From 791167246afb4eb9994df716365a2a9d790d0996 Mon Sep 17 00:00:00 2001 From: Kevin Stederoth <43753494+ksted@users.noreply.github.com> Date: Mon, 20 Nov 2023 13:21:56 +0100 Subject: [PATCH 01/15] chore: remove prettier plugin from eslint config --- apps/web/.eslintrc.cjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/web/.eslintrc.cjs b/apps/web/.eslintrc.cjs index beb0288a9..ce3d2784d 100644 --- a/apps/web/.eslintrc.cjs +++ b/apps/web/.eslintrc.cjs @@ -1,5 +1,5 @@ module.exports = { - extends: ['@vue-storefront/eslint-config', '@vue-storefront/eslint-config/vue3', 'prettier'], + extends: ['@vue-storefront/eslint-config', '@vue-storefront/eslint-config/vue3'], parserOptions: { project: './tsconfig.json', tsconfigRootDir: __dirname, From 64352f95c1883586bd3fdb98f0ffd70d00097e45 Mon Sep 17 00:00:00 2001 From: Kevin Stederoth <43753494+ksted@users.noreply.github.com> Date: Mon, 20 Nov 2023 13:30:26 +0100 Subject: [PATCH 02/15] Update .eslintrc.cjs --- apps/web/.eslintrc.cjs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/web/.eslintrc.cjs b/apps/web/.eslintrc.cjs index ce3d2784d..e0e3da4fb 100644 --- a/apps/web/.eslintrc.cjs +++ b/apps/web/.eslintrc.cjs @@ -32,5 +32,7 @@ module.exports = { 'unicorn/filename-case': 'off', 'no-undef': 'off', 'vue/no-setup-props-destructure': 'off', + 'vue/singleline-html-element-content-newline': 'off', + 'vue/max-attributes-per-line': 'off', }, }; From 5e7823138c7405ad464ddbe3763bda990191cc06 Mon Sep 17 00:00:00 2001 From: Kevin Stederoth <43753494+ksted@users.noreply.github.com> Date: Mon, 20 Nov 2023 13:38:02 +0100 Subject: [PATCH 03/15] Update lint.yml --- .github/workflows/lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 25373e958..fb70c8c32 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -30,7 +30,7 @@ jobs: - name: Set yarn version run: | yarn set version stable - yarn set version 3.6.4 + yarn set version 3.6.3 - name: Setup .yarnrc.yml run: | From 2990e20d6b572d07f8ed360e79b766a8f4908f55 Mon Sep 17 00:00:00 2001 From: Kevin Stederoth <43753494+ksted@users.noreply.github.com> Date: Mon, 20 Nov 2023 14:31:28 +0100 Subject: [PATCH 04/15] Update lint.yml --- .github/workflows/lint.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index fb70c8c32..0c7ce6122 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -20,6 +20,9 @@ jobs: - name: Checkout code uses: actions/checkout@v4 + - name: Enable corepack + run: corepack enable + - name: Setup node uses: actions/setup-node@v3 with: From 171b4401c7d599463e67e62866479e4434877b6f Mon Sep 17 00:00:00 2001 From: Kevin Stederoth <43753494+ksted@users.noreply.github.com> Date: Mon, 20 Nov 2023 14:55:26 +0100 Subject: [PATCH 05/15] Update package.json --- apps/web/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/web/package.json b/apps/web/package.json index 6ccbbfc29..619eff19a 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -12,7 +12,7 @@ "docs:build": "yarn publish-typedoc && vitepress build docs", "docs:preview": "vitepress preview docs", "publish-typedoc": "yarn typedoc", - "lint": "nuxt typecheck && eslint --ext .vue,.js,.ts .", + "lint": "eslint --ext .vue,.js,.ts .", "lint:fix": "eslint --ext .vue,.js,.ts . --fix", "preview": "nuxt preview", "postinstall": "nuxt prepare", From a6a89c7c9f5ba5e37a2a41a407aca66bcdea2b25 Mon Sep 17 00:00:00 2001 From: Kevin Stederoth <43753494+ksted@users.noreply.github.com> Date: Mon, 20 Nov 2023 15:25:04 +0100 Subject: [PATCH 06/15] Update lint.yml --- .github/workflows/lint.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 0c7ce6122..9e9b62cb4 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -47,8 +47,5 @@ jobs: - name: Install Dependencies run: yarn --frozen-lockfile - - name: Build packages - run: yarn build - - name: Run linter run: yarn lint From 19863cab97eee9be0add11faebe7dc15e05136f6 Mon Sep 17 00:00:00 2001 From: ksted Date: Tue, 21 Nov 2023 07:35:36 +0100 Subject: [PATCH 07/15] chore: use prettier config instead of plugin --- apps/web/.eslintrc.cjs | 2 +- apps/web/package.json | 2 +- yarn.lock | 13 ++++++++++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/apps/web/.eslintrc.cjs b/apps/web/.eslintrc.cjs index e0e3da4fb..712d06979 100644 --- a/apps/web/.eslintrc.cjs +++ b/apps/web/.eslintrc.cjs @@ -1,5 +1,5 @@ module.exports = { - extends: ['@vue-storefront/eslint-config', '@vue-storefront/eslint-config/vue3'], + extends: ['@vue-storefront/eslint-config', '@vue-storefront/eslint-config/vue3', 'prettier'], parserOptions: { project: './tsconfig.json', tsconfigRootDir: __dirname, diff --git a/apps/web/package.json b/apps/web/package.json index 619eff19a..d298090d5 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -48,7 +48,7 @@ "cypress-real-events": "^1.10.0", "cypress-wait-until": "^2.0.0", "eslint": "^8.50.0", - "eslint-plugin-prettier": "5.0.1", + "eslint-config-prettier": "^9.0.0", "happy-dom": "^12.0.0", "nuxt": "^3.6.5", "nuxt-vitest": "^0.10.1", diff --git a/yarn.lock b/yarn.lock index d4abf8966..bcdc50d94 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10216,6 +10216,17 @@ __metadata: languageName: node linkType: hard +"eslint-config-prettier@npm:^9.0.0": + version: 9.0.0 + resolution: "eslint-config-prettier@npm:9.0.0" + peerDependencies: + eslint: ">=7.0.0" + bin: + eslint-config-prettier: bin/cli.js + checksum: 362e991b6cb343f79362bada2d97c202e5303e6865888918a7445c555fb75e4c078b01278e90be98aa98ae22f8597d8e93d48314bec6824f540f7efcab3ce451 + languageName: node + linkType: hard + "eslint-etc@npm:^5.1.0": version: 5.2.1 resolution: "eslint-etc@npm:5.2.1" @@ -21319,7 +21330,7 @@ __metadata: cypress-real-events: ^1.10.0 cypress-wait-until: ^2.0.0 eslint: ^8.50.0 - eslint-plugin-prettier: 5.0.1 + eslint-config-prettier: ^9.0.0 happy-dom: ^12.0.0 lodash-es: ^4.17.21 nuxt: ^3.6.5 From 794f30801c49c186493e8b0f2e7f3c3a3286b0b7 Mon Sep 17 00:00:00 2001 From: ksted Date: Tue, 21 Nov 2023 07:48:43 +0100 Subject: [PATCH 08/15] chore: run prettier separately --- .github/workflows/lint.yml | 3 +++ .prettierignore | 1 + .prettierrc | 8 +------- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 9e9b62cb4..da8259204 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -47,5 +47,8 @@ jobs: - name: Install Dependencies run: yarn --frozen-lockfile + - name: Run prettier + run: yarn prettier --check "apps/web/**/*.{js,ts,vue}" + - name: Run linter run: yarn lint diff --git a/.prettierignore b/.prettierignore index af72bce21..1e30caed1 100755 --- a/.prettierignore +++ b/.prettierignore @@ -1,3 +1,4 @@ node_modules +__tests__ .nuxt .turbo diff --git a/.prettierrc b/.prettierrc index 15cfc7d6a..6c04e63d5 100755 --- a/.prettierrc +++ b/.prettierrc @@ -6,11 +6,5 @@ "tabWidth": 2, "trailingComma": "all", "printWidth": 120, - "jsxSingleQuote": false, - "importOrder": [ - "^vue", - "^(nuxt/(.*)$)|^(nuxt$)", - "", - "^[./]" - ] + "jsxSingleQuote": false } From ae9996c6a7a21cb97f3829b76fac044acb5dc86a Mon Sep 17 00:00:00 2001 From: ksted Date: Tue, 21 Nov 2023 08:04:15 +0100 Subject: [PATCH 09/15] chore: use script --- .github/PULL_REQUEST_TEMPLATE.md | 1 + .github/workflows/lint.yml | 2 +- GUIDE.md | 6 +++--- LICENSE.md | 2 +- README.md | 19 ++++++++++--------- apps/server/middleware.config.ts | 6 +++--- apps/server/tsup.config.ts | 6 +++--- apps/web/docs/.vitepress/config.ts | 16 +++++++--------- apps/web/docs/index.md | 3 +-- docs/config/middleware.md | 1 + docs/deployment/deployment.md | 13 ++++++------- package.json | 3 ++- 12 files changed, 39 insertions(+), 39 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index a86cb7102..f7c7f7800 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -5,6 +5,7 @@ Closes: #ID ## Describe your changes ## Checklist before requesting a review + - [ ] My code follows the code style of this project. - [ ] I have read the **CONTRIBUTING** document. - [ ] I have added tests to cover my changes. diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index da8259204..4eb7bf8d5 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -48,7 +48,7 @@ jobs: run: yarn --frozen-lockfile - name: Run prettier - run: yarn prettier --check "apps/web/**/*.{js,ts,vue}" + run: yarn format - name: Run linter run: yarn lint diff --git a/GUIDE.md b/GUIDE.md index 13d6b7502..b11bad96f 100644 --- a/GUIDE.md +++ b/GUIDE.md @@ -139,7 +139,7 @@ Naming convention: - each composables should be prefixed with `use` keyword (`useProduct`) - composable should follow `Camel case` pattern (`useProductReviews`) -We are using internal [Nuxt.js state management](https://nuxt.com/docs/getting-started/state-management) to lock the data responsibility along with the composition functions (composables). State connected to the certain composable is read-only and modified by the internal modifiers (functions). You can check the `useCart.ts` composable as a reference. +We are using internal [Nuxt.js state management](https://nuxt.com/docs/getting-started/state-management) to lock the data responsibility along with the composition functions (composables). State connected to the certain composable is read-only and modified by the internal modifiers (functions). You can check the `useCart.ts` composable as a reference. ### Components @@ -191,7 +191,7 @@ Naming convention: The data fetching process is handled seamlessly by integrating VSF SDK, which acts as a robust communication layer between the application and the VSF Middleware. The SDK provides a set of convenient and optimized methods to fetch data from various APIs and services. -To simplify the implementation and management of data fetching we're using native Nuxt's composables for [useAsyncData](https://nuxt.com/docs/api/composables/use-async-data) and [useState](https://nuxt.com/docs/getting-started/state-management). It seamlessly integrates with VSF SDK and simplifies the process of caching, synchronizing, and managing the application's data. These functions provide an elegant and efficient way to handle asynchronous data fetching, automatically managing data caching, refetching, and background updates. +To simplify the implementation and management of data fetching we're using native Nuxt's composables for [useAsyncData](https://nuxt.com/docs/api/composables/use-async-data) and [useState](https://nuxt.com/docs/getting-started/state-management). It seamlessly integrates with VSF SDK and simplifies the process of caching, synchronizing, and managing the application's data. These functions provide an elegant and efficient way to handle asynchronous data fetching, automatically managing data caching, refetching, and background updates. By combining VSF SDK with Nuxt's composables, this project ensures a reliable and performant data fetching experience for the application. Developers can easily fetch, update, and maintain data using composition declarative approach, while the VSF SDK handles the underlying communication and data retrieval tasks. @@ -244,7 +244,7 @@ In order to optimize and enhance the performance of the application, several per > **Note** > To analyze your app bundles run `npx nuxi analyze` command. -*You can use bundle analyzer to check the whole application structure along with server, or simply jump into the `apps/web` folder to analyze your web application.* +_You can use bundle analyzer to check the whole application structure along with server, or simply jump into the `apps/web` folder to analyze your web application._ #### Web performance automated testing diff --git a/LICENSE.md b/LICENSE.md index ea0ce1003..a713e6590 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -18,4 +18,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE -OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file +OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/README.md b/README.md index f72c0093e..44339ec20 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@
Vue Storefront - plentysystems logo +plentysystems logo

Vue Storefront 3 Integration With plentysystems

@@ -25,20 +25,20 @@ For plentyShop PWA to run, you have to install plugins that provide additional R 1. Log into your plentysystems system. 2. [Install](https://knowledge.plentymarkets.com/en-gb/manual/main/plugins/installing-added-plugins.html#installing-plugins) the following plugins in the latest version: - - IO - - plentyShop LTS - - PayPal - - Cash in advance - - Pay upon pickup - - DHL Shipping (Versenden) - - Customer feedback + - IO + - plentyShop LTS + - PayPal + - Cash in advance + - Pay upon pickup + - DHL Shipping (Versenden) + - Customer feedback 3. Set the priorities of the plugins, so that IO has the highest priority and plentyShop LTS the second highest. The priorities of all other plugins remains 0. ### System configuration 1. Log into your plentysystems system. 2. Go to **Setup » Guided Tours** and complete **Setting up plentyShop**. -3. *Optional:* Go to **Setup » Orders » Payment » PayPal** and set up your PayPal account. +3. _Optional:_ Go to **Setup » Orders » Payment » PayPal** and set up your PayPal account. ## Local dev setup @@ -94,6 +94,7 @@ For detailed setup instructions, refer to the [deployment guide](./docs/deployme ## Resources ### Changelog + [English](./docs/changelog/changelog_en.md) | [German](./docs/changelog/changelog_de.md) ### Features diff --git a/apps/server/middleware.config.ts b/apps/server/middleware.config.ts index 30b93c1e6..5fcf1927a 100644 --- a/apps/server/middleware.config.ts +++ b/apps/server/middleware.config.ts @@ -7,10 +7,10 @@ const config = { location: '@plentymarkets/shop-api/server', configuration: { api: { - url: process.env.API_ENDPOINT - } + url: process.env.API_ENDPOINT, + }, }, - } + }, }, }; diff --git a/apps/server/tsup.config.ts b/apps/server/tsup.config.ts index 9c5f7d4d5..7e920546f 100644 --- a/apps/server/tsup.config.ts +++ b/apps/server/tsup.config.ts @@ -1,8 +1,8 @@ -import { defineConfig } from 'tsup' +import { defineConfig } from 'tsup'; export default defineConfig({ entry: ['src/index.ts'], splitting: false, sourcemap: true, - clean: true -}) + clean: true, +}); diff --git a/apps/web/docs/.vitepress/config.ts b/apps/web/docs/.vitepress/config.ts index aef403c81..c592baa9e 100644 --- a/apps/web/docs/.vitepress/config.ts +++ b/apps/web/docs/.vitepress/config.ts @@ -1,15 +1,15 @@ -import { defineConfig } from 'vitepress' +import { defineConfig } from 'vitepress'; import typedocSidebar from '../composables/typedoc-sidebar.json'; // https://vitepress.dev/reference/site-config export default defineConfig({ - title: "plentyShop PWA Docs", - description: "Documentation of plentyShop PWA", + title: 'plentyShop PWA Docs', + description: 'Documentation of plentyShop PWA', themeConfig: { // https://vitepress.dev/reference/default-theme-config nav: [ { text: 'Home', link: '/' }, - { text: 'Composables', link: '/composables/' } + { text: 'Composables', link: '/composables/' }, ], sidebar: [ @@ -19,8 +19,6 @@ export default defineConfig({ }, ], - socialLinks: [ - { icon: 'github', link: 'https://github.com/vuejs/vitepress' } - ] - } -}) + socialLinks: [{ icon: 'github', link: 'https://github.com/vuejs/vitepress' }], + }, +}); diff --git a/apps/web/docs/index.md b/apps/web/docs/index.md index 8465aa275..c26f46422 100644 --- a/apps/web/docs/index.md +++ b/apps/web/docs/index.md @@ -3,7 +3,7 @@ layout: home hero: - name: "plentyShop PWA" + name: 'plentyShop PWA' tagline: Composables documentation actions: - theme: brand @@ -21,4 +21,3 @@ features: - title: Functions details: Lorem ipsum dolor sit amet, consectetur adipiscing elit --- - diff --git a/docs/config/middleware.md b/docs/config/middleware.md index 336b499e9..625cfba81 100644 --- a/docs/config/middleware.md +++ b/docs/config/middleware.md @@ -15,6 +15,7 @@ Create a `.env` file in the `apps/server` directory with the following content: ``` API_ENDPOINT=https://mevofvd5omld.c01-14.plentymarkets.com ``` + Replace the API_ENDPOINT url with the shop domain of your plentyShop. In the local development environment, the app connects to the provided URL. In production, it connects to the plentysystems system that hosts the app. diff --git a/docs/deployment/deployment.md b/docs/deployment/deployment.md index 5779289d3..dfb62eb87 100644 --- a/docs/deployment/deployment.md +++ b/docs/deployment/deployment.md @@ -32,10 +32,10 @@ Creating the application adds a new table entry. In the next part, you'll need t 5. Fill in the information according to the table below. 6. Repeat steps 4-5 for the second secret. -| Name | Value | -| ----------- | ----------- | -| `URL_ENDPOINT` | **Upload Endpoint** | -| `URL_ENDPOINT_TOKEN` | **Access key** | +| Name | Value | +| -------------------- | ------------------- | +| `URL_ENDPOINT` | **Upload Endpoint** | +| `URL_ENDPOINT_TOKEN` | **Access key** | ### System URL @@ -46,8 +46,8 @@ Creating the application adds a new table entry. In the next part, you'll need t 5. Click on **New repository variable**. 6. Fill in the information according to the table below. -| Name | Value | -| ----------- | ----------- | +| Name | Value | +| --------- | ---------------- | | `API_URL` | Your shop domain | ### Upload @@ -75,7 +75,6 @@ The workflow takes several minutes to complete. You can monitor the progress in The activation makes the application reachable on the configured domain. It can take up to 1 hour for the changes to take effect. - ## Preview 1. Log into your plentysystems system. diff --git a/package.json b/package.json index 28de5fcd9..5a6a4d50d 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,8 @@ "start": "turbo run start", "lint": "turbo run lint", "lint:fix": "turbo run lint:fix", - "format": "prettier --write \"**/*.{ts,vue,css,scss,md}\"", + "format": "prettier --check \"**/*.{ts,vue,css,scss,md}\"", + "format:fix": "prettier --write \"**/*.{ts,vue,css,scss,md}\"", "clean": "npx rimraf ./**/node_modules && rm yarn.lock", "clean:hard": "npx rimraf ./**/node_modules && npx rimraf ./**/lib && rm yarn.lock && npx rimraf ./**/.turbo && npx rimraf ./**/.nuxt", "test": "turbo run test", From 46cc0fa642756839736e0a07c9faa1ce2e0879f5 Mon Sep 17 00:00:00 2001 From: ksted Date: Tue, 21 Nov 2023 08:12:34 +0100 Subject: [PATCH 10/15] fix: yarn version --- .github/workflows/lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 4eb7bf8d5..c8fbca5ed 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -33,7 +33,7 @@ jobs: - name: Set yarn version run: | yarn set version stable - yarn set version 3.6.3 + yarn set version 3.6.4 - name: Setup .yarnrc.yml run: | From 68b78d128a713b3472c0c99b129c8825b609b773 Mon Sep 17 00:00:00 2001 From: cristian sandru Date: Thu, 23 Nov 2023 11:34:55 +0200 Subject: [PATCH 11/15] feat: add missing html attributes --- apps/web/components/Cookiebar/Cookiebar.vue | 15 +++++++++++---- apps/web/lang/de.json | 1 + apps/web/lang/en.json | 1 + apps/web/pages/index.vue | 1 + 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/apps/web/components/Cookiebar/Cookiebar.vue b/apps/web/components/Cookiebar/Cookiebar.vue index 4c8f8270b..e6414e20f 100644 --- a/apps/web/components/Cookiebar/Cookiebar.vue +++ b/apps/web/components/Cookiebar/Cookiebar.vue @@ -111,7 +111,7 @@ class="w-full" :aria-disabled="false" type="button" - aria-label="button" + :aria-label="$t('CookieBar.Accept All')" @click="setAllCookiesState(true)" > {{ $t('CookieBar.Accept All') }} @@ -122,14 +122,21 @@ class="w-full" :aria-disabled="false" type="button" - aria-label="button" + :aria-label="$t('CookieBar.Reject All')" @click="setAllCookiesState(false)" > {{ $t('CookieBar.Reject All') }}
- + {{ $t('CookieBar.Accept Selection') }}
@@ -140,7 +147,7 @@ v-else variant="secondary" class="z-10 fixed bottom-2 xl:bottom-2 xl:left-auto xl:right-2 bg-white" - aria-label="Cookie control" + :aria-label="$t('CookieBar.Cookie Control')" @click="changeVisibilityState" > diff --git a/apps/web/lang/de.json b/apps/web/lang/de.json index e9360c3b2..305b42e89 100644 --- a/apps/web/lang/de.json +++ b/apps/web/lang/de.json @@ -31,6 +31,7 @@ "asterixHint": "* markierte Zustimmungen sind erforderlich" }, "CookieBar": { + "Cookie Control": "Cookie Kontrolle", "Privacy Settings": "Datenschutzeinstellungen", "More information": "Mehr Informationen", "Further Settings": "Weitere Einstellungen", diff --git a/apps/web/lang/en.json b/apps/web/lang/en.json index eb030c8e6..2bf97e2d0 100644 --- a/apps/web/lang/en.json +++ b/apps/web/lang/en.json @@ -31,6 +31,7 @@ "asterixHint": "* marked consents are required" }, "CookieBar": { + "Cookie Control": "Cookie Control", "Privacy Settings": "Privacy Settings", "More information": "More information", "Further Settings": "Further Settings", diff --git a/apps/web/pages/index.vue b/apps/web/pages/index.vue index 32f105be3..fff803dbf 100644 --- a/apps/web/pages/index.vue +++ b/apps/web/pages/index.vue @@ -7,6 +7,7 @@ /> Hero mobile background From 72a0be5d664d408029ae6e5fe3d1363bd8a531f5 Mon Sep 17 00:00:00 2001 From: cristian sandru Date: Mon, 27 Nov 2023 09:11:06 +0200 Subject: [PATCH 12/15] chore: added changelog --- docs/changelog/changelog_de.md | 1 + docs/changelog/changelog_en.md | 1 + 2 files changed, 2 insertions(+) diff --git a/docs/changelog/changelog_de.md b/docs/changelog/changelog_de.md index 6f0a01aa3..3b0440269 100644 --- a/docs/changelog/changelog_de.md +++ b/docs/changelog/changelog_de.md @@ -5,6 +5,7 @@ ### Geändert - Die Cookiebar Logik wurde überarbeitet. +- Beschriftungsübersetzungen für Cookiebar schaltflächen hinzugefügt ## v1.1.0 (03.11.2023) Übersicht aller Änderungen diff --git a/docs/changelog/changelog_en.md b/docs/changelog/changelog_en.md index 8b7a348f1..9cad1199b 100644 --- a/docs/changelog/changelog_en.md +++ b/docs/changelog/changelog_en.md @@ -5,6 +5,7 @@ ### Changed - Reworked logic of cookie bar. +- Added label translations for cookie bar buttons ## v1.1.0 (2023-11-03) Overview of all changes From 5fb556c4acfa06eeff2cc4181985d2e4e689f5d0 Mon Sep 17 00:00:00 2001 From: cristian sandru Date: Mon, 27 Nov 2023 12:41:55 +0200 Subject: [PATCH 13/15] feat: update homepage img demo sections --- apps/web/pages/index.vue | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/apps/web/pages/index.vue b/apps/web/pages/index.vue index 54a0ab8bf..e441fd8d4 100644 --- a/apps/web/pages/index.vue +++ b/apps/web/pages/index.vue @@ -30,13 +30,11 @@ From c7396a5abdf1e0b501c5d0c6143d71022dc22942 Mon Sep 17 00:00:00 2001 From: cristian sandru Date: Wed, 29 Nov 2023 08:40:26 +0200 Subject: [PATCH 14/15] fix: translations per review suggestions --- apps/web/components/Cookiebar/Cookiebar.vue | 2 +- apps/web/lang/de.json | 2 +- apps/web/lang/en.json | 2 +- docs/changelog/changelog_de.md | 4 ++-- docs/changelog/changelog_en.md | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/web/components/Cookiebar/Cookiebar.vue b/apps/web/components/Cookiebar/Cookiebar.vue index e6414e20f..f9511bda5 100644 --- a/apps/web/components/Cookiebar/Cookiebar.vue +++ b/apps/web/components/Cookiebar/Cookiebar.vue @@ -147,7 +147,7 @@ v-else variant="secondary" class="z-10 fixed bottom-2 xl:bottom-2 xl:left-auto xl:right-2 bg-white" - :aria-label="$t('CookieBar.Cookie Control')" + :aria-label="$t('CookieBar.Cookie Settings')" @click="changeVisibilityState" > diff --git a/apps/web/lang/de.json b/apps/web/lang/de.json index 305b42e89..0ef008110 100644 --- a/apps/web/lang/de.json +++ b/apps/web/lang/de.json @@ -31,7 +31,7 @@ "asterixHint": "* markierte Zustimmungen sind erforderlich" }, "CookieBar": { - "Cookie Control": "Cookie Kontrolle", + "Cookie Settings": "Cookie-Einstellungen", "Privacy Settings": "Datenschutzeinstellungen", "More information": "Mehr Informationen", "Further Settings": "Weitere Einstellungen", diff --git a/apps/web/lang/en.json b/apps/web/lang/en.json index 2bf97e2d0..1feee6651 100644 --- a/apps/web/lang/en.json +++ b/apps/web/lang/en.json @@ -31,7 +31,7 @@ "asterixHint": "* marked consents are required" }, "CookieBar": { - "Cookie Control": "Cookie Control", + "Cookie Settings": "Cookie Settings", "Privacy Settings": "Privacy Settings", "More information": "More information", "Further Settings": "Further Settings", diff --git a/docs/changelog/changelog_de.md b/docs/changelog/changelog_de.md index 4304233e9..e6af33df9 100644 --- a/docs/changelog/changelog_de.md +++ b/docs/changelog/changelog_de.md @@ -13,7 +13,7 @@ ### Geändert - Die Cookiebar Logik wurde überarbeitet. -- Beschriftungsübersetzungen für Cookiebar schaltflächen hinzugefügt +- Die ARIA-Labels von Schaltflächen der Cookiebar wurden übersetzt. - Die Sprachauswahl wurde überarbeitet und zeigt jetzt Länderflaggen an. - Die Checkout-Seite wurde überarbeitet, um weniger Daten zu laden. @@ -23,7 +23,7 @@ - Beim Unterschreiten der Mindestkaufpreisanforderung wurde beim Bezahlvorgang kein Fehler ausgegeben. - UI Benachrichtigungen führten zu einer Layoutverschiebung für den Benutzer. - Kategorien wurden in der falschen Sprache geladen, wenn die Website zum ersten Mal mit SSR gerendert wurde. -– Die Variationsauswahl hat die Variation nicht aus der URL entfernt, wenn die Basisvariation ausgewählt wurde. + – Die Variationsauswahl hat die Variation nicht aus der URL entfernt, wenn die Basisvariation ausgewählt wurde. - Produkte auf der Bestellbestätigungsseite haben nicht auf das korrekte Produkt verlinkt. ## v1.1.0 (03.11.2023) Übersicht aller Änderungen diff --git a/docs/changelog/changelog_en.md b/docs/changelog/changelog_en.md index 40cff35cf..8126595ce 100644 --- a/docs/changelog/changelog_en.md +++ b/docs/changelog/changelog_en.md @@ -13,7 +13,7 @@ ### Changed - Reworked logic of cookie bar. -- Added label translations for cookie bar buttons +- Added ARIA label translations for cookie bar buttons. - The language select has been refactored and is now showing country flags. - Refactored the checkout page to load less data. From 6546e0fcc7c7d222bcccef49f8d5c6a76029c51f Mon Sep 17 00:00:00 2001 From: ksted Date: Wed, 29 Nov 2023 09:28:43 +0100 Subject: [PATCH 15/15] fix: prettier --- apps/web/docs/.vitepress/config.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/web/docs/.vitepress/config.ts b/apps/web/docs/.vitepress/config.ts index 6817bc147..213558007 100644 --- a/apps/web/docs/.vitepress/config.ts +++ b/apps/web/docs/.vitepress/config.ts @@ -1,4 +1,4 @@ -import { defineConfig } from 'vitepress' +import { defineConfig } from 'vitepress'; import typedocSidebar from '../reference/composables/typedoc-sidebar.json'; // https://vitepress.dev/reference/site-config @@ -9,7 +9,7 @@ export default defineConfig({ // https://vitepress.dev/reference/default-theme-config nav: [ { text: 'Home', link: '/' }, - { text: 'Composables', link: '/reference/composables/' } + { text: 'Composables', link: '/reference/composables/' }, ], sidebar: [