@abi-software/mapintegratedvuer 0.7.1-auth.1 → 0.7.1-auth.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/mapintegratedvuer",
-  "version": "0.7.1-auth.1",
+  "version": "0.7.1-auth.3",
   "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.4",
     "@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/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: undefined,
       }
     }
   },

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/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

@@ -430,12 +430,9 @@ export default {
   created: function () {
     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/stores/index.js

@@ -1,16 +1,15 @@
-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: ''
+    },
+    marker: 'mapintegratedvuer marker'
+  }),
+  getters: {
+    userToken(state) {
+      return state.userProfile.token
+    },
+  },
+})

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'