diff --git a/apps/app/src/pages/Home/Home.tsx b/apps/app/src/pages/Home/Home.tsx index 40c18a0e..8c8a985b 100644 --- a/apps/app/src/pages/Home/Home.tsx +++ b/apps/app/src/pages/Home/Home.tsx @@ -2,7 +2,7 @@ import { Header } from '../../components/Header'; import c from './Home.module.scss'; import TopCompaniesSection from './sections/TopCompaniesSection'; import EventsSection from './sections/EventsSection'; -import LocationSection from '@/components/LocationSection'; +import LocationSection from '../../components/LocationSection'; const HomePage = () => { return ( diff --git a/apps/app/src/pages/ShoppingPage/ShoppingPage.module.scss b/apps/app/src/pages/ShoppingPage/ShoppingPage.module.scss index e274299e..139597f9 100644 --- a/apps/app/src/pages/ShoppingPage/ShoppingPage.module.scss +++ b/apps/app/src/pages/ShoppingPage/ShoppingPage.module.scss @@ -1,39 +1,2 @@ -.header { - display: flex; - justify-content: space-between; - margin-bottom: 2rem; -} -.wrapper { - padding-top: 4rem; - padding-left: 1.5rem; - padding-right: 1.5rem; - padding-bottom: 2rem; - background: $primary-black; -} -.title { - @include heading-2; - color: $white-text; -} - -.navigation { - display: flex; - gap: 6px; -} - -.navButton { - background: $black-90; - border: none; - border-radius: 0.5rem; - display: block; - padding: 17.5px 45px; - display: flex; - flex-direction: column; - gap: 12px; - - p { - @include paragraph-16; - color: $white-text; - } -} diff --git a/apps/app/src/pages/ShoppingPage/ShoppingPage.tsx b/apps/app/src/pages/ShoppingPage/ShoppingPage.tsx index 549338ae..45c468ca 100644 --- a/apps/app/src/pages/ShoppingPage/ShoppingPage.tsx +++ b/apps/app/src/pages/ShoppingPage/ShoppingPage.tsx @@ -1,25 +1,12 @@ -import CrossIcon from '@/assets/icons/cross-icon.svg'; import styles from './ShoppingPage.module.scss'; -import TransactionsIcon from '@/assets/icons/transactions-icon.svg'; -import ShoppingCartIcon from '@/assets/icons/shopping-cart-icon.svg'; +import ShoppingItems from './sections/ShoppingItems'; +import ShoppingHeader from './sections/ShoppingHeader'; export const ShoppingPage = () => { return (
-
-

SHOPPING

- -
-
- - -
+ +
); }; diff --git a/apps/app/src/pages/ShoppingPage/sections/ShoppingHeader/ShoppingHeader.module.scss b/apps/app/src/pages/ShoppingPage/sections/ShoppingHeader/ShoppingHeader.module.scss new file mode 100644 index 00000000..f936b568 --- /dev/null +++ b/apps/app/src/pages/ShoppingPage/sections/ShoppingHeader/ShoppingHeader.module.scss @@ -0,0 +1,41 @@ +.header { + display: flex; + justify-content: space-between; + margin-bottom: 2rem; +} + +.headerContainer { + padding-top: 4rem; + padding-left: 1.5rem; + padding-right: 1.5rem; + padding-bottom: 2rem; + background: $primary-black; + height: 300px; +} + +.title { + @include heading-2; + color: $white-text; + font-weight: 500; +} + +.navigation { + display: flex; + gap: 6px; +} + +.navButton { + background: $black-90; + border: none; + border-radius: 0.5rem; + display: block; + padding: 17.5px 45px; + display: flex; + flex-direction: column; + gap: 12px; + + p { + @include paragraph-16; + color: $white-text; + } +} diff --git a/apps/app/src/pages/ShoppingPage/sections/ShoppingHeader/ShoppingHeader.tsx b/apps/app/src/pages/ShoppingPage/sections/ShoppingHeader/ShoppingHeader.tsx new file mode 100644 index 00000000..68f889ee --- /dev/null +++ b/apps/app/src/pages/ShoppingPage/sections/ShoppingHeader/ShoppingHeader.tsx @@ -0,0 +1,27 @@ +import styles from './ShoppingHeader.module.scss' +import CrossIcon from '@/assets/icons/cross-icon.svg'; +import TransactionsIcon from '@/assets/icons/transactions-icon.svg'; +import ShoppingCartIcon from '@/assets/icons/shopping-cart-icon.svg'; + +const ShoppingHeader = () => { + return ( +
+
+

SHOPPING

+ +
+
+ + +
+
+ ) +} + +export default ShoppingHeader \ No newline at end of file diff --git a/apps/app/src/pages/ShoppingPage/sections/ShoppingHeader/index.ts b/apps/app/src/pages/ShoppingPage/sections/ShoppingHeader/index.ts new file mode 100644 index 00000000..f187d630 --- /dev/null +++ b/apps/app/src/pages/ShoppingPage/sections/ShoppingHeader/index.ts @@ -0,0 +1,3 @@ +import ShoppingHeader from "./ShoppingHeader"; + +export default ShoppingHeader; diff --git a/apps/app/src/pages/ShoppingPage/sections/ShoppingItems/ShoppingItems.module.scss b/apps/app/src/pages/ShoppingPage/sections/ShoppingItems/ShoppingItems.module.scss new file mode 100644 index 00000000..f0127685 --- /dev/null +++ b/apps/app/src/pages/ShoppingPage/sections/ShoppingItems/ShoppingItems.module.scss @@ -0,0 +1,51 @@ +.shoppingItemsWrapper { + border-top-right-radius: 1rem; + border-top-left-radius: 1rem; + height: auto; + z-index: 5; + position: absolute; + top: 266px; + bottom: 0; + left: 0; + right: 0; + background: $primary-background; + padding: 1.5rem; + /* overflow-y: scroll; */ + display: flex; + flex-direction: column; +} + +.shoppingUserPoints { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + gap: 0.5rem; + padding: 10px 1.5rem; + background: $primary-beige; + border-radius: 0.5rem; + + p { + @include paragraph-16; + color: $black-70; + } + + .points { + display: flex; + gap: 3px; + height: 28px; + img { + height: 22px; + width: 22px; + } + span { + @include heading-2; + } + } +} + +.shoppingItemsContainer { +} + +.shoppingItem { +} diff --git a/apps/app/src/pages/ShoppingPage/sections/ShoppingItems/ShoppingItems.tsx b/apps/app/src/pages/ShoppingPage/sections/ShoppingItems/ShoppingItems.tsx new file mode 100644 index 00000000..d6341fb0 --- /dev/null +++ b/apps/app/src/pages/ShoppingPage/sections/ShoppingItems/ShoppingItems.tsx @@ -0,0 +1,18 @@ +import styles from './ShoppingItems.module.scss'; +import StarIcon from '@/assets/icons/rating-star-1.svg'; + +const ShoppingItems = () => { + return ( +
+
+

Tvoje stanje s bodovima

+
+ + 299 +
+
+
+ ) +} + +export default ShoppingItems \ No newline at end of file diff --git a/apps/app/src/pages/ShoppingPage/sections/ShoppingItems/index.ts b/apps/app/src/pages/ShoppingPage/sections/ShoppingItems/index.ts new file mode 100644 index 00000000..513005b6 --- /dev/null +++ b/apps/app/src/pages/ShoppingPage/sections/ShoppingItems/index.ts @@ -0,0 +1,3 @@ +import ShoppingItems from './ShoppingItems'; + +export default ShoppingItems;