Merge branch 'release/v2.1.0' into main

heseya · Feb 8, 2024 · f241409 · f241409
2 parents f314118 + de9ca22
commit f241409
Show file tree

Hide file tree

Showing 226 changed files with 5,413 additions and 4,196 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,6 @@
+/.nuxt
+/.output
+/node_modules
+
+.gitignore
+README.md
diff --git a/.env.example b/.env.example
@@ -9,6 +9,8 @@ APP_HOST=http://localhost:3001/
 
 # Contact form
 MAIL_HOST=
+MAIL_PORT=
+MAIL_SENDER=
 MAIL_USER=
 MAIL_PASSWORD=
 MAIL_RECEIVER=
@@ -58,3 +60,7 @@ AXIOS_CACHE_TTL=0
 # Available languages in app
 ALLOWED_UI_LANGUAGES=pl,en
 DEFAULT_LANGUAGE=pl
+
+# Sentry
+NUXT_PUBLIC_SENTRY_DSN=
+NUXT_PUBLIC_SENTRY_ENVIRONMENT=development
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -17,7 +17,7 @@ cache:
 # --------------------------
 
 eslint:
-  image: node:16-alpine
+  image: node:18-alpine
   stage: test
   before_script:
     - yarn install
@@ -27,7 +27,7 @@ eslint:
     - yarn lint:eslint
 
 vue-tsc:
-  image: node:16-alpine
+  image: node:18-alpine
   stage: test
   before_script:
     - yarn install
@@ -41,15 +41,17 @@ vue-tsc:
 trigger-***REMOVED***-repo:
   stage: trigger
   rules:
-  - if: $CI_COMMIT_REF_NAME == $***REMOVED***_TRIGGER_BRANCH
-    when: always
-  - if: $CI_COMMIT_TAG
-    when: always
+    - if: $CI_COMMIT_REF_NAME == $***REMOVED***_TRIGGER_BRANCH
+      when: always
+    - if: $CI_COMMIT_TAG
+      when: always
   script:
     - if [ "$CI_COMMIT_TAG" != "" ]; then
-        export IMAGE_NAME=$CI_COMMIT_TAG;
+      export IMAGE_NAME=$CI_COMMIT_TAG;
+      export TARGET_BRANCH=$CI_COMMIT_TAG;
       else
-        export IMAGE_NAME=$***REMOVED***_IMAGE_NAME;
+      export IMAGE_NAME=$***REMOVED***_IMAGE_NAME;
+      export TARGET_BRANCH=$CI_COMMIT_BRANCH;
       fi
     - apt update -y && apt install -y curl
-    - curl -X POST -F token=$***REMOVED***_TRIGGER_TOKEN -F ref=main -F variables[IMAGE_NAME]=$IMAGE_NAME "***REMOVED***/api/v4/projects/929/trigger/pipeline"
+    - curl -X POST -F token=$***REMOVED***_TRIGGER_TOKEN -F ref=main -F variables[IMAGE_NAME]=$IMAGE_NAME -F variables[CI_BRANCH]=$TARGET_BRANCH "***REMOVED***/api/v4/projects/929/trigger/pipeline"
diff --git a/Dockerfile b/Dockerfile
@@ -1,11 +1,31 @@
-FROM node:18-alpine as builder
+# syntax = docker/dockerfile:1
 
-EXPOSE 3000
+ARG NODE_VERSION=18.15.0
 
-WORKDIR /app
-COPY / /app
+FROM node:${NODE_VERSION}-slim as base
+
+ARG PORT=3000
+
+ENV NODE_ENV=production
+
+WORKDIR /src
+
+# Build
+FROM base as build
+
+COPY --link package.json yarn.lock ./
+RUN yarn install --production=false
+
+COPY --link . .
 
-RUN yarn install
 RUN yarn build
 
-CMD ["yarn", "start", "--hostname", "0.0.0.0"]
+# Run
+FROM base
+
+ENV PORT=$PORT
+EXPOSE $PORT
+
+COPY --from=build /src/.output /src/.output
+
+CMD [ "node", ".output/server/index.mjs" ]
diff --git a/Makefile b/Makefile
@@ -0,0 +1,2 @@
+docker-compose:
+	docker compose up --build
diff --git a/app.vue b/app.vue
@@ -1,6 +1,5 @@
 <template>
   <Html :lang="i18nHead.htmlAttrs?.lang" :dir="i18nHead.htmlAttrs?.dir">
-    <IntegrationCallpage />
     <IntegrationEkomiWidget :token="ekomiPopupToken" />
 
     <LayoutThemeContext>
@@ -36,12 +35,17 @@ const isShopDisabled = computed(() => config.storeFrontDisabled)
 
 useSeoMeta({
   titleTemplate: (titleChunk) => (titleChunk ? `${titleChunk} - ${title.value}` : title.value),
-  description: () => seo.value.description,
-  ogImage: () => seo.value.og_image?.url,
-  twitterCard: () => seo.value.twitter_card,
-  robots: 'index, follow',
 })
 
+useSeo(() => [
+  {
+    description: seo.value.description,
+    ogImage: seo.value.og_image?.url,
+    twitterCard: seo.value.twitter_card,
+    robots: 'index, follow',
+  },
+])
+
 useHead({
   link: [
     ...(i18nHead.value.link || []),

diff --git a/assets/scss/components/_html-content.scss b/assets/scss/components/_html-content.scss
@@ -1,89 +1,87 @@
 .hs-html-content {
-  :root {
-    --c-placeholder-dark: rgba(0, 11, 29, 0.4);
-    --c-text-dark: #000b1d;
-    --c-text-default: $textColor;
-    --c-text-moderated: rgba(38, 47, 63, 0.7);
-    --c-text-muted: rgba(38, 47, 63, 0.5);
-    --c-text-success: #00b4a8;
-    --c-text-error: #bf3d66;
-    --c-text-light: #ffffff;
-    --c-text-light-moderated: rgba(255, 255, 255, 0.8);
-    --c-text-light-muted: rgba(255, 255, 255, 0.5);
-    --c-heading-default: #000b1d;
-    --c-heading-moderated: rgba(0, 11, 29, 0.7);
-    --c-heading-muted: rgba(0, 11, 29, 0.5);
-    --c-heading-light: #ffffff;
-    --c-heading-light-moderated: rgba(255, 255, 255, 0.8);
-    --c-link-default-base: #0044c3;
-    --c-link-default-hover: #bf3d66;
-    --c-link-dark-base: #000b1d;
-    --c-link-dark-hover: rgba(0, 11, 29, 0.6);
-    --c-link-moderated-base: rgba(0, 11, 29, 0.7);
-    --c-link-moderated-hover: #000b1d;
-    --c-link-light-base: #ffffff;
-    --c-link-light-hover: rgba(255, 255, 255, 0.6);
-    --c-link-light-moderated-base: rgba(255, 255, 255, 0.7);
-    --c-link-light-moderated-hover: #ffffff;
-    --c-pre-background: #f5f5f6;
-    --c-pre-text: #262f3f;
-    --c-pre-border: transparent;
-    --c-table-cell-border: rgba(217, 219, 221, 0.5);
-    --c-form-label-text: #262f3f;
-    --c-inline-var-text: rgba(0, 11, 29, 0.85);
-    --c-inline-kbd-border: rgba(0, 11, 29, 0.15);
-    --c-inline-kbd-text: rgba(0, 11, 29, 0.85);
-    --c-inline-code-background: #f5f5f6;
-    --c-inline-code-text: rgba(0, 11, 29, 0.85);
-    --c-button-default-base-background: #ffffff;
-    --c-button-default-base-border: #d9dbdd;
-    --c-button-default-base-text: #262f3f;
-    --c-button-default-hover-background: #f5f5f6;
-    --c-button-default-hover-border: #d9dbdd;
-    --c-button-default-hover-text: #000b1d;
-    --c-button-default-disabled-background: #ffffff;
-    --c-button-default-disabled-border: #d9dbdd;
-    --c-button-default-disabled-text: rgba(0, 11, 29, 0.85);
-    --c-button-primary-base-background: #0058fb;
-    --c-button-primary-base-border: transparent;
-    --c-button-primary-base-text: #edf3ff;
-    --c-button-primary-hover-background: #0044c3;
-    --c-button-primary-hover-border: transparent;
-    --c-button-primary-hover-text: #edf3ff;
-    --c-button-primary-disabled-background: #000b1d;
-    --c-button-primary-disabled-border: transparent;
-    --c-button-primary-disabled-text: rgba(237, 243, 255, 0.75);
-    --c-button-secondary-base-background: #000b1d;
-    --c-button-secondary-base-border: transparent;
-    --c-button-secondary-base-text: #f5f5f6;
-    --c-button-secondary-hover-background: #262f3f;
-    --c-button-secondary-hover-border: transparent;
-    --c-button-secondary-hover-text: #f5f5f6;
-    --c-button-secondary-disabled-background: #000b1d;
-    --c-button-secondary-disabled-border: transparent;
-    --c-button-secondary-disabled-text: rgba(245, 245, 246, 0.75);
-    --c-input-default-base-text: #262f3f;
-    --c-input-default-base-border: #d9dbdd;
-    --c-input-default-base-background: #ffffff;
-    --c-input-default-focus-border: rgba(0, 88, 251, 0.5);
-    --c-input-default-focus-shadow: rgba(0, 88, 251, 0.3);
-    --c-input-error-base-text: #bf3d66;
-    --c-input-error-base-border: rgba(255, 79, 127, 0.5);
-    --c-input-error-base-shadow: rgba(255, 79, 127, 0.3);
-    --c-input-error-focus-border: #ff4f7f;
-    --c-hint-default: rgba(38, 47, 63, 0.55);
-    --c-hint-success: #00b4a8;
-    --c-hint-error: #bf3d66;
-    --c-hint-required: #bf3d66;
-    --c-line-default: rgba(217, 219, 221, 0.6);
-    --c-shadow-neutral-100-1: rgba(0, 11, 29, 0.15);
-    --c-shadow-neutral-100-2: rgba(0, 11, 29, 0.06);
-    --c-shadow-neutral-200-1: rgba(0, 11, 29, 0.12);
-    --c-shadow-neutral-200-2: rgba(0, 11, 29, 0.06);
-    --c-shadow-neutral-300: rgba(0, 11, 29, 0.2);
-    --c-background-light: #ffffff;
-    --c-background-dark: #000b1d;
-  }
+  --c-placeholder-dark: rgba(0, 11, 29, 0.4);
+  --c-text-dark: #000b1d;
+  --c-text-default: $textColor;
+  --c-text-moderated: rgba(38, 47, 63, 0.7);
+  --c-text-muted: rgba(38, 47, 63, 0.5);
+  --c-text-success: #00b4a8;
+  --c-text-error: #bf3d66;
+  --c-text-light: #ffffff;
+  --c-text-light-moderated: rgba(255, 255, 255, 0.8);
+  --c-text-light-muted: rgba(255, 255, 255, 0.5);
+  --c-heading-default: #000b1d;
+  --c-heading-moderated: rgba(0, 11, 29, 0.7);
+  --c-heading-muted: rgba(0, 11, 29, 0.5);
+  --c-heading-light: #ffffff;
+  --c-heading-light-moderated: rgba(255, 255, 255, 0.8);
+  --c-link-default-base: var(--primary-color);
+  --c-link-default-hover: var(--primary-color-alt);
+  --c-link-dark-base: #000b1d;
+  --c-link-dark-hover: rgba(0, 11, 29, 0.6);
+  --c-link-moderated-base: rgba(0, 11, 29, 0.7);
+  --c-link-moderated-hover: #000b1d;
+  --c-link-light-base: #ffffff;
+  --c-link-light-hover: rgba(255, 255, 255, 0.6);
+  --c-link-light-moderated-base: rgba(255, 255, 255, 0.7);
+  --c-link-light-moderated-hover: #ffffff;
+  --c-pre-background: #f5f5f6;
+  --c-pre-text: #262f3f;
+  --c-pre-border: transparent;
+  --c-table-cell-border: rgba(217, 219, 221, 0.5);
+  --c-form-label-text: #262f3f;
+  --c-inline-var-text: rgba(0, 11, 29, 0.85);
+  --c-inline-kbd-border: rgba(0, 11, 29, 0.15);
+  --c-inline-kbd-text: rgba(0, 11, 29, 0.85);
+  --c-inline-code-background: #f5f5f6;
+  --c-inline-code-text: rgba(0, 11, 29, 0.85);
+  --c-button-default-base-background: #ffffff;
+  --c-button-default-base-border: #d9dbdd;
+  --c-button-default-base-text: #262f3f;
+  --c-button-default-hover-background: #f5f5f6;
+  --c-button-default-hover-border: #d9dbdd;
+  --c-button-default-hover-text: #000b1d;
+  --c-button-default-disabled-background: #ffffff;
+  --c-button-default-disabled-border: #d9dbdd;
+  --c-button-default-disabled-text: rgba(0, 11, 29, 0.85);
+  --c-button-primary-base-background: #0058fb;
+  --c-button-primary-base-border: transparent;
+  --c-button-primary-base-text: #edf3ff;
+  --c-button-primary-hover-background: #0044c3;
+  --c-button-primary-hover-border: transparent;
+  --c-button-primary-hover-text: #edf3ff;
+  --c-button-primary-disabled-background: #000b1d;
+  --c-button-primary-disabled-border: transparent;
+  --c-button-primary-disabled-text: rgba(237, 243, 255, 0.75);
+  --c-button-secondary-base-background: #000b1d;
+  --c-button-secondary-base-border: transparent;
+  --c-button-secondary-base-text: #f5f5f6;
+  --c-button-secondary-hover-background: #262f3f;
+  --c-button-secondary-hover-border: transparent;
+  --c-button-secondary-hover-text: #f5f5f6;
+  --c-button-secondary-disabled-background: #000b1d;
+  --c-button-secondary-disabled-border: transparent;
+  --c-button-secondary-disabled-text: rgba(245, 245, 246, 0.75);
+  --c-input-default-base-text: #262f3f;
+  --c-input-default-base-border: #d9dbdd;
+  --c-input-default-base-background: #ffffff;
+  --c-input-default-focus-border: rgba(0, 88, 251, 0.5);
+  --c-input-default-focus-shadow: rgba(0, 88, 251, 0.3);
+  --c-input-error-base-text: #bf3d66;
+  --c-input-error-base-border: rgba(255, 79, 127, 0.5);
+  --c-input-error-base-shadow: rgba(255, 79, 127, 0.3);
+  --c-input-error-focus-border: #ff4f7f;
+  --c-hint-default: rgba(38, 47, 63, 0.55);
+  --c-hint-success: #00b4a8;
+  --c-hint-error: #bf3d66;
+  --c-hint-required: #bf3d66;
+  --c-line-default: #d9dbdd99;
+  --c-shadow-neutral-100-1: rgba(0, 11, 29, 0.15);
+  --c-shadow-neutral-100-2: rgba(0, 11, 29, 0.06);
+  --c-shadow-neutral-200-1: rgba(0, 11, 29, 0.12);
+  --c-shadow-neutral-200-2: rgba(0, 11, 29, 0.06);
+  --c-shadow-neutral-300: rgba(0, 11, 29, 0.2);
+  --c-background-light: #ffffff;
+  --c-background-dark: #000b1d;
 
   *,
   *::before,
@@ -301,6 +299,10 @@
 
   a {
     color: var(--c-link-default-base);
+
+    &:hover {
+      color: var(--c-link-default-hover);
+    }
   }
 
   h1,
@@ -615,12 +617,12 @@
     margin-bottom: 1.5em;
     height: 10px;
   }
-  hr:before {
+  hr::before {
     content: '';
     position: absolute;
     top: 50%;
   }
-  hr:before {
+  hr::before {
     width: 100%;
     max-width: 100%;
     margin-top: -0.5px;

diff --git a/assets/scss/components/_input.scss b/assets/scss/components/_input.scss
@@ -86,6 +86,7 @@
 
   &--postfix::after {
     content: attr(data-postfix);
+    pointer-events: none;
     position: absolute;
     right: 15px;
     top: 50%;

diff --git a/components/StaticArticle.vue b/components/StaticArticle.vue
@@ -23,22 +23,24 @@
 </i18n>
 
 <script setup lang="ts">
-import { Page } from '@heseya/store-core'
+import type { Page } from '@heseya/store-core'
 
 const props = defineProps<{
   page: Page
 }>()
 
 useSeo(() => [props.page?.seo, { title: props.page?.name }])
 
+usePageJsonLd(props.page)
+
 const breadcrumbs = computed(() => [
   { label: props.page?.name || '', link: `/${props.page?.slug}` },
 ])
 </script>
 
 <style lang="scss" scoped>
 .page {
-  max-width: $content-width;
+  max-width: $container-width;
   margin: auto;
 
   &__title {

diff --git a/components/SubcategoriesLinks.vue b/components/SubcategoriesLinks.vue
@@ -31,7 +31,7 @@
 </template>
 
 <script setup lang="ts">
-import { HeseyaPaginationMeta, ProductSet, ProductSetList } from '@heseya/store-core'
+import type { HeseyaPaginationMeta, ProductSet, ProductSetList } from '@heseya/store-core'
 import ChevronIcon from '@/assets/icons/chevron.svg?component'
 
 const props = defineProps<{

diff --git a/components/about/partnerCarousel/Index.vue b/components/about/partnerCarousel/Index.vue
@@ -5,16 +5,16 @@
     </LayoutHeader>
 
     <LayoutCarousel :items="partners || []" :breakpoints="breakpoints">
-      <template #item="partner: TranslatedAboutPartner">
+      <template #item="partner">
         <AboutPartnerCarouselItem :partner="partner" />
       </template>
     </LayoutCarousel>
   </div>
 </template>
 
 <script lang="ts" setup>
-import { SwiperOptions } from 'swiper/types'
-import { TranslatedAboutPartner } from '@/interfaces/aboutPage'
+import type { SwiperOptions } from 'swiper/types'
+import type { TranslatedAboutPartner } from '@/interfaces/aboutPage'
 
 defineProps<{
   title: string