Rettelser + anvendelse af me2 query

src/App.js

@@ -58,7 +58,7 @@ function App() {
  <Router>
  <ApolloProvider client={client}>
  <Header />
- <AdminNav />
+ {localStorage.token && <AdminNav />}
  <Switch>
  {/* Routes til offentligt tilgængeligt indhold */}
  <Route path="/" exact component={Textarea} />

src/components/addNewScooter/AddNewScooter.js

@@ -436,7 +436,7 @@ function AddNewScooter() {
  id="scooterDescription"
  minLength="1"
  maxLength="500"
- default={description}
+ defaultValue={description}
  placeholder="Beskrivelse..."
  onChange={event =>
  setDescription(event.target.value.replace(/\r?\n/g, '<br>'))

src/components/adminNav/AdminNav.js

@@ -15,39 +15,44 @@ import {
  NavLink
 } from 'reactstrap';
 
-// ME query defineres
-export const ME = gql`
- {
- me {
- _id
- }
- }
-`;
-
 // AdminNav komponent
-function AdminNav(props) {
+function AdminNav() {
+ // ME query defineres
+ const ME2 = gql`
+ {
+ me2(token: ${localStorage.token}) {
+ _id
+ firstName
+ lastName
+ }
+ }
+ `;
+ // Client initialiseres til at være ME2 query
+ const { loading, error, data, client } = useQuery(ME2);
  // States med React Hooks
  const [isOpen, setIsOpen] = useState(false);
 
  // Toggle til at åbne og lukke AdminNav
  const toggle = () => setIsOpen(!isOpen);
 
- // Client initialiseres til at være ME query
- const { client } = useQuery(ME);
-
  // Funktion der smider token og redirecter til login-siden
  const Logout = () => {
  localStorage.clear();
  client.resetStore();
  window.location = '/login';
  };
 
+ if (loading) return <p className="text-center m-3">Loading...</p>;
+ if (error) return <p className="text-center m-3">Error!</p>;
+
  return (
  <React.Fragment>
  {localStorage.token && (
  <Navbar className="veryLightGreenBg adminNavStyles" light expand="md">
  <Container>
- <NavbarBrand></NavbarBrand>
+ <NavbarBrand href="/">
+ {data.me2.firstName + ' ' + data.me2.lastName}
+ </NavbarBrand>
  <NavbarToggler onClick={toggle} />
  <Collapse isOpen={isOpen} navbar>
  <Nav className="ml-auto" navbar>
@@ -84,5 +89,4 @@ function AdminNav(props) {
  </React.Fragment>
  );
 }
-
 export default AdminNav;