diff --git a/app/views/otp/welcome.pug b/app/views/otp/welcome.pug index 2d4bb84..c03ac7d 100644 --- a/app/views/otp/welcome.pug +++ b/app/views/otp/welcome.pug @@ -41,7 +41,7 @@ block content .uk-margin button(type="submit").uk-button.dtp-button-primary.uk-border-pill Enable 2FA - div(class="uk-width-1-1 uk-text-center uk-text-left@m", hidden) + div(class="uk-width-1-1 uk-text-center uk-text-left@m") .uk-margin p Or, if your authenticator doesn't support scanning QR codes, you can enter the OTP configuration information shown here to begin displaying codes: pre( diff --git a/client/img/icon/blog.cybershell.xyz/icon-114x114.png b/client/img/icon/blog.cybershell.xyz/icon-114x114.png new file mode 100644 index 0000000..ec4a8bf Binary files /dev/null and b/client/img/icon/blog.cybershell.xyz/icon-114x114.png differ diff --git a/client/img/icon/blog.cybershell.xyz/icon-120x120.png b/client/img/icon/blog.cybershell.xyz/icon-120x120.png new file mode 100644 index 0000000..6ced2c5 Binary files /dev/null and b/client/img/icon/blog.cybershell.xyz/icon-120x120.png differ diff --git a/client/img/icon/blog.cybershell.xyz/icon-144x144.png b/client/img/icon/blog.cybershell.xyz/icon-144x144.png new file mode 100644 index 0000000..69fba8d Binary files /dev/null and b/client/img/icon/blog.cybershell.xyz/icon-144x144.png differ diff --git a/client/img/icon/blog.cybershell.xyz/icon-150x150.png b/client/img/icon/blog.cybershell.xyz/icon-150x150.png new file mode 100644 index 0000000..84c9cf9 Binary files /dev/null and b/client/img/icon/blog.cybershell.xyz/icon-150x150.png differ diff --git a/client/img/icon/blog.cybershell.xyz/icon-152x152.png b/client/img/icon/blog.cybershell.xyz/icon-152x152.png new file mode 100644 index 0000000..6331e97 Binary files /dev/null and b/client/img/icon/blog.cybershell.xyz/icon-152x152.png differ diff --git a/client/img/icon/blog.cybershell.xyz/icon-16x16.png b/client/img/icon/blog.cybershell.xyz/icon-16x16.png new file mode 100644 index 0000000..9b9eaa4 Binary files /dev/null and b/client/img/icon/blog.cybershell.xyz/icon-16x16.png differ diff --git a/client/img/icon/blog.cybershell.xyz/icon-180x180.png b/client/img/icon/blog.cybershell.xyz/icon-180x180.png new file mode 100644 index 0000000..edb005e Binary files /dev/null and b/client/img/icon/blog.cybershell.xyz/icon-180x180.png differ diff --git a/client/img/icon/blog.cybershell.xyz/icon-192x192.png b/client/img/icon/blog.cybershell.xyz/icon-192x192.png new file mode 100644 index 0000000..ecfbf39 Binary files /dev/null and b/client/img/icon/blog.cybershell.xyz/icon-192x192.png differ diff --git a/client/img/icon/blog.cybershell.xyz/icon-256x256.png b/client/img/icon/blog.cybershell.xyz/icon-256x256.png new file mode 100644 index 0000000..486ca54 Binary files /dev/null and b/client/img/icon/blog.cybershell.xyz/icon-256x256.png differ diff --git a/client/img/icon/blog.cybershell.xyz/icon-310x310.png b/client/img/icon/blog.cybershell.xyz/icon-310x310.png new file mode 100644 index 0000000..6211999 Binary files /dev/null and b/client/img/icon/blog.cybershell.xyz/icon-310x310.png differ diff --git a/client/img/icon/blog.cybershell.xyz/icon-32x32.png b/client/img/icon/blog.cybershell.xyz/icon-32x32.png new file mode 100644 index 0000000..a9404e7 Binary files /dev/null and b/client/img/icon/blog.cybershell.xyz/icon-32x32.png differ diff --git a/client/img/icon/blog.cybershell.xyz/icon-36x36.png b/client/img/icon/blog.cybershell.xyz/icon-36x36.png new file mode 100644 index 0000000..632a538 Binary files /dev/null and b/client/img/icon/blog.cybershell.xyz/icon-36x36.png differ diff --git a/client/img/icon/blog.cybershell.xyz/icon-384x384.png b/client/img/icon/blog.cybershell.xyz/icon-384x384.png new file mode 100644 index 0000000..fc16bd6 Binary files /dev/null and b/client/img/icon/blog.cybershell.xyz/icon-384x384.png differ diff --git a/client/img/icon/blog.cybershell.xyz/icon-48x48.png b/client/img/icon/blog.cybershell.xyz/icon-48x48.png new file mode 100644 index 0000000..ab5b186 Binary files /dev/null and b/client/img/icon/blog.cybershell.xyz/icon-48x48.png differ diff --git a/client/img/icon/blog.cybershell.xyz/icon-512x512.png b/client/img/icon/blog.cybershell.xyz/icon-512x512.png new file mode 100644 index 0000000..02029bd Binary files /dev/null and b/client/img/icon/blog.cybershell.xyz/icon-512x512.png differ diff --git a/client/img/icon/blog.cybershell.xyz/icon-57x57.png b/client/img/icon/blog.cybershell.xyz/icon-57x57.png new file mode 100644 index 0000000..27fcadc Binary files /dev/null and b/client/img/icon/blog.cybershell.xyz/icon-57x57.png differ diff --git a/client/img/icon/blog.cybershell.xyz/icon-60x60.png b/client/img/icon/blog.cybershell.xyz/icon-60x60.png new file mode 100644 index 0000000..d0cd268 Binary files /dev/null and b/client/img/icon/blog.cybershell.xyz/icon-60x60.png differ diff --git a/client/img/icon/blog.cybershell.xyz/icon-70x70.png b/client/img/icon/blog.cybershell.xyz/icon-70x70.png new file mode 100644 index 0000000..589372c Binary files /dev/null and b/client/img/icon/blog.cybershell.xyz/icon-70x70.png differ diff --git a/client/img/icon/blog.cybershell.xyz/icon-72x72.png b/client/img/icon/blog.cybershell.xyz/icon-72x72.png new file mode 100644 index 0000000..e4465cb Binary files /dev/null and b/client/img/icon/blog.cybershell.xyz/icon-72x72.png differ diff --git a/client/img/icon/blog.cybershell.xyz/icon-76x76.png b/client/img/icon/blog.cybershell.xyz/icon-76x76.png new file mode 100644 index 0000000..7c2c523 Binary files /dev/null and b/client/img/icon/blog.cybershell.xyz/icon-76x76.png differ diff --git a/client/img/icon/blog.cybershell.xyz/icon-96x96.png b/client/img/icon/blog.cybershell.xyz/icon-96x96.png new file mode 100644 index 0000000..149b5d7 Binary files /dev/null and b/client/img/icon/blog.cybershell.xyz/icon-96x96.png differ diff --git a/client/img/social-cards/blog.cybershell.xyz.png b/client/img/social-cards/blog.cybershell.xyz.png new file mode 100644 index 0000000..18eace6 Binary files /dev/null and b/client/img/social-cards/blog.cybershell.xyz.png differ diff --git a/iconImport.js b/iconImport.js new file mode 100644 index 0000000..25bdb14 --- /dev/null +++ b/iconImport.js @@ -0,0 +1,26 @@ +(async() => { + const siteDomain = "blog.cybershell.xyz"; + const sharp = require('sharp'); + const fs = require('fs'); + const path = require('path'); + // const iconDir = path.join(__dirname, siteDomain); + const siteImagesDir = path.join(__dirname, 'client', 'img'); + const siteIconDir = path.join(siteImagesDir, 'icon', siteDomain) + const sourceIconFile = 'thumbnail.png'; + const sourceIconFilePath = path.join(__dirname, sourceIconFile); + const sizes = [16, 32, 36, 48, 57, 60, 70, 72, 76, 96, 114, 120, 144, 150, 152, 180, 192, 256, 310, 384, 512]; + + await fs.promises.mkdir(siteIconDir, { force: true, recursive: true }); + for (var size of sizes) { + await sharp(sourceIconFilePath).resize({ + fit: sharp.fit.contain, + width: size, + height: size + }).png() + .toFile(path.join(siteIconDir, `icon-${size}x${size}.png`)); + } + + // await fs.promises.cp(sourceIconFilePath, path.join(siteIconDir, `${siteDomain}.png`)); + await fs.promises.cp(sourceIconFilePath, path.join(siteImagesDir, 'social-cards', `${siteDomain}.png`)); + // await fs.promises.cp(iconDir, path.join(siteImagesDir, 'icon' ), { recursive: true }); +})() \ No newline at end of file diff --git a/supervisord/dtp-sites-chat.conf b/supervisord/dtp-sites-chat.conf new file mode 100644 index 0000000..95c08e4 --- /dev/null +++ b/supervisord/dtp-sites-chat.conf @@ -0,0 +1,16 @@ +[group:sites-chat] +programs=dtp-sites-chat + +[program:dtp-sites-chat] +numprocs=1 +process_name=%(program_name)s_%(process_num)02d +command=/home/dtp/.nvm/versions/node/v18.12.0/bin/node --optimize_for_size --max_old_space_size=1024 --gc_interval=100 app/workers/chat.js +directory=/home/dtp/live/dtp-sites +autostart=true +autorestart=true +startretries=3 +stopsignal=INT +stderr_logfile=/var/log/dtp-sites/host-services.err.log +stdout_logfile=/var/log/dtp-sites/host-services.out.log +user=dtp +environment=HOME='/home/dtp/live/dtp-sites',HTTP_BIND_PORT=30%(process_num)02d,NODE_ENV=production,LOGNAME=host-services \ No newline at end of file diff --git a/supervisord/dtp-sites-groups.conf b/supervisord/dtp-sites-groups.conf new file mode 100644 index 0000000..43232f1 --- /dev/null +++ b/supervisord/dtp-sites-groups.conf @@ -0,0 +1,8 @@ + + +[group:sites-media] +program=dtp-sites-media +[group:sites-chat] +program=dtp-sites-chat +[group:sites] +program=dtp-sites \ No newline at end of file diff --git a/supervisord/dtp-sites-host-services.conf b/supervisord/dtp-sites-host-services.conf index ef11c57..9e14c72 100644 --- a/supervisord/dtp-sites-host-services.conf +++ b/supervisord/dtp-sites-host-services.conf @@ -1,7 +1,11 @@ +[group:sites-host-services] +programs=host-services + + [program:host-services] numprocs=1 process_name=%(program_name)s_%(process_num)02d -command=/home/dtp/.nvm/versions/node/v16.13.0/bin/node --optimize_for_size --max_old_space_size=1024 --gc_interval=100 app/workers/host-services.js +command=/home/dtp/.nvm/versions/node/v18.12.0/bin/node --optimize_for_size --max_old_space_size=1024 --gc_interval=100 app/workers/host-services.js directory=/home/dtp/live/dtp-sites autostart=true autorestart=true diff --git a/supervisord/dtp-sites-media.conf b/supervisord/dtp-sites-media.conf new file mode 100644 index 0000000..726f429 --- /dev/null +++ b/supervisord/dtp-sites-media.conf @@ -0,0 +1,17 @@ + +[group:sites-media] +programs=dtp-sites-media + +[program:dtp-sites-media] +numprocs=1 +process_name=%(program_name)s_%(process_num)02d +command=/home/dtp/.nvm/versions/node/v18.12.0/bin/node --optimize_for_size --max_old_space_size=1024 --gc_interval=100 app/workers/media.js +directory=/home/dtp/live/dtp-sites +autostart=true +autorestart=true +startretries=3 +stopsignal=INT +stderr_logfile=/var/log/dtp-sites/host-services.err.log +stdout_logfile=/var/log/dtp-sites/host-services.out.log +user=dtp +environment=HOME='/home/dtp/live/dtp-sites',HTTP_BIND_PORT=30%(process_num)02d,NODE_ENV=production,LOGNAME=host-services \ No newline at end of file diff --git a/supervisord/dtp-sites-newsletter.conf b/supervisord/dtp-sites-newsletter.conf index dbe583b..ea8d9d2 100644 --- a/supervisord/dtp-sites-newsletter.conf +++ b/supervisord/dtp-sites-newsletter.conf @@ -1,7 +1,10 @@ -[program:dtp-sites:newsletter] +[group:sites-newsletter] +programs=dtp-sites-newsletter + +[program:dtp-sites-newsletter] numprocs=1 process_name=%(program_name)s_%(process_num)02d -command=/home/dtp/.nvm/versions/node/v16.13.0/bin/node --optimize_for_size --max_old_space_size=1024 --gc_interval=100 app/workers/newsletter.js +command=/home/dtp/.nvm/versions/node/v18.12.0/bin/node --optimize_for_size --max_old_space_size=1024 --gc_interval=100 app/workers/newsletter.js directory=/home/dtp/live/dtp-sites autostart=true autorestart=true diff --git a/supervisord/dtp-sites-newsroom.conf b/supervisord/dtp-sites-newsroom.conf new file mode 100644 index 0000000..2794eda --- /dev/null +++ b/supervisord/dtp-sites-newsroom.conf @@ -0,0 +1,16 @@ +[group:sites-newsroom] +programs=dtp-sites-newsroom + +[program:dtp-sites-newsroom] +numprocs=1 +process_name=%(program_name)s_%(process_num)02d +command=/home/dtp/.nvm/versions/node/v18.12.0/bin/node --optimize_for_size --max_old_space_size=1024 --gc_interval=100 app/workers/newsroom.js +directory=/home/dtp/live/dtp-sites +autostart=true +autorestart=true +startretries=3 +stopsignal=INT +stderr_logfile=/var/log/dtp-sites/newsroom.err.log +stdout_logfile=/var/log/dtp-sites/newsroom.out.log +user=dtp +environment=HOME='/home/dtp/live/dtp-sites',HTTP_BIND_PORT=30%(process_num)02d,NODE_ENV=production,LOGNAME=newsroom \ No newline at end of file diff --git a/supervisord/dtp-sites-reeper.conf b/supervisord/dtp-sites-reeper.conf new file mode 100644 index 0000000..3550752 --- /dev/null +++ b/supervisord/dtp-sites-reeper.conf @@ -0,0 +1,16 @@ +[group:sites-reeeper] +programs=reeeper + +[program:reeeper] +numprocs=1 +process_name=%(program_name)s_%(process_num)02d +command=/home/dtp/.nvm/versions/node/v18.12.0/bin/node --optimize_for_size --max_old_space_size=1024 --gc_interval=100 app/workers/reeeper.js +directory=/home/dtp/live/dtp-sites +autostart=true +autorestart=true +startretries=3 +stopsignal=INT +stderr_logfile=/var/log/dtp-sites/host-services.err.log +stdout_logfile=/var/log/dtp-sites/host-services.out.log +user=dtp +environment=HOME='/home/dtp/live/dtp-sites',HTTP_BIND_PORT=30%(process_num)02d,NODE_ENV=production,LOGNAME=host-services \ No newline at end of file diff --git a/supervisord/dtp-sites.conf b/supervisord/dtp-sites.conf index 2df7a0b..bbc117d 100644 --- a/supervisord/dtp-sites.conf +++ b/supervisord/dtp-sites.conf @@ -1,7 +1,10 @@ +[group:sites] +programs=dtp-sites + [program:dtp-sites] numprocs=1 process_name=%(program_name)s_%(process_num)02d -command=/home/dtp/.nvm/versions/node/v16.13.0/bin/node --optimize_for_size --max_old_space_size=1024 --gc_interval=100 dtp-sites.js +command=/home/dtp/.nvm/versions/node/v18.12.0/bin/node --optimize_for_size --max_old_space_size=1024 --gc_interval=100 dtp-sites.js directory=/home/dtp/live/dtp-sites autostart=true autorestart=true diff --git a/thumbnail.png b/thumbnail.png new file mode 100644 index 0000000..18eace6 Binary files /dev/null and b/thumbnail.png differ diff --git a/update-master b/update-master new file mode 100644 index 0000000..cfce2a5 --- /dev/null +++ b/update-master @@ -0,0 +1,3 @@ +#!/bin/bash +git fetch origin master +git merge -s ours origin/master \ No newline at end of file