Merge production

Freegle · Jun 28, 2023 · c6120cd · c6120cd
2 parents ad8e426 + e672fdb
commit c6120cd
Show file tree

Hide file tree

Showing 62 changed files with 1,650 additions and 586 deletions.
diff --git a/components/AdaptiveMap.vue b/components/AdaptiveMap.vue
@@ -641,9 +641,9 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-@import '~bootstrap/scss/functions';
-@import '~bootstrap/scss/variables';
-@import '~bootstrap/scss/mixins/_breakpoints';
+@import 'bootstrap/scss/functions';
+@import 'bootstrap/scss/variables';
+@import 'bootstrap/scss/mixins/_breakpoints';
 
 .postcode {
   position: absolute;

diff --git a/components/AdaptiveMapGroup.vue b/components/AdaptiveMapGroup.vue
@@ -75,9 +75,9 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-@import '~bootstrap/scss/functions';
-@import '~bootstrap/scss/variables';
-@import '~bootstrap/scss/mixins/_breakpoints';
+@import 'bootstrap/scss/functions';
+@import 'bootstrap/scss/variables';
+@import 'bootstrap/scss/mixins/_breakpoints';
 
 .layout {
   display: grid;

diff --git a/components/BrowseHomeIcon.vue b/components/BrowseHomeIcon.vue
@@ -9,9 +9,9 @@
 export default {}
 </script>
 <style scoped lang="scss">
-@import '~bootstrap/scss/functions';
-@import '~bootstrap/scss/variables';
-@import '~bootstrap/scss/mixins/_breakpoints';
+@import 'bootstrap/scss/functions';
+@import 'bootstrap/scss/variables';
+@import 'bootstrap/scss/mixins/_breakpoints';
 
 .icon {
   width: 46px;

diff --git a/components/ChatHeader.vue b/components/ChatHeader.vue
@@ -366,9 +366,9 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-@import '~bootstrap/scss/functions';
-@import '~bootstrap/scss/variables';
-@import '~bootstrap/scss/mixins/_breakpoints';
+@import 'bootstrap/scss/functions';
+@import 'bootstrap/scss/variables';
+@import 'bootstrap/scss/mixins/_breakpoints';
 
 .outer {
   background-color: $color-blue--x-light;

diff --git a/components/ChatMenu.vue b/components/ChatMenu.vue
@@ -69,9 +69,9 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-@import '~bootstrap/scss/functions';
-@import '~bootstrap/scss/variables';
-@import '~bootstrap/scss/mixins/_breakpoints';
+@import 'bootstrap/scss/functions';
+@import 'bootstrap/scss/variables';
+@import 'bootstrap/scss/mixins/_breakpoints';
 
 .chatbadge {
   position: absolute;

diff --git a/components/ChatMessage.vue b/components/ChatMessage.vue
@@ -204,9 +204,9 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-@import '~bootstrap/scss/functions';
-@import '~bootstrap/scss/variables';
-@import '~bootstrap/scss/mixins/_breakpoints';
+@import 'bootstrap/scss/functions';
+@import 'bootstrap/scss/variables';
+@import 'bootstrap/scss/mixins/_breakpoints';
 
 .selected {
   border: 1px solid $color-blue--bright;

diff --git a/components/ChatMessageCompleted.vue b/components/ChatMessageCompleted.vue
@@ -24,10 +24,28 @@
               </h4>
             </b-card-title>
             <b-card-text>
-              <span v-if="refmsg?.type === 'Offer'">
-                This is no longer available.
-              </span>
-              <span v-else> Thanks, this has now been received. </span>
+              <div v-if="emessage">
+                <NoticeMessage variant="info">
+                  <div class="small">
+                    <v-icon icon="info-circle" />
+                    <span v-if="refmsg?.type === 'Offer'">
+                    This is no longer available.
+                  </span>
+                    <span v-else> Thanks, this has now been received. </span>
+                  </div>
+                </NoticeMessage>
+                <div class="preline forcebreak mt-1">
+                  {{ emessage }}
+                </div>
+              </div>
+              <div v-else>
+                <v-icon icon="info-circle" />
+                <span v-if="refmsg?.type === 'Offer'">
+                  This is no longer available.
+                </span>
+                <span v-else> Thanks, this has now been received. </span>
+                <div class="text-muted small">This is an automated message.</div>
+              </div>
             </b-card-text>
           </b-card>
         </div>
@@ -53,14 +71,28 @@
               </h4>
             </b-card-title>
             <b-card-text>
-              <div>
+              <div v-if="emessage">
+                <NoticeMessage variant="info">
+                  <div class="text-muted small">
+                    <v-icon icon="info-circle" />
+                    <span v-if="refmsg?.type === 'Offer'">
+                    This is no longer available.
+                  </span>
+                    <span v-else> Thanks, this has now been received. </span>
+                  </div>
+                </NoticeMessage>
+                <div class="preline forcebreak mt-1">
+                  {{ emessage }}
+                </div>
+              </div>
+              <div v-else>
                 <v-icon icon="info-circle" />
                 <span v-if="refmsg.type === 'Offer'">
                   We've let them know this is no longer available.
                 </span>
                 <span v-else> This has now been received. </span>
+                <div class="text-muted small">This is an automated message.</div>
               </div>
-              <div class="text-muted small">This is an automated message.</div>
             </b-card-text>
           </b-card>
         </div>
@@ -70,8 +102,10 @@
 </template>
 <script>
 import ChatBase from '~/components/ChatBase'
+import NoticeMessage from './NoticeMessage'
 
 export default {
+  components: {NoticeMessage},
   extends: ChatBase,
 }
 </script>
diff --git a/components/ChatMessageSummary.vue b/components/ChatMessageSummary.vue
@@ -164,9 +164,9 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-@import '~bootstrap/scss/functions';
-@import '~bootstrap/scss/variables';
-@import '~bootstrap/scss/mixins/_breakpoints';
+@import 'bootstrap/scss/functions';
+@import 'bootstrap/scss/variables';
+@import 'bootstrap/scss/mixins/_breakpoints';
 
 .messagecard {
   border-radius: 4px;

diff --git a/components/ClusterIcon.vue b/components/ClusterIcon.vue
@@ -39,9 +39,9 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-@import '~bootstrap/scss/functions';
-@import '~bootstrap/scss/variables';
-@import '~bootstrap/scss/mixins/_breakpoints';
+@import 'bootstrap/scss/functions';
+@import 'bootstrap/scss/variables';
+@import 'bootstrap/scss/mixins/_breakpoints';
 
 .icon {
   width: 46px;

diff --git a/components/CommunityEvent.vue b/components/CommunityEvent.vue
@@ -250,9 +250,9 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-@import '~bootstrap/scss/functions';
-@import '~bootstrap/scss/variables';
-@import '~bootstrap/scss/mixins/_breakpoints';
+@import 'bootstrap/scss/functions';
+@import 'bootstrap/scss/variables';
+@import 'bootstrap/scss/mixins/_breakpoints';
 
 .square {
   object-fit: cover;

diff --git a/components/GroupHeader.vue b/components/GroupHeader.vue
@@ -226,9 +226,9 @@ export default {
 </script>
 
 <style scoped lang="scss">
-@import '~bootstrap/scss/functions';
-@import '~bootstrap/scss/variables';
-@import '~bootstrap/scss/mixins/_breakpoints';
+@import 'bootstrap/scss/functions';
+@import 'bootstrap/scss/variables';
+@import 'bootstrap/scss/mixins/_breakpoints';
 
 .img-thumbnail {
   margin-bottom: 20px;

diff --git a/components/InviteSomeone.vue b/components/InviteSomeone.vue
@@ -196,9 +196,9 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-@import '~bootstrap/scss/functions';
-@import '~bootstrap/scss/variables';
-@import '~bootstrap/scss/mixins/_breakpoints';
+@import 'bootstrap/scss/functions';
+@import 'bootstrap/scss/variables';
+@import 'bootstrap/scss/mixins/_breakpoints';
 
 .layout {
   display: grid;

diff --git a/components/IsoChrone.vue b/components/IsoChrone.vue
@@ -317,9 +317,9 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-@import '~bootstrap/scss/functions';
-@import '~bootstrap/scss/variables';
-@import '~bootstrap/scss/mixins/_breakpoints';
+@import 'bootstrap/scss/functions';
+@import 'bootstrap/scss/variables';
+@import 'bootstrap/scss/mixins/_breakpoints';
 
 :deep(button) {
   box-shadow: none !important;

diff --git a/components/IsochronePostMapAndList.vue b/components/IsochronePostMapAndList.vue
@@ -625,9 +625,9 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-@import '~bootstrap/scss/functions';
-@import '~bootstrap/scss/variables';
-@import '~bootstrap/scss/mixins/_breakpoints';
+@import 'bootstrap/scss/functions';
+@import 'bootstrap/scss/variables';
+@import 'bootstrap/scss/mixins/_breakpoints';
 
 .postcode {
   position: absolute;

diff --git a/components/LayoutCommon.vue b/components/LayoutCommon.vue
@@ -179,9 +179,9 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-@import '~bootstrap/scss/functions';
-@import '~bootstrap/scss/variables';
-@import '~bootstrap/scss/mixins/_breakpoints';
+@import 'bootstrap/scss/functions';
+@import 'bootstrap/scss/variables';
+@import 'bootstrap/scss/mixins/_breakpoints';
 
 html {
   box-sizing: border-box;

diff --git a/components/LoginModal.vue b/components/LoginModal.vue
@@ -905,9 +905,9 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-@import '~bootstrap/scss/functions';
-@import '~bootstrap/scss/variables';
-@import '~bootstrap/scss/mixins/_breakpoints';
+@import 'bootstrap/scss/functions';
+@import 'bootstrap/scss/variables';
+@import 'bootstrap/scss/mixins/_breakpoints';
 
 $color-facebook: #4267b2;
 $color-google: #4285f4;

diff --git a/components/MainFooter.vue b/components/MainFooter.vue
@@ -75,9 +75,9 @@
 export default {}
 </script>
 <style scoped lang="scss">
-@import '~bootstrap/scss/functions';
-@import '~bootstrap/scss/variables';
-@import '~bootstrap/scss/mixins/_breakpoints';
+@import 'bootstrap/scss/functions';
+@import 'bootstrap/scss/variables';
+@import 'bootstrap/scss/mixins/_breakpoints';
 
 .footer {
   //max-width: map-get($grid-breakpoints, 'md');

diff --git a/components/MainHeader.vue b/components/MainHeader.vue
@@ -754,9 +754,9 @@ const clickedMobileNav = () => {
 }
 </script>
 <style scoped lang="scss">
-@import '~bootstrap/scss/functions';
-@import '~bootstrap/scss/variables';
-@import '~bootstrap/scss/mixins/_breakpoints';
+@import 'bootstrap/scss/functions';
+@import 'bootstrap/scss/variables';
+@import 'bootstrap/scss/mixins/_breakpoints';
 
 #navbar_large .nav-item {
   text-align: center;

diff --git a/components/MessageAttachments.vue b/components/MessageAttachments.vue
@@ -98,9 +98,9 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-@import '~bootstrap/scss/functions';
-@import '~bootstrap/scss/variables';
-@import '~bootstrap/scss/mixins/_breakpoints';
+@import 'bootstrap/scss/functions';
+@import 'bootstrap/scss/variables';
+@import 'bootstrap/scss/mixins/_breakpoints';
 
 .attachment {
   object-fit: cover;

diff --git a/components/MessageExpanded.vue b/components/MessageExpanded.vue
@@ -189,9 +189,9 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-@import '~bootstrap/scss/functions';
-@import '~bootstrap/scss/variables';
-@import '~bootstrap/scss/mixins/_breakpoints';
+@import 'bootstrap/scss/functions';
+@import 'bootstrap/scss/variables';
+@import 'bootstrap/scss/mixins/_breakpoints';
 
 .header--size4 {
   color: $colour-info-fg !important;

diff --git a/components/MessageMap.vue b/components/MessageMap.vue
@@ -88,7 +88,7 @@ export default {
   },
   methods: {
     idle(themap) {
-      if (this.home) {
+      if (this.home?.lat || this.home?.lng) {
         // We want to show both the centre and the marker.
         // eslint-disable-next-line new-cap
         const fg = new this.L.featureGroup([
@@ -98,7 +98,10 @@ export default {
           new this.L.marker([this.home.lat, this.home.lng]),
         ])
 
-        themap.fitBounds(fg.getBounds().pad(0.1))
+        let fitTo = fg.getBounds().pad(0.1)
+        if (fitTo.isValid()) {
+          themap.fitBounds(fitTo)
+        }
       } else {
         // eslint-disable-next-line new-cap
         const fg = new this.L.featureGroup([

diff --git a/components/MessageModal.vue b/components/MessageModal.vue
@@ -131,9 +131,9 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-@import '~bootstrap/scss/functions';
-@import '~bootstrap/scss/variables';
-@import '~bootstrap/scss/mixins/_breakpoints';
+@import 'bootstrap/scss/functions';
+@import 'bootstrap/scss/variables';
+@import 'bootstrap/scss/mixins/_breakpoints';
 
 .close {
   top: -15px;

diff --git a/components/MessageReplySection.vue b/components/MessageReplySection.vue
@@ -216,14 +216,16 @@ export default {
     alreadyAMember() {
       let found = false
 
-      for (const messageGroup of this.message?.groups) {
-        Object.keys(this.myGroups).forEach((key) => {
-          const group = this.myGroups[key]
+      if (this.message?.groups) {
+        for (const messageGroup of this.message?.groups) {
+          Object.keys(this.myGroups).forEach((key) => {
+            const group = this.myGroups[key]
 
-          if (messageGroup.groupid === group.id) {
-            found = true
-          }
-        })
+            if (messageGroup.groupid === group.id) {
+              found = true
+            }
+          })
+        }
       }
 
       return found

diff --git a/components/MessageSummary.vue b/components/MessageSummary.vue
@@ -140,9 +140,9 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-@import '~bootstrap/scss/functions';
-@import '~bootstrap/scss/variables';
-@import '~bootstrap/scss/mixins/_breakpoints';
+@import 'bootstrap/scss/functions';
+@import 'bootstrap/scss/variables';
+@import 'bootstrap/scss/mixins/_breakpoints';
 
 .card-body {
   padding: 0px;