Skip to content

Commit 5c3acdd

Browse files
committed
[Starts #171648121] Feature page displays user profile and support updating user info
1 parent e522140 commit 5c3acdd

26 files changed

+745
-12
lines changed

package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
"redux": "^4.0.5",
8181
"redux-devtools-extension": "^2.13.8",
8282
"redux-logger": "^3.0.6",
83-
"redux-thunk": "^2.3.0"
83+
"redux-thunk": "^2.3.0",
84+
"simple-flexbox": "^2.3.1"
8485
}
8586
}
+3
Loading
+10
Loading
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
import React from "react";
2+
3+
export default () => (
4+
<svg
5+
width="18"
6+
height="19"
7+
viewBox="0 0 18 19"
8+
fill="none"
9+
xmlns="http://www.w3.org/2000/svg"
10+
>
11+
<path
12+
d="M7.99999 19C9.10374 19 9.99905 18.1047 9.99905 17H6.00093C6.00093 18.1047 6.89624 19 7.99999 19ZM14.7309 14.3216C14.1272 13.6728 12.9975 12.6969 12.9975 9.5C12.9975 7.07188 11.295 5.12812 8.99937 4.65125V4C8.99937 3.44781 8.55187 3 7.99999 3C7.44812 3 7.00062 3.44781 7.00062 4V4.65125C4.70499 5.12812 3.00249 7.07188 3.00249 9.5C3.00249 12.6969 1.8728 13.6728 1.26905 14.3216C1.08155 14.5231 0.998429 14.7641 0.999991 15C1.00343 15.5125 1.40562 16 2.00312 16H13.9969C14.5944 16 14.9969 15.5125 15 15C15.0016 14.7641 14.9184 14.5228 14.7309 14.3216Z"
13+
fill="#C5C7CD"
14+
/>
15+
<circle
16+
cx="13"
17+
cy="5"
18+
r="3.75"
19+
fill="#3751FF"
20+
stroke="#F7F8FC"
21+
strokeWidth="1.5"
22+
/>
23+
</svg>
24+
);
+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import React from "react";
2+
3+
export default () => (
4+
<svg
5+
width="16"
6+
height="16"
7+
viewBox="0 0 16 16"
8+
fill="none"
9+
xmlns="http://www.w3.org/2000/svg"
10+
>
11+
<circle cx="6.5" cy="6.5" r="5.75" stroke="#C5C7CD" strokeWidth="1.5" />
12+
<path
13+
d="M11 11L15 15"
14+
stroke="#C5C7CD"
15+
strokeWidth="1.5"
16+
strokeLinecap="round"
17+
/>
18+
</svg>
19+
);
Loading
Loading
Loading
+10
Loading

src/Assets/DashboardAssets/user.svg

+9
Loading

src/Assets/DashboardAssets/user_icon_big.svg

+9
Loading
+10
Loading

src/Components/App.jsx

+4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import "react-toastify/dist/ReactToastify.css";
77
import "./App.scss";
88
import store from "../Redux/store";
99
import Home from "./Home/Home.jsx";
10+
import Profile from "./Profile/Profile.jsx";
11+
import Users from "./Users/Users.jsx";
1012
import SignUpComponent from "./Auth/SignUp/SignUp.jsx";
1113
import SignInComponent from "./Auth/SignIn/SignIn.jsx";
1214
import Protected from "./Shared/ProtectedRoute/ProtectedRoute.jsx";
@@ -27,6 +29,8 @@ const App = () => (
2729
component={EmailVerificationResponse}
2830
/>
2931
<Protected exact path="/home" component={Home} />
32+
<Route exact path="/profile" component={Profile} />
33+
<Route exact path="/users" component={Users} />
3034
<Route exact path="/signup" component={SignUpComponent} />
3135
</Switch>
3236
</Router>

src/Components/App.scss

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
$font-stack: 14px "Roboto", Nunito, Arial, sans-serif;
22
$primary-color: #4d4d4d;
3-
$background-color: #f5f5f5;
3+
$background-color: #f7f7f7;
44

55
html,
66
body {
77
font: 100% $font-stack;
88
color: $primary-color;
9-
margin: 0;
109
padding: 0;
10+
margin: 0;
11+
height: 100%;
12+
width: 100%;
1113
}
1214

1315
body {
1416
line-height: 1.4em;
1517
background: $background-color;
16-
min-width: 230px;
17-
max-width: 550px;
1818
margin: 0 auto;
1919
}
2020

src/Components/Home/Home.jsx

+11-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
1-
import React, { Fragment } from "react";
1+
import React from "react";
2+
import Sidebar from "../Shared/Dashboard/Sidebar/Sidebar.jsx";
3+
import Header from "../Shared/Dashboard/Header/Header.jsx";
4+
import "../Shared/Dashboard/Dashboard.scss";
25

36
const Home = () => (
4-
<Fragment>
5-
<section className="main">
6-
<h2>Home Page</h2>
7-
<p>Welcome to the dashboard page</p>
8-
</section>
9-
</Fragment>
7+
<div className="App">
8+
<div className="grid-container">
9+
<Header className="header" />
10+
<Sidebar className="grid-sidebar" />
11+
<div className="content">Home</div>
12+
</div>
13+
</div>
1014
);
1115

1216
export default Home;

0 commit comments

Comments
 (0)