From ce353029e26d50efd147df72a096322418a694b0 Mon Sep 17 00:00:00 2001 From: Vishesh Vijayvargiya Date: Sun, 21 May 2023 18:27:46 +0530 Subject: [PATCH 1/7] #163 completed --- pages/signup/index.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pages/signup/index.js b/pages/signup/index.js index 507bf3d..a21d474 100644 --- a/pages/signup/index.js +++ b/pages/signup/index.js @@ -54,8 +54,10 @@ export default function SignUp() { } else { router.push('/dashboard'); } - } else { - alert('Registration Failed'); + } + else{ + console.log(result) + message.error(result.error); } } catch (err) { console.log(err); From 8025c4d3415d4016399d1379367bbe71dca60f1f Mon Sep 17 00:00:00 2001 From: Vishesh Vijayvargiya Date: Wed, 24 May 2023 13:35:50 +0530 Subject: [PATCH 2/7] #165 --- assets/images/illustrations/addition.png | Bin 0 -> 133 bytes assets/images/illustrations/clock.png | Bin 0 -> 977 bytes assets/images/illustrations/menu.png | Bin 0 -> 142 bytes assets/svgs/dashboard.svg | 11 +++++ components/elements/Form/index.js | 28 ++++++++++++ pages/dashboard/sampledash/index.js | 55 +++++++++++++++++++++++ pages/signup/index.js | 27 +++++++---- 7 files changed, 112 insertions(+), 9 deletions(-) create mode 100644 assets/images/illustrations/addition.png create mode 100644 assets/images/illustrations/clock.png create mode 100644 assets/images/illustrations/menu.png create mode 100644 assets/svgs/dashboard.svg create mode 100644 components/elements/Form/index.js create mode 100644 pages/dashboard/sampledash/index.js diff --git a/assets/images/illustrations/addition.png b/assets/images/illustrations/addition.png new file mode 100644 index 0000000000000000000000000000000000000000..8ee5b30c55c5f8fa7eb9357f561fbba3aa4c89c9 GIT binary patch literal 133 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GG!XV7ZFl!D-g}JAT zV@SoEUM#Tx1v${AM&s2nJ7AKbLh*2~7aJ$|FDk literal 0 HcmV?d00001 diff --git a/assets/images/illustrations/clock.png b/assets/images/illustrations/clock.png new file mode 100644 index 0000000000000000000000000000000000000000..c4cb5f77aa6ba93fb29376400281baa3fac95bd5 GIT binary patch literal 977 zcmV;?11|iDP)$E$rk%BMp6M(welO$9 z7hoCy#&+oP4``AdjT`fizY7#Kf}(Sv@F_6OmafNd(1~ZN=XmbehWx3Q7=8l^2{M`W zc6)g~FpiZuh)4Q&r?{Ni0*YQ2IX(f(Z%Vv3dmb=OhQkU+wM{3G(c#*7 zWHZ}9(NGBqCvT!SY?y9AwV<%K=%D(OU)Z?LGv3!3M$x@QB(iimNvbrm4Gvm5Qb@75 zY;Buq*f_MWplCi`XX0hu!u@@pkw+BX^ zkAtKH1We=?t*}T>6x+DHK+*b=Ywk44(Ss(Z}{^(!U8Qk@(ZM^Oq)Q5chHE4_fZTl1O(a| zQYX;evOCmrS2k?q|4e4n8X&MaR1Z=iu==x9F~8dra1}xk1;Dq;=HrrZdhRV zmv)mhuBQh!6X0T&hE9yvbM k`EWKKUVL&&qZk82L%lA`7yimuK(iP;UHx3vIVCg!01O=_>i_@% literal 0 HcmV?d00001 diff --git a/assets/svgs/dashboard.svg b/assets/svgs/dashboard.svg new file mode 100644 index 0000000..78f4c3f --- /dev/null +++ b/assets/svgs/dashboard.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/components/elements/Form/index.js b/components/elements/Form/index.js new file mode 100644 index 0000000..ced5b9c --- /dev/null +++ b/components/elements/Form/index.js @@ -0,0 +1,28 @@ +import menu from "../../../assets/images/illustrations/menu.png" +import Image from "next/image"; +import clock from "../../../assets/images/illustrations/clock.png"; +export default function Form(props) { + return ( +
+
+
+
{props.formName}
+
+ {props.createdAt} Months ago + +
+
+ +
+
+
{props.totalSubmissions} Submissions
+
+
+ ); +} \ No newline at end of file diff --git a/pages/dashboard/sampledash/index.js b/pages/dashboard/sampledash/index.js new file mode 100644 index 0000000..7704881 --- /dev/null +++ b/pages/dashboard/sampledash/index.js @@ -0,0 +1,55 @@ +import React from "react"; +import { Typography, Col, Row, Button, Input, Modal, message } from 'antd'; +import { PlusOutlined } from '@ant-design/icons'; +import Form from '../../../components/elements/Form'; +export default function dashboard(){ + return ( +
+
+ + + + + + + + + + + +
+

Project1

+ +
+
+ +
+
+
+ + + + + +
+
+
+ ); +} \ No newline at end of file diff --git a/pages/signup/index.js b/pages/signup/index.js index a21d474..77c7890 100644 --- a/pages/signup/index.js +++ b/pages/signup/index.js @@ -1,5 +1,5 @@ import Image from 'next/image'; -import React, { useState,useContext } from 'react'; +import React, { useState, useContext } from 'react'; import backimage from '../../assets/images/illustrations/signin.png'; import { post } from '../../components/utils/API'; import { storeLS } from '../../components/utils/LocalStorage'; @@ -54,9 +54,8 @@ export default function SignUp() { } else { router.push('/dashboard'); } - } - else{ - console.log(result) + } else { + console.log(result); message.error(result.error); } } catch (err) { @@ -75,7 +74,9 @@ export default function SignUp() {
-

Sign up

+

+ Sign up +

{passwordToggle === false ? ( - setPasswordToggle((prev) => !prev)} /> + setPasswordToggle((prev) => !prev)} + /> ) : ( - setPasswordToggle((prev) => !prev)} /> + setPasswordToggle((prev) => !prev)} + /> )}
@@ -124,9 +129,13 @@ export default function SignUp() { >
{confirmPasswordToggle === false ? ( - setConfirmPasswordToggle((prev) => !prev)} /> + setConfirmPasswordToggle((prev) => !prev)} + /> ) : ( - setConfirmPasswordToggle((prev) => !prev)} /> + setConfirmPasswordToggle((prev) => !prev)} + /> )}
From 15d56ef6a50cbcefd07970ea7f4336e563cce7ee Mon Sep 17 00:00:00 2001 From: Vishesh Vijayvargiya Date: Wed, 24 May 2023 22:37:51 +0530 Subject: [PATCH 3/7] #164 --- components/sections/feature.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/sections/feature.js b/components/sections/feature.js index c08bdd9..e32f1eb 100644 --- a/components/sections/feature.js +++ b/components/sections/feature.js @@ -108,18 +108,18 @@ const feature = () => { className={`reveal-bottom ${ circle1Visible ? "active-reveal" : "opacity-0" } max-600:hidden absolute right-[30vw] top-[10vh] homeCircleColor w-[18vw] h-[18vw] rounded-full min-w-[200px] min-h-[200px] - min-[600px]:top-[22%] min-[600px]:right-[25%] md:right-[30%] lg:right-[25%] md:top-[20%] xl:top-[15%] min-[600px]:min-w-[100px] max-md:top-[38vw] max-md:right-[25vw] max-md:min-w-[130px] max-md:min-h-[130px] min-[600px]:min-h-[100px] `} + min-[600px]:top-[22%] min-[600px]:right-[25%] md:right-[30%] lg:right-[-18%] md:top-[20%] xl:top-[10%] min-[600px]:min-w-[100px] max-md:top-[38vw] max-md:right-[25vw] max-md:min-w-[130px] max-md:min-h-[130px] min-[600px]:min-h-[100px] `} >
From e65e2c74306ee22f944a0f7266167de545d8b38f Mon Sep 17 00:00:00 2001 From: Vishesh Vijayvargiya Date: Fri, 26 May 2023 18:58:05 +0530 Subject: [PATCH 4/7] footer done --- assets/images/logos/Facebook Icon.svg | 4 + assets/images/logos/Linkedin Icon (2).svg | 4 + assets/images/logos/Twitter Icon.svg | 4 + components/elements/Alert/Twitter Icon.svg | 4 + components/elements/Footer/index.js | 168 +++++++++++++++++++++ package-lock.json | 11 ++ package.json | 1 + pages/dashboard2/index.js | 3 +- 8 files changed, 198 insertions(+), 1 deletion(-) create mode 100644 assets/images/logos/Facebook Icon.svg create mode 100644 assets/images/logos/Linkedin Icon (2).svg create mode 100644 assets/images/logos/Twitter Icon.svg create mode 100644 components/elements/Alert/Twitter Icon.svg create mode 100644 components/elements/Footer/index.js diff --git a/assets/images/logos/Facebook Icon.svg b/assets/images/logos/Facebook Icon.svg new file mode 100644 index 0000000..0ec2e5d --- /dev/null +++ b/assets/images/logos/Facebook Icon.svg @@ -0,0 +1,4 @@ + + + + diff --git a/assets/images/logos/Linkedin Icon (2).svg b/assets/images/logos/Linkedin Icon (2).svg new file mode 100644 index 0000000..3df4f7c --- /dev/null +++ b/assets/images/logos/Linkedin Icon (2).svg @@ -0,0 +1,4 @@ + + + + diff --git a/assets/images/logos/Twitter Icon.svg b/assets/images/logos/Twitter Icon.svg new file mode 100644 index 0000000..b322743 --- /dev/null +++ b/assets/images/logos/Twitter Icon.svg @@ -0,0 +1,4 @@ + + + + diff --git a/components/elements/Alert/Twitter Icon.svg b/components/elements/Alert/Twitter Icon.svg new file mode 100644 index 0000000..b322743 --- /dev/null +++ b/components/elements/Alert/Twitter Icon.svg @@ -0,0 +1,4 @@ + + + + diff --git a/components/elements/Footer/index.js b/components/elements/Footer/index.js new file mode 100644 index 0000000..4b7a537 --- /dev/null +++ b/components/elements/Footer/index.js @@ -0,0 +1,168 @@ +import AppbarLogo from "../../../assets/images/logos/Appbarlogo.svg" +export default function Footer(){ + return ( +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + +
+
+ © 2023 SaveMyForm. All Rights Reserved.{' '} +
+
+
+ + + + +
+
+ + + + +
+
+ + + + +
+
+
+
+
+ ); +} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 4cf9a25..a26f3a2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,6 +21,7 @@ "nextra": "^2.0.3", "nextra-theme-docs": "^2.0.3", "react": "18.2.0", + "react-component": "^0.0.0", "react-dom": "18.2.0", "react-google-recaptcha-v3": "^1.10.1", "react-icons": "^4.7.1", @@ -8275,6 +8276,11 @@ "node": ">=0.10.0" } }, + "node_modules/react-component": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/react-component/-/react-component-0.0.0.tgz", + "integrity": "sha512-BhUOsgimfA/1iI8zL3VNsfEkSNM1Dd43P5w6gFfj8c6nIhSmTQVSzHnWus+M3u6VnfIUhAp+5H6aKGPYYJ7Ggg==" + }, "node_modules/react-dom": { "version": "18.2.0", "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz", @@ -15701,6 +15707,11 @@ "loose-envify": "^1.1.0" } }, + "react-component": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/react-component/-/react-component-0.0.0.tgz", + "integrity": "sha512-BhUOsgimfA/1iI8zL3VNsfEkSNM1Dd43P5w6gFfj8c6nIhSmTQVSzHnWus+M3u6VnfIUhAp+5H6aKGPYYJ7Ggg==" + }, "react-dom": { "version": "18.2.0", "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz", diff --git a/package.json b/package.json index b29c3f5..1b11909 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "nextra": "^2.0.3", "nextra-theme-docs": "^2.0.3", "react": "18.2.0", + "react-component": "^0.0.0", "react-dom": "18.2.0", "react-google-recaptcha-v3": "^1.10.1", "react-icons": "^4.7.1", diff --git a/pages/dashboard2/index.js b/pages/dashboard2/index.js index 452e713..8a24134 100644 --- a/pages/dashboard2/index.js +++ b/pages/dashboard2/index.js @@ -2,6 +2,7 @@ import Card from '../../components/card' import PCard from '../../components/P_Card' import Icon from '../../assets/svgs/iconDash.svg' import Image from 'next/image' +import Footer from '../../components/elements/Footer' export default ()=>{ return (
@@ -48,7 +49,7 @@ export default ()=>{
- +