From 24a66478d6bd6099dc02d6207bcf2021136eaefb Mon Sep 17 00:00:00 2001 From: DwCay Date: Thu, 2 Jun 2022 14:27:04 +0300 Subject: [PATCH] Start window Onboarding1 --- src/App.jsx | 9 +-- src/components/DropdownProfile.jsx | 4 +- src/pages/Onboarding1.jsx | 4 +- src/pages/Onboarding2.jsx | 6 +- src/pages/Onboarding3.jsx | 4 +- src/pages/Onboarding4.jsx | 13 ++-- src/pages/ResetPassword.jsx | 2 +- src/pages/SharedData.jsx | 5 +- src/pages/Signin.jsx | 6 +- src/pages/Signup.jsx | 101 ----------------------------- src/partials/Sidebar.jsx | 4 +- 11 files changed, 30 insertions(+), 128 deletions(-) delete mode 100644 src/pages/Signup.jsx diff --git a/src/App.jsx b/src/App.jsx index 3137f83..c6271ac 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -27,12 +27,14 @@ import Onboarding3 from "./pages/Onboarding3"; import Onboarding4 from "./pages/Onboarding4"; import SharedData from "./pages/SharedData"; import ResetPassword from "./pages/ResetPassword"; -import Signup from "./pages/Signup"; import Signin from "./pages/Signin"; function App() { const location = useLocation(); + useEffect(()=> { + localStorage.setItem('svgAvatar', '') + },[]) useEffect(() => { document.querySelector('html').style.scrollBehavior = 'auto' @@ -43,7 +45,8 @@ function App() { return ( <> - } /> + } /> + } /> } /> } /> } /> @@ -51,7 +54,6 @@ function App() { } /> } /> } /> - } /> } /> } /> } /> @@ -61,7 +63,6 @@ function App() { } /> } /> } /> - } /> ); diff --git a/src/components/DropdownProfile.jsx b/src/components/DropdownProfile.jsx index 6d40198..f2533b6 100644 --- a/src/components/DropdownProfile.jsx +++ b/src/components/DropdownProfile.jsx @@ -75,7 +75,7 @@ function DropdownProfile({
  • setDropdownOpen(!dropdownOpen)} > Settings @@ -84,7 +84,7 @@ function DropdownProfile({
  • setDropdownOpen(!dropdownOpen)} > Sign Out diff --git a/src/pages/Onboarding1.jsx b/src/pages/Onboarding1.jsx index c2c60a5..39dd28d 100644 --- a/src/pages/Onboarding1.jsx +++ b/src/pages/Onboarding1.jsx @@ -21,7 +21,7 @@ function Onboarding1() { {/* Header */}
    {/* Logo */} - + logo
    @@ -36,7 +36,7 @@ function Onboarding1() {
    • - 1 + 1
    • 2 diff --git a/src/pages/Onboarding2.jsx b/src/pages/Onboarding2.jsx index e17dca2..8e1560f 100644 --- a/src/pages/Onboarding2.jsx +++ b/src/pages/Onboarding2.jsx @@ -21,7 +21,7 @@ function Onboarding2() { {/* Header */}
      {/* Logo */} - + logo
      @@ -36,7 +36,7 @@ function Onboarding2() {
      • - 1 + 1
      • 2 @@ -87,7 +87,7 @@ function Onboarding2() {
      diff --git a/src/pages/Onboarding3.jsx b/src/pages/Onboarding3.jsx index a60c787..a083ba6 100644 --- a/src/pages/Onboarding3.jsx +++ b/src/pages/Onboarding3.jsx @@ -20,7 +20,7 @@ function Onboarding3() { {/* Header */}
      {/* Logo */} - + logo
      @@ -35,7 +35,7 @@ function Onboarding3() {
      • - 1 + 1
      • 2 diff --git a/src/pages/Onboarding4.jsx b/src/pages/Onboarding4.jsx index bdbf1d6..8c5fc52 100644 --- a/src/pages/Onboarding4.jsx +++ b/src/pages/Onboarding4.jsx @@ -4,6 +4,11 @@ import {generateSvgAvatar} from "../images/GenerateOnboardingSvg/GenerateSvg"; import Logo from "../images/logo.png"; function Onboarding4() { + + function saveDigitalId() { + localStorage.setItem('svgAvatar', generateSvgAvatar()) + } + return (
        @@ -19,7 +24,7 @@ function Onboarding4() { {/* Header */}
        {/* Logo */} - + logo
        @@ -34,7 +39,7 @@ function Onboarding4() {
        • - 1 + 1
        • 2 @@ -60,8 +65,8 @@ function Onboarding4() {

          Nice to meet you, Ivan 🙌

          -
        diff --git a/src/pages/ResetPassword.jsx b/src/pages/ResetPassword.jsx index d7223d0..339a010 100644 --- a/src/pages/ResetPassword.jsx +++ b/src/pages/ResetPassword.jsx @@ -18,7 +18,7 @@ function ResetPassword() {
        {/* Logo */} - + diff --git a/src/pages/SharedData.jsx b/src/pages/SharedData.jsx index db8fc56..2397bc9 100644 --- a/src/pages/SharedData.jsx +++ b/src/pages/SharedData.jsx @@ -55,9 +55,6 @@ function SharedData() { ] }; - function saveDigitalId() { - localStorage.setItem('svgAvatar', generateSvgAvatar()) - } return (
        @@ -92,7 +89,7 @@ function SharedData() {
        Onboarding {sharedDataItems.data} - saveDigitalId()} className="mt-12 btn bg-indigo-500 hover:bg-indigo-600 text-white" to="/">Get my digital ID + Get my digital ID
        diff --git a/src/pages/Signin.jsx b/src/pages/Signin.jsx index 9bcd3a0..710a855 100644 --- a/src/pages/Signin.jsx +++ b/src/pages/Signin.jsx @@ -21,7 +21,7 @@ function Signin() {
        {/* Logo */} - + @@ -60,13 +60,13 @@ function Signin() {
        Forgot Password?
        - Sign In + Sign In
        {/* Footer */}
        - Don’t you have an account? Sign Up + Don’t you have an account? Sign Up
        {/* Warning */}
        diff --git a/src/pages/Signup.jsx b/src/pages/Signup.jsx deleted file mode 100644 index 852badb..0000000 --- a/src/pages/Signup.jsx +++ /dev/null @@ -1,101 +0,0 @@ -import React from 'react'; -import { Link } from 'react-router-dom'; - -import AuthImage from '../images/auth-image.jpg'; -import AuthDecoration from '../images/auth-decoration.png'; - -function Signup() { - return ( -
        - -
        - - {/* Content */} -
        -
        - - {/* Header */} -
        -
        - {/* Logo */} - - - - - - - - - - - - - - - - - - -
        -
        - -
        -

        Create your Account ✨

        - {/* Form */} -
        -
        -
        - - -
        -
        - - -
        -
        - - -
        -
        - - -
        -
        -
        -
        - -
        - Sign Up -
        -
        - {/* Footer */} -
        -
        - Have an account? Sign In -
        -
        -
        - -
        -
        - - {/* Image */} - - -
        - -
        - ); -} - -export default Signup; diff --git a/src/partials/Sidebar.jsx b/src/partials/Sidebar.jsx index a67245b..ed7e507 100644 --- a/src/partials/Sidebar.jsx +++ b/src/partials/Sidebar.jsx @@ -85,7 +85,7 @@ function Sidebar({ {/* Logo */} - + logo
        @@ -154,7 +154,7 @@ function Sidebar({
      • 'block text-slate-400 hover:text-slate-200 transition duration-150 truncate ' + (isActive ? '!text-indigo-500' : '') }