From 4014783dbfa7567b33708ba49b42cfc8a967b44a Mon Sep 17 00:00:00 2001 From: Jonatan Nilsson Date: Tue, 2 Aug 2022 08:00:57 +0000 Subject: [PATCH] restructure --- .gitignore | 13 +-- app/admin.js | 12 -- {api => base}/article/routes.mjs | 0 {api => base}/article/util.mjs | 0 {api => base}/authentication/routes.mjs | 0 {api => base}/authentication/security.mjs | 0 {api => base}/config.mjs | 0 {api => base}/db.mjs | 0 {api => base}/defaults.mjs | 0 {api => base}/file/torrent.mjs | 0 {api => base}/file/util.mjs | 0 {api => base}/media/client.mjs | 0 {api => base}/media/upload.mjs | 0 {api => base}/media/util.mjs | 0 {api => base}/page/routes.mjs | 0 {api => base}/page/util.mjs | 0 {api => base}/pagination/helpers.mjs | 0 {api => base}/pagination/parser.mjs | 0 {api => base}/serve.mjs | 0 {api => base}/server.mjs | 0 {api => base}/util.mjs | 0 config/config.default.json | 48 -------- migrations/20190219105500_base.js | 110 ------------------ migrations/20210104150910_media.js | 20 ---- migrations/20210107081810_indexes.js | 16 --- {app => nfp_moe/app}/_common.scss | 0 {app => nfp_moe/app}/admin.scss | 0 {app => nfp_moe/app}/admin/admin.scss | 0 {app => nfp_moe/app}/admin/articles.js | 0 {app => nfp_moe/app}/admin/articles.scss | 0 {app => nfp_moe/app}/admin/dtsel.js | 0 {app => nfp_moe/app}/admin/editarticle.js | 0 {app => nfp_moe/app}/admin/editor.js | 0 {app => nfp_moe/app}/admin/editpage.js | 0 {app => nfp_moe/app}/admin/editstaff.js | 0 {app => nfp_moe/app}/admin/froala.js | 0 {app => nfp_moe/app}/admin/pages.js | 0 {app => nfp_moe/app}/admin/pages.scss | 0 {app => nfp_moe/app}/admin/staff.scss | 0 {app => nfp_moe/app}/admin/stafflist.js | 0 {app => nfp_moe/app}/api/article.js | 0 {app => nfp_moe/app}/api/article.p.js | 0 {app => nfp_moe/app}/api/common.js | 0 {app => nfp_moe/app}/api/file.js | 0 {app => nfp_moe/app}/api/media.js | 0 {app => nfp_moe/app}/api/page.js | 0 {app => nfp_moe/app}/api/page.p.js | 0 {app => nfp_moe/app}/api/pagination.js | 0 {app => nfp_moe/app}/api/staff.js | 0 {app => nfp_moe/app}/app.scss | 0 {app => nfp_moe/app}/article/article.js | 0 {app => nfp_moe/app}/article/article.scss | 0 {app => nfp_moe/app}/authentication.js | 0 {app => nfp_moe/app}/darkmode.js | 0 {app => nfp_moe/app}/editor.scss | 0 {app => nfp_moe/app}/footer/footer.js | 0 {app => nfp_moe/app}/footer/footer.scss | 0 {app => nfp_moe/app}/frontpage/frontpage.js | 0 {app => nfp_moe/app}/frontpage/frontpage.scss | 0 {app => nfp_moe/app}/index.js | 0 {app => nfp_moe/app}/login/login.js | 0 {app => nfp_moe/app}/login/login.scss | 0 {app => nfp_moe/app}/login/logout.js | 0 {app => nfp_moe/app}/menu/menu.js | 0 {app => nfp_moe/app}/menu/menu.scss | 0 {app => nfp_moe/app}/pages/page.js | 0 {app => nfp_moe/app}/pages/page.scss | 0 {app => nfp_moe/app}/polyfill.js | 0 {app => nfp_moe/app}/widgets/admin.scss | 0 {app => nfp_moe/app}/widgets/common.scss | 0 {app => nfp_moe/app}/widgets/dialogue.js | 0 {app => nfp_moe/app}/widgets/editorblock.js | 0 {app => nfp_moe/app}/widgets/fileinfo.js | 0 {app => nfp_moe/app}/widgets/fileupload.js | 0 {app => nfp_moe/app}/widgets/newsentry.js | 0 {app => nfp_moe/app}/widgets/newsitem.js | 0 {app => nfp_moe/app}/widgets/pages.js | 0 dev.mjs => nfp_moe/dev.mjs | 0 index.mjs => nfp_moe/index.mjs | 0 package.json => nfp_moe/package.json | 0 .../public}/assets/Inter.var.woff2 | Bin {public => nfp_moe/public}/assets/editor.js | 0 .../public}/assets/img/asuna_frontpage.avif | Bin .../public}/assets/img/asuna_frontpage.jpg | Bin .../public}/assets/img/asuna_frontpage.png | Bin .../public}/assets/img/asuna_frontpage.xcf | Bin .../assets/img/asuna_frontpage_test.avif | Bin .../assets/img/asuna_frontpage_test.png | Bin .../assets/img/dark_asuna_frontpage.avif | Bin .../assets/img/dark_asuna_frontpage.jpg | Bin .../assets/img/dark_asuna_frontpage.png | Bin .../assets/img/dark_asuna_frontpage.xcf | Bin .../public}/assets/img/dark_tsun.jpg | Bin .../public}/assets/img/dark_tsun_small.jpg | Bin .../public}/assets/img/delete.svg | 46 ++++---- .../public}/assets/img/favicon.png | Bin .../public}/assets/img/heart.jpg | Bin .../public}/assets/img/heart.png | Bin .../public}/assets/img/heart.psd | Bin .../public}/assets/img/heart.xcf | Bin .../public}/assets/img/login.png | Bin .../public}/assets/img/logo.avif | Bin .../public}/assets/img/logo.jpg | Bin .../public}/assets/img/logo.png | Bin .../public}/assets/img/logo_small.jpg | Bin .../public}/assets/img/tsun.avif | Bin .../public}/assets/img/tsun.jpg | Bin .../public}/assets/img/tsun.png | Bin .../public}/assets/img/tsun_small.jpg | Bin .../public}/assets/img/upload.svg | 56 ++++----- {public => nfp_moe/public}/assets/inter.css | 0 {public => nfp_moe/public}/index.html | 0 {public => nfp_moe/public}/robots.txt | 0 scripts/rollback.mjs | 37 ------ temp.sql | 24 ---- 115 files changed, 57 insertions(+), 325 deletions(-) delete mode 100644 app/admin.js rename {api => base}/article/routes.mjs (100%) rename {api => base}/article/util.mjs (100%) rename {api => base}/authentication/routes.mjs (100%) rename {api => base}/authentication/security.mjs (100%) rename {api => base}/config.mjs (100%) rename {api => base}/db.mjs (100%) rename {api => base}/defaults.mjs (100%) rename {api => base}/file/torrent.mjs (100%) rename {api => base}/file/util.mjs (100%) rename {api => base}/media/client.mjs (100%) rename {api => base}/media/upload.mjs (100%) rename {api => base}/media/util.mjs (100%) rename {api => base}/page/routes.mjs (100%) rename {api => base}/page/util.mjs (100%) rename {api => base}/pagination/helpers.mjs (100%) rename {api => base}/pagination/parser.mjs (100%) rename {api => base}/serve.mjs (100%) rename {api => base}/server.mjs (100%) rename {api => base}/util.mjs (100%) delete mode 100644 config/config.default.json delete mode 100644 migrations/20190219105500_base.js delete mode 100644 migrations/20210104150910_media.js delete mode 100644 migrations/20210107081810_indexes.js rename {app => nfp_moe/app}/_common.scss (100%) rename {app => nfp_moe/app}/admin.scss (100%) rename {app => nfp_moe/app}/admin/admin.scss (100%) rename {app => nfp_moe/app}/admin/articles.js (100%) rename {app => nfp_moe/app}/admin/articles.scss (100%) rename {app => nfp_moe/app}/admin/dtsel.js (100%) rename {app => nfp_moe/app}/admin/editarticle.js (100%) rename {app => nfp_moe/app}/admin/editor.js (100%) rename {app => nfp_moe/app}/admin/editpage.js (100%) rename {app => nfp_moe/app}/admin/editstaff.js (100%) rename {app => nfp_moe/app}/admin/froala.js (100%) rename {app => nfp_moe/app}/admin/pages.js (100%) rename {app => nfp_moe/app}/admin/pages.scss (100%) rename {app => nfp_moe/app}/admin/staff.scss (100%) rename {app => nfp_moe/app}/admin/stafflist.js (100%) rename {app => nfp_moe/app}/api/article.js (100%) rename {app => nfp_moe/app}/api/article.p.js (100%) rename {app => nfp_moe/app}/api/common.js (100%) rename {app => nfp_moe/app}/api/file.js (100%) rename {app => nfp_moe/app}/api/media.js (100%) rename {app => nfp_moe/app}/api/page.js (100%) rename {app => nfp_moe/app}/api/page.p.js (100%) rename {app => nfp_moe/app}/api/pagination.js (100%) rename {app => nfp_moe/app}/api/staff.js (100%) rename {app => nfp_moe/app}/app.scss (100%) rename {app => nfp_moe/app}/article/article.js (100%) rename {app => nfp_moe/app}/article/article.scss (100%) rename {app => nfp_moe/app}/authentication.js (100%) rename {app => nfp_moe/app}/darkmode.js (100%) rename {app => nfp_moe/app}/editor.scss (100%) rename {app => nfp_moe/app}/footer/footer.js (100%) rename {app => nfp_moe/app}/footer/footer.scss (100%) rename {app => nfp_moe/app}/frontpage/frontpage.js (100%) rename {app => nfp_moe/app}/frontpage/frontpage.scss (100%) rename {app => nfp_moe/app}/index.js (100%) rename {app => nfp_moe/app}/login/login.js (100%) rename {app => nfp_moe/app}/login/login.scss (100%) rename {app => nfp_moe/app}/login/logout.js (100%) rename {app => nfp_moe/app}/menu/menu.js (100%) rename {app => nfp_moe/app}/menu/menu.scss (100%) rename {app => nfp_moe/app}/pages/page.js (100%) rename {app => nfp_moe/app}/pages/page.scss (100%) rename {app => nfp_moe/app}/polyfill.js (100%) rename {app => nfp_moe/app}/widgets/admin.scss (100%) rename {app => nfp_moe/app}/widgets/common.scss (100%) rename {app => nfp_moe/app}/widgets/dialogue.js (100%) rename {app => nfp_moe/app}/widgets/editorblock.js (100%) rename {app => nfp_moe/app}/widgets/fileinfo.js (100%) rename {app => nfp_moe/app}/widgets/fileupload.js (100%) rename {app => nfp_moe/app}/widgets/newsentry.js (100%) rename {app => nfp_moe/app}/widgets/newsitem.js (100%) rename {app => nfp_moe/app}/widgets/pages.js (100%) rename dev.mjs => nfp_moe/dev.mjs (100%) rename index.mjs => nfp_moe/index.mjs (100%) rename package.json => nfp_moe/package.json (100%) rename {public => nfp_moe/public}/assets/Inter.var.woff2 (100%) rename {public => nfp_moe/public}/assets/editor.js (100%) rename {public => nfp_moe/public}/assets/img/asuna_frontpage.avif (100%) rename {public => nfp_moe/public}/assets/img/asuna_frontpage.jpg (100%) rename {public => nfp_moe/public}/assets/img/asuna_frontpage.png (100%) rename {public => nfp_moe/public}/assets/img/asuna_frontpage.xcf (100%) rename {public => nfp_moe/public}/assets/img/asuna_frontpage_test.avif (100%) rename {public => nfp_moe/public}/assets/img/asuna_frontpage_test.png (100%) rename {public => nfp_moe/public}/assets/img/dark_asuna_frontpage.avif (100%) rename {public => nfp_moe/public}/assets/img/dark_asuna_frontpage.jpg (100%) rename {public => nfp_moe/public}/assets/img/dark_asuna_frontpage.png (100%) rename {public => nfp_moe/public}/assets/img/dark_asuna_frontpage.xcf (100%) rename {public => nfp_moe/public}/assets/img/dark_tsun.jpg (100%) rename {public => nfp_moe/public}/assets/img/dark_tsun_small.jpg (100%) rename {public => nfp_moe/public}/assets/img/delete.svg (98%) rename {public => nfp_moe/public}/assets/img/favicon.png (100%) rename {public => nfp_moe/public}/assets/img/heart.jpg (100%) rename {public => nfp_moe/public}/assets/img/heart.png (100%) rename {public => nfp_moe/public}/assets/img/heart.psd (100%) rename {public => nfp_moe/public}/assets/img/heart.xcf (100%) rename {public => nfp_moe/public}/assets/img/login.png (100%) rename {public => nfp_moe/public}/assets/img/logo.avif (100%) rename {public => nfp_moe/public}/assets/img/logo.jpg (100%) rename {public => nfp_moe/public}/assets/img/logo.png (100%) rename {public => nfp_moe/public}/assets/img/logo_small.jpg (100%) rename {public => nfp_moe/public}/assets/img/tsun.avif (100%) rename {public => nfp_moe/public}/assets/img/tsun.jpg (100%) rename {public => nfp_moe/public}/assets/img/tsun.png (100%) rename {public => nfp_moe/public}/assets/img/tsun_small.jpg (100%) rename {public => nfp_moe/public}/assets/img/upload.svg (98%) rename {public => nfp_moe/public}/assets/inter.css (100%) rename {public => nfp_moe/public}/index.html (100%) rename {public => nfp_moe/public}/robots.txt (100%) delete mode 100644 scripts/rollback.mjs delete mode 100644 temp.sql diff --git a/.gitignore b/.gitignore index 09a3fec..b0ff62b 100644 --- a/.gitignore +++ b/.gitignore @@ -58,12 +58,11 @@ typings/ .env # Local development config file -config/config.json config.json package-lock.json -public/assets/app.js -public/assets/app.css -public/assets/app.css.map -public/assets/admin.js -public/assets/admin.css -public/assets/admin.css.map +**/app.js +**/app.css +**/app.css.map +**/admin.js +**/admin.css +**/admin.css.map diff --git a/app/admin.js b/app/admin.js deleted file mode 100644 index c6a1cba..0000000 --- a/app/admin.js +++ /dev/null @@ -1,12 +0,0 @@ -const EditPage = require('./admin/editpage') -const AdminPages = require('./admin/pages') -const AdminArticles = require('./admin/articles') -const EditArticle = require('./admin/editarticle') -const AdminStaffList = require('./admin/stafflist') -const EditStaff = require('./admin/editstaff') - -window.adminRoutes = { - pages: [AdminPages, EditPage], - articles: [AdminArticles, EditArticle], - staff: [AdminStaffList, EditStaff], -} diff --git a/api/article/routes.mjs b/base/article/routes.mjs similarity index 100% rename from api/article/routes.mjs rename to base/article/routes.mjs diff --git a/api/article/util.mjs b/base/article/util.mjs similarity index 100% rename from api/article/util.mjs rename to base/article/util.mjs diff --git a/api/authentication/routes.mjs b/base/authentication/routes.mjs similarity index 100% rename from api/authentication/routes.mjs rename to base/authentication/routes.mjs diff --git a/api/authentication/security.mjs b/base/authentication/security.mjs similarity index 100% rename from api/authentication/security.mjs rename to base/authentication/security.mjs diff --git a/api/config.mjs b/base/config.mjs similarity index 100% rename from api/config.mjs rename to base/config.mjs diff --git a/api/db.mjs b/base/db.mjs similarity index 100% rename from api/db.mjs rename to base/db.mjs diff --git a/api/defaults.mjs b/base/defaults.mjs similarity index 100% rename from api/defaults.mjs rename to base/defaults.mjs diff --git a/api/file/torrent.mjs b/base/file/torrent.mjs similarity index 100% rename from api/file/torrent.mjs rename to base/file/torrent.mjs diff --git a/api/file/util.mjs b/base/file/util.mjs similarity index 100% rename from api/file/util.mjs rename to base/file/util.mjs diff --git a/api/media/client.mjs b/base/media/client.mjs similarity index 100% rename from api/media/client.mjs rename to base/media/client.mjs diff --git a/api/media/upload.mjs b/base/media/upload.mjs similarity index 100% rename from api/media/upload.mjs rename to base/media/upload.mjs diff --git a/api/media/util.mjs b/base/media/util.mjs similarity index 100% rename from api/media/util.mjs rename to base/media/util.mjs diff --git a/api/page/routes.mjs b/base/page/routes.mjs similarity index 100% rename from api/page/routes.mjs rename to base/page/routes.mjs diff --git a/api/page/util.mjs b/base/page/util.mjs similarity index 100% rename from api/page/util.mjs rename to base/page/util.mjs diff --git a/api/pagination/helpers.mjs b/base/pagination/helpers.mjs similarity index 100% rename from api/pagination/helpers.mjs rename to base/pagination/helpers.mjs diff --git a/api/pagination/parser.mjs b/base/pagination/parser.mjs similarity index 100% rename from api/pagination/parser.mjs rename to base/pagination/parser.mjs diff --git a/api/serve.mjs b/base/serve.mjs similarity index 100% rename from api/serve.mjs rename to base/serve.mjs diff --git a/api/server.mjs b/base/server.mjs similarity index 100% rename from api/server.mjs rename to base/server.mjs diff --git a/api/util.mjs b/base/util.mjs similarity index 100% rename from api/util.mjs rename to base/util.mjs diff --git a/config/config.default.json b/config/config.default.json deleted file mode 100644 index 1c10d70..0000000 --- a/config/config.default.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "NODE_ENV": "development", - "server": { - "port": 4030, - "host": "0.0.0.0" - }, - "CIRCLECI_VERSION": "circleci_version_number", - "knex": { - "client": "pg", - "connection": { - "host" : "127.0.0.1", - "user" : "postgres", - "password" : "postgres", - "database" : "nfpmoe" - }, - "connectionslave": null, - "migrations": { - }, - "acquireConnectionTimeout": 10000 - }, - "bunyan": { - "name": "nfpmoe", - "streams": [{ - "stream": "process.stdout", - "level": "debug" - } - ] - }, - "frontend": { - "url": "http://beta01.nfp.moe" - }, - "jwt": { - "secret": "this-is-my-secret", - "options": { - "expiresIn": 604800 - } - }, - "sessionsecret": "this-is-session-secret-lol", - "bcrypt": 5, - "fileSize": 524288000, - "upload": { - "baseurl": "https://cdn.nfp.is", - "port": "2111", - "host": "storage01.nfp.is", - "name": "nfpmoe-dev", - "secret": "nfpmoe-dev" - } -} diff --git a/migrations/20190219105500_base.js b/migrations/20190219105500_base.js deleted file mode 100644 index 1bc0a2e..0000000 --- a/migrations/20190219105500_base.js +++ /dev/null @@ -1,110 +0,0 @@ -/* eslint-disable */ - -exports.up = function up(knex, Promise) { - return Promise.all([ - knex.schema.createTable('staff', function(table) { - table.increments() - table.text('email') - table.text('fullname') - table.text('password') - table.boolean('is_deleted') - .notNullable() - .default(false) - table.integer('level') - .notNullable() - .defaultTo(1) - table.timestamps() - }) - .then(pass => - knex('staff').insert({ - email: 'jonatan@nilsson.is', - fullname: 'Admin', - level: 100, - }) - ), - knex.schema.createTable('media', function(table) { - table.increments() - table.text('filename') - table.text('filetype') - table.text('small_image') - table.text('medium_image') - table.text('large_image') - table.text('org_image') - table.integer('size') - table.integer('staff_id') - .references('staff.id') - table.boolean('is_deleted') - .notNullable() - .default(false) - table.timestamps() - }), - knex.schema.createTable('pages', function(table) { - table.increments() - table.integer('staff_id') - .references('staff.id') - table.integer('parent_id') - .references('pages.id') - table.text('name') - table.text('path') - table.text('description') - table.integer('banner_id') - .references('media.id') - .defaultTo(null) - table.integer('media_id') - .references('media.id') - .defaultTo(null) - table.boolean('is_deleted') - .notNullable() - .default(false) - table.timestamps() - }), - knex.schema.createTable('articles', function(table) { - table.increments() - table.integer('staff_id') - .references('staff.id') - table.integer('parent_id') - .references('pages.id') - table.text('name') - table.text('path') - table.text('description') - table.integer('banner_id') - .references('media.id') - .defaultTo(null) - table.integer('media_id') - .references('media.id') - .defaultTo(null) - table.boolean('is_deleted') - .notNullable() - .default(false) - table.timestamp('published_at') - .defaultTo(knex.fn.now()) - table.boolean('is_featured') - .notNullable() - .default(false) - table.timestamps() - }), - knex.schema.createTable('files', function(table) { - table.increments() - table.integer('article_id') - .references('articles.id') - table.text('filename') - table.text('filetype') - table.text('path') - table.integer('size') - table.integer('staff_id') - .references('staff.id') - table.jsonb('meta') - table.boolean('is_deleted') - .notNullable() - .default(false) - table.timestamps() - }), - ]) -} - -exports.down = function down(knex, Promise) { - return Promise.all([ - knex.schema.dropTable('media'), - knex.schema.dropTable('staff'), - ]) -} diff --git a/migrations/20210104150910_media.js b/migrations/20210104150910_media.js deleted file mode 100644 index 3c862e9..0000000 --- a/migrations/20210104150910_media.js +++ /dev/null @@ -1,20 +0,0 @@ -/* eslint-disable */ -exports.up = function(knex) { - return Promise.all([ - knex.schema.table('media', function(table) { - table.text('small_image_avif') - table.text('medium_image_avif') - table.text('large_image_avif') - }) - ]) -}; - -exports.down = function(knex) { - return Promise.all([ - knex.schema.table('media', function(table) { - table.dropColumn('small_image_avif') - table.dropColumn('medium_image_avif') - table.dropColumn('large_image_avif') - }) - ]) -}; diff --git a/migrations/20210107081810_indexes.js b/migrations/20210107081810_indexes.js deleted file mode 100644 index 80ae8ae..0000000 --- a/migrations/20210107081810_indexes.js +++ /dev/null @@ -1,16 +0,0 @@ -/* eslint-disable */ -exports.up = function(knex) { - return Promise.all([ - knex.schema.raw('create index pages_gettree_index on pages (name asc) where not is_deleted'), - knex.schema.raw('create index pages_featuredpublish_index on articles (published_at desc) where is_featured = true and not is_deleted'), - knex.schema.raw('create index pages_publish_index on articles (published_at desc) where is_deleted = false'), - ]) -}; - -exports.down = function(knex) { - return Promise.all([ - knex.schema.table('pages', function(table) { - table.dropIndex('pages_gettree_index') - }) - ]) -}; diff --git a/app/_common.scss b/nfp_moe/app/_common.scss similarity index 100% rename from app/_common.scss rename to nfp_moe/app/_common.scss diff --git a/app/admin.scss b/nfp_moe/app/admin.scss similarity index 100% rename from app/admin.scss rename to nfp_moe/app/admin.scss diff --git a/app/admin/admin.scss b/nfp_moe/app/admin/admin.scss similarity index 100% rename from app/admin/admin.scss rename to nfp_moe/app/admin/admin.scss diff --git a/app/admin/articles.js b/nfp_moe/app/admin/articles.js similarity index 100% rename from app/admin/articles.js rename to nfp_moe/app/admin/articles.js diff --git a/app/admin/articles.scss b/nfp_moe/app/admin/articles.scss similarity index 100% rename from app/admin/articles.scss rename to nfp_moe/app/admin/articles.scss diff --git a/app/admin/dtsel.js b/nfp_moe/app/admin/dtsel.js similarity index 100% rename from app/admin/dtsel.js rename to nfp_moe/app/admin/dtsel.js diff --git a/app/admin/editarticle.js b/nfp_moe/app/admin/editarticle.js similarity index 100% rename from app/admin/editarticle.js rename to nfp_moe/app/admin/editarticle.js diff --git a/app/admin/editor.js b/nfp_moe/app/admin/editor.js similarity index 100% rename from app/admin/editor.js rename to nfp_moe/app/admin/editor.js diff --git a/app/admin/editpage.js b/nfp_moe/app/admin/editpage.js similarity index 100% rename from app/admin/editpage.js rename to nfp_moe/app/admin/editpage.js diff --git a/app/admin/editstaff.js b/nfp_moe/app/admin/editstaff.js similarity index 100% rename from app/admin/editstaff.js rename to nfp_moe/app/admin/editstaff.js diff --git a/app/admin/froala.js b/nfp_moe/app/admin/froala.js similarity index 100% rename from app/admin/froala.js rename to nfp_moe/app/admin/froala.js diff --git a/app/admin/pages.js b/nfp_moe/app/admin/pages.js similarity index 100% rename from app/admin/pages.js rename to nfp_moe/app/admin/pages.js diff --git a/app/admin/pages.scss b/nfp_moe/app/admin/pages.scss similarity index 100% rename from app/admin/pages.scss rename to nfp_moe/app/admin/pages.scss diff --git a/app/admin/staff.scss b/nfp_moe/app/admin/staff.scss similarity index 100% rename from app/admin/staff.scss rename to nfp_moe/app/admin/staff.scss diff --git a/app/admin/stafflist.js b/nfp_moe/app/admin/stafflist.js similarity index 100% rename from app/admin/stafflist.js rename to nfp_moe/app/admin/stafflist.js diff --git a/app/api/article.js b/nfp_moe/app/api/article.js similarity index 100% rename from app/api/article.js rename to nfp_moe/app/api/article.js diff --git a/app/api/article.p.js b/nfp_moe/app/api/article.p.js similarity index 100% rename from app/api/article.p.js rename to nfp_moe/app/api/article.p.js diff --git a/app/api/common.js b/nfp_moe/app/api/common.js similarity index 100% rename from app/api/common.js rename to nfp_moe/app/api/common.js diff --git a/app/api/file.js b/nfp_moe/app/api/file.js similarity index 100% rename from app/api/file.js rename to nfp_moe/app/api/file.js diff --git a/app/api/media.js b/nfp_moe/app/api/media.js similarity index 100% rename from app/api/media.js rename to nfp_moe/app/api/media.js diff --git a/app/api/page.js b/nfp_moe/app/api/page.js similarity index 100% rename from app/api/page.js rename to nfp_moe/app/api/page.js diff --git a/app/api/page.p.js b/nfp_moe/app/api/page.p.js similarity index 100% rename from app/api/page.p.js rename to nfp_moe/app/api/page.p.js diff --git a/app/api/pagination.js b/nfp_moe/app/api/pagination.js similarity index 100% rename from app/api/pagination.js rename to nfp_moe/app/api/pagination.js diff --git a/app/api/staff.js b/nfp_moe/app/api/staff.js similarity index 100% rename from app/api/staff.js rename to nfp_moe/app/api/staff.js diff --git a/app/app.scss b/nfp_moe/app/app.scss similarity index 100% rename from app/app.scss rename to nfp_moe/app/app.scss diff --git a/app/article/article.js b/nfp_moe/app/article/article.js similarity index 100% rename from app/article/article.js rename to nfp_moe/app/article/article.js diff --git a/app/article/article.scss b/nfp_moe/app/article/article.scss similarity index 100% rename from app/article/article.scss rename to nfp_moe/app/article/article.scss diff --git a/app/authentication.js b/nfp_moe/app/authentication.js similarity index 100% rename from app/authentication.js rename to nfp_moe/app/authentication.js diff --git a/app/darkmode.js b/nfp_moe/app/darkmode.js similarity index 100% rename from app/darkmode.js rename to nfp_moe/app/darkmode.js diff --git a/app/editor.scss b/nfp_moe/app/editor.scss similarity index 100% rename from app/editor.scss rename to nfp_moe/app/editor.scss diff --git a/app/footer/footer.js b/nfp_moe/app/footer/footer.js similarity index 100% rename from app/footer/footer.js rename to nfp_moe/app/footer/footer.js diff --git a/app/footer/footer.scss b/nfp_moe/app/footer/footer.scss similarity index 100% rename from app/footer/footer.scss rename to nfp_moe/app/footer/footer.scss diff --git a/app/frontpage/frontpage.js b/nfp_moe/app/frontpage/frontpage.js similarity index 100% rename from app/frontpage/frontpage.js rename to nfp_moe/app/frontpage/frontpage.js diff --git a/app/frontpage/frontpage.scss b/nfp_moe/app/frontpage/frontpage.scss similarity index 100% rename from app/frontpage/frontpage.scss rename to nfp_moe/app/frontpage/frontpage.scss diff --git a/app/index.js b/nfp_moe/app/index.js similarity index 100% rename from app/index.js rename to nfp_moe/app/index.js diff --git a/app/login/login.js b/nfp_moe/app/login/login.js similarity index 100% rename from app/login/login.js rename to nfp_moe/app/login/login.js diff --git a/app/login/login.scss b/nfp_moe/app/login/login.scss similarity index 100% rename from app/login/login.scss rename to nfp_moe/app/login/login.scss diff --git a/app/login/logout.js b/nfp_moe/app/login/logout.js similarity index 100% rename from app/login/logout.js rename to nfp_moe/app/login/logout.js diff --git a/app/menu/menu.js b/nfp_moe/app/menu/menu.js similarity index 100% rename from app/menu/menu.js rename to nfp_moe/app/menu/menu.js diff --git a/app/menu/menu.scss b/nfp_moe/app/menu/menu.scss similarity index 100% rename from app/menu/menu.scss rename to nfp_moe/app/menu/menu.scss diff --git a/app/pages/page.js b/nfp_moe/app/pages/page.js similarity index 100% rename from app/pages/page.js rename to nfp_moe/app/pages/page.js diff --git a/app/pages/page.scss b/nfp_moe/app/pages/page.scss similarity index 100% rename from app/pages/page.scss rename to nfp_moe/app/pages/page.scss diff --git a/app/polyfill.js b/nfp_moe/app/polyfill.js similarity index 100% rename from app/polyfill.js rename to nfp_moe/app/polyfill.js diff --git a/app/widgets/admin.scss b/nfp_moe/app/widgets/admin.scss similarity index 100% rename from app/widgets/admin.scss rename to nfp_moe/app/widgets/admin.scss diff --git a/app/widgets/common.scss b/nfp_moe/app/widgets/common.scss similarity index 100% rename from app/widgets/common.scss rename to nfp_moe/app/widgets/common.scss diff --git a/app/widgets/dialogue.js b/nfp_moe/app/widgets/dialogue.js similarity index 100% rename from app/widgets/dialogue.js rename to nfp_moe/app/widgets/dialogue.js diff --git a/app/widgets/editorblock.js b/nfp_moe/app/widgets/editorblock.js similarity index 100% rename from app/widgets/editorblock.js rename to nfp_moe/app/widgets/editorblock.js diff --git a/app/widgets/fileinfo.js b/nfp_moe/app/widgets/fileinfo.js similarity index 100% rename from app/widgets/fileinfo.js rename to nfp_moe/app/widgets/fileinfo.js diff --git a/app/widgets/fileupload.js b/nfp_moe/app/widgets/fileupload.js similarity index 100% rename from app/widgets/fileupload.js rename to nfp_moe/app/widgets/fileupload.js diff --git a/app/widgets/newsentry.js b/nfp_moe/app/widgets/newsentry.js similarity index 100% rename from app/widgets/newsentry.js rename to nfp_moe/app/widgets/newsentry.js diff --git a/app/widgets/newsitem.js b/nfp_moe/app/widgets/newsitem.js similarity index 100% rename from app/widgets/newsitem.js rename to nfp_moe/app/widgets/newsitem.js diff --git a/app/widgets/pages.js b/nfp_moe/app/widgets/pages.js similarity index 100% rename from app/widgets/pages.js rename to nfp_moe/app/widgets/pages.js diff --git a/dev.mjs b/nfp_moe/dev.mjs similarity index 100% rename from dev.mjs rename to nfp_moe/dev.mjs diff --git a/index.mjs b/nfp_moe/index.mjs similarity index 100% rename from index.mjs rename to nfp_moe/index.mjs diff --git a/package.json b/nfp_moe/package.json similarity index 100% rename from package.json rename to nfp_moe/package.json diff --git a/public/assets/Inter.var.woff2 b/nfp_moe/public/assets/Inter.var.woff2 similarity index 100% rename from public/assets/Inter.var.woff2 rename to nfp_moe/public/assets/Inter.var.woff2 diff --git a/public/assets/editor.js b/nfp_moe/public/assets/editor.js similarity index 100% rename from public/assets/editor.js rename to nfp_moe/public/assets/editor.js diff --git a/public/assets/img/asuna_frontpage.avif b/nfp_moe/public/assets/img/asuna_frontpage.avif similarity index 100% rename from public/assets/img/asuna_frontpage.avif rename to nfp_moe/public/assets/img/asuna_frontpage.avif diff --git a/public/assets/img/asuna_frontpage.jpg b/nfp_moe/public/assets/img/asuna_frontpage.jpg similarity index 100% rename from public/assets/img/asuna_frontpage.jpg rename to nfp_moe/public/assets/img/asuna_frontpage.jpg diff --git a/public/assets/img/asuna_frontpage.png b/nfp_moe/public/assets/img/asuna_frontpage.png similarity index 100% rename from public/assets/img/asuna_frontpage.png rename to nfp_moe/public/assets/img/asuna_frontpage.png diff --git a/public/assets/img/asuna_frontpage.xcf b/nfp_moe/public/assets/img/asuna_frontpage.xcf similarity index 100% rename from public/assets/img/asuna_frontpage.xcf rename to nfp_moe/public/assets/img/asuna_frontpage.xcf diff --git a/public/assets/img/asuna_frontpage_test.avif b/nfp_moe/public/assets/img/asuna_frontpage_test.avif similarity index 100% rename from public/assets/img/asuna_frontpage_test.avif rename to nfp_moe/public/assets/img/asuna_frontpage_test.avif diff --git a/public/assets/img/asuna_frontpage_test.png b/nfp_moe/public/assets/img/asuna_frontpage_test.png similarity index 100% rename from public/assets/img/asuna_frontpage_test.png rename to nfp_moe/public/assets/img/asuna_frontpage_test.png diff --git a/public/assets/img/dark_asuna_frontpage.avif b/nfp_moe/public/assets/img/dark_asuna_frontpage.avif similarity index 100% rename from public/assets/img/dark_asuna_frontpage.avif rename to nfp_moe/public/assets/img/dark_asuna_frontpage.avif diff --git a/public/assets/img/dark_asuna_frontpage.jpg b/nfp_moe/public/assets/img/dark_asuna_frontpage.jpg similarity index 100% rename from public/assets/img/dark_asuna_frontpage.jpg rename to nfp_moe/public/assets/img/dark_asuna_frontpage.jpg diff --git a/public/assets/img/dark_asuna_frontpage.png b/nfp_moe/public/assets/img/dark_asuna_frontpage.png similarity index 100% rename from public/assets/img/dark_asuna_frontpage.png rename to nfp_moe/public/assets/img/dark_asuna_frontpage.png diff --git a/public/assets/img/dark_asuna_frontpage.xcf b/nfp_moe/public/assets/img/dark_asuna_frontpage.xcf similarity index 100% rename from public/assets/img/dark_asuna_frontpage.xcf rename to nfp_moe/public/assets/img/dark_asuna_frontpage.xcf diff --git a/public/assets/img/dark_tsun.jpg b/nfp_moe/public/assets/img/dark_tsun.jpg similarity index 100% rename from public/assets/img/dark_tsun.jpg rename to nfp_moe/public/assets/img/dark_tsun.jpg diff --git a/public/assets/img/dark_tsun_small.jpg b/nfp_moe/public/assets/img/dark_tsun_small.jpg similarity index 100% rename from public/assets/img/dark_tsun_small.jpg rename to nfp_moe/public/assets/img/dark_tsun_small.jpg diff --git a/public/assets/img/delete.svg b/nfp_moe/public/assets/img/delete.svg similarity index 98% rename from public/assets/img/delete.svg rename to nfp_moe/public/assets/img/delete.svg index cd44bfe..07874b2 100644 --- a/public/assets/img/delete.svg +++ b/nfp_moe/public/assets/img/delete.svg @@ -1,23 +1,23 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/public/assets/img/favicon.png b/nfp_moe/public/assets/img/favicon.png similarity index 100% rename from public/assets/img/favicon.png rename to nfp_moe/public/assets/img/favicon.png diff --git a/public/assets/img/heart.jpg b/nfp_moe/public/assets/img/heart.jpg similarity index 100% rename from public/assets/img/heart.jpg rename to nfp_moe/public/assets/img/heart.jpg diff --git a/public/assets/img/heart.png b/nfp_moe/public/assets/img/heart.png similarity index 100% rename from public/assets/img/heart.png rename to nfp_moe/public/assets/img/heart.png diff --git a/public/assets/img/heart.psd b/nfp_moe/public/assets/img/heart.psd similarity index 100% rename from public/assets/img/heart.psd rename to nfp_moe/public/assets/img/heart.psd diff --git a/public/assets/img/heart.xcf b/nfp_moe/public/assets/img/heart.xcf similarity index 100% rename from public/assets/img/heart.xcf rename to nfp_moe/public/assets/img/heart.xcf diff --git a/public/assets/img/login.png b/nfp_moe/public/assets/img/login.png similarity index 100% rename from public/assets/img/login.png rename to nfp_moe/public/assets/img/login.png diff --git a/public/assets/img/logo.avif b/nfp_moe/public/assets/img/logo.avif similarity index 100% rename from public/assets/img/logo.avif rename to nfp_moe/public/assets/img/logo.avif diff --git a/public/assets/img/logo.jpg b/nfp_moe/public/assets/img/logo.jpg similarity index 100% rename from public/assets/img/logo.jpg rename to nfp_moe/public/assets/img/logo.jpg diff --git a/public/assets/img/logo.png b/nfp_moe/public/assets/img/logo.png similarity index 100% rename from public/assets/img/logo.png rename to nfp_moe/public/assets/img/logo.png diff --git a/public/assets/img/logo_small.jpg b/nfp_moe/public/assets/img/logo_small.jpg similarity index 100% rename from public/assets/img/logo_small.jpg rename to nfp_moe/public/assets/img/logo_small.jpg diff --git a/public/assets/img/tsun.avif b/nfp_moe/public/assets/img/tsun.avif similarity index 100% rename from public/assets/img/tsun.avif rename to nfp_moe/public/assets/img/tsun.avif diff --git a/public/assets/img/tsun.jpg b/nfp_moe/public/assets/img/tsun.jpg similarity index 100% rename from public/assets/img/tsun.jpg rename to nfp_moe/public/assets/img/tsun.jpg diff --git a/public/assets/img/tsun.png b/nfp_moe/public/assets/img/tsun.png similarity index 100% rename from public/assets/img/tsun.png rename to nfp_moe/public/assets/img/tsun.png diff --git a/public/assets/img/tsun_small.jpg b/nfp_moe/public/assets/img/tsun_small.jpg similarity index 100% rename from public/assets/img/tsun_small.jpg rename to nfp_moe/public/assets/img/tsun_small.jpg diff --git a/public/assets/img/upload.svg b/nfp_moe/public/assets/img/upload.svg similarity index 98% rename from public/assets/img/upload.svg rename to nfp_moe/public/assets/img/upload.svg index 2e98a84..2ff44ab 100644 --- a/public/assets/img/upload.svg +++ b/nfp_moe/public/assets/img/upload.svg @@ -1,28 +1,28 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/public/assets/inter.css b/nfp_moe/public/assets/inter.css similarity index 100% rename from public/assets/inter.css rename to nfp_moe/public/assets/inter.css diff --git a/public/index.html b/nfp_moe/public/index.html similarity index 100% rename from public/index.html rename to nfp_moe/public/index.html diff --git a/public/robots.txt b/nfp_moe/public/robots.txt similarity index 100% rename from public/robots.txt rename to nfp_moe/public/robots.txt diff --git a/scripts/rollback.mjs b/scripts/rollback.mjs deleted file mode 100644 index 6090146..0000000 --- a/scripts/rollback.mjs +++ /dev/null @@ -1,37 +0,0 @@ -import _ from 'lodash' - -import config from '../api/config.mjs' -import log from '../api/log.mjs' -import knex from 'knex-core' - -// This is important for setup to run cleanly. -let knexConfig = _.cloneDeep(config.get('knex')) -knexConfig.pool = { min: 1, max: 1 } - -let knexSetup = knex(knexConfig) - -export default function rollback() { - log.info(knexConfig, 'Running database rollback.') - - return knexSetup.migrate.rollback({ - directory: './migrations', - }) - .then((result) => { - if (result[1].length === 0) { - return log.info('Database has been roll backed') - } - for (let i = 0; i < result[1].length; i++) { - log.info('Rollbacked migration from', result[1][i].substr(result[1][i].lastIndexOf('\\') + 1)) - } - return knexSetup.destroy() - }) -} - -rollback() -.catch(async (error) => { - log.error({ code: error.code, message: error.message }, 'Error while rollbacking database') - log.error('Unable to verify database integrity.') - process.exit(1) -}).then(() => - process.exit(0) -) diff --git a/temp.sql b/temp.sql deleted file mode 100644 index 2afd9c6..0000000 --- a/temp.sql +++ /dev/null @@ -1,24 +0,0 @@ -use nfp_sites; -go - --- Object_definition(object_id) - -Declare @sql varchar(max) ; -SELECT @sql=Object_definition(object_id) -FROM sys.procedures -WHERE name = 'spe_get_my_data' and SCHEMA_NAME(schema_id) = 'dbo'; -SET @sql=REPLACE(@sql, 'CREATE PROCEDURE [dbo].', 'ALTER PROCEDURE [nfp_moe].'); -print @sql -exec (@sql) -print '-----------------------------'; - - -SELECT * -FROM sys.procedures -WHERE name like 'spe_%' and SCHEMA_NAME(schema_id) = 'dbo'; - - -SELECT * -FROM sys.procedures where SCHEMA_NAME(schema_id) = 'dbo'; - -EXEC sp_helptext 'dbo.spe_get_schema'; \ No newline at end of file