Merge branch 'master' into DID-12

This commit is contained in:
DuCay
2022-07-26 17:18:14 +03:00
committed by GitHub
3 changed files with 12 additions and 26 deletions

View File

@@ -3,8 +3,8 @@ import { Link } from 'react-router-dom';
import OnboardingImage from '../images/onboarding-image.jpg'; import OnboardingImage from '../images/onboarding-image.jpg';
import OnboardingDecoration from '../images/auth-decoration.png'; import OnboardingDecoration from '../images/auth-decoration.png';
import Logo from "../images/logo.png"; import Logo from "../images/logo.png";
import {observer} from "mobx-react-lite"; import { observer } from "mobx-react-lite";
import {registrationStore} from "../store/store"; import { registrationStore } from "../store/store";
const Onboarding1 = observer(() => { const Onboarding1 = observer(() => {
@@ -64,7 +64,7 @@ const Onboarding1 = observer(() => {
<h1 className="text-3xl text-slate-800 font-bold mb-12">Tell us about your company </h1> <h1 className="text-3xl text-slate-800 font-bold mb-12">Tell us about your company </h1>
{/* Form */} {/* Form */}
<form> <div>
<div className="sm:flex space-y-3 sm:space-y-0 sm:space-x-4 mb-8"> <div className="sm:flex space-y-3 sm:space-y-0 sm:space-x-4 mb-8">
<label className="flex-1 relative block cursor-pointer"> <label className="flex-1 relative block cursor-pointer">
<input type="radio" name="radio-buttons" className="peer sr-only" defaultChecked /> <input type="radio" name="radio-buttons" className="peer sr-only" defaultChecked />
@@ -114,7 +114,7 @@ const Onboarding1 = observer(() => {
<Link to="/onboarding-2">Next Step -&gt;</Link> <Link to="/onboarding-2">Next Step -&gt;</Link>
</button> </button>
</div> </div>
</form> </div>
</div> </div>
</div> </div>

View File

@@ -31,12 +31,12 @@ const Onboarding2 = observer(() => {
} }
}; };
const saveStoreRegistration = ()=>{ const saveStoreRegistration = () => {
if (fillingForm) { if (fillingForm) {
registrationStore.saveDataRegistration(Object.keys(dataRegistration).map(item => { registrationStore.saveDataRegistration(Object.keys(dataRegistration).map(item => {
return{ return{
key: `${item}`, key: `${item}`,
value: dataRegistration[item] value: dataRegistration[item],
} }
})) }))
} }
@@ -93,7 +93,7 @@ const Onboarding2 = observer(() => {
<div className="max-w-[344px] mx-auto"> <div className="max-w-[344px] mx-auto">
<h1 className="text-3xl text-slate-800 font-bold mb-6">Create your Account </h1> <h1 className="text-3xl text-slate-800 font-bold mb-6">Create your Account </h1>
{/* Form */} {/* Form */}
<form> <div>
<div className="space-y-4 mb-8"> <div className="space-y-4 mb-8">
<div> <div>
<label className="block text-sm font-medium mb-1" htmlFor="first_name">First name <span className="text-rose-500">*</span></label> <label className="block text-sm font-medium mb-1" htmlFor="first_name">First name <span className="text-rose-500">*</span></label>
@@ -127,7 +127,7 @@ const Onboarding2 = observer(() => {
<Link id="signup" to={fillingForm && "/onboarding-3"} >Sign Up</Link> <Link id="signup" to={fillingForm && "/onboarding-3"} >Sign Up</Link>
</button> </button>
</div> </div>
</form> </div>
{/* Footer */} {/* Footer */}
<div className="pt-5 mt-6 border-t border-slate-200"> <div className="pt-5 mt-6 border-t border-slate-200">
<div className="text-sm"> <div className="text-sm">

View File

@@ -2,6 +2,7 @@ import React from 'react';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
import AuthImage from '../images/auth-image.jpg'; import AuthImage from '../images/auth-image.jpg';
import AuthDecoration from '../images/auth-decoration.png'; import AuthDecoration from '../images/auth-decoration.png';
import Logo from "../images/logo.png";
function ResetPassword() { function ResetPassword() {
return ( return (
@@ -18,22 +19,7 @@ function ResetPassword() {
<div className="flex items-center justify-between h-16 px-4 sm:px-6 lg:px-8"> <div className="flex items-center justify-between h-16 px-4 sm:px-6 lg:px-8">
{/* Logo */} {/* Logo */}
<Link className="block" to="/dashboard"> <Link className="block" to="/dashboard">
<svg width="32" height="32" viewBox="0 0 32 32"> <img alt='logo' src={Logo} width="89" height="32"/>
<defs>
<linearGradient x1="28.538%" y1="20.229%" x2="100%" y2="108.156%" id="logo-a">
<stop stopColor="#A5B4FC" stopOpacity="0" offset="0%" />
<stop stopColor="#A5B4FC" offset="100%" />
</linearGradient>
<linearGradient x1="88.638%" y1="29.267%" x2="22.42%" y2="100%" id="logo-b">
<stop stopColor="#38BDF8" stopOpacity="0" offset="0%" />
<stop stopColor="#38BDF8" offset="100%" />
</linearGradient>
</defs>
<rect fill="#6366F1" width="32" height="32" rx="16" />
<path d="M18.277.16C26.035 1.267 32 7.938 32 16c0 8.837-7.163 16-16 16a15.937 15.937 0 01-10.426-3.863L18.277.161z" fill="#4F46E5" />
<path d="M7.404 2.503l18.339 26.19A15.93 15.93 0 0116 32C7.163 32 0 24.837 0 16 0 10.327 2.952 5.344 7.404 2.503z" fill="url(#logo-a)" />
<path d="M2.223 24.14L29.777 7.86A15.926 15.926 0 0132 16c0 8.837-7.163 16-16 16-5.864 0-10.991-3.154-13.777-7.86z" fill="url(#logo-b)" />
</svg>
</Link> </Link>
</div> </div>
</div> </div>
@@ -41,7 +27,7 @@ function ResetPassword() {
<div className="max-w-sm mx-auto px-4 py-8"> <div className="max-w-sm mx-auto px-4 py-8">
<h1 className="text-3xl text-slate-800 font-bold mb-6">Reset your Password </h1> <h1 className="text-3xl text-slate-800 font-bold mb-6">Reset your Password </h1>
{/* Form */} {/* Form */}
<form> <div>
<div className="space-y-4"> <div className="space-y-4">
<div> <div>
<label className="block text-sm font-medium mb-1" htmlFor="email">Email Address <span className="text-rose-500">*</span></label> <label className="block text-sm font-medium mb-1" htmlFor="email">Email Address <span className="text-rose-500">*</span></label>
@@ -51,7 +37,7 @@ function ResetPassword() {
<div className="flex justify-end mt-6"> <div className="flex justify-end mt-6">
<button className="btn bg-indigo-500 hover:bg-indigo-600 text-white whitespace-nowrap">Send Reset Link</button> <button className="btn bg-indigo-500 hover:bg-indigo-600 text-white whitespace-nowrap">Send Reset Link</button>
</div> </div>
</form> </div>
</div> </div>
</div> </div>