From d43d3be0b7e98d2f8beb4e92665496b860699f1b Mon Sep 17 00:00:00 2001 From: Celine Choi Date: Wed, 11 Oct 2023 01:01:26 -0700 Subject: [PATCH 1/7] fixed prettier and eslint issues --- package-lock.json | 58 ++++++++++++++++++++++++++++++++++++ package.json | 3 ++ src/app/storefront/page.tsx | 27 +++++++++++++++-- src/app/storefront/styles.ts | 23 ++++++++++++++ 4 files changed, 109 insertions(+), 2 deletions(-) create mode 100644 src/app/storefront/styles.ts diff --git a/package-lock.json b/package-lock.json index 54b0cc3d..40271472 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,6 +8,9 @@ "name": "shanti-project", "version": "0.1.0", "dependencies": { + "@fortawesome/fontawesome-free": "^6.4.2", + "@fortawesome/free-solid-svg-icons": "^6.4.2", + "@fortawesome/react-fontawesome": "^0.2.0", "@supabase/supabase-js": "^2.37.0", "@types/node": "20.6.3", "@types/react": "18.2.22", @@ -2141,6 +2144,61 @@ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, + "node_modules/@fortawesome/fontawesome-common-types": { + "version": "6.4.2", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.4.2.tgz", + "integrity": "sha512-1DgP7f+XQIJbLFCTX1V2QnxVmpLdKdzzo2k8EmvDOePfchaIGQ9eCHj2up3/jNEbZuBqel5OxiaOJf37TWauRA==", + "hasInstallScript": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/@fortawesome/fontawesome-free": { + "version": "6.4.2", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.4.2.tgz", + "integrity": "sha512-m5cPn3e2+FDCOgi1mz0RexTUvvQibBebOUlUlW0+YrMjDTPkiJ6VTKukA1GRsvRw+12KyJndNjj0O4AgTxm2Pg==", + "hasInstallScript": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/@fortawesome/fontawesome-svg-core": { + "version": "6.4.2", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.4.2.tgz", + "integrity": "sha512-gjYDSKv3TrM2sLTOKBc5rH9ckje8Wrwgx1CxAPbN5N3Fm4prfi7NsJVWd1jklp7i5uSCVwhZS5qlhMXqLrpAIg==", + "hasInstallScript": true, + "peer": true, + "dependencies": { + "@fortawesome/fontawesome-common-types": "6.4.2" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@fortawesome/free-solid-svg-icons": { + "version": "6.4.2", + "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.4.2.tgz", + "integrity": "sha512-sYwXurXUEQS32fZz9hVCUUv/xu49PEJEyUOsA51l6PU/qVgfbTb2glsTEaJngVVT8VqBATRIdh7XVgV1JF1LkA==", + "hasInstallScript": true, + "dependencies": { + "@fortawesome/fontawesome-common-types": "6.4.2" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@fortawesome/react-fontawesome": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.2.0.tgz", + "integrity": "sha512-uHg75Rb/XORTtVt7OS9WoK8uM276Ufi7gCzshVWkUJbHhh3svsUUeqXerrM96Wm7fRiDzfKRwSoahhMIkGAYHw==", + "dependencies": { + "prop-types": "^15.8.1" + }, + "peerDependencies": { + "@fortawesome/fontawesome-svg-core": "~1 || ~6", + "react": ">=16.3" + } + }, "node_modules/@humanwhocodes/config-array": { "version": "0.11.11", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.11.tgz", diff --git a/package.json b/package.json index 81c69524..4de3a35d 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,9 @@ "prettier:fix": "npx prettier --write ." }, "dependencies": { + "@fortawesome/fontawesome-free": "^6.4.2", + "@fortawesome/free-solid-svg-icons": "^6.4.2", + "@fortawesome/react-fontawesome": "^0.2.0", "@supabase/supabase-js": "^2.37.0", "@types/node": "20.6.3", "@types/react": "18.2.22", diff --git a/src/app/storefront/page.tsx b/src/app/storefront/page.tsx index 3004c266..a624b6c0 100644 --- a/src/app/storefront/page.tsx +++ b/src/app/storefront/page.tsx @@ -1,7 +1,30 @@ -export default function Storefront() { +'use client'; + +import React from 'react'; +import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; +import { faShoppingCart, faUser } from '@fortawesome/free-solid-svg-icons'; +import { GlobalStyle, Button } from './styles'; + +function handleCheckoutClick() { + window.location.href = '/checkout'; +} + +function handleProfileClick() { + window.location.href = '/profileScreen'; +} + +export default function App() { return (
-
storefront
+ + +
); } diff --git a/src/app/storefront/styles.ts b/src/app/storefront/styles.ts new file mode 100644 index 00000000..051a10c0 --- /dev/null +++ b/src/app/storefront/styles.ts @@ -0,0 +1,23 @@ +import styled, { createGlobalStyle } from 'styled-components'; + +export const GlobalStyle = createGlobalStyle` + body { + background:white; + } +`; + +export const Button = styled.button` + margin: 10px; + color: black; + text-align: center; + font-family: sans-serif; + font-size: 15px; + font-style: normal; + font-weight: normal; + line-height: normal; + width: 50px; + height: 50px; + background: transparent; + border: transparent; + float: right; +`; From 5bba7680561b8ca94f52b18b35ff7441016f17a5 Mon Sep 17 00:00:00 2001 From: EthanAuyeung Date: Wed, 11 Oct 2023 17:38:52 -0700 Subject: [PATCH 2/7] Fixed deployment issues --- src/app/login/page.tsx | 34 +--------------------------------- 1 file changed, 1 insertion(+), 33 deletions(-) diff --git a/src/app/login/page.tsx b/src/app/login/page.tsx index 40e4ec69..cf6479bb 100644 --- a/src/app/login/page.tsx +++ b/src/app/login/page.tsx @@ -1,18 +1,6 @@ 'use client'; import { useState } from 'react'; -import Link from 'next/link'; -import LoginForm from '../../components/LoginForm'; - -import { - GlobalStyle, - Fullscreen, - Img, - LoginBox, - LoginContent, - WelcomeSign, - Button, -} from './styles'; import { handleSignUp, @@ -20,27 +8,7 @@ import { signOut, } from '../../api/supabase/auth/auth'; -export default function App() { - return ( -
- - - - - - Welcome - - - - - -
- ); -} - -export function Login() { +export default function Login() { const [email, setEmail] = useState(''); const [password, setPassword] = useState(''); From 512ce6ffba6fded3ba6abe22b5c76b6092bf6414 Mon Sep 17 00:00:00 2001 From: EthanAuyeung Date: Wed, 11 Oct 2023 17:40:37 -0700 Subject: [PATCH 3/7] Fixed deployment typing --- src/app/login/page.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/login/page.tsx b/src/app/login/page.tsx index cf6479bb..4a7a7cde 100644 --- a/src/app/login/page.tsx +++ b/src/app/login/page.tsx @@ -8,7 +8,7 @@ import { signOut, } from '../../api/supabase/auth/auth'; -export default function Login() { +export default function App() { const [email, setEmail] = useState(''); const [password, setPassword] = useState(''); From dbc592786b0acdab0add8662622ffdcdd695c439 Mon Sep 17 00:00:00 2001 From: EthanAuyeung Date: Wed, 11 Oct 2023 17:44:40 -0700 Subject: [PATCH 4/7] vercel errors --- src/app/login/page.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/login/page.tsx b/src/app/login/page.tsx index 4a7a7cde..cf6479bb 100644 --- a/src/app/login/page.tsx +++ b/src/app/login/page.tsx @@ -8,7 +8,7 @@ import { signOut, } from '../../api/supabase/auth/auth'; -export default function App() { +export default function Login() { const [email, setEmail] = useState(''); const [password, setPassword] = useState(''); From bf5b3ab5a68cbdd9499586bb80512c48880000ab Mon Sep 17 00:00:00 2001 From: Celine Choi Date: Wed, 11 Oct 2023 19:48:24 -0700 Subject: [PATCH 5/7] removed fortawesome package and replaced icons --- src/app/storefront/Shopping_Cart_01.png | Bin 0 -> 633 bytes src/app/storefront/User_01.png | Bin 0 -> 585 bytes src/app/storefront/page.tsx | 9 +++++---- src/app/storefront/styles.ts | 7 ++++--- 4 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 src/app/storefront/Shopping_Cart_01.png create mode 100644 src/app/storefront/User_01.png diff --git a/src/app/storefront/Shopping_Cart_01.png b/src/app/storefront/Shopping_Cart_01.png new file mode 100644 index 0000000000000000000000000000000000000000..9bf09887ada395900d3fc45e0a9ef77eb9ed0f3c GIT binary patch literal 633 zcmV-<0*3vGP)A+MFQb9}wF%<-!`O!hr0ZIix2hJ})>PRHwAJ84T6US&mLKJ)yXQ7F;g6J3P4A~!=fWMq>vB3=!FnGiT$ zM#R5BDV{&KcXJBVMToJ6ssiT+WW1OOnu18gWCtOmV+)DJmi$P@wuKmDFLCQ$x-=_B zQQ5jz+*tB_Gr#Jqa3!ICaLLy_IRjP_+gS2-bt0))AQu@Xmz5E!6sDAq@0o!yltKL! z$SreTp>$wkO6k_NeT@qI5Qf7ci|DiVgm*|8e!WnrWilP{54w>*Hq=0-v9?P;U$PvyYKwtrtSxhnzc_0UzyBO~f zFpzr)2YjPyLSslW91dx_-M&+3@D@P6MbZ|VRM{jH8gOdF`E!R|*2hj`K>aZh{nTM+ zL?;v)^)iRHWw@+FDFGs~6Nt5aXcBAD^A5XY$37^D`s~ltZ2v*tFXVAahX8`CWWP81 zm_`*+dC%Wp$N^3jQ}TfWBsLa}~G=1;n_t^Ijz6{I4LfyviZm zs<|MQLW)<1`%9w8-1uB_nh1;`UvmD}T`iiwt9rrX#(urt&^$85GOUg2JGvT{nHaXc@$8xe$f=@4){{MnMYK35UiH Xf{mH=w)Ge{00000NkvXXu0mjf?aTki literal 0 HcmV?d00001 diff --git a/src/app/storefront/page.tsx b/src/app/storefront/page.tsx index a624b6c0..d6a8338e 100644 --- a/src/app/storefront/page.tsx +++ b/src/app/storefront/page.tsx @@ -1,8 +1,9 @@ 'use client'; import React from 'react'; -import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; -import { faShoppingCart, faUser } from '@fortawesome/free-solid-svg-icons'; +import Image from 'next/image'; +import ShoppingCartImage from './Shopping_Cart_01.png'; +import UserProfileImage from './User_01.png'; import { GlobalStyle, Button } from './styles'; function handleCheckoutClick() { @@ -18,11 +19,11 @@ export default function App() {
diff --git a/src/app/storefront/styles.ts b/src/app/storefront/styles.ts index 051a10c0..f2bc5596 100644 --- a/src/app/storefront/styles.ts +++ b/src/app/storefront/styles.ts @@ -7,7 +7,8 @@ export const GlobalStyle = createGlobalStyle` `; export const Button = styled.button` - margin: 10px; + margin-top: 30px; + margin-right: 25px; color: black; text-align: center; font-family: sans-serif; @@ -15,8 +16,8 @@ export const Button = styled.button` font-style: normal; font-weight: normal; line-height: normal; - width: 50px; - height: 50px; + width: 70px; + height: 70px; background: transparent; border: transparent; float: right; From 2186ebe085c5370bb400245839685e35aacfba9c Mon Sep 17 00:00:00 2001 From: Celine Choi Date: Wed, 11 Oct 2023 20:01:35 -0700 Subject: [PATCH 6/7] deleted icons and replaced with text buttons --- src/app/storefront/Shopping_Cart_01.png | Bin 633 -> 0 bytes src/app/storefront/User_01.png | Bin 585 -> 0 bytes src/app/storefront/page.tsx | 14 +++++--------- src/app/storefront/styles.ts | 7 ++++--- 4 files changed, 9 insertions(+), 12 deletions(-) delete mode 100644 src/app/storefront/Shopping_Cart_01.png delete mode 100644 src/app/storefront/User_01.png diff --git a/src/app/storefront/Shopping_Cart_01.png b/src/app/storefront/Shopping_Cart_01.png deleted file mode 100644 index 9bf09887ada395900d3fc45e0a9ef77eb9ed0f3c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 633 zcmV-<0*3vGP)A+MFQb9}wF%<-!`O!hr0ZIix2hJ})>PRHwAJ84T6US&mLKJ)yXQ7F;g6J3P4A~!=fWMq>vB3=!FnGiT$ zM#R5BDV{&KcXJBVMToJ6ssiT+WW1OOnu18gWCtOmV+)DJmi$P@wuKmDFLCQ$x-=_B zQQ5jz+*tB_Gr#Jqa3!ICaLLy_IRjP_+gS2-bt0))AQu@Xmz5E!6sDAq@0o!yltKL! z$SreTp>$wkO6k_NeT@qI5Qf7ci|DiVgm*|8e!WnrWilP{54w>*Hq=0-v9?P;U$PvyYKwtrtSxhnzc_0UzyBO~f zFpzr)2YjPyLSslW91dx_-M&+3@D@P6MbZ|VRM{jH8gOdF`E!R|*2hj`K>aZh{nTM+ zL?;v)^)iRHWw@+FDFGs~6Nt5aXcBAD^A5XY$37^D`s~ltZ2v*tFXVAahX8`CWWP81 zm_`*+dC%Wp$N^3jQ}TfWBsLa}~G=1;n_t^Ijz6{I4LfyviZm zs<|MQLW)<1`%9w8-1uB_nh1;`UvmD}T`iiwt9rrX#(urt&^$85GOUg2JGvT{nHaXc@$8xe$f=@4){{MnMYK35UiH Xf{mH=w)Ge{00000NkvXXu0mjf?aTki diff --git a/src/app/storefront/page.tsx b/src/app/storefront/page.tsx index d6a8338e..64e98f90 100644 --- a/src/app/storefront/page.tsx +++ b/src/app/storefront/page.tsx @@ -1,9 +1,7 @@ 'use client'; import React from 'react'; -import Image from 'next/image'; -import ShoppingCartImage from './Shopping_Cart_01.png'; -import UserProfileImage from './User_01.png'; +import Link from 'next/link'; import { GlobalStyle, Button } from './styles'; function handleCheckoutClick() { @@ -18,13 +16,11 @@ export default function App() { return (
- -
); diff --git a/src/app/storefront/styles.ts b/src/app/storefront/styles.ts index f2bc5596..f6d8953f 100644 --- a/src/app/storefront/styles.ts +++ b/src/app/storefront/styles.ts @@ -9,7 +9,7 @@ export const GlobalStyle = createGlobalStyle` export const Button = styled.button` margin-top: 30px; margin-right: 25px; - color: black; + color: white; text-align: center; font-family: sans-serif; font-size: 15px; @@ -17,8 +17,9 @@ export const Button = styled.button` font-weight: normal; line-height: normal; width: 70px; - height: 70px; - background: transparent; + height: 40px; + background: black; border: transparent; + border-radius: 5px; float: right; `; From edcb866e52a5dd43b83cc92f6d0561a0b05e01e6 Mon Sep 17 00:00:00 2001 From: Celine Choi Date: Wed, 11 Oct 2023 20:02:56 -0700 Subject: [PATCH 7/7] fixed eslint issues --- src/app/storefront/page.tsx | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/app/storefront/page.tsx b/src/app/storefront/page.tsx index 64e98f90..538b76c4 100644 --- a/src/app/storefront/page.tsx +++ b/src/app/storefront/page.tsx @@ -4,14 +4,6 @@ import React from 'react'; import Link from 'next/link'; import { GlobalStyle, Button } from './styles'; -function handleCheckoutClick() { - window.location.href = '/checkout'; -} - -function handleProfileClick() { - window.location.href = '/profileScreen'; -} - export default function App() { return (