From 3a3be7945d1ae011e96ee3b0fda4081ff951c065 Mon Sep 17 00:00:00 2001 From: MuhammadKhalilzadeh Date: Wed, 29 May 2024 20:36:43 +0330 Subject: [PATCH 1/3] Some bugs --- Client/src/Components/DashboardProgressBars/index.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Client/src/Components/DashboardProgressBars/index.jsx b/Client/src/Components/DashboardProgressBars/index.jsx index 8215a0d17..4326c8d97 100644 --- a/Client/src/Components/DashboardProgressBars/index.jsx +++ b/Client/src/Components/DashboardProgressBars/index.jsx @@ -1,4 +1,4 @@ -import { BarChart } from '@mui/x-charts/BarChart'; +// import { BarChart } from '@mui/x-charts/BarChart'; const ChartsOverviewDemo = () => { return ( @@ -10,7 +10,7 @@ const ChartsOverviewDemo = () => { { data: [60, 50, 15, 25] }, ]} height={290} - xAxis={[{ data: ['Q1', 'Q2', 'Q3', 'Q4'], scaleType: 'band' }]} + xAxis={[{ data: ["Q1", "Q2", "Q3", "Q4"], scaleType: "band" }]} margin={{ top: 10, bottom: 30, left: 40, right: 10 }} /> ); From 76e861a1dd92ceff06de1037c74fde73424208cc Mon Sep 17 00:00:00 2001 From: MuhammadKhalilzadeh Date: Wed, 29 May 2024 22:11:16 +0330 Subject: [PATCH 2/3] set new password page --- Client/src/App.jsx | 2 + Client/src/Pages/SetNewPassword/index.css | 83 ++++++++++++++++++++++ Client/src/Pages/SetNewPassword/index.jsx | 77 ++++++++++++++++++++ Client/src/assets/Images/lock-icon.png | Bin 0 -> 1724 bytes 4 files changed, 162 insertions(+) create mode 100644 Client/src/Pages/SetNewPassword/index.css create mode 100644 Client/src/Pages/SetNewPassword/index.jsx create mode 100644 Client/src/assets/Images/lock-icon.png diff --git a/Client/src/App.jsx b/Client/src/App.jsx index 4b9bc086a..0584ebf26 100644 --- a/Client/src/App.jsx +++ b/Client/src/App.jsx @@ -13,6 +13,7 @@ import Integrations from "./Pages/Integrations"; import Settings from "./Pages/Settings"; import ForgotPassword from "./Pages/ForgotPassword"; import CheckEmail from "./Pages/CheckEmail"; +import SetNewPassword from "./Pages/SetNewPassword"; function App() { return ( @@ -32,6 +33,7 @@ function App() { } /> } /> } /> + } /> ); diff --git a/Client/src/Pages/SetNewPassword/index.css b/Client/src/Pages/SetNewPassword/index.css new file mode 100644 index 000000000..1eb504aad --- /dev/null +++ b/Client/src/Pages/SetNewPassword/index.css @@ -0,0 +1,83 @@ +:root { + --set-new-password-page-width-1: 100vw; + --set-new-password-page-height-1: 100vh; + + --set-new-password-form-width-1: 360px; + --set-new-password-form-height-1: 526px; + + --set-new-password-logo-width-1: 20px; + --set-new-password-font-size-medium: 13px; + + --set-new-password-color-1: #101828; + --set-new-password-color-2: #1570ef; + --set-new-password-color-3: #475467; +} + +.set-new-password-page { + width: var(--set-new-password-page-width-1); + display: flex; + justify-content: center; + min-height: var(--set-new-password-page-height-1); +} + +.set-new-password-form { + width: var(--set-new-password-form-width-1); + min-height: var(--set-new-password-form-height-1); + margin: 90px auto; +} + +.set-new-password-form-header { + justify-content: center; + align-items: center; + text-align: center; +} + +.set-new-password-form-gap-large { + height: 32px; +} + +.set-new-password-form-gap-medium { + height: 24px; +} + +.set-new-password-form-gap-small-medium { + height: 20px; +} + +.set-new-password-form-gap-small { + height: 12px; +} + +.set-new-password-form-heading { + font-size: 16px; + color: #101828; + font-weight: 700; +} + +.set-new-password-form-subheading { + font-size: 13px; + color: var(--set-new-password-color-3); + font-weight: 600; +} + +.set-new-password-back-button { + display: flex; + justify-content: center; + align-items: center; + cursor: pointer; +} + +.set-new-password-back-button-img { + width: 20px; + height: 20px; + margin-right: 5px; + align-items: center; +} + +.set-new-password-back-button-text { + height: 20px; + font-size: 13px; + color: var(--set-new-password-color-3); + font-weight: 600; + align-items: center; +} diff --git a/Client/src/Pages/SetNewPassword/index.jsx b/Client/src/Pages/SetNewPassword/index.jsx new file mode 100644 index 000000000..5f718f666 --- /dev/null +++ b/Client/src/Pages/SetNewPassword/index.jsx @@ -0,0 +1,77 @@ +import BackgroundPattern from "../../Components/BackgroundPattern/BackgroundPattern"; +import "./index.css"; +import React from "react"; +import LockIcon from "../../assets/Images/lock-icon.png"; +import PasswordTextField from "../../Components/TextFields/Password/PasswordTextField"; +import Check from "../../Components/Check/Check"; +import Button from "../../Components/Button"; +import LeftArrow from "../../assets/Images/arrow-left.png"; + +const SetNewPassword = () => { + return ( +
+ +
+
+ LockIcon +
+
Set new password
+
+
+ Your new password must be different to previously used passwords. +
+
+
+
+ +
+ +
+
+ +
+ +
+
+
+
+
+ LeftArrow +
+ Back to log in +
+
+
+
+ ); +}; + +export default SetNewPassword; diff --git a/Client/src/assets/Images/lock-icon.png b/Client/src/assets/Images/lock-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..163adad87ac1ede49e4e12457bf227dd5fdb22f6 GIT binary patch literal 1724 zcmV;t21EIYP)GrLw5q)LW{^wzjaPOc)1+?>07fq>Ln>Mit;L)8N$U%=2W09B4XKyH=X1L`4H zmRwVWDF{`fl9&F$HpW@g263==r|<3V7(=kVkXdA#pR}Iw&g^)8^WMC9^L7kyb+F*- zRNn1=w>BU|`K1u1F}Al?iw_Nn83AAj1_=i2F7yBxgPP-tP0nE@hS%`$u+{aMPKBjX z=~J$Ku!Jp-fndvAXQl?R{P6ItJ?H`0_6ZJrBT;wUX#v8}81|35^I?de2Rk^hXAi2i zLb-aBEfnlH^Z_c^*Mq~FUBbR!<~dfb*mLE>TA^696VPX%K2zU`1B98fB-wr?DGW zYee4TLCRc+P2u`#!TUH8F^0<23^x8nZ}o4z`%sN#yI~%2;r%1E$FmmBM0E3t>*l%=Ff8w5lF&!Za+cc<{TMf;ZYGLvd5sWqE4lPTP9w4yhy4> za1rtiXiVfIkhV`a9>Z)SQ0eHb)-l8uP<2yyS)B3d*Q>d;mg4!8@pVE2XO&?c4YUQk z_YFh>18A%{M2OFguM8xL;TMcOfirQAtcSe$ljVRmf!P}R^3(JTL;}+@%0w75Ifw#C z;IW?*E2yegyLv<#lf~fcBt(N#Upf=fLX6T)ct65IZAzr{4Tu1SVR)%WI2Vn8kuXb8 z8e@*tt*+d-;2=d3FvPXbQ)y|H$x1satu$HZ{~)%3#)#tBvkt&fr~2F{N(RotwRv3S z+U#5DDYVk2BdxU3

SW>|5NPus~W!Vlk|B#KB1%gSLTfyimI~k9rbT?rC91=P;3R zFbj5KL%I z&SIO(Dx47{>mkrIHC77^Pb#p?=2giO0;!UApnDWcfD)Xp!^+TNVLM8M3>tKYMISD> zW1t4jb(pDgEd}tn-*V?Ui|*#eL*vUr=iV{ZK6Uh-R{LKT3AsjJHzM_=dkcoQGn7{P zx}zN!f)J`zwhKI?B?1X&l<$K(p#l0h?w-aw)sY5J)m)a_1>I{C)P!l#J+vsr`I+ie zFW4P*gHM>LA&mQl);AA3N+gUCi+qqxJv1^YxFUjQ4a(O=eG}B+%;rH^Obfjv@{r__ zgB9={h|plZ1)l<6!i(sHJcaiJZ63b+_KBX$<(xpJv&xJXbr4BYmPk(pS7?aSSGh{a zo=4C+#if5#8pNYm6$fXMUvhto&WnZ5Y@%y=Db47F)~IE0>*fUFm2MvT0g=YEdI^%_ zjd3k=xk~G~&MdzvbC}@0YAGMumVb6}uu!z^1fApw-VZnDFk=EN$Ejc0JL*;F4M?~` zptqJg-47>|IZFJHbICD9k`{x~@s7IY$bYwOQ@0B1H2 zAeNS%zX25ekjrOaKtLyI9n{jOEw%?2~X17+uQex-%j6>Pq)GG+z~|{r6g@0Z`c%Ystd}c?fa8EB*)9s1H3r ST6cW_0000 Date: Wed, 29 May 2024 23:33:51 +0330 Subject: [PATCH 3/3] un-commenting --- Client/src/Components/DashboardProgressBars/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Client/src/Components/DashboardProgressBars/index.jsx b/Client/src/Components/DashboardProgressBars/index.jsx index 4326c8d97..4b81c9d1a 100644 --- a/Client/src/Components/DashboardProgressBars/index.jsx +++ b/Client/src/Components/DashboardProgressBars/index.jsx @@ -1,4 +1,4 @@ -// import { BarChart } from '@mui/x-charts/BarChart'; +import { BarChart } from "@mui/x-charts/BarChart"; const ChartsOverviewDemo = () => { return (