UyQTran · UyQTran · Nov 7, 2016 · Nov 10, 2016 · Nov 10, 2016
diff --git a/pisk/.meteor/packages b/pisk/.meteor/packages
@@ -20,3 +20,4 @@ shell-server@0.2.1            # Server-side component of the `meteor shell` comm
 
 autopublish@1.0.7             # Publish all data to the clients (for prototyping)
 insecure@1.0.7                # Allow all DB writes from clients (for prototyping)
+kadira:flow-router
diff --git a/pisk/.meteor/versions b/pisk/.meteor/versions
@@ -32,6 +32,7 @@ http@1.1.8
 id-map@1.0.8
 insecure@1.0.7
 jquery@1.11.9
+kadira:flow-router@2.12.1
 launch-screen@1.0.12
 livedata@1.0.18
 logging@1.1.15_1
@@ -51,6 +52,7 @@ observe-sequence@1.0.13
 ordered-dict@1.0.8
 promise@0.8.7
 random@1.0.10
+reactive-dict@1.1.8
 reactive-var@1.0.10
 reload@1.1.10
 retry@1.0.8

diff --git a/pisk/client/main.html b/pisk/client/main.html
@@ -1,8 +1,4 @@
 <head>
   <title>PI:SK</title>
+  <meta name="viewport" content="width=device-width, initial-scale=1">
 </head>
-
-<body>
-  <div id="render-body"></div>
-  <div id="render-footer"></div>
-</body>
diff --git a/pisk/client/main.jsx b/pisk/client/main.jsx
@@ -1,11 +1 @@
-import React from 'react';
-import { Meteor } from 'meteor/meteor';
-import { render } from 'react-dom';
-
-import App from '../imports/ui/App.jsx';
-import Footer from '../imports/ui/Footer.jsx';
-
-Meteor.startup(() => {
-  render(<App />, document.getElementById('render-body'));
-  render(<Footer />, document.getElementById('render-footer'));
-});
+import '/imports/startup';
diff --git a/pisk/data/calendarfeed.json b/pisk/data/calendarfeed.json
@@ -0,0 +1,19 @@
+{
+  "events": [
+    {
+      "date": "2016-11-20 09:40",
+      "title": "Styremøte",
+      "description": "Bare for styret, ikke for deg!"
+    },
+    {
+      "date": "2016-11-20 09:40",
+      "title": "Styremøte",
+      "description": "Bare for styret, ikke for deg!"
+    },
+    {
+      "date": "2016-11-20 09:40",
+      "title": "Styremøte",
+      "description": "Bare for styret, ikke for deg!"
+    }
+  ]
+}
diff --git a/pisk/data/styret.json b/pisk/data/styret.json
@@ -0,0 +1,52 @@
+{
+  "members": [
+    {
+      "name": "Uy Tran",
+      "role": "Styremedlem",
+      "email": "uqtran@ifi.uio.no",
+      "picture": ""
+    },
+    {
+      "name": "Adrian Eriksen",
+      "role": "Styreleder",
+      "email": "adrian_eriksen92@hotmail.com",
+      "picture": ""
+    },
+    {
+      "name": "Øystein Halvorsen",
+      "role": "Økonomiansvarlig",
+      "email": "",
+      "picture": ""
+    },
+    {
+      "name": "Kaisa Korsak",
+      "role": "Nestleder",
+      "email": "",
+      "picture": ""
+    },
+    {
+      "name": "Martine Solberg",
+      "role": "Styremedlem",
+      "email": "",
+      "picture": ""
+    },
+    {
+      "name": "Marie Fremstad",
+      "role": "Styremedlem",
+      "email": "",
+      "picture": ""
+    },
+    {
+      "name": "Nikolas Martin",
+      "role": "Styremedlem",
+      "email": "",
+      "picture": ""
+    },
+    {
+      "name": "Sofie Lie Rapp",
+      "role": "Styremedlem",
+      "email": "",
+      "picture": ""
+    }
+  ]
+}
diff --git a/pisk/imports/startup/index.js b/pisk/imports/startup/index.js
@@ -0,0 +1 @@
+import './routes.jsx';
diff --git a/pisk/imports/startup/routes.jsx b/pisk/imports/startup/routes.jsx
@@ -0,0 +1,62 @@
+import {FlowRouter} from 'meteor/kadira:flow-router';
+import {Meteor} from 'meteor/meteor';
+import {ReactiveVar} from 'meteor/reactive-var';
+import {mount} from 'react-mounter';
+import AppLayout from '../ui/AppLayout.jsx';
+import NavBar from '../ui/NavBar.jsx';
+import LandingPage from '../ui/LandingPage.jsx';
+import WhatsUpPage from '../ui/WhatsUpPage.jsx';
+import FortranPage from '../ui/FortranPage.jsx';
+import StatutesPage from '../ui/StatutesPage.jsx';
+import Footer from '../ui/Footer.jsx';
+import React from 'react';
+
+FlowRouter.route('/', {
+  name: 'rootview',
+  action(props, {goToUrl}) {
+    mount(AppLayout, {
+      header: (<NavBar/>),
+      main: (<LandingPage/>)
+    });
+  }
+});
+
+FlowRouter.route('/whatsup', {
+  name: 'whatsup',
+  action(props, {goToUrl}) {
+    mount(AppLayout, {
+      header: (<NavBar/>),
+      main: (<WhatsUpPage/>)
+    });
+  }
+});
+
+FlowRouter.route('/fortran', {
+  name: 'fortran',
+  action(props, {goToUrl}) {
+    mount(AppLayout, {
+      header: (<NavBar/>),
+      main: (<FortranPage/>)
+    });
+  }
+});
+
+FlowRouter.route('/statutes', {
+  name: 'statutes',
+  action(props, {goToUrl}) {
+    mount(AppLayout, {
+      header: (<NavBar/>),
+      main: (<StatutesPage/>)
+    });
+  }
+});
+
+FlowRouter.notFound = {
+  action() {
+    mount(AppLayout, {
+      header: (<NavBar />),
+      main: (<p>404 siden finnes ikke</p>),
+      footer:('')
+    });
+  }
+};
diff --git a/pisk/imports/ui/App.jsx b/pisk/imports/ui/App.jsx
diff --git a/pisk/imports/ui/AppLayout.jsx b/pisk/imports/ui/AppLayout.jsx
@@ -0,0 +1,36 @@
+import React from 'react';
+import MuiThemeProvider from 'material-ui/styles/MuiThemeProvider';
+import getMuiTheme from 'material-ui/styles/getMuiTheme';
+import lightBaseTheme from 'material-ui/styles/baseThemes/lightBaseTheme.js';
+import { blue800 } from 'material-ui/styles/colors';
+
+const style = {
+  ...lightBaseTheme,
+  palette: {
+    ...lightBaseTheme.palette,
+    primary1Color: "#ffffff",
+    alternateTextColor:"#000000"
+  }
+};
+
+const AppLayout = ({header, main, footer}) => {
+  return (
+    <article>
+      <MuiThemeProvider muiTheme={getMuiTheme(style)}>
+        <div>
+          <header>{header}</header>
+          <main>{main}</main>
+          <footer>{footer}</footer>
+        </div>
+      </MuiThemeProvider>
+    </article>
+  );
+};
+
+AppLayout.propTypes = {
+  header: React.PropTypes.node.isRequired,
+  main: React.PropTypes.node.isRequired,
+  footer: React.PropTypes.node
+};
+
+export default AppLayout;
diff --git a/pisk/imports/ui/FortranPage.jsx b/pisk/imports/ui/FortranPage.jsx
@@ -0,0 +1,22 @@
+import React, { Component } from 'react';
+import CalendarIcon from 'material-ui/svg-icons/action/event';
+import {cyan500} from 'material-ui/styles/colors';
+import calendarfeed from '/data/calendarfeed.json';
+
+
+export default class StatutesPage extends Component {
+
+  constructor(props) {
+    super(props);
+
+    this.state = {
+    };
+  }
+
+  render() {
+    return (
+      <div style={{display: 'flex', alignItems: 'space-between'}}>
+        <CalendarIcon style={{height:100, width:100, color:cyan500}}/>
+      </div>);
+  }
+}
diff --git a/pisk/imports/ui/LandingPage.jsx b/pisk/imports/ui/LandingPage.jsx
@@ -1,6 +1,7 @@
 import React, { Component } from 'react';
 import CalendarIcon from 'material-ui/svg-icons/action/event';
 import {cyan500} from 'material-ui/styles/colors';
+import styret from '/data/styret.json';
 
 
 export default class LandingPage extends Component {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,3 +20,4 @@ shell-server@0.2.1 # Server-side component of the `meteor shell` comm

		autopublish@1.0.7 # Publish all data to the clients (for prototyping)
		insecure@1.0.7 # Allow all DB writes from clients (for prototyping)
		kadira:flow-router