major file refactor - fix disconnecting bug

client/app/Wrapper.js

@@ -0,0 +1,23 @@
+import React from 'react';
+import Navbar from './components/Navbar/Navbar.component';
+
+//styling
+import './scss/index.scss';
+
+export default class Wrapper extends React.Component {
+
+    render() {
+        return (
+            <div>
+                <Navbar/>
+                <div>
+                    {this.props.children}
+                </div>
+            </div>
+        );
+    }
+}
+
+Wrapper.propTypes = {
+    children: React.PropTypes.node,
+};

client/app/app.js

@@ -0,0 +1,18 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+import { Router, Route, IndexRoute, browserHistory } from 'react-router';
+
+import Wrapper from './Wrapper';
+import Home from './pages/Home/Home';
+import Soundboard from './pages/Soundboard/Soundboard';
+import NotFound from './pages/NotFound/NotFound';
+
+ReactDOM.render(
+    <Router history={browserHistory}>
+        <Route path="/" component={Wrapper}>
+            <IndexRoute component={Home}/>
+            <Route path="/soundboard" component={Soundboard}/>
+            <Route path="*" component={NotFound}/>
+        </Route>
+    </Router>
+, document.getElementById('app'));

client/app/assets/normalize.css

@@ -0,0 +1,461 @@
+/*! normalize.css v5.0.0 | MIT License | github.com/necolas/normalize.css */
+
+/**
+ * 1. Change the default font family in all browsers (opinionated).
+ * 2. Correct the line height in all browsers.
+ * 3. Prevent adjustments of font size after orientation changes in
+ *    IE on Windows Phone and in iOS.
+ */
+
+/* Document
+   ========================================================================== */
+
+html {
+  font-family: sans-serif; /* 1 */
+  line-height: 1.15; /* 2 */
+  -ms-text-size-adjust: 100%; /* 3 */
+  -webkit-text-size-adjust: 100%; /* 3 */
+}
+
+/* Sections
+   ========================================================================== */
+
+/**
+ * Remove the margin in all browsers (opinionated).
+ */
+
+body {
+  margin: 0;
+}
+
+/**
+ * Add the correct display in IE 9-.
+ */
+
+article,
+aside,
+footer,
+header,
+nav,
+section {
+  display: block;
+}
+
+/**
+ * Correct the font size and margin on `h1` elements within `section` and
+ * `article` contexts in Chrome, Firefox, and Safari.
+ */
+
+h1 {
+  font-size: 2em;
+  margin: 0.67em 0;
+}
+
+/* Grouping content
+   ========================================================================== */
+
+/**
+ * Add the correct display in IE 9-.
+ * 1. Add the correct display in IE.
+ */
+
+figcaption,
+figure,
+main { /* 1 */
+  display: block;
+}
+
+/**
+ * Add the correct margin in IE 8.
+ */
+
+figure {
+  margin: 1em 40px;
+}
+
+/**
+ * 1. Add the correct box sizing in Firefox.
+ * 2. Show the overflow in Edge and IE.
+ */
+
+hr {
+  box-sizing: content-box; /* 1 */
+  height: 0; /* 1 */
+  overflow: visible; /* 2 */
+}
+
+/**
+ * 1. Correct the inheritance and scaling of font size in all browsers.
+ * 2. Correct the odd `em` font sizing in all browsers.
+ */
+
+pre {
+  font-family: monospace, monospace; /* 1 */
+  font-size: 1em; /* 2 */
+}
+
+/* Text-level semantics
+   ========================================================================== */
+
+/**
+ * 1. Remove the gray background on active links in IE 10.
+ * 2. Remove gaps in links underline in iOS 8+ and Safari 8+.
+ */
+
+a {
+  background-color: transparent; /* 1 */
+  -webkit-text-decoration-skip: objects; /* 2 */
+}
+
+/**
+ * Remove the outline on focused links when they are also active or hovered
+ * in all browsers (opinionated).
+ */
+
+a:active,
+a:hover {
+  outline-width: 0;
+}
+
+/**
+ * 1. Remove the bottom border in Firefox 39-.
+ * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
+ */
+
+abbr[title] {
+  border-bottom: none; /* 1 */
+  text-decoration: underline; /* 2 */
+  text-decoration: underline dotted; /* 2 */
+}
+
+/**
+ * Prevent the duplicate application of `bolder` by the next rule in Safari 6.
+ */
+
+b,
+strong {
+  font-weight: inherit;
+}
+
+/**
+ * Add the correct font weight in Chrome, Edge, and Safari.
+ */
+
+b,
+strong {
+  font-weight: bolder;
+}
+
+/**
+ * 1. Correct the inheritance and scaling of font size in all browsers.
+ * 2. Correct the odd `em` font sizing in all browsers.
+ */
+
+code,
+kbd,
+samp {
+  font-family: monospace, monospace; /* 1 */
+  font-size: 1em; /* 2 */
+}
+
+/**
+ * Add the correct font style in Android 4.3-.
+ */
+
+dfn {
+  font-style: italic;
+}
+
+/**
+ * Add the correct background and color in IE 9-.
+ */
+
+mark {
+  background-color: #ff0;
+  color: #000;
+}
+
+/**
+ * Add the correct font size in all browsers.
+ */
+
+small {
+  font-size: 80%;
+}
+
+/**
+ * Prevent `sub` and `sup` elements from affecting the line height in
+ * all browsers.
+ */
+
+sub,
+sup {
+  font-size: 75%;
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline;
+}
+
+sub {
+  bottom: -0.25em;
+}
+
+sup {
+  top: -0.5em;
+}
+
+/* Embedded content
+   ========================================================================== */
+
+/**
+ * Add the correct display in IE 9-.
+ */
+
+audio,
+video {
+  display: inline-block;
+}
+
+/**
+ * Add the correct display in iOS 4-7.
+ */
+
+audio:not([controls]) {
+  display: none;
+  height: 0;
+}
+
+/**
+ * Remove the border on images inside links in IE 10-.
+ */
+
+img {
+  border-style: none;
+}
+
+/**
+ * Hide the overflow in IE.
+ */
+
+svg:not(:root) {
+  overflow: hidden;
+}
+
+/* Forms
+   ========================================================================== */
+
+/**
+ * 1. Change the font styles in all browsers (opinionated).
+ * 2. Remove the margin in Firefox and Safari.
+ */
+
+button,
+input,
+optgroup,
+select,
+textarea {
+  font-family: sans-serif; /* 1 */
+  font-size: 100%; /* 1 */
+  line-height: 1.15; /* 1 */
+  margin: 0; /* 2 */
+}
+
+/**
+ * Show the overflow in IE.
+ * 1. Show the overflow in Edge.
+ */
+
+button,
+input { /* 1 */
+  overflow: visible;
+}
+
+/**
+ * Remove the inheritance of text transform in Edge, Firefox, and IE.
+ * 1. Remove the inheritance of text transform in Firefox.
+ */
+
+button,
+select { /* 1 */
+  text-transform: none;
+}
+
+/**
+ * 1. Prevent a WebKit bug where (2) destroys native `audio` and `video`
+ *    controls in Android 4.
+ * 2. Correct the inability to style clickable types in iOS and Safari.
+ */
+
+button,
+html [type="button"], /* 1 */
+[type="reset"],
+[type="submit"] {
+  -webkit-appearance: button; /* 2 */
+}
+
+/**
+ * Remove the inner border and padding in Firefox.
+ */
+
+button::-moz-focus-inner,
+[type="button"]::-moz-focus-inner,
+[type="reset"]::-moz-focus-inner,
+[type="submit"]::-moz-focus-inner {
+  border-style: none;
+  padding: 0;
+}
+
+/**
+ * Restore the focus styles unset by the previous rule.
+ */
+
+button:-moz-focusring,
+[type="button"]:-moz-focusring,
+[type="reset"]:-moz-focusring,
+[type="submit"]:-moz-focusring {
+  outline: 1px dotted ButtonText;
+}
+
+/**
+ * Change the border, margin, and padding in all browsers (opinionated).
+ */
+
+fieldset {
+  border: 1px solid #c0c0c0;
+  margin: 0 2px;
+  padding: 0.35em 0.625em 0.75em;
+}
+
+/**
+ * 1. Correct the text wrapping in Edge and IE.
+ * 2. Correct the color inheritance from `fieldset` elements in IE.
+ * 3. Remove the padding so developers are not caught out when they zero out
+ *    `fieldset` elements in all browsers.
+ */
+
+legend {
+  box-sizing: border-box; /* 1 */
+  color: inherit; /* 2 */
+  display: table; /* 1 */
+  max-width: 100%; /* 1 */
+  padding: 0; /* 3 */
+  white-space: normal; /* 1 */
+}
+
+/**
+ * 1. Add the correct display in IE 9-.
+ * 2. Add the correct vertical alignment in Chrome, Firefox, and Opera.
+ */
+
+progress {
+  display: inline-block; /* 1 */
+  vertical-align: baseline; /* 2 */
+}
+
+/**
+ * Remove the default vertical scrollbar in IE.
+ */
+
+textarea {
+  overflow: auto;
+}
+
+/**
+ * 1. Add the correct box sizing in IE 10-.
+ * 2. Remove the padding in IE 10-.
+ */
+
+[type="checkbox"],
+[type="radio"] {
+  box-sizing: border-box; /* 1 */
+  padding: 0; /* 2 */
+}
+
+/**
+ * Correct the cursor style of increment and decrement buttons in Chrome.
+ */
+
+[type="number"]::-webkit-inner-spin-button,
+[type="number"]::-webkit-outer-spin-button {
+  height: auto;
+}
+
+/**
+ * 1. Correct the odd appearance in Chrome and Safari.
+ * 2. Correct the outline style in Safari.
+ */
+
+[type="search"] {
+  -webkit-appearance: textfield; /* 1 */
+  outline-offset: -2px; /* 2 */
+}
+
+/**
+ * Remove the inner padding and cancel buttons in Chrome and Safari on macOS.
+ */
+
+[type="search"]::-webkit-search-cancel-button,
+[type="search"]::-webkit-search-decoration {
+  -webkit-appearance: none;
+}
+
+/**
+ * 1. Correct the inability to style clickable types in iOS and Safari.
+ * 2. Change font properties to `inherit` in Safari.
+ */
+
+::-webkit-file-upload-button {
+  -webkit-appearance: button; /* 1 */
+  font: inherit; /* 2 */
+}
+
+/* Interactive
+   ========================================================================== */
+
+/*
+ * Add the correct display in IE 9-.
+ * 1. Add the correct display in Edge, IE, and Firefox.
+ */
+
+details, /* 1 */
+menu {
+  display: block;
+}
+
+/*
+ * Add the correct display in all browsers.
+ */
+
+summary {
+  display: list-item;
+}
+
+/* Scripting
+   ========================================================================== */
+
+/**
+ * Add the correct display in IE 9-.
+ */
+
+canvas {
+  display: inline-block;
+}
+
+/**
+ * Add the correct display in IE.
+ */
+
+template {
+  display: none;
+}
+
+/* Hidden
+   ========================================================================== */
+
+/**
+ * Add the correct display in IE 10-.
+ */
+
+[hidden] {
+  display: none;
+}

client/app/components/Navbar/Navbar.component.js

@@ -0,0 +1,21 @@
+import React from 'react';
+import { Link } from 'react-router';
+
+import './Navbar.scss';
+
+export default class Navbar extends React.Component {
+
+    render() {
+        return (
+            <div className="Navbar">
+                <div className="Navbar__header">Go Discord Bot</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>
+        );
+    }
+}
+
+Navbar.propTypes = {
+    children: React.PropTypes.node,
+};

client/app/components/Navbar/Navbar.scss

@@ -0,0 +1,52 @@
+@import '../../scss/variables';
+
+.Navbar {
+    position: fixed;
+    display: flex;
+    flex-direction: column;
+    top: 0;
+    left: 0;
+    height: 100%;
+    width: $navbarWidth;
+    background-color: $gray2;
+    border-right: 1px solid darken($gray2, 2%);
+    overflow-y: auto;
+    padding-bottom: 10px;
+}
+
+.Navbar__header {
+    font-size: 25px;
+    min-height: 100px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    text-align: center;
+    background-color: $primaryBlue;
+    border-bottom: 1px solid $gray3;
+}
+
+.Navbar__item {
+    min-height: 50px;
+    text-decoration: none;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    text-align: center;
+    color: $white;
+    transition: background-color 0.1s linear, color 0.2s linear;
+    
+    &:hover {
+        background-color: $gray1; 
+    }
+    
+    & + .Navbar__item {
+        border-top: 1px solid $gray3;
+    }
+    
+}
+
+.Navbar__item--active {
+    padding-left: 4px;
+    border-right: 4px solid $primaryBlue;
+    color: $primaryBlue !important;
+}

client/app/pages/Home/Home.js

@@ -0,0 +1,26 @@
+import React from 'react';
+
+import './Home.scss';
+
+export default class Home extends React.Component {
+    render() {
+        return (
+            <div className="Home">
+                <div className="Card">
+                    <div className="Card__header">
+                        Go Discord Bot
+                    </div>
+                    <p>Drag and drop files to upload. Sounds can be played in discord by typing the commands on the next page.</p>
+                    <br/>
+                    <p>Gif command now supported! Example: !gif awesome cat gifs</p>
+                    <br/>
+                    <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"/>
+                        </a>
+                    </p>
+                </div>
+            </div>
+        );
+    }
+}

client/app/pages/Home/Home.scss

@@ -0,0 +1,3 @@
+.Home {
+    padding: 10px;
+}

client/app/pages/NotFound/NotFound.js

@@ -0,0 +1,12 @@
+import React from 'react';
+import './NotFound.scss';
+
+export default class Default extends React.Component {
+    render() {
+        return (
+            <div className="NotFound">
+                404 Not Found
+            </div>
+        );
+    }
+}

client/app/pages/NotFound/NotFound.scss

@@ -0,0 +1,8 @@
+.NotFound {
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    
+    font-size: 20px;
+}

client/app/pages/Soundboard/SoundList.component.js

@@ -0,0 +1,89 @@
+import React from 'react';
+import axios from 'axios';
+
+import './SoundList.scss';
+
+export default class SoundList extends React.Component {
+    
+    constructor() {
+        super();
+        this.state = {
+            soundList: [],
+            showAudioControls: [],
+        };
+    }
+    
+    componentDidMount() {
+        this.getSoundList();
+    }
+    
+    getSoundList() {
+        if (!this.soundListCache) {
+            axios.get("/soundlist").then((response) => {
+                this.soundListCache = response.data;
+                this.setState({
+                    soundList: response.data,
+                });
+            }).catch(() => {
+                //console.warn(error.response.data);
+            });
+        } else {
+            this.setState({
+                soundList: this.soundListCache,
+            });
+        }
+    }
+    
+    checkExtension(extension) {
+        switch(extension) {
+        case "wav":
+            return true;
+        case "mp3":
+            return true;
+        case "mpeg":
+            return true;
+        default:
+            return false;
+        }
+    }
+
+    handleShowAudio(index) {
+        let temp = this.state.showAudioControls;
+        temp[index] = true;
+
+        this.setState({
+            showAudioControls: temp,
+        });
+    }
+    
+    render() {
+        return (
+            <div className="Card">
+                <div className="Card__header" style={{display:'flex'}}>
+                    <div>
+                        Sounds
+                        <i className="fa fa fa-volume-up" aria-hidden="true"/>
+                    </div>
+                    <div style={{flex:1}}/>
+                    <div>({this.state.soundList.length})</div>
+                </div>
+                
+                {this.state.soundList.length > 0 ? this.state.soundList.map((sound, index) => {
+                    return (
+                        <div key={index} className="SoundList__item">
+                            <div>
+                                {sound.prefix + sound.name}
+                            </div>
+                            
+                            {this.checkExtension(sound.extension) && this.state.showAudioControls[index] ?
+                            <audio controls src={"/sounds/" + sound.name + "." + sound.extension}
+                                    type={"audio/" + sound.extension}
+                                    style={{width: "100px"}}/>
+                            : <i className="fa fa-play link" aria-hidden="true" onClick={() => this.handleShowAudio(index)}/> }
+                        </div>
+                    );
+                }) : null}
+            </div>
+        );
+    }
+}

client/app/pages/Soundboard/SoundList.scss

@@ -0,0 +1,12 @@
+@import "../../scss/variables";
+
+.SoundList__item {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    height: 50px;
+    
+    & + .SoundList__item {
+        border-top: 1px solid $gray3;
+    }
+}

client/app/pages/Soundboard/Soundboard.js

@@ -0,0 +1,109 @@
+import React from 'react';
+import Dropzone from 'react-dropzone';
+import axios from 'axios';
+
+import SoundList from './SoundList.component';
+
+import './Soundboard.scss';
+
+let self;
+
+export default class Soundboard extends React.Component {
+    
+    constructor() {
+        super();
+        this.state = {
+            percentCompleted: 0,
+            password: "",
+            uploaded: false,
+            uploadError: " ",
+        }
+        self = this;
+    }
+    
+    componentDidMount() {
+        this.config = {
+            headers: {
+                'Content-Type': 'multipart/form-data',
+            },
+            onUploadProgress: (progressEvent) => {
+                this.setState({
+                    percentCompleted: Math.round( (progressEvent.loaded * 100) / progressEvent.total ),
+                });
+            }
+        };
+    }
+    
+    onDrop(acceptedFiles, rejectedFiles) {
+        if (acceptedFiles.length > 0) {
+            self.uploadFile(acceptedFiles[0]);
+        }
+    }
+    
+    uploadFile(file) {
+        let formData = new FormData();
+        formData.append("name", file.name);
+        formData.append("file", file);
+        formData.append("password", this.state.password);
+        
+        axios.put("/upload", formData, this.config)
+            .then(() => {
+                this.setState({
+                    password: "",
+                    percentCompleted: 0,
+                    uploaded: true,
+                    uploadError: " ",
+                });
+                
+                // reset sound list cache and load the new list
+                this.refs.SoundList.soundListCache = undefined;
+                this.refs.SoundList.getSoundList();
+            }).catch((err) => {
+                this.setState({
+                    percentCompleted: 0,
+                    uploaded: false,
+                    uploadError: err.response.data,
+                });
+            });
+    }
+    
+    passwordOnChange(event) {
+        this.setState({
+            password: event.target.value,
+        });
+    }
+    
+    render() {
+        return (
+            <div className="Soundboard">
+                <div className="column">
+                    <SoundList ref="SoundList"/>
+                </div>
+            
+                <div className="column">
+                    <div>
+                        <Dropzone className="Dropzone"
+                                activeClassName="Dropzone--active"
+                                onDrop={this.onDrop}
+                                multiple={false}
+                                disableClick={true}
+                                maxSize={10000000000}
+                                accept={"audio/*"}>
+                                
+                            <input className="Soundboard__input"
+                                    type="password"
+                                    placeholder="Password"
+                                    value={this.state.password}
+                                    onChange={this.passwordOnChange.bind(this)}/>
+                                
+                            <div style={{fontSize: "20px"}}>Drop file here to upload.</div>
+                            {this.state.percentCompleted > 0 ? <div>Uploading: {this.state.percentCompleted}</div> : ""}
+                            {this.state.uploaded ? <div style={{color: 'green'}}>File uploded!</div> : ""}
+                            <div style={{color: '#f95f59'}}>{this.state.uploadError}</div>
+                        </Dropzone>
+                    </div>
+                </div>
+            </div>
+        )
+    }
+}

client/app/pages/Soundboard/Soundboard.scss

@@ -0,0 +1,45 @@
+@import '../../scss/variables';
+
+.Soundboard {
+    display: flex;
+    padding: 10px;
+}
+
+.Soundboard__column {
+    flex: 1;    
+}
+
+.Soundboard__input {
+    display: block;
+    width: 200px;
+    border-radius: 3px;
+    border: 1px solid lighten($gray1, 5%);
+    margin-bottom: 10px;
+    margin-right: auto;
+    margin-left: auto;
+    padding-left: 5px;
+    padding-right: 5px;
+    height: 30px;
+}
+
+.Dropzone {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    border: 2px solid $primaryBlue;
+    border-radius: 1em;
+    padding: 20px;
+    margin-right: auto;
+    margin-left: auto;
+    color: lighten($gray1, 15%);
+    width: 400px;
+    height: 400px;
+    background-color: $gray2;
+    transition: box-shadow 0.1s linear, background-color 0.1s linear;
+}
+
+.Dropzone--active {
+    background-color: $gray3;
+    box-shadow: 0px 0px 5px 1px $primaryBlue;
+}

client/app/scss/index.scss

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

client/app/scss/style.scss

@@ -0,0 +1,54 @@
+* {
+    box-sizing: border-box;
+}
+
+a, .link {
+    text-decoration: none;    
+    color: $primaryBlue;
+    transition: color 0.1s linear;
+    cursor: pointer;
+    
+    &:hover {
+        color: darken(white, 10%);
+    }
+}
+
+i {
+    margin-left: 5px;    
+    margin-right: 5px;    
+}
+
+body {
+    background-color: $gray1;
+    color: $white;
+    padding-left: $navbarWidth;
+}
+
+.Card {
+    background-color: $gray2;
+    border-radius: 5px;
+    max-width: 800px;
+    padding: 10px;
+    margin-bottom: 20px;
+    border: 1px solid $gray3;
+}
+
+.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;
+}
+
+.column {
+    flex: 1;
+    
+    & + .column {
+        margin-left: 10px;
+    }
+}

client/app/scss/variables.scss

@@ -0,0 +1,13 @@
+$navbarWidth: 200px;
+
+
+// colors
+$primaryBlue: #7289da;
+$white: darken(white, 10%);
+
+$gray1: #2e3136;
+$gray2: #2a2d32;
+$gray3: #23262a;
+$gray4: #2e3136;
+$gray5: #282b30;
+$gray6: #1e2124;