Merge pull request #12 from BCIT-SSD-2020-21/11ShowPosts

11 show posts
BCIT-SSD-2020-21 · Apr 15, 2021 · 8bd3e24 · 8bd3e24
2 parents 6369070 + 8ae233b
commit 8bd3e24
Show file tree

Hide file tree

Showing 12 changed files with 2,606 additions and 55 deletions.
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/public/images/avatars/avatar.png b/client/public/images/avatars/avatar.png
diff --git a/client/src/App.js b/client/src/App.js
@@ -5,9 +5,12 @@ import Main from "./components/main/Main";
 import Navbar from "./components/navbar/Navbar";
 import Sidebar from "./components/sidebar/Sidebar";
 
+
 import LoginPage from "./layouts/LoginPage";
 import SignOutPage from "./layouts/SignOutPage"
 import NewPostPage from "./layouts/NewPostPage"
+import Posts from "./layouts/PostsPage"
+
 
 import * as token from './token'
 
@@ -43,7 +46,10 @@ const App = () => {
             </Route>  
             <Route path="/newPost">
             <NewPostPage></NewPostPage>
-            </Route>                            
+            </Route>  
+            <Route path="/posts">
+            <Posts></Posts>
+            </Route>                                       
             <Route path="/">
               <Main user={user}></Main>
             </Route>          

diff --git a/client/src/components/NewPost/NewPost.js b/client/src/components/NewPost/NewPost.js
@@ -5,7 +5,7 @@ import CloseIcon from '@material-ui/icons/Close';
 import { IconButton } from '@material-ui/core'
 import Post  from './Post'
 import './NewPost.css'
-import { BsFillPersonFill } from 'react-icons/bs';
+import { BsForward, BsCameraVideo } from 'react-icons/bs';
 import {IOSSwitch} from '../utils/ToggleSwitch'
 import FormControlLabel from '@material-ui/core/FormControlLabel';
 
@@ -93,7 +93,7 @@ export default function NewPost({ submit, close, submitPost }) {
 						<input type="file" accept="image/*" name="image-upload" id="input" onChange={imageHandler} />
 						<div className="label">
 							<label className="image-upload" htmlFor="input">
-								<BsFillPersonFill size={30} />
+								<BsCameraVideo style={{marginRight: '0.5rem'}} size={30} />
 								<span>Add Photo</span>
 							</label>
 						</div>
@@ -151,7 +151,7 @@ export default function NewPost({ submit, close, submitPost }) {
 				</div>	
 
 				<button className="submitButton">
-					<BsFillPersonFill size={30} />
+					<BsForward style={{marginRight: '0.5rem'}} size={30} />
 					<span>Add Photo</span>
 				</button>
 			</form>	

diff --git a/client/src/components/navbar/Navbar.js b/client/src/components/navbar/Navbar.js
@@ -9,7 +9,6 @@ const Navbar = ({ sidebarOpen, openSidebar, user }) => {
       </div>
       <div className="navbar__left">
         <a href="#">Subscribers</a>
-        <a href="#">Video Management</a>
         <a className="active_link" href="#">
           Admin
         </a>