feat: terms-and-condition, contact-support,notification. (#112)

* new design login,signup,dashboard,startup page is done * page design has done for 1st phase and need refactorization * unused import removed * routing almost done * Main container margin padding. cart border,color resolve almost * re arranged * form submitting going on * form submission ndone * # api created for budget, category, wallet. # in frontend cin budget and wallet page ids type has changed * # api created for budget, category, wallet. # in frontend cin budget and wallet page ids type has changed * Added notify stack, added title and amount range in all forms, income model frontend backend completed for get and post, * added joi validation * Joi validation pending task * Joi validation pending task * Joi validation pending task * budget date issue dix * budget date issue dix * budget date issue dix * auto comepele addted * auto comepele added * auto comepele added * auto comepele issue fix, base url set * autocomeolete task done * autocomeolete task done * login, sign up, tooltip, defaul year added * login, sign up, tooltip, defaul year added * login, sign up, tooltip, defaul year added * yarn lock * footer position fix * dashboard scroller issue * feat terms and support page crreated * settings, contact, support, TC * signup page button position fix * loading does not working, so rermoved
techtwig · Nov 12, 2023 · e3b6ab6 · e3b6ab6
1 parent 7c386a1
commit e3b6ab6
Show file tree

Hide file tree

Showing 25 changed files with 7,870 additions and 5,325 deletions.
diff --git a/api-server-nestjs/.yarn/install-state.gz b/api-server-nestjs/.yarn/install-state.gz
diff --git a/api-server-nestjs/src/.env-example b/api-server-nestjs/src/.env-example
diff --git a/api-server-nestjs/src/main.ts b/api-server-nestjs/src/main.ts
@@ -3,13 +3,16 @@ import { AppModule } from './app.module';
 import { ValidationPipe } from '@nestjs/common';
 /*import { config } from 'dotenv';
 
+
 config(); // Load environment variables from .env file*/
+const PORT = 5000;
 
 async function bootstrap() {
   const app = await NestFactory.create(AppModule);
   app.useGlobalPipes(new ValidationPipe());
   app.enableCors();
-  await app.listen(5000);
+  await app.listen(PORT);
+  console.log('server is running at: ' + PORT);
 }
 
-bootstrap()
+bootstrap();
diff --git a/api-server-nestjs/yarn b/api-server-nestjs/yarn
diff --git a/api-server-nestjs/yarn.lock b/api-server-nestjs/yarn.lock
diff --git a/frontend/.yarn/install-state.gz b/frontend/.yarn/install-state.gz
diff --git a/frontend/app/settings/contact-support/page.tsx b/frontend/app/settings/contact-support/page.tsx
@@ -0,0 +1,6 @@
+import ContactSupport from '@/component/settings/ContactSupport';
+
+const Constact = () => {
+  return <ContactSupport />;
+};
+export default Constact;
diff --git a/frontend/app/settings/notification/page.tsx b/frontend/app/settings/notification/page.tsx
@@ -0,0 +1,6 @@
+import Nofifuactions from '@/component/settings/Notification';
+
+const Notify = () => {
+  return <Nofifuactions />;
+};
+export default Notify;
diff --git a/frontend/app/settings/page.tsx b/frontend/app/settings/page.tsx
@@ -1,4 +1,4 @@
-import Settings from '@/component/Settings';
+import Settings from '@/component/settings/Settings';
 
 const SettingsPage = () => {
   return <Settings />;

diff --git a/frontend/app/settings/terms-and-support/page.tsx b/frontend/app/settings/terms-and-support/page.tsx
@@ -0,0 +1,6 @@
+import TermsAndSupport from '@/component/settings/TermsAndSupport';
+
+const Terms = () => {
+  return <TermsAndSupport />;
+};
+export default Terms;
diff --git a/frontend/common/CustomCardForSettings.tsx b/frontend/common/CustomCardForSettings.tsx
@@ -1,51 +1,68 @@
-import {Button, Grid, Typography} from '@mui/material';
+import {Box, Button, Grid, Typography} from '@mui/material';
 import PlayArrowIcon from '@mui/icons-material/PlayArrow';
-import React, {FC, useState} from 'react';
+import React, {FC, useEffect, useState} from 'react';
 import Drawers from '@/component/DrewerComponent';
+import {useRouter} from 'next/navigation';
 
 interface Props {
   title: string;
   subTitle?: string;
+  setting?: number;
+  onClk?: any;
 }
 
-const CustomCardForSetting: FC<Props> = ({title, subTitle}) => {
-  const handleDrewer = () => {
-    setState(!state);
-    return;
-  };
-  const [state, setState] = useState(false);
+const CustomCardForSetting: FC<Props> = ({title, subTitle, setting, onClk}) => {
+  // const [state, setSate]=React.useState()
+  // const handleDrewer = () => {
+  //   setState(!state);
+  //   return;
+  // };
   return (
-    <>
-      <Grid item xs={7} sx={{p: '20px'}}>
-        <Typography sx={{fontSize: '17px', fontWeight: '700'}}>
-          {title}
-        </Typography>
-      </Grid>
+    <Grid item xs={12}>
       <Grid
-        item
-        xs={5}
+        container
+        onClick={onClk}
         sx={{
-          display: 'flex',
-          alignItems: 'end',
-          justifyContent: 'right',
-          p: '20px 0px',
+          cursor: 'pointer',
+          '&:hover': {
+            border: '1px solid #00FF00',
+            color: 'black',
+            backgroundColor: 'lightblue',
+          },
+          borderRadius: '20px',
         }}>
-        <Typography sx={{opacity: '.3'}}>{subTitle}</Typography>
-        <Button
-          onClick={handleDrewer}
+        <Grid item xs={7} sx={{p: '20px'}}>
+          <Typography sx={{fontSize: '17px', fontWeight: '700'}}>
+            {title}
+          </Typography>
+        </Grid>
+        <Grid
+          item
+          xs={5}
           sx={{
-            p: '0px 0px',
-            maxWidth: '20px',
-            color: 'common.white',
-            ':hover': {
-              backgroundColor: 'common.white',
-            },
-          }}
-          endIcon={<PlayArrowIcon sx={{color: '#000'}} />}></Button>
+            display: 'flex',
+            alignItems: 'end',
+            justifyContent: 'right',
+            p: '20px 0px',
+          }}>
+          <Typography sx={{opacity: '.3'}}>{subTitle}</Typography>
+          <Button
+            // onClick={handleDrewer}
+            // onClick={handleDrewer}
+            sx={{
+              p: '0px 0px',
+              maxWidth: '20px',
+              color: 'common.white',
+              ':hover': {
+                backgroundColor: 'common.white',
+              },
+            }}
+            endIcon={<PlayArrowIcon sx={{color: '#000'}} />}></Button>
 
-        <Drawers state={state} setState={setState} />
+          {/*<Drawers state={state} setState={setState} />*/}
+        </Grid>
       </Grid>
-    </>
+    </Grid>
   );
 };
 export default CustomCardForSetting;
diff --git a/frontend/common/DashboardCard.tsx b/frontend/common/DashboardCard.tsx
@@ -19,7 +19,6 @@ const DashboardCard: FC<Props> = ({title, amount}) => {
         borderRadius: '10px',
         width: '125px',
         float: 'left',
-        marginRight: '12px',
         mb: '7px',
       }}>
       <Box

diff --git a/frontend/common/footer/Footer.tsx b/frontend/common/footer/Footer.tsx
@@ -1,4 +1,4 @@
-import {Box, Button, Grid, Tooltip} from '@mui/material';
+import {Box, Grid, Tooltip} from '@mui/material';
 import HomeRoundedIcon from '@mui/icons-material/HomeRounded';
 import AddCircleOutlinedIcon from '@mui/icons-material/AddCircleOutlined';
 import React, {FC, useEffect, useState} from 'react';
@@ -11,7 +11,7 @@ interface IFooter {
   currentOption?: number;
   newPage?: boolean;
 }
-const Footer: FC<IFooter> = ({currentOption, newPage}) => {
+const Footer: FC<IFooter> = ({currentOption}) => {
   const Router = useRouter();
   const [selectNewPage, setSelectNewPage] = useState(false);
   const [selectOption, setSelectOption] = useState(currentOption);
@@ -24,11 +24,7 @@ const Footer: FC<IFooter> = ({currentOption, newPage}) => {
     return;
   };
   useEffect(() => {
-    console.log('Router', Router);
-    console.log('selectOption', selectOption);
-    console.log('selectNewPage', selectNewPage);
     if (selectOption === 0 && !selectNewPage) {
-
       Router.push('/dashboard', {scroll: false});
     }
     if (selectOption === 1 && !selectNewPage) {
@@ -71,7 +67,7 @@ const Footer: FC<IFooter> = ({currentOption, newPage}) => {
           alignItems: 'center',
           backgroundColor: '#fff',
           borderTop: '2px solid #F6F5F6',
-          width: '429px',
+          width: '418px',
           pb: '15px',
           pt: '15px',
         }}>

diff --git a/frontend/component/AddNewBudget.tsx b/frontend/component/AddNewBudget.tsx
@@ -161,6 +161,7 @@ const AddNewBudget = () => {
                 rules={{
                   required: true,
                 }}
+                defaultValue={currentMonth}
                 render={({field: {onChange, value}}) => (
                   <Select
                     sx={{

diff --git a/frontend/component/Dashboard.tsx b/frontend/component/Dashboard.tsx
@@ -40,7 +40,7 @@ const DashBoard = () => {
             borderBottomRightRadius: '20px',
             borderBottomLeftRadius: '20px',
           }}>
-          <Grid container spacing={1}>
+          <Grid container rowSpacing={1}>
             <Grid item xs={12}>
               <Typography
                 sx={{fontSize: '18px', fontWeight: '700', mt: '40px'}}>
@@ -61,6 +61,7 @@ const DashBoard = () => {
                 overflowX: 'auto',
                 // overflowY: 'hidden',
                 display: 'flex',
+                gap: '12px',
               }}>
               <Box>
                 <DashboardCard
@@ -236,7 +237,9 @@ const DashBoard = () => {
           </Grid>
         </Grid>
       </Grid>
-      <Footer currentOption={0} />
+      <Grid sx={{ml: '13px'}}>
+        <Footer currentOption={0} />
+      </Grid>
     </Container>
   );
 };

diff --git a/frontend/component/SignUp.tsx b/frontend/component/SignUp.tsx
@@ -292,7 +292,7 @@ const Signup = ({setSelectedIndex}: any) => {
                 </Grid>
               </Grid>
             </Grid>
-            <Grid item xs={12} sx={{marginLeft: '15px'}}>
+            <Grid item xs={12}>
               <SubmitButton>Create Account</SubmitButton>
             </Grid>
           </Grid>

diff --git a/frontend/component/Statistics.tsx b/frontend/component/Statistics.tsx
@@ -17,7 +17,7 @@ import HomeRoundedIcon from '@mui/icons-material/HomeRounded';
 import {CustomStyles} from '@/utilities/enums';
 import {BarChartComponent} from '@/component/statisticsData/BarChart';
 import {useRouter} from 'next/navigation';
-import {timeDuration, wallets} from '@/utilities/helper';
+import {timeDuration} from '@/utilities/helper';
 
 const Statistics = () => {
   const Router = useRouter();
@@ -227,8 +227,9 @@ const Statistics = () => {
             percentage={'1%'}
           />
         </Grid>
-        <Footer currentOption={1} />
       </Grid>
+
+      <Footer currentOption={1} />
     </Container>
   );
 };

diff --git a/frontend/component/settings/ContactSupport.tsx b/frontend/component/settings/ContactSupport.tsx
@@ -0,0 +1,30 @@
+'use client';
+import {Box, Container, Typography} from '@mui/material';
+import {CustomStyles} from '@/utilities/enums';
+import BackButton from '@/common/button/BackButton';
+
+const ContactSupport = () => {
+  return (
+    <Container
+      maxWidth={'xs'}
+      disableGutters={true}
+      sx={{
+        minHeight: '100vh',
+        backgroundColor: '#FEFEFF',
+        pt: CustomStyles.CONTAINER_TOP,
+        pl: CustomStyles.CONTAINER_LEFT,
+        pr: CustomStyles.CONTAINER_RIGHT,
+        pb: '100px',
+        position: 'relative',
+      }}>
+      <Box>
+        <BackButton />
+      </Box>
+      <Typography sx={{fontSize: '20px', mb: '20px', fontWeight: '700'}}>
+        Contract support
+      </Typography>
+      <Typography>For details visit out web page</Typography>
+    </Container>
+  );
+};
+export default ContactSupport;
diff --git a/frontend/component/settings/Notification.tsx b/frontend/component/settings/Notification.tsx
@@ -0,0 +1,30 @@
+'use client';
+import {Box, Container, Typography} from '@mui/material';
+import {CustomStyles} from '@/utilities/enums';
+import BackButton from '@/common/button/BackButton';
+
+const Nofifuactions = () => {
+  return (
+    <Container
+      maxWidth={'xs'}
+      disableGutters={true}
+      sx={{
+        minHeight: '100vh',
+        backgroundColor: '#FEFEFF',
+        pt: CustomStyles.CONTAINER_TOP,
+        pl: CustomStyles.CONTAINER_LEFT,
+        pr: CustomStyles.CONTAINER_RIGHT,
+        pb: '100px',
+        position: 'relative',
+      }}>
+      <Box>
+        <BackButton />
+      </Box>
+      <Typography sx={{fontSize: '20px', mb: '20px', fontWeight: '700'}}>
+        Notofiaction
+      </Typography>
+      <Typography>For details visit out web page</Typography>
+    </Container>
+  );
+};
+export default Nofifuactions;
diff --git a/frontend/component/Settings.tsx → frontend/component/settings/Settings.tsx b/frontend/component/Settings.tsx → frontend/component/settings/Settings.tsx
@@ -1,11 +1,28 @@
 'use client';
 import {Button, Container, Grid, Typography} from '@mui/material';
 import Footer from '@/common/footer/Footer';
-import React from 'react';
+import React, {useEffect, useState} from 'react';
 import CustomCardForSetting from '@/common/CustomCardForSettings';
 import {CustomStyles} from '@/utilities/enums';
+import {useRouter} from 'next/navigation';
 
 const Settings = () => {
+  const [setting, setSetting] = useState<number>(0);
+  const Router = useRouter();
+  const habdleClick = (index: number) => {
+    console.log('already clicked');
+    setSetting(index);
+  };
+  useEffect(() => {
+    if (setting === 5) {
+      Router.push('/settings/terms-and-support', {scroll: false});
+    } else if (setting === 2) {
+      Router.push('/settings/notification', {scroll: false});
+    } else if (setting === 6) {
+      Router.push('/settings/contact-support', {scroll: false});
+    }
+  }, [setting]);
+  console.log('val', setting);
   return (
     <Container
       maxWidth={'xs'}
@@ -45,12 +62,22 @@ const Settings = () => {
               borderRadius: '40px',
             }}>
             <CustomCardForSetting title={'Premium'} />
-            <CustomCardForSetting title={'Notification'} subTitle={'USD'} />
+            <CustomCardForSetting
+              title={'Notification'}
+              subTitle={'USD'}
+              onClk={() => habdleClick(2)}
+            />
             <CustomCardForSetting title={'Main currency'} subTitle={'TK'} />
             <CustomCardForSetting title={'Language'} />
             <CustomCardForSetting title={'Export'} />
-            <CustomCardForSetting title={'Terms and policies'} />
-            <CustomCardForSetting title={'Contract support'} />
+            <CustomCardForSetting
+              title={'Terms and Support'}
+              onClk={() => habdleClick(5)}
+            />
+            <CustomCardForSetting
+              title={'Contract support'}
+              onClk={() => habdleClick(6)}
+            />
           </Grid>
         </Grid>
         <Grid
-Original file line number
+Diff line change
@@ Expand Up / @@ -292,7 +292,7 @@ const Signup = ({setSelectedIndex}: any) => { @@
                     </Grid>
                   </Grid>
                 </Grid>
-                <Grid item xs={12} sx={{marginLeft: '15px'}}>
+                <Grid item xs={12}>
                   <SubmitButton>Create Account</SubmitButton>
                 </Grid>
               </Grid>
@@ Expand Down @@