Merge pull request #172 from s0lvang/feature/completed

Ferdige oppdrag

src/components/AllRequestsMap.vue

@@ -102,7 +102,7 @@ export default {
 }
 
 #all-requests-map {
-  margin: 1em auto 2em;
+  margin: 0 auto 2em;
   position: relative;
   height: 65vh;
   z-index: 199;

src/services/firebase.js

@@ -130,3 +130,13 @@ export const deleteUser = (userId, callback = () => { }) => {
 
   callback();
 };
+
+export const getDelivered = async (callback = () => { }) => {
+  const resp = await fb
+    .firestore()
+    .collectionGroup("requests")
+    .where("delivered", "==", true)
+    .get();
+
+  callback(resp.docs.length);
+};

src/views/AllRequests.vue

@@ -11,6 +11,10 @@
         {{ mapEnabled ? "Skjul" : "Vis" }} kart
       </button>
     </div>
+    <small
+      >{{ delivered === null ? "Laster antall" : delivered }} fullførte
+      oppdrag{{ delivered === null ? "..." : "" }}</small
+    >
     <section v-if="getRequests.length && this.mapEnabled">
       <AllRequestsMap
         :requests="getRequests"
@@ -38,17 +42,19 @@ import Request from "@/components/Request.vue";
 import AllRequestsMap from "@/components/AllRequestsMap.vue";
 import coordinateDistance from "@/helpers/coord";
 import Icon from "@/components/shared/Icon.vue";
+import { getDelivered } from "@/services/firebase";
 
 export default {
-  name: "MyRequests",
+  name: "AllRequests",
   components: {
     Request,
     AllRequestsMap,
     Icon
   },
   data() {
     return {
-      mapEnabled: false
+      mapEnabled: false,
+      delivered: null
     };
   },
   computed: {
@@ -87,6 +93,11 @@ export default {
           )
       );
     }
+  },
+  mounted() {
+    getDelivered(count => {
+      this.delivered = count;
+    });
   }
 };
 </script>
@@ -98,6 +109,13 @@ export default {
   align-items: flex-start;
 }
 
+small {
+  margin-top: -0.7rem;
+  margin-bottom: 1rem;
+  display: block;
+  color: gray;
+}
+
 button.toggle-map {
   --blue: #{$color-primary};
   --light-blue: #{lighten($color-primary, 10%)};