diff --git a/frontend/.gitignore b/frontend/.gitignore index 5379696..40aa9dc 100644 --- a/frontend/.gitignore +++ b/frontend/.gitignore @@ -22,3 +22,4 @@ node_modules .env .env.* !.env.example +/test-results/.last-run.json diff --git a/frontend/assets/css/typo.utils.css b/frontend/assets/css/typo.utils.css index 43e281a..763b533 100644 --- a/frontend/assets/css/typo.utils.css +++ b/frontend/assets/css/typo.utils.css @@ -55,27 +55,27 @@ /* TYPE PARAGRAPH */ @utility typo-p-2xl { - @apply text-[24px] leading-[40px] font-light ; + @apply text-[24px] leading-[42px] font-light ; } @utility typo-p-xl { - @apply text-[20px] leading-[32px] font-light ; + @apply text-[20px] leading-[34px] font-light ; } @utility typo-p-lg { - @apply text-[18px] leading-[32px] font-light ; + @apply text-[18px] leading-[34px] font-light ; } @utility typo-p-md { - @apply text-[16px] leading-[28px] font-light ; + @apply text-[16px] leading-[30px] font-light ; } @utility typo-p-sm { - @apply text-[14px] leading-[24px] font-light ; + @apply text-[14px] leading-[26px] font-light ; } @utility typo-p-xs { - @apply text-[12px] leading-[16px] font-light ; + @apply text-[12px] leading-[18px] font-light ; } /* TYPO LABEL */ diff --git a/frontend/components/articles/ArticlesList.vue b/frontend/components/articles/ArticlesList.vue new file mode 100644 index 0000000..4413d94 --- /dev/null +++ b/frontend/components/articles/ArticlesList.vue @@ -0,0 +1,63 @@ + + + + + \ No newline at end of file diff --git a/frontend/components/global/BlogPost.vue b/frontend/components/global/BlogPost.vue index 485bf58..76f425f 100644 --- a/frontend/components/global/BlogPost.vue +++ b/frontend/components/global/BlogPost.vue @@ -3,12 +3,11 @@ // types type Props = { + id: number; tag: string; date: string; - comments: number; title: string; description: string; - link: string; variant?: "sm" | "lg"; image: string, } @@ -23,96 +22,95 @@ const {} = toRefs(props); \ No newline at end of file diff --git a/frontend/components/global/products/FilterProducts.vue b/frontend/components/global/products/FilterProducts.vue index daadb14..2dcd364 100644 --- a/frontend/components/global/products/FilterProducts.vue +++ b/frontend/components/global/products/FilterProducts.vue @@ -44,9 +44,7 @@ const filters = computed(() => { const { data: categories, suspense } = useGetCategories(); -await useAsyncData(async () => { - await suspense(); -}); +await suspense(); const { isPending: productsIsPending } = useGetProducts(filters); diff --git a/frontend/components/home/Hero.vue b/frontend/components/home/Hero.vue index 02843e5..adf07db 100644 --- a/frontend/components/home/Hero.vue +++ b/frontend/components/home/Hero.vue @@ -10,6 +10,7 @@ import useHomeData from "~/composables/api/home/useHomeData"; const { data: homeData } = useHomeData(); const swiper_instance = ref(null); +const isMuted = ref(true); // methods @@ -37,18 +38,29 @@ const onChange = (swiper: SwiperClass) => { @slide-change="onChange" >
-
-
-
- - -
-
- - -
-
+ + + \ No newline at end of file diff --git a/frontend/components/product/ProductHero.vue b/frontend/components/product/ProductHero.vue index baad819..e186b38 100644 --- a/frontend/components/product/ProductHero.vue +++ b/frontend/components/product/ProductHero.vue @@ -3,6 +3,7 @@ // import import useGetProduct from "~/composables/api/product/useGetProduct"; +import { sanitize } from "isomorphic-dompurify"; // state @@ -14,6 +15,9 @@ const { data: product } = useGetProduct(id); const quantity = ref(1); const selectedSlide = ref(0); + +// computed + const slides = computed(() => { return [ { @@ -30,6 +34,11 @@ const slides = computed(() => { } ]; }); + +const sanitizedProductDescription = computed(() => { + return sanitize(product.value!.description); +}); +