From 4c0540ff6e4fe0fb8c141a11d21ca069357981ce Mon Sep 17 00:00:00 2001 From: nvc8996 Date: Wed, 6 Oct 2021 16:35:31 +0300 Subject: [PATCH] fixed compiling error, re-organized ts source code --- config/testing.json | 2 +- package.json | 14 +++++++------- {dev/src => src/backend}/app.ts | 2 +- {dev/src => src/backend}/controllers/aliases.ts | 0 {dev/src => src/backend}/controllers/pages.ts | 0 .../backend}/controllers/pagesOrder.ts | 0 .../backend}/controllers/transport.ts | 0 {dev/src => src/backend}/controllers/users.ts | 0 .../backend}/exceptions/httpException.ts | 0 {dev/src => src/backend}/models/alias.ts | 0 {dev/src => src/backend}/models/file.ts | 2 +- {dev/src => src/backend}/models/page.ts | 2 +- {dev/src => src/backend}/models/pageOrder.ts | 0 {dev/src => src/backend}/models/user.ts | 0 {dev/src => src/backend}/routes/aliases.ts | 0 {dev/src => src/backend}/routes/api/index.ts | 0 {dev/src => src/backend}/routes/api/links.ts | 0 {dev/src => src/backend}/routes/api/pages.ts | 0 .../src => src/backend}/routes/api/transport.ts | 0 {dev/src => src/backend}/routes/auth.ts | 0 {dev/src => src/backend}/routes/home.ts | 0 {dev/src => src/backend}/routes/index.ts | 0 .../backend}/routes/middlewares/locals.ts | 0 .../backend}/routes/middlewares/pages.ts | 0 .../backend}/routes/middlewares/token.ts | 0 {dev/src => src/backend}/routes/pages.ts | 0 .../backend}/utils/asyncMiddleware.ts | 0 {dev/src => src/backend}/utils/crypto.ts | 0 .../src => src/backend}/utils/database/index.ts | 8 ++++---- .../backend}/utils/database/initDb.ts | 0 {dev/src => src/backend}/utils/objects.ts | 0 {dev/src => src/backend}/utils/rcparser.ts | 0 {dev/src => src/backend}/utils/translation.ts | 0 {dev/src => src/backend}/utils/twig.ts | 2 +- {dev/src => src/backend}/utils/urlify.ts | 0 {views => src/backend/views}/auth.twig | 0 .../backend/views}/components/aside.twig | 0 .../backend/views}/components/header.twig | 0 {views => src/backend/views}/error.twig | 0 {views => src/backend/views}/layout.twig | 0 .../backend/views}/pages/blocks/checklist.twig | 0 .../backend/views}/pages/blocks/code.twig | 0 .../backend/views}/pages/blocks/delimiter.twig | 0 .../backend/views}/pages/blocks/header.twig | 0 .../backend/views}/pages/blocks/image.twig | 0 .../backend/views}/pages/blocks/linkTool.twig | 0 .../backend/views}/pages/blocks/list.twig | 0 .../backend/views}/pages/blocks/paragraph.twig | 0 .../backend/views}/pages/blocks/raw.twig | 0 .../backend/views}/pages/blocks/table.twig | 0 .../backend/views}/pages/blocks/warning.twig | 0 {views => src/backend/views}/pages/form.twig | 0 {views => src/backend/views}/pages/index.twig | 0 {views => src/backend/views}/pages/page.twig | 0 {dev => src}/bin/nvm.sh | 0 {dev => src}/bin/server.ts | 2 +- {frontend => src/frontend}/.postcssrc | 0 {frontend => src/frontend}/js/app.js | 0 .../frontend}/js/classes/codeStyler.js | 0 {frontend => src/frontend}/js/classes/editor.js | 0 .../frontend}/js/modules/extensions.js | 0 {frontend => src/frontend}/js/modules/page.js | 0 .../frontend}/js/modules/writing.js | 0 {frontend => src/frontend}/styles/carbon.pcss | 0 .../frontend}/styles/components/aside.pcss | 0 .../frontend}/styles/components/auth.pcss | 0 .../frontend}/styles/components/header.pcss | 0 .../frontend}/styles/components/landing.pcss | 0 .../frontend}/styles/components/page.pcss | 0 .../frontend}/styles/components/writing.pcss | 0 {frontend => src/frontend}/styles/diff.pcss | 0 {frontend => src/frontend}/styles/layout.pcss | 0 {frontend => src/frontend}/styles/main.pcss | 0 {frontend => src/frontend}/styles/vars.pcss | 0 {frontend => src/frontend}/svg/loader.svg | 0 {frontend => src/frontend}/svg/menu.svg | 0 {frontend => src/frontend}/svg/plus.svg | 0 {dev => src}/generatePassword.ts | 2 +- {dev => src}/test/database.ts | 2 +- {dev => src}/test/express.ts | 0 {dev => src}/test/models/alias.ts | 6 +++--- {dev => src}/test/models/file.ts | 4 ++-- {dev => src}/test/models/page.ts | 6 +++--- {dev => src}/test/models/pageOrder.ts | 4 ++-- {dev => src}/test/rcparser.ts | 2 +- {dev => src}/test/rest/aliases.ts | 0 {dev => src}/test/rest/pages.ts | 8 ++++---- {dev => src}/test/rest/test_file.json | 0 {dev => src}/test/rest/test_image.png | Bin {dev => src}/test/rest/transport.ts | 16 ++++++++-------- 90 files changed, 42 insertions(+), 42 deletions(-) rename {dev/src => src/backend}/app.ts (93%) rename {dev/src => src/backend}/controllers/aliases.ts (100%) rename {dev/src => src/backend}/controllers/pages.ts (100%) rename {dev/src => src/backend}/controllers/pagesOrder.ts (100%) rename {dev/src => src/backend}/controllers/transport.ts (100%) rename {dev/src => src/backend}/controllers/users.ts (100%) rename {dev/src => src/backend}/exceptions/httpException.ts (100%) rename {dev/src => src/backend}/models/alias.ts (100%) rename {dev/src => src/backend}/models/file.ts (97%) rename {dev/src => src/backend}/models/page.ts (98%) rename {dev/src => src/backend}/models/pageOrder.ts (100%) rename {dev/src => src/backend}/models/user.ts (100%) rename {dev/src => src/backend}/routes/aliases.ts (100%) rename {dev/src => src/backend}/routes/api/index.ts (100%) rename {dev/src => src/backend}/routes/api/links.ts (100%) rename {dev/src => src/backend}/routes/api/pages.ts (100%) rename {dev/src => src/backend}/routes/api/transport.ts (100%) rename {dev/src => src/backend}/routes/auth.ts (100%) rename {dev/src => src/backend}/routes/home.ts (100%) rename {dev/src => src/backend}/routes/index.ts (100%) rename {dev/src => src/backend}/routes/middlewares/locals.ts (100%) rename {dev/src => src/backend}/routes/middlewares/pages.ts (100%) rename {dev/src => src/backend}/routes/middlewares/token.ts (100%) rename {dev/src => src/backend}/routes/pages.ts (100%) rename {dev/src => src/backend}/utils/asyncMiddleware.ts (100%) rename {dev/src => src/backend}/utils/crypto.ts (100%) rename {dev/src => src/backend}/utils/database/index.ts (91%) rename {dev/src => src/backend}/utils/database/initDb.ts (100%) rename {dev/src => src/backend}/utils/objects.ts (100%) rename {dev/src => src/backend}/utils/rcparser.ts (100%) rename {dev/src => src/backend}/utils/translation.ts (100%) rename {dev/src => src/backend}/utils/twig.ts (93%) rename {dev/src => src/backend}/utils/urlify.ts (100%) rename {views => src/backend/views}/auth.twig (100%) rename {views => src/backend/views}/components/aside.twig (100%) rename {views => src/backend/views}/components/header.twig (100%) rename {views => src/backend/views}/error.twig (100%) rename {views => src/backend/views}/layout.twig (100%) rename {views => src/backend/views}/pages/blocks/checklist.twig (100%) rename {views => src/backend/views}/pages/blocks/code.twig (100%) rename {views => src/backend/views}/pages/blocks/delimiter.twig (100%) rename {views => src/backend/views}/pages/blocks/header.twig (100%) rename {views => src/backend/views}/pages/blocks/image.twig (100%) rename {views => src/backend/views}/pages/blocks/linkTool.twig (100%) rename {views => src/backend/views}/pages/blocks/list.twig (100%) rename {views => src/backend/views}/pages/blocks/paragraph.twig (100%) rename {views => src/backend/views}/pages/blocks/raw.twig (100%) rename {views => src/backend/views}/pages/blocks/table.twig (100%) rename {views => src/backend/views}/pages/blocks/warning.twig (100%) rename {views => src/backend/views}/pages/form.twig (100%) rename {views => src/backend/views}/pages/index.twig (100%) rename {views => src/backend/views}/pages/page.twig (100%) rename {dev => src}/bin/nvm.sh (100%) rename {dev => src}/bin/server.ts (98%) rename {frontend => src/frontend}/.postcssrc (100%) rename {frontend => src/frontend}/js/app.js (100%) rename {frontend => src/frontend}/js/classes/codeStyler.js (100%) rename {frontend => src/frontend}/js/classes/editor.js (100%) rename {frontend => src/frontend}/js/modules/extensions.js (100%) rename {frontend => src/frontend}/js/modules/page.js (100%) rename {frontend => src/frontend}/js/modules/writing.js (100%) rename {frontend => src/frontend}/styles/carbon.pcss (100%) rename {frontend => src/frontend}/styles/components/aside.pcss (100%) rename {frontend => src/frontend}/styles/components/auth.pcss (100%) rename {frontend => src/frontend}/styles/components/header.pcss (100%) rename {frontend => src/frontend}/styles/components/landing.pcss (100%) rename {frontend => src/frontend}/styles/components/page.pcss (100%) rename {frontend => src/frontend}/styles/components/writing.pcss (100%) rename {frontend => src/frontend}/styles/diff.pcss (100%) rename {frontend => src/frontend}/styles/layout.pcss (100%) rename {frontend => src/frontend}/styles/main.pcss (100%) rename {frontend => src/frontend}/styles/vars.pcss (100%) rename {frontend => src/frontend}/svg/loader.svg (100%) rename {frontend => src/frontend}/svg/menu.svg (100%) rename {frontend => src/frontend}/svg/plus.svg (100%) rename {dev => src}/generatePassword.ts (96%) rename {dev => src}/test/database.ts (99%) rename {dev => src}/test/express.ts (100%) rename {dev => src}/test/models/alias.ts (96%) rename {dev => src}/test/models/file.ts (98%) rename {dev => src}/test/models/page.ts (98%) rename {dev => src}/test/models/pageOrder.ts (97%) rename {dev => src}/test/rcparser.ts (99%) rename {dev => src}/test/rest/aliases.ts (100%) rename {dev => src}/test/rest/pages.ts (98%) rename {dev => src}/test/rest/test_file.json (100%) rename {dev => src}/test/rest/test_image.png (100%) rename {dev => src}/test/rest/transport.ts (93%) diff --git a/config/testing.json b/config/testing.json index 96a5938..25371d0 100644 --- a/config/testing.json +++ b/config/testing.json @@ -1,7 +1,7 @@ { "port": 3001, "database": ".testdb", - "rcFile": "./dev/test/.codexdocsrc", + "rcFile": "./src/test/.codexdocsrc", "uploads": "public/uploads_test", "secret": "iamasecretstring" } diff --git a/package.json b/package.json index 70548e5..6807643 100644 --- a/package.json +++ b/package.json @@ -10,15 +10,15 @@ ], "scripts": { "start": "cross-env NODE_ENV=production nodemon --config nodemon.json ./dist/bin/server.js", - "start:ts": "cross-env NODE_ENV=production nodemon --config nodemon.json ./dev/bin/server.ts", - "start:dev": "cross-env NODE_ENV=development nodemon --config nodemon.json ./dev/bin/server.ts", + "start:ts": "cross-env NODE_ENV=production nodemon --config nodemon.json ./src/bin/server.ts", + "start:dev": "cross-env NODE_ENV=development nodemon --config nodemon.json ./src/bin/server.ts", "test": "cross-env NODE_ENV=testing mocha --recursive ./dist/test --exit", - "test:ts": "cross-env NODE_ENV=testing ts-mocha ./dev/test/*.ts ./dev/test/**/*.ts --exit", - "lint": "eslint --fix --cache --ext .ts ./dev/src", - "build": "webpack ./frontend/js/app.js --o='./public/dist/[name].bundle.js' --output-library=Docs --output-public-path=/dist/ -p --mode=production", - "build:dev": "webpack ./frontend/js/app.js --o='./public/dist/[name].bundle.js' --output-library=Docs --output-public-path=/dist/ -p --mode=development --watch", + "test:ts": "cross-env NODE_ENV=testing ts-mocha ./src/test/*.ts ./src/test/**/*.ts --exit", + "lint": "eslint --fix --cache --ext .ts ./src/backend", + "build": "webpack ./src/frontend/js/app.js --o='./public/dist/[name].bundle.js' --output-library=Docs --output-public-path=/dist/ -p --mode=production", + "build:dev": "webpack ./src/frontend/js/app.js --o='./public/dist/[name].bundle.js' --output-library=Docs --output-public-path=/dist/ -p --mode=development --watch", "precommit": "yarn lint && yarn test:ts", - "generatePassword:ts": "ts-node ./dev/generatePassword.ts", + "generatePassword:ts": "ts-node ./src/generatePassword.ts", "generatePassword": "node ./dist/generatePassword.js", "editor-upgrade": "yarn add -D @editorjs/{editorjs,header,code,delimiter,list,link,image,table,inline-code,marker,warning,checklist,raw}@latest", "compile": "npx tsc" diff --git a/dev/src/app.ts b/src/backend/app.ts similarity index 93% rename from dev/src/app.ts rename to src/backend/app.ts index 2a826cd..b9f1c1c 100644 --- a/dev/src/app.ts +++ b/src/backend/app.ts @@ -12,7 +12,7 @@ const config = rcParser.getConfiguration(); app.locals.config = config; // view engine setup -app.set('views', path.join(__dirname, '../../', 'views')); +app.set('views', path.join(__dirname, '../../src/backend/', 'views')); app.set('view engine', 'twig'); require('./utils/twig'); diff --git a/dev/src/controllers/aliases.ts b/src/backend/controllers/aliases.ts similarity index 100% rename from dev/src/controllers/aliases.ts rename to src/backend/controllers/aliases.ts diff --git a/dev/src/controllers/pages.ts b/src/backend/controllers/pages.ts similarity index 100% rename from dev/src/controllers/pages.ts rename to src/backend/controllers/pages.ts diff --git a/dev/src/controllers/pagesOrder.ts b/src/backend/controllers/pagesOrder.ts similarity index 100% rename from dev/src/controllers/pagesOrder.ts rename to src/backend/controllers/pagesOrder.ts diff --git a/dev/src/controllers/transport.ts b/src/backend/controllers/transport.ts similarity index 100% rename from dev/src/controllers/transport.ts rename to src/backend/controllers/transport.ts diff --git a/dev/src/controllers/users.ts b/src/backend/controllers/users.ts similarity index 100% rename from dev/src/controllers/users.ts rename to src/backend/controllers/users.ts diff --git a/dev/src/exceptions/httpException.ts b/src/backend/exceptions/httpException.ts similarity index 100% rename from dev/src/exceptions/httpException.ts rename to src/backend/exceptions/httpException.ts diff --git a/dev/src/models/alias.ts b/src/backend/models/alias.ts similarity index 100% rename from dev/src/models/alias.ts rename to src/backend/models/alias.ts diff --git a/dev/src/models/file.ts b/src/backend/models/file.ts similarity index 97% rename from dev/src/models/file.ts rename to src/backend/models/file.ts index b604906..3ed44ee 100644 --- a/dev/src/models/file.ts +++ b/src/backend/models/file.ts @@ -87,7 +87,7 @@ class File { * @param {object} query - input query * @returns {Promise} */ - public static async getAll(query: FileData = {}): Promise { + public static async getAll(query: Record = {}): Promise { const docs = await filesDb.find(query); return Promise.all(docs.map(doc => new File(doc))); diff --git a/dev/src/models/page.ts b/src/backend/models/page.ts similarity index 98% rename from dev/src/models/page.ts rename to src/backend/models/page.ts index d176b2a..c8d2ae8 100644 --- a/dev/src/models/page.ts +++ b/src/backend/models/page.ts @@ -83,7 +83,7 @@ class Page { * @param {object} query - input query * @returns {Promise} */ - public static async getAll(query: PageData = {}): Promise { + public static async getAll(query: Record = {}): Promise { const docs = await pagesDb.find(query); return Promise.all(docs.map(doc => new Page(doc))); diff --git a/dev/src/models/pageOrder.ts b/src/backend/models/pageOrder.ts similarity index 100% rename from dev/src/models/pageOrder.ts rename to src/backend/models/pageOrder.ts diff --git a/dev/src/models/user.ts b/src/backend/models/user.ts similarity index 100% rename from dev/src/models/user.ts rename to src/backend/models/user.ts diff --git a/dev/src/routes/aliases.ts b/src/backend/routes/aliases.ts similarity index 100% rename from dev/src/routes/aliases.ts rename to src/backend/routes/aliases.ts diff --git a/dev/src/routes/api/index.ts b/src/backend/routes/api/index.ts similarity index 100% rename from dev/src/routes/api/index.ts rename to src/backend/routes/api/index.ts diff --git a/dev/src/routes/api/links.ts b/src/backend/routes/api/links.ts similarity index 100% rename from dev/src/routes/api/links.ts rename to src/backend/routes/api/links.ts diff --git a/dev/src/routes/api/pages.ts b/src/backend/routes/api/pages.ts similarity index 100% rename from dev/src/routes/api/pages.ts rename to src/backend/routes/api/pages.ts diff --git a/dev/src/routes/api/transport.ts b/src/backend/routes/api/transport.ts similarity index 100% rename from dev/src/routes/api/transport.ts rename to src/backend/routes/api/transport.ts diff --git a/dev/src/routes/auth.ts b/src/backend/routes/auth.ts similarity index 100% rename from dev/src/routes/auth.ts rename to src/backend/routes/auth.ts diff --git a/dev/src/routes/home.ts b/src/backend/routes/home.ts similarity index 100% rename from dev/src/routes/home.ts rename to src/backend/routes/home.ts diff --git a/dev/src/routes/index.ts b/src/backend/routes/index.ts similarity index 100% rename from dev/src/routes/index.ts rename to src/backend/routes/index.ts diff --git a/dev/src/routes/middlewares/locals.ts b/src/backend/routes/middlewares/locals.ts similarity index 100% rename from dev/src/routes/middlewares/locals.ts rename to src/backend/routes/middlewares/locals.ts diff --git a/dev/src/routes/middlewares/pages.ts b/src/backend/routes/middlewares/pages.ts similarity index 100% rename from dev/src/routes/middlewares/pages.ts rename to src/backend/routes/middlewares/pages.ts diff --git a/dev/src/routes/middlewares/token.ts b/src/backend/routes/middlewares/token.ts similarity index 100% rename from dev/src/routes/middlewares/token.ts rename to src/backend/routes/middlewares/token.ts diff --git a/dev/src/routes/pages.ts b/src/backend/routes/pages.ts similarity index 100% rename from dev/src/routes/pages.ts rename to src/backend/routes/pages.ts diff --git a/dev/src/utils/asyncMiddleware.ts b/src/backend/utils/asyncMiddleware.ts similarity index 100% rename from dev/src/utils/asyncMiddleware.ts rename to src/backend/utils/asyncMiddleware.ts diff --git a/dev/src/utils/crypto.ts b/src/backend/utils/crypto.ts similarity index 100% rename from dev/src/utils/crypto.ts rename to src/backend/utils/crypto.ts diff --git a/dev/src/utils/database/index.ts b/src/backend/utils/database/index.ts similarity index 91% rename from dev/src/utils/database/index.ts rename to src/backend/utils/database/index.ts index 19469be..f742172 100644 --- a/dev/src/utils/database/index.ts +++ b/src/backend/utils/database/index.ts @@ -71,7 +71,7 @@ export class Database { * @param {Object} projection - projection object * @returns {Promise|Error>} - found docs or Error object */ - public async find(query: DocType, projection?: DocType): Promise> { + public async find(query: Record, projection?: DocType): Promise> { const cbk = (resolve: ResolveFunction, reject: RejectFunction) => (err: Error | null, docs: DocType[]) => { if (err) { reject(err); @@ -98,7 +98,7 @@ export class Database { * @param {Object} projection - projection object * @returns {Promise} - found doc or Error object */ - public async findOne(query: DocType, projection?: DocType): Promise { + public async findOne(query: Record, projection?: DocType): Promise { const cbk = (resolve: ResolveFunction, reject: RejectFunction) => (err: Error | null, doc: DocType) => { if (err) { reject(err); @@ -126,7 +126,7 @@ export class Database { * @param {Options} options - optional params * @returns {Promise} - number of updated rows or affected docs or Error object */ - public async update(query: DocType, update: DocType, options: Options = {}): Promise> { + public async update(query: Record, update: DocType, options: Options = {}): Promise> { return new Promise((resolve, reject) => this.db.update(query, update, options, (err, result, affectedDocs) => { if (err) { reject(err); @@ -157,7 +157,7 @@ export class Database { * @param {Options} options - optional params * @returns {Promise} - number of removed rows or Error object */ - public async remove(query: DocType, options: Options = {}): Promise { + public async remove(query: Record, options: Options = {}): Promise { return new Promise((resolve, reject) => this.db.remove(query, options, (err, result) => { if (err) { reject(err); diff --git a/dev/src/utils/database/initDb.ts b/src/backend/utils/database/initDb.ts similarity index 100% rename from dev/src/utils/database/initDb.ts rename to src/backend/utils/database/initDb.ts diff --git a/dev/src/utils/objects.ts b/src/backend/utils/objects.ts similarity index 100% rename from dev/src/utils/objects.ts rename to src/backend/utils/objects.ts diff --git a/dev/src/utils/rcparser.ts b/src/backend/utils/rcparser.ts similarity index 100% rename from dev/src/utils/rcparser.ts rename to src/backend/utils/rcparser.ts diff --git a/dev/src/utils/translation.ts b/src/backend/utils/translation.ts similarity index 100% rename from dev/src/utils/translation.ts rename to src/backend/utils/translation.ts diff --git a/dev/src/utils/twig.ts b/src/backend/utils/twig.ts similarity index 93% rename from dev/src/utils/twig.ts rename to src/backend/utils/twig.ts index 1aa8e93..fa3ee6d 100644 --- a/dev/src/utils/twig.ts +++ b/src/backend/utils/twig.ts @@ -16,7 +16,7 @@ export default (function () { * @returns {string} - svg code */ twig.extendFunction('svg', function (filename: string) { - return fs.readFileSync(`./frontend/svg/${filename}.svg`, 'utf-8'); + return fs.readFileSync(`./src/frontend/svg/${filename}.svg`, 'utf-8'); }); /** diff --git a/dev/src/utils/urlify.ts b/src/backend/utils/urlify.ts similarity index 100% rename from dev/src/utils/urlify.ts rename to src/backend/utils/urlify.ts diff --git a/views/auth.twig b/src/backend/views/auth.twig similarity index 100% rename from views/auth.twig rename to src/backend/views/auth.twig diff --git a/views/components/aside.twig b/src/backend/views/components/aside.twig similarity index 100% rename from views/components/aside.twig rename to src/backend/views/components/aside.twig diff --git a/views/components/header.twig b/src/backend/views/components/header.twig similarity index 100% rename from views/components/header.twig rename to src/backend/views/components/header.twig diff --git a/views/error.twig b/src/backend/views/error.twig similarity index 100% rename from views/error.twig rename to src/backend/views/error.twig diff --git a/views/layout.twig b/src/backend/views/layout.twig similarity index 100% rename from views/layout.twig rename to src/backend/views/layout.twig diff --git a/views/pages/blocks/checklist.twig b/src/backend/views/pages/blocks/checklist.twig similarity index 100% rename from views/pages/blocks/checklist.twig rename to src/backend/views/pages/blocks/checklist.twig diff --git a/views/pages/blocks/code.twig b/src/backend/views/pages/blocks/code.twig similarity index 100% rename from views/pages/blocks/code.twig rename to src/backend/views/pages/blocks/code.twig diff --git a/views/pages/blocks/delimiter.twig b/src/backend/views/pages/blocks/delimiter.twig similarity index 100% rename from views/pages/blocks/delimiter.twig rename to src/backend/views/pages/blocks/delimiter.twig diff --git a/views/pages/blocks/header.twig b/src/backend/views/pages/blocks/header.twig similarity index 100% rename from views/pages/blocks/header.twig rename to src/backend/views/pages/blocks/header.twig diff --git a/views/pages/blocks/image.twig b/src/backend/views/pages/blocks/image.twig similarity index 100% rename from views/pages/blocks/image.twig rename to src/backend/views/pages/blocks/image.twig diff --git a/views/pages/blocks/linkTool.twig b/src/backend/views/pages/blocks/linkTool.twig similarity index 100% rename from views/pages/blocks/linkTool.twig rename to src/backend/views/pages/blocks/linkTool.twig diff --git a/views/pages/blocks/list.twig b/src/backend/views/pages/blocks/list.twig similarity index 100% rename from views/pages/blocks/list.twig rename to src/backend/views/pages/blocks/list.twig diff --git a/views/pages/blocks/paragraph.twig b/src/backend/views/pages/blocks/paragraph.twig similarity index 100% rename from views/pages/blocks/paragraph.twig rename to src/backend/views/pages/blocks/paragraph.twig diff --git a/views/pages/blocks/raw.twig b/src/backend/views/pages/blocks/raw.twig similarity index 100% rename from views/pages/blocks/raw.twig rename to src/backend/views/pages/blocks/raw.twig diff --git a/views/pages/blocks/table.twig b/src/backend/views/pages/blocks/table.twig similarity index 100% rename from views/pages/blocks/table.twig rename to src/backend/views/pages/blocks/table.twig diff --git a/views/pages/blocks/warning.twig b/src/backend/views/pages/blocks/warning.twig similarity index 100% rename from views/pages/blocks/warning.twig rename to src/backend/views/pages/blocks/warning.twig diff --git a/views/pages/form.twig b/src/backend/views/pages/form.twig similarity index 100% rename from views/pages/form.twig rename to src/backend/views/pages/form.twig diff --git a/views/pages/index.twig b/src/backend/views/pages/index.twig similarity index 100% rename from views/pages/index.twig rename to src/backend/views/pages/index.twig diff --git a/views/pages/page.twig b/src/backend/views/pages/page.twig similarity index 100% rename from views/pages/page.twig rename to src/backend/views/pages/page.twig diff --git a/dev/bin/nvm.sh b/src/bin/nvm.sh similarity index 100% rename from dev/bin/nvm.sh rename to src/bin/nvm.sh diff --git a/dev/bin/server.ts b/src/bin/server.ts similarity index 98% rename from dev/bin/server.ts rename to src/bin/server.ts index ebdfc50..5ea477b 100644 --- a/dev/bin/server.ts +++ b/src/bin/server.ts @@ -1,7 +1,7 @@ /** * Module dependencies. */ -import app from '../src/app'; +import app from '../backend/app'; import http from 'http'; import config from 'config'; import Debug from 'debug'; diff --git a/frontend/.postcssrc b/src/frontend/.postcssrc similarity index 100% rename from frontend/.postcssrc rename to src/frontend/.postcssrc diff --git a/frontend/js/app.js b/src/frontend/js/app.js similarity index 100% rename from frontend/js/app.js rename to src/frontend/js/app.js diff --git a/frontend/js/classes/codeStyler.js b/src/frontend/js/classes/codeStyler.js similarity index 100% rename from frontend/js/classes/codeStyler.js rename to src/frontend/js/classes/codeStyler.js diff --git a/frontend/js/classes/editor.js b/src/frontend/js/classes/editor.js similarity index 100% rename from frontend/js/classes/editor.js rename to src/frontend/js/classes/editor.js diff --git a/frontend/js/modules/extensions.js b/src/frontend/js/modules/extensions.js similarity index 100% rename from frontend/js/modules/extensions.js rename to src/frontend/js/modules/extensions.js diff --git a/frontend/js/modules/page.js b/src/frontend/js/modules/page.js similarity index 100% rename from frontend/js/modules/page.js rename to src/frontend/js/modules/page.js diff --git a/frontend/js/modules/writing.js b/src/frontend/js/modules/writing.js similarity index 100% rename from frontend/js/modules/writing.js rename to src/frontend/js/modules/writing.js diff --git a/frontend/styles/carbon.pcss b/src/frontend/styles/carbon.pcss similarity index 100% rename from frontend/styles/carbon.pcss rename to src/frontend/styles/carbon.pcss diff --git a/frontend/styles/components/aside.pcss b/src/frontend/styles/components/aside.pcss similarity index 100% rename from frontend/styles/components/aside.pcss rename to src/frontend/styles/components/aside.pcss diff --git a/frontend/styles/components/auth.pcss b/src/frontend/styles/components/auth.pcss similarity index 100% rename from frontend/styles/components/auth.pcss rename to src/frontend/styles/components/auth.pcss diff --git a/frontend/styles/components/header.pcss b/src/frontend/styles/components/header.pcss similarity index 100% rename from frontend/styles/components/header.pcss rename to src/frontend/styles/components/header.pcss diff --git a/frontend/styles/components/landing.pcss b/src/frontend/styles/components/landing.pcss similarity index 100% rename from frontend/styles/components/landing.pcss rename to src/frontend/styles/components/landing.pcss diff --git a/frontend/styles/components/page.pcss b/src/frontend/styles/components/page.pcss similarity index 100% rename from frontend/styles/components/page.pcss rename to src/frontend/styles/components/page.pcss diff --git a/frontend/styles/components/writing.pcss b/src/frontend/styles/components/writing.pcss similarity index 100% rename from frontend/styles/components/writing.pcss rename to src/frontend/styles/components/writing.pcss diff --git a/frontend/styles/diff.pcss b/src/frontend/styles/diff.pcss similarity index 100% rename from frontend/styles/diff.pcss rename to src/frontend/styles/diff.pcss diff --git a/frontend/styles/layout.pcss b/src/frontend/styles/layout.pcss similarity index 100% rename from frontend/styles/layout.pcss rename to src/frontend/styles/layout.pcss diff --git a/frontend/styles/main.pcss b/src/frontend/styles/main.pcss similarity index 100% rename from frontend/styles/main.pcss rename to src/frontend/styles/main.pcss diff --git a/frontend/styles/vars.pcss b/src/frontend/styles/vars.pcss similarity index 100% rename from frontend/styles/vars.pcss rename to src/frontend/styles/vars.pcss diff --git a/frontend/svg/loader.svg b/src/frontend/svg/loader.svg similarity index 100% rename from frontend/svg/loader.svg rename to src/frontend/svg/loader.svg diff --git a/frontend/svg/menu.svg b/src/frontend/svg/menu.svg similarity index 100% rename from frontend/svg/menu.svg rename to src/frontend/svg/menu.svg diff --git a/frontend/svg/plus.svg b/src/frontend/svg/plus.svg similarity index 100% rename from frontend/svg/plus.svg rename to src/frontend/svg/plus.svg diff --git a/dev/generatePassword.ts b/src/generatePassword.ts similarity index 96% rename from dev/generatePassword.ts rename to src/generatePassword.ts index 9591fb7..f0c09b4 100644 --- a/dev/generatePassword.ts +++ b/src/generatePassword.ts @@ -1,6 +1,6 @@ #!/usr/bin/env node -import database from './src/utils/database'; +import database from './backend/utils/database'; import commander from 'commander'; import bcrypt from 'bcrypt'; diff --git a/dev/test/database.ts b/src/test/database.ts similarity index 99% rename from dev/test/database.ts rename to src/test/database.ts index 7ee2640..a073223 100644 --- a/dev/test/database.ts +++ b/src/test/database.ts @@ -3,7 +3,7 @@ import config from 'config'; import { expect } from 'chai'; import Datastore from 'nedb'; -import { Database } from '../src/utils/database'; +import { Database } from '../backend/utils/database'; interface Document { data?: any; diff --git a/dev/test/express.ts b/src/test/express.ts similarity index 100% rename from dev/test/express.ts rename to src/test/express.ts diff --git a/dev/test/models/alias.ts b/src/test/models/alias.ts similarity index 96% rename from dev/test/models/alias.ts rename to src/test/models/alias.ts index 1b9d3c2..453457e 100644 --- a/dev/test/models/alias.ts +++ b/src/test/models/alias.ts @@ -2,9 +2,9 @@ import { expect } from 'chai'; import fs from 'fs'; import path from 'path'; import config from 'config'; -import Alias from '../../src/models/alias'; -import { binaryMD5 } from '../../src/utils/crypto'; -import database from '../../src/utils/database'; +import Alias from '../../backend/models/alias'; +import { binaryMD5 } from '../../backend/utils/crypto'; +import database from '../../backend/utils/database'; const aliases = database['aliases']; diff --git a/dev/test/models/file.ts b/src/test/models/file.ts similarity index 98% rename from dev/test/models/file.ts rename to src/test/models/file.ts index dfb0254..f1d54a4 100644 --- a/dev/test/models/file.ts +++ b/src/test/models/file.ts @@ -2,8 +2,8 @@ import { expect } from 'chai'; import fs from 'fs'; import path from 'path'; import config from 'config'; -import File from '../../src/models/file'; -import database from '../../src/utils/database'; +import File from '../../backend/models/file'; +import database from '../../backend/utils/database'; const files = database['files']; diff --git a/dev/test/models/page.ts b/src/test/models/page.ts similarity index 98% rename from dev/test/models/page.ts rename to src/test/models/page.ts index be80e03..bd9d61d 100644 --- a/dev/test/models/page.ts +++ b/src/test/models/page.ts @@ -2,9 +2,9 @@ import { expect } from 'chai'; import fs from 'fs'; import path from 'path'; import config from 'config'; -import Page from '../../src/models/page'; -import translateString from '../../src/utils/translation'; -import database from '../../src/utils/database'; +import Page from '../../backend/models/page'; +import translateString from '../../backend/utils/translation'; +import database from '../../backend/utils/database'; const pages = database['pages']; diff --git a/dev/test/models/pageOrder.ts b/src/test/models/pageOrder.ts similarity index 97% rename from dev/test/models/pageOrder.ts rename to src/test/models/pageOrder.ts index e08494a..569af52 100644 --- a/dev/test/models/pageOrder.ts +++ b/src/test/models/pageOrder.ts @@ -2,8 +2,8 @@ import { expect } from 'chai'; import fs from 'fs'; import path from 'path'; import config from 'config'; -import PageOrder from '../../src/models/pageOrder'; -import database from '../../src/utils/database'; +import PageOrder from '../../backend/models/pageOrder'; +import database from '../../backend/utils/database'; const pagesOrder = database['pagesOrder']; diff --git a/dev/test/rcparser.ts b/src/test/rcparser.ts similarity index 99% rename from dev/test/rcparser.ts rename to src/test/rcparser.ts index fe3b180..4172217 100644 --- a/dev/test/rcparser.ts +++ b/src/test/rcparser.ts @@ -4,7 +4,7 @@ import path from 'path'; import config from 'config'; import sinon = require('sinon'); -import rcParser from '../src/utils/rcparser'; +import rcParser from '../backend/utils/rcparser'; const rcPath = path.resolve(process.cwd(), config.get('rcFile')); diff --git a/dev/test/rest/aliases.ts b/src/test/rest/aliases.ts similarity index 100% rename from dev/test/rest/aliases.ts rename to src/test/rest/aliases.ts diff --git a/dev/test/rest/pages.ts b/src/test/rest/pages.ts similarity index 98% rename from dev/test/rest/pages.ts rename to src/test/rest/pages.ts index 06bf583..ca73eb6 100644 --- a/dev/test/rest/pages.ts +++ b/src/test/rest/pages.ts @@ -4,10 +4,10 @@ import config from 'config'; import chai from 'chai'; import chaiHTTP from 'chai-http'; import server from '../../bin/server'; -import model from '../../src/models/page'; -import Page from '../../src/models/page'; -import PageOrder from '../../src/models/pageOrder'; -import translateString from '../../src/utils/translation'; +import model from '../../backend/models/page'; +import Page from '../../backend/models/page'; +import PageOrder from '../../backend/models/pageOrder'; +import translateString from '../../backend/utils/translation'; const {expect} = chai; const app = server.app; diff --git a/dev/test/rest/test_file.json b/src/test/rest/test_file.json similarity index 100% rename from dev/test/rest/test_file.json rename to src/test/rest/test_file.json diff --git a/dev/test/rest/test_image.png b/src/test/rest/test_image.png similarity index 100% rename from dev/test/rest/test_image.png rename to src/test/rest/test_image.png diff --git a/dev/test/rest/transport.ts b/src/test/rest/transport.ts similarity index 93% rename from dev/test/rest/transport.ts rename to src/test/rest/transport.ts index 1abacb4..ccee062 100644 --- a/dev/test/rest/transport.ts +++ b/src/test/rest/transport.ts @@ -6,7 +6,7 @@ import chaiHTTP from 'chai-http'; import rimraf from 'rimraf'; import config from 'config'; import server from '../../bin/server'; -import model from '../../src/models/file'; +import model from '../../backend/models/file'; const {expect} = chai; const app = server.app; @@ -38,7 +38,7 @@ describe('Transport routes: ', () => { it('Uploading an image', async () => { const name = 'test_image.png'; - const image = fs.readFileSync(path.resolve(`./dev/test/rest/${name}`)); + const image = fs.readFileSync(path.resolve(`./src/test/rest/${name}`)); const res = await agent .post('/api/transport/image') .attach('image', image, name); @@ -75,7 +75,7 @@ describe('Transport routes: ', () => { it('Uploading an image with map option', async () => { const name = 'test_image.png'; - const image = fs.readFileSync(path.resolve(`./dev/test/rest/${name}`)); + const image = fs.readFileSync(path.resolve(`./src/test/rest/${name}`)); const res = await agent .post('/api/transport/image') .attach('image', image, name) @@ -96,7 +96,7 @@ describe('Transport routes: ', () => { it('Uploading a file', async () => { const name = 'test_file.json'; - const json = fs.readFileSync(path.resolve(`./dev/test/rest/${name}`)); + const json = fs.readFileSync(path.resolve(`./src/test/rest/${name}`)); const res = await agent .post('/api/transport/file') .attach('file', json, name); @@ -127,7 +127,7 @@ describe('Transport routes: ', () => { it('Uploading a file with map option', async () => { const name = 'test_file.json'; - const json = fs.readFileSync(path.resolve(`./dev/test/rest/${name}`)); + const json = fs.readFileSync(path.resolve(`./src/test/rest/${name}`)); const res = await agent .post('/api/transport/file') .attach('file', json, name) @@ -207,7 +207,7 @@ describe('Transport routes: ', () => { expect(body.success).to.equal(0); const name = 'test_file.json'; - const json = fs.readFileSync(path.resolve(`./dev/test/rest/${name}`)); + const json = fs.readFileSync(path.resolve(`./src/test/rest/${name}`)); res = await agent .post('/api/transport/file') .attach('file', json, name) @@ -230,7 +230,7 @@ describe('Transport routes: ', () => { expect(body.success).to.equal(0); let name = 'test_file.json'; - const json = fs.readFileSync(path.resolve(`./dev/test/rest/${name}`)); + const json = fs.readFileSync(path.resolve(`./src/test/rest/${name}`)); res = await agent .post('/api/transport/image') .attach('image', json, name); @@ -238,7 +238,7 @@ describe('Transport routes: ', () => { expect(res).to.have.status(400); name = 'test_image.png'; - const image = fs.readFileSync(path.resolve(`./dev/test/rest/${name}`)); + const image = fs.readFileSync(path.resolve(`./src/test/rest/${name}`)); res = await agent .post('/api/transport/image') .attach('image', image, name)