diff --git a/Dockerfile b/Dockerfile index 89ef851..fc1d838 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,13 +33,13 @@ ENV NODE_ENV production # cleanup USER root -RUN rm -r ./src ./public/js-source ./bio-proxy-configuration-for-docker && \ +RUN rm -r ./backend/src ./backend/test ./public/js-source ./bio-proxy-configuration-for-docker && \ npm cache clean --force USER appuser # healthcheck HEALTHCHECK --interval=10s --timeout=2s --start-period=15s \ - CMD node ./out/healthcheck.js + CMD node ./backend/out/healthcheck.js # set command CMD npm run production diff --git a/src/.eslintrc.js b/backend/.eslintrc.js similarity index 100% rename from src/.eslintrc.js rename to backend/.eslintrc.js diff --git a/src/app.ts b/backend/src/app.ts similarity index 92% rename from src/app.ts rename to backend/src/app.ts index 6ae3e37..8e5077a 100644 --- a/src/app.ts +++ b/backend/src/app.ts @@ -48,12 +48,12 @@ router.use(AutoReloader.getRouter({ // static config router.use('/js/polyfill.js', Polyfill.getRouter('./public/js/bundle.js')); router.use(sassMiddleware({ - src: path.join(__dirname, '../public'), - dest: path.join(__dirname, '../public'), + src: path.join(__dirname, '../../public'), + dest: path.join(__dirname, '../../public'), indentedSyntax: true, // true = .sass and false = .scss sourceMap: true, })); -router.use(express.static(path.join(__dirname, '../public'))); +router.use(express.static(path.join(__dirname, '../../public'))); router.use(indexRouter); app.use(DefaultConfig.BASE_PATH, router); diff --git a/src/healthcheck.ts b/backend/src/healthcheck.ts similarity index 100% rename from src/healthcheck.ts rename to backend/src/healthcheck.ts diff --git a/src/index.ts b/backend/src/index.ts similarity index 100% rename from src/index.ts rename to backend/src/index.ts diff --git a/src/routes/api/user.ts b/backend/src/routes/api/user.ts similarity index 100% rename from src/routes/api/user.ts rename to backend/src/routes/api/user.ts diff --git a/src/routes/healthcheck.ts b/backend/src/routes/healthcheck.ts similarity index 100% rename from src/routes/healthcheck.ts rename to backend/src/routes/healthcheck.ts diff --git a/src/routes/index.ts b/backend/src/routes/index.ts similarity index 100% rename from src/routes/index.ts rename to backend/src/routes/index.ts diff --git a/src/types/extend-request.d.ts b/backend/src/types/extend-request.d.ts similarity index 100% rename from src/types/extend-request.d.ts rename to backend/src/types/extend-request.d.ts diff --git a/test/routes/healthcheck.ts b/backend/test/routes/healthcheck.ts similarity index 100% rename from test/routes/healthcheck.ts rename to backend/test/routes/healthcheck.ts diff --git a/tsconfig.json b/backend/tsconfig.json similarity index 92% rename from tsconfig.json rename to backend/tsconfig.json index 4404f06..8845498 100644 --- a/tsconfig.json +++ b/backend/tsconfig.json @@ -12,7 +12,7 @@ "./src/**/*.ts" ], "exclude": [ - "./node_modules", + "../node_modules", "./public" ] } diff --git a/views/error.pug b/backend/views/error.pug similarity index 100% rename from views/error.pug rename to backend/views/error.pug diff --git a/views/index.pug b/backend/views/index.pug similarity index 100% rename from views/index.pug rename to backend/views/index.pug diff --git a/views/layout.pug b/backend/views/layout.pug similarity index 100% rename from views/layout.pug rename to backend/views/layout.pug diff --git a/package.json b/package.json index 5ae535c..9a4830b 100644 --- a/package.json +++ b/package.json @@ -6,11 +6,11 @@ "lint": "eslint . --ext .ts", "lint-fix": "eslint . --ext .ts --fix", "debug-client": "tsc-watch --project ./public/js-source", - "debug-server": "tsc-watch --project . --onSuccess \"node --enable-source-maps --use-openssl-ca --unhandled-rejections=strict ./out/index\"", + "debug-server": "tsc-watch --project ./backend --onSuccess \"node --enable-source-maps --use-openssl-ca --unhandled-rejections=strict ./backend/out/index\"", "debug": "concurrently npm:debug-*", - "test": "nyc mocha -r ts-node/register ./public/js-source/test/**/*.ts ./test/**/*.ts", + "test": "nyc mocha -r ts-node/register ./public/js-source/test/**/*.ts ./backend/test/**/*.ts", "build": "tsc", - "production": "node --use-openssl-ca --unhandled-rejections=strict ./out/index", + "production": "node --use-openssl-ca --unhandled-rejections=strict ./backend/out/index", "install-debug": "npm install && npm run build", "install-prod": "npm install --only=dev && npm install --only=prod && npm run build && npm test && npm run del-node-module && npm install --only=prod", "del-node-module:default": "rm -r node_modules", diff --git a/public/styles/style.css b/public/styles/style.css deleted file mode 100644 index b57cbb4..0000000 --- a/public/styles/style.css +++ /dev/null @@ -1,8 +0,0 @@ -body { - padding: 50px; - font: 14px "Lucida Grande", Helvetica, Arial, sans-serif; } - -a { - color: #00B7FF; } - -/*# sourceMappingURL=style.css.map */ \ No newline at end of file