From 1413c0eb534e60cb220e4e9702eb6de1e18edddc Mon Sep 17 00:00:00 2001
From: Daniel <dds2130@rit.edu>
Date: Fri, 19 Jan 2018 22:14:43 -0500
Subject: [PATCH] #5 collection; portal home page

---
 src/components/Home.js                        | 25 ++++++++++++++++---
 src/components/Routing.js                     | 19 --------------
 .../collection/{Home.js => index.js}          |  2 +-
 src/components/index.js                       |  3 +--
 src/components/portal/Home.js                 | 15 ++++++++++-
 src/components/portal/{Base.js => index.js}   | 12 ++++-----
 6 files changed, 42 insertions(+), 34 deletions(-)
 delete mode 100644 src/components/Routing.js
 rename src/components/collection/{Home.js => index.js} (98%)
 rename src/components/portal/{Base.js => index.js} (86%)

diff --git a/src/components/Home.js b/src/components/Home.js
index d304b16..01444af 100644
--- a/src/components/Home.js
+++ b/src/components/Home.js
@@ -1,9 +1,26 @@
 import React from 'react';
-import Interactive from 'react-interactive';
-import { Link } from 'react-router-dom';
-import s from '../styles/home.style';
+import { Route, Link } from 'react-router-dom';
 
-export default function Home() {
+/* Components */
+import {PageNotFound, UnderConstruction} from './Snippets';
+import EnterTheCode from './account/EnterTheCode';
+import Collection from './collection/index';
+import Portal from './portal/index';
+
+export function Routing(props) {
+  return (
+    <div>
+      <Route exact path={props.match.url} component={Home} />
+      <Route path="/PageNotFound" component={PageNotFound} />
+      <Route path="/UnderConstruction" component={UnderConstruction} />
+      <Route path="/EnterTheCode" component={EnterTheCode} />
+      <Route path="/collection" component={Collection} />
+      <Route path="/portal" component={Portal} />
+    </div>
+  );
+}
+
+function Home() {
   return (
     <div>
       <link rel="stylesheet" href="/src/css/with_love.css" />
diff --git a/src/components/Routing.js b/src/components/Routing.js
deleted file mode 100644
index 10ffa75..0000000
--- a/src/components/Routing.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import React from 'react';
-import { Route } from 'react-router-dom';
-
-import {PageNotFound, UnderConstruction} from './Snippets';
-import Home from './Home';
-import EnterTheCode from './account/EnterTheCode';
-
-export function Routing(props) {
-  console.log(props);
-  const match = props.match;
-  return (
-    <div>
-      <Route exact path={match.url} component={Home} />
-      <Route path={`${match.url}EnterTheCode`} component={EnterTheCode} />
-      <Route path="/PageNotFound" component={PageNotFound} />
-      <Route path="/UnderConstruction" component={UnderConstruction} />
-    </div>
-  );
-}
diff --git a/src/components/collection/Home.js b/src/components/collection/index.js
similarity index 98%
rename from src/components/collection/Home.js
rename to src/components/collection/index.js
index 13e287b..8dc2996 100644
--- a/src/components/collection/Home.js
+++ b/src/components/collection/index.js
@@ -7,7 +7,7 @@ import CardList from './List';
 import SearchForm from './Search';
 
 @inject((stores, props, context) => props) @observer
-export default class CollectionHome extends React.Component {
+export default class Home extends React.Component {
   @observable n = 10;
   @observable p = 1;
   @observable content = [];
diff --git a/src/components/index.js b/src/components/index.js
index de33128..3d98f4d 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -2,9 +2,8 @@ import React from 'react';
 import { render } from 'react-dom';
 import { Link } from 'react-router-dom';
 import { BrowserRouter as Router, Route } from 'react-router-dom';
-
 import s from '../styles/app.style';
-import {Routing} from './Routing';
+import {Routing} from './Home';
 
 const language = "ENG";
 const bkgrnd = "05";
diff --git a/src/components/portal/Home.js b/src/components/portal/Home.js
index d4057a2..1b1b2fa 100644
--- a/src/components/portal/Home.js
+++ b/src/components/portal/Home.js
@@ -1,7 +1,20 @@
 import React from 'react';
+import { Route } from 'react-router-dom';
 import API from '../SpreadsheetData';
 
-export default class PortalHome extends React.Component {
+export function Routing(props) {
+  console.log(props);
+  const match = props.match;
+
+  return (
+    <div>
+      <Route exact path={match.url} component={Home} />
+      {/* <Route path={`${match.url}collection`} component={CollectionHome} /> */}
+    </div>
+  );
+}
+
+class Home extends React.Component {
 
   componentDidMount() {
     this.coin = null;
diff --git a/src/components/portal/Base.js b/src/components/portal/index.js
similarity index 86%
rename from src/components/portal/Base.js
rename to src/components/portal/index.js
index b6b198f..0931db6 100644
--- a/src/components/portal/Base.js
+++ b/src/components/portal/index.js
@@ -1,14 +1,12 @@
 import React from 'react';
-import PropTypes from 'prop-types';
-import s from '../../styles/app.style';
-import Interactive from 'react-interactive';
 import {observable} from "mobx";
 import {observer, inject} from 'mobx-react';
-import { Link } from 'react-router';
+import {Link} from 'react-router-dom';
+import {Routing} from './Home';
 import Search from './Search';
 
 @inject((stores, props, context) => props) @observer
-export default class PortalBase extends React.Component {
+export default class Base extends React.Component {
 
   render() {
     return (
@@ -16,13 +14,13 @@ export default class PortalBase extends React.Component {
         <link rel="stylesheet" href="/src/css/portal.css" />
         <Header />
         <br />
-        {this.props.children}
+        <Routing {...this.props} />
       </div>
     );
   }
 }
 
-function Header(props) {
+function Header() {
 
   const types = (() => {
     return (