From 8355ebb740648168c79419924586d41122c0665d Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Tue, 29 Sep 2020 19:39:16 -0300 Subject: [PATCH 1/3] Changes to Button --- .../product/ProductView/ProductView.module.css | 5 +++++ components/product/ProductView/ProductView.tsx | 12 ++++++++---- components/ui/Button/Button.module.css | 6 +++++- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/components/product/ProductView/ProductView.module.css b/components/product/ProductView/ProductView.module.css index 3ee34e54a..8d459b9dc 100644 --- a/components/product/ProductView/ProductView.module.css +++ b/components/product/ProductView/ProductView.module.css @@ -1,3 +1,8 @@ .root { @apply flex flex-row h-screen py-12; } + +.button { + @apply py-5 uppercase text-center; + min-width: 300px; +} diff --git a/components/product/ProductView/ProductView.tsx b/components/product/ProductView/ProductView.tsx index e5ed41262..b29a2c4d6 100644 --- a/components/product/ProductView/ProductView.tsx +++ b/components/product/ProductView/ProductView.tsx @@ -17,10 +17,14 @@ const ProductView: FunctionComponent = ({ productData, className }) => { const rootClassName = cn(s.root, className); return (
-
-

T-Shirt

+
+

+ T-Shirt +

+
+ $50 +
-
T-Shirt
@@ -57,7 +61,7 @@ const ProductView: FunctionComponent = ({ productData, className }) => {

{productData.description}

- +
diff --git a/components/ui/Button/Button.module.css b/components/ui/Button/Button.module.css index 2244ccb5c..c067e78e8 100644 --- a/components/ui/Button/Button.module.css +++ b/components/ui/Button/Button.module.css @@ -1,5 +1,5 @@ .root { - @apply cursor-pointer inline-flex items-center px-8 py-2 rounded-sm border border-transparent text-base leading-6 text-white bg-black transition ease-in-out duration-150 shadow-sm font-medium; + @apply cursor-pointer inline-flex px-8 py-2 rounded-sm border border-transparent leading-6 text-white bg-black transition ease-in-out duration-150 shadow-sm font-medium text-center justify-center; } .root:hover { @@ -13,3 +13,7 @@ .root:active { @apply bg-gray-700; } + +s.filled { + @apply text-white bg-black; +} From bfcdbb24497325b11c81a96af277e069e9a7d06b Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Tue, 29 Sep 2020 19:55:48 -0300 Subject: [PATCH 2/3] Adding Icons --- components/core/index.ts | 8 ++-- components/icon/Bag.tsx | 38 ++++++++++++++++ components/icon/Heart.tsx | 24 ++++++++++ components/icon/Trash.tsx | 45 +++++++++++++++++++ .../product/ProductView/ProductView.tsx | 10 ++--- components/ui/Button/Button.module.css | 2 +- 6 files changed, 117 insertions(+), 10 deletions(-) create mode 100644 components/icon/Bag.tsx create mode 100644 components/icon/Heart.tsx create mode 100644 components/icon/Trash.tsx diff --git a/components/core/index.ts b/components/core/index.ts index faf5aea3e..f402d710d 100644 --- a/components/core/index.ts +++ b/components/core/index.ts @@ -1,6 +1,6 @@ export { default as Avatar } from "./Avatar"; -export { default as Footer } from "./Footer"; -export { default as Navbar } from "./Navbar"; -export { default as Searchbar } from "./Searchbar"; -export { default as Layout } from "./Layout"; export { default as Featurebar } from "./Featurebar"; +export { default as Footer } from "./Footer"; +export { default as Layout } from "./Layout"; +export { default as Navbar } from "./Avatar"; +export { default as Searchbar } from "./Avatar"; diff --git a/components/icon/Bag.tsx b/components/icon/Bag.tsx new file mode 100644 index 000000000..6893fbac8 --- /dev/null +++ b/components/icon/Bag.tsx @@ -0,0 +1,38 @@ +import React from "react"; + +const Bag = ({ ...props }) => { + return ( + + + + + + ); +}; + +export default Bag; diff --git a/components/icon/Heart.tsx b/components/icon/Heart.tsx new file mode 100644 index 000000000..051f57b01 --- /dev/null +++ b/components/icon/Heart.tsx @@ -0,0 +1,24 @@ +import React from "react"; + +const Heart = ({ ...props }) => { + return ( + + + + ); +}; + +export default Heart; diff --git a/components/icon/Trash.tsx b/components/icon/Trash.tsx new file mode 100644 index 000000000..76b0fbc83 --- /dev/null +++ b/components/icon/Trash.tsx @@ -0,0 +1,45 @@ +import React from "react"; + +const Trash = ({ ...props }) => { + return ( + + + + + + + ); +}; + +export default Trash; diff --git a/components/product/ProductView/ProductView.tsx b/components/product/ProductView/ProductView.tsx index b29a2c4d6..a6a74cd4d 100644 --- a/components/product/ProductView/ProductView.tsx +++ b/components/product/ProductView/ProductView.tsx @@ -40,19 +40,19 @@ const ProductView: FunctionComponent = ({ productData, className }) => {

Size

- + S - + M - + L - + XL - + XXL
diff --git a/components/ui/Button/Button.module.css b/components/ui/Button/Button.module.css index c067e78e8..df6b46eb5 100644 --- a/components/ui/Button/Button.module.css +++ b/components/ui/Button/Button.module.css @@ -1,5 +1,5 @@ .root { - @apply cursor-pointer inline-flex px-8 py-2 rounded-sm border border-transparent leading-6 text-white bg-black transition ease-in-out duration-150 shadow-sm font-medium text-center justify-center; + @apply cursor-pointer inline-flex px-8 py-2 rounded-sm border border-transparent leading-6 text-white bg-black transition ease-in-out duration-150 shadow-sm font-semibold text-center justify-center; } .root:hover { From 5e115ade3c065be5babb3ad1bc66a16793d44011 Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Tue, 29 Sep 2020 20:00:09 -0300 Subject: [PATCH 3/3] Adding Icons --- components/core/Navbar/Navbar.tsx | 5 ++++- components/core/index.ts | 4 ++-- components/icon/index.ts | 3 +++ 3 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 components/icon/index.ts diff --git a/components/core/Navbar/Navbar.tsx b/components/core/Navbar/Navbar.tsx index 8cb8b2143..e849205d3 100644 --- a/components/core/Navbar/Navbar.tsx +++ b/components/core/Navbar/Navbar.tsx @@ -3,6 +3,7 @@ import React, { FunctionComponent } from "react"; import s from "./Navbar.module.css"; import { Logo, Container } from "@components/ui"; import { Avatar, Searchbar } from "@components/core"; +import { Heart, Bag } from "@components/icon"; interface Props { className?: string; children?: any; @@ -21,7 +22,9 @@ const Navbar: FunctionComponent = ({ className }) => { Accesories -