Merge pull request #296 from FredericHeem/registration-complete

Registration complete
FredericHeem · Jul 23, 2017 · 90f9e4a · 90f9e4a
2 parents 4946b7c + 0d51cbf
commit 90f9e4a
Show file tree

Hide file tree

Showing 31 changed files with 349 additions and 330 deletions.
diff --git a/client/README.md b/client/README.md
@@ -120,32 +120,49 @@ To build the production version:
 
 ```
 Version: webpack 3.3.0
-Time: 19093ms
+Time: 17286ms
                              Asset       Size  Chunks                    Chunk Names
-      4.90f1853ce17c1deb6ce2.js.gz    18.1 kB          [emitted]         
-         0.90f1853ce17c1deb6ce2.js     142 kB       0  [emitted]         
-         2.90f1853ce17c1deb6ce2.js    33.2 kB       2  [emitted]         
-         3.90f1853ce17c1deb6ce2.js     292 kB       3  [emitted]  [big]  home
-         4.90f1853ce17c1deb6ce2.js    65.2 kB       4  [emitted]         
-       app.90f1853ce17c1deb6ce2.js     431 kB       5  [emitted]  [big]  app
-     0.90f1853ce17c1deb6ce2.js.map     727 kB       0  [emitted]         
-     1.90f1853ce17c1deb6ce2.js.map     366 kB       1  [emitted]         
-     2.90f1853ce17c1deb6ce2.js.map     193 kB       2  [emitted]         
-     3.90f1853ce17c1deb6ce2.js.map     617 kB       3  [emitted]         home
-     4.90f1853ce17c1deb6ce2.js.map     470 kB       4  [emitted]         
-   app.90f1853ce17c1deb6ce2.js.map    2.75 MB       5  [emitted]         app
-      2.90f1853ce17c1deb6ce2.js.gz    7.09 kB          [emitted]         
-      1.90f1853ce17c1deb6ce2.js.gz    14.3 kB          [emitted]         
-         1.90f1853ce17c1deb6ce2.js      65 kB       1  [emitted]         
-      0.90f1853ce17c1deb6ce2.js.gz    29.7 kB          [emitted]         
-  2.90f1853ce17c1deb6ce2.js.map.gz    36.6 kB          [emitted]         
-  1.90f1853ce17c1deb6ce2.js.map.gz    71.4 kB          [emitted]         
-    app.90f1853ce17c1deb6ce2.js.gz     116 kB          [emitted]         
-      3.90f1853ce17c1deb6ce2.js.gz     177 kB          [emitted]         
-  4.90f1853ce17c1deb6ce2.js.map.gz     105 kB          [emitted]         
-  3.90f1853ce17c1deb6ce2.js.map.gz     359 kB          [emitted]  [big]  
-  0.90f1853ce17c1deb6ce2.js.map.gz     151 kB          [emitted]         
-app.90f1853ce17c1deb6ce2.js.map.gz     632 kB          [emitted]  [big]  
+      2.f09209ebd25efb13e2d0.js.gz    9.98 kB          [emitted]         
+         0.f09209ebd25efb13e2d0.js     142 kB       0  [emitted]         
+         2.f09209ebd25efb13e2d0.js    45.9 kB       2  [emitted]         
+         3.f09209ebd25efb13e2d0.js     298 kB    3, 5  [emitted]  [big]  
+         4.f09209ebd25efb13e2d0.js    5.21 kB       4  [emitted]         
+         5.f09209ebd25efb13e2d0.js    6.26 kB       5  [emitted]         
+         6.f09209ebd25efb13e2d0.js    5.62 kB       6  [emitted]         
+         7.f09209ebd25efb13e2d0.js    5.09 kB       7  [emitted]         
+         8.f09209ebd25efb13e2d0.js    65.2 kB       8  [emitted]         
+         9.f09209ebd25efb13e2d0.js    2.29 kB       9  [emitted]         
+       app.f09209ebd25efb13e2d0.js     350 kB      10  [emitted]  [big]  app
+     0.f09209ebd25efb13e2d0.js.map     727 kB       0  [emitted]         
+     1.f09209ebd25efb13e2d0.js.map     479 kB       1  [emitted]         
+     2.f09209ebd25efb13e2d0.js.map     312 kB       2  [emitted]         
+     3.f09209ebd25efb13e2d0.js.map     649 kB    3, 5  [emitted]         
+     4.f09209ebd25efb13e2d0.js.map      43 kB       4  [emitted]         
+     5.f09209ebd25efb13e2d0.js.map    32.1 kB       5  [emitted]         
+     6.f09209ebd25efb13e2d0.js.map    26.5 kB       6  [emitted]         
+     7.f09209ebd25efb13e2d0.js.map    23.9 kB       7  [emitted]         
+     8.f09209ebd25efb13e2d0.js.map     470 kB       8  [emitted]         
+     9.f09209ebd25efb13e2d0.js.map    10.8 kB       9  [emitted]         
+   app.f09209ebd25efb13e2d0.js.map    2.21 MB      10  [emitted]         app
+         1.f09209ebd25efb13e2d0.js    77.5 kB       1  [emitted]         
+  4.f09209ebd25efb13e2d0.js.map.gz    7.82 kB          [emitted]         
+  5.f09209ebd25efb13e2d0.js.map.gz    5.02 kB          [emitted]         
+  6.f09209ebd25efb13e2d0.js.map.gz    6.01 kB          [emitted]         
+  7.f09209ebd25efb13e2d0.js.map.gz     5.5 kB          [emitted]         
+  9.f09209ebd25efb13e2d0.js.map.gz    2.68 kB          [emitted]         
+      1.f09209ebd25efb13e2d0.js.gz    16.8 kB          [emitted]         
+      8.f09209ebd25efb13e2d0.js.gz    18.1 kB          [emitted]         
+      0.f09209ebd25efb13e2d0.js.gz    29.7 kB          [emitted]         
+  2.f09209ebd25efb13e2d0.js.map.gz    58.4 kB          [emitted]         
+    app.f09209ebd25efb13e2d0.js.gz    96.9 kB          [emitted]         
+  1.f09209ebd25efb13e2d0.js.map.gz      93 kB          [emitted]         
+      3.f09209ebd25efb13e2d0.js.gz     178 kB          [emitted]         
+  8.f09209ebd25efb13e2d0.js.map.gz     105 kB          [emitted]         
+  3.f09209ebd25efb13e2d0.js.map.gz     364 kB          [emitted]  [big]  
+  0.f09209ebd25efb13e2d0.js.map.gz     151 kB          [emitted]         
+app.f09209ebd25efb13e2d0.js.map.gz     532 kB          [emitted]  [big]  
+                        index.html    3.01 kB          [emitted]         
+
 
 ```
 

diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "starhackit-ui",
   "title": "StarHack.It",
-  "version": "5.0.0",
+  "version": "5.0.1",
   "description": "React + node starter kit. A fullstack boilerplate written in ES6/7 with authentication and authorisation",
   "homepage": "https://github.com/FredericHeem/starhackit",
   "license": "NLPL",
@@ -35,7 +35,6 @@
   },
   "dependencies": {
     "axios": "0.16.2",
-    "checkit": "0.7.0",
     "debug": "2.6.8",
     "glamor": "2.20.25",
     "glamorous": "3.23.5",
@@ -59,7 +58,8 @@
     "react-pagify": "2.3.0",
     "reactabular-table": "8.9.0",
     "segmentize": "0.4.1",
-    "universal-router": "3.2.0"
+    "universal-router": "3.2.0",
+    "validate.js": "0.11.1"
   },
   "devDependencies": {
     "babel-core": "6.25.0",

diff --git a/client/src/app/client.js b/client/src/app/client.js
@@ -2,6 +2,7 @@ import React from 'react';
 import { render } from 'react-dom';
 import Qs from 'qs';
 import Router from './router';
+import appView from "components/applicationView";
 
 export default (context) => {
     const AlertStack = context.alertStack.View;
@@ -18,7 +19,7 @@ export default (context) => {
                 query: Qs.parse(location.search),
             });
             //console.log("onLocationChange route ", route);
-            const Layout = context.parts.auth.containers().app();
+            const Layout = appView(context);
             const layout = (
                 <Layout>
                     {route.component}

diff --git a/client/src/app/components/AsyncView.js b/client/src/app/components/AsyncView.js
@@ -0,0 +1,19 @@
+import React from "react";
+import AsyncRoute from "preact-async-route";
+
+export default context => {
+  const { tr } = context;
+
+  return function AsyncView({ getModule, ...rest }) {
+    return (
+      <AsyncRoute
+        {...rest}
+        getComponent={() => getModule().then(module => module.default(context))}
+        loading={() =>
+          (<div>
+            {tr.t("Loading")}
+          </div>)}
+      />
+    );
+  };
+};
diff --git a/client/src/app/components/FormGroup.js b/client/src/app/components/FormGroup.js
@@ -1,6 +1,6 @@
 import glamorous from "glamorous";
 
-export default () => glamorous.div({
+export default () => glamorous('div')({
     marginTop: 20,
     marginBottom: 20
   });
diff --git a/client/src/app/components/Page.js b/client/src/app/components/Page.js
@@ -1,6 +1,6 @@
 import glamorous from 'glamorous';
 
-export default () => glamorous.div({
+export default () => glamorous('div')({
   maxWidth: 600,
   width: '100%'
 });
diff --git a/client/src/app/components/Row.js b/client/src/app/components/Row.js
@@ -1,6 +1,6 @@
 import glamorous from 'glamorous';
 
-export default glamorous.div({
+export default glamorous('div')({
   display: 'flex',
   flexDirection: 'row',
   flexWrap: 'wrap',

diff --git a/client/src/app/components/Title.js b/client/src/app/components/Title.js
@@ -1,6 +1,6 @@
 import glamorous from 'glamorous';
 
-export default glamorous.div({
+export default glamorous('div')({
   textAlign: 'center',
   fontWeight: 'bold',
   fontSize: 26,

diff --git a/...c/app/parts/auth/views/applicationView.js → client/src/app/components/applicationView.js b/...c/app/parts/auth/views/applicationView.js → client/src/app/components/applicationView.js
@@ -1,23 +1,18 @@
-import React from "react";
+import React, {createElement as h} from "react";
 import { observer } from "mobx-react";
 import glamorous from "glamorous";
-import AsyncRoute from "preact-async-route";
-import navBar from "../../core/components/navbar";
-import footer from "../../core/components/footer";
+import navBar from "./navbar";
+import footer from "./footer";
+import asyncView from "components/AsyncView";
 // eslint-disable-next-line no-undef
 const version = __VERSION__;
 
 export default context => {
-  const { tr, theme } = context;
+  const { theme, parts } = context;
   const { palette } = theme;
   const NavBar = navBar(context);
   const Footer = footer(context);
-
-  function getTheme() {
-    return System.import("../../theme/ThemeView").then(module =>
-      module.default(context)
-    );
-  }
+  const AsyncView = asyncView(context);
 
   const AppRoot = glamorous("div")({
     display: "flex"
@@ -48,13 +43,17 @@ export default context => {
           <Footer version={version} />
         </AppView>
         {themeStore.open &&
-          <AsyncRoute
-            getComponent={getTheme}
-            loading={() => (<div>{tr.t("Loading")}</div>)}
+          <AsyncView
+            getModule={() => System.import("../parts/theme/ThemeView")}
           />}
       </AppRoot>
     );
   }
 
-  return observer(ApplicationView);
+  return ({ children }) =>
+    h(observer(ApplicationView), {
+      authStore: parts.auth.stores().auth,
+      themeStore: parts.theme.stores().sideBar,
+      children
+    });
 };
diff --git a/...t/src/app/parts/core/components/footer.js → client/src/app/components/footer.js b/...t/src/app/parts/core/components/footer.js → client/src/app/components/footer.js
diff --git a/client/src/app/parts/core/components/menu.js → client/src/app/components/menu.js b/client/src/app/parts/core/components/menu.js → client/src/app/components/menu.js
@@ -14,7 +14,7 @@ export default context => {
           text: "ADMIN"
         },
         {
-          route: "/db/schema",
+          route: "/dbschema",
           text: "DB SCHEMA"
         },
         {

diff --git a/...t/src/app/parts/core/components/navbar.js → client/src/app/components/navbar.js b/...t/src/app/parts/core/components/navbar.js → client/src/app/components/navbar.js
@@ -73,7 +73,6 @@ export default context => {
   }));
 
   function AppBar({ onDrawerClick, onTitleClick }) {
-    console.log("AppBar ", palette.primary)
     return (
       <AppBarView>
         <IconLeft onDrawerClick={onDrawerClick} />

diff --git a/client/src/app/components/panel/panel.js b/client/src/app/components/panel/panel.js
@@ -2,19 +2,19 @@ import glamorous from 'glamorous';
 
 export default function({theme}){
   const {palette} = theme;
-  const Panel = glamorous.div({
+  const Panel = glamorous('div')({
     borderBottom: `1px solid ${palette.primaryDark}`,
     padding: '0.5rem',
   });
 
-  const Header = glamorous.div({
+  const Header = glamorous('div')({
     fontSize: '2rem',
     fontWeight: 'bold',
     padding: '0.5rem',
     backgroundColor: palette.primaryLight
   });
 
-  const Body = glamorous.div({
+  const Body = glamorous('div')({
     padding: '0.5rem',
     backgroundColor: palette.background
   });