@abi-software/mapintegratedvuer 0.7.1-auth.2 → 0.7.1-auth.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/mapintegratedvuer",
-  "version": "0.7.1-auth.2",
+  "version": "0.7.1-auth.4",
   "license": "Apache-2.0",
   "scripts": {
     "serve": "vite --host --force",
@@ -42,7 +42,7 @@
     "*.js"
   ],
   "dependencies": {
-    "@abi-software/flatmapvuer": "^0.6.1-auth.2",
+    "@abi-software/flatmapvuer": "^0.6.1-auth.5",
     "@abi-software/map-side-bar": "^1.7.0-vue3.4",
     "@abi-software/plotvuer": "^0.4.0-vue-3-alpha.10",
     "@abi-software/scaffoldvuer": "^0.4.0-vue3.6",

package/src/components/viewers/Flatmap.vue

@@ -16,7 +16,6 @@
     :enableOpenMapUI="true"
     :flatmapAPI="flatmapAPI"
     :sparcAPI="apiLocation"
-    :userApiKey="userApiKey"
     @open-map="openMap"
   />
 </template>

package/src/components/viewers/MultiFlatmap.vue

@@ -15,7 +15,6 @@
     :openMapOptions="openMapOptions"
     :flatmapAPI="flatmapAPI"
     :sparcAPI="apiLocation"
-    :userApiKey="userApiKey"
     @pan-zoom-callback="flatmapPanZoomCallback"
     @open-map="openMap"
   />

package/src/components/viewers/Scaffold.vue

@@ -21,7 +21,6 @@
     :view-u-r-l="entry.viewUrl"
     :markerLabels="markerLabels"
     :flatmapAPI="flatmapAPI"
-    :userApiKey="userApiKey"
   />
 </template>
 

package/src/main.js

@@ -3,6 +3,7 @@ import { createApp } from 'vue'
 import { createPinia } from 'pinia'
 import * as VueRouter from 'vue-router'
 import App from './App.vue'
+import { useMainStore } from './stores/index'
 
 const routes = [
   { path: '/'},
@@ -20,3 +21,5 @@ const app = createApp(App)
 app.use(pinia)
 app.use(router)
 app.mount('#app')
+
+useMainStore()

package/src/mixins/ContentMixin.js

@@ -9,7 +9,6 @@ import markerZoomLevels from "../components/markerZoomLevelsHardCoded.js";
 import { mapStores } from 'pinia';
 import { useSettingsStore } from '../stores/settings';
 import { useSplitFlowStore } from '../stores/splitFlow';
-import { useMainStore } from '@/store/index';
 
 function capitalise(text) {
   return text[0].toUpperCase() + text.substring(1)
@@ -33,13 +32,10 @@ export default {
     },
   },
   computed: {
-    ...mapStores(useSettingsStore, useSplitFlowStore, useMainStore),
+    ...mapStores(useSettingsStore, useSplitFlowStore),
     syncMode() {
       return this.splitFlowStore.syncMode;
     },
-    userApiKey() {
-      return this.mainStore.userToken;
-    }
   },
   mounted: function () {
     EventBus.on("startHelp", () => {
@@ -432,7 +428,6 @@ export default {
     };
   },
   created: function () {
-    console.log("🚀 ~ useMainStore:", useMainStore())
     this.flatmapAPI = undefined;
     this.apiLocation = undefined;
     if (this.settingsStore.flatmapAPI)

package/src/stores/index.js

@@ -1,16 +1,14 @@
-import Vue from 'vue';
-import Vuex from 'vuex';
-import entries from './modules/entries';
-import settings from './modules/settings';
-import splitFlow from './modules/splitFlow';
-Vue.use(Vuex);
+import { defineStore } from 'pinia'
 
-export const store = new Vuex.Store({
-  modules: {
-    entries,
-    splitFlow,
-    settings,
-  }
-});
-
-export default store;
+export const useMainStore = defineStore('main', {
+  state: () => ({
+    userProfile: {
+      token: ''
+    },
+  }),
+  getters: {
+    userToken(state) {
+      return state.userProfile.token
+    },
+  },
+})

package/vite.config.js

@@ -32,11 +32,6 @@ export default defineConfig(({ command, mode }) => {
         // https://github.com/antfu/unocss
         // see unocss.config.ts for config
     ],
-    resolve: {
-      alias: {
-        '@': path.resolve(__dirname, './src'),
-      }
-    },
     build: {
       lib: {
         entry: path.resolve(__dirname, "./src/components/index.js"),

package/src/store/index.js

@@ -1,20 +0,0 @@
-import { defineStore } from 'pinia'
-
-export const useMainStore = defineStore('main', {
-  state: () => ({
-    userProfile: {
-      token: ''
-    }
-  }),
-  getters: {
-    userToken(state) {
-      return state.userProfile.token
-    },
-  },
-  actions: {
-
-  },
-  persist: {
-
-  }
-})