Merge pull request #3 from mgerb/mitchell

styling changes - added font-awesome

app/Wrapper.js

@@ -8,9 +8,9 @@ export default class Wrapper extends React.Component {
 
     render() {
         return (
-            <div>
+            <div className="Content">
                 <Navbar/>
-                <div className="content">
+                <div>
                     {this.props.children}
                 </div>
             </div>

app/components/Navbar/Navbar.js

@@ -11,6 +11,9 @@ export default class Navbar extends React.Component {
                 <div className="Navbar__header">GoBot</div>
                 <Link to="/" className="Navbar__item" onlyActiveOnIndex activeClassName="Navbar__item--active">Home</Link>
                 <Link to="/soundboard" className="Navbar__item" activeClassName="Navbar__item--active">Soundboard</Link>
+                <div className="link">
+                    <a href="https://discordapp.com/invite/0Z2tzxKECEj2BHwj" target="_blank">Join the discord</a>
+                </div>
             </div>
         );
     }

app/components/Navbar/Navbar.scss

@@ -11,14 +11,24 @@
     background-color: $gray2;
     border-right: 1px solid darken($gray2, 2%);
     overflow-y: auto;
+    padding-bottom: 10px;
+    
+    .link {
+        display: flex;
+        flex: 1;
+        flex-direction: column;
+        justify-content: flex-end;
+        text-align: center;
+    }
 }
 
 .Navbar__header {
+    font-size: 25px;
     min-height: 100px;
     display: flex;
     align-items: center;
     justify-content: center;
-    background-color: $gray2;
+    background-color: $primaryBlue;
     border-bottom: 1px solid $gray3;
 }
 
@@ -31,6 +41,7 @@
     text-align: center;
     color: $white;
     transition: background-color 0.1s linear;
+    transition: color 0.1s linear;
     
     &:hover {
         background-color: $gray1; 
@@ -45,4 +56,5 @@
 .Navbar__item--active {
     padding-left: 4px;
     border-right: 4px solid $primaryBlue;
+    color: $primaryBlue !important;
 }

app/pages/Home/Home.js

@@ -5,9 +5,17 @@ export default class Home extends React.Component {
 
     render() {
         return (
-            <div className="Home">
+            <div className="Card">
+            <div className="Card__header">
                 GoBot Early Access Pre Pre Alpha
             </div>
+                <p>This application is a work in progress.</p>
+                <p>Check out the source code on 
+                    <a href="https://github.com/mgerb/GoBot" target="_blank"> GitHub 
+                        <i className="fa fa-github" aria-hidden="true"></i>
+                    </a>
+                </p>
+            </div>
         );
     }
 }

app/pages/Home/Home.scss

@@ -1,7 +1 @@
-.Home {
-    display: flex;
-    height: 100%;
-    align-items: center;
-    justify-content: center;
-    font-size: 25px;
-}
+@import "../../scss/variables";

app/pages/Soundboard/Soundboard.scss

@@ -26,10 +26,12 @@
     padding: 20px;
     color: lighten($gray1, 15%);
     border-radius: 1em;
-    width: 200px;
-    height: 200px;
+    width: 300px;
+    height: 300px;
+    background-color: $gray2;
+    transition: background-color 0.1s linear;
 }
 
 .Dropzone--active {
-    background-color: lighten($gray1, 20%);
+    background-color: $primaryBlue;
 }

app/scss/index.scss

@@ -1,3 +1,4 @@
 @import '../assets/normalize.css';
+@import '../assets/font-awesome/css/font-awesome.css';
 @import './variables.scss';
 @import './style.scss';

app/scss/style.scss

@@ -1,9 +1,46 @@
+* {
+    box-sizing: border-box;
+}
+
+a {
+    text-decoration: none;    
+    color: $primaryBlue;
+    transition: color 0.1s linear;
+    
+    &:hover {
+        color: darken(white, 10%);
+    }
+}
+
+i {
+    margin-left: 5px;    
+    margin-right: 5px;    
+}
+
 body {
     background-color: $gray1;
     color: $white;
     padding-left: $navbarWidth;
 }
 
-.content {
+.Content {
     padding: 10px;
+}
+
+.Card {
+    background-color: $gray2;
+    border-radius: 5px;
+    padding: 10px;
+}
+
+.Card__header {
+    margin: -10px -10px 10px -10px;
+    display: flex;
+    align-items: center;
+    padding-left: 10px;
+    padding-right: 10px;
+    height: 50px;
+    border-radius: 5px 5px 0 0;
+    font-size: 25px;
+    background-color: $gray3;
 }

app/scss/variables.scss

@@ -2,12 +2,12 @@ $navbarWidth: 200px;
 
 
 // colors
-$primaryBlue: #42adf4;
+$primaryBlue: #7289da;
 $white: darken(white, 10%);
 
-$gray1: #686a6e;
-$gray2: #424549;
-$gray3: #36393e;
+$gray1: #2e3136;
+$gray2: #2a2d32;
+$gray3: #282b30;
 $gray4: #2e3136;
 $gray5: #282b30;
 $gray6: #1e2124;

package.json

@@ -23,6 +23,7 @@
     "eslint": "^3.12.2",
     "eslint-plugin-react": "^6.8.0",
     "extract-text-webpack-plugin": "2.0.0-rc.1",
+    "file-loader": "^0.10.0",
     "html-webpack-plugin": "^2.24.1",
     "node-sass": "^4.5.0",
     "postcss-loader": "^1.2.1",
@@ -32,6 +33,7 @@
     "react-router": "^3.0.0",
     "sass-loader": "^4.1.1",
     "style-loader": "^0.13.1",
+    "url-loader": "^0.5.7",
     "webpack": "2.2.1",
     "webpack-dev-server": "2.2.0"
   }

webpack.config.js

@@ -28,6 +28,21 @@ module.exports = {
                 fallbackLoader: 'style-loader',
                 loader: 'css-loader'
             })
+        }, {
+            test: /\.svg$/,
+            loader: 'url-loader?limit=65000&mimetype=image/svg+xml&name=static/[name].[ext]&publicPath=../'
+        }, {
+            test: /\.woff$/,
+            loader: 'url-loader?limit=65000&mimetype=application/font-woff&name=static/[name].[ext]&publicPath=../'
+        }, {
+            test: /\.woff2$/,
+            loader: 'url-loader?limit=65000&mimetype=application/font-woff2&name=static/[name].[ext]&publicPath=../'
+        }, {
+            test: /\.[ot]tf$/,
+            loader: 'url-loader?limit=65000&mimetype=application/octet-stream&name=static/[name].[ext]&publicPath=../'
+        }, {
+            test: /\.eot$/,
+            loader: 'url-loader?limit=65000&mimetype=application/vnd.ms-fontobject&name=static/[name].[ext]&publicPath=../'
         }]
     },
     plugins: [

yarn.lock

@@ -34,8 +34,8 @@ acorn@^3.0.4:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
 
 acorn@^4.0.3, acorn@^4.0.4:
-  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.7.tgz#084596cd4636f796d2273990c699e13fe4092ac8"
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.8.tgz#f41e52020ce78118a3c68ed0e9215eb8fc68b5b1"
 
 ajv-keywords@^1.0.0, ajv-keywords@^1.1.1:
   version "1.5.1"
@@ -1701,8 +1701,8 @@ encoding@^0.1.11:
     iconv-lite "~0.4.13"
 
 enhanced-resolve@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.0.3.tgz#df14c06b5fc5eecade1094c9c5a12b4b3edc0b62"
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz#9f4b626f577245edcf4b2ad83d86e17f4f421dec"
   dependencies:
     graceful-fs "^4.1.2"
     memory-fs "^0.4.0"
@@ -1820,8 +1820,8 @@ eslint-plugin-react@^6.8.0:
     jsx-ast-utils "^1.3.4"
 
 eslint@^3.12.2:
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.14.1.tgz#8a62175f2255109494747a1b25128d97b8eb3d97"
+  version "3.15.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.15.0.tgz#bdcc6a6c5ffe08160e7b93c066695362a91e30f2"
   dependencies:
     babel-code-frame "^6.16.0"
     chalk "^1.1.3"
@@ -1829,7 +1829,7 @@ eslint@^3.12.2:
     debug "^2.1.1"
     doctrine "^1.2.2"
     escope "^3.6.0"
-    espree "^3.3.1"
+    espree "^3.4.0"
     estraverse "^4.2.0"
     esutils "^2.0.2"
     file-entry-cache "^2.0.0"
@@ -1858,7 +1858,7 @@ eslint@^3.12.2:
     text-table "~0.2.0"
     user-home "^2.0.0"
 
-espree@^3.3.1:
+espree@^3.4.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/espree/-/espree-3.4.0.tgz#41656fa5628e042878025ef467e78f125cb86e1d"
   dependencies:
@@ -2034,6 +2034,12 @@ file-entry-cache@^2.0.0:
     flat-cache "^1.2.1"
     object-assign "^4.0.1"
 
+file-loader@^0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-0.10.0.tgz#bbe6db7474ac92c7f54fdc197cf547e98b6b8e12"
+  dependencies:
+    loader-utils "~0.2.5"
+
 filename-regex@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.0.tgz#996e3e80479b98b9897f15a8a58b3d084e926775"
@@ -2824,7 +2830,7 @@ loader-runner@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
 
-loader-utils@^0.2.11, loader-utils@^0.2.15, loader-utils@^0.2.16, loader-utils@^0.2.7, loader-utils@~0.2.2:
+loader-utils@0.2.x, loader-utils@^0.2.11, loader-utils@^0.2.15, loader-utils@^0.2.16, loader-utils@^0.2.7, loader-utils@~0.2.2, loader-utils@~0.2.5:
   version "0.2.16"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.16.tgz#f08632066ed8282835dff88dfb52704765adee6d"
   dependencies:
@@ -2974,6 +2980,10 @@ mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.13, mime-types@~2.1.7:
   dependencies:
     mime-db "~1.26.0"
 
+mime@1.2.x:
+  version "1.2.11"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.2.11.tgz#58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"
+
 mime@1.3.4, mime@^1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
@@ -3405,8 +3415,8 @@ postcss-colormin@^2.1.8:
     postcss-value-parser "^3.2.3"
 
 postcss-convert-values@^2.3.4:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-2.6.0.tgz#08c6d06130fe58a91a21ff50829e1aad6a3a1acc"
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz#bbd8593c5c1fd2e3d1c322bb925dcae8dae4d62d"
   dependencies:
     postcss "^5.0.11"
     postcss-value-parser "^3.1.2"
@@ -4547,6 +4557,13 @@ upper-case@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
 
+url-loader@^0.5.7:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-0.5.7.tgz#67e8779759f8000da74994906680c943a9b0925d"
+  dependencies:
+    loader-utils "0.2.x"
+    mime "1.2.x"
+
 url-parse@1.0.x:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.0.5.tgz#0854860422afdcfefeb6c965c662d4800169927b"