diff --git a/.env b/.env new file mode 100644 index 0000000..0201721 --- /dev/null +++ b/.env @@ -0,0 +1,10 @@ +APP_NAME=BezDziennik +APP_ENV=local +APP_URL=https://kill3rs4.usermd.net + +DB_HOST=mysql49.mydevil.net +DB_USERNAME=m1344_dziennik +DB_PASSWORD=K8T2nB>_vgX6qvw8(zBuw4B318cmw8 +DB_DATABASE=m1344_dziennik +DB_CONNECTION=mysql + diff --git a/.env.local b/.env.local new file mode 100644 index 0000000..0201721 --- /dev/null +++ b/.env.local @@ -0,0 +1,10 @@ +APP_NAME=BezDziennik +APP_ENV=local +APP_URL=https://kill3rs4.usermd.net + +DB_HOST=mysql49.mydevil.net +DB_USERNAME=m1344_dziennik +DB_PASSWORD=K8T2nB>_vgX6qvw8(zBuw4B318cmw8 +DB_DATABASE=m1344_dziennik +DB_CONNECTION=mysql + diff --git a/app.js b/app.js index 17baa64..352260c 100755 --- a/app.js +++ b/app.js @@ -1,22 +1,27 @@ var mysql = require('mysql'); +var config = require('./config.js'); var express = require('express'); var session = require('express-session'); var bodyParser = require('body-parser'); var path = require('path'); var connection = mysql.createConnection({ - host : 'mysql49.mydevil.net', - user : 'm1344_dziennik', - password : 'K8T2nB>_vgX6qvw8(zBuw4B318cmw8', - database : 'm1344_dziennik' + host : config.db.host, + user : config.db.username, + password : config.db.password, + database : config.db.dbname }); + var app = express(); app.use(session({ secret: 'secret', resave: true, saveUninitialized: true })); + + + app.use(bodyParser.urlencoded({extended : true})); app.use(bodyParser.json()); @@ -29,7 +34,7 @@ app.post('/auth', function(request, response) { var active = request.body.active; var password = request.body.password; if (username && password) { - connection.query('SELECT * FROM accounts WHERE username = ? AND password = ? AND active != 0', [username, password], function(error, results, fields) { + connection.query('SELECT * FROM accounts WHERE login = ? AND password = ? AND active != 0', [username, password], function(error, results, fields) { if (results.length > 0) { request.session.loggedin = true; request.session.username = username; diff --git a/config.js b/config.js new file mode 100755 index 0000000..50d6b8d --- /dev/null +++ b/config.js @@ -0,0 +1,16 @@ +var config = {}; +config.db = {}; + +config.db.type = 'mysql'; +config.db.charset = 'utf8'; + +config.db.username = 'm1344_dziennik'; +config.db.password = 'Julian2020!'; +config.db.host = 'mysql49.mydevil.net'; +config.db.dbname = 'm1344_dziennik'; // DB name + +config.db.users_tbl = 'users'; // table name +// config.db.another_tbl = 'next_table'; // ... + +// export +module.exports = config; diff --git a/public/home.html b/public/home.html index 0ee6572..44a9021 100644 --- a/public/home.html +++ b/public/home.html @@ -9,7 +9,7 @@
- + - alert(""); +