Merge branch 'container_navbar' into 'master'

Put pages in a container with a simple navbar See merge request amiv-website!2

Merge branch 'container_navbar' into 'master'
Put pages in a container with a simple navbar See merge request amiv-website!2
da75c958 · Sandro Lutz · 32468d9d · 90073eaa · da75c958 · da75c958
Commit da75c958 authored 7 years ago by Sandro Lutz
--- a/index.html
+++ b/index.html
 <!doctype html>
 <html>
-    <head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1" />
-        <title>AMIV website</title>
-    </head>
-    <body>
-        <script src="/dist/bundle.js"></script>
-    </body>
+
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>AMIV website</title>
+</head>
+
+<body>
+    <script src="/dist/bundle.js"></script>
+</body>
+
 </html>
\ No newline at end of file
--- a/src/amiv.js
+++ b/src/amiv.js
+const m = require('mithril');
+
+module.exports = {
+  view() {
+    return m('div', 'example AMIV content');
+  },
+};
--- a/src/index.js
+++ b/src/index.js
 // src/index.js
 const m = require('mithril');
 const Layout = require('./layout');
+const amiv = require('./amiv');

 m.route(document.body, '/', {
  '/': {
    render() {
-      return m(Layout);
+      return m(Layout, m(amiv));
    },
  },
 });
--- a/src/layout.js
+++ b/src/layout.js
 const m = require('mithril');

 module.exports = {
-  view() {
-    return m('div', { class: 'container' }, [
-      m('p', 'hallo5'),
+  view(vnode) {
+    return m('div', [
+      m('nav', [
+        m('a', { href: '/' }, 'AMIV'),
+        m('a', { href: '/events' }, 'Events'),
+        m('a', { href: '/studydocuments' }, 'Studienunterlagen'),
+        m('a', { href: '/jobs' }, 'Jobs'),
+        m('a', { href: '/profile' }, 'Profil'),
+      ]),
+      m('main', vnode.children),
    ]);
  },
 };