nowaakademia/eco-hack
Archived
0
0 Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

renamed logo to navbar (refs)

Browse Source
This commit is contained in:
mmacierzanka committed 2021-10-05 19:27:21 +02:00
1 parent e8b5853e82
commit fe40fd9639
1 file changed
+49 -50
Download Patch File Download Diff File Expand all files Collapse all files
client/src/App.js
+49 -50
View File
@@ -5,61 +5,60 @@ import { About } from "./pages/About";
import { Users } from "./pages/Users"; import { Users } from "./pages/Users";
import { Credits } from "./pages/Credits"; import { Credits } from "./pages/Credits";
import { NotFound } from "./pages/NotFound"; import { NotFound } from "./pages/NotFound";
import Logo from "./components/Logo"; import { Navbar } from "./components/Navbar";
import { CreateEvent } from "./pages/CreateEvent"; import { CreateEvent } from "./pages/CreateEvent";
import { Event } from "./pages/Event"; import { Event } from "./pages/Event";
import { EVENT_CONTEXT } from "./constants"; import { EVENT_CONTEXT } from "./constants";
import { LoginPage } from "./pages/Login"; import { LoginPage } from "./pages/Login";
export const App = (props) => { export const App = (props) => {
const [context, setContext] = useState({ const [context, setContext] = useState({
events: props.events, events: props.events,
updateEvents: function (events = []) { updateEvents: function (events = []) {
if (!Array.isArray(events)) if (!Array.isArray(events)) throw new TypeError("Events must come in array");
throw new TypeError("Events must come in array"); setContext({
setContext({ events: events,
events: events, updateEvents: this.updateEvents,
updateEvents: this.updateEvents, });
}); },
}, });
});
return ( return (
<EVENT_CONTEXT.Provider value={context}> <EVENT_CONTEXT.Provider value={context}>
<Router> <Router>
<Logo /> <Navbar />
<Switch> <Switch>
<Route exact path="/about" component={About} /> <Route exact path="/about" component={About} />
<Route exact path="/credits" component={Credits} /> <Route exact path="/credits" component={Credits} />
<Route exact path="/users" component={Users} /> <Route exact path="/users" component={Users} />
<Route exact path="/"> <Route exact path="/">
<Home /> <Home />
</Route> </Route>
<Route exact path="/create" component={CreateEvent} /> <Route exact path="/create" component={CreateEvent} />
<Route exact path="/login" component={LoginPage} /> <Route exact path="/login" component={LoginPage} />
{Array.isArray(props.events) && {Array.isArray(props.events) &&
props.events.map((e) => { props.events.map((e) => {
return ( return (
<Route key={e._id} exact path={`/event/${e._id}`}> <Route key={e._id} exact path={`/event/${e._id}`}>
<Event <Event
data={{ data={{
name: e.name, name: e.name,
type: e.type, type: e.type,
description: e.description, description: e.description,
address: e.address, address: e.address,
time: e.time, time: e.time,
lat: e.lat, lat: e.lat,
lon: e.lon, lon: e.lon,
id: e._id, id: e._id,
createdTime: e.created.time, createdTime: e.created.time,
}} }}
></Event> ></Event>
</Route> </Route>
); );
})} })}
<Route component={NotFound} /> <Route component={NotFound} />
</Switch> </Switch>
</Router> </Router>
</EVENT_CONTEXT.Provider> </EVENT_CONTEXT.Provider>
); );
}; };