removed most log in components

GeorgiKarapetrov · Sep 24, 2018 · 48026b5 · 48026b5
1 parent 6d35962
commit 48026b5
Show file tree

Hide file tree

Showing 20 changed files with 6 additions and 482 deletions.
diff --git a/app/components/Routes/AdminRoute.js b/app/components/Routes/AdminRoute.js
diff --git a/app/components/Routes/PrivateRoute.js b/app/components/Routes/PrivateRoute.js
diff --git a/app/components/Template/Hamburger.js b/app/components/Template/Hamburger.js
@@ -2,7 +2,6 @@ import React, { Component } from 'react';
 import { Link } from 'react-router-dom';
 
 import Menus from 'react-burger-menu';
-import cookie from 'js-cookie';
 
 import routes from '../../data/routes';
 
@@ -40,7 +39,6 @@ class Hamburger extends Component {
   }
 
   render() {
-    const { id, admin } = cookie.get();
     return (
       <div className="hamburger-container">
         <nav className="main" id="hambuger-nav">
@@ -57,8 +55,6 @@ class Hamburger extends Component {
                 </Link>
               </li>
             ))}
-            {admin ? <li><Link to="/admin"><h3>Admin</h3></Link></li> : null}
-            {id ? <li><a href="/logout"><h3>Logout</h3></a></li> : null}
           </ul>
         </Menu>
       </div>

diff --git a/app/components/Template/Header.js b/app/components/Template/Header.js
@@ -1,12 +1,9 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
-import cookie from 'js-cookie';
 
 import Hamburger from './Hamburger';
 import routes from '../../data/routes';
 
-const { id, admin } = cookie.get();
-
 const Header = () => (
   <header id="header">
     <h1 className="index-link">
@@ -21,8 +18,6 @@ const Header = () => (
             <Link to={l.path}>{l.label}</Link>
           </li>
         ))}
-        {admin ? <li><a href="/admin">Admin</a></li> : null}
-        {id ? <li><a href="/logout">Logout</a></li> : null}
       </ul>
     </nav>
     <Hamburger />

diff --git a/app/entry.js b/app/entry.js
@@ -2,9 +2,6 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { BrowserRouter as Router, Route, Switch } from 'react-router-dom';
 
-import PrivateRoute from './components/Routes/PrivateRoute';
-import AdminRoute from './components/Routes/AdminRoute';
-
 // Featured
 import Index from './views/Index';
 import About from './views/About';
@@ -16,18 +13,11 @@ import Contact from './views/Contact';
 // Hidden
 import Music from './views/Music';
 
-import Login from './views/Login';
-import Admin from './views/Admin';
-
 import NotFound from './views/NotFound';
 
 // All of our CSS
 require('./static/css/main.scss');
 
-if (window.location.href.endsWith('#')) { // For Google Oauth
-  window.history.replaceState({}, '', window.location.href.slice(0, -1));
-}
-
 ReactDOM.render(
   <Router>
     <Switch>
@@ -37,10 +27,7 @@ ReactDOM.render(
       <Route path="/stats" component={Stats} />
       <Route path="/contact" component={Contact} />
       <Route path="/music" component={Music} />
-      <Route path="/login" component={Login} />
-
-      <PrivateRoute path="/resume" component={Resume} />
-      <AdminRoute path="/admin" component={Admin} />
+      <Route path="/resume" component={Resume} />
 
       <Route component={NotFound} status={404} />
     </Switch>

diff --git a/app/layouts/Main.js b/app/layouts/Main.js
@@ -3,13 +3,12 @@ import PropTypes from 'prop-types';
 import Helmet from 'react-helmet';
 
 import ReactGA from 'react-ga';
-import cookie from 'js-cookie';
 
 import Header from '../components/Template/Header';
 import Nav from '../components/Template/Nav';
 
 if (process.env.NODE_ENV === 'production') {
-  ReactGA.initialize('UA-68649021-1');
+  ReactGA.initialize(process.env.GA_ID);
 }
 
 class Main extends Component {
@@ -19,10 +18,8 @@ class Main extends Component {
 
   componentDidMount() {
     if (process.env.NODE_ENV === 'production') {
-      const { id } = cookie.get();
       ReactGA.set({
         page: window.location.pathname,
-        userId: id,
       });
       ReactGA.pageview(window.location.pathname);
     }

diff --git a/app/static/css/main.scss b/app/static/css/main.scss
@@ -60,10 +60,8 @@
 	@import 'layout/footer';
 	@import 'layout/menu';
 
-	@import 'views/admin';
 	@import 'views/about';
 	@import 'views/contact';
-	@import 'views/login';
 	@import 'views/music';
 	@import 'views/notFound';
 	@import 'views/resume';

diff --git a/app/static/css/views/_admin.scss b/app/static/css/views/_admin.scss
diff --git a/app/static/css/views/_login.scss b/app/static/css/views/_login.scss
diff --git a/app/views/Admin.js b/app/views/Admin.js
diff --git a/app/views/Login.js b/app/views/Login.js
diff --git a/sample.env b/sample.env
@@ -22,3 +22,6 @@ HOSTNAME=http://localhost:7999
 
 # any random string
 SESSION_SECRET=1234567890
+
+# Google analytics ID
+GA_ID=UA_123456