Add files

dustin-chan · Nov 16, 2018 · 0d23df2 · 0d23df2
1 parent 239f181
commit 0d23df2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/...assets/stylesheets/components/browse.scss → .../stylesheets/components/main_content.scss b/...assets/stylesheets/components/browse.scss → .../stylesheets/components/main_content.scss
@@ -21,6 +21,14 @@
     opacity: .95;
 }
 
+.main-container .logo {
+  display: flex;
+  justify-content: left;
+  font-weight: 545;
+  font-size: 24px;
+  color: white;
+}
+
 
 
 // body {

diff --git a/frontend/components/App.jsx b/frontend/components/App.jsx
@@ -4,7 +4,7 @@ import { Route, Switch } from 'react-router-dom';
 import LoginFormContainer from './session/login_form_container';
 import SignupFormContainer from './session/signup_form_container';
 import SplashContainer from './splash/splash_container';
-import BrowseContainer from './browse/browse_container';
+import BrowseContainer from './main/browse_container';
 
 const App = () => {
     return (

diff --git a/frontend/components/main/main_content.jsx b/frontend/components/main/main_content.jsx
@@ -6,6 +6,10 @@ class MainContent extends React.Component {
     return (
       <div className="main-container">
         <nav className="nav-bar">
+          <div className="logo">
+            <img src={window.whiteLogoURL}></img>
+            <h1>Spoofify</h1>
+          </div>
           <button onClick={()=>this.props.logout()}>Logout</button>
         </nav>
       </div>