changes from api and web folder change

Author: burkkyy

Dockerfile

@@ -14,29 +14,29 @@ ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true \
 RUN mkdir /home/node/app && chown -R node:node /home/node/app
 RUN mkdir /home/node/web && chown -R node:node /home/node/web
 
-COPY --chown=node:node src/web/package*.json /home/node/web/
-COPY --chown=node:node src/api/package*.json /home/node/app/
+COPY --chown=node:node web/package*.json /home/node/web/
+COPY --chown=node:node api/package*.json /home/node/app/
 
 RUN npm install -g npm@8.5.5
 USER node
 
 WORKDIR /home/node/app
 RUN npm install && npm cache clean --force --loglevel=error
-COPY --chown=node:node src/api/.env* ./
+COPY --chown=node:node api/.env* ./
 
 WORKDIR /home/node/web
 
 RUN npm install && npm cache clean --force --loglevel=error
-COPY --chown=node:node src/api /home/node/app/
-COPY --chown=node:node src/web /home/node/web/
+COPY --chown=node:node api /home/node/app/
+COPY --chown=node:node web /home/node/web/
 
 RUN npm run build:docker
 
 EXPOSE 3000
 
 WORKDIR /home/node/app
 
-COPY src/api/templates /home/node/app/dist/templates
+COPY api/templates /home/node/app/dist/templates
 
 ENV NODE_ENV=production
 #RUN npm install --platform=linux --arch=x64 sharp@0.29.1

README.md

@@ -5,8 +5,8 @@
 Writing code and developing in this application requires running three services:
 
 - A local Microsoft SQL Server (2019 Linux) database running in Docker
-- The server-side Node.js application written in TypeScript: `/src/api`
-- The Vue.js and Vuetify based front-end: `/src/web`
+- The server-side Node.js application written in TypeScript: `/api`
+- The Vue.js and Vuetify based front-end: `/web`
 
 ---
 
@@ -65,7 +65,7 @@ cd /opt/mssql-tools/bin
 You will now have a local database with data ready for the API. To run the API, run the following commands:
 
 ```
-cd src/api
+cd api
 npm install
 cp .env .env.development
 ```
@@ -81,17 +81,17 @@ The API will bind to your local machines port 3000 and be available at http://lo
 Last to start is the the Vue.js web front-end. To run this, open a second terminal window at this directory and run the following commands:
 
 ```
-cd src/web
+cd web
 npm install
 npm run start
 ```
 
-You will now have the Vue CLI server hosting the application at http://localhost:8080 and you can begin editing the API or front-end code. **All changes to the files in the `src/api` and `src/web` will automatically reload theie respective applications.**
+You will now have the Vue CLI server hosting the application at http://localhost:8080 and you can begin editing the API or front-end code. **All changes to the files in the `api` and `web` will automatically reload theie respective applications.**
 
 ## Local Testing
 
 Currently there is very minimal support for testing.
-Only `src/api` has a test suite.
+Only `api` has a test suite.
 **The development and test databases are shared, so don't write tests that change database state yet.**
 
 To boot the test suite go to the top level of the app and run:
@@ -103,7 +103,7 @@ bin/dev test up
 docker-compose -f docker-cmpose.test.yml up
 
 # or if you don't have docker
-cd src/api
+cd api
 npm install
 npm run test
 ```
@@ -157,8 +157,8 @@ the appropriate environment variables set using the following commands:
 1. Set the environment variables for the back-end.
 
 ```
-cp /src/api/.env /src/api/.env.production
-vi /src/api/.env.production
+cp /api/.env /api/.env.production
+vi /api/.env.production
 ```
 
 2. Set the global host port.

bin/dev

@@ -149,7 +149,7 @@ class DevHelper
     if RUBY_PLATFORM =~ /linux/
       run(*%w[api npm run knex], *args, execution_mode: WAIT_FOR_PROCESS, **kwargs)
 
-      file_or_directory = "#{project_root}/src/api/data/migrations"
+      file_or_directory = "#{project_root}/api/data/migrations"
       exit(0) unless take_over_needed?(file_or_directory)
 
       ownit file_or_directory

docker-compose.development.yml

@@ -1,24 +1,24 @@
 services:
   web:
     build:
-      context: ./src/web
+      context: ./web
       dockerfile: development.Dockerfile
     environment:
       NODE_ENV: development
     tty: true
     ports:
       - '8080:8080'
     volumes:
-      - ./src/web:/usr/src/web
+      - ./web:/usr/src/web
     depends_on:
       - api
       - db
   api:
     build:
-      context: ./src/api
+      context: ./api
       dockerfile: development.Dockerfile
     env_file:
-      - ./src/api/.env.development
+      - ./api/.env.development
     environment:
       NODE_ENV: development
       DB_HOST: db
@@ -31,7 +31,7 @@ services:
       - 'host.docker.internal:host-gateway'
       - 'host.docker.internal:172.17.0.1'
     volumes:
-      - ./src/api:/usr/src/api
+      - ./api:/usr/src/api
     depends_on:
       - db
   db:

docker-compose.test.yml

@@ -3,11 +3,11 @@ version: '3'
 services:
   api:
     build:
-      context: ./src/api
+      context: ./api
       dockerfile: development.Dockerfile
     command: ['npm', 'run', 'test']
     env_file:
-      - ./src/api/.env.development
+      - ./api/.env.development
     environment:
       NODE_ENV: test
       DB_HOST: db
@@ -20,7 +20,7 @@ services:
       - 'host.docker.internal:host-gateway'
       - 'host.docker.internal:172.17.0.1'
     volumes:
-      - ./src/api:/usr/src/api
+      - ./api:/usr/src/api
     depends_on:
       - db
   db:

jsconfig.json

@@ -1,6 +1,6 @@
  {
     "include": [
-      "./src/web/**/*"
+      "./web/**/*"
     ],
     "compilerOptions": {
         "baseUrl": ".",