Merge pull request #129 from SELab-2/web/feature/last-mockupfixes

Frontend: mockupfixes

web/src/router/index.ts

@@ -106,7 +106,7 @@ const routes = [
         component: UserCreation,
       },
       {
-        path: "/dashboard/ronde/rapport",
+        path: "/dashboard/rondes/rapport",
         name: "Ronde rapport",
         component: RoundReport,
       },

web/src/views/BuildingFollowup.vue

@@ -111,16 +111,8 @@ const mockbuildingdata: any[] = [
     student: "Mats Van Belle",
     comments: [
       {
-        title: "Ambetant gebouw",
-        comment: "geen leuk gebouw",
-      },
-      {
-        title: "Lange code",
-        comment: "12 karakters is te lang",
-      },
-      {
-        title: "Ver",
-        comment: "Zeer ver van de andere gebouwen in de ronde",
+        title: "Kapotte deur",
+        comment: "De deur in de berging is kapot",
       },
     ],
   },

web/src/views/LoginScreen.vue

@@ -34,7 +34,7 @@
           </span>
         </p>
         <!-- Login button -->
-        <router-link to="/dashboard">
+        <router-link to="/planning">
           <v-btn prepend-icon="mdi-login" color="success">Login</v-btn>
         </router-link>
       </div>

web/src/views/RoundDetail.vue

@@ -57,6 +57,15 @@
           </v-timeline-item>
         </v-timeline>
       </v-container>
+      <v-card-actions class="d-flex">
+        <v-spacer></v-spacer>
+        <v-btn
+          to="/dashboard/rondes/rapport"
+          prepend-icon="mdi-check"
+          color="primary"
+          >Ronde stoppen</v-btn
+        >
+      </v-card-actions>
     </v-card>
   </v-container>
 </template>

web/src/views/RoundFollowup.vue

@@ -1,6 +1,7 @@
 <template>
   <!-- Simple vlist that uses the custom component RoundCard -->
-  <v-list>
+  <v-list class="mx-3">
+    <v-card-title>Rondes van vandaag</v-card-title>
     <RoundCard
       v-for="(round, i) in mockrounds"
       :key="i"

web/src/views/RoundPlanner.vue

@@ -35,7 +35,7 @@
               :items="rounds"
             ></v-select>
             <v-spacer></v-spacer>
-            <router-link to="/rondes/maken">
+            <router-link to="/dashboard/rondes/nieuw">
               <v-btn
                 v-if="selectedRound"
                 prepend-icon="mdi-pencil"

web/src/views/RoundReport.vue

@@ -67,8 +67,12 @@
       </v-container>
       <v-card-actions class="d-flex">
         <v-spacer></v-spacer>
-        <v-btn prepend-icon="mdi-close" color="error">Niet afsluiten</v-btn>
-        <v-btn prepend-icon="mdi-check" color="primary">Afsluiten</v-btn>
+        <v-btn to="/rondes/detail" prepend-icon="mdi-close" color="error"
+          >Niet afsluiten</v-btn
+        >
+        <v-btn to="/planning" prepend-icon="mdi-check" color="primary"
+          >Afsluiten</v-btn
+        >
       </v-card-actions>
     </v-card>
   </v-container>

web/src/views/StudentFollowUp.vue

@@ -2,13 +2,14 @@
   <!-- Card that lets you select the round -->
   <v-card title="Kies ronde" prepend-icon="mdi-transit-detour" class="ma-3">
     <template v-slot:append>
-      <v-select
-        prepend-inner-icon="mdi-filter"
-        label="Sorteer"
-        :items="['Datum', 'Naam']"
-        v-model="mockDefaultSort"
-        variant="solo"
-      ></v-select>
+      <v-card-actions>
+        <router-link to="/rondes/plannen">
+          <v-btn color="primary"> Ronde plannen </v-btn>
+        </router-link>
+        <router-link to="/dashboard/rondes/nieuw">
+          <v-btn color="primary"> Ronde aanmaken </v-btn>
+        </router-link>
+      </v-card-actions>
     </template>
 
     <v-row class="py-0 my-0 mx-1">
@@ -57,7 +58,12 @@
       </v-chip>
     </template>
     <template v-slot:append>
-      <v-btn prepend-icon="mdi-file-eye" color="primary">Details</v-btn>
+      <v-btn
+        to="/dashboard/ronde/rapport"
+        prepend-icon="mdi-file-eye"
+        color="primary"
+        >Details</v-btn
+      >
     </template>
   </v-card>
 </template>
@@ -66,7 +72,6 @@
 import { ref } from "vue";
 import Avatar from "@/components/Avatar.vue";
 
-const mockDefaultSort = ref("Datum");
 const mockDefaultWeek = ref("Week 1");
 const mockDefaultRound = ref("Ronde 1");