Fix prettier

Author: AchoArnold

.pre-commit-config.yaml

@@ -14,6 +14,6 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.0.0-alpha.6
+    rev: v2.7.1
     hooks:
       - id: prettier

web/components/FirebaseAuth.vue

@@ -46,7 +46,7 @@ export default class FirebaseAuth extends Vue {
     return {
       callbacks: {
         signInSuccessWithAuthResult: (
-          authResult: firebase.auth.UserCredential,
+          authResult: firebase.auth.UserCredential
         ) => {
           this.$store.dispatch('addNotification', {
             message: 'Login successfull!',
@@ -66,7 +66,7 @@ export default class FirebaseAuth extends Vue {
           this.firebaseUIInitialized = true
           const container = this.$refs.authContainer as HTMLElement
           Array.from(
-            container.getElementsByClassName('firebaseui-idp-text-long'),
+            container.getElementsByClassName('firebaseui-idp-text-long')
           ).forEach((item: Element) => {
             item.textContent =
               item.textContent?.replace('Sign in with', 'Continue with') || null

web/layouts/default.vue

@@ -40,14 +40,11 @@ export default class DefaultLayout extends Vue {
 
   mounted() {
     // this.startPoller()
-    setTimeout(
-      () => {
-        if (this.poller) {
-          clearInterval(this.poller)
-        }
-      },
-      60 * 1000 * 60,
-    )
+    setTimeout(() => {
+      if (this.poller) {
+        clearInterval(this.poller)
+      }
+    }, 60 * 1000 * 60)
   }
 
   beforeDestroy(): void {
@@ -65,7 +62,7 @@ export default class DefaultLayout extends Vue {
         setAuthHeader((await this.$fire.auth.currentUser?.getIdToken()) ?? '')
         promises.push(
           this.$store.dispatch('loadThreads'),
-          this.$store.dispatch('getHeartbeat'),
+          this.$store.dispatch('getHeartbeat')
         )
       }
 
@@ -77,8 +74,8 @@ export default class DefaultLayout extends Vue {
         promises.push(
           this.$store.dispatch(
             'loadThreadMessages',
-            this.$store.getters.getThread.id,
-          ),
+            this.$store.getters.getThread.id
+          )
         )
       }
       await Promise.all(promises)

web/package.json

@@ -62,7 +62,7 @@
     "jest": "^27.4.4",
     "lint-staged": "^13.2.0",
     "postcss-html": "^1.5.0",
-    "prettier": "3.0.0-alpha.6",
+    "prettier": "^2.8.4",
     "stylelint": "^14.16.1",
     "stylelint-config-prettier": "^9.0.5",
     "stylelint-config-recommended-vue": "^1.1.0",

web/pages/billing/index.vue

@@ -49,7 +49,7 @@
                         Your next bill is for <b>${{ plan.price }}</b> on
                         <b>{{
                           new Date(
-                            $store.getters.getUser.subscription_renews_at,
+                            $store.getters.getUser.subscription_renews_at
                           ).toLocaleDateString()
                         }}</b>
                       </p>
@@ -64,7 +64,7 @@
                         You will be downgraded to the <b>FREE</b> plan on
                         <b>{{
                           new Date(
-                            $store.getters.getUser.subscription_ends_at,
+                            $store.getters.getUser.subscription_ends_at
                           ).toLocaleDateString()
                         }}</b>
                       </p>
@@ -116,7 +116,7 @@
                               of the current billing period on
                               <b>{{
                                 new Date(
-                                  $store.getters.getUser.subscription_renews_at,
+                                  $store.getters.getUser.subscription_renews_at
                                 ).toLocaleDateString()
                               }}</b>
                             </p>
@@ -399,7 +399,7 @@ export default Vue.extend({
     plan(): PaymentPlan {
       return this.plans.find(
         (x) =>
-          x.id === (this.$store.getters.getUser?.subscription_name || 'free'),
+          x.id === (this.$store.getters.getUser?.subscription_name || 'free')
       )!
     },
     isOnFreePlan(): boolean {

web/pages/messages/index.vue

@@ -96,8 +96,8 @@ export default {
             errors.set(
               'to',
               response.data.data.to.map((x) =>
-                x.replace('to field', 'phone number field'),
-              ),
+                x.replace('to field', 'phone number field')
+              )
             )
           }
           if (response.data.data.from) {

web/pages/terms-and-conditions/index.vue

@@ -169,7 +169,7 @@ export default Vue.extend({
   },
   head() {
     return {
-      title: 'Terms And Conditions - Http SMS',
+      title: 'Terms And Conditions - httpSMS',
     }
   },
 })

web/pages/threads/_id.vue

@@ -265,6 +265,7 @@ export default Vue.extend({
       mdiCheckAll,
       mdiCheck,
       mdiAlert,
+      messages: [] as Message[],
       mdiPackageUp,
       mdiPackageDown,
       mdiAccount,
@@ -277,13 +278,10 @@ export default Vue.extend({
   },
   head() {
     return {
-      title: 'Messages - Http SMS',
+      title: 'Messages - httpSMS',
     }
   },
   computed: {
-    messages(): Array<Message> {
-      return [...this.$store.getters.getThreadMessages].reverse()
-    },
     contactIsPhoneNumber(): boolean {
       return isValidPhoneNumber(this.$store.getters.getThread.contact)
     },
@@ -320,17 +318,23 @@ export default Vue.extend({
       )
     },
 
+    loadMessages() {
+      this.$store
+        .dispatch('loadThreadMessages', this.$route.params.id)
+        .then((messages: Array<Message>) => {
+          this.messages = [...messages].reverse()
+        })
+      this.scrollToElement()
+    },
+
     async loadData() {
       await this.$store.dispatch('loadPhones')
       await this.$store.dispatch('loadThreads')
 
       if (!this.$store.getters.hasThreadId(this.$route.params.id)) {
         await this.$router.push({ name: 'threads' })
-        return
+        this.loadMessages()
       }
-
-      await this.$store.dispatch('loadThreadMessages', this.$route.params.id)
-      this.scrollToElement()
     },
 
     isMT(message: Message): boolean {
@@ -373,12 +377,7 @@ export default Vue.extend({
         this.selectedMenuItem = -1
       }, 1000)
 
-      await this.$store.dispatch(
-        'loadThreadMessages',
-        this.$store.getters.getThread.id,
-      )
-
-      this.scrollToElement()
+      this.loadMessages()
     },
 
     async sendMessage(event: KeyboardEvent) {

web/pages/threads/index.vue

@@ -30,7 +30,7 @@ export default {
   middleware: ['auth'],
   head() {
     return {
-      title: 'Threads - Http SMS',
+      title: 'Threads - httpSMS',
     }
   },
   async mounted() {

web/plugins/errors.ts

@@ -21,7 +21,7 @@ const sanitize = (key: string, values: Array<string>): Array<string> => {
         .split(' char')
         .join(' character')
         .split(' field ')
-        .join(' '),
+        .join(' ')
     )
   })
 }