From 0df433bb046769427ebd4f39be350631f2a5367c Mon Sep 17 00:00:00 2001 From: Uy Tran Date: Mon, 7 Nov 2016 18:22:46 +0100 Subject: [PATCH 1/3] added all pages needed, just missing some graphical stuff and styling --- pisk/.meteor/packages | 1 + pisk/.meteor/versions | 2 + pisk/client/main.html | 6 +-- pisk/client/main.jsx | 12 +----- pisk/data/calendarfeed.json | 19 +++++++++ pisk/data/styret.json | 52 ++++++++++++++++++++++++ pisk/imports/startup/index.js | 1 + pisk/imports/startup/routes.jsx | 62 ++++++++++++++++++++++++++++ pisk/imports/ui/App.jsx | 6 +-- pisk/imports/ui/AppHeader.jsx | 69 ++++++++++++++++++++++++++++++++ pisk/imports/ui/AppLayout.jsx | 36 +++++++++++++++++ pisk/imports/ui/FortranPage.jsx | 22 ++++++++++ pisk/imports/ui/LandingPage.jsx | 1 + pisk/imports/ui/StatutesPage.jsx | 22 ++++++++++ pisk/imports/ui/WhatsUpPage.jsx | 22 ++++++++++ pisk/package.json | 1 + 16 files changed, 313 insertions(+), 21 deletions(-) create mode 100644 pisk/data/calendarfeed.json create mode 100644 pisk/data/styret.json create mode 100644 pisk/imports/startup/index.js create mode 100644 pisk/imports/startup/routes.jsx create mode 100644 pisk/imports/ui/AppHeader.jsx create mode 100644 pisk/imports/ui/AppLayout.jsx create mode 100644 pisk/imports/ui/FortranPage.jsx create mode 100644 pisk/imports/ui/StatutesPage.jsx create mode 100644 pisk/imports/ui/WhatsUpPage.jsx diff --git a/pisk/.meteor/packages b/pisk/.meteor/packages index 0cd3100..8b4b1df 100644 --- 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 index 8cc40eb..0b57afd 100644 --- 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 index 2f25749..21f7057 100644 --- a/pisk/client/main.html +++ b/pisk/client/main.html @@ -1,8 +1,4 @@ PI:SK + - - -
- - diff --git a/pisk/client/main.jsx b/pisk/client/main.jsx index 27cc14f..724e06f 100644 --- 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(, document.getElementById('render-body')); - render(