diff --git a/src/server/admin/api/getHandler.js b/src/server/admin/api/getHandler.js index b8d238b..0741ea1 100644 --- a/src/server/admin/api/getHandler.js +++ b/src/server/admin/api/getHandler.js @@ -88,6 +88,16 @@ class GETHandler { resolve( this.settings.currency ); } else if ( call === 'getAdminAccounts' ) { db.getData( 'admin' ).then( data => { + if ( data[ 0 ] ) { + resolve( { 'data': data, 'status': 'ok' } ); + } else { + resolve( { 'data': {}, 'status': 'empty' } ); + } + } ).catch( err => { + reject( { 'code': 500, 'message': 'ERR_DB: ' + err } ); + } ); + } else if ( call === 'getRootAccountDetails' ) { + db.getJSONData( 'rootAccount' ).then( data => { resolve( data ); } ).catch( err => { reject( { 'code': 500, 'message': 'ERR_DB: ' + err } ); diff --git a/src/server/admin/pwdmanager.js b/src/server/admin/pwdmanager.js index 10cbf61..8193c89 100644 --- a/src/server/admin/pwdmanager.js +++ b/src/server/admin/pwdmanager.js @@ -20,19 +20,27 @@ const db = require( '../backend/db/db.js' ); module.exports.checkpassword = ( username, password ) => { return new Promise( resolve => { - db.getDataSimple( 'admin', 'email', username ).then( data => { - if ( data ) { - if ( data[ 0 ] ) { - bcrypt.compare( password, data[ 0 ].pass ).then( res => { - resolve( { 'status': res, 'twoFA': data[ 0 ].two_fa } ); - } ); + if ( username === 'root' ) { + db.getJSONData( 'rootAccount' ).then( account => { + bcrypt.compare( password, account.pass ).then( res => { + resolve( { 'status': res, 'twoFA': true } ); + } ); + } ); + } else { + db.getDataSimple( 'admin', 'email', username ).then( data => { + if ( data ) { + if ( data[ 0 ] ) { + bcrypt.compare( password, data[ 0 ].pass ).then( res => { + resolve( { 'status': res, 'twoFA': data[ 0 ].two_fa } ); + } ); + } else { + resolve( false ); + } } else { resolve( false ); } - } else { - resolve( false ); - } - } ); + } ); + } } ); }; diff --git a/src/server/backend/db/data/rootAccount.json b/src/server/backend/db/data/rootAccount.json new file mode 100644 index 0000000..e69de29 diff --git a/src/server/ui/home/templates/default/index.html b/src/server/ui/home/templates/default/index.html index a8d61db..66181ec 100644 --- a/src/server/ui/home/templates/default/index.html +++ b/src/server/ui/home/templates/default/index.html @@ -3,11 +3,23 @@ - {{ pageName }} + + + + + + {{ pageName }} :: Home -
- -
+ + +

Welcome to {{ pageName }}!

+

{{ description }}

\ No newline at end of file diff --git a/src/server/ui/home/templates/default/startPage.config.json b/src/server/ui/home/templates/default/startPage.config.json new file mode 100644 index 0000000..e69de29 diff --git a/src/server/ui/home/templates/default/startPage.json b/src/server/ui/home/templates/default/startPage.json new file mode 100644 index 0000000..e69de29 diff --git a/src/server/ui/home/templates/modern/index.html b/src/server/ui/home/templates/modern/index.html new file mode 100644 index 0000000..66181ec --- /dev/null +++ b/src/server/ui/home/templates/modern/index.html @@ -0,0 +1,25 @@ + + + + + + + + + + + {{ pageName }} :: Home + + + + +

Welcome to {{ pageName }}!

+

{{ description }}

+ + \ No newline at end of file diff --git a/src/server/ui/home/templates/template.html b/src/server/ui/home/templates/template.html new file mode 100644 index 0000000..66181ec --- /dev/null +++ b/src/server/ui/home/templates/template.html @@ -0,0 +1,25 @@ + + + + + + + + + + + {{ pageName }} :: Home + + + + +

Welcome to {{ pageName }}!

+

{{ description }}

+ + \ No newline at end of file