Move frontend from src/web to src/web/app

.github/workflows/docker-build-and-push.yml

@@ -71,7 +71,7 @@ jobs:
           #  image: docs
           - context: src/api/feed-discovery
             image: feed-discovery
-          - context: src/web
+          - context: src/web/app
             image: nginx
             build-args: |
               WEB_URL=${{ inputs.web_url }}

.prettierignore

@@ -11,8 +11,8 @@ pnpm-lock.yaml
 
 # We don't maintain these files
 src/api/status/public/assets
-src/web/public/sw*
-src/web/public/workbox*
+src/web/app/public/sw*
+src/web/app/public/workbox*
 src/api/status/src/views
 
 # Ignore these directories for the docusaurus docs website

README.md

@@ -1,4 +1,4 @@
-# Telescope <img align="left" width="130" height="130" src=https://github.com/Seneca-CDOT/telescope/blob/master/src/web/public/logo.svg>
+# Telescope <img align="left" width="130" height="130" src=https://github.com/Seneca-CDOT/telescope/blob/master/src/web/app/public/logo.svg>
 
 [![js-airbnb/prettier-style](https://img.shields.io/badge/code%20style-airbnb%2Fprettier-blue)](https://github.com/airbnb/javascript)
 [![renovatebot - enabled](https://img.shields.io/badge/renovatebot-enabled-2ea44f?logo=renovatebot)](https://renovatebot.com)

docker/development.yml

@@ -13,7 +13,7 @@ services:
   # API Gateway
   nginx:
     build:
-      context: ../src/web
+      context: ../src/web/app
       cache_from:
         - docker.cdot.systems/nginx:buildcache
       # next.js needs build-time access to a number of API URL values, forward as ARGs

jest.config.js

@@ -4,7 +4,7 @@ module.exports = {
   ...baseConfig,
   projects: [
     // Our front-end
-    '<rootDir>/src/web/jest.config.js',
+    '<rootDir>/src/web/app/jest.config.js',
     // Our legacy backend tests, slowly being migrated to microservices
     '<rootDir>/test/jest.config.js',
     // Satellite

package.json

@@ -11,7 +11,7 @@
   },
   "scripts": {
     "build": "pnpm turbo run build",
-    "dev": "pnpm dev --prefix src/web --",
+    "dev": "pnpm dev --prefix src/web/app --",
     "develop": "pnpm dev",
     "eslint": "TIMING=1 eslint --config .eslintrc.js --ignore-path .gitignore \"./src/backend/**/*.js\" \"./test/**/*.js\"",
     "eslint-fix": "eslint --config .eslintrc.js --ignore-path .gitignore \"./src/backend/**/*.js\" \"./test/**/*.js\" --fix",