Merge pull request #29 from nirvikbaruah/master

Updated colour scheme

.gitignore

@@ -1,2 +1,3 @@
 node_modules
-.env
+.env
+.DS_Store

public/manifest.json

@@ -4,7 +4,7 @@
   "icons": [
     {
       "src": "favicon.ico",
-      "sizes": "64x64 32x32 24x24 16x16",
+      "sizes": "32x32",
       "type": "image/x-icon"
     },
     {

src/index.scss

@@ -1,4 +1,4 @@
-@import "sass/themes/pink_palm_tree";
+@import "sass/themes/green_sprout";
 @import "sass/global";
 
 $navbar-logo-font-size: 36px;

src/js/ideas.js

@@ -47,9 +47,9 @@ class Table extends React.Component {
       user_json =>
         user_json.forms.meet_info &&
         user_json.forms.meet_info.showProfile &&
+        user_json.forms.meet_info.idea &&
         user_list.push(user_json)
     );
-    console.log(user_list);
 
     // For testing with many users
     // for (let i = 1; user_list.length < 500; i++) {
@@ -61,7 +61,6 @@ class Table extends React.Component {
     var fuse = new Fuse(user_list, {
       keys: [
         "forms.meet_info.idea",
-        "forms.meet_info.verticals",
         "forms.meet_info.first_name"
       ]
     });
@@ -173,19 +172,19 @@ class Entry extends React.Component {
             <p>{idea}</p>
           </ Linkify>
         </div>
-        <div className="tags">
-          {verticals &&
-            verticals.length > 0 &&
-            verticals.map(vertical => (
-              <div
-                className="tag"
-                key={vertical}
-                style={{ backgroundColor: colors[this.getColorNum(vertical)] }}
-              >
-                {vertical}
-              </div>
-            ))}
-        </div>
+        {/* <div className="tags"> */}
+        {/*   {verticals && */}
+        {/*     verticals.length > 0 && */}
+        {/*     verticals.map(vertical => ( */}
+        {/*       <div */}
+        {/*         className="tag" */}
+        {/*         key={vertical} */}
+        {/*         style={{ backgroundColor: colors[this.getColorNum(vertical)] }} */}
+        {/*       > */}
+        {/*         {vertical} */}
+        {/*       </div> */}
+        {/*     ))} */}
+        {/* </div> */}
         <div className="contact">
           <ReactGA.OutboundLink
             eventLabel="Contact"

src/js/table.js

@@ -41,15 +41,14 @@ class Table extends React.Component {
 
   async componentDidMount() {
     const body = await API.get("treehacks", "/users_meet", {});
-    console.log(body);
     let user_list = [];
     body["results"].map(
       user_json =>
         user_json.forms.meet_info &&
         user_json.forms.meet_info.showProfile &&
+        user_json.forms.meet_info.profileDesc &&
         user_list.push(user_json)
     );
-    console.log(user_list);
 
     // For testing with many users
     // for (let i = 1; user_list.length < 500; i++) {

src/sass/global.scss

@@ -1,3 +1,5 @@
+@import "themes/default";
+
 .main-button,
 .btn {
   font-weight: bold;

src/sass/loading.scss

@@ -1,4 +1,4 @@
-@import "themes/pink_palm_tree";
+@import "themes/green_sprout";
 @import "global";
 
 .treehacks-error-container {

src/sass/themes/default.scss

@@ -1,20 +1,18 @@
-/* Color Palette */
-$background-color: #FFFFFF;
-$background-color-light-border: #DCDCDC;
+@import "green_sprout";
 
-$primary-color: #888888;
-$secondary-color: #888888;
-$tertiary-color: #888888;
 $box-color: #FFFFFF;
 
-$text-gray: #ADADAD;
-$text-color: #000000;
-$secondary-text-color: #000000;
+$background-color: hsl(339, 77%, 99%);
+$background-color-light-border: #eeeeee;
+
+$primary-color: #0D9071;
+$secondary-color: #E83028;
+$tertiary-color: #FF730E;
+
+$text-color: #696E76;
+$secondary-text-color: #535152;
 $primary-btn-text-color: #FFFFFF;
 
-$light-gray: #DDD;
-$dark-gray: #535152;
-$gray: #888888;
 
 /* Fonts */
 $navbar-font-size: 16px * 1.18;

src/sass/themes/pink_palm_tree.scss → src/sass/themes/green_sprout.scss

@@ -1,16 +1,16 @@
-@import "default.scss";
 // Proxima Nova font
 @import url("https://use.typekit.net/vam8uoe.css");
 
 $background-color: hsl(339, 77%, 99%);
 $background-color-light-border: #eeeeee;
 
-$primary-color: #E51B5D;
-$secondary-color: #F46E20;
-$tertiary-color: #A7DDE8;
+$primary-color: #0D9071;
+$secondary-color: #E83028;
+$tertiary-color: #FF730E;
 
 $text-color: #696E76;
 $secondary-text-color: #535152;
 $primary-btn-text-color: #FFFFFF;
 
-$base-font-family: proxima-nova, sans-serif;
+$font-size: 18px;
+$base-font-family: proxima-nova, sans-serif;