diff --git a/package-lock.json b/package-lock.json index 854c6f2..17d3362 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,6 @@ "axios": "^1.2.1", "pinia": "^2.0.11", "quasar": "^2.6.0", - "swiper": "^11.0.5", "v-mask": "^2.3.0", "vee-validate": "^4.12.2", "vue": "^3.0.0", @@ -23,6 +22,7 @@ "zod": "^3.22.4" }, "devDependencies": { + "@babel/types": "^7.23.6", "@faker-js/faker": "^8.3.1", "@quasar/app-vite": "^1.3.0", "@types/node": "^12.20.21", @@ -51,6 +51,24 @@ "node": ">=0.10.0" } }, + "node_modules/@babel/helper-string-parser": { + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz", + "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-identifier": { + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", + "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, "node_modules/@babel/parser": { "version": "7.23.6", "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.6.tgz", @@ -62,6 +80,20 @@ "node": ">=6.0.0" } }, + "node_modules/@babel/types": { + "version": "7.23.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.6.tgz", + "integrity": "sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==", + "dev": true, + "dependencies": { + "@babel/helper-string-parser": "^7.23.4", + "@babel/helper-validator-identifier": "^7.22.20", + "to-fast-properties": "^2.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, "node_modules/@eslint-community/eslint-utils": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", @@ -5287,24 +5319,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/swiper": { - "version": "11.0.5", - "resolved": "https://registry.npmjs.org/swiper/-/swiper-11.0.5.tgz", - "integrity": "sha512-rhCwupqSyRnWrtNzWzemnBLMoyYuoDgGgspAm/8iBD3jCvAWycPLH4Z3TB0O5520DHLzMx94yUMH/B9Efpa48w==", - "funding": [ - { - "type": "patreon", - "url": "https://www.patreon.com/swiperjs" - }, - { - "type": "open_collective", - "url": "http://opencollective.com/swiper" - } - ], - "engines": { - "node": ">= 4.7.0" - } - }, "node_modules/table": { "version": "6.8.1", "resolved": "https://registry.npmjs.org/table/-/table-6.8.1.tgz", @@ -5383,6 +5397,15 @@ "node": ">=0.6.0" } }, + "node_modules/to-fast-properties": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", + "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", + "dev": true, + "engines": { + "node": ">=4" + } + }, "node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", diff --git a/package.json b/package.json index 890ef42..2519361 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,8 @@ "dev": "quasar dev -m ssr", "backend": "json-server -p 5000 -d 3000 -w src/services/json-server/db.json", "build": "quasar build -m ssr", - "start:build": "npm run build && cd dist/ssr && npm i && npm run start" + "start:build": "npm run build && cd dist/ssr && npm i && npm run start", + "typecheck": "tsc --project tsconfig.json --noEmit" }, "dependencies": { "@quasar/extras": "^1.16.4", @@ -20,7 +21,6 @@ "axios": "^1.2.1", "pinia": "^2.0.11", "quasar": "^2.6.0", - "swiper": "^11.0.5", "v-mask": "^2.3.0", "vee-validate": "^4.12.2", "vue": "^3.0.0", @@ -29,6 +29,7 @@ "zod": "^3.22.4" }, "devDependencies": { + "@babel/types": "^7.23.6", "@faker-js/faker": "^8.3.1", "@quasar/app-vite": "^1.3.0", "@types/node": "^12.20.21", diff --git a/src/components/@inputs/Calendar.vue b/src/components/@inputs/Calendar.vue index a7e08fa..d6deadd 100644 --- a/src/components/@inputs/Calendar.vue +++ b/src/components/@inputs/Calendar.vue @@ -1,22 +1,103 @@ - - diff --git a/src/components/@inputs/PostalCode.vue b/src/components/@inputs/PostalCode.vue index b12d09b..0aa2122 100644 --- a/src/components/@inputs/PostalCode.vue +++ b/src/components/@inputs/PostalCode.vue @@ -1,22 +1,62 @@ - - diff --git a/src/components/@inputs/PriceRange.vue b/src/components/@inputs/PriceRange.vue index bfd8f31..35642ca 100644 --- a/src/components/@inputs/PriceRange.vue +++ b/src/components/@inputs/PriceRange.vue @@ -34,11 +34,7 @@ export default defineComponent({ setup() { const rangePriceStore = useRangePriceStore(); - const handleChange = (e: Event) => { - console.log(e); - }; - - return { rangePriceStore, handleChange }; + return { rangePriceStore }; }, }); diff --git a/src/components/@inputs/SortSelect.vue b/src/components/@inputs/SortSelect.vue new file mode 100644 index 0000000..09e14b5 --- /dev/null +++ b/src/components/@inputs/SortSelect.vue @@ -0,0 +1,82 @@ + + + + + diff --git a/src/components/ExampleComponent.vue b/src/components/ExampleComponent.vue deleted file mode 100644 index 3bfd35e..0000000 --- a/src/components/ExampleComponent.vue +++ /dev/null @@ -1,64 +0,0 @@ - - - diff --git a/src/components/header/NavLinks.vue b/src/components/header/NavLinks.vue index b1984a8..cee4bfc 100644 --- a/src/components/header/NavLinks.vue +++ b/src/components/header/NavLinks.vue @@ -2,23 +2,23 @@ diff --git a/src/components/header/UserArea.vue b/src/components/header/UserArea.vue index 0bf0327..c6efa5b 100644 --- a/src/components/header/UserArea.vue +++ b/src/components/header/UserArea.vue @@ -1,17 +1,15 @@ diff --git a/src/components/icons/credit-flags/IconAny.vue b/src/components/icons/credit-flags/IconAny.vue new file mode 100644 index 0000000..d6cf52e --- /dev/null +++ b/src/components/icons/credit-flags/IconAny.vue @@ -0,0 +1,7 @@ + diff --git a/src/components/icons/credit-flags/IconExpress.vue b/src/components/icons/credit-flags/IconExpress.vue new file mode 100644 index 0000000..68a900e --- /dev/null +++ b/src/components/icons/credit-flags/IconExpress.vue @@ -0,0 +1,54 @@ + diff --git a/src/components/icons/credit-flags/IconExprex.vue b/src/components/icons/credit-flags/IconExprex.vue new file mode 100644 index 0000000..68a900e --- /dev/null +++ b/src/components/icons/credit-flags/IconExprex.vue @@ -0,0 +1,54 @@ + diff --git a/src/components/icons/credit-flags/IconMaster.vue b/src/components/icons/credit-flags/IconMaster.vue new file mode 100644 index 0000000..16b1a07 --- /dev/null +++ b/src/components/icons/credit-flags/IconMaster.vue @@ -0,0 +1,42 @@ + + + diff --git a/src/components/icons/credit-flags/IconVisa.vue b/src/components/icons/credit-flags/IconVisa.vue new file mode 100644 index 0000000..fa598f3 --- /dev/null +++ b/src/components/icons/credit-flags/IconVisa.vue @@ -0,0 +1,28 @@ + diff --git a/src/components/icons/svg/ArrowCircleFilledLeft.svg b/src/components/icons/svg/ArrowCircleFilledLeft.svg new file mode 100644 index 0000000..fa7240e --- /dev/null +++ b/src/components/icons/svg/ArrowCircleFilledLeft.svg @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/src/components/icons/svg/ArrowCircleFilledRight.svg b/src/components/icons/svg/ArrowCircleFilledRight.svg new file mode 100644 index 0000000..31ecbba --- /dev/null +++ b/src/components/icons/svg/ArrowCircleFilledRight.svg @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/src/components/models.ts b/src/components/models.ts deleted file mode 100644 index 6945920..0000000 --- a/src/components/models.ts +++ /dev/null @@ -1,8 +0,0 @@ -export interface Todo { - id: number; - content: string; -} - -export interface Meta { - totalCount: number; -} diff --git a/src/components/quasar-components/carousel/HorizontalCarousel.vue b/src/components/quasar-components/carousel/HorizontalCarousel.vue index 035449c..611ae6a 100644 --- a/src/components/quasar-components/carousel/HorizontalCarousel.vue +++ b/src/components/quasar-components/carousel/HorizontalCarousel.vue @@ -1,29 +1,87 @@ + + diff --git a/src/components/quasar-components/carousel/VerticalCarouselImgs.vue b/src/components/quasar-components/carousel/VerticalCarouselImgs.vue index 51fd6a5..f30c31b 100644 --- a/src/components/quasar-components/carousel/VerticalCarouselImgs.vue +++ b/src/components/quasar-components/carousel/VerticalCarouselImgs.vue @@ -44,14 +44,12 @@ - + - + @@ -63,7 +61,6 @@ import { PropType, defineComponent, ref } from 'vue'; import { storeToRefs } from 'pinia'; import Calendar from 'src/components/@inputs/Calendar.vue'; import PostalCode from 'src/components/@inputs/PostalCode.vue'; -import IconMouse from 'src/components/icons/IconMouse.vue'; import IconSearch from 'src/components/icons/IconSearch.vue'; import { useMobileStore } from 'src/stores/mobileNav'; @@ -93,7 +90,7 @@ export default defineComponent({ screenWidth, }; }, - components: { IconMouse, IconSearch, Calendar, PostalCode }, + components: { IconSearch, Calendar, PostalCode }, }); @@ -138,10 +135,27 @@ export default defineComponent({ flex-wrap: wrap; border-radius: 10px 0 0 10px; overflow: hidden; - margin-bottom: 82px; + /* margin-bottom: 82px; */ + min-height: 150px; & .carousel-content-item { + display: flex; + align-items: center; padding: 27px 53px 34px 48px; flex: 1; + position: relative; + &:first-child::after { + content: ''; + position: absolute; + width: 1px; + opacity: 0.2; + background-color: $text-normal-100; + right: 0; + top: 27px; + bottom: 29px; + @media only screen and (max-width: $med-md) { + display: none; + } + } &.btn { &:focus, &:focus-visible { diff --git a/src/components/quasar-components/dropdown/DropdownItem.vue b/src/components/quasar-components/dropdown/DropdownItem.vue index 085fe2e..e1aea2f 100644 --- a/src/components/quasar-components/dropdown/DropdownItem.vue +++ b/src/components/quasar-components/dropdown/DropdownItem.vue @@ -1,5 +1,5 @@ - - diff --git a/src/components/sections/InfoSection.vue b/src/components/sections/InfoSection.vue index ce214a4..7f09d55 100644 --- a/src/components/sections/InfoSection.vue +++ b/src/components/sections/InfoSection.vue @@ -12,9 +12,12 @@ sin intermediarios.

- + ¿Quieres saber más? - + diff --git a/src/components/sections/QuestionSection.vue b/src/components/sections/QuestionSection.vue index d8857af..714c42b 100644 --- a/src/components/sections/QuestionSection.vue +++ b/src/components/sections/QuestionSection.vue @@ -1,9 +1,10 @@ + + diff --git a/src/components/ui/Card.vue b/src/components/ui/Card.vue index 32feb0c..05c9823 100644 --- a/src/components/ui/Card.vue +++ b/src/components/ui/Card.vue @@ -10,7 +10,12 @@

-{{ discount }}%

- +
@@ -23,7 +28,7 @@

{{ productValue }}€

-

+

{{ valueWithDiscount() }}€

@@ -32,7 +37,7 @@ + + diff --git a/src/components/ui/MobileNav.vue b/src/components/ui/MobileNav.vue index 948b0a0..06e52bf 100644 --- a/src/components/ui/MobileNav.vue +++ b/src/components/ui/MobileNav.vue @@ -1,11 +1,19 @@ @@ -161,7 +264,16 @@ export default defineComponent({ padding: 4px 30px 4px 14px; } &.order-filter { - padding: 4px 30px 4px 14px; + padding: 4px 10px 4px 20px; + text-align: end; + border-radius: 10px 0px 0px 10px; + &.active { + border-radius: 10px 0px 0px 0px; + } + + & .order-filters { + position: relative; + } } &.filters { @@ -175,6 +287,7 @@ export default defineComponent({ & .filter-btn { padding: 8px; border-radius: 0 30px 30px 0; + &.availability, &.price-order { position: absolute; @@ -188,6 +301,7 @@ export default defineComponent({ &.price-order { right: -33px; padding: 9.5px; + top: 0; } } @@ -195,6 +309,7 @@ export default defineComponent({ display: flex; gap: 40px; margin-right: 33px; + align-items: flex-start; } @media only screen and (max-width: $med-md) { diff --git a/src/pages/CheckoutPage.vue b/src/pages/CheckoutPage.vue index 5c84fa8..b264577 100644 --- a/src/pages/CheckoutPage.vue +++ b/src/pages/CheckoutPage.vue @@ -1,152 +1,410 @@ - diff --git a/src/pages/HomePage.vue b/src/pages/HomePage.vue index 880ecd1..b8d33cd 100644 --- a/src/pages/HomePage.vue +++ b/src/pages/HomePage.vue @@ -4,11 +4,6 @@ - -

@@ -44,7 +39,7 @@

-
+

Nuestra selección de plantas para el verano @@ -58,7 +53,42 @@

- + + + + + + + + +