EljakimHerrewijnen/Ichthus
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of http://192.168.0.150:3000/EljakimHerrewijnen/Ichthus

Browse Source 
Simulating merge error
This commit is contained in:
JonathanHerrewijnen 2020-02-17 11:11:40 +01:00
commit 04d82e996d
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Website/Website/ClientApp/src/App.js
View File

@ -4,6 +4,7 @@ import { Layout } from './components/Layout';
import { Home } from './components/Home'; import { Home } from './components/Home';
import { Leden } from './components/Leden'; import { Leden } from './components/Leden';
import { OverIchthus } from './pages/overichthus'; import { OverIchthus } from './pages/overichthus';
import { ChristenZijn } from './pages/christenzijn';
import { Login } from './components/Login'; import { Login } from './components/Login';
export default class App extends Component { export default class App extends Component {
@ -15,6 +16,7 @@ export default class App extends Component {
<Route exact path='/' component={Home} /> <Route exact path='/' component={Home} />
<Route exact path='/leden' component={Leden} /> <Route exact path='/leden' component={Leden} />
<Route exact path='/pages/overichthus' component={OverIchthus} /> <Route exact path='/pages/overichthus' component={OverIchthus} />
<Route exact path='/pages/christenzijn' component={ChristenZijn} />
<Route exact path='/login' component={Login} /> <Route exact path='/login' component={Login} />
</Layout> </Layout>

4
Website/Website/ClientApp/src/components/NavMenu.js
View File

@ -24,7 +24,7 @@ export class NavMenu extends Component {
</div> </div>
<div id="MenuBlock"> <div id="MenuBlock">
<Link to={`/christenzijn/`} id="MenuText"> <Link to={`/pages/christenzijn/`} id="MenuText">
Christen zijn Christen zijn
</Link> </Link>
</div> </div>
@ -36,7 +36,7 @@ export class NavMenu extends Component {
</div> </div>
<div id="MenuBlock"> <div id="MenuBlock">
<Link to={`./pages/overichthus/`} id="MenuText"> <Link to={`/pages/overichthus/`} id="MenuText">
Over Ichthus Over Ichthus
</Link> </Link>
</div> </div>

14
Website/Website/ClientApp/src/pages/christenzijn.js
View File

@ -0,0 +1,14 @@
import React, { Component } from 'react';
export class ChristenZijn extends Component {
displayName = ChristenZijn.name
render() {
return (
<div>
<h1>Christen zijn</h1>
<p>Welcome to your new single-page application, built with: Well, React dotnet, and does it really matter?..</p>
</div>
);
}
}