From 09e1e52e168f3b761f6e78494d02eb721604141a Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 20 Jun 2018 11:24:04 +0200 Subject: [PATCH] Client - deactivate administration for now --- ...admin-sports.test.js => admin-sports.test} | 0 .../e2e/{admin.test.js => admin.test} | 0 fittrackee_client/src/components/App.jsx | 4 ++-- .../src/components/NavBar/index.jsx | 24 +++++++++---------- 4 files changed, 14 insertions(+), 14 deletions(-) rename fittrackee_client/e2e/{admin-sports.test.js => admin-sports.test} (100%) rename fittrackee_client/e2e/{admin.test.js => admin.test} (100%) diff --git a/fittrackee_client/e2e/admin-sports.test.js b/fittrackee_client/e2e/admin-sports.test similarity index 100% rename from fittrackee_client/e2e/admin-sports.test.js rename to fittrackee_client/e2e/admin-sports.test diff --git a/fittrackee_client/e2e/admin.test.js b/fittrackee_client/e2e/admin.test similarity index 100% rename from fittrackee_client/e2e/admin.test.js rename to fittrackee_client/e2e/admin.test diff --git a/fittrackee_client/src/components/App.jsx b/fittrackee_client/src/components/App.jsx index 016c7bae..15b8d65b 100644 --- a/fittrackee_client/src/components/App.jsx +++ b/fittrackee_client/src/components/App.jsx @@ -2,7 +2,7 @@ import React from 'react' import { Redirect, Route, Switch } from 'react-router-dom' import './App.css' -import Admin from './Admin' +// import Admin from './Admin' import Activity from './Activity' import Activities from './Activities' import Dashboard from './Dashboard' @@ -90,7 +90,7 @@ export default class App extends React.Component { component={Activities} /> - + {/* */} diff --git a/fittrackee_client/src/components/NavBar/index.jsx b/fittrackee_client/src/components/NavBar/index.jsx index f2912b10..a5acaac5 100644 --- a/fittrackee_client/src/components/NavBar/index.jsx +++ b/fittrackee_client/src/components/NavBar/index.jsx @@ -58,18 +58,18 @@ function NavBar(props) { )} - {props.user.admin && ( -
  • - - Admin - -
  • - )} + {/* {props.user.admin && ( */} + {/*
  • */} + {/* */} + {/* Admin */} + {/* */} + {/*
  • */} + {/* )} */}
      {!props.user.isAuthenticated && (