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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/mapintegratedvuer",
-  "version": "0.7.1-auth.0",
+  "version": "0.7.1-auth.2",
   "license": "Apache-2.0",
   "scripts": {
     "serve": "vite --host --force",
@@ -42,12 +42,12 @@
     "*.js"
   ],
   "dependencies": {
-    "@abi-software/flatmapvuer": "^0.6.1-auth.0",
+    "@abi-software/flatmapvuer": "^0.6.1-auth.2",
     "@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",
     "@abi-software/simulationvuer": "^0.7.0-vue-3-alpha.5",
-    "@abi-software/svg-sprite": "^0.4.0-vue3.3",
+    "@abi-software/svg-sprite": "^0.4.0-vue3-beta.0",
     "@cypress/vite-dev-server": "^5.0.7",
     "@element-plus/icons-vue": "^2.3.1",
     "@pinia/testing": "^0.1.3",

package/src/App.vue

@@ -85,7 +85,6 @@ export default {
         flatmapAPI: import.meta.env.VITE_FLATMAPAPI_LOCATION,
         nlLinkPrefix: import.meta.env.VITE_NL_LINK_PREFIX,
         rootUrl: import.meta.env.VITE_ROOT_URL,
-        userToken: '',
       }
     }
   },

package/src/components/MapContent.vue

@@ -233,7 +233,6 @@ export default {
       this.options.flatmapAPI ? this.settingsStore.updateFlatmapAPI(this.options.flatmapAPI) : null,
       this.options.nlLinkPrefix ? this.settingsStore.updateNLLinkPrefix(this.options.nlLinkPrefix) : null
       this.options.rootUrl ? this.settingsStore.updateRootUrl(this.options.rootUrl) : null
-      this.options.userToken ? this.settingsStore.updateUserToken(this.options.userToken) : null
     }
   },
   mounted: async function() {

package/src/components/viewers/Scaffold.vue

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

package/src/mixins/ContentMixin.js

@@ -9,6 +9,7 @@ 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)
@@ -32,10 +33,13 @@ export default {
     },
   },
   computed: {
-    ...mapStores(useSettingsStore, useSplitFlowStore),
+    ...mapStores(useSettingsStore, useSplitFlowStore, useMainStore),
     syncMode() {
       return this.splitFlowStore.syncMode;
     },
+    userApiKey() {
+      return this.mainStore.userToken;
+    }
   },
   mounted: function () {
     EventBus.on("startHelp", () => {
@@ -428,14 +432,12 @@ export default {
     };
   },
   created: function () {
+    console.log("🚀 ~ useMainStore:", useMainStore())
     this.flatmapAPI = undefined;
     this.apiLocation = undefined;
-    this.userApiKey = undefined;
     if (this.settingsStore.flatmapAPI)
       this.flatmapAPI = this.settingsStore.flatmapAPI;
     if (this.settingsStore.sparcApi)
       this.apiLocation = this.settingsStore.sparcApi;
-    if (this.settingsStore.userToken)
-      this.userApiKey = this.settingsStore.userToken;
   },
 };

package/src/store/index.js

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

package/src/stores/settings.js

@@ -14,7 +14,6 @@ export const useSettingsStore = defineStore('settings', {
       flatmapAPI: undefined,
       nlLinkPrefix: undefined,
       rootUrl: undefined,
-      userToken: undefined,
       facets: { species: [], gender: [], organ: [] },
       facetLabels: [],
       markers: [],
@@ -65,9 +64,6 @@ export const useSettingsStore = defineStore('settings', {
     updateRootUrl(rootUrl) {
       this.rootUrl = rootUrl;
     },
-    updateUserToken(userToken) {
-      this.userToken = userToken;
-    },
     updateMarkers(markers) {
       this.markers = markers;
     },

package/vite.config.js

@@ -1,5 +1,4 @@
 import path from "path";
-const pathSrc = path.resolve(__dirname, "./src");
 import { defineConfig } from 'vite'
 import vue from '@vitejs/plugin-vue'
 import Components from 'unplugin-vue-components/vite'
@@ -33,6 +32,11 @@ 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"),