From c43ba98638fbfc0dec77af6827fcc099d9680916 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Tue, 4 Sep 2018 11:34:10 +0200 Subject: [PATCH] Current database bound functionality moved to Profile page --- client/src/App.js | 15 +++++---------- client/src/components/Browse.js | 2 +- client/src/components/Profile.js | 11 ++++++----- client/src/index.css | 4 ++-- 4 files changed, 14 insertions(+), 18 deletions(-) diff --git a/client/src/App.js b/client/src/App.js index 80e74bf66..131e52d1a 100644 --- a/client/src/App.js +++ b/client/src/App.js @@ -4,6 +4,11 @@ import {ApolloProvider} from 'react-apollo'; import Navbar from './components/Navbar' import { Route, BrowserRouter, Switch } from 'react-router-dom' + +// Components + + + import Home from './components/Home' import Profile from './components/Profile' import Browse from './components/Browse' @@ -12,11 +17,6 @@ import About from './components/About' import Contact from './components/Contact' import Post from './components/Post' -// Components - -import UserList from './components/UserList'; -import AddUser from './components/AddUser'; - // Apollo Client Setup const client = new ApolloClient({ @@ -42,11 +42,6 @@ class App extends Component { -
-

Advanced Algos - Users Module

- - -
); diff --git a/client/src/components/Browse.js b/client/src/components/Browse.js index 6e85d76e4..b0a7fa4f2 100644 --- a/client/src/components/Browse.js +++ b/client/src/components/Browse.js @@ -5,7 +5,7 @@ const Browse = () => {

Browse

-

Lorem ipsum dolor sit amet consectetur adipisicing elit. Recusandae repudiandae repellat illo magni eligendi cupiditate voluptates eius nam voluptate. Incidunt nihil ullam quae quia officia quaerat, deserunt eligendi explicabo totam?

+

Here we will have the Browse functionality. we will allow end users to navigate through a directory like list of system users. We need to resolve pagination and be able to filter users by their role.

) diff --git a/client/src/components/Profile.js b/client/src/components/Profile.js index 88af0ea4f..1c0dda0f0 100644 --- a/client/src/components/Profile.js +++ b/client/src/components/Profile.js @@ -1,12 +1,13 @@ import React from 'react' +import UserList from './UserList'; +import AddUser from './AddUser'; + const Profile = () => { return ( -
-
-

Profile

-

Lorem ipsum dolor sit amet consectetur adipisicing elit. Recusandae repudiandae repellat illo magni eligendi cupiditate voluptates eius nam voluptate. Incidunt nihil ullam quae quia officia quaerat, deserunt eligendi explicabo totam?

-
+
+ +
) } diff --git a/client/src/index.css b/client/src/index.css index b141c590e..948bb3170 100644 --- a/client/src/index.css +++ b/client/src/index.css @@ -73,10 +73,10 @@ form button{ #user-profile{ position: fixed; - top: 0; + bottom: 0; right: 0; width: 40%; - height: 100%; + height: 80%; background: #AD1457; padding: 30px; overflow: auto;