Merge pull request #27 from MuNuChapterHKN/develop

Opening apply march 2024
MuNuChapterHKN · Feb 25, 2024 · 6214d36 · 6214d36
2 parents 4525448 + 5cd4d94
commit 6214d36
Show file tree

Hide file tree

Showing 9 changed files with 3,476 additions and 3,257 deletions.
diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml
@@ -23,11 +23,11 @@ jobs:
             VERSION=${GITHUB_REF#refs/tags/}
             TAGS="$DOCKER_IMAGE:$VERSION,$DOCKER_IMAGE:latest"
           elif [[ $GITHUB_REF == refs/heads/main ]]; then
-            VERSION=$(git rev-parse --short ${{ github.sha }})
+            VERSION=main-$(git rev-parse --short ${{ github.sha }})
             TAGS="$DOCKER_IMAGE:$VERSION,$DOCKER_IMAGE:latest"
           elif [[ $GITHUB_REF == refs/heads/develop ]]; then
             VERSION=dev-$(git rev-parse --short ${{ github.sha }})
-            TAGS="$DOCKER_IMAGE:$VERSION"
+            TAGS="$DOCKER_IMAGE:$VERSION,$DOCKER_IMAGE:test"
           else
             VERSION=$(git rev-parse --short ${{ github.sha }})
             TAGS="$DOCKER_IMAGE:$VERSION"

diff --git a/components/JoinUs/SubmissionForm.tsx b/components/JoinUs/SubmissionForm.tsx
@@ -96,7 +96,19 @@ export default function SubmissionForm() {
             if (response.ok) {
                 setSubmitted(true);
             } else {
-                setSubmissionError("An error occurred, please try again later or send an email");
+                switch (response.status) {
+                    case 413:
+                        setSubmissionError("The files you provided were too large (Max 2MB) or not in the correct format. Try again.");
+                        break;
+                    case 422:
+                        setSubmissionError("The provided data was incorrect or invalid, try again");
+                        break;
+                    case 405:
+                        setSubmissionError("Something went wrong, refresh the page and try again");
+                        break;
+                    default:
+                        setSubmissionError("An error occurred, please try again later or send an email");
+                }   
             }
         } catch (error: any) {
             console.error(error)