resolved merge conflicts

Author: briancaffey

backend/apps/accounts/migrations/0002_auto_20201124_0323.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.1.2 on 2020-11-24 03:23
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='customuser',
+            name='first_name',
+            field=models.CharField(blank=True, max_length=150, verbose_name='first name'),
+        ),
+    ]

quasar/package.json

@@ -25,14 +25,14 @@
     "highcharts-vue": "1.3.5",
     "js-cookie": "2.2.1",
     "prettier": "2.1.2",
-    "quasar": "1.14.2",
+    "quasar": "1.14.5",
     "vue-apollo": "3.0.5",
     "vue-i18n": "8.22.1",
     "vue-native-websocket": "2.0.14",
     "workbox-webpack-plugin": "5.0.0"
   },
   "devDependencies": {
-    "@quasar/app": "2.1.5",
+    "@quasar/app": "2.1.8",
     "@vue/eslint-config-prettier": "6.0.0",
     "babel-eslint": "10.1.0",
     "eslint": "7.12.0",

quasar/src/boot/i18n.js

@@ -7,7 +7,7 @@ Vue.use(VueI18n);
 const i18n = new VueI18n({
   locale: "en-us",
   fallbackLocale: "en-us",
-  messages
+  messages,
 });
 
 export default ({ app }) => {

quasar/src/components/LeftMenuLink.vue

@@ -14,7 +14,7 @@
 
 <script>
 export default {
-  props: ["label", "to", "icon", "caption"]
+  props: ["label", "to", "icon", "caption"],
 };
 </script>
 

quasar/src/components/MainCarousel.vue

@@ -11,11 +11,9 @@
       padding
       arrows
       height="300px"
-      :class="
-        `text-white shadow-1 rounded-borders ${
-          $store.getters.isDark ? 'carousel-dark' : 'carousel-light'
-        }`
-      "
+      :class="`text-white shadow-1 rounded-borders ${
+        $store.getters.isDark ? 'carousel-dark' : 'carousel-light'
+      }`"
     >
       <q-carousel-slide name="style" class="column no-wrap flex-center">
         <q-icon name="layers" size="56px" />
@@ -47,9 +45,9 @@ export default {
   data() {
     return {
       lorem: "Abc123",
-      slide: "style"
+      slide: "style",
     };
-  }
+  },
 };
 </script>
 

quasar/src/components/auth/SignUpForm.vue

@@ -41,7 +41,7 @@ export default {
     return {
       email: "",
       password: "",
-      visible: false
+      visible: false,
     };
   },
   methods: {
@@ -51,7 +51,7 @@ export default {
         .then(() => {
           this.$q.notify({
             title: "User registered",
-            message: "Thank you for registering!"
+            message: "Thank you for registering!",
           });
           this.visible = false;
           this.$router.push("/");
@@ -60,8 +60,8 @@ export default {
           this.visible = false;
           this.$q.notify("There was an error.");
         });
-    }
-  }
+    },
+  },
 };
 </script>
 

quasar/src/components/services/ServiceLink.vue

@@ -9,25 +9,25 @@ export default {
   props: {
     href: {
       type: String,
-      default: "#"
+      default: "#",
     },
     name: {
       type: String,
-      default: ""
+      default: "",
     },
     icon: {
       type: String,
-      default: ""
+      default: "",
     },
     target: {
       type: String,
-      default: "_blank"
+      default: "_blank",
     },
     type: {
       type: String,
-      default: "a"
-    }
-  }
+      default: "a",
+    },
+  },
 };
 </script>
 

quasar/src/components/ui/BaseBtn.vue

@@ -7,13 +7,13 @@ export default {
   props: {
     color: {
       type: String,
-      default: "white"
-    }
+      default: "white",
+    },
   },
   textColor: {
     type: String,
-    default: "black"
-  }
+    default: "black",
+  },
 };
 </script>
 

quasar/src/components/ui/BaseInput.vue

@@ -1,7 +1,6 @@
 <template>
   <q-input v-bind="$attrs" v-on="$listeners" :dark="$store.getters.isDark">
-    <template v-slot:prepend>
-      <slot></slot> </template
+    <template v-slot:prepend> <slot></slot> </template
   ></q-input>
 </template>
 

quasar/src/components/ui/BasePage.vue

@@ -13,8 +13,8 @@ export default {
   methods: {
     getStyle() {
       return { color: "white" };
-    }
-  }
+    },
+  },
 };
 </script>