import-generic view and route added

ui/src/locales/de.json

@@ -137,7 +137,7 @@
     "dontimportagain": "Achte darauf, dass du die Datei nicht erneut importierst, da dies zu mehrfachen Einträgen führen würde.",
     "checkpointsimportcsv": "Wenn du alle diese Punkte überprüft hast kannst du unten die CSV importieren.",
     "importhintunits": "Vergewissere dich ebenfalls, dass die <u>Kraftstoffeinheit</u> und der <u>Kraftstofftyp</u> im Fahrzeug richtig eingestellt sind.",
-    "importhintcurrdist": "Stelle sicher, dass die <u>Währung</u> und die <u>Entfernungseinheit</u> in Hammond korrekt eingestellt sind. Der Import erkennt die Währung nicht automatisch aus der CSV-Datei, sondern verwendet die für den Benutzer eingestellte Währung.",
+    "importhintcurrdist": "Stelle sicher, dass die <u>Währung</u> und die <u>Entfernungseinheit</u> in Hammond korrekt eingestellt sind. Der Import erkennt die Währung nicht automatisch aus der datei, sondern verwendet die für den Benutzer eingestellte Währung.",
     "importhintnickname": "Vergewissere dich, dass der Fahrzeugname in Hammond genau mit dem Namen in der Fuelly-CSV-Datei übereinstimmt, sonst funktioniert der Import nicht.",
     "importhintvehiclecreated": "Vergewissere dich, dass du die Fahrzeuge bereits in Hammond erstellt hast.",
     "importhintcreatecsv": "Exportiere deine Daten aus {name} im CSV-Format. Die Schritte dazu findest du",

ui/src/locales/en.json

@@ -130,6 +130,8 @@
     "importdatadesc": "Choose from the following options to import data into Hammond",
     "import": "Import",
     "importcsv": "If you have been using {name} to store your vehicle data, export the CSV file from {name} and click here to import.",
+    "importgeneric": "Generic Import",
+    "importgenericdesc": "Generic csv and json import.",
     "choosecsv": "Choose CSV",
     "choosephoto": "Choose Photo",
     "importsuccessfull": "Data Imported Successfully",
@@ -137,13 +139,15 @@
     "importfrom": "Import from {0}",
     "stepstoimport": "Steps to import data from {name}",
     "choosecsvimport": "Choose the {name} CSV and press the import button.",
+    "choosedatafile": "Choose the CSV or JSON file and then press the import button.",
     "dontimportagain": "Make sure that you do not import the file again because that will create repeat entries.",
     "checkpointsimportcsv": "Once you have checked all these points, just import the CSV below.",
     "importhintunits": "Similiarly, make sure that the <u>Fuel Unit</u> and <u>Fuel Type</u> are correctly set in the Vehicle.",
-    "importhintcurrdist": "Make sure that the <u>Currency</u> and <u>Distance Unit</u> are set correctly in Hammond. Import will not autodetect Currency from the CSV but use the one set for the user.",
+    "importhintcurrdist": "Make sure that the <u>Currency</u> and <u>Distance Unit</u> are set correctly in Hammond. Import will not autodetect Currency from the file but use the one set for the user.",
     "importhintnickname": "Make sure that the Vehicle nickname in Hammond is exactly the same as the name on Fuelly CSV or the import will not work.",
     "importhintvehiclecreated": "Make sure that you have already created the vehicles in Hammond platform.",
     "importhintcreatecsv": "Export your data from {name} in the CSV format. Steps to do that can be found",
+    "importgenerichintdata": "Data must be in either CSV or JSON format.",
     "here": "here",
     "unprocessedquickentries": "You have one quick entry to be processed. | You have {0} quick entries pending to be processed.",
     "show": "Show",

ui/src/router/routes.js

@@ -419,6 +419,15 @@ export default [
     },
     props: (route) => ({ user: store.state.auth.currentUser || {} }),
   },
+  {
+    path: '/import/generic',
+    name: 'import-generic',
+    component: () => lazyLoadView(import('@views/import-generic.vue')),
+    meta: {
+      authRequired: true,
+    },
+    props: (route) => ({ user: store.state.auth.currentUser || {} }),
+  },
   {
     path: '/logout',
     name: 'logout',

ui/src/router/views/import-generic.unit.js

@@ -0,0 +1,7 @@
+import ImportGeneric from './import-generic'
+
+describe('@views/import-generic', () => {
+  it('is a valid view', () => {
+    expect(ImportGeneric).toBeAViewComponent()
+  })
+})

ui/src/router/views/import-generic.vue

@@ -0,0 +1,18 @@
+<script>
+import Layout from '@layouts/main.vue'
+
+export default {
+  page: {
+    title: 'Import Generic',
+    meta: [{ name: 'description', content: 'The Import Generic page.' }],
+  },
+  components: { Layout }
+}
+</script>
+
+<template>
+  <Layout>
+    Import Generic
+  </Layout>
+</template>
+

ui/src/router/views/import.vue

@@ -18,18 +18,19 @@ export default {
 
 <template>
   <Layout>
-    <div class="columns box"
-      ><div class="column">
+    <div class="columns box">
+      <div class="column">
         <h1 class="title">{{ $t('importdata') }}</h1>
         <p class="subtitle">{{ $t('importdatadesc') }}</p>
-      </div></div
-    >
+      </div>
+    </div>
     <br />
     <div class="columns">
       <div class="column is-one-third">
         <div class="box">
           <h1 class="title">Fuelly</h1>
-          <p>If you have been using Fuelly to store your vehicle data, export the CSV file from Fuelly and click here to import.</p>
+          <p>If you have been using Fuelly to store your vehicle data, export the CSV file from Fuelly and click here to
+            import.</p>
           <br />
           <b-button type="is-primary" tag="router-link" to="/import/fuelly">{{ $t('import') }}</b-button>
         </div>
@@ -43,6 +44,16 @@ export default {
           <b-button type="is-primary" tag="router-link" to="/import/drivvo">{{ $t('import') }}</b-button>
         </div>
       </div>
+
+
+      <div class="column is-one-third" to="/import-generic">
+        <div class="box">
+          <h1 class="title">{{ $t('importgeneric') }}</h1>
+          <p>{{ $t('importgenericdesc') }}</p>
+          <br />
+          <b-button type="is-primary" tag="router-link" to="/import/generic">{{ $t('import') }}</b-button>
+        </div>
+      </div>
     </div>
   </Layout>
 </template>