Merge branch 'master' into ios-fix-safe-area-padding

Tidomann · Mar 17, 2022 · 646882a · 646882a
2 parents 55abdb6 + 2d428b1
commit 646882a
Show file tree

Hide file tree

Showing 51 changed files with 24 additions and 24 deletions.
diff --git a/package.json b/package.json
@@ -32,7 +32,7 @@
     "vue-property-decorator": "^8.3.0",
     "vue-router": "^3.2.0",
     "vuedraggable": "^2.23.2",
-    "vuetify": "2.4.0",
+    "vuetify": "^2.4.0",
     "vuetify-loader": "^1.7.0",
     "vuex": "^3.4.0",
     "vuex-module-decorators": "^0.10.1"

diff --git a/public/index.html b/public/index.html
@@ -6,7 +6,7 @@
     <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
     <meta http-equiv="Pragma" content="no-cache" />
     <meta http-equiv="Expires" content="0" />
-    <meta name="viewport" content="width=device-width,initial-scale=1.0,viewport-fit=cover" />
+    <meta name="viewport" content="width=device-width,initial-scale=1.0" />
     <meta
       name="description"
       content="A digital toolset for the LANCER TTRPG by Massif Press. Create characters and track them in combat, or run games with the GM toolkit."

diff --git a/public/static/img/mech/alt_agonist.png b/public/static/img/mech/alt_agonist.png
diff --git a/public/static/img/mech/alt_hercules.png b/public/static/img/mech/alt_hercules.png
diff --git a/public/static/img/mech/alt_hortuga.png b/public/static/img/mech/alt_hortuga.png
diff --git a/public/static/img/mech/alt_sherman_old.png b/public/static/img/mech/alt_sherman_old.png
diff --git a/public/static/img/mech/mf_atlas.png b/public/static/img/mech/mf_atlas.png
diff --git a/public/static/img/mech/mf_balor.png b/public/static/img/mech/mf_balor.png
diff --git a/public/static/img/mech/mf_barbarossa.png b/public/static/img/mech/mf_barbarossa.png
diff --git a/public/static/img/mech/mf_black_witch.png b/public/static/img/mech/mf_black_witch.png
diff --git a/public/static/img/mech/mf_blackbeard.png b/public/static/img/mech/mf_blackbeard.png
diff --git a/public/static/img/mech/mf_deaths_head.png b/public/static/img/mech/mf_deaths_head.png
diff --git a/public/static/img/mech/mf_drake.png b/public/static/img/mech/mf_drake.png
diff --git a/public/static/img/mech/mf_dusk_wing.png b/public/static/img/mech/mf_dusk_wing.png
diff --git a/public/static/img/mech/mf_genghis.png b/public/static/img/mech/mf_genghis.png
diff --git a/public/static/img/mech/mf_goblin.png b/public/static/img/mech/mf_goblin.png
diff --git a/public/static/img/mech/mf_gorgon.png b/public/static/img/mech/mf_gorgon.png
diff --git a/public/static/img/mech/mf_hydra.png b/public/static/img/mech/mf_hydra.png
diff --git a/public/static/img/mech/mf_iskander.png b/public/static/img/mech/mf_iskander.png
diff --git a/public/static/img/mech/mf_kobold.png b/public/static/img/mech/mf_kobold.png
diff --git a/public/static/img/mech/mf_lancaster.png b/public/static/img/mech/mf_lancaster.png
diff --git a/public/static/img/mech/mf_lich.png b/public/static/img/mech/mf_lich.png
diff --git a/public/static/img/mech/mf_manticore.png b/public/static/img/mech/mf_manticore.png
diff --git a/public/static/img/mech/mf_metalmark.png b/public/static/img/mech/mf_metalmark.png
diff --git a/public/static/img/mech/mf_minotaur.png b/public/static/img/mech/mf_minotaur.png
diff --git a/public/static/img/mech/mf_monarch.png b/public/static/img/mech/mf_monarch.png
diff --git a/public/static/img/mech/mf_mourning_cloak.png b/public/static/img/mech/mf_mourning_cloak.png
diff --git a/public/static/img/mech/mf_napoleon.png b/public/static/img/mech/mf_napoleon.png
diff --git a/public/static/img/mech/mf_nelson.png b/public/static/img/mech/mf_nelson.png
diff --git a/public/static/img/mech/mf_pegasus.png b/public/static/img/mech/mf_pegasus.png
diff --git a/public/static/img/mech/mf_raleigh.png b/public/static/img/mech/mf_raleigh.png
diff --git a/public/static/img/mech/mf_saladin.png b/public/static/img/mech/mf_saladin.png
diff --git a/public/static/img/mech/mf_sherman.png b/public/static/img/mech/mf_sherman.png
diff --git a/public/static/img/mech/mf_standard_pattern_i_everest.png b/public/static/img/mech/mf_standard_pattern_i_everest.png
diff --git a/public/static/img/mech/mf_sunzi.png b/public/static/img/mech/mf_sunzi.png
diff --git a/public/static/img/mech/mf_swallowtail.png b/public/static/img/mech/mf_swallowtail.png
diff --git a/public/static/img/mech/mf_tokugawa.png b/public/static/img/mech/mf_tokugawa.png
diff --git a/public/static/img/mech/mf_tortuga.png b/public/static/img/mech/mf_tortuga.png
diff --git a/public/static/img/mech/mf_vlad.png b/public/static/img/mech/mf_vlad.png
diff --git a/public/static/img/mech/mf_zheng.png b/public/static/img/mech/mf_zheng.png
diff --git a/public/static/img/mech/thunderhead.PNG b/public/static/img/mech/thunderhead.PNG
diff --git a/src/features/compendium/Views/Licenses.vue b/src/features/compendium/Views/Licenses.vue
@@ -78,7 +78,6 @@ export default Vue.extend({
   methods: {
     manufacturer(id: string) {
       const compendium = getModule(CompendiumStore, this.$store)
-      console.log(compendium.Manufacturers)
       return compendium.Manufacturers.find(x => x.ID === id)
     },
     frame(id: string) {

diff --git a/src/features/main_menu/_components/MainTitle.vue b/src/features/main_menu/_components/MainTitle.vue
@@ -13,7 +13,7 @@
         text-align: right;
       "
     >
-      <!-- <update-checker class="mt-2 mr-2" @mouseenter="$emit('logupdate')" /> -->
+      <update-checker class="mt-2 mr-2" @mouseenter="$emit('logupdate')" />
       <div
         style="
           display: inline-block;
@@ -85,11 +85,11 @@
 
 <script lang="ts">
 import Vue from "vue";
-// import UpdateChecker from './UpdateChecker.vue'
+import UpdateChecker from './UpdateChecker.vue'
 
 export default Vue.extend({
   name: "cci-banner",
-  // components: { UpdateChecker },
+  components: { UpdateChecker },
 });
 </script>
 

diff --git a/src/features/main_menu/mobile.vue b/src/features/main_menu/mobile.vue
@@ -59,9 +59,9 @@
             <span>v.{{ $appVersion }}</span>
           </div>
         </v-col>
-        <!-- <v-col cols="auto ml-auto">
+        <v-col cols="auto ml-auto">
           <update-checker small />
-        </v-col> -->
+        </v-col>
       </v-row>
       <v-row dense justify="space-around">
         <mobile-btn
@@ -129,7 +129,7 @@
 
 <script lang="ts">
 import Vue from "vue";
-// import UpdateChecker from './_components/UpdateChecker.vue'
+import UpdateChecker from './_components/UpdateChecker.vue'
 import MobileBtn from "./_components/MobileBtn.vue";
 import ContentPage from "../nav/pages/ExtraContent/index.vue";
 import CreditsPage from "../nav/pages/Credits.vue";
@@ -143,7 +143,7 @@ import SignIn from "./_components/login/index.vue";
 export default Vue.extend({
   name: "landing-page-mobile",
   components: {
-    // UpdateChecker,
+    UpdateChecker,
     MobileBtn,
     ContentPage,
     AboutPage,

diff --git a/src/features/pilot_management/PilotSheet/sections/mech/sections/OperatorNotes.vue b/src/features/pilot_management/PilotSheet/sections/mech/sections/OperatorNotes.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <cc-title small :color="color" style="margin-left: -60px!important">
+    <cc-title small :color="color" style="margin-left: -70px!important">
       <section-edit-icon label="Edit Operator Notes" @open-selector="show()" />
       Operator Notes
     </cc-title>

diff --git a/src/features/pilot_management/PilotSheet/sections/mech/sections/attributes/HasePips.vue b/src/features/pilot_management/PilotSheet/sections/mech/sections/attributes/HasePips.vue
@@ -7,7 +7,7 @@
     </cc-tooltip>
     <cc-synergy-display :location="attr" :mech="mech" class="d-inline" />
     <div v-if="$vuetify.breakpoint.lgAndUp" class="mt-n2 ml-1">
-      <span class="no-height ml-n1">
+      <span class="no-height">
         <v-icon
           v-for="n in val"
           :key="`hase_${attr}-${n}`"
@@ -16,7 +16,7 @@
           v-html="'mdi-hexagon'"
         />
       </span>
-      <span :class="`no-height ${val ? 'ml-n1' : ''}`">
+      <span class="no-height">
         <v-icon
           v-for="n in 6 - val"
           :key="`hase_${attr}-n${n}`"

diff --git a/src/features/pilot_management/PilotSheet/sections/narrative/components/DtResourcesBlock.vue b/src/features/pilot_management/PilotSheet/sections/narrative/components/DtResourcesBlock.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="my-3">
-    <cc-title small color="pilot" style="margin-left: -70px!important">
+    <cc-title small color="pilot" class="pl-3" style="margin-left: -70px!important">
       <section-edit-icon
         label="Add Reserves and Bonuses"
         @open-selector="$refs.dtSelector.show()"

diff --git a/src/router.ts b/src/router.ts
@@ -7,7 +7,7 @@ import compendiumRoutes from './features/compendium/routes'
 import { getModule } from 'vuex-module-decorators'
 import { NavStore, store } from '@/store'
 
-// import updateChecker from '@/util/UpdateChecker'
+import updateChecker from '@/util/UpdateChecker'
 
 Vue.use(Router)
 
@@ -62,8 +62,8 @@ r.beforeEach((to, from, next) => {
   next()
 })
 
-// r.afterEach((to, from) => {
-//   updateChecker.checkUpdates()
-// })
+r.afterEach((to, from) => {
+  updateChecker.checkUpdates()
+})
 
 export default r
diff --git a/src/ui/components/CCTitle.vue b/src/ui/components/CCTitle.vue
@@ -4,7 +4,7 @@
     :style="`width: max-content; background-color: ${getColor()};`"
   >
     <span
-      :class="`${this.$vuetify.breakpoint.smAndDown ? 'px-2' : 'pl-5 pr-5 pb-1'} ctitle${size} ${
+      :class="`${this.$vuetify.breakpoint.smAndDown ? 'px-2' : 'pr-5 pb-1'} pl-5 ctitle${size} ${
         dark ? 'white--text' : 'stark--text'
       }`"
     >

diff --git a/vue.config.js b/vue.config.js
@@ -1,10 +1,11 @@
 module.exports = {
   pwa: {
+    name: 'COMP/CON',
     themeColor: '#991E2A',
     iconPaths: {
       favicon16: 'img/icons/favicon-16x16.png',
       favicon32: 'img/icons/favicon-32x32.png',
-      appleTouchIcon: 'img/icons/apple-touch-iconpng',
+      appleTouchIcon: 'img/icons/apple-touch-icon.png',
       msTileImage: 'img/icons/192x192.png'
     }
   },

diff --git a/yarn.lock b/yarn.lock
@@ -11245,10 +11245,10 @@ vuetify-loader@^1.7.0:
     file-loader "^6.2.0"
     loader-utils "^2.0.0"
 
-[email protected]:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-2.4.0.tgz#6aa2616b0fecb0614cf85052b0ffbb5cad80bf92"
-  integrity sha512-FBFAtg1ZnNwDBhMzENCzgh0hBV+HMjXejrxeRQqTfKPojKQSQFswtdHatUPmlkArDulZC73GRs2F/IwdF48o5g==
+vuetify@^2.4.0:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-2.6.3.tgz#b33ede2da958a40c6ced0ad1f4eda737984b3967"
+  integrity sha512-Zfiz2DZnp1DvxqGaSCGqGjv4mPNAurJJ5Xwy7bzNzIySGLlRdlO8UH6aNWnSgfaAsLP3voxadSGDm6tKM8Ys7w==
 
 vuex-module-decorators@^0.10.1:
   version "0.10.1"