mitchell/go-discord-bot
1
0
Fork 0
mirror of https://github.com/mgerb/go-discord-bot synced 2026-01-09 16:42:48 +00:00
Code Issues Releases Wiki Activity

client: updated everything, deprecated pubg stuff

Browse Source
This commit is contained in:
Mitchell
2018-04-09 20:28:36 -05:00
parent 1f4cb18d21
commit 0fe7468506
43 changed files with 12857 additions and 11121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -9,3 +9,5 @@ clips
debug debug
youtube youtube
go-discord-bot go-discord-bot
data.db
.wwp-cache

3
.vscode/settings.json vendored Normal file
View File

@@ -0,0 +1,3 @@
{
"editor.formatOnSave": true
}

6
client/.prettierrc Normal file
View File

@@ -0,0 +1,6 @@
{
"singleQuote": true,
"tabWidth": 2,
"trailingComma": "all",
"printWidth": 120
}

4
client/app/Wrapper.tsx
View File

@@ -5,8 +5,8 @@ import { Navbar } from './components/Navbar';
import './scss/index.scss'; import './scss/index.scss';
export class Wrapper extends React.Component<any, any> { export class Wrapper extends React.Component<any, any> {
constructor() { constructor(props: any) {
super(); super(props);
} }
render() { render() {

34
client/app/app.tsx
View File

@@ -1,27 +1,31 @@
import React from 'react'; import React from 'react';
import ReactDOM from 'react-dom'; import ReactDOM from 'react-dom';
import { Router, Route, IndexRoute, browserHistory } from 'react-router'; import { BrowserRouter, Route, Switch } from 'react-router-dom';
import { Wrapper } from './Wrapper'; import { Wrapper } from './Wrapper';
import { Home } from './pages/Home/Home'; import { Home } from './pages/Home/Home';
import { Soundboard } from './pages/Soundboard/Soundboard'; import { Soundboard } from './pages/Soundboard/Soundboard';
import { NotFound } from './pages/NotFound/NotFound'; import { NotFound } from './pages/NotFound/NotFound';
import { Downloader } from './pages/Downloader/Downloader'; import { Downloader } from './pages/Downloader/Downloader';
import { Pubg } from './pages/Pubg/Pubg';
import { Clips } from './pages/Clips'; import { Clips } from './pages/Clips';
import { Oauth } from './pages/oauth/oauth'; import { Oauth } from './pages/oauth/oauth';
import 'babel-polyfill'; import 'babel-polyfill';
ReactDOM.render( const App: any = (): any => {
<Router history={browserHistory}> return (
<Route path="/" component={Wrapper}> <BrowserRouter>
<IndexRoute component={Home}/> <Wrapper>
<Route path="/soundboard" component={Soundboard}/> <Switch>
<Route path="/downloader" component={Downloader}/> <Route exact path="/" component={Home} />
<Route path="/pubg" component={Pubg}/> <Route path="/soundboard" component={Soundboard} />
<Route path="/clips" component={Clips}/> <Route path="/downloader" component={Downloader} />
<Route path="/oauth" component={Oauth}/> <Route path="/clips" component={Clips} />
<Route path="*" component={NotFound}/> <Route path="/oauth" component={Oauth} />
</Route> <Route component={NotFound} />
</Router> </Switch>
, document.getElementById('app')); </Wrapper>
</BrowserRouter>
);
};
ReactDOM.render(<App /> as any, document.getElementById('app'));

2337
client/app/assets/font-awesome/css/font-awesome.css vendored
View File

File diff suppressed because it is too large Load Diff

BIN
client/app/assets/font-awesome/fonts/FontAwesome.otf
View File

Binary file not shown.

BIN
client/app/assets/font-awesome/fonts/fontawesome-webfont.eot
View File

Binary file not shown.

2671
client/app/assets/font-awesome/fonts/fontawesome-webfont.svg
View File

File diff suppressed because it is too large Load Diff
Side by Side

Before

Width:  |  Height:  |  Size: 434 KiB

BIN
client/app/assets/font-awesome/fonts/fontawesome-webfont.ttf
View File

Binary file not shown.

BIN
client/app/assets/font-awesome/fonts/fontawesome-webfont.woff
View File

Binary file not shown.

BIN
client/app/assets/font-awesome/fonts/fontawesome-webfont.woff2
View File

Binary file not shown.

461
client/app/assets/normalize.css vendored
View File

@@ -1,461 +0,0 @@
/*! 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;
}

38
client/app/components/Navbar/Navbar.tsx
View File

@@ -1,5 +1,5 @@
import React from 'react'; import React from 'react';
import { Link } from 'react-router'; import { NavLink } from 'react-router-dom';
import jwt_decode from 'jwt-decode'; import jwt_decode from 'jwt-decode';
import './Navbar.scss'; import './Navbar.scss';
@@ -15,7 +15,6 @@ if (!process.env.NODE_ENV) {
oauthUrl = `https://discordapp.com/api/oauth2/authorize?client_id=271998875802402816&redirect_uri=https%3A%2F%2Fcashdiscord.com%2Foauth&response_type=code&scope=identify%20guilds%20email`; oauthUrl = `https://discordapp.com/api/oauth2/authorize?client_id=271998875802402816&redirect_uri=https%3A%2F%2Fcashdiscord.com%2Foauth&response_type=code&scope=identify%20guilds%20email`;
} }
interface Props {} interface Props {}
interface State { interface State {
@@ -24,7 +23,6 @@ interface State {
} }
export class Navbar extends React.Component<Props, State> { export class Navbar extends React.Component<Props, State> {
constructor(props: Props) { constructor(props: Props) {
super(props); super(props);
this.state = { this.state = {
@@ -37,6 +35,7 @@ export class Navbar extends React.Component<Props, State> {
if (token) { if (token) {
const claims: any = jwt_decode(token!); const claims: any = jwt_decode(token!);
console.log(claims);
const email = claims['email']; const email = claims['email'];
this.setState({ token, email }); this.setState({ token, email });
} }
@@ -45,23 +44,34 @@ export class Navbar extends React.Component<Props, State> {
private logout = () => { private logout = () => {
localStorage.clear(); localStorage.clear();
window.location.href = '/'; window.location.href = '/';
} };
render() { render() {
return ( return (
<div className="Navbar"> <div className="Navbar">
<div className="Navbar__header">Go Discord Bot</div> <div className="Navbar__header">Go Discord Bot</div>
<Link to="/" className="Navbar__item" onlyActiveOnIndex activeClassName="Navbar__item--active">Home</Link> <NavLink exact to="/" className="Navbar__item" activeClassName="Navbar__item--active">
<Link to="/soundboard" className="Navbar__item" activeClassName="Navbar__item--active">Soundboard</Link> Home
<Link to="/downloader" className="Navbar__item" activeClassName="Navbar__item--active">Youtube Downloader</Link> </NavLink>
{/* PUBG - DEPRECATED */} <NavLink to="/soundboard" className="Navbar__item" activeClassName="Navbar__item--active">
{/* <Link to="/pubg" className="Navbar__item" activeClassName="Navbar__item--active">Pubg</Link> */} Soundboard
<Link to="/clips" className="Navbar__item" activeClassName="Navbar__item--active">Clips</Link> </NavLink>
<NavLink to="/downloader" className="Navbar__item" activeClassName="Navbar__item--active">
Youtube Downloader
</NavLink>
<NavLink to="/clips" className="Navbar__item" activeClassName="Navbar__item--active">
Clips
</NavLink>
{ !this.state.token ? {!this.state.token ? (
<a href={oauthUrl} className="Navbar__item">Login</a> : <a href={oauthUrl} className="Navbar__item">
<a className="Navbar__item" onClick={this.logout}>Logout</a> Login
} </a>
) : (
<a className="Navbar__item" onClick={this.logout}>
Logout
</a>
)}
{this.state.email && <div className="Navbar__email">{this.state.email}</div>} {this.state.email && <div className="Navbar__email">{this.state.email}</div>}
</div> </div>

20
client/app/components/SoundList/SoundList.scss
View File

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

126
client/app/components/SoundList/SoundList.tsx
View File

@@ -3,81 +3,85 @@ import React from 'react';
import './SoundList.scss'; import './SoundList.scss';
interface Props { interface Props {
soundList: SoundType[]; soundList: SoundType[];
type: string; type: string;
} }
interface State { interface State {
showAudioControls: boolean[]; showAudioControls: boolean[];
} }
export interface SoundType { export interface SoundType {
extension: string; extension: string;
name: string; name: string;
prefix?: string; prefix?: string;
} }
export class SoundList extends React.Component<Props, State> { export class SoundList extends React.Component<Props, State> {
constructor(props: Props) {
super(props);
this.state = {
showAudioControls: [],
};
}
constructor() { checkExtension(extension: string) {
super(); switch (extension) {
this.state = { case 'wav':
showAudioControls: [], return true;
}; case 'mp3':
} return true;
case 'mpeg':
checkExtension(extension: string) { return true;
switch(extension) { default:
case "wav": return false;
return true;
case "mp3":
return true;
case "mpeg":
return true;
default:
return false;
}
} }
}
handleShowAudio(index: any) { handleShowAudio(index: any) {
let temp = this.state.showAudioControls; let temp = this.state.showAudioControls;
temp[index] = true; temp[index] = true;
this.setState({ this.setState({
showAudioControls: temp, showAudioControls: temp,
}); });
} }
render() {
const { soundList, type } = this.props; render() {
const { soundList, type } = this.props;
return ( return (
<div className="Card"> <div className="Card">
<div className="Card__header" style={{display:'flex'}}> <div className="Card__header" style={{ display: 'flex' }}>
<div> <div>
<span>{type}</span> <span>{type}</span>
<i className="fa fa fa-volume-up" aria-hidden="true"/> <i className="fa fa fa-volume-up" aria-hidden="true" />
</div> </div>
<div style={{flex:1}}/> <div style={{ flex: 1 }} />
<div>({soundList.length})</div> <div>({soundList.length})</div>
</div>
{soundList.length > 0
? soundList.map((sound: SoundType, index: number) => {
return (
<div key={index} className="SoundList__item">
<div>{(sound.prefix || '') + sound.name}</div>
{this.checkExtension(sound.extension) && this.state.showAudioControls[index] ? (
<audio
controls
src={`/public/${type.toLowerCase()}/` + sound.name + '.' + sound.extension}
itemType={'audio/' + sound.extension}
style={{ width: '100px' }}
/>
) : (
<i className="fa fa-play link" aria-hidden="true" onClick={() => this.handleShowAudio(index)} />
)}
</div> </div>
);
{soundList.length > 0 ? soundList.map((sound: SoundType, index: number) => { })
return ( : null}
<div key={index} className="SoundList__item"> </div>
<div>{(sound.prefix || '') + sound.name}</div> );
}
{this.checkExtension(sound.extension) && this.state.showAudioControls[index] ?
<audio controls src={`/public/${type.toLowerCase()}/` + sound.name + "." + sound.extension}
itemType={"audio/" + sound.extension}
style={{width: "100px"}}/>
: <i className="fa fa-play link" aria-hidden="true" onClick={() => this.handleShowAudio(index)}/> }
</div>
);
}) : null}
</div>
);
}
} }

6
client/app/pages/Clips/Clips.tsx
View File

@@ -10,8 +10,8 @@ interface State {
} }
export class Clips extends React.Component<Props, State> { export class Clips extends React.Component<Props, State> {
constructor() { constructor(props: Props) {
super(); super(props);
this.state = { this.state = {
clipList: [], clipList: [],
}; };
@@ -38,7 +38,7 @@ export class Clips extends React.Component<Props, State> {
return ( return (
<div className="Soundboard"> <div className="Soundboard">
<div className="column"> <div className="column">
<SoundList soundList={this.state.clipList} type="Clips"/> <SoundList soundList={this.state.clipList} type="Clips" />
</div> </div>
</div> </div>
); );

15
client/app/pages/Downloader/Downloader.scss
View File

@@ -1,16 +1,15 @@
.Downloader { .Downloader {
padding: 10px; padding: 10px;
} }
.Downloader__input { .Downloader__input {
width: 100%; width: 100%;
margin-top: 10px; margin-top: 10px;
margin-bottom: 10px; margin-bottom: 10px;
} }
.Downloader__button { .Downloader__button {
& + & {
& + & { margin-left: 10px;
margin-left: 10px; }
}
} }

159
client/app/pages/Downloader/Downloader.tsx
View File

@@ -3,97 +3,102 @@ import axios from 'axios';
import './Downloader.scss'; import './Downloader.scss';
interface Props { interface Props {}
}
interface State { interface State {
fileType: string; fileType: string;
url: string; url: string;
message: string; message: string;
downloadLink: string; downloadLink: string;
downLoadFileName: string; downLoadFileName: string;
dataLoading: boolean; dataLoading: boolean;
dataLoaded: boolean; dataLoaded: boolean;
} }
export class Downloader extends React.Component<Props, State> { export class Downloader extends React.Component<Props, State> {
constructor(props: Props) {
super(props);
this.state = {
fileType: 'mp3',
url: '',
message: '',
dataLoaded: false,
downloadLink: '',
downLoadFileName: '',
dataLoading: false,
};
}
constructor(props: Props) { sendRequest() {
super(props); if (this.state.url === '') {
this.state = { this.setState({
fileType: "mp3", message: 'Invalid URL',
url: "", });
message: "",
dataLoaded: false, return;
downloadLink: "",
downLoadFileName: "",
dataLoading: false,
};
} }
sendRequest() { this.setState({
if (this.state.url === "") { message: '',
this.setState({ url: '',
message: "Invalid URL", dataLoaded: false,
}); dataLoading: true,
});
return;
}
axios
.get(`/api/ytdownloader`, {
params: {
fileType: this.state.fileType,
url: this.state.url,
},
})
.then(res => {
this.setState({ this.setState({
message: "", dataLoaded: true,
url: "", dataLoading: false,
dataLoaded: false, downloadLink: `/public/youtube/${res.data.fileName}`,
dataLoading: true, downLoadFileName: res.data.fileName,
}); });
})
axios.get(`/api/ytdownloader`, { .catch(() => {
params: { this.setState({
fileType: this.state.fileType, message: 'Internal error.',
url: this.state.url, dataLoading: false,
}
}).then((res) => {
this.setState({
dataLoaded: true,
dataLoading: false,
downloadLink: `/public/youtube/${res.data.fileName}`,
downLoadFileName: res.data.fileName,
});
}).catch(() => {
this.setState({
message: "Internal error.",
dataLoading: false,
});
}); });
} });
}
render() { render() {
return ( return (
<div className="Downloader"> <div className="Downloader">
<div className="card"> <div className="card">
<div className="card__header"> <div className="card__header">Youtube to MP3</div>
Youtube to MP3
</div>
<input placeholder="Enter Youtube URL" <input
className="input Downloader__input" placeholder="Enter Youtube URL"
value={this.state.url} className="input Downloader__input"
onChange={(event) => this.setState({url: event.target.value})}/> value={this.state.url}
onChange={event => this.setState({ url: event.target.value })}
/>
<div style={{marginBottom:'10px'}}> <div style={{ marginBottom: '10px' }}>
<button className="button button--primary" <button
style={{width: '100px', height: '40px', fontSize: 'large'}} className="button button--primary"
onClick={this.sendRequest.bind(this)}> style={{ width: '100px', height: '40px', fontSize: 'large' }}
{this.state.dataLoading ? <i className="fa fa-spinner fa-spin fa-fw"/> : 'Convert'} onClick={this.sendRequest.bind(this)}
</button> >
</div> {this.state.dataLoading ? <i className="fa fa-spinner fa-spin fa-fw" /> : 'Convert'}
</button>
</div>
{this.state.message !== "" && <div>{this.state.message}</div>} {this.state.message !== '' && <div>{this.state.message}</div>}
{this.state.dataLoaded && <a href={this.state.downloadLink} download>{this.state.downLoadFileName}</a>} {this.state.dataLoaded && (
</div> <a href={this.state.downloadLink} download>
{this.state.downLoadFileName}
</div> </a>
); )}
} </div>
</div>
);
}
} }

2
client/app/pages/Home/Home.scss
View File

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

71
client/app/pages/Home/Home.tsx
View File

@@ -2,50 +2,47 @@ import React from 'react';
import './Home.scss'; import './Home.scss';
interface Props { interface Props {}
} interface State {}
interface State {
}
export class Home extends React.Component<Props, State> { export class Home extends React.Component<Props, State> {
render() {
return (
<div className="Home">
<div className="Card">
<div className="Card__header">Go Discord Bot</div>
render() { <h3>04-09-18 Update</h3>
return ( <ul>
<div className="Home"> <li>pubg stats no longer updated on this site</li>
<div className="Card"> <li>client dependencies all updated (including webpack 4 and react router 4)</li>
<div className="Card__header"> </ul>
Go Discord Bot
</div>
<h3>Audio Clipping</h3>
<p><em>NEW:</em> Audio clipping now supported! Try it out with the <code>clip</code> command!</p>
<br/> <h3>Audio Clipping</h3>
<p>
<em>NEW:</em> Audio clipping now supported! Try it out with the <code>clip</code> command!
</p>
<h3>PUBG Stats</h3> <h3>PUBG Stats</h3>
<p>PUBG stats are pulled from the score API.</p> <p>PUBG stats are pulled from the score API.</p>
<br/> <h3>Youtube Downloader</h3>
<p>Convert Youtube URL's to MP3 files.</p>
<h3>Youtube Downloader</h3> <h3>Soundboard Upload</h3>
<p>Convert Youtube URL's to MP3 files.</p> <p>Drag and drop files to upload. Sounds can be played in discord by typing the commands on the next page.</p>
<br/> <p>
Check out the source code on
<h3>Soundboard Upload</h3> <a href="https://github.com/mgerb/GoBot" target="_blank">
<p>Drag and drop files to upload. Sounds can be played in discord by typing the commands on the next page.</p> {' '}
GitHub
<br/> <i className="fa fa-github" aria-hidden="true" />
</a>
<p>Check out the source code on </p>
<a href="https://github.com/mgerb/GoBot" target="_blank"> GitHub </div>
<i className="fa fa-github" aria-hidden="true"/> </div>
</a> );
</p> }
</div>
</div>
);
}
} }

14
client/app/pages/NotFound/NotFound.scss
View File

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

18
client/app/pages/NotFound/NotFound.tsx
View File

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

37
client/app/pages/Pubg/Pubg.scss
View File

@@ -1,32 +1,33 @@
@import "../../scss/variables"; @import '../../scss/variables';
.pubg__container { .pubg__container {
padding: 10px; padding: 10px;
} }
.pubg__table { .pubg__table {
border-collapse: collapse; border-collapse: collapse;
width: 100%; width: 100%;
text-align: left; text-align: left;
margin-top: 20px; margin-top: 20px;
tr + tr { tr + tr {
border-top: 1px solid $gray3; border-top: 1px solid $gray3;
} }
td, th { td,
padding: 5px; th {
} padding: 5px;
}
} }
.pubg__button-row { .pubg__button-row {
margin-bottom: 10px; margin-bottom: 10px;
.button { .button {
min-width: 100px; min-width: 100px;
& + .button { & + .button {
margin-left: 5px; margin-left: 5px;
}
} }
}
} }

249
client/app/pages/Pubg/Pubg.tsx
View File

@@ -1,146 +1,159 @@
// DEPRECATED /**
* DEPRECATED
*/
import React from 'react'; import React from 'react';
import axios from 'axios'; import axios from 'axios';
import * as _ from 'lodash'; import * as _ from 'lodash';
import './Pubg.scss'; import './Pubg.scss';
interface Props { interface Props {}
}
interface State { interface State {
players: Player[]; players: Player[];
selectedRegion: string; selectedRegion: string;
selectedMatch: string; selectedMatch: string;
statList: string[]; statList: string[];
} }
interface Player { interface Player {
PlayerName: string; PlayerName: string;
agg?: any; agg?: any;
as?: any; as?: any;
na?: any; na?: any;
sa?: any; sa?: any;
} }
export class Pubg extends React.Component<Props, State> { export class Pubg extends React.Component<Props, State> {
constructor(props: Props) {
super(props);
this.state = {
players: [],
selectedRegion: 'agg',
selectedMatch: 'squad',
statList: [],
};
}
constructor() { componentDidMount() {
super(); axios.get('/api/stats/pubg').then(res => {
this.state = { this.setState({
players: [], players: _.map(res.data) as any,
selectedRegion: 'agg', });
selectedMatch: 'squad',
statList: [], this.setStatList();
}; });
}
// get stat list
setStatList() {
// hacky way to find existing content -- to tired to make it pretty
let i = 0;
let stats;
while (!stats) {
if (i > this.state.players.length) {
return;
}
stats = _.find(
_.get(this.state, `players[${i}].Stats`),
(s: any) => s.Match === this.state.selectedMatch.toLowerCase(),
);
i++;
} }
componentDidMount() { if (stats) {
axios.get("/api/stats/pubg").then((res) => { this.setState({
statList: _.sortBy(_.map(stats.Stats, 'field')) as any,
});
}
}
this.setState({ insertRows(): any {
players: _.map(res.data) as any, return this.state.statList.map((val: any, index: any) => {
return (
<tr key={index}>
<td>{val}</td>
{this.state.players.map((player: any, i: number) => {
// find player stats for field
let playerStat = _.find(player.Stats, (p: any) => {
return (
p.Match === this.state.selectedMatch.toLowerCase() &&
p.Region === this.state.selectedRegion.toLowerCase()
);
}); });
this.setStatList();
});
}
// get stat list
setStatList() {
// hacky way to find existing content -- to tired to make it pretty
let i = 0;
let stats;
while (!stats) {
if (i > this.state.players.length) {
return;
}
stats = _.find(_.get(this.state, `players[${i}].Stats`), (s: any) => s.Match === this.state.selectedMatch.toLowerCase());
i++;
}
if (stats) {
this.setState({
statList: _.sortBy(_.map(stats.Stats, 'field')) as any,
});
}
}
insertRows(): any {
return this.state.statList.map((val: any, index: any) => {
return ( return (
<tr key={index}> <td key={i}>{_.get(_.find(_.get(playerStat, 'Stats'), (p: any) => p.field === val), 'displayValue')}</td>
<td>{val}</td>
{this.state.players.map((player: any, i: number) => {
// find player stats for field
let playerStat = _.find(player.Stats, (p: any) => {
return p.Match === this.state.selectedMatch.toLowerCase() && p.Region === this.state.selectedRegion.toLowerCase();
});
return <td key={i}>{_.get(_.find(_.get(playerStat, 'Stats'), (p: any) => p.field === val), 'displayValue')}</td>
})}
</tr>
); );
}); })}
} </tr>
);
});
}
buttonRegion(title: string) { buttonRegion(title: string) {
let lowerTitle = title === 'All' ? 'agg' : title.toLowerCase() let lowerTitle = title === 'All' ? 'agg' : title.toLowerCase();
return ( return (
<button className={`button ${lowerTitle === this.state.selectedRegion ? 'button--primary' : ''}`} <button
onClick={() => { className={`button ${lowerTitle === this.state.selectedRegion ? 'button--primary' : ''}`}
this.setState({selectedRegion: lowerTitle}); onClick={() => {
this.setStatList(); this.setState({ selectedRegion: lowerTitle });
}}>{title}</button> this.setStatList();
); }}
} >
{title}
</button>
);
}
buttonMatch(title: string) { buttonMatch(title: string) {
let lowerTitle = title.toLowerCase() let lowerTitle = title.toLowerCase();
return ( return (
<button className={`button ${lowerTitle === this.state.selectedMatch ? 'button--primary' : ''}`} <button
onClick={() => { className={`button ${lowerTitle === this.state.selectedMatch ? 'button--primary' : ''}`}
this.setState({selectedMatch: lowerTitle}); onClick={() => {
this.setStatList(); this.setState({ selectedMatch: lowerTitle });
}}>{title}</button> this.setStatList();
); }}
} >
{title}
</button>
);
}
render() { render() {
return ( return (
<div className="pubg__container"> <div className="pubg__container">
<div className="card" style={{maxWidth:'initial'}}> <div className="card" style={{ maxWidth: 'initial' }}>
<div className="card__header">PUBG Stats</div> <div className="card__header">PUBG Stats</div>
<div className="pubg__button-row"> <div className="pubg__button-row">
{this.buttonMatch('Solo')} {this.buttonMatch('Solo')}
{this.buttonMatch('Duo')} {this.buttonMatch('Duo')}
{this.buttonMatch('Squad')} {this.buttonMatch('Squad')}
</div> </div>
<div className="pubg__button-row"> <div className="pubg__button-row">
{this.buttonRegion('All')} {this.buttonRegion('All')}
{this.buttonRegion('Na')} {this.buttonRegion('Na')}
{this.buttonRegion('As')} {this.buttonRegion('As')}
{this.buttonRegion('Au')} {this.buttonRegion('Au')}
</div> </div>
<table className="pubg__table"> <table className="pubg__table">
<tbody> <tbody>
<tr> <tr>
<th></th> <th />
{this.state.players.map((val: any, index: number) => { {this.state.players.map((val: any, index: number) => {
return <th key={index}>{val.PlayerName}</th>; return <th key={index}>{val.PlayerName}</th>;
})} })}
</tr> </tr>
{this.insertRows()} {this.insertRows()}
</tbody> </tbody>
</table> </table>
</div>
</div> </div>
</div> );
); }
}
} }

48
client/app/pages/Soundboard/Soundboard.scss
View File

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

22
client/app/pages/Soundboard/Soundboard.tsx
View File

@@ -22,8 +22,8 @@ export class Soundboard extends React.Component<Props, State> {
private config: AxiosRequestConfig; private config: AxiosRequestConfig;
private soundListCache: any; private soundListCache: any;
constructor() { constructor(props: Props) {
super(); super(props);
(this.state = { (this.state = {
percentCompleted: 0, percentCompleted: 0,
uploaded: false, uploaded: false,
@@ -37,13 +37,11 @@ export class Soundboard extends React.Component<Props, State> {
this.config = { this.config = {
headers: { headers: {
'Content-Type': 'multipart/form-data', 'Content-Type': 'multipart/form-data',
'Authorization': `Bearer ${storage.getJWT()}` Authorization: `Bearer ${storage.getJWT()}`,
}, },
onUploadProgress: progressEvent => { onUploadProgress: progressEvent => {
this.setState({ this.setState({
percentCompleted: Math.round( percentCompleted: Math.round(progressEvent.loaded * 100 / progressEvent.total),
progressEvent.loaded * 100 / progressEvent.total,
),
}); });
}, },
}; };
@@ -123,16 +121,8 @@ export class Soundboard extends React.Component<Props, State> {
accept={'audio/*'} accept={'audio/*'}
> >
<div style={{ fontSize: '20px' }}>Drop file here to upload.</div> <div style={{ fontSize: '20px' }}>Drop file here to upload.</div>
{this.state.percentCompleted > 0 ? ( {this.state.percentCompleted > 0 ? <div>Uploading: {this.state.percentCompleted}</div> : ''}
<div>Uploading: {this.state.percentCompleted}</div> {this.state.uploaded ? <div style={{ color: 'green' }}>File uploded!</div> : ''}
) : (
''
)}
{this.state.uploaded ? (
<div style={{ color: 'green' }}>File uploded!</div>
) : (
''
)}
<div style={{ color: '#f95f59' }}>{this.state.uploadError}</div> <div style={{ color: '#f95f59' }}>{this.state.uploadError}</div>
</Dropzone> </Dropzone>
</div> </div>

11
client/app/pages/oauth/oauth.tsx
View File

@@ -1,9 +1,10 @@
import React from 'react'; import React from 'react';
import { get } from 'lodash';
import axios from 'axios'; import axios from 'axios';
import queryString from 'query-string';
import { RouteComponentProps } from 'react-router-dom';
import { storage } from '../../storage'; import { storage } from '../../storage';
interface Props {} interface Props extends RouteComponentProps<any> {}
interface State {} interface State {}
@@ -13,11 +14,11 @@ export class Oauth extends React.Component<Props, State> {
} }
componentDidMount() { componentDidMount() {
const code = get(this, 'props.location.query.code'); const params = queryString.parse(this.props.location.search);
if (code) { if (params['code']) {
// do stuff here // do stuff here
this.fetchOauth(code as string); this.fetchOauth(params['code']);
} }
} }

4
client/app/scss/index.scss
View File

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

111
client/app/scss/style.scss
View File

@@ -1,85 +1,86 @@
* { * {
box-sizing: border-box; box-sizing: border-box;
} }
a, .link { a,
text-decoration: none; .link {
color: $primaryBlue; text-decoration: none;
transition: color 0.1s linear; color: $primaryBlue;
cursor: pointer; transition: color 0.1s linear;
cursor: pointer;
&:hover {
color: $white; &:hover {
} color: $white;
}
} }
i { i {
margin-left: 5px; margin-left: 5px;
margin-right: 5px; margin-right: 5px;
} }
body { body {
background-color: $gray1; background-color: $gray1;
color: $white; color: $white;
padding-left: $navbarWidth; padding-left: $navbarWidth;
} }
.input { .input {
border-radius: 3px; border-radius: 3px;
border: 1px solid $lightGray; border: 1px solid $lightGray;
padding-left: 5px; padding-left: 5px;
padding-right: 5px; padding-right: 5px;
height: 30px; height: 30px;
background: $gray5; background: $gray5;
color: $white; color: $white;
} }
.button { .button {
border: none; border: none;
border-radius: 3px; border-radius: 3px;
color: $white; color: $white;
background: $lightGray; background: $lightGray;
padding: 10px; padding: 10px;
cursor: pointer; cursor: pointer;
&:hover { &:hover {
background: lighten($lightGray, 5%); background: lighten($lightGray, 5%);
} }
} }
.button--primary { .button--primary {
background: $primaryBlue; background: $primaryBlue;
&:hover { &:hover {
background: lighten($primaryBlue, 2%); background: lighten($primaryBlue, 2%);
} }
} }
.Card { .Card {
background-color: $gray2; background-color: $gray2;
border-radius: 5px; border-radius: 5px;
max-width: 800px; max-width: 800px;
padding: 10px; padding: 10px;
margin-bottom: 20px; margin-bottom: 20px;
border: 1px solid $gray3; border: 1px solid $gray3;
} }
.Card__header { .Card__header {
margin: -10px -10px 10px -10px; margin: -10px -10px 10px -10px;
display: flex; display: flex;
align-items: center; align-items: center;
padding-left: 10px; padding-left: 10px;
padding-right: 10px; padding-right: 10px;
height: 50px; height: 50px;
border-radius: 5px 5px 0 0; border-radius: 5px 5px 0 0;
font-size: 25px; font-size: 25px;
background-color: $gray3; background-color: $gray3;
} }
.column { .column {
flex: 1; flex: 1;
& + .column { & + .column {
margin-left: 10px; margin-left: 10px;
} }
} }

1
client/app/scss/variables.scss
View File

@@ -1,6 +1,5 @@
$navbarWidth: 200px; $navbarWidth: 200px;
// colors // colors
$primaryBlue: #7289da; $primaryBlue: #7289da;
$white: darken(white, 20%); $white: darken(white, 20%);

BIN
client/favicon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.1 MiB

12
client/index.html
View File

@@ -1,5 +1,9 @@
<html> <html>
<body>
<div id="app"></div> <head></head>
</body>
</html> <body>
<div id="app"></div>
</body>
</html>

12242
client/package-lock.json generated Normal file
View File

File diff suppressed because it is too large Load Diff

60
client/package.json
View File

@@ -1,11 +1,11 @@
{ {
"name": "todoapp", "name": "go-discord-bot",
"version": "1.0.0", "version": "1.0.0",
"description": "A seed for a simple react application", "description": "Client for go-discord-bot",
"scripts": { "scripts": {
"build": "NODE_ENV=prod webpack -p --progress --colors", "build": "NODE_ENV=prod webpack -p --progress --colors",
"dev": "webpack --watch", "dev": "webpack --progress --colors --watch --mode development",
"c9": "webpack-dev-server --host 0.0.0.0 --port 8080 --inline --hot --history-api-fallback" "c9": "webpack-dev-server --host 0.0.0.0 --port 8080 --inline --history-api-fallback --mode development"
}, },
"author": "Mitchell Gerber", "author": "Mitchell Gerber",
"license": "MIT", "license": "MIT",
@@ -13,40 +13,44 @@
"@types/jwt-decode": "^2.2.1", "@types/jwt-decode": "^2.2.1",
"@types/lodash": "^4.14.71", "@types/lodash": "^4.14.71",
"@types/node": "^9.4.6", "@types/node": "^9.4.6",
"@types/query-string": "^5.1.0",
"@types/react": "^16.0.0", "@types/react": "^16.0.0",
"@types/react-dom": "^15.5.1", "@types/react-dom": "^16.0.4",
"@types/react-dropzone": "^3.13.1", "@types/react-dropzone": "^4.2.0",
"@types/react-router": "3.0.11", "@types/react-router-dom": "^4.2.6",
"autoprefixer": "^6.6.0", "autoprefixer": "^8.2.0",
"axios": "^0.15.3", "axios": "^0.18.0",
"babel-core": "^6.21.0", "babel-core": "^6.21.0",
"babel-loader": "^6.2.10", "babel-loader": "^7.1.4",
"babel-plugin-add-module-exports": "^0.2.1", "babel-plugin-add-module-exports": "^0.2.1",
"babel-polyfill": "^6.26.0", "babel-polyfill": "^6.26.0",
"babel-preset-es2015": "^6.18.0", "babel-preset-es2015": "^6.18.0",
"babel-preset-react": "^6.16.0", "babel-preset-react": "^6.16.0",
"babel-preset-stage-0": "^6.16.0", "babel-preset-stage-0": "^6.16.0",
"clean-webpack-plugin": "^0.1.14", "clean-webpack-plugin": "^0.1.14",
"css-loader": "^0.26.1", "css-loader": "^0.28.11",
"eslint": "^3.12.2", "extract-text-webpack-plugin": "^4.0.0-beta.0",
"eslint-plugin-react": "^6.8.0", "favicons-webpack-plugin": "0.0.9",
"extract-text-webpack-plugin": "2.0.0-rc.1", "file-loader": "^1.1.11",
"file-loader": "^0.10.0", "font-awesome": "^4.7.0",
"html-webpack-plugin": "^2.24.1", "html-webpack-plugin": "^3.2.0",
"jwt-decode": "^2.2.0", "jwt-decode": "^2.2.0",
"lodash": "^4.17.4", "lodash": "^4.17.4",
"node-sass": "^4.5.3", "node-sass": "^4.5.3",
"postcss-loader": "^1.2.1", "normalize.css": "^8.0.0",
"react": "15.6.1", "postcss-loader": "^2.1.3",
"react-dom": "^15.4.1", "query-string": "^6.0.0",
"react-dropzone": "^3.9.2", "react": "^16.3.1",
"react-router": "^3.0.0", "react-dom": "^16.3.1",
"sass-loader": "^4.1.1", "react-dropzone": "^4.2.9",
"style-loader": "^0.13.1", "react-router-dom": "^4.2.2",
"ts-loader": "^2.3.2", "sass-loader": "^6.0.7",
"typescript": "^2.4.2", "style-loader": "^0.20.3",
"url-loader": "^0.5.7", "ts-loader": "^4.2.0",
"webpack": "2.3.2", "typescript": "^2.8.1",
"webpack-dev-server": "2.2.0" "url-loader": "^1.0.1",
"webpack": "^4.5.0",
"webpack-cli": "^2.0.14",
"webpack-dev-server": "^3.1.3"
} }
} }

77
client/webpack.config.js
View File

@@ -1,16 +1,18 @@
const CleanWebpackPlugin = require('clean-webpack-plugin');
const ExtractTextPlugin = require('extract-text-webpack-plugin'); const ExtractTextPlugin = require('extract-text-webpack-plugin');
const HtmlWebpackPlugin = require('html-webpack-plugin'); const HtmlWebpackPlugin = require('html-webpack-plugin');
const FaviconsWebpackPlugin = require('favicons-webpack-plugin');
const path = require('path'); const path = require('path');
const webpack = require('webpack'); const webpack = require('webpack');
module.exports = { module.exports = {
entry: { entry: {
app: './app/app.tsx', app: ['babel-polyfill', './app/app.tsx'],
vendor: ['react', 'react-dom'],
}, },
output: { output: {
path: path.resolve(__dirname, '../dist'), path: path.resolve(__dirname, '../dist/static'),
filename: './static/[name].[hash].js', filename: '[name].[hash].js',
publicPath: 'static',
}, },
resolve: { resolve: {
extensions: ['.ts', '.tsx', '.js'], extensions: ['.ts', '.tsx', '.js'],
@@ -19,56 +21,53 @@ module.exports = {
rules: [ rules: [
{ {
test: /\.(js|jsx)$/, test: /\.(js|jsx)$/,
loaders: ['babel-loader'], use: ['babel-loader'],
}, },
{ {
test: /\.ts(x)?$/, test: /\.ts(x)?$/,
loaders: ['babel-loader', 'ts-loader'], use: ['babel-loader', 'ts-loader'],
}, },
{ {
test: /\.scss$/, test: /\.scss$/,
loader: ExtractTextPlugin.extract({ use: ExtractTextPlugin.extract({
fallbackLoader: 'style-loader', fallback: 'style-loader',
loader: 'css-loader!postcss-loader!sass-loader', use: ['css-loader', 'postcss-loader', 'sass-loader'],
}), }),
}, },
{ {
test: /\.css$/, test: /\.css$/,
loader: ExtractTextPlugin.extract({ use: ExtractTextPlugin.extract({
fallbackLoader: 'style-loader', fallback: 'style-loader',
loader: 'css-loader', use: ['css-loader'],
}), }),
}, },
{ {
test: /\.svg$/, test: /\.woff2?$|\.ttf$|\.eot$|\.svg$/,
loader: use: [
'url-loader?limit=65000&mimetype=image/svg+xml&name=static/[name].[ext]&publicPath=../', {
}, loader: 'file-loader',
{ options: {
test: /\.woff$/, name: 'static/[name].[hash].[ext]',
loader: publicPath: './.',
'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=../',
}, },
], ],
}, },
optimization: {
occurrenceOrder: true,
splitChunks: {
chunks: 'all',
},
},
plugins: [ plugins: [
new CleanWebpackPlugin(['../dist/static'], {
verbose: true,
allowExternal: true,
}),
new ExtractTextPlugin({ new ExtractTextPlugin({
filename: '/static/[name].[hash].css', filename: '[name].[hash].css',
disable: false, disable: false,
allChunks: true, allChunks: true,
}), }),
@@ -76,14 +75,12 @@ module.exports = {
filename: 'index.html', filename: 'index.html',
template: './index.html', template: './index.html',
}), }),
new webpack.optimize.CommonsChunkPlugin({
name: ['vendor', 'manifest'],
minChunks: 'Infinity',
}),
new webpack.DefinePlugin({ new webpack.DefinePlugin({
'process.env': { 'process.env': {
NODE_ENV: JSON.stringify(process.env.NODE_ENV), NODE_ENV: JSON.stringify(process.env.NODE_ENV),
}, },
}), }),
new webpack.HotModuleReplacementPlugin(),
new FaviconsWebpackPlugin('./favicon.png'),
], ],
}; };

5063
client/yarn.lock
View File

File diff suppressed because it is too large Load Diff

26
config.template.json
View File

@@ -1,22 +1,18 @@
{ {
"token": "", "token": "",
"client_id": "", "client_id": "",
"client_secret": "", "client_secret": "",
"redirect_uri": "", "redirect_uri": "",
"bot_prefix": "#", "bot_prefix": "#",
"admin_emails": ["mail@example.com"], "admin_emails": ["mail@example.com"],
"jwt_key": "", "jwt_key": "",
"server_addr": "0.0.0.0:80", "server_addr": "0.0.0.0:80",
"sounds_path": "./sounds/", "logging": true,
"clips_path": "./clips/",
"pubg": { "sounds_path": "./sounds/",
"api_key": "", "clips_path": "./clips/"
"enabled": false,
"players": ["player1"]
}
} }

2
readme.md
View File

@@ -34,7 +34,7 @@ Sounds are stored in the `sounds` directory. You may copy files directly to this
### Dependencies ### Dependencies
- Go - Go
- Yarn (or npm - makefile will need to be adjusted) - node/npm
- make - make
### Compiling ### Compiling

6
server/bothandlers/gif.go
View File

@@ -1,6 +1,10 @@
package bothandlers package bothandlers
/***** DEPRECATED *****/ /**
* DEPRECATED
* this was used to fetch a giphy image
* no longer used
*/
import ( import (
"io/ioutil" "io/ioutil"

6
server/config/config.go
View File

@@ -31,11 +31,7 @@ type configFile struct {
ServerAddr string `json:"server_addr"` ServerAddr string `json:"server_addr"`
JWTKey string `json:"jwt_key"` JWTKey string `json:"jwt_key"`
Pubg struct { Logging bool `json:"logging"`
Enabled bool `json:"enabled"`
APIKey string `json:"api_key"`
Players []string `json:"players"`
} `json:"pubg"`
} }
type configFlags struct { type configFlags struct {

5
server/webserver/pubg/pubg.go
View File

@@ -1,5 +1,10 @@
package pubg package pubg
/**
* DEPRECATED
* I no longer have a use for this so I'm ripping it out
*/
import ( import (
"sync" "sync"
"time" "time"

9
server/webserver/server.go
View File

@@ -5,7 +5,6 @@ import (
"github.com/mgerb/go-discord-bot/server/config" "github.com/mgerb/go-discord-bot/server/config"
"github.com/mgerb/go-discord-bot/server/webserver/handlers" "github.com/mgerb/go-discord-bot/server/webserver/handlers"
"github.com/mgerb/go-discord-bot/server/webserver/middleware" "github.com/mgerb/go-discord-bot/server/webserver/middleware"
"github.com/mgerb/go-discord-bot/server/webserver/pubg"
) )
func getRouter() *gin.Engine { func getRouter() *gin.Engine {
@@ -17,11 +16,10 @@ func getRouter() *gin.Engine {
router.Static("/public/clips", config.Config.ClipsPath) router.Static("/public/clips", config.Config.ClipsPath)
router.NoRoute(func(c *gin.Context) { router.NoRoute(func(c *gin.Context) {
c.File("./dist/index.html") c.File("./dist/static/index.html")
}) })
api := router.Group("/api") api := router.Group("/api")
api.GET("/stats/pubg", pubg.Handler)
api.GET("/ytdownloader", handlers.Downloader) api.GET("/ytdownloader", handlers.Downloader)
api.GET("/soundlist", handlers.SoundList) api.GET("/soundlist", handlers.SoundList)
api.GET("/cliplist", handlers.ClipList) api.GET("/cliplist", handlers.ClipList)
@@ -37,11 +35,6 @@ func getRouter() *gin.Engine {
// Start - // Start -
func Start() { func Start() {
// start gathering pubg data from the api
if config.Config.Pubg.Enabled {
pubg.Start(config.Config.Pubg.APIKey, config.Config.Pubg.Players)
}
router := getRouter() router := getRouter()
router.Run(config.Config.ServerAddr) router.Run(config.Config.ServerAddr)
} }