diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b15fcc5c4dd730f568cc6a1d018b50f4384bd91c..77baf8268961b7345b8139fa9a95c149a587fdb9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ pages-testing: - npm run clean - npm run build - rm -rf ./built/views - - cp -R ./views ./built + - cp -R ./src/views ./built - cat $configfiledev > ./built/config/config.js - "pm2 delete --silent project || :" - pm2 start ./built/app.js --name=project diff --git a/__test/unit.test.ts b/__test/unit.test.ts index a3b497688249dca79098efef31bf668e713ae972..55e3912ef4fb4c1c671aa5a159da41c2e58f3632 100644 --- a/__test/unit.test.ts +++ b/__test/unit.test.ts @@ -1,5 +1,5 @@ -import helpers from '../utils/helpers' -import gitlab from '../controller/gitlab' +import helpers from '../src/utils/helpers' +import gitlab from '../src/controller/gitlab' test('[/utils/helpers] convert string to array', () => { expect(helpers.stringToArray('foo')).toStrictEqual(["foo"]) diff --git a/package.json b/package.json index 577035bde97b4e63b41a66881f5716fd25767292..91a5bbb0c7bf581e3445af3bb4fef24bc520c549 100644 --- a/package.json +++ b/package.json @@ -14,10 +14,11 @@ "url": "https://transfer.hft-stuttgart.de/gitlab/m4lab_tv1/project-page.git" }, "scripts": { - "start:dev": "nodemon app.ts", + "start:dev": "nodemon ./src/app.ts", "start": "nodemon ./built/app.js", "build": "tsc -build", "clean": "tsc -build --clean", + "check-types": "tsc", "test": "jest", "cleancode": "ts-standard --fix" }, diff --git a/app.ts b/src/app.ts similarity index 100% rename from app.ts rename to src/app.ts diff --git a/config/config.ts b/src/config/config.ts similarity index 100% rename from config/config.ts rename to src/config/config.ts diff --git a/config/dbconn.ts b/src/config/dbconn.ts similarity index 100% rename from config/dbconn.ts rename to src/config/dbconn.ts diff --git a/controller/controller.ts b/src/controller/controller.ts similarity index 100% rename from controller/controller.ts rename to src/controller/controller.ts diff --git a/controller/gitlab.ts b/src/controller/gitlab.ts similarity index 100% rename from controller/gitlab.ts rename to src/controller/gitlab.ts diff --git a/public/js/jquery-ui/i18n/datepicker-de.js b/src/public/js/jquery-ui/i18n/datepicker-de.js similarity index 100% rename from public/js/jquery-ui/i18n/datepicker-de.js rename to src/public/js/jquery-ui/i18n/datepicker-de.js diff --git a/routes/project.ts b/src/routes/project.ts similarity index 100% rename from routes/project.ts rename to src/routes/project.ts diff --git a/utils/helpers.ts b/src/utils/helpers.ts similarity index 100% rename from utils/helpers.ts rename to src/utils/helpers.ts diff --git a/views/DE/404.pug b/src/views/DE/404.pug similarity index 100% rename from views/DE/404.pug rename to src/views/DE/404.pug diff --git a/views/DE/500.pug b/src/views/DE/500.pug similarity index 100% rename from views/DE/500.pug rename to src/views/DE/500.pug diff --git a/views/DE/project/mailinglists.pug b/src/views/DE/project/mailinglists.pug similarity index 100% rename from views/DE/project/mailinglists.pug rename to src/views/DE/project/mailinglists.pug diff --git a/views/DE/project/pagesList.pug b/src/views/DE/project/pagesList.pug similarity index 100% rename from views/DE/project/pagesList.pug rename to src/views/DE/project/pagesList.pug diff --git a/views/DE/project/project-simplified.pug b/src/views/DE/project/project-simplified.pug similarity index 100% rename from views/DE/project/project-simplified.pug rename to src/views/DE/project/project-simplified.pug diff --git a/views/DE/project/project.html b/src/views/DE/project/project.html similarity index 100% rename from views/DE/project/project.html rename to src/views/DE/project/project.html diff --git a/views/DE/project/projectList.pug b/src/views/DE/project/projectList.pug similarity index 100% rename from views/DE/project/projectList.pug rename to src/views/DE/project/projectList.pug diff --git a/views/DE/project/projectOverview.pug b/src/views/DE/project/projectOverview.pug similarity index 100% rename from views/DE/project/projectOverview.pug rename to src/views/DE/project/projectOverview.pug diff --git a/views/EN/404.pug b/src/views/EN/404.pug similarity index 100% rename from views/EN/404.pug rename to src/views/EN/404.pug diff --git a/views/EN/500.pug b/src/views/EN/500.pug similarity index 100% rename from views/EN/500.pug rename to src/views/EN/500.pug diff --git a/views/EN/project/addProjectOverview.pug b/src/views/EN/project/addProjectOverview.pug similarity index 100% rename from views/EN/project/addProjectOverview.pug rename to src/views/EN/project/addProjectOverview.pug diff --git a/views/EN/project/mailinglists.pug b/src/views/EN/project/mailinglists.pug similarity index 100% rename from views/EN/project/mailinglists.pug rename to src/views/EN/project/mailinglists.pug diff --git a/views/EN/project/projects.pug b/src/views/EN/project/projects.pug similarity index 100% rename from views/EN/project/projects.pug rename to src/views/EN/project/projects.pug diff --git a/tsconfig.json b/tsconfig.json index 404cf0b5d22c765dacd8803a1d748d0d2b7780d5..af9f7b6f83f5fea2daa399dc16525b22267c4fac 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -5,7 +5,7 @@ "module": "commonjs", "strict": true, "outDir": "./built", - "rootDir": "./", + "rootDir": "./src", "esModuleInterop": true, "allowJs": true }