From 0b9a66c222b968d7ef3666c786a37cdbbd5e9f21 Mon Sep 17 00:00:00 2001 From: Disha Date: Mon, 7 Feb 2022 14:25:37 +0530 Subject: [PATCH 01/13] Added firebase auto deployment configuration(#20d6xcu) --- .firebaserc | 14 +++++++++++ .github/workflows/firebase-hosting-merge.yml | 26 ++++++++++++++++++++ firebase.json | 17 +++++++++++++ 3 files changed, 57 insertions(+) create mode 100644 .firebaserc create mode 100644 .github/workflows/firebase-hosting-merge.yml create mode 100644 firebase.json diff --git a/.firebaserc b/.firebaserc new file mode 100644 index 00000000..bde4b7d1 --- /dev/null +++ b/.firebaserc @@ -0,0 +1,14 @@ +{ + "projects": { + "default": "hotwax-digital-commerce" + }, + "targets": { + "hotwax-digital-commerce": { + "hosting": { + "commerce-hub-dev": [ + "dev-commerce-hub" + ] + } + } + } +} \ No newline at end of file diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml new file mode 100644 index 00000000..9fbed171 --- /dev/null +++ b/.github/workflows/firebase-hosting-merge.yml @@ -0,0 +1,26 @@ +# This file was auto-generated by the Firebase CLI +# https://github.com/firebase/firebase-tools + +name: Deploy to Firebase Hosting on merge +'on': + push: + branches: + - main +jobs: + build_and_deploy: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Install Dependencies + run: npm install + - name: Generate .env file + run: cp .env.example .env + - name: Build + run: npm run build + - uses: FirebaseExtended/action-hosting-deploy@v0 + with: + repoToken: '${{ secrets.GITHUB_TOKEN }}' + firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_HOTWAX_DIGITAL_COMMERCE }}' + channelId: live + projectId: hotwax-digital-commerce + target: commerce-hub-dev \ No newline at end of file diff --git a/firebase.json b/firebase.json new file mode 100644 index 00000000..381bbd55 --- /dev/null +++ b/firebase.json @@ -0,0 +1,17 @@ +{ + "hosting": { + "target": "commerce-hub-dev", + "public": "dist", + "ignore": [ + "firebase.json", + "**/.*", + "**/node_modules/**" + ], + "rewrites": [ + { + "source": "**", + "destination": "/index.html" + } + ] + } + } \ No newline at end of file From 262e9abd54c55fc9a02746cfa06c4c17d8995cb5 Mon Sep 17 00:00:00 2001 From: Disha Date: Mon, 7 Feb 2022 14:28:11 +0530 Subject: [PATCH 02/13] Added changelog entry(#20d6xcu) --- changelogs/unreleased/-20d6xcu.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 changelogs/unreleased/-20d6xcu.yml diff --git a/changelogs/unreleased/-20d6xcu.yml b/changelogs/unreleased/-20d6xcu.yml new file mode 100644 index 00000000..5f256ad2 --- /dev/null +++ b/changelogs/unreleased/-20d6xcu.yml @@ -0,0 +1,6 @@ +--- +title: Added firebase auto deployment configuration +ticket_id: "#20d6xcu" +merge_request: 13 +author: Disha +type: added From e65df8d2e5a1554eecc67b51c046818d4c5ca4a6 Mon Sep 17 00:00:00 2001 From: niharika Date: Thu, 10 Mar 2022 17:46:05 +0530 Subject: [PATCH 03/13] Added slot icon-only to ion-icon in ion-button(#238uwuv) --- src/components/BatchModal.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/BatchModal.vue b/src/components/BatchModal.vue index 6fb82a1f..0b338579 100644 --- a/src/components/BatchModal.vue +++ b/src/components/BatchModal.vue @@ -3,7 +3,7 @@ - + Batch 2 From 75c227fc610e3a36bb3fb25bec2811c75ff2e3e4 Mon Sep 17 00:00:00 2001 From: azkyakhan Date: Thu, 10 Mar 2022 17:59:39 +0530 Subject: [PATCH 04/13] Updated color of ion-icon in ion-chip, ion-chip outline and ion-item lines in dark mode(#238p38r) --- src/theme/variables.css | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/theme/variables.css b/src/theme/variables.css index 7d337f3e..c0f157ac 100644 --- a/src/theme/variables.css +++ b/src/theme/variables.css @@ -258,3 +258,17 @@ ion-select { max-width: 100%; } +@media (prefers-color-scheme: dark) { + ion-chip > ion-icon { + color: var(--ion-color-dark); + } + + .chip-outline { + border-color: var(--ion-color-dark); + } + + ion-item { + --border-color: var(--ion-color-medium) + } +} + From 66c00000e32dada679599f5e45a02a82ed5cb505 Mon Sep 17 00:00:00 2001 From: azkyakhan Date: Thu, 10 Mar 2022 18:02:01 +0530 Subject: [PATCH 05/13] Added: Changelog(#238p38r) --- changelogs/unreleased/-238p38r.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 changelogs/unreleased/-238p38r.yml diff --git a/changelogs/unreleased/-238p38r.yml b/changelogs/unreleased/-238p38r.yml new file mode 100644 index 00000000..70c6090c --- /dev/null +++ b/changelogs/unreleased/-238p38r.yml @@ -0,0 +1,7 @@ +--- +title: Updated color of ion-icon in ion-chip, ion-chip outline and ion-item lines + in dark mode +ticket_id: "#238p38r" +merge_request: 19 +author: azkyakhan +type: changed From 8c5ee6b6eda1091a8e5aae65b6151f96934380ca Mon Sep 17 00:00:00 2001 From: Yash Maheshwari Date: Fri, 11 Mar 2022 15:12:27 +0530 Subject: [PATCH 06/13] Added: ion-menu-button on all the pages(#238uygm) --- src/views/Inventory.vue | 3 +++ src/views/Orders.vue | 3 +++ src/views/PreOrder.vue | 3 +++ src/views/Product.vue | 3 +++ src/views/Settings.vue | 6 ++++-- 5 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/views/Inventory.vue b/src/views/Inventory.vue index 45d026a4..12ad2287 100644 --- a/src/views/Inventory.vue +++ b/src/views/Inventory.vue @@ -2,6 +2,7 @@ + {{ $t("Inventory") }} @@ -105,6 +106,7 @@ import { IonHeader, IonItem, IonLabel, + IonMenuButton, IonPage, IonRadioGroup, IonRadio, @@ -124,6 +126,7 @@ export default defineComponent({ IonHeader, IonItem, IonLabel, + IonMenuButton, IonPage, IonRadioGroup, IonRadio, diff --git a/src/views/Orders.vue b/src/views/Orders.vue index dc404fdd..16656288 100644 --- a/src/views/Orders.vue +++ b/src/views/Orders.vue @@ -2,6 +2,7 @@ + {{ $t("Orders") }} @@ -107,6 +108,7 @@ import { IonItem, IonItemDivider, IonLabel, + IonMenuButton, IonNote, IonPage, IonTitle, @@ -132,6 +134,7 @@ export default defineComponent({ IonItem, IonItemDivider, IonLabel, + IonMenuButton, IonNote, IonPage, IonTitle, diff --git a/src/views/PreOrder.vue b/src/views/PreOrder.vue index 513561c9..fb6595d7 100644 --- a/src/views/PreOrder.vue +++ b/src/views/PreOrder.vue @@ -2,6 +2,7 @@ + {{ $t("Pre-order") }} @@ -87,6 +88,7 @@ import { IonHeader, IonItem, IonLabel, + IonMenuButton, IonPage, IonTitle, IonToggle, @@ -106,6 +108,7 @@ export default defineComponent({ IonHeader, IonItem, IonLabel, + IonMenuButton, IonPage, IonTitle, IonToggle, diff --git a/src/views/Product.vue b/src/views/Product.vue index 0edd19cb..e9e3dd33 100644 --- a/src/views/Product.vue +++ b/src/views/Product.vue @@ -2,6 +2,7 @@ + {{ $t("Product") }} @@ -38,6 +39,7 @@ import { IonHeader, IonItem, IonLabel, + IonMenuButton, IonPage, IonTitle, IonToolbar @@ -55,6 +57,7 @@ export default defineComponent({ IonHeader, IonItem, IonLabel, + IonMenuButton, IonPage, IonTitle, IonToolbar, diff --git a/src/views/Settings.vue b/src/views/Settings.vue index 3852552a..fbaa3b63 100644 --- a/src/views/Settings.vue +++ b/src/views/Settings.vue @@ -2,6 +2,7 @@ + {{ $t("Settings") }} @@ -32,7 +33,7 @@