From f08230b5490b327ed8d98dcebcbc5eca5c5d2859 Mon Sep 17 00:00:00 2001 From: Fuwn Date: Sat, 15 Jan 2022 02:25:59 +0000 Subject: chore: chibisafe -> Hostess --- package.json | 15 +- pm2.json | 22 +- src/api/routes/auth/loginPOST.js | 2 +- src/api/scripts/overwriteConfig.js | 2 +- src/api/structures/Server.js | 2 +- src/api/structures/Setting.js | 2 +- src/api/utils/Util.js | 4 +- src/setup.js | 4 +- src/site/assets/images/background.jpg | Bin 75515 -> 63981 bytes src/site/assets/images/background.jpg.bak | Bin 0 -> 75515 bytes src/site/assets/images/logo.png | Bin 11306 -> 86843 bytes src/site/assets/images/logo.png.bak | Bin 0 -> 11306 bytes src/site/assets/styles/_bulma_colors_extender.scss | 10 +- src/site/assets/styles/style.scss | 16 +- src/site/components/footer/Footer.test.js | 4 +- src/site/components/footer/Footer.vue | 17 +- src/site/components/home/links/Links.vue | 6 +- src/site/components/image-modal/ImageInfo.vue | 42 +- src/site/components/image-modal/TagInfo.vue | 2 +- src/site/components/search/Search.vue | 4 +- src/site/components/settings/JoiObject.vue | 4 +- src/site/components/uploader/Uploader.vue | 4 +- src/site/layouts/default.vue | 3 +- src/site/pages/dashboard/account.vue | 16 +- src/site/pages/dashboard/admin/settings.vue | 2 +- src/site/pages/dashboard/admin/users.vue | 10 +- src/site/pages/dashboard/albums/index.vue | 2 +- src/site/pages/dashboard/tags/index.vue | 4 +- src/site/pages/faq.vue | 12 +- src/site/pages/index.vue | 9 +- src/site/pages/login.vue | 6 +- src/site/pages/register.vue | 8 +- src/site/plugins/axios.js | 2 +- src/site/static/logo.png | Bin 13039 -> 86843 bytes src/site/static/logo.png.bak | Bin 0 -> 13039 bytes src/site/static/oembed.json | 8 +- src/tests/utils.js | 2 +- yarn.lock | 12835 +++++++++++++++++++ 38 files changed, 12955 insertions(+), 126 deletions(-) create mode 100644 src/site/assets/images/background.jpg.bak create mode 100644 src/site/assets/images/logo.png.bak create mode 100644 src/site/static/logo.png.bak create mode 100644 yarn.lock diff --git a/package.json b/package.json index 6a1d3c1..bd49d5a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { - "name": "chibisafe", + "name": "hostess", "version": "4.0.2", - "description": "Blazing fast file uploader and bunker written in node! 🚀", + "description": "Hostess - Objectively the best, fastest, and most secure file host there is.", "license": "MIT", "author": { "name": "Pitu", @@ -14,7 +14,7 @@ "dev": "nodemon src/api/structures/Server", "migrate": "knex migrate:latest", "seed": "knex seed:run", - "restart": "pm2 restart chibisafe", + "restart": "pm2 restart hostess", "overwrite-config": "cross-env OVERWRITE_SETTINGS=true", "test:vue": "jest --testPathPattern=src/site", "test:api": "jest --testPathPattern=src/tests/api", @@ -24,10 +24,10 @@ }, "repository": { "type": "git", - "url": "https://github.com/WeebDev/chibisafe" + "url": "https://github.com/Fuwn/Hostess" }, "bugs": { - "url": "https://github.com/WeebDev/chibisafe/issues" + "url": "https://github.com/Fuwn/Hostess/issues" }, "engines": { "node": ">=12.0.0" @@ -138,8 +138,9 @@ "delay": 2500 }, "keywords": [ - "chibisafe", - "lolisafe", + "hostess", + "strelizia", + "fuwn", "upload", "uploader", "file", diff --git a/pm2.json b/pm2.json index e5737f6..451b6b3 100644 --- a/pm2.json +++ b/pm2.json @@ -1,15 +1,11 @@ { - "apps": [ - { - "name": "chibisafe", - "script": "npm", - "args": "run start", - "env": { - "NODE_ENV": "production" - }, - "env_production": { - "NODE_ENV": "production" - } - } - ] + "apps": [ + { + "name": "hostess", + "script": "npm", + "args": "run start", + "env": { "NODE_ENV": "production" }, + "env_production": { "NODE_ENV": "production" } + } + ] } diff --git a/src/api/routes/auth/loginPOST.js b/src/api/routes/auth/loginPOST.js index cc72145..665d0a3 100644 --- a/src/api/routes/auth/loginPOST.js +++ b/src/api/routes/auth/loginPOST.js @@ -35,7 +35,7 @@ class loginPOST extends Route { Create the jwt with some data */ const jwt = JWT.sign({ - iss: 'chibisafe', + iss: 'hostess', sub: user.id, iat: moment.utc().valueOf() }, Util.config.secret, { expiresIn: '30d' }); diff --git a/src/api/scripts/overwriteConfig.js b/src/api/scripts/overwriteConfig.js index 0355ea6..05a1b73 100644 --- a/src/api/scripts/overwriteConfig.js +++ b/src/api/scripts/overwriteConfig.js @@ -5,7 +5,7 @@ const Util = require('../utils/Util'); const start = async () => { try { await Util.writeConfigToDb(Util.getEnvironmentDefaults()); - console.log('Configuration overwriten, you can now start chibisafe'); + console.log('Configuration overwriten, you can now start Hostess'); process.exit(0); } catch (error) { console.error(error); diff --git a/src/api/structures/Server.js b/src/api/structures/Server.js index b63d06d..859a97f 100644 --- a/src/api/structures/Server.js +++ b/src/api/structures/Server.js @@ -43,7 +43,7 @@ class Server { if ((req.url.includes('/api/album/') || req.url.includes('/zip')) && req.method === 'GET') return next(); // This bypasses the headers.accept if we are accessing the frontend if (!req.url.includes('/api/') && req.method === 'GET') return next(); - if (req.headers.accept && req.headers.accept.includes('application/vnd.chibisafe.json')) return next(); + if (req.headers.accept && req.headers.accept.includes('application/vnd.hostess.json')) return next(); return res.status(405).json({ message: 'Incorrect `Accept` header provided' }); }); this.server.use(bodyParser.urlencoded({ extended: true })); diff --git a/src/api/structures/Setting.js b/src/api/structures/Setting.js index bb37834..a622e04 100644 --- a/src/api/structures/Setting.js +++ b/src/api/structures/Setting.js @@ -118,7 +118,7 @@ const schema = Joi.object({ .label('Meta description') .description('Short and accurate summary of the content of the page'), - metaKeywords: Joi.string().default('chibisafe,lolisafe,upload,uploader,file,vue,images,ssr,file uploader,free') + metaKeywords: Joi.string().default('hostess,strelizia,fuwn,upload,uploader,file,vue,images,ssr,file uploader,free') .meta({ section: Sections.SOCIAL_AND_SHARING }) diff --git a/src/api/utils/Util.js b/src/api/utils/Util.js index b243b2b..81b8a2d 100644 --- a/src/api/utils/Util.js +++ b/src/api/utils/Util.js @@ -57,8 +57,8 @@ class Util { // eslint-disable-next-line eqeqeq userAccounts: process.env.USER_ACCOUNTS == undefined ? true : false, metaThemeColor: process.env.META_THEME_COLOR || '#20222b', - metaDescription: process.env.META_DESCRIPTION || 'Blazing fast file uploader and bunker written in node! 🚀', - metaKeywords: process.env.META_KEYWORDS || 'chibisafe,lolisafe,upload,uploader,file,vue,images,ssr,file uploader,free', + metaDescription: process.env.META_DESCRIPTION || 'Hostess - Objectively the best, fastest, and most secure file host there is.', + metaKeywords: process.env.META_KEYWORDS || 'hostess,strelizia,fuwn,upload,uploader,file,vue,images,ssr,file uploader,free', metaTwitterHandle: process.env.META_TWITTER_HANDLE || '@your-handle', backgroundImageURL: process.env.BACKGROUND_IMAGE_URL || '', logoURL: process.env.LOGO_URL || '', diff --git a/src/setup.js b/src/setup.js index 997a251..a38bf52 100644 --- a/src/setup.js +++ b/src/setup.js @@ -15,12 +15,12 @@ async function start() { const wizard = [ { type: 'input', - query: 'Full domain this instance is gonna be running on (Ex: https://my-super-chibisafe.xyz):', + query: 'Full domain this instance is gonna be running on (Ex: https://hostess.fuwn.me):', handle: 'DOMAIN' }, { type: 'input', - query: 'Port to run chibisafe in? (default: 5000)', + query: 'Port to run Hostess in? (default: 5000)', handle: 'SERVER_PORT' }, { diff --git a/src/site/assets/images/background.jpg b/src/site/assets/images/background.jpg index d3e1862..a206c50 100644 Binary files a/src/site/assets/images/background.jpg and b/src/site/assets/images/background.jpg differ diff --git a/src/site/assets/images/background.jpg.bak b/src/site/assets/images/background.jpg.bak new file mode 100644 index 0000000..d3e1862 Binary files /dev/null and b/src/site/assets/images/background.jpg.bak differ diff --git a/src/site/assets/images/logo.png b/src/site/assets/images/logo.png index f72de04..430b689 100644 Binary files a/src/site/assets/images/logo.png and b/src/site/assets/images/logo.png differ diff --git a/src/site/assets/images/logo.png.bak b/src/site/assets/images/logo.png.bak new file mode 100644 index 0000000..f72de04 Binary files /dev/null and b/src/site/assets/images/logo.png.bak differ diff --git a/src/site/assets/styles/_bulma_colors_extender.scss b/src/site/assets/styles/_bulma_colors_extender.scss index ce406c4..acf9166 100644 --- a/src/site/assets/styles/_bulma_colors_extender.scss +++ b/src/site/assets/styles/_bulma_colors_extender.scss @@ -3,14 +3,14 @@ @import "../../../../node_modules/bulma/sass/utilities/functions"; // Setup our custom colors -$chibisafe: #323846; -$chibisafe-invert: findColorInvert($chibisafe); +$hostess: #323846; +$hostess-invert: findColorInvert($hostess); // XXX: EXPERIMENTAL, CHECK IF WE NEED ORIGINAL PRIMARY ANYWHERE -// $primary: $chibisafe; -// $primary-invert: $chibisafe-invert; +// $primary: $hostess; +// $primary-invert: $hostess-invert; // declare custom colors $custom-colors: ( - "chibisafe":($chibisafe, $chibisafe-invert) + "hostess":($hostess, $hostess-invert) ); diff --git a/src/site/assets/styles/style.scss b/src/site/assets/styles/style.scss index 1152f43..a1a0e0f 100644 --- a/src/site/assets/styles/style.scss +++ b/src/site/assets/styles/style.scss @@ -269,9 +269,9 @@ table.table { } } -.chibisafe-input input, -.chibisafe-select select, -.chibisafe-textarea textarea { +.hostess-input input, +.hostess-select select, +.hostess-textarea textarea { border: 2px solid #21252d; border-radius: 0.3em !important; background: rgba(0, 0, 0, 0.15); @@ -287,7 +287,7 @@ table.table { } } -.chibisafe-input .icon { +.hostess-input .icon { color: #323846 !important; } @@ -368,15 +368,15 @@ table.table { align-items: center; } -.chibisafe-on-border.field.is-floating-label .label:before { - background-color: $chibisafe; +.hostess-on-border.field.is-floating-label .label:before { + background-color: $hostess; } -.is-chibisafe.divider::after, .is-chibisafe.divider::before { +.is-hostess.divider::after, .is-hostess.divider::before { background-color: #21252d; } -.chibisafe.taginput { +.hostess.taginput { .taginput-container { background-color: #21252d; border: 2px solid #21252d; diff --git a/src/site/components/footer/Footer.test.js b/src/site/components/footer/Footer.test.js index 379f939..4f89b26 100644 --- a/src/site/components/footer/Footer.test.js +++ b/src/site/components/footer/Footer.test.js @@ -16,10 +16,10 @@ describe('Footer.vue', () => { } }); - it('Should render chibisafe as the instance title', () => { + it('Should render Hostess as the instance title', () => { const wrapper = shallowMount(Component, { store, localVue }); const title = wrapper.find('h4'); - expect(title.text()).toBe('chibisafe'); + expect(title.text()).toBe('Hostess'); }); }); diff --git a/src/site/components/footer/Footer.vue b/src/site/components/footer/Footer.vue index 0e3cceb..c0df64c 100644 --- a/src/site/components/footer/Footer.vue +++ b/src/site/components/footer/Footer.vue @@ -3,24 +3,23 @@
-

chibisafe

- © 2017-{{ getYear }} +

Hostess

+ © 2022-{{ getYear }} Pitu + href="https://fuwn.me" + class="no-block">Fuwn
{{ version }}
- GitHub - Patreon - Discord + GitHub + Contact
ShareX Config - Chrome Extension +
@@ -56,7 +55,7 @@ export default { "FileFormName": "files[]", "Headers": { "token": "${this.apiKey}", - "accept": "application/vnd.chibisafe.json" + "accept": "application/vnd.hostess.json" }, "ResponseType": "Text", "URL": "$json:url$", diff --git a/src/site/components/home/links/Links.vue b/src/site/components/home/links/Links.vue index 6777f44..a8ade00 100644 --- a/src/site/components/home/links/Links.vue +++ b/src/site/components/home/links/Links.vue @@ -1,12 +1,12 @@