Change favicon to match mobile icon

Change icon to gas pump icon instead of text
Add icon for mobile homescreens
2022-03-07 16:53:47 +01:00 · 2022-03-07 10:41:28 +01:00 · 2022-03-07 00:46:42 +01:00
5 changed files with 55 additions and 66 deletions
--- a/ui/public/hammond.png
+++ b/ui/public/hammond.png
--- a/ui/public/index.html
+++ b/ui/public/index.html
@@ -5,6 +5,7 @@
    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
    <meta name="viewport" content="width=device-width,initial-scale=1.0" />
    <link rel="shortcut icon" href="<%= webpackConfig.output.publicPath %>hammond.png" />
+    <link rel="apple-touch-icon" href="<%= webpackConfig.output.publicPath %>touch-icon.png" />
    <title><%= webpackConfig.name %></title>
  </head>
  <body>
--- a/ui/public/touch-icon.png
+++ b/ui/public/touch-icon.png
--- a/ui/src/router/views/initialize.vue
+++ b/ui/src/router/views/initialize.vue
@@ -21,27 +21,13 @@ export default {
        email: '',
        password: '',
        distanceUnit: 1,
-        currency: '',
+        currency: 'INR',
      },
    }
  },
  computed: {
    ...mapGetters('auth', ['isInitialized']),
    ...mapState('vehicles', ['currencyMasters', 'distanceUnitMasters']),
-    filteredCurrencyMasters() {
-      return this.currencyMasters.filter((option) => {
-        return (
-          option.namePlural
-            .toString()
-            .toLowerCase()
-            .indexOf(this.registerModel.currency.toLowerCase()) >= 0 ||
-          option.code
-            .toString()
-            .toLowerCase()
-            .indexOf(this.registerModel.currency.toLowerCase()) >= 0
-        )
-      })
-    },
  },
  mounted() {
    store.dispatch('vehicles/fetchMasters').then((data) => {})
@@ -153,9 +139,6 @@ export default {
        })
        .finally(() => (this.isWorking = false))
    },
-    formatCurrency(option) {
-      return `${option.namePlural} (${option.code})`
-    },
  },
 }
 </script>
@@ -165,10 +148,15 @@ export default {
    <div v-if="!migrationMode" class="box">
      <h1 class="title">Migrate from Clarkson</h1>
      <p>
-        If you have an existing Clarkson deployment and you want to migrate your data from that, press the following button.
+        If you have an existing Clarkson deployment and you want to migrate your data from that,
+        press the following button.
      </p>
      <br />
-      <b-field> <b-button type="is-primary" @click="migrationMode = 'clarkson'">Migrate from Clarkson</b-button></b-field>
+      <b-field>
+        <b-button type="is-primary" @click="migrationMode = 'clarkson'"
+          >Migrate from Clarkson</b-button
+        ></b-field
+      >
    </div>
    <div v-if="!migrationMode" class="box">
      <h1 class="title">Fresh Install</h1>
@@ -182,12 +170,21 @@ export default {
    </div>
    <div v-if="migrationMode === 'clarkson'" class="box content">
      <h1 class="title">Migrate from Clarkson</h1>
-      <p>You need to make sure that this deployment of Hammond can access the MySQL database used by Clarkson.</p>
-      <p>If that is not directly possible, you can make a copy of that database somewhere accessible from this instance.</p>
-      <p>Once that is done, enter the connection string to the MySQL instance in the following format.</p>
      <p
-        >All the users imported from Clarkson will have their username as their email in Clarkson database and pasword set to
-        <span class="" style="font-weight:bold">hammond</span></p
+        >You need to make sure that this deployment of Hammond can access the MySQL database used by
+        Clarkson.</p
+      >
+      <p
+        >If that is not directly possible, you can make a copy of that database somewhere accessible
+        from this instance.</p
+      >
+      <p
+        >Once that is done, enter the connection string to the MySQL instance in the following
+        format.</p
+      >
+      <p
+        >All the users imported from Clarkson will have their username as their email in Clarkson
+        database and pasword set to <span class="" style="font-weight:bold">hammond</span></p
      >
      <code>
        user:pass@tcp(127.0.0.1:3306)/dbname?charset=utf8mb4&parseTime=True&loc=Local
@@ -203,8 +200,15 @@ export default {
      </b-field>

      <div class="buttons">
-        <b-button v-if="!testSuccess" type="is-primary" :disabled="isWorking" @click="testConnection">Test Connection</b-button
-        ><b-button v-if="testSuccess" type="is-success" :disabled="isWorking" @click="migrate">Migrate</b-button>
+        <b-button
+          v-if="!testSuccess"
+          type="is-primary"
+          :disabled="isWorking"
+          @click="testConnection"
+          >Test Connection</b-button
+        ><b-button v-if="testSuccess" type="is-success" :disabled="isWorking" @click="migrate"
+          >Migrate</b-button
+        >
        <b-button type="is-danger is-light" @click="resetMigrationMode">Cancel</b-button>
      </div>
    </div>
@@ -218,22 +222,28 @@ export default {
          <b-input v-model="registerModel.email" type="email" required></b-input>
        </b-field>
        <b-field label="Your Password">
-          <b-input v-model="registerModel.password" type="password" required minlength="8" password-reveal></b-input>
+          <b-input
+            v-model="registerModel.password"
+            type="password"
+            required
+            minlength="8"
+            password-reveal
+          ></b-input>
        </b-field>
        <b-field label="Currency">
-          <b-autocomplete
-            v-model="registerModel.currency"
-            :custom-formatter="formatCurrency"
-            placeholder="Currency"
-            :data="filteredCurrencyMasters"
-            :keep-first="true"
-            :open-on-focus="true"
-            required
-            @select="(option) => (selected = option)"
-          ></b-autocomplete>
+          <b-select v-model="registerModel.currency" placeholder="Currency" required expanded>
+            <option v-for="option in currencyMasters" :key="option.code" :value="option.code">
+              {{ `${option.namePlural} (${option.code})` }}
+            </option>
+          </b-select>
        </b-field>
        <b-field label="Distance Unit">
-          <b-select v-model.number="registerModel.distanceUnit" placeholder="Distance Unit" required expanded>
+          <b-select
+            v-model.number="registerModel.distanceUnit"
+            placeholder="Distance Unit"
+            required
+            expanded
+          >
            <option v-for="(option, key) in distanceUnitMasters" :key="key" :value="key">
              {{ `${option.long} (${option.short})` }}
            </option>
--- a/ui/src/router/views/settings.vue
+++ b/ui/src/router/views/settings.vue
@@ -44,20 +44,6 @@ export default {

      return this.changePassModel.new === this.changePassModel.renew
    },
-    filteredCurrencyMasters() {
-      return this.currencyMasters.filter((option) => {
-        return (
-          option.namePlural
-            .toString()
-            .toLowerCase()
-            .indexOf(this.settingsModel.currency.toLowerCase()) >= 0 ||
-          option.code
-            .toString()
-            .toLowerCase()
-            .indexOf(this.settingsModel.currency.toLowerCase()) >= 0
-        )
-      })
-    },
  },
  methods: {
    changePassword() {
@@ -123,9 +109,6 @@ export default {
          this.tryingToSave = false
        })
    },
-    formatCurrency(option) {
-      return `${option.namePlural} (${option.code})`
-    },
  },
 }
 </script>
@@ -140,16 +123,11 @@ export default {
            These will be used as default values whenever you create a new fillup or expense.
          </h1>
          <b-field label="Currency">
-            <b-autocomplete
-              v-model="settingsModel.currency"
-              :custom-formatter="formatCurrency"
-              placeholder="Currency"
-              :data="filteredCurrencyMasters"
-              :keep-first="true"
-              :open-on-focus="true"
-              required
-              @select="(option) => (selected = option)"
-            ></b-autocomplete>
+            <b-select v-model="settingsModel.currency" placeholder="Currency" required expanded>
+              <option v-for="option in currencyMasters" :key="option.code" :value="option.code">
+                {{ `${option.namePlural} (${option.code})` }}
+              </option>
+            </b-select>
          </b-field>
          <b-field label="Distance Unit">
            <b-select v-model.number="settingsModel.distanceUnit" placeholder="Distance Unit" required expanded>
Author	SHA1	Message	Date
Alf Sebastian Houge	74e52c3e87	Change favicon to match mobile icon	2022-03-07 16:53:47 +01:00
Alf Sebastian Houge	1857bb0518	Change icon to gas pump icon instead of text	2022-03-07 10:41:28 +01:00
Alf Sebastian Houge	a729b5eb12	Add icon for mobile homescreens	2022-03-07 00:46:42 +01:00