index

intuition-dev · Jun 5, 2019 · 763d739 · 763d739
1 parent dca0c93
commit 763d739
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 85 deletions.
diff --git a/src/index.js b/src/index.js
@@ -17,7 +17,6 @@ mainApp.use(bodyParser.urlencoded({ extended: true }));
 const emailJs = new EmailJs_1.EmailJs();
 try {
     if (fs.existsSync(pathToDb)) {
-        mainApp.use('/setup', Serv_1.ExpressRPC.serveStatic('setup'));
         adbDB.createNewADBwSchema('ADB.sqlite');
         const editorRoutes = new editor_1.EditorRoutes();
         mainApp.use('/api/editors', editorRoutes.routes(adbDB));

diff --git a/src/index.ts b/src/index.ts
@@ -27,7 +27,6 @@ try {
       /*
       * E D I T O R S
       */
-      mainApp.use('/setup', ExpressRPC.serveStatic('setup'));
       adbDB.createNewADBwSchema('ADB.sqlite')
       const editorRoutes = new EditorRoutes();
       mainApp.use('/api/editors', editorRoutes.routes(adbDB));

diff --git a/src/lib/ADB.js b/src/lib/ADB.js
@@ -105,7 +105,9 @@ class ADB {
         return vcode;
     }
     resetPassword(email, vcode, password) {
-        return this.db.run(`UPDATE admin SET password='${password}' WHERE email='${email}' AND vcode='${vcode}'`)
+        var salt = bcrypt.genSaltSync(10);
+        let hashPass = bcrypt.hashSync(password, salt);
+        return this.db.run(`UPDATE admin SET password='${hashPass}' WHERE email='${email}' AND vcode='${vcode}'`)
             .then(res => {
             if (res.changes > 0) {
                 return true;

diff --git a/src/www/assets/webAdmin/WebAdmin.min.js b/src/www/assets/webAdmin/WebAdmin.min.js
diff --git a/src/www/edit/index.html b/src/www/edit/index.html
@@ -1 +1 @@
-<!doctype html><html><head><script>var _start=Date.now()</script><title></title><meta charset='utf-8'><meta content='width=device-width,initial-scale=1' name='viewport'><script src='//cdn.jsdelivr.net/npm/[email protected]/dist/depp.min.js'></script><script src='//cdn.jsdelivr.net/npm/[email protected]/riot.min.js'></script><style>.delayShowing{opacity:0}.blur{-webkit-filter:blur(2px);filter:blur(2px)}</style><script src='//unpkg.com/[email protected]/toolBelt.min.js'></script><script>window.ROOT='/'</script><script>window.apiProtocol='http',window.apiHost='0.0.0.0',window.apiPort='9081',window.appMount='http://0.0.0.0:9082',window.siteName='Metabake'</script><link href='/editors/assets/css/spectreTop.css' rel='stylesheet'></head><body><script src='/editors/assets/js/loader.js'></script><header><div class='container col-settings'><div><div class='site-brand'>Site Name</div></div><ul class='user-area'><li><a class='sign-out' href='#' id='sign-out'>Sign out</a></li><li class='user-name'></li></ul></div></header><div class='lds-css loader ng-scope'><div class='text'>Deploying</div><div class='lds-ellipsis' style='width:100%;height:100%'><div><div></div></div><div><div></div></div><div><div></div></div><div><div></div></div><div><div></div></div></div></div><div class='container edit-blog-page page-content'><div class='columns'><div class='col-sidebar'><div class='blog-list'><div class='blog-list__inside'><div class='blog-list-wrap'></div></div></div><div class='logo-wrap'><div class='js-enable-pug logo'>Your Logo Here</div><div class='easter-pug'>You can edit pug<i class='i-arrow-right'></i></div></div></div><div class='col-editor'><div class='editor-wrapper'><h1>Editing <span class='js-file-name'>Choose file to edit</span></h1><div class='icons-row'><div class='icon-wrap'><i class='disabled upload' title='file upload'></i></div><div class='icon-wrap'><i class='disabled i-calendar publish-date' title='Set publish date'></i></div><div class='icon-wrap'><i class='icono-sync' title='Refresh'></i></div><div class='icon-wrap'><i class='disabled create-post i-plusCircle' title='Clone page'></i></div></div><textarea id='cms1' rows='400'></textarea><div class='d-hide errors mt-2 toast toast-error' data-js='errors'></div><div class='btns-wrap'><button class='btn-custom btn-primary save' disabled='disabled' href='#'>save</button><a class='btn-custom btn-secondary view-page' href='#' disabled='disabled' target='_blank'><span>view page</span></a></div></div></div></div><div class='d-hide notification'><div class='text'></div></div><form class='d-hide post-name-wrap'><label>Enter new page name:</label><div class='input-wrap'><input type='text' name='post-name' required><button type='submit'><i class='icono-checkCircle'></i></button></div></form><form class='d-hide dropzone file-upload' action='upload' encType='multipart/form-data' id='file-upload' method='post'>Select file:<input type='file' class='file-upload-input' id='file-upload-input' multiple='' name='sampleFile'><input type='submit'></form><form class='d-hide publish-date-form'><label>Select date:</label><div class='input-wrap'><input type='text' class='datepicker publish-date-input'><button type='submit'><i class='icono-checkCircle'></i></button></div></form></div><!-- mB v5.07.01 on 2019-06-04T21:47:38.575Z --></body></html>
+<!doctype html><html><head><script>var _start=Date.now()</script><title></title><meta charset='utf-8'><meta content='width=device-width,initial-scale=1' name='viewport'><script src='//cdn.jsdelivr.net/npm/[email protected]/dist/depp.min.js'></script><script src='//cdn.jsdelivr.net/npm/[email protected]/riot.min.js'></script><style>.delayShowing{opacity:0}.blur{-webkit-filter:blur(2px);filter:blur(2px)}</style><script src='//unpkg.com/[email protected]/toolBelt.min.js'></script><script>window.ROOT='/'</script><script>window.apiProtocol='http',window.apiHost='0.0.0.0',window.apiPort='9081',window.appMount='http://0.0.0.0:9082',window.siteName='Metabake'</script><link href='/editors/assets/css/spectreTop.css' rel='stylesheet'></head><body><script src='/editors/assets/js/loader.js'></script><header><div class='container col-settings'><div><div class='site-brand'>Site Name</div></div><ul class='user-area'><li><a class='sign-out' href='#' id='sign-out'>Sign out</a></li><li class='user-name'></li></ul></div></header><div class='lds-css loader ng-scope'><div class='text'>Deploying</div><div class='lds-ellipsis' style='width:100%;height:100%'><div><div></div></div><div><div></div></div><div><div></div></div><div><div></div></div><div><div></div></div></div></div><div class='container edit-blog-page page-content'><div class='columns'><div class='col-sidebar'><div class='blog-list'><div class='blog-list__inside'><div class='blog-list-wrap'></div></div></div><div class='logo-wrap'><div class='js-enable-pug logo'>Your Logo Here</div><div class='easter-pug'>You can edit pug<i class='i-arrow-right'></i></div></div></div><div class='col-editor'><div class='editor-wrapper'><h1>Editing <span class='js-file-name'>Choose file to edit</span></h1><div class='icons-row'><div class='icon-wrap'><i class='disabled upload' title='file upload'></i></div><div class='icon-wrap'><i class='disabled i-calendar publish-date' title='Set publish date'></i></div><div class='icon-wrap'><i class='icono-sync' title='Refresh'></i></div><div class='icon-wrap'><i class='disabled create-post i-plusCircle' title='Clone page'></i></div></div><textarea id='cms1' rows='400'></textarea><div class='d-hide errors mt-2 toast toast-error' data-js='errors'></div><div class='btns-wrap'><button class='btn-custom btn-primary save' disabled='disabled' href='#'>save</button><a class='btn-custom btn-secondary view-page' href='#' disabled='disabled' target='_blank'><span>view page</span></a></div></div></div></div><div class='d-hide notification'><div class='text'></div></div><form class='d-hide post-name-wrap'><label>Enter new page name:</label><div class='input-wrap'><input type='text' name='post-name' required><button type='submit'><i class='icono-checkCircle'></i></button></div></form><form class='d-hide dropzone file-upload' action='upload' encType='multipart/form-data' id='file-upload' method='post'>Select file:<input type='file' class='file-upload-input' id='file-upload-input' multiple='' name='sampleFile'><input type='submit'></form><form class='d-hide publish-date-form'><label>Select date:</label><div class='input-wrap'><input type='text' class='datepicker publish-date-input'><button type='submit'><i class='icono-checkCircle'></i></button></div></form></div><!-- mB v5.07.01 on 2019-06-05T19:09:01.494Z --></body></html>
diff --git a/src/www/index.html b/src/www/index.html
@@ -3,4 +3,4 @@
 let t=$("#login-form input[name='login']").val(),i=$("#login-form input[name='password']").val()
 e.checkUser(t,i)}),$(document).on('click','#reset-password-link',function(){$('#reset-password-form').removeClass('d-hide'),$('#login-form').addClass('d-hide')}),$('#reset-password-form').submit(function(e){e.preventDefault(),$('[class^="message"]').addClass('d-hide')
 let s=$(this).find('input[type="email"]').val()
-auth.sendPasswordResetEmail(s).then(()=>{$(this).find('fieldset, button').addClass('d-hide'),$(this).find('.message-info').removeClass('d-hide').text('An email with the password reset link has been sent to your email address'),setTimeout(function(){$('#reset-password-form fieldset, #reset-password-form .btn-group, #login-form').removeClass('d-hide'),$('#reset-password-form, #reset-password-form p').addClass('d-hide')},5e3)}).catch(function(e){$('.message-warning').removeClass('d-hide').text('No user exists with such email')})})})</script><!-- mB v5.07.01 on 2019-06-04T21:10:23.881Z --></body></html>
+auth.sendPasswordResetEmail(s).then(()=>{$(this).find('fieldset, button').addClass('d-hide'),$(this).find('.message-info').removeClass('d-hide').text('An email with the password reset link has been sent to your email address'),setTimeout(function(){$('#reset-password-form fieldset, #reset-password-form .btn-group, #login-form').removeClass('d-hide'),$('#reset-password-form, #reset-password-form p').addClass('d-hide')},5e3)}).catch(function(e){$('.message-warning').removeClass('d-hide').text('No user exists with such email')})})})</script><!-- mB v5.07.01 on 2019-06-05T19:09:01.599Z --></body></html>
diff --git a/src/wwwAdmin/crudEditors/index.html b/src/wwwAdmin/crudEditors/index.html
@@ -1,3 +1,3 @@
 <!doctype html><html><head><script>var _start=Date.now()
 window.ENV='0'</script><title></title><meta charset='utf-8'><meta content='width=device-width,initial-scale=1' name='viewport'><script src='//cdn.jsdelivr.net/npm/[email protected]/dist/depp.min.js'></script><script src='//cdn.jsdelivr.net/npm/[email protected]/riot.min.js'></script><style>.delayShowing{opacity:0}.blur{-webkit-filter:blur(2px);filter:blur(2px)}</style><script src='//unpkg.com/[email protected]/toolBelt.min.js'></script><script>window.ROOT='/'</script><script>window.rpcProtocol='http',window.rpcHost='0.0.0.0',window.rpcPort='9081',window.siteName='Metabake'</script><link href='/admin/assets/css/spectreTop.css' rel='stylesheet'></head><body><script src='/admin/assets/js/loader.js'></script><div class='lds-css loader ng-scope'><div class='text'>Deploying</div><div class='lds-ellipsis' style='width:100%;height:100%'><div><div></div></div><div><div></div></div><div><div></div></div><div><div></div></div><div><div></div></div></div></div><div class='container page-content'><div class='columns'><div class='col-settings'><ul class='user-area'><li class='divider site-brand'>Site Name</li><li class='user-name'></li><li><a class='sign-out' href='#' id='sign-out'>Sign out</a></li></ul><div class='js-enable-pug logo'>Your Logo Here</div></div><div class='col-content'><h1 class='table-header'>Users</h1><div class='table-wrap'><div class='table-custom' id='editors-table'></div><div class='space-2v'></div><form class='grid-form' id='editor-form'><fieldset><legend>Select row to edit/remove editor, to add editor type in new editor's login credentials</legend><div data-row-span='3'><div data-field-span='1'><label>Email</label><input name='email' type='text'></div><div data-field-span='1'><label>Name</label><input name='name' type='text'></div><div data-field-span='1'><label>Password</label><input name='password' type='password' minlength='6' required='required'></div></div></fieldset></form><div class='space-2v btn-row'><a class='btn-custom btn-primary' href='#' id='add-editor'>Add</a><a class='btn-custom btn-primary' href='#' id='edit-editor'>Edit</a><a class='btn-custom btn-secondary' href='#' id='delete-editor'><span>Delete</span></a></div></div></div></div><div class='d-hide notification'><div class='text'></div></div></div><script>depp.require('rw',function(){var n=new BindLogin
-$('#sign-out').off('click').on('click',function(i){n.signOut()})})</script><!-- mB v5.07.01 on 2019-06-05T07:47:48.963Z --></body></html>
+$('#sign-out').off('click').on('click',function(i){n.signOut()})})</script><!-- mB v5.07.01 on 2019-06-05T19:08:53.191Z --></body></html>