From 23fd4779bf27d32deb5578954f37ccecbc358d92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carsten=20Gr=C3=A4f?= Date: Mon, 18 Mar 2024 10:38:07 +0100 Subject: [PATCH] layout and config fix --- quasar.config.js | 4 ++-- src-bex/background.ts | 2 +- src/App.vue | 4 ++-- src/components/BookmarksTree.vue | 11 ++++++++- .../helper/SidePanelFooterLeftButton.vue | 2 +- .../helper/SidePanelFooterLeftButtons.vue | 2 +- src/i18n/de/de.json | 4 ++-- src/i18n/en/en.json | 4 +++- src/pages/SidePanelPage.vue | 4 +--- .../sidepanel/SidePanelBookmarksPage.vue | 24 +++++++++---------- src/pages/sidepanel/SidePanelTop10Page.vue | 2 +- src/pages/sidepanel/WelcomePage.vue | 13 ++++++++++ src/stores/bookmarksStore.ts | 3 +++ src/stores/uiStore.ts | 2 ++ 14 files changed, 54 insertions(+), 27 deletions(-) diff --git a/quasar.config.js b/quasar.config.js index 2f1e3ed3..e13bdb7f 100644 --- a/quasar.config.js +++ b/quasar.config.js @@ -43,7 +43,7 @@ module.exports = configure(function (ctx) { // 'ionicons-v4', // 'mdi-v5', // 'fontawesome-v6', - // 'eva-icons', + 'eva-icons', // 'themify', // 'line-awesome', // 'roboto-font-latin-ext', // this or either 'roboto-font', NEVER both! @@ -143,7 +143,7 @@ module.exports = configure(function (ctx) { framework: { config: {}, - // iconSet: 'material-icons', // Quasar icon set + iconSet: 'eva-icons', // lang: 'en-US', // Quasar language pack // For special cases outside of where the auto-import strategy can have an impact diff --git a/src-bex/background.ts b/src-bex/background.ts index 581aa2bd..78e46b09 100644 --- a/src-bex/background.ts +++ b/src-bex/background.ts @@ -107,7 +107,7 @@ chrome.runtime.onConnect.addListener(function (port) { export default bexBackground((bridge, cons/* , allActiveConnections */) => { - if (process.env.USE_FIREBASE) { + if (process.env.USE_FIREBASE == "true") { //console.debug("[service-worker] about to obtain cloud messaging token") const firebaseApp = firebase.initializeApp({ diff --git a/src/App.vue b/src/App.vue index 5cf869f5..ae5b0ba6 100644 --- a/src/App.vue +++ b/src/App.vue @@ -27,7 +27,7 @@ const {info} = useLogger() const emitter = new EventEmitter() emitter.setMaxListeners(12) -if (process.env.USE_FIREBASE) { +if (process.env.USE_FIREBASE == "true") { FirebaseServices.init() } @@ -63,7 +63,7 @@ if (inBexMode()) { }) } -if (process.env.USE_FIREBASE) { +if (process.env.USE_FIREBASE == "true") { const auth = FirebaseServices.getAuth() onAuthStateChanged(auth, async (user) => { if (user) { diff --git a/src/components/BookmarksTree.vue b/src/components/BookmarksTree.vue index 8aa96ab3..94452fee 100644 --- a/src/components/BookmarksTree.vue +++ b/src/components/BookmarksTree.vue @@ -21,8 +21,15 @@ +
+ +
+ diff --git a/src/i18n/de/de.json b/src/i18n/de/de.json index 747dacf8..5e9beae7 100644 --- a/src/i18n/de/de.json +++ b/src/i18n/de/de.json @@ -7,10 +7,10 @@ "documentation": "Dokumentation", "experimental": "experimental", "language": "Sprache", - "no_space_selected": "Kein Space ausgewählt", + "no_space_selected": "Kein Space gewählt", "no_special_chars_and_length": "Bitte nur Standardzeichen, max. Länge ist 32", "optionally": "Optional:", - "provide_name_add_later": "Vergebe einen Namen und füge die Tabs später hinzu", + "provide_name_add_later": "Vergebe einen Namen (und füge die Tabs später hinzu)", "tabset_name": "Tabset Name", "welcome_to_tabsets": "Willkommen zu Tabsets" } diff --git a/src/i18n/en/en.json b/src/i18n/en/en.json index 526b3dfb..afe65c39 100644 --- a/src/i18n/en/en.json +++ b/src/i18n/en/en.json @@ -11,7 +11,9 @@ "no_space_selected": "No Space selected", "no_special_chars_and_length": "Please do not use special Characters, maximum length is 32", "optionally": "Optionally", - "provide_name_add_later": "Provide a name and add tabs later", + "one_line_about_tabsets1": "Mange your links:", + "one_line_about_tabsets2": "locally and private or synced and safe", + "provide_name_add_later": "provide a name (and add tabs later)", "tabset_name": "Tabset name", "welcome_to_tabsets": "Welcome to Tabsets" } diff --git a/src/pages/SidePanelPage.vue b/src/pages/SidePanelPage.vue index 39709ab5..55f32e45 100644 --- a/src/pages/SidePanelPage.vue +++ b/src/pages/SidePanelPage.vue @@ -20,9 +20,7 @@ - + diff --git a/src/pages/sidepanel/SidePanelBookmarksPage.vue b/src/pages/sidepanel/SidePanelBookmarksPage.vue index 66421b9d..acf89661 100644 --- a/src/pages/sidepanel/SidePanelBookmarksPage.vue +++ b/src/pages/sidepanel/SidePanelBookmarksPage.vue @@ -51,17 +51,17 @@ onMounted(() => { Analytics.firePageViewEvent('SidePanelBookmarksPage', document.location.href); }) -const onMessageListener = async (message: any, sender: any, sendResponse: any) => { - console.log(" <<< received message", message) - if (message.name === "sidepanel-switch-view") { - // const tsId = message.data.changedTabsetId - // await useTabsetService().reloadTabset(tsId) - // console.log("tsId", tsId) - // sortedSpaces.value = getSortedSpaces() - // tabsetsForSpaces.value = await getTabsetsForSpaces() - // randomKey.value = uid() - // //console.log("tabsetsForSpace", tabsetsForSpaces.value) - } -} +// const onMessageListener = async (message: any, sender: any, sendResponse: any) => { +// console.log(" <<< received message", message) +// if (message.name === "sidepanel-switch-view") { +// // const tsId = message.data.changedTabsetId +// // await useTabsetService().reloadTabset(tsId) +// // console.log("tsId", tsId) +// // sortedSpaces.value = getSortedSpaces() +// // tabsetsForSpaces.value = await getTabsetsForSpaces() +// // randomKey.value = uid() +// // //console.log("tabsetsForSpace", tabsetsForSpaces.value) +// } +// } diff --git a/src/pages/sidepanel/SidePanelTop10Page.vue b/src/pages/sidepanel/SidePanelTop10Page.vue index 1f5a5ecb..a205a710 100644 --- a/src/pages/sidepanel/SidePanelTop10Page.vue +++ b/src/pages/sidepanel/SidePanelTop10Page.vue @@ -88,7 +88,7 @@ watchEffect(() => { loading.value = true setTimeout(() => { top10.value = _.orderBy( - _.flatMap([...tabsStore.tabsets.values()], + _.flatMap([...tabsStore.tabsets.values()] as Tabset[], (tabset: Tabset) => _.flatMap(tabset.tabs)), (t: Tab) => t.activatedCount, "desc") diff --git a/src/pages/sidepanel/WelcomePage.vue b/src/pages/sidepanel/WelcomePage.vue index 1b205ec2..78ccc4e0 100644 --- a/src/pages/sidepanel/WelcomePage.vue +++ b/src/pages/sidepanel/WelcomePage.vue @@ -12,6 +12,10 @@
{{ t('welcome_to_tabsets') }} {{ stageIdentifier() }}
+ + + +
@@ -23,6 +27,7 @@ { } + + diff --git a/src/stores/bookmarksStore.ts b/src/stores/bookmarksStore.ts index fca9f237..3b198365 100644 --- a/src/stores/bookmarksStore.ts +++ b/src/stores/bookmarksStore.ts @@ -3,6 +3,7 @@ import _ from "lodash"; import {TreeNode} from "src/models/Tree"; import {Bookmark} from "src/models/Bookmark"; import {useUtils} from "src/services/Utils"; +import {useUiStore} from "stores/uiStore"; function nodesFrom( parent: chrome.bookmarks.BookmarkTreeNode, @@ -92,6 +93,7 @@ export const useBookmarksStore = defineStore('bookmarks', { this.initListeners() }, async loadBookmarks(): Promise { + useUiStore().bookmarksLoading = true this.bookmarksTree = [] this.bookmarksNodes = [] this.bookmarksNodes2 = [] @@ -117,6 +119,7 @@ export const useBookmarksStore = defineStore('bookmarks', { this.foldersCount = nodes[1] this.bookmarksCount = nodes[2] + useUiStore().bookmarksLoading = false return Promise.resolve() diff --git a/src/stores/uiStore.ts b/src/stores/uiStore.ts index c8641e0d..135b5a68 100644 --- a/src/stores/uiStore.ts +++ b/src/stores/uiStore.ts @@ -144,6 +144,7 @@ export const useUiStore = defineStore('ui', () => { const selectedTag = ref(undefined) const tabsetsExpanded = ref(false) const appLoading = ref(undefined) + const bookmarksLoading = ref(false) const progress = ref(undefined) // online offline @@ -604,6 +605,7 @@ export const useUiStore = defineStore('ui', () => { networkOnline, tabBeingDragged, appLoading, + bookmarksLoading, progress, setProgress, animateNewTabsetButton,