From 5e2e2ca9409b61c5dc553e1eab717d8d0c2dc387 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carsten=20Gr=C3=A4f?= Date: Wed, 20 Mar 2024 17:32:41 +0100 Subject: [PATCH 1/2] TAB-511 revisit "open tabs" --- .env.template | 8 +- .github/workflows/publish.yml | 1 - .gitignore | 1 + .publish.env | 2 - package.json | 10 +- src/components/BookmarksTree.vue | 20 +- src/components/layouts/OpenTabCard.vue | 10 +- src/components/layouts/OpenTabCard2.vue | 114 + .../sidepanel/SidePanelTabListHelper.vue | 2 +- src/components/views/TabDetails.vue | 7 - src/components/widgets/TabCardWidget.vue | 10 +- .../widgets/TabListElementWidget.vue | 16 +- src/domain/commands/CreateTabFromOpenTabs.ts | 3 + src/models/Tab.ts | 2 - src/pages/DynamicTabsetPage.vue | 2 +- src/pages/SidePanelPage.vue | 4 +- src/pages/SidePanelSpacesPage.vue | 19 +- .../sidepanel/SidePanelOpenTabsListViewer.vue | 408 +++- src/pages/sidepanel/SidePanelOpenTabsPage.vue | 70 + src/router/routes.ts | 12 +- src/services/ChromeListeners.ts | 7 +- src/services/TabsetService2.ts | 3 +- src/services/Utils.ts | 1 + src/stores/tabsStore.ts | 6 +- src/stores/windowsStore.ts | 8 +- yarn.lock | 2090 +++++++++-------- 26 files changed, 1650 insertions(+), 1186 deletions(-) create mode 100644 src/components/layouts/OpenTabCard2.vue create mode 100644 src/pages/sidepanel/SidePanelOpenTabsPage.vue diff --git a/.env.template b/.env.template index dd2eb709..821b534f 100644 --- a/.env.template +++ b/.env.template @@ -1,14 +1,10 @@ # check quasar.config.js as well!! -STAGE=DEV -FIREBASE_ACTIVE=true +STAGE=PRD +FIREBASE_ACTIVE=false -#BACKEND_URL="http://localhost:5001/tabsets-backend-prd/us-central1/app" -#BACKEND_URL="http://localhost:5001/bookmrkx-backend-dev/us-central1" BACKEND_URL="https://us-central1-bookmrkx-backend-dev.cloudfunctions.net" -LOGZ_URL="https://listener.logz.io:8071?token=..." - FIREBASE_PROJECT_ID="..." FIREBASE_AUTH_DOMAIN="..." FIREBASE_API_KEY="..." diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d2074b3a..2b6c31fd 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -22,7 +22,6 @@ jobs: echo FIREBASE_ACTIVE=false >> .env echo BACKEND_URL="https://us-central1-tabsets-backend-prd.cloudfunctions.net/app" >> .env echo TABSETS_PWA_URL="https://pwa.tabsets.net" >> .env - echo LOGZ_URL="https://listener.logz.io:8071?token=hpSuDcIXnsCtElvVuRpAztrDuRjuAoNj" >> .env echo FIREBASE_API_KEY="${{ secrets.FIREBASE_API_KEY }}" >> .env echo FIREBASE_AUTH_DOMAIN="tabsets-72089.firebaseapp.com" >> .env echo FIREBASE_PROJECT_ID="tabsets-72089" >> .env diff --git a/.gitignore b/.gitignore index 036d086f..57318d6e 100644 --- a/.gitignore +++ b/.gitignore @@ -70,4 +70,5 @@ yarn-error.log* /Tabsets - Manage Tabs and Bookmarks with Ease/ /.dev.env /.prd.env +/.env.tmp /.tabsets-backend-prd.env diff --git a/.publish.env b/.publish.env index 383d5437..049adf5e 100644 --- a/.publish.env +++ b/.publish.env @@ -13,8 +13,6 @@ STRIPE_API_VERSION="2022-11-15" LOCALE="de" STRIPE_SYNC_PRODUCT_LINK="https://buy.stripe.com/test_dR67sT1NC6iq7ew9AA" -LOGZ_URL="https://listener.logz.io:8071?token=hpSuDcIXnsCtElvVuRpAztrDuRjuAoNj" - FIREBASE_API_KEY=$FIREBASE_API_KEY FIREBASE_AUTH_DOMAIN="tabsets-72089.firebaseapp.com" FIREBASE_PROJECT_ID="tabsets-72089" diff --git a/package.json b/package.json index b2c31802..7d03cecf 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "build bex (prd)": "mv .env .env.tmp && cp .prd.env .env && quasar build -m bex && mv .env.tmp .env", "build bex (publish)": "quasar build -m bex", "build pwa": "quasar build -m pwa", - "build electron": "quasar build -m electron", + "build electron": "mv .env .env.tmp && cp .prd.env .env && quasar build -m electron && mv .env.tmp .env", "build capacitor": "quasar build -m capacitor -T ios", "icon": "icongenie generate -i src/assets/icon.png", "test": "echo \"See package.json => scripts for available tests.\" && exit 0", @@ -43,7 +43,7 @@ "@extractus/feed-extractor": "^7.0.1", "@intlify/unplugin-vue-i18n": "^3.0.0", "@mozilla/readability": "^0.5.0", - "@quasar/extras": "^1.16.6", + "@quasar/extras": "^1.16.9", "@stripe/stripe-js": "^3.0.3", "@types/lodash": "^4.14.182", "@types/pngjs": "^6.0.4", @@ -65,7 +65,7 @@ "pinia": "^2.0.11", "pixelmatch": "^5.3.0", "pngjs": "^7.0.0", - "quasar": "^2.14.4", + "quasar": "^2.15.1", "rangy": "^1.3.1", "regenerator-runtime": "^0.14.1", "sanitize-html": "^2.10.0", @@ -93,7 +93,7 @@ "@editorjs/table": "^2.2.2", "@electron/packager": "^18.1.3", "@playwright/test": "^1.27.1", - "@quasar/app-vite": "^1.4.3", + "@quasar/app-vite": "^1.8.0", "@quasar/babel-preset-app": "^2.0.2", "@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0", "@types/node": "^20.4.10", @@ -108,7 +108,7 @@ "canvas": "^2.11.0", "editorjs-alert": "^1.1.3", "editorjs-text-color-plugin": "^2.0.4", - "electron": "^29.1.0", + "electron": "^29.1.4", "electron-packager": "^17.1.1", "fake-indexeddb": "^5.0.1", "typescript": "^5.1.6", diff --git a/src/components/BookmarksTree.vue b/src/components/BookmarksTree.vue index 94452fee..86da03cb 100644 --- a/src/components/BookmarksTree.vue +++ b/src/components/BookmarksTree.vue @@ -40,13 +40,16 @@ v-model:expanded="useNotificationsStore().bookmarksExpanded"> diff --git a/src/components/layouts/OpenTabCard.vue b/src/components/layouts/OpenTabCard.vue index be7365d3..b006572c 100644 --- a/src/components/layouts/OpenTabCard.vue +++ b/src/components/layouts/OpenTabCard.vue @@ -1,13 +1,12 @@ diff --git a/src/pages/sidepanel/SidePanelOpenTabsListViewer.vue b/src/pages/sidepanel/SidePanelOpenTabsListViewer.vue index 69935ced..c0ef8745 100644 --- a/src/pages/sidepanel/SidePanelOpenTabsListViewer.vue +++ b/src/pages/sidepanel/SidePanelOpenTabsListViewer.vue @@ -1,116 +1,177 @@