Skip to content

Commit

Permalink
Merge pull request #28 from Lambda-School-Labs/RC2cleanup
Browse files Browse the repository at this point in the history
Rc2cleanup
  • Loading branch information
fishmanjohn authored Mar 27, 2020
2 parents e533825 + ab77e71 commit 87a7a48
Show file tree
Hide file tree
Showing 17 changed files with 355 additions and 896 deletions.
12 changes: 10 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

| [George Raymond](https://github.com/georgeraymond98) | [Chase Redford](https://github.com/redfordch1) | [Anthony Lopez](https://github.com/anthony1120)
| :-----------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------: |
| [<img src="https://avatars3.githubusercontent.com/u/49840522?s=460&u=468032a956335acae29eba43ce68ef89f9afa950&v=4" width = "200" />](https://github.com/georgeraymond98) | [<img src="https://avatars1.githubusercontent.com/u/54921879?s=460&u=5e2d9c2577c51d6040add3e5661d240511bc3737&v=4" width = "200" />](https://github.com/redfordch1) | [<img src="https://avatars0.githubusercontent.com/u/53539912?s=460&u=2f676643c6a84e8feb7608a375c3c5ca3217e99f&v=4" width = "200" />](https://github.com/anthony1120)
| [<img src="https://github.com/favicon.ico" width="15"> ](https://github.com/georgeraymond98) | [<img src="https://github.com/favicon.ico" width="15"> ](https://github.com/redfordch1) | [<img src="https://github.com/favicon.ico" width="15"> ](https://github.com/anthonylopez1120) | [<img src="https://github.com/favicon.ico" width="15"> ](https://github.com/) |
| [<img src="https://avatars3.githubusercontent.com/u/49840522?s=460&u=468032a956335acae29eba43ce68ef89f9afa950&v=4" width = "200" />](https://github.com/georgeraymond98) | [<img src="https://avatars1.githubusercontent.com/u/54921879?s=460&u=5e2d9c2577c51d6040add3e5661d240511bc3737&v=4" width = "200" />](https://github.com/redfordch1) | [<img src="https://avatars0.githubusercontent.com/u/53539912?s=460&u=2f676643c6a84e8feb7608a375c3c5ca3217e99f&v=4" width = "200" />](https://github.com/AnthonyLopez1120)
| [<img src="https://github.com/favicon.ico" width="15"> ](https://github.com/georgeraymond98) | [<img src="https://github.com/favicon.ico" width="15"> ](https://github.com/redfordch1) | [<img src="https://github.com/favicon.ico" width="15"> ](https://github.com/AnthonyLopez1120) | [<img src="https://github.com/favicon.ico" width="15"> ](https://github.com/) |
| [ <img src="https://static.licdn.com/sc/h/al2o9zrvru7aqj8e1x2rzsrca" width="15"> ](https://www.linkedin.com/in/george-raymond-656285102/) | [ <img src="https://static.licdn.com/sc/h/al2o9zrvru7aqj8e1x2rzsrca" width="15"> ](https://www.linkedin.com/) | [ <img src="https://static.licdn.com/sc/h/al2o9zrvru7aqj8e1x2rzsrca" width="15"> ](https://www.linkedin.com/) | [ <img src="https://static.licdn.com/sc/h/al2o9zrvru7aqj8e1x2rzsrca" width="15"> ](https://www.linkedin.com/) |
<br>
<br>
Expand Down Expand Up @@ -71,6 +71,14 @@ Our app GeoSeek aims to be a known name for creating engaging experiences throug

JWT

## Mapping API's

React Map Gl, ArcGis geocoding

## Data Storage

Geoseek-be

# Environment Variables

In order for the app to function correctly, the user must set up their own environment variables. There should be a .env.local file containing the following:
Expand Down
153 changes: 89 additions & 64 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
import React, { useState, Component } from "react";
import NavBar from "./components/navbar";
import Map from "./components/map";
import ViewGem from "./components/viewGem";
import CreateGem from "./components/createGem";
import styled from "styled-components";

import { BrowserRouter as Router, Route } from "react-router-dom";



import './App.css';
import Header from "./components/Header/Header";


const BACKEND_URL = process.env.BACKEND_URL
import React, {useState} from 'react';
import NavBar from './components/navbar'
import Map from './components/map'
Expand All @@ -23,60 +7,101 @@ import Register from './components/register'
import Login from './components/Login'
import UserDashboard from './components/dashboard'
import styled from 'styled-components'
import {BrowserRouter as Router, Route, Switch} from "react-router-dom";
import RegisterImg from './images/RegisterImg.jpg'
import {Route, Switch} from 'react-router-dom'
import Header from "./components/Header/Header"
import ProtetedRoute from './utils/protectedRoute';
import './App.css';


const AppContainer = styled.div`
min-height: 100vh;
max-height: 100vh;
`

function App() {
const MapAndGems = styled.div`
display: flex;
height: 100vh;
min-height: 100vh;
`
const MapAndGems = styled.div`
display: flex;
`

const [[latitude, longitude], setLatLong] = useState([36.955992,-121.971428])
function App () {
const [[latitude, longitude], setLatLong] = useState([36.955992, -121.971428])
const [refresh, setRefresh] = useState(false);
const updatePosition = (latitude, longitude) => {
setLatLong([latitude, longitude]);
};


return (
<Router>
<div>
<NavBar />
<div>

<MapAndGems>
<Map refresh={refresh} latitude={latitude} longitude={longitude} />
{/* <Route exact path="/" /> */}
<Route
path="/ViewGem"
component={() => <ViewGem updatePosition={updatePosition} />}
/>
<Route
path="/CreateGem"
render={props => (
<CreateGem
{...props}
latitude={latitude}
longitude={longitude}
updatePosition={updatePosition}
setRefresh={setRefresh}
/>
)}
/>
</MapAndGems>
<landingPage/>
<Route exact path='/' />
<Route path='/ViewGem' component={() => <ViewGem updatePosition={updatePosition} />} />
<Route path='/UserDash' component={UserDashboard}/>
<Route path='/CreateGem'
render={(props) => <CreateGem {...props} latitude={latitude} longitude={longitude} updatePosition={updatePosition} setRefresh={setRefresh} />} />
</div>
</div>
</Router>
);
setLatLong([latitude, longitude])
}
const [RegLogRendered, setRegLogRendered] = useState(false);

if (RegLogRendered === true) {
return (
<AppContainer>
<NavBar/>
<MapAndGems>
<Route exact path='/' component={() => <Header setRegLogRendered={setRegLogRendered}/>} />
<Route path='/Register' render={(props) => <Register {...props} setRegLogRendered={setRegLogRendered} />} />
<Route path='/Login' component={(props) => <Login {...props} setRefresh={setRefresh} setRegLogRendered={setRegLogRendered} />} />
<Route path='/UserDash' component={(props) => <UserDashboard {...props} setRegLogRendered={setRegLogRendered} />}/>
</MapAndGems>
</AppContainer>
)
} else {
return (
<AppContainer>
<NavBar/>
<MapAndGems>
<Route exact path='/' component={() => <Header setRegLogRendered={setRegLogRendered}/>} />
<Route path='*'>
<Map refresh={refresh} setRefresh={setRefresh} latitude={latitude} longitude={longitude} setRegLogRendered={setRegLogRendered}/>
</Route>
<Route path='/Register' render={(props) => <Register {...props} setRegLogRendered={setRegLogRendered} />} />
<Route path='/Login' render={(props) => <Login {...props} refresh={refresh} setRefresh={setRefresh} setRegLogRendered={setRegLogRendered} />} />
<ProtetedRoute path='/CreateGem' component={props => <CreateGem {...props} setRegLogRendered={setRegLogRendered} latitude={latitude} longitude={longitude} updatePosition={updatePosition} setRefresh={setRefresh} />} />
<Route path='/ViewGem' render={(props) => <ViewGem {...props} refresh={refresh} setRegLogRendered={setRegLogRendered} updatePosition={updatePosition} />} />
<ProtetedRoute path='/UserDash' component={(props) => <UserDashboard {...props} setRegLogRendered={setRegLogRendered} />}/>
</MapAndGems>
</AppContainer>
)
}
}

export default App;














// return (
// <AppContainer>
//
// <MapAndGems>
// {RegLogRendered === true
// ? <div>
// <Route exact path='/' component={() => <Header setRegLogRendered={setRegLogRendered}/>} />
// <Route path='/Register' render={(props) => <Register {...props} setRegLogRendered={setRegLogRendered} />} />
// <Route path='/Login' component={(props) => <Login {...props} setRefresh={setRefresh} setRegLogRendered={setRegLogRendered} />} />
// </div>
// :
// <div>
// <Route exact path='/' component={() => <Header setRegLogRendered={setRegLogRendered}/>} />
// <Map refresh={refresh} setRefresh={setRefresh} latitude={latitude} longitude={longitude} />
// <Route path='/Register' render={(props) => <Register {...props} setRegLogRendered={setRegLogRendered} />} />
// <Route path='/Login' component={(props) => <Login {...props} setRefresh={setRefresh} setRegLogRendered={setRegLogRendered} />} />
// <ProtetedRoute path='/CreateGem' component={props => <CreateGem {...props} setRegLogRendered={setRegLogRendered} latitude={latitude} longitude={longitude} updatePosition={updatePosition} setRefresh={setRefresh} />} />
// <Route path='/ViewGem' component={() => <ViewGem refresh={refresh} setRegLogRendered={setRegLogRendered} updatePosition={updatePosition} />} />
// </div>
// }
// </MapAndGems>
// {/* <Route path='/UserDash' component={(props) => <UserDashboard {...props} setRegLogRendered={setRegLogRendered} />}/> */}
// </AppContainer>
// );
// }

// export default App
108 changes: 0 additions & 108 deletions src/AppRedux.js

This file was deleted.

8 changes: 4 additions & 4 deletions src/components/Header/Header.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ function Header(props) {
<Col xs="12" sm="12">
<div className="nav_container">
<nav className="navbar navbar-default nav_container">
<div class="container-fluid">
<div class="navbar-header">
<div className="container-fluid">
<div className="navbar-header">
</div>
<div class="collapse navbar-collapse" id="myNavbar">
<ul class="nav navbar-nav navbar-right">
<div className="collapse navbar-collapse" id="myNavbar">
<ul className="nav navbar-nav navbar-right">
</ul>
</div>
</div>
Expand Down
61 changes: 0 additions & 61 deletions src/components/LogOut.js

This file was deleted.

Loading

0 comments on commit 87a7a48

Please sign in to comment.