Changed The Routes

main
Pedram Keshavarzi 3 years ago
parent 6c40eff910
commit 9584a552cc
  1. 1
      src/App.css
  2. 4
      src/App.js
  3. 1
      src/components/Button/index.js
  4. 4
      src/components/nav/Nav.js
  5. 2
      src/view/login/Login.js
  6. 3
      tailwind.config.js

@ -1,3 +1,4 @@
.App { .App {
text-align: center; text-align: center;
direction: rtl;
} }

@ -18,6 +18,7 @@ import avatar4 from "./assets/img/avatar/alexander-hipp-iEEBWgY_6lA-unsplash.jpg
import avatar5 from "./assets/img/avatar/julian-wan-WNoLnJo7tS8-unsplash.jpg"; import avatar5 from "./assets/img/avatar/julian-wan-WNoLnJo7tS8-unsplash.jpg";
import avatar6 from "./assets/img/avatar/nicolas-horn-MTZTGvDsHFY-unsplash.jpg"; import avatar6 from "./assets/img/avatar/nicolas-horn-MTZTGvDsHFY-unsplash.jpg";
import avatar7 from "./assets/img/avatar/pexels-yuri-manei-2690323.jpg"; import avatar7 from "./assets/img/avatar/pexels-yuri-manei-2690323.jpg";
import LoginSignUp from './view/LoginSignUp';
let data = [ let data = [
@ -643,8 +644,9 @@ function App() {
{LOGIN && <Header />} {LOGIN && <Header />}
{LOGIN && <Nav logOut={logOut} />} {LOGIN && <Nav logOut={logOut} />}
<Routes> <Routes>
<Route path="/" element={<LoginSignUp />} />
<Route <Route
path="/" path="/login"
element={ element={
<Login activeLogin={activeLogin} />} <Login activeLogin={activeLogin} />}

@ -0,0 +1 @@
import React from "react";

@ -44,7 +44,7 @@ const Nav = ({ logOut }) => {
{/* ------------ */} {/* ------------ */}
<div className="nav-menu-container w-full h-3/4 flex-col items-center absolute z-30 top-1/4 right-0"> <div className="nav-menu-container w-full h-3/4 flex-col items-center absolute z-30 top-1/4 right-0">
<Link <Link
to="/" to="/dashboard"
className="nav-menu-container-item w-full h-1/6 flex flex-col items-center justify-center hover:bg-color2_5 cursor-pointer" className="nav-menu-container-item w-full h-1/6 flex flex-col items-center justify-center hover:bg-color2_5 cursor-pointer"
onClick={() => chaneNav(1)} onClick={() => chaneNav(1)}
> >
@ -236,7 +236,7 @@ const Nav = ({ logOut }) => {
</Link> </Link>
{/* ---------- */} {/* ---------- */}
<Link <Link
to="/login" to="/"
className="nav-menu-container-item w-full h-1/6 flex flex-col items-center justify-center hover:bg-color2_5 cursor-pointer" className="nav-menu-container-item w-full h-1/6 flex flex-col items-center justify-center hover:bg-color2_5 cursor-pointer"
onClick={logOut} onClick={logOut}
> >

@ -74,7 +74,7 @@ const Login = ({ activeLogin }) => {
</div> </div>
{/* ---- */} {/* ---- */}
<Link <Link
to="/" to="/dashboard"
className="Login-box-form-btn w-full h-12 rounded bg-color2 text-white flex items-center justify-center mt-6" className="Login-box-form-btn w-full h-12 rounded bg-color2 text-white flex items-center justify-center mt-6"
onClick={activeLogin} onClick={activeLogin}
> >

@ -23,6 +23,9 @@ module.exports = {
color17: "#CB1F1F", color17: "#CB1F1F",
color18: "#E2E2E2", color18: "#E2E2E2",
color19: "#959595", //register input label color19: "#959595", //register input label
red26: '#521326',
red52: '#df1452',
grayEC: '#ececec'
}, },
}, },
screens: { screens: {

Loading…
Cancel
Save