From 866b5f500f7e8afec3330a774e358d93df81547b Mon Sep 17 00:00:00 2001 From: thejhp1 Date: Fri, 3 Nov 2023 16:01:33 -0400 Subject: [PATCH 1/7] inital marketplace sidebar commit --- .../marketplace_dashboard/marketplace_sidebar.tsx | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 cubeseed_login/src/pages/dashboard/marketplace_dashboard/marketplace_sidebar.tsx diff --git a/cubeseed_login/src/pages/dashboard/marketplace_dashboard/marketplace_sidebar.tsx b/cubeseed_login/src/pages/dashboard/marketplace_dashboard/marketplace_sidebar.tsx new file mode 100644 index 0000000..44a9937 --- /dev/null +++ b/cubeseed_login/src/pages/dashboard/marketplace_dashboard/marketplace_sidebar.tsx @@ -0,0 +1,11 @@ +const MarketplaceSidebar = () => { + return ( + <> +
+ asd +
+ + ) +} + +export default MarketplaceSidebar From 67c6c11f9390b9ddd943249d0a50739bbbc9e4a6 Mon Sep 17 00:00:00 2001 From: thejhp1 Date: Sun, 12 Nov 2023 13:35:51 -0500 Subject: [PATCH 2/7] finished sidebar --- .../src/assets/icons/TransparentCubeseed.png | Bin 0 -> 7098 bytes .../assets/icons/TransparentSmallCubeseed.png | Bin 0 -> 2276 bytes .../marketplace_sidebar.tsx | 237 +++++++++++++++++- .../src/styles/MarketPlaceSideBar.module.css | 131 ++++++++++ 4 files changed, 359 insertions(+), 9 deletions(-) create mode 100644 cubeseed_login/src/assets/icons/TransparentCubeseed.png create mode 100644 cubeseed_login/src/assets/icons/TransparentSmallCubeseed.png create mode 100644 cubeseed_login/src/styles/MarketPlaceSideBar.module.css diff --git a/cubeseed_login/src/assets/icons/TransparentCubeseed.png b/cubeseed_login/src/assets/icons/TransparentCubeseed.png new file mode 100644 index 0000000000000000000000000000000000000000..8b09f992f47e84f31f1aac30859187981d8312cb GIT binary patch literal 7098 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 literal 0 HcmV?d00001 diff --git a/cubeseed_login/src/assets/icons/TransparentSmallCubeseed.png b/cubeseed_login/src/assets/icons/TransparentSmallCubeseed.png new file mode 100644 index 0000000000000000000000000000000000000000..16d38ee1e5f07cd56fb70b0d340ab5dbfd609a99 GIT binary patch literal 2276 zcmV39qm>{#l(6? zJKu05@tCWvZKTp{>C`j0`~ekN1q1Hu_-fb<619)nFCY;DJnpY!<$gx2n!ivnLuV6Q7ijV z8!y#b;itd$;`T^K2dQMp>;l0L=bi)OAds?>hx4+6xu&QDDhSZhstUVGVe*kM%uHhB znI2ISm|w7c_JRNU8|z5RA*5~2KQ;lFGpN|+xqJYcKx6Eq5~v_RF~-JD=T4ZaQA-IN zMX{kaIK;&Jv;N?27E>?zcL~WqV2;h+2U(ES7#n(@N}z%O4Vf{Ncw+7x&SE1R;{XoF zyvsOWkLy1J%yC?t5ux`KQyABp=AHqtVUhFhjNL^gP(gr-%>dkcY(6399o1IAoWogs zHjy6$V8R23S$-hGyBFqxT8=wHuXlBx9-|VdAi!xwJ;sRFcCvG6sI?7%F@XJua;8c) zJZ2+a^*XM#;XE{VFU&TH?eNI7^A?pz1p%I%?3r+xkE5UNU68C%E4z#mc*-20_mYRi zbe%9l}p?CI>uP>H0e5S<{g9p)+}=K!%j zm%^Ndb9u-+gxBpx!~1~=IDb9 z1Z83v*W! zcjVWp1dC4W1L^%dOT5+FVFDb(oMDQT2;E^7G!`uftpb+2RsqXhtAORMRlsuBDqy*5 z6|mg33Rv!11uS>10+ze(_>Vwy@)qU%OsP7pqFA?4SrLE6h!@sY85|=L#oqEF7ICl% z&pwk|$y?DX)m;PhvMDPq*3d>tP!90g9AQ*o`v>;{wC{81#&BR_axwr zgqTDIHJy(haV~_53N?UrVdCS6r;N?G=0am6oD24p9pH5m8i$)4W-@rPf7mv zTcKv5NY0>boh7X=lA9W!=IR)4IC5LDNXs#DP}{1G9H~LSvk^g)4d`eZ5FXoz9w)Ns zpR&?O&<85|1V`PunzHCqL_sfe+tDd1P@I1O@B4kDFO#SZu}W0BYz5G(gb;fSv9anM zGMm`YeE@FGffGgO+OLo|)uD#k*q(533PH>T(IvDip0#W&Ua&oE=}Ka;;!S>982Lf?X9hwro%eHEehbzWR3Dy^fUHyx>2X zrN#U|1k_FaS4eAXlrf%$Ht_Qz5pAPWW1Fe>C+vnDrsR}#cukr^a zWwB+45zhXiF@!)TKLD?{15x2xjII=_>rDg>-y^n8QKg%tN8e0%qpngwU5`*qEd-ye yu#=U(px+k$MPxlcx*;${-PsKP_|`pOG4y{X%7{v{>ymc>0000 { - return ( - <> -
- asd -
- - ) +import { useState } from "react" +import MarketPlaceSideBarStyle from "@/styles/MarketPlaceSideBar.module.css" +import logo from "../../../assets/icons/TransparentCubeseed.png" +import smallLogo from "../../../assets/icons/TransparentSmallCubeseed.png" + +const MarketPlaceSideBar = () => { + const [selected, setSelected] = useState(false); + const [id, setId] = useState("Home"); + + const toggleSideBar = () => { + setSelected((prev) => !prev); + } + + const customSelect = (selectedName: string) => { + if (selectedName == "Home") { + setId("Home") + } else if (selectedName === "Purchase") { + setId("Purchase") + } else if (selectedName === "Quotes") { + setId("Quotes") + } else if (selectedName === "Favorite") { + setId("Favorite") + } else if (selectedName === "Profile") { + setId("Profile") + } + } + + return ( +
+
+ + + + +
+
+
+
customSelect("Home")} + > + + + + + + + + +

Home

+
+
customSelect("Purchase")} + > + + + + + + + + +

Purchase Orders

+
+
customSelect("Quotes")} + > + + + + + + + + +

Quotations

+
+
customSelect("Favorite")} + > + + + +

Favorites

+
+
customSelect("Profile")} + > + + + +

Profiles

+
+
+ +
+
+ + + +

Settings

+
+
+ + + +

Support

+
+
+

Sign Out

+
+
+
+ ) } -export default MarketplaceSidebar +export default MarketPlaceSideBar diff --git a/cubeseed_login/src/styles/MarketPlaceSideBar.module.css b/cubeseed_login/src/styles/MarketPlaceSideBar.module.css new file mode 100644 index 0000000..51c8294 --- /dev/null +++ b/cubeseed_login/src/styles/MarketPlaceSideBar.module.css @@ -0,0 +1,131 @@ +/*************************** CONTAINER *******************************/ + +.sideBarOpenContainer { + display: flex; + width: 360px; + height: 100vh; + padding: 20px 12px 12px 12px; + flex-direction: column; + align-items: center; + gap: var(--dimentions-d-2, 15px); + background-color: #F0F6F6; + transition: .3s; +} + +.mainOptionsContainer { + display: flex; + flex-direction: column; + gap: 12px; +} + +.userSettingContainer { + font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; + display: flex; + flex-direction: column; + bottom: 0; + position: absolute; + padding-bottom: 2rem; +} + +/*************************** OPEN SIDEBAR *******************************/ + +.logoOpen { + display: flex; + padding: var(--dimentions-d-0, 0px) 40px var(--dimentions-d-0, 0px) var(--dimentions-d-4, 16px); + align-items: center; + gap: 20px; +} + +.logoOpen > * { + cursor: pointer; +} + +.dividerOpen { + width: 304px; + height: var(--dimentions-d-0, 1px); + border-radius: var(--dimentions-d-0, 0px); + background: #D0DAD7; +} + +.mainOptionsOpen { + display: flex; + align-items: center; + justify-content: flex-start; + font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; + font-size: 14px; + height: 56px; + padding: var(--dimentions-d-4, 16px) 24px var(--dimentions-d-4, 16px) var(--dimentions-d-4, 16px); + width: 336px; + gap: 12px; + font-weight: 500; +} + +.mainOptionsOpen:hover { + cursor: pointer; + border-radius: 3rem; +} + +.selectedOpen { + display: flex; + padding: var(--dimentions-d-4, 16px) 24px var(--dimentions-d-4, 16px) var(--dimentions-d-4, 16px); + align-items: center; + gap: 12px; + flex: 1 0 0; + align-self: stretch; + font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; + font-size: 14px; + color: white; + font-weight: 500; + background: #03656B; + border-radius: 3rem; +} + +/***************************** CLOSED SIDEBAR **********************************/ + +.dividerClosed { + width: 24px; + height: var(--dimentions-d-0, 1px); + border-radius: var(--dimentions-d-0, 0px); + background: #D0DAD7; +} + +.selectedClosed { + background: #03656B; + border-radius: 3rem; +} + +.sideBarClosedContainer { + transition: .4s; + display: flex; + flex-direction: column; + align-items: center; + height: 100vh; + width: 80px; + padding: 20px 12px 12px 12px; + gap: var(--dimentions-d-2, 15px); + background-color: #F0F6F6; +} + +.logoClosed { + padding: 0; +} + +.logoClosed > * { + cursor: pointer; +} + +.mainOptionsClosedContainer { + display: flex; + align-items: center; + font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; + font-size: 14px; + height: 56px; + width: 56px; + font-weight: 500; + justify-content: center; + cursor: pointer; +} + +.hidden { + display: none; +} From 72bad98b2dad7f274f18cfaaec9b68dc2c63d2c8 Mon Sep 17 00:00:00 2001 From: thejhp1 Date: Tue, 14 Nov 2023 12:50:57 -0500 Subject: [PATCH 3/7] changed img to Image next/js --- .../dashboard/marketplace_dashboard/marketplace_sidebar.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cubeseed_login/src/pages/dashboard/marketplace_dashboard/marketplace_sidebar.tsx b/cubeseed_login/src/pages/dashboard/marketplace_dashboard/marketplace_sidebar.tsx index 2419a2e..3481d1a 100644 --- a/cubeseed_login/src/pages/dashboard/marketplace_dashboard/marketplace_sidebar.tsx +++ b/cubeseed_login/src/pages/dashboard/marketplace_dashboard/marketplace_sidebar.tsx @@ -2,6 +2,7 @@ import { useState } from "react" import MarketPlaceSideBarStyle from "@/styles/MarketPlaceSideBar.module.css" import logo from "../../../assets/icons/TransparentCubeseed.png" import smallLogo from "../../../assets/icons/TransparentSmallCubeseed.png" +import Image from "next/image" const MarketPlaceSideBar = () => { const [selected, setSelected] = useState(false); @@ -42,7 +43,7 @@ const MarketPlaceSideBar = () => { fill="black" /> - + {selected ? small-logo : small-logo }
From edf3e3cd43d786e8cfb0edd00fdc0ec1495c723f Mon Sep 17 00:00:00 2001 From: thejhp1 Date: Tue, 14 Nov 2023 13:03:19 -0500 Subject: [PATCH 4/7] move around index file --- cubeseed_login/src/pages/index.tsx | 47 +++++++++++++++--------------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/cubeseed_login/src/pages/index.tsx b/cubeseed_login/src/pages/index.tsx index 68516f7..486237a 100644 --- a/cubeseed_login/src/pages/index.tsx +++ b/cubeseed_login/src/pages/index.tsx @@ -57,25 +57,24 @@ // // ) // } - -import Navbar from "@/component/navbar/Navbar"; -import ProgressBar from "@/component/progressbar/ProgressBar"; -import ServiceForm from "@/component/forms/ServiceForm"; -//import Confirmation from './confirmation_page/Confirmation' -import Confirmation from "./confirmation_page/Confirmation"; -import { useMultiSteps } from "@/hooks/useMultiSteps"; -import Head from "next/head"; -import { FormEvent } from "react"; -import homeStyles from "@/styles/home.module.scss"; -import styles from "../styles/Login.module.scss"; -import Carousel from "@/component/carousel/Carousel"; -import UserDetailsForm from "@/component/forms/UserDetailsForm"; -import Link from "next/link"; -import React from "react"; // import {BrowserRouter as Router, Route, Routes } from 'react-router-dom' -import Profilepage from "./dashboard/profile"; - // import {BrowserRouter as Router, Route, Routes } from 'react-router-dom' +// import Confirmation from './confirmation_page/Confirmation' + +import Navbar from "@/component/navbar/Navbar" +import ProgressBar from "@/component/progressbar/ProgressBar" +import ServiceForm from "@/component/forms/ServiceForm" +import Confirmation from "./confirmation_page/Confirmation" +import { useMultiSteps } from "@/hooks/useMultiSteps" +import Head from "next/head" +import { FormEvent } from "react" +import homeStyles from "@/styles/home.module.scss" +import styles from "../styles/Login.module.scss" +import Carousel from "@/component/carousel/Carousel" +import UserDetailsForm from "@/component/forms/UserDetailsForm" +import Link from "next/link" +import React from "react" +import Profilepage from "./dashboard/profile" export default function Home() { const stepDivs = [ @@ -85,17 +84,17 @@ export default function Home() { //
three
, //
four
, - ]; + ] const { steps, step, next, back, currentIndex, isLastStep, isFirstStep } = - useMultiSteps(stepDivs); + useMultiSteps(stepDivs) - console.log(`first ${isFirstStep}`, `last ${isLastStep}`); + console.log(`first ${isFirstStep}`, `last ${isLastStep}`) function handleSubmit(event: FormEvent) { - event.preventDefault(); - if (!isLastStep) return next(); - console.log("finished"); + event.preventDefault() + if (!isLastStep) return next() + console.log("finished") // alert('submitted') } @@ -158,5 +157,5 @@ export default function Home() {
- ); + ) } From 88f117508bbe2cbbd8b3ad0113595e2f5d48f1dc Mon Sep 17 00:00:00 2001 From: thejhp1 Date: Tue, 14 Nov 2023 13:26:02 -0500 Subject: [PATCH 5/7] added key to stepDivs in index --- cubeseed_login/src/pages/index.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cubeseed_login/src/pages/index.tsx b/cubeseed_login/src/pages/index.tsx index 486237a..47278d7 100644 --- a/cubeseed_login/src/pages/index.tsx +++ b/cubeseed_login/src/pages/index.tsx @@ -78,9 +78,9 @@ import Profilepage from "./dashboard/profile" export default function Home() { const stepDivs = [ - , - , - , + , + , + , //
three
, //
four
, From f26c8c605a16602367828ab1ebe32e7fabc9dfec Mon Sep 17 00:00:00 2001 From: thejhp1 Date: Tue, 14 Nov 2023 13:36:22 -0500 Subject: [PATCH 6/7] fix farmprovidercontext --- .../src/comps/FarmGrn/goodsrecievenotice.tsx | 22 +++++++++---------- cubeseed_login/src/comps/modal/modal.tsx | 22 +++++++++---------- .../src/comps/textarea/textarea.tsx | 18 +++++++-------- cubeseed_login/src/pages/_app.tsx | 14 ++++++------ cubeseed_login/src/pages/grn.tsx | 12 +++++----- 5 files changed, 44 insertions(+), 44 deletions(-) diff --git a/cubeseed_login/src/comps/FarmGrn/goodsrecievenotice.tsx b/cubeseed_login/src/comps/FarmGrn/goodsrecievenotice.tsx index bf83bf2..233ef7e 100644 --- a/cubeseed_login/src/comps/FarmGrn/goodsrecievenotice.tsx +++ b/cubeseed_login/src/comps/FarmGrn/goodsrecievenotice.tsx @@ -1,14 +1,14 @@ -import GoodsRecievedNotice from "@/styles/goodsrecievenotice.module.scss"; -import UserCardinfo from "../userCardInfo/userCardinfo"; -import Button from "../Button/button"; -import Textarea from "../textarea/textarea"; -import { Context } from "@/context/context"; -import { useContext } from "react"; +import GoodsRecievedNotice from "@/styles/goodsrecievenotice.module.scss" +import UserCardinfo from "../userCardInfo/userCardinfo" +import Button from "../Button/button" +import Textarea from "../textarea/textarea" +import { FarmContext } from "@/context/context" +import { useContext } from "react" -const limitNumber = 200; +const limitNumber = 200 export default function GoodsRecievedNote() { - const { inputValue, handleChangeInputValues, handleCongrateMeaasge } = - useContext(Context); + const { inputValue, handleChangeInputValues, handleCongrateMessage } = + useContext(FarmContext) return (
@@ -76,12 +76,12 @@ export default function GoodsRecievedNote() {
- ); + ) } diff --git a/cubeseed_login/src/comps/modal/modal.tsx b/cubeseed_login/src/comps/modal/modal.tsx index 6561225..d1a69bf 100644 --- a/cubeseed_login/src/comps/modal/modal.tsx +++ b/cubeseed_login/src/comps/modal/modal.tsx @@ -1,20 +1,20 @@ -import React, { useContext } from "react"; -import { Modal } from "react-responsive-modal"; -import "react-responsive-modal/styles.css"; -import GoodsRecievedNote from "../FarmGrn/goodsrecievenotice"; -import { Context } from "@/context/context"; -import CongratulationSms from "./../congratsms/index"; +import React, { useContext } from "react" +import { Modal } from "react-responsive-modal" +import "react-responsive-modal/styles.css" +import GoodsRecievedNote from "../FarmGrn/goodsrecievenotice" +import { FarmContext } from "@/context/context" +import CongratulationSms from "./../congratsms/index" type ModalProps = { - show: boolean; - onClose: () => void; -}; + show: boolean + onClose: () => void +} export default function ActivateModal() { - const { show, handleCloseModal, congrate } = useContext(Context); + const { show, handleCloseModal, congrate } = useContext(FarmContext) return ( {congrate ? : } - ); + ) } diff --git a/cubeseed_login/src/comps/textarea/textarea.tsx b/cubeseed_login/src/comps/textarea/textarea.tsx index 637a59d..ef6dd18 100644 --- a/cubeseed_login/src/comps/textarea/textarea.tsx +++ b/cubeseed_login/src/comps/textarea/textarea.tsx @@ -1,20 +1,20 @@ -import React, { useContext, useState } from "react"; -import { Context } from "@/context/context"; +import React, { useContext, useState } from "react" +import { FarmContext } from "@/context/context" type TextAreaProps = { - limit: number; -}; + limit: number +} function Textarea({ limit }: TextAreaProps) { - const { setText, text } = useContext(Context); + const { setText, text } = useContext(FarmContext) // const [content, setContent] = React.useState(); const handleTextArea = React.useCallback( (text: string) => { - setText(text.slice(0, limit)); + setText(text.slice(0, limit)) }, [limit, setText] - ); + ) return ( <> @@ -25,7 +25,7 @@ function Textarea({ limit }: TextAreaProps) { > {limit} character limit left - ); + ) } -export default Textarea; +export default Textarea diff --git a/cubeseed_login/src/pages/_app.tsx b/cubeseed_login/src/pages/_app.tsx index fbbebe3..88d6d9f 100644 --- a/cubeseed_login/src/pages/_app.tsx +++ b/cubeseed_login/src/pages/_app.tsx @@ -1,15 +1,15 @@ -import type { AppProps } from "next/app"; -import "@/styles/globals.scss"; +import type { AppProps } from "next/app" +import "@/styles/globals.scss" // import "@/styles/global.css" // tailwind -import { FarmContexProvider } from "@/context/context"; -import { SignUpContextProvider } from "@/context/signup"; +import { FarmContextProvider } from "@/context/context" +import { SignUpContextProvider } from "@/context/signup" export default function App({ Component, pageProps }: AppProps) { return ( - + - - ); + + ) } diff --git a/cubeseed_login/src/pages/grn.tsx b/cubeseed_login/src/pages/grn.tsx index 67bee4a..095748a 100644 --- a/cubeseed_login/src/pages/grn.tsx +++ b/cubeseed_login/src/pages/grn.tsx @@ -1,11 +1,11 @@ -import React, { useContext } from "react"; +import React, { useContext } from "react" -import Button from "@/comps/Button/button"; -import { Context } from "@/context/context"; -import ActivateModal from "./../comps/modal/modal"; +import Button from "@/comps/Button/button" +import { FarmContext } from "@/context/context" +import ActivateModal from "./../comps/modal/modal" export default function Grn() { - const { open, handleShowModal } = useContext(Context); + const { open, handleShowModal } = useContext(FarmContext) return ( <> @@ -21,5 +21,5 @@ export default function Grn() { - ); + ) } From bb47406f640f9da5c222b93986001de2449a899c Mon Sep 17 00:00:00 2001 From: thejhp1 Date: Tue, 14 Nov 2023 13:38:59 -0500 Subject: [PATCH 7/7] missed 1 FarmContext --- cubeseed_login/src/comps/FarmWayBill/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cubeseed_login/src/comps/FarmWayBill/index.tsx b/cubeseed_login/src/comps/FarmWayBill/index.tsx index c689e8d..65ae500 100644 --- a/cubeseed_login/src/comps/FarmWayBill/index.tsx +++ b/cubeseed_login/src/comps/FarmWayBill/index.tsx @@ -1,14 +1,14 @@ import style from "@/styles/grn.module.scss" import Image from "next/image" import Button from "../Button/button" -import { Context } from "@/context/context" +import { FarmContext } from "@/context/context" import { useContext } from "react" type WayBillProps = { time: string } export default function FarmWayBill() { - const { inputValue } = useContext(Context) + const { inputValue } = useContext(FarmContext) return ( <>