From 3d72afb4da2d0e9d88b07c49cccc3251569b63c4 Mon Sep 17 00:00:00 2001
From: OlivierJM <manolivier93@gmail.com>
Date: Sat, 19 Sep 2020 22:34:28 +0200
Subject: [PATCH 1/2] remove slider on landing page

---
 .gitignore                     |  1 +
 config.json                    |  6 +++---
 imports/ui/components/Home.jsx | 10 +---------
 package-lock.json              | 18 +++++++++---------
 4 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2297dc16..7323c696 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,3 +76,4 @@ settings.json
 # config.json
 .deploy/
 .vscode/
+config.json
\ No newline at end of file
diff --git a/config.json b/config.json
index fa498fbb..908f89ff 100644
--- a/config.json
+++ b/config.json
@@ -1,7 +1,7 @@
 {
-  "name": "SparkEd Institute",
-  "tag": "Education",
-  "isUserAuth": true,
+  "name": "Inspired",
+  "tag": "To Inspire",
+  "isUserAuth": false,
   "isHighSchool": false,
   "isConfigured": true,
   "server": "http://localhost:3000"
diff --git a/imports/ui/components/Home.jsx b/imports/ui/components/Home.jsx
index 7ac5f7c7..f0cbb2c5 100755
--- a/imports/ui/components/Home.jsx
+++ b/imports/ui/components/Home.jsx
@@ -8,11 +8,9 @@ import { _Courses } from '../../api/courses/courses';
 import { _Units } from '../../api/units/units';
 import Courses from './content/Courses.jsx';
 import { FloatingButton } from './Utilities/Utilities.jsx';
-import ImgSlider from "../components/layouts/ImageSlider"; // eslint-disable-line
 import * as Config from '../../../config.json';
 import { Loader } from "./Loader"; // eslint-disable-line
 import ErrorBoundary from "./ErrorBoundary"; // eslint-disable-line
-import { ThemeContext } from "../containers/AppWrapper"; // eslint-disable-line
 
 export class Home extends PureComponent {
   componentDidMount() {
@@ -24,14 +22,13 @@ export class Home extends PureComponent {
   }
 
   renderCourses() {
-    let index = 0;
     const { courses } = this.props;
     if (!courses) {
       return <span> No Courses </span>;
     } else if (courses.length === 0) {
       return <p className="center"> There is no content as yet </p>;
     }
-    return courses.map(cours => <Courses key={index++} course={cours} />);
+    return courses.map(cours => <Courses key={cours._id} course={cours} />);
   }
 
   render() {
@@ -39,10 +36,7 @@ export class Home extends PureComponent {
 
     return (
       <ErrorBoundary>
-        <ThemeContext.Consumer>
-          {({ state }) => (
             <Fragment>
-              <ImgSlider isDark={state.isDark} />
               <div className="container ">
                 <div className="row ">
                   <div className="input-field col s12">
@@ -67,8 +61,6 @@ export class Home extends PureComponent {
                 <FloatingButton />
               </div>
             </Fragment>
-          )}
-        </ThemeContext.Consumer>
       </ErrorBoundary>
     );
   }
diff --git a/package-lock.json b/package-lock.json
index 707e7c90..7bc05a8c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4172,9 +4172,9 @@
           }
         },
         "lodash": {
-          "version": "4.17.15",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+          "version": "4.17.20",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
+          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
           "dev": true
         },
         "strip-ansi": {
@@ -5202,9 +5202,9 @@
           "dev": true
         },
         "lodash": {
-          "version": "4.17.15",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+          "version": "4.17.20",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
+          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
           "dev": true
         },
         "strip-ansi": {
@@ -8261,9 +8261,9 @@
       },
       "dependencies": {
         "lodash": {
-          "version": "4.17.15",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+          "version": "4.17.20",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
+          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
           "dev": true
         }
       }

From 59948d36211ff4d3afdddd31165aeb626aea2189 Mon Sep 17 00:00:00 2001
From: OlivierJM <manolivier93@gmail.com>
Date: Sat, 19 Sep 2020 23:16:04 +0200
Subject: [PATCH 2/2] refactor and clean up landing

---
 imports/ui/components/Home.jsx                | 13 +++----
 imports/ui/components/Search/SearchPage.jsx   |  2 +-
 imports/ui/components/Search/searchpage.css   |  8 ++---
 imports/ui/components/Utilities/Utilities.jsx | 34 ++++++++-----------
 4 files changed, 23 insertions(+), 34 deletions(-)

diff --git a/imports/ui/components/Home.jsx b/imports/ui/components/Home.jsx
index f0cbb2c5..29d54223 100755
--- a/imports/ui/components/Home.jsx
+++ b/imports/ui/components/Home.jsx
@@ -32,18 +32,15 @@ export class Home extends PureComponent {
   }
 
   render() {
-    const { courseReady } = this.props;
-
+    const { courseReady, courses } = this.props;
     return (
       <ErrorBoundary>
             <Fragment>
-              <div className="container ">
+              <div className={`container ${!courseReady || !courses.length ? 'center-page' : ''}`}>
                 <div className="row ">
-                  <div className="input-field col s12">
+                  <div className={`input-field col s12`}>
                     <select
-                      onChange={e => {
-                        Session.set('language', e.target.value);
-                      }}
+                      onChange={e => Session.set('language', e.target.value)}
                     >
                       <option value="" disabled defaultValue>
                         Choose your Language
@@ -58,8 +55,8 @@ export class Home extends PureComponent {
                 <div className="row ">
                   {courseReady ? this.renderCourses() : <Loader />}
                 </div>
-                <FloatingButton />
               </div>
+                <FloatingButton />
             </Fragment>
       </ErrorBoundary>
     );
diff --git a/imports/ui/components/Search/SearchPage.jsx b/imports/ui/components/Search/SearchPage.jsx
index 61eaa930..d37b24d1 100644
--- a/imports/ui/components/Search/SearchPage.jsx
+++ b/imports/ui/components/Search/SearchPage.jsx
@@ -7,7 +7,7 @@ export default function SearchPage() {
     return FlowRouter.go(`/results?q=${value}`);
   }
   return (
-        <div className="search-page">
+        <div className="center-page">
             <form
                 action={'/results'}
                 onSubmit={handleSubmit}
diff --git a/imports/ui/components/Search/searchpage.css b/imports/ui/components/Search/searchpage.css
index 86da9714..1f5c3319 100644
--- a/imports/ui/components/Search/searchpage.css
+++ b/imports/ui/components/Search/searchpage.css
@@ -1,16 +1,12 @@
-.search-page {
+.center-page {
   position: absolute;
-  /* margin: auto;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0; */
   width: 70%;
   left: 50%;
   top: 50%;
   transform: translate(-50%, -50%);
   font-size: 30px;
 }
+
 input[type="text"] {
   font-size: 30px;
 }
diff --git a/imports/ui/components/Utilities/Utilities.jsx b/imports/ui/components/Utilities/Utilities.jsx
index d09e1d70..ffe465e5 100755
--- a/imports/ui/components/Utilities/Utilities.jsx
+++ b/imports/ui/components/Utilities/Utilities.jsx
@@ -117,21 +117,18 @@ export function setActiveItem(id, items, clas) {
 
 // todo: make a proper component for the floating button and remove jQuery
 export class FloatingButton extends PureComponent {
-  constructor(props) {
-    super(props);
-    this.state = {
-      isOpen: false,
-      modalIdentifier: '',
-      modalType: '',
-      title: '',
-      confirm: '',
-      reject: '',
-      value: '',
-      feedDesc: '',
-      feedTitle: '',
-      bookTitle: '',
-      bookDesc: '',
-    };
+  state = {
+    isOpen: false,
+    modalIdentifier: '',
+    modalType: '',
+    title: '',
+    confirm: '',
+    reject: '',
+    value: '',
+    feedDesc: '',
+    feedTitle: '',
+    bookTitle: '',
+    bookDesc: '',
   }
 
   componentDidMount() {
@@ -148,7 +145,6 @@ export class FloatingButton extends PureComponent {
     const { pathname, href } = window.location;
     switch (modalType) {
       case 'feedback':
-        // const { href } = window.location;
         Meteor.call(
           'feedback.insert',
           feedTitle,
@@ -232,6 +228,7 @@ export class FloatingButton extends PureComponent {
     });
   }
 
+  // refactor this
   grabText = ({ target: { value } }, field) => {
     switch (field) {
       case 'feedTitle':
@@ -364,12 +361,11 @@ export class FloatingButton extends PureComponent {
         </MainModal>
 
         <div className="fixed-action-btn plus-icon">
-          <a
-            href=""
+          <span
             className="btn-floating btn-large waves-effect waves-light teal darken-1"
           >
             <i className="fa fa-plus center more-items" />
-          </a>
+          </span>
           <ul>
             <li>
               <a