(WORKING) Database interaction working and converted all requires to the ES6 import syntax
This commit is contained in:
5
index.js
5
index.js
@@ -1 +1,6 @@
|
||||
require('regenerator-runtime/runtime');
|
||||
require('babel-register')({
|
||||
presets: [ 'env' ]
|
||||
});
|
||||
|
||||
require('./src/index');
|
||||
|
||||
1216
package-lock.json
generated
1216
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -9,10 +9,14 @@
|
||||
"author": "",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"babel": "^6.23.0",
|
||||
"babel-preset-env": "^1.7.0",
|
||||
"babel-register": "^6.26.0",
|
||||
"body-parser": "^1.18.3",
|
||||
"colors": "^1.3.2",
|
||||
"discord.js": "^11.4.2",
|
||||
"express": "^4.16.4",
|
||||
"regenerator-runtime": "^0.12.1",
|
||||
"request": "^2.88.0",
|
||||
"sequelize": "^4.39.1",
|
||||
"sqlite3": "^4.0.2"
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
const Logger = require('./logger');
|
||||
const fs = require('fs');
|
||||
import fs from 'fs';
|
||||
|
||||
module.exports = class Config {
|
||||
import {Logger} from './logger';
|
||||
|
||||
export class Config {
|
||||
constructor(path) {
|
||||
this.file = './resources/config/config.json';
|
||||
this.path = [ './resources/', './resources/config' ]
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
const Sequelize = require('sequelize');
|
||||
import Sequelize from 'sequelize';
|
||||
|
||||
const Logger = require('../logger');
|
||||
import {Logger} from '../logger';
|
||||
|
||||
let Connection;
|
||||
let Server;
|
||||
|
||||
module.exports = class Database {
|
||||
export class BaseDatabase {
|
||||
static get Connection() { return Connection; }
|
||||
static get Server() { return Server; }
|
||||
|
||||
|
||||
@@ -1,28 +1,24 @@
|
||||
const BaseDatabase = require('./basedatabase');
|
||||
import Sequelize from 'sequelize';
|
||||
|
||||
class Database extends BaseDatabase {
|
||||
import {BaseDatabase} from './baseDatabase';
|
||||
import {Logger} from '../logger';
|
||||
|
||||
export class Database extends BaseDatabase {
|
||||
static async exec(query) {
|
||||
let connection = BaseDatabase.Connection;
|
||||
let res;
|
||||
|
||||
let promise = new Promise((resolve, reject) => {
|
||||
return new Promise((resolve, reject) => {
|
||||
connection
|
||||
.query(query)
|
||||
.then(result => {
|
||||
Logger.database(JSON.stringify(res, null, 4));
|
||||
res = result[0][0].result;
|
||||
resolve();
|
||||
resolve(result[0][0].result);
|
||||
})
|
||||
.catch(err => {
|
||||
Logger.error('An error occured while querying a database: ' + err);
|
||||
reject()
|
||||
});
|
||||
});
|
||||
|
||||
await promise;
|
||||
return res;
|
||||
}
|
||||
}
|
||||
|
||||
Database.Server = require('./server').ServerTools;
|
||||
module.exports = Database;
|
||||
Database.server = require('./server').ServerTools;
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
const BaseDatabase = require('./basedatabase');
|
||||
import Sequelize from 'sequelize';
|
||||
|
||||
module.exports.ServerTools = class ServerTools extends BaseDatabase {
|
||||
import {BaseDatabase} from './baseDatabase';
|
||||
import {Logger} from '../logger';
|
||||
|
||||
export class ServerTools extends BaseDatabase {
|
||||
static lolxd() {
|
||||
console.log('lolcx')
|
||||
}
|
||||
|
||||
10
src/index.js
10
src/index.js
@@ -1,8 +1,8 @@
|
||||
const Discord = require('discord.js');
|
||||
import Discord from 'discord.js';
|
||||
|
||||
const Logger = require('./logger');
|
||||
const Config = require('./config');
|
||||
const Database = require('./database/database');
|
||||
import {Logger} from './logger';
|
||||
import {Config} from './config';
|
||||
import {Database} from './database/database';
|
||||
|
||||
let client;
|
||||
|
||||
@@ -15,7 +15,7 @@ async function init() {
|
||||
config.load();
|
||||
|
||||
await Database.init();
|
||||
Database.Server.lolxd();
|
||||
Database.server.lolxd();
|
||||
|
||||
client = new Discord.Client();
|
||||
}
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
const colours = require('colors/safe');
|
||||
const fs = require('fs');
|
||||
import colours from 'colors/safe';
|
||||
import fs from 'fs';
|
||||
|
||||
let LogLevel = 1;
|
||||
let Dialect = 'SQLITE';
|
||||
let logPath = 'logs.log';
|
||||
|
||||
module.exports = class Logger {
|
||||
export class Logger {
|
||||
static init(path) {
|
||||
if (path) logPath = path;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user