Merge pull request #1176 from dodona-edu/feature/improve-upload-form

dodona-edu · Jul 8, 2023 · 406da3d · 406da3d
2 parents dd3b6f3 + 8e13dab
commit 406da3d
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 25 deletions.
diff --git a/web/src/components/upload/UploadFormCard.vue b/web/src/components/upload/UploadFormCard.vue
@@ -309,9 +309,6 @@ watch(
                     :rules="fileRules"
                     :truncate-length="80"
                     :show-size="1000"
-                    persistent-hint
-                    hint="We currently only support a ZIP-file with a mandatory
-                    info.csv file listing the files to analyze."
                     prepend-icon=""
                     prepend-inner-icon="$file"
                     accept="zip, application/zip"

diff --git a/web/src/components/upload/UploadsTable.vue b/web/src/components/upload/UploadsTable.vue
@@ -109,6 +109,11 @@ const openShareDialog = (item: any): void => {
           <v-icon>mdi-share-variant</v-icon>
         </v-btn>
       </template>
+
+      <template #no-data>
+        Your uploads will appear here.
+        See our <a href="https://dolos.ugent.be/try/">demo</a> page for an example of a report.
+      </template>
     </v-data-table>
 
     <uploads-table-info-dialog

diff --git a/web/src/views/upload/upload.vue b/web/src/views/upload/upload.vue
@@ -20,31 +20,50 @@ const search = ref("");
       </v-col>
 
       <v-col cols="12" md="6">
-        <v-card>
-          <v-row align="center" no-gutters>
-            <v-col cols="12" md="6">
-              <v-card-title> Previous analysis results </v-card-title>
-              <v-card-subtitle>
-                View the analysis results of previous uploads on this computer.
-              </v-card-subtitle>
-            </v-col>
+        <v-row>
+          <v-col cols="12">
+            <v-card>
+              <v-row align="center" no-gutters>
+                <v-col cols="12" md="6">
+                  <v-card-title> Previous analysis results </v-card-title>
+                  <v-card-subtitle>
+                    View the analysis results of previous uploads on this computer.
+                  </v-card-subtitle>
+                </v-col>
 
-            <v-col cols="12" md="6">
-              <v-text-field
-                v-model="search"
-                append-icon="mdi-magnify"
-                label="Search"
-                single-line
-                hide-details
-                outlined
-                dense
-              />
-            </v-col>
-          </v-row>
+                <v-col cols="12" md="6">
+                  <v-text-field
+                      class="search-text-field"
+                      v-model="search"
+                      append-icon="mdi-magnify"
+                      label="Search"
+                      single-line
+                      hide-details
+                      outlined
+                      dense
+                  />
+                </v-col>
+              </v-row>
 
-          <uploads-table :search.sync="search" />
-        </v-card>
+              <uploads-table :search.sync="search" />
+            </v-card>
+          </v-col>
+
+        <v-col cols="12">
+          <v-card>
+            <v-card-title>Need help?</v-card-title>
+            <v-card-text>
+              Reach out if you have any problems, suggestions or feedback.
+            </v-card-text>
+            <v-card-actions>
+              <v-btn color="primary" text href="https://dodona.ugent.be/en/contact">Contact us</v-btn>
+              <v-btn text href="https://dolos.ugent.be">View documentation</v-btn>
+            </v-card-actions>
+          </v-card>
+        </v-col>
+        </v-row>
       </v-col>
+
     </v-row>
   </div>
 </template>
@@ -61,4 +80,8 @@ const search = ref("");
     font-size: 1.25rem;
   }
 }
+
+.search-text-field {
+  margin: 0 16px;
+}
 </style>