gitignore and change to database

.gitignore

+server/database/config.json
+server/node_modules/

database_setup/createDatabase.sh

@@ -240,7 +240,7 @@ function createMysqlDbUser()
 
     SQL7="CREATE TABLE users(
     		id bigint unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY,
-    		discord_id CHAR(30) NOT NULL,
+    		discord_id int,
 		house_id bigint unsigned,
 		leadership smallint unsigned,
 		FOREIGN KEY(house_id) REFERENCES houses(id));"

server/database/config.json

-{
-    "host": "localhost",
-    "user": "root",
-    "password": "goodyear",
-    "database": "conquerors_blade_db",
-    "connectionLimit": 100
-}
\ No newline at end of file

server/models/users.js

@@ -2,4 +2,8 @@ const db = require('../database/database');
 
 const users = {};
 
+users.getUser = async (context, next) => {
+
+};
+
 module.exports = users;
\ No newline at end of file

server/node_modules/@koa/router/LICENSE

-The MIT License (MIT)
-
-Copyright (c) 2015 Alexander C. Mingoia
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

server/node_modules/@koa/router/README.md

-# @koa/router
-
-Router middleware for [koa](https://github.com/koajs/koa)
-
-[![NPM version](https://img.shields.io/npm/v/@koa/router.svg?style=flat)](https://npmjs.org/package/@koa/router) 
-[![NPM Downloads](https://img.shields.io/npm/dm/@koa/router.svg?style=flat)](https://npmjs.org/package/@koa/router) 
-[![Node.js Version](https://img.shields.io/node/v/@koa/router.svg?style=flat)](http://nodejs.org/download/)
-[![Build Status](https://img.shields.io/travis/koajs/router.svg?style=flat)](http://travis-ci.org/koajs/router)
-[![gitter](https://img.shields.io/gitter/room/koajs/koa.svg?style=flat)](https://gitter.im/koajs/koa)
-
-* Express-style routing (`app.get`, `app.put`, `app.post`, etc.)
-* Named URL parameters
-* Named routes with URL generation
-* Responds to `OPTIONS` requests with allowed methods
-* Support for `405 Method Not Allowed` and `501 Not Implemented`
-* Multiple route middleware
-* Multiple and nestable routers
-* `async/await` support
-
-## Migrating to 7 / Koa 2
-
-- The API has changed to match the new promise-based middleware
-  signature of koa 2. See the
-  [koa 2.x readme](https://github.com/koajs/koa/tree/2.0.0-alpha.3) for more
-  information.
-- Middleware is now always run in the order declared by `.use()` (or `.get()`,
-  etc.), which matches Express 4 API.
-
-## Installation
-
-Install using [npm](https://www.npmjs.org/):
-
-```sh
-npm install @koa/router
-```
-
-## [API Reference](./API.md)
-
-## Contributing
-
-Please submit all issues and pull requests to the [koajs/router](http://github.com/koajs/router) repository!
-
-## Tests
-
-Run tests using `npm test`.
-
-## Support
-
-If you have any problem or suggestion please open an issue [here](https://github.com/koajs/router/issues).
-
-## Call for Maintainers
-
-This module is forked from the original [koa-router](https://github.com/ZijianHe/koa-router) due to its lack of activity. `koa-router` is the most widely used router module in the Koa community and we need maintainers. If you're interested in fixing bugs or implementing new features feel free to open a pull request. We'll be adding active contributors as collaborators.
-
-Thanks to the original authors @alexmingoia and the original team for their great work.
-

server/node_modules/@koa/router/history.md

-
-8.0.0 / 2019-06-16
-==================
-
-**others**
-  * [[`b5dd5e8`](http://github.com/koajs/koa-router/commit/b5dd5e8f00e841b7061a62ab6228cbe96a999470)] - chore: rename to @koa/router (dead-horse <<dead_horse@qq.com>>)
-
--------------
-
-# Changelogs inherit from koa-router.
-
-## 7.4.0
-
-- Fix router.url() for multiple nested routers [#407](https://github.com/alexmingoia/koa-router/pull/407)
-- `layer.name` added to `ctx` at `ctx.routerName` during routing [#412](https://github.com/alexmingoia/koa-router/pull/412)
-- Router.use() was erroneously settings `(.*)` as a prefix to all routers nested with .use that did not pass an explicit prefix string as the first argument. This resulted in routes being matched that should not have been, included the running of multiple route handlers in error. [#369](https://github.com/alexmingoia/koa-router/issues/369) and [#410](https://github.com/alexmingoia/koa-router/issues/410) include information on this issue.
-
-## 7.3.0
-
-- Router#url() now accepts query parameters to add to generated urls [#396](https://github.com/alexmingoia/koa-router/pull/396)
-
-## 7.2.1
-
-- Respond to CORS preflights with 200, 0 length body [#359](https://github.com/alexmingoia/koa-router/issues/359)
-
-## 7.2.0
-
-- Fix a bug in Router#url and append Router object to ctx. [#350](https://github.com/alexmingoia/koa-router/pull/350)
-- Adds `_matchedRouteName` to context [#337](https://github.com/alexmingoia/koa-router/pull/337)
-- Respond to CORS preflights with 200, 0 length body [#359](https://github.com/alexmingoia/koa-router/issues/359)
-
-## 7.1.1
-
-- Fix bug where param handlers were run out of order [#282](https://github.com/alexmingoia/koa-router/pull/282)
-
-## 7.1.0
-
-- Backports: merge 5.4 work into the 7.x upstream. See 5.4.0 updates for more details.
-
-## 7.0.1
-
-- Fix: allowedMethods should be ctx.method not this.method [#215](https://github.com/alexmingoia/koa-router/pull/215)
-
-## 7.0.0
-
-- The API has changed to match the new promise-based middleware
-  signature of koa 2. See the
-  [koa 2.x readme](https://github.com/koajs/koa/tree/2.0.0-alpha.3) for more
-  information.
-- Middleware is now always run in the order declared by `.use()` (or `.get()`,
-  etc.), which matches Express 4 API.
-
-## 5.4.0
-
-- Expose matched route at `ctx._matchedRoute`.
-
-## 5.3.0
-
-- Register multiple routes with array of paths [#203](https://github.com/alexmingoia/koa-router/issue/143).
-- Improved router.url() [#143](https://github.com/alexmingoia/koa-router/pull/143)
-- Adds support for named routes and regular expressions
-  [#152](https://github.com/alexmingoia/koa-router/pull/152)
-- Add support for custom throw functions for 405 and 501 responses [#206](https://github.com/alexmingoia/koa-router/pull/206)
-
-## 5.2.3
-
-- Fix for middleware running twice when nesting routes [#184](https://github.com/alexmingoia/koa-router/issues/184)
-
-## 5.2.2
-
-- Register routes without params before those with params [#183](https://github.com/alexmingoia/koa-router/pull/183)
-- Fix for allowed methods [#182](https://github.com/alexmingoia/koa-router/issues/182)
-
-## 5.2.0
-
-- Add support for async/await. Resolves [#130](https://github.com/alexmingoia/koa-router/issues/130).
-- Add support for array of paths by Router#use(). Resolves [#175](https://github.com/alexmingoia/koa-router/issues/175).
-- Inherit param middleware when nesting routers. Fixes [#170](https://github.com/alexmingoia/koa-router/issues/170).
-- Default router middleware without path to root. Fixes [#161](https://github.com/alexmingoia/koa-router/issues/161), [#155](https://github.com/alexmingoia/koa-router/issues/155), [#156](https://github.com/alexmingoia/koa-router/issues/156).
-- Run nested router middleware after parent's. Fixes [#156](https://github.com/alexmingoia/koa-router/issues/156).
-- Remove dependency on koa-compose.
-
-## 5.1.1
-
-- Match routes in order they were defined. Fixes #131.
-
-## 5.1.0
-
-- Support mounting router middleware at a given path.
-
-## 5.0.1
-
-- Fix bug with missing parameters when nesting routers.
-
-## 5.0.0
-
-- Remove confusing API for extending koa app with router methods. Router#use()
-  does not have the same behavior as app#use().
-- Add support for nesting routes.
-- Remove support for regular expression routes to achieve nestable routers and
-  enable future trie-based routing optimizations.
-
-## 4.3.2
-
-- Do not send 405 if route matched but status is 404. Fixes #112, closes #114.
-
-## 4.3.1
-
-- Do not run middleware if not yielded to by previous middleware. Fixes #115.
-
-## 4.3.0
-
-- Add support for router prefixes.
-- Add MIT license.
-
-## 4.2.0
-
-- Fixed issue with router middleware being applied even if no route was
-matched.
-- Router.url - new static method to generate url from url pattern and data
-
-## 4.1.0
-
-Private API changed to separate context parameter decoration from route
-matching. `Router#match` and `Route#match` are now pure functions that return
-an array of routes that match the URL path.
-
-For modules using this private API that need to determine if a method and path
-match a route, `route.methods` must be checked against the routes returned from
-`router.match()`:
-
-```javascript
-var matchedRoute = router.match(path).filter(function (route) {
-  return ~route.methods.indexOf(method);
-}).shift();
-```
-
-## 4.0.0
-
-405, 501, and OPTIONS response handling was moved into separate middleware
-`router.allowedMethods()`. This resolves incorrect 501 or 405 responses when
-using multiple routers.
-
-### Breaking changes
-
-4.x is mostly backwards compatible with 3.x, except for the following:
-
-- Instantiating a router with `new` and `app` returns the router instance,
-  whereas 3.x returns the router middleware. When creating a router in 4.x, the
-  only time router middleware is returned is when creating using the
-  `Router(app)` signature (with `app` and without `new`).

server/node_modules/@koa/router/lib/API_tpl.hbs

-
-## API Reference
-{{#module name="koa-router"~}}
-  {{>body~}}
-  {{>member-index~}}
-  {{>members~}}
-{{/module~}}

server/node_modules/@koa/router/lib/layer.js

-var debug = require('debug')('koa-router');
-var pathToRegExp = require('path-to-regexp');
-var uri = require('urijs');
-
-module.exports = Layer;
-
-/**
- * Initialize a new routing Layer with given `method`, `path`, and `middleware`.
- *
- * @param {String|RegExp} path Path string or regular expression.
- * @param {Array} methods Array of HTTP verbs.
- * @param {Array} middleware Layer callback/middleware or series of.
- * @param {Object=} opts
- * @param {String=} opts.name route name
- * @param {String=} opts.sensitive case sensitive (default: false)
- * @param {String=} opts.strict require the trailing slash (default: false)
- * @returns {Layer}
- * @private
- */
-
-function Layer(path, methods, middleware, opts) {
-  this.opts = opts || {};
-  this.name = this.opts.name || null;
-  this.methods = [];
-  this.paramNames = [];
-  this.stack = Array.isArray(middleware) ? middleware : [middleware];
-
-  for(var i = 0; i < methods.length; i++) {
-    var l = this.methods.push(methods[i].toUpperCase());
-    if (this.methods[l-1] === 'GET') {
-       this.methods.unshift('HEAD');
-    }
-  }
-
-  // ensure middleware is a function
-  for (var i = 0; i < this.stack.length; i++) {
-    var fn = this.stack[i];
-    var type = (typeof fn);
-    if (type !== 'function') {
-      throw new Error(
-        methods.toString() + " `" + (this.opts.name || path) +"`: `middleware` "
-        + "must be a function, not `" + type + "`"
-      );
-    }
-  }
-
-  this.path = path;
-  this.regexp = pathToRegExp(path, this.paramNames, this.opts);
-
-  debug('defined route %s %s', this.methods, this.opts.prefix + this.path);
-};
-
-/**
- * Returns whether request `path` matches route.
- *
- * @param {String} path
- * @returns {Boolean}
- * @private
- */
-
-Layer.prototype.match = function (path) {
-  return this.regexp.test(path);
-};
-
-/**
- * Returns map of URL parameters for given `path` and `paramNames`.
- *
- * @param {String} path
- * @param {Array.<String>} captures
- * @param {Object=} existingParams
- * @returns {Object}
- * @private
- */
-
-Layer.prototype.params = function (path, captures, existingParams) {
-  var params = existingParams || {};
-
-  for (var len = captures.length, i=0; i<len; i++) {
-    if (this.paramNames[i]) {
-      var c = captures[i];
-      params[this.paramNames[i].name] = c ? safeDecodeURIComponent(c) : c;
-    }
-  }
-
-  return params;
-};
-
-/**
- * Returns array of regexp url path captures.
- *
- * @param {String} path