diff --git a/assets/fonts/suisse-intl/SuisseIntl-Black.otf b/assets/fonts/suisse-intl/SuisseIntl-Black.otf index 02b9053..9ac9272 100755 Binary files a/assets/fonts/suisse-intl/SuisseIntl-Black.otf and b/assets/fonts/suisse-intl/SuisseIntl-Black.otf differ diff --git a/assets/fonts/suisse-intl/SuisseIntl-BlackItalic.otf b/assets/fonts/suisse-intl/SuisseIntl-BlackItalic.otf index 106b921..024bd0d 100755 Binary files a/assets/fonts/suisse-intl/SuisseIntl-BlackItalic.otf and b/assets/fonts/suisse-intl/SuisseIntl-BlackItalic.otf differ diff --git a/assets/fonts/suisse-intl/SuisseIntl-Bold.otf b/assets/fonts/suisse-intl/SuisseIntl-Bold.otf index 91c3072..df409be 100755 Binary files a/assets/fonts/suisse-intl/SuisseIntl-Bold.otf and b/assets/fonts/suisse-intl/SuisseIntl-Bold.otf differ diff --git a/assets/fonts/suisse-intl/SuisseIntl-BoldItalic.otf b/assets/fonts/suisse-intl/SuisseIntl-BoldItalic.otf index 97501b1..08b8215 100755 Binary files a/assets/fonts/suisse-intl/SuisseIntl-BoldItalic.otf and b/assets/fonts/suisse-intl/SuisseIntl-BoldItalic.otf differ diff --git a/assets/fonts/suisse-intl/SuisseIntl-BookItalic.otf b/assets/fonts/suisse-intl/SuisseIntl-BookItalic.otf index a2ff0ff..2b11f54 100755 Binary files a/assets/fonts/suisse-intl/SuisseIntl-BookItalic.otf and b/assets/fonts/suisse-intl/SuisseIntl-BookItalic.otf differ diff --git a/assets/fonts/suisse-intl/SuisseIntl-Light.otf b/assets/fonts/suisse-intl/SuisseIntl-Light.otf index 6e3b28f..89de6c6 100755 Binary files a/assets/fonts/suisse-intl/SuisseIntl-Light.otf and b/assets/fonts/suisse-intl/SuisseIntl-Light.otf differ diff --git a/assets/fonts/suisse-intl/SuisseIntl-LightItalic.otf b/assets/fonts/suisse-intl/SuisseIntl-LightItalic.otf index e1a7284..38e4254 100755 Binary files a/assets/fonts/suisse-intl/SuisseIntl-LightItalic.otf and b/assets/fonts/suisse-intl/SuisseIntl-LightItalic.otf differ diff --git a/assets/fonts/suisse-intl/SuisseIntl-Medium.otf b/assets/fonts/suisse-intl/SuisseIntl-Medium.otf index 28c511a..4fba3a7 100755 Binary files a/assets/fonts/suisse-intl/SuisseIntl-Medium.otf and b/assets/fonts/suisse-intl/SuisseIntl-Medium.otf differ diff --git a/assets/fonts/suisse-intl/SuisseIntl-MediumItalic.otf b/assets/fonts/suisse-intl/SuisseIntl-MediumItalic.otf index 4ffcaed..9429d2f 100755 Binary files a/assets/fonts/suisse-intl/SuisseIntl-MediumItalic.otf and b/assets/fonts/suisse-intl/SuisseIntl-MediumItalic.otf differ diff --git a/assets/fonts/suisse-intl/SuisseIntl-Regular.otf b/assets/fonts/suisse-intl/SuisseIntl-Regular.otf index 7587f91..1852651 100755 Binary files a/assets/fonts/suisse-intl/SuisseIntl-Regular.otf and b/assets/fonts/suisse-intl/SuisseIntl-Regular.otf differ diff --git a/assets/fonts/suisse-intl/SuisseIntl-RegularItalic.otf b/assets/fonts/suisse-intl/SuisseIntl-RegularItalic.otf index 38ce52d..94254f7 100755 Binary files a/assets/fonts/suisse-intl/SuisseIntl-RegularItalic.otf and b/assets/fonts/suisse-intl/SuisseIntl-RegularItalic.otf differ diff --git a/assets/fonts/suisse-intl/SuisseIntl-SemiBold.otf b/assets/fonts/suisse-intl/SuisseIntl-SemiBold.otf index 4140cfb..abe4913 100755 Binary files a/assets/fonts/suisse-intl/SuisseIntl-SemiBold.otf and b/assets/fonts/suisse-intl/SuisseIntl-SemiBold.otf differ diff --git a/assets/fonts/suisse-intl/SuisseIntl-SemiBoldItalic.otf b/assets/fonts/suisse-intl/SuisseIntl-SemiBoldItalic.otf index 852a9fe..d75d4d2 100755 Binary files a/assets/fonts/suisse-intl/SuisseIntl-SemiBoldItalic.otf and b/assets/fonts/suisse-intl/SuisseIntl-SemiBoldItalic.otf differ diff --git a/assets/fonts/suisse-intl/SuisseIntl-Thin.otf b/assets/fonts/suisse-intl/SuisseIntl-Thin.otf index 21b1fca..3a9f222 100755 Binary files a/assets/fonts/suisse-intl/SuisseIntl-Thin.otf and b/assets/fonts/suisse-intl/SuisseIntl-Thin.otf differ diff --git a/assets/fonts/suisse-intl/SuisseIntl-ThinItalic.otf b/assets/fonts/suisse-intl/SuisseIntl-ThinItalic.otf index 90c960a..1ef759a 100755 Binary files a/assets/fonts/suisse-intl/SuisseIntl-ThinItalic.otf and b/assets/fonts/suisse-intl/SuisseIntl-ThinItalic.otf differ diff --git a/assets/fonts/suisse-intl/SuisseIntl-Ultralight.otf b/assets/fonts/suisse-intl/SuisseIntl-Ultralight.otf index ad18026..16d137b 100755 Binary files a/assets/fonts/suisse-intl/SuisseIntl-Ultralight.otf and b/assets/fonts/suisse-intl/SuisseIntl-Ultralight.otf differ diff --git a/assets/fonts/suisse-intl/SuisseIntl-UltralightItalic.otf b/assets/fonts/suisse-intl/SuisseIntl-UltralightItalic.otf index 141d95e..0cb2b87 100755 Binary files a/assets/fonts/suisse-intl/SuisseIntl-UltralightItalic.otf and b/assets/fonts/suisse-intl/SuisseIntl-UltralightItalic.otf differ diff --git a/modules/zero-components/button/components/button.vue b/modules/zero-components/button/components/button.vue index c75b403..378c59f 100644 --- a/modules/zero-components/button/components/button.vue +++ b/modules/zero-components/button/components/button.vue @@ -14,9 +14,6 @@ diff --git a/modules/zero-components/button/index.js b/modules/zero-components/button/index.js index a2427ab..bac99b9 100644 --- a/modules/zero-components/button/index.js +++ b/modules/zero-components/button/index.js @@ -2,10 +2,7 @@ export default { components: [ { file: 'button.vue', name: 'ZeroButton' } ], - plugins: [ - { file: 'button.js', name: 'zero-button' } - ], stores: [ - { file: 'button.js', name: 'zero-button-store' } + { file: 'button.js', name: 'useZeroButtonStore' } ] } diff --git a/modules/zero-components/button/plugins/button.js b/modules/zero-components/button/plugins/button.js deleted file mode 100644 index 65801de..0000000 --- a/modules/zero-components/button/plugins/button.js +++ /dev/null @@ -1,45 +0,0 @@ -// ///////////////////////////////////////////////////////////////////// Imports -// ----------------------------------------------------------------------------- -import CloneDeep from 'lodash.clonedeep' -import { defineNuxtPlugin } from '#imports' -import { useZeroButtonStore } from '../stores/button.js' - -// ////////////////////////////////////////////////////////////// [Class] Button -// ----------------------------------------------------------------------------- -const Button = (id, store) => { - let button = store.buttons[id] - return { - // ================================================================ register - async register () { - if (button) { return this.get() } - return await this.set({ id, loading: false }) - }, - - // ============================================================== deregister - async deregister () { - await store.removeButton(id) - }, - - // ===================================================================== get - get () { - return Object.assign(this, button) - }, - - // ===================================================================== set - async set (incoming) { - button = await store.setButton(Object.assign(CloneDeep(button || {}), incoming)) - return this.get() - } - } -} - -// ////////////////////////////////////////////////////////////////////// Export -// ----------------------------------------------------------------------------- -export default defineNuxtPlugin(() => { - const store = useZeroButtonStore() - return { - provide: { - button: (id) => Button(id, store) - } - } -}) diff --git a/modules/zero-components/button/stores/button.js b/modules/zero-components/button/stores/button.js index 0f61e02..23bed01 100644 --- a/modules/zero-components/button/stores/button.js +++ b/modules/zero-components/button/stores/button.js @@ -1,23 +1,26 @@ // ///////////////////////////////////////////////////////////////////// Imports // ----------------------------------------------------------------------------- import { defineStore } from 'pinia' -import { ref } from '#imports' +import { reactive } from '#imports' // /////////////////////////////////////////////////////////////////////// State // ----------------------------------------------------------------------------- -const buttons = ref({}) +const buttons = reactive([]) // ///////////////////////////////////////////////////////////////////// Actions // ----------------------------------------------------------------------------- -// /////////////////////////////////////////////////////////////////// setButton -const setButton = (payload) => { - buttons.value[payload.id] = payload - return payload +// ///////////////////////////////////////////////////////////////////////// set +const set = (payload) => { + const index = buttons.findIndex(button => button.id === payload.id) + index === -1 ? buttons.push(payload) : buttons.splice(index, 1, payload) } -// //////////////////////////////////////////////////////////////// removeButton -const removeButton = (id) => { - delete buttons.value[id] +// ////////////////////////////////////////////////////////////////////// remove +const remove = (id) => { + const index = buttons.findIndex(button => button.id === id) + if (id !== -1) { + buttons.splice(index, 1) + } } // ////////////////////////////////////////////////////////////////////// Export @@ -26,6 +29,6 @@ export const useZeroButtonStore = defineStore('zero-button', () => ({ // ----- state buttons, // ----- actions - setButton, - removeButton + set, + remove })) diff --git a/modules/zero-components/index.js b/modules/zero-components/index.js index 328971f..b564beb 100644 --- a/modules/zero-components/index.js +++ b/modules/zero-components/index.js @@ -50,6 +50,7 @@ const registerStores = (submodule, stores) => { stores.forEach((store) => { addImports({ name: store.name, + as: store.name, from: resolve(`${submodule}/stores/${store.file}`) }) }) diff --git a/nuxt.config.js b/nuxt.config.js index 5b7d4fb..4670640 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -8,7 +8,7 @@ const baseUrls = { production: 'https://singularity.storage/' } -const frontendPort = 10050 +const frontendPort = 10070 const seo = { siteName: 'Singularity', diff --git a/pages/index.vue b/pages/index.vue index fd6bdc9..45b6762 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -7,6 +7,7 @@