From e2a7be88b768fa48499c80410e034d40f00b80fb Mon Sep 17 00:00:00 2001 From: zuzanna-maria Date: Fri, 14 Jun 2024 19:03:26 +0100 Subject: [PATCH] cleaning --- lib/decrees.js | 70 +--------------------------------- www/admin/inner.js | 9 +---- www/common/pad-types.js | 1 - www/install/appconfigscreen.js | 2 - www/install/main.js | 4 +- 5 files changed, 4 insertions(+), 82 deletions(-) diff --git a/lib/decrees.js b/lib/decrees.js index c2e29d6f3..ef2d75f4b 100644 --- a/lib/decrees.js +++ b/lib/decrees.js @@ -236,74 +236,6 @@ commands.DISABLE_APPS = function (Env, args) { return true; }; -commands.CHANGE_COLOR = function (Env, args) { - console.log('change color') - var color = args - adminDecree(Env, null, function (err) { - if (err) { return void cb(err); } - Env.flushCache(); - cb(void 0, true); - }, ['CHANGE_COLOR', [ - 'SET_ACCENT_COLOR', - [color] - ]]); - return true; -}; - -// commands.UPLOAD_LOGO = function(Env, data) { -// console.log('data', data) -// const args = Array.isArray(data) && data[1]; -// if (!args || typeof(args) !== 'object') { console.err("EINVAL"); -// return } -// let dataURL = args.dataURL; - -// // (size*4/3) + 24 ==> base64 and dataURL overhead -// if (!dataURL || dataURL.length > ((MAX_LOGO_SIZE*4/3)+24)) { -// console.err("E_TOO_LARGE"); -// return -// } - -// let s = dataURL.split(','); -// let base64 = s[1]; -// let mime = s[0].slice(s[0].indexOf(":")+1, s[0].indexOf(";")); -// if (!base64 || !mime) { return void cb('EINVAL'); } -// let buf; -// try { -// buf = Buffer.from(base64, 'base64'); -// } catch (e) { -// console.err(e); -// return -// } - -// nThen(waitFor => { -// Fse.mkdirp('customize', {}, waitFor((err) => { -// if (!err) { return; } -// waitFor.abort(); -// console.err(err); -// return -// })); -// }).nThen(waitFor => { -// Fse.writeFile('./customize/CryptPad_logo_hero.svg', buf, waitFor((err) => { -// if (!err) { return; } -// waitFor.abort(); -// console.err(err); -// return -// })); -// }).nThen(() => { -// adminDecree(Env, null, function (err) { - -// if (err) { console.err(err); -// return -// } -// Env.flushCache(); -// // cb(void 0, true); -// }, ['UPLOAD_LOGO', [ -// 'SET_LOGO_MIME', -// [mime] -// ]]); -// }); -// } - commands.SET_SUPPORT_KEYS = function (Env, args) { const curvePublic = args[0]; // Support mailbox key const edPublic = args[1]; // Support pin log @@ -374,7 +306,7 @@ var args_isMaintenance = function (args) { // whenever that happens we can relax validation a bit to support more formats var makeBroadcastSetter = function (attr, validation) { return function (Env, args) { - if ((validation && !validation(args)) &&!args_isString(args)) { + if ((validation && !validation(args)) && !args_isString(args)) { throw new Error('INVALID_ARGS'); } var str = args[0]; diff --git a/www/admin/inner.js b/www/admin/inner.js index 832688969..6d7f4904a 100644 --- a/www/admin/inner.js +++ b/www/admin/inner.js @@ -622,7 +622,6 @@ define([ UI.log(Messages._getKey('ui_saved', [Messages.admin_emailTitle])); }); }); - var nav = blocks.nav([button]); var form = blocks.form([ @@ -635,22 +634,18 @@ define([ }); sidebar.addItem('apps', function (cb) { - const grid = blocks.block([], 'cp-admin-customize-apps-grid'); - const allApps = ['pad', 'code', 'kanban', 'slide', 'sheet', 'form', 'whiteboard', 'diagram']; - const availableApps = [] + const availableApps = []; function select(app) { - if (availableApps.indexOf(app) === -1) { availableApps.push(app); $(`#${app}-block`).attr('class', 'active-app') } else { availableApps.splice(availableApps.indexOf(app), 1) $(`#${app}-block`).attr('class', 'inactive-app') - } - + } } allApps.forEach(app => { diff --git a/www/common/pad-types.js b/www/common/pad-types.js index e1f74512a..86390e885 100644 --- a/www/common/pad-types.js +++ b/www/common/pad-types.js @@ -2,7 +2,6 @@ // // SPDX-License-Identifier: AGPL-3.0-or-later - define([ "/customize/application_config.js", "/api/config", diff --git a/www/install/appconfigscreen.js b/www/install/appconfigscreen.js index c04b64687..95311a78d 100644 --- a/www/install/appconfigscreen.js +++ b/www/install/appconfigscreen.js @@ -11,8 +11,6 @@ define([ 'css!/components/bootstrap/dist/css/bootstrap.min.css', 'css!/components/components-font-awesome/css/font-awesome.min.css', - // 'less!/admin/app-admin.less', - // 'css!/install/configscreen.css' ], function( $, Sidebar, diff --git a/www/install/main.js b/www/install/main.js index 7d970df4c..5205b9678 100644 --- a/www/install/main.js +++ b/www/install/main.js @@ -19,9 +19,7 @@ define([ 'appconfigscreen.js', '/common/inner/sidebar-layout.js', - // 'css!/install/configscreen.css', - 'less!/install/onboarding.less', - + 'less!/install/onboarding.less', 'css!/components/components-font-awesome/css/font-awesome.min.css', ], function ($, Login, Cryptpad, /*Test,*/ Cred, UI, Util, Realtime, Constants, Feedback, LocalStore, h, Pages, Rpc, AppConfigScreen, Sidebar) { if (window.top !== window) { return; }