From aa26ea14ef4cd22131002bf75d4b7d0a75ffc177 Mon Sep 17 00:00:00 2001 From: "Jonny_Bro (Nikita)" Date: Mon, 26 Jun 2023 17:16:22 +0500 Subject: [PATCH] update dashboard-core --- dashboard/dashboard-core | 2 +- dashboard/dashboard.js | 25 ++++--- languages/en-US/dashboard.json | 7 +- languages/ru-RU/dashboard.json | 7 +- languages/uk-UA/dashboard.json | 7 +- package-lock.json | 115 ++------------------------------- package.json | 4 +- 7 files changed, 41 insertions(+), 126 deletions(-) diff --git a/dashboard/dashboard-core b/dashboard/dashboard-core index c870a2de..a17c7d6d 160000 --- a/dashboard/dashboard-core +++ b/dashboard/dashboard-core @@ -1 +1 @@ -Subproject commit c870a2dec57b8afe9897adacbb4b9a55412828c5 +Subproject commit a17c7d6d6a60021a87b797a905abc23349600e0d diff --git a/dashboard/dashboard.js b/dashboard/dashboard.js index 6b873630..ed43c2d6 100644 --- a/dashboard/dashboard.js +++ b/dashboard/dashboard.js @@ -1,7 +1,5 @@ const SoftUI = require("./dashboard-core/theme/dbd-soft-ui"), - DBD = require("./dashboard-core/index"), - session = require("express-session"), - FileStore = require("session-file-store")(session); + DBD = require("./dashboard-core/index"); const { PermissionsBitField, ChannelType } = require("discord.js"); @@ -45,7 +43,6 @@ module.exports.load = async client => { secret: client.config.dashboard.secret, }, cookiesSecret: client.config.dashboard.secret, - sessionSaveSession: new FileStore, domain: client.config.dashboard.domain, redirectUri: `${client.config.dashboard.domain}${client.config.dashboard.port !== 80 ? `:${client.config.dashboard.port}` : ""}/discord/callback`, bot: client, @@ -148,7 +145,7 @@ module.exports.load = async client => { }, }, websiteName: `${client.user.username} Dashboard`, - colorScheme: "red", + colorScheme: "blue", supporteMail: "", icons: { favicon: client.user.avatarURL(), @@ -181,9 +178,13 @@ module.exports.load = async client => { }, }, sweetalert: { - errors: {}, + errors: { + settingsSave: "Failed to save setttings", + }, success: { + settingsSave: "Successfully saved setttings.", login: "Successfully logged in.", + logout: "Successfully logged out.", }, }, preloader: { @@ -649,9 +650,15 @@ module.exports.load = async client => { categoryPermissions: PermissionsBitField.Flags.ViewChannel, categoryOptionsList: [ { - optionType: SoftUI.formTypes.spacer(), - title: "no settings", - description: "", + optionType: DBD.formTypes.embedBuilder({ + username: "JaBa", + avatarURL: "https://cdn.discordapp.com/avatars/708637495054565426/af98d49ebc9bf28b40b45ed5a0a623b4.png?size=4096", + }), + setNew: async ({ guild, user, newData }) => { + console.log(guild); + console.log(user); + console.log(newData); + }, }, ], }, diff --git a/languages/en-US/dashboard.json b/languages/en-US/dashboard.json index af0f1955..21e9d98a 100644 --- a/languages/en-US/dashboard.json +++ b/languages/en-US/dashboard.json @@ -69,8 +69,13 @@ } }, "sweetalert": { + "errors": { + "settingsSave": "Failed to save setttings" + }, "success": { - "login": "Successfully logged in." + "settingsSave": "Successfully saved setttings.", + "login": "Successfully logged in.", + "logout": "Successfully logged out." } }, "preloader": { diff --git a/languages/ru-RU/dashboard.json b/languages/ru-RU/dashboard.json index f67a027d..26e4c11f 100644 --- a/languages/ru-RU/dashboard.json +++ b/languages/ru-RU/dashboard.json @@ -69,8 +69,13 @@ } }, "sweetalert": { + "errors": { + "settingsSave": "Произошла ошибка при сохранении настроек." + }, "success": { - "login": "Вход выполнен." + "settingsSave": "Настройки успешно сохранены.", + "login": "Вход успешно выполнен.", + "logout": "Выход успешно выполнен." } }, "preloader": { diff --git a/languages/uk-UA/dashboard.json b/languages/uk-UA/dashboard.json index 89e4b2ec..c73836e8 100644 --- a/languages/uk-UA/dashboard.json +++ b/languages/uk-UA/dashboard.json @@ -69,8 +69,13 @@ } }, "sweetalert": { + "errors": { + "settingsSave": "Произошла ошибка при сохранении настроек." + }, "success": { - "login": "Вхід виконано." + "settingsSave": "Настройки успешно сохранены.", + "login": "Вход успешно выполнен.", + "logout": "Выход успешно выполнен." } }, "preloader": { diff --git a/package-lock.json b/package-lock.json index d5d4fdd5..b18e68a4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,6 @@ "discord-giveaways": "^6.0.1", "discord-player": "^6.5.0", "discord.js": "^14.11.0", - "express-session": "^1.17.3", "gamedig": "^4.0.2", "i18next": "^21.9.1", "i18next-fs-backend": "^1.1.5", @@ -28,8 +27,7 @@ "moment": "^2.26.0", "mongoose": "^5.13.15", "ms": "^2.1.3", - "play-dl": "^1.9.6", - "session-file-store": "^1.5.0" + "play-dl": "^1.9.6" }, "devDependencies": { "eslint": "^8.23.0" @@ -685,17 +683,6 @@ "version": "1.1.1", "license": "MIT" }, - "node_modules/asn1.js": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz", - "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==", - "dependencies": { - "bn.js": "^4.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0", - "safer-buffer": "^2.1.0" - } - }, "node_modules/assistants-safe-storage": { "version": "1.0.0", "license": "MIT", @@ -714,11 +701,6 @@ "follow-redirects": "^1.14.4" } }, - "node_modules/bagpipe": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/bagpipe/-/bagpipe-0.3.5.tgz", - "integrity": "sha512-42sAlmPDKes1nLm/aly+0VdaopSU9br+jkRELedhQxI5uXHgtk47I83Mpmf4zoNTRMASdLFtUkimlu/Z9zQ8+g==" - }, "node_modules/balanced-match": { "version": "1.0.2", "license": "MIT" @@ -811,11 +793,6 @@ "version": "3.5.1", "license": "MIT" }, - "node_modules/bn.js": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" - }, "node_modules/body-parser": { "version": "1.20.2", "license": "MIT", @@ -2133,19 +2110,6 @@ "version": "1.0.0", "license": "MIT" }, - "node_modules/fs-extra": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", - "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - }, - "engines": { - "node": ">=6 <7 || >=8" - } - }, "node_modules/fs-minipass": { "version": "2.1.0", "license": "ISC", @@ -2339,7 +2303,8 @@ }, "node_modules/graceful-fs": { "version": "4.2.11", - "license": "ISC" + "license": "ISC", + "optional": true }, "node_modules/graceful-readlink": { "version": "1.0.1", @@ -2562,6 +2527,7 @@ }, "node_modules/imurmurhash": { "version": "0.1.4", + "devOptional": true, "license": "MIT", "engines": { "node": ">=0.8.19" @@ -2651,11 +2617,6 @@ "node": ">=8" } }, - "node_modules/is-typedarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==" - }, "node_modules/isarray": { "version": "0.0.1", "license": "MIT" @@ -2706,14 +2667,6 @@ "dev": true, "license": "MIT" }, - "node_modules/jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, "node_modules/kareem": { "version": "2.3.2", "license": "Apache-2.0" @@ -2725,17 +2678,6 @@ "json-buffer": "3.0.1" } }, - "node_modules/kruptein": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/kruptein/-/kruptein-2.2.3.tgz", - "integrity": "sha512-BTwprBPTzkFT9oTugxKd3WnWrX630MqUDsnmBuoa98eQs12oD4n4TeI0GbpdGcYn/73Xueg2rfnw+oK4dovnJg==", - "dependencies": { - "asn1.js": "^5.4.1" - }, - "engines": { - "node": ">6" - } - }, "node_modules/levn": { "version": "0.4.1", "dev": true, @@ -2943,11 +2885,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/minimalistic-assert": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", - "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==" - }, "node_modules/minimatch": { "version": "3.1.2", "license": "ISC", @@ -3985,6 +3922,7 @@ "node_modules/retry": { "version": "0.12.0", "license": "MIT", + "optional": true, "engines": { "node": ">= 4" } @@ -4143,22 +4081,6 @@ "node": ">= 0.8.0" } }, - "node_modules/session-file-store": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/session-file-store/-/session-file-store-1.5.0.tgz", - "integrity": "sha512-60IZaJNzyu2tIeHutkYE8RiXVx3KRvacOxfLr2Mj92SIsRIroDsH0IlUUR6fJAjoTW4RQISbaOApa2IZpIwFdQ==", - "dependencies": { - "bagpipe": "^0.3.5", - "fs-extra": "^8.0.1", - "kruptein": "^2.0.4", - "object-assign": "^4.1.1", - "retry": "^0.12.0", - "write-file-atomic": "3.0.3" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/set-blocking": { "version": "2.0.0", "license": "ISC" @@ -4688,14 +4610,6 @@ "node": ">= 0.6" } }, - "node_modules/typedarray-to-buffer": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", - "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", - "dependencies": { - "is-typedarray": "^1.0.0" - } - }, "node_modules/uid-safe": { "version": "2.1.5", "license": "MIT", @@ -4732,14 +4646,6 @@ "imurmurhash": "^0.1.4" } }, - "node_modules/universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", - "engines": { - "node": ">= 4.0.0" - } - }, "node_modules/unpipe": { "version": "1.0.0", "license": "MIT", @@ -4829,17 +4735,6 @@ "version": "1.0.2", "license": "ISC" }, - "node_modules/write-file-atomic": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", - "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", - "dependencies": { - "imurmurhash": "^0.1.4", - "is-typedarray": "^1.0.0", - "signal-exit": "^3.0.2", - "typedarray-to-buffer": "^3.1.5" - } - }, "node_modules/ws": { "version": "8.13.0", "license": "MIT", diff --git a/package.json b/package.json index b5382057..e0a65cfe 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,6 @@ "discord-giveaways": "^6.0.1", "discord-player": "^6.5.0", "discord.js": "^14.11.0", - "express-session": "^1.17.3", "gamedig": "^4.0.2", "i18next": "^21.9.1", "i18next-fs-backend": "^1.1.5", @@ -31,8 +30,7 @@ "moment": "^2.26.0", "mongoose": "^5.13.15", "ms": "^2.1.3", - "play-dl": "^1.9.6", - "session-file-store": "^1.5.0" + "play-dl": "^1.9.6" }, "devDependencies": { "eslint": "^8.23.0"