Merge pull request #287 from Irev-Dev/kurt/259

Move app into app directory
2021-05-01 07:14:52 +10:00
parent 7066b40d35 5c53902caf
commit 1e5a2532c5
232 changed files with 2 additions and 6 deletions
--- a/app/.env.defaults
+++ b/app/.env.defaults
--- a/app/.env.example
+++ b/app/.env.example
--- a/app/.eslintignore
+++ b/app/.eslintignore
--- a/app/.gitmodules
+++ b/app/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "web/src/cascade"]
-	path = web/src/cascade
+	path = app/web/web/src/cascade
 	url = https://github.com/Irev-Dev/CascadeStudio.git
--- a/app/.nvmrc
+++ b/app/.nvmrc
--- a/app/README.md
+++ b/app/README.md
--- a/app/api/api/.babelrc.js
+++ b/app/api/api/.babelrc.js
--- a/app/api/api/db/migrations/20210228081443_initial_migration_to_postgres_from_sqlite/migration.sql
+++ b/app/api/api/db/migrations/20210228081443_initial_migration_to_postgres_from_sqlite/migration.sql
--- a/app/api/api/db/migrations/migration_lock.toml
+++ b/app/api/api/db/migrations/migration_lock.toml
--- a/app/api/api/db/schema.prisma
+++ b/app/api/api/db/schema.prisma
--- a/app/api/api/db/seed.js
+++ b/app/api/api/db/seed.js
--- a/app/api/api/jest.config.js
+++ b/app/api/api/jest.config.js
--- a/app/api/api/jsconfig.json
+++ b/app/api/api/jsconfig.json
--- a/app/api/api/package.json
+++ b/app/api/api/package.json
--- a/app/api/api/src/docker/Dockerfile
+++ b/app/api/api/src/docker/Dockerfile
--- a/app/api/api/src/docker/README.md
+++ b/app/api/api/src/docker/README.md
--- a/app/api/api/src/docker/aws-emulator.js
+++ b/app/api/api/src/docker/aws-emulator.js
--- a/app/api/api/src/docker/cadquery/Dockerfile
+++ b/app/api/api/src/docker/cadquery/Dockerfile
--- a/app/api/api/src/docker/cadquery/cadquery.js
+++ b/app/api/api/src/docker/cadquery/cadquery.js
--- a/app/api/api/src/docker/cadquery/package.json
+++ b/app/api/api/src/docker/cadquery/package.json
--- a/app/api/api/src/docker/cadquery/runCQ.js
+++ b/app/api/api/src/docker/cadquery/runCQ.js
--- a/app/api/api/src/docker/cadquery/yarn.lock
+++ b/app/api/api/src/docker/cadquery/yarn.lock
--- a/app/api/api/src/docker/common/entrypoint.sh
+++ b/app/api/api/src/docker/common/entrypoint.sh
--- a/app/api/api/src/docker/common/node14source_setup.sh
+++ b/app/api/api/src/docker/common/node14source_setup.sh
--- a/app/api/api/src/docker/common/utils.js
+++ b/app/api/api/src/docker/common/utils.js
--- a/app/api/api/src/docker/docker-compose.yml
+++ b/app/api/api/src/docker/docker-compose.yml
--- a/app/api/api/src/docker/openscad/Dockerfile
+++ b/app/api/api/src/docker/openscad/Dockerfile
--- a/app/api/api/src/docker/openscad/openscad.js
+++ b/app/api/api/src/docker/openscad/openscad.js
--- a/app/api/api/src/docker/openscad/package.json
+++ b/app/api/api/src/docker/openscad/package.json
--- a/app/api/api/src/docker/openscad/runScad.js
+++ b/app/api/api/src/docker/openscad/runScad.js
--- a/app/api/api/src/docker/openscad/yarn.lock
+++ b/app/api/api/src/docker/openscad/yarn.lock
--- a/app/api/api/src/docker/package.json
+++ b/app/api/api/src/docker/package.json
--- a/app/api/api/src/docker/serverless.yml
+++ b/app/api/api/src/docker/serverless.yml
--- a/app/api/api/src/docker/yarn.lock
+++ b/app/api/api/src/docker/yarn.lock
--- a/app/api/api/src/functions/graphql.js
+++ b/app/api/api/src/functions/graphql.js
--- a/app/api/api/src/functions/identity-signup.js
+++ b/app/api/api/src/functions/identity-signup.js
--- a/app/api/api/src/graphql/.keep
+++ b/app/api/api/src/graphql/.keep
--- a/app/api/api/src/graphql/comments.sdl.js
+++ b/app/api/api/src/graphql/comments.sdl.js
--- a/app/api/api/src/graphql/partReactions.sdl.js
+++ b/app/api/api/src/graphql/partReactions.sdl.js
--- a/app/api/api/src/graphql/parts.sdl.js
+++ b/app/api/api/src/graphql/parts.sdl.js
--- a/app/api/api/src/graphql/subjectAccessRequests.sdl.js
+++ b/app/api/api/src/graphql/subjectAccessRequests.sdl.js
--- a/app/api/api/src/graphql/users.sdl.js
+++ b/app/api/api/src/graphql/users.sdl.js
--- a/app/api/api/src/lib/auth.js
+++ b/app/api/api/src/lib/auth.js
--- a/app/api/api/src/lib/db.js
+++ b/app/api/api/src/lib/db.js
--- a/app/api/api/src/lib/logger.ts
+++ b/app/api/api/src/lib/logger.ts
--- a/app/api/api/src/lib/owner.js
+++ b/app/api/api/src/lib/owner.js
--- a/app/api/api/src/services/.keep
+++ b/app/api/api/src/services/.keep
--- a/app/api/api/src/services/comments/comments.js
+++ b/app/api/api/src/services/comments/comments.js
--- a/app/api/api/src/services/comments/comments.test.js
+++ b/app/api/api/src/services/comments/comments.test.js
--- a/app/api/api/src/services/helpers.js
+++ b/app/api/api/src/services/helpers.js
--- a/app/api/api/src/services/partReactions/partReactions.js
+++ b/app/api/api/src/services/partReactions/partReactions.js
--- a/app/api/api/src/services/partReactions/partReactions.test.js
+++ b/app/api/api/src/services/partReactions/partReactions.test.js
--- a/app/api/api/src/services/parts/parts.js
+++ b/app/api/api/src/services/parts/parts.js
--- a/app/api/api/src/services/parts/parts.test.js
+++ b/app/api/api/src/services/parts/parts.test.js
--- a/app/api/api/src/services/subjectAccessRequests/subjectAccessRequests.js
+++ b/app/api/api/src/services/subjectAccessRequests/subjectAccessRequests.js
--- a/app/api/api/src/services/subjectAccessRequests/subjectAccessRequests.test.js
+++ b/app/api/api/src/services/subjectAccessRequests/subjectAccessRequests.test.js
--- a/app/api/api/src/services/users/users.js
+++ b/app/api/api/src/services/users/users.js
--- a/app/api/api/src/services/users/users.test.js
+++ b/app/api/api/src/services/users/users.test.js
--- a/app/babel.config.js
+++ b/app/babel.config.js
--- a/app/graphql.config.js
+++ b/app/graphql.config.js
--- a/app/netlify.toml
+++ b/app/netlify.toml
--- a/app/package.json
+++ b/app/package.json
@@ -3,11 +3,7 @@
  "workspaces": {
    "packages": [
      "api",
-      "web",
-      "docs"
-    ],
-    "nohoist": [
-      "docs/**"
+      "web"
    ]
  },
  "scripts": {},
--- a/app/prettier.config.js
+++ b/app/prettier.config.js
--- a/app/redwood.toml
+++ b/app/redwood.toml
--- a/app/web/web/.babelrc.js
+++ b/app/web/web/.babelrc.js
--- a/app/web/web/config/postcss.config.js
+++ b/app/web/web/config/postcss.config.js
--- a/app/web/web/config/webpack.config.js
+++ b/app/web/web/config/webpack.config.js
--- a/app/web/web/identity-test.json
+++ b/app/web/web/identity-test.json
--- a/app/web/web/jest.config.js
+++ b/app/web/web/jest.config.js
--- a/app/web/web/jsconfig.json
+++ b/app/web/web/jsconfig.json
--- a/app/web/web/package.json
+++ b/app/web/web/package.json
--- a/app/web/web/public/README.md
+++ b/app/web/web/public/README.md
--- a/app/web/web/public/robots.txt
+++ b/app/web/web/public/robots.txt
--- a/app/web/web/src/App.js
+++ b/app/web/web/src/App.js
--- a/app/web/web/src/Routes.js
+++ b/app/web/web/src/Routes.js
--- a/app/web/web/src/cascade
+++ b/app/web/web/src/cascade
--- a/app/web/web/src/components/.keep
+++ b/app/web/web/src/components/.keep
--- a/app/web/web/src/components/AdminParts/AdminParts.js
+++ b/app/web/web/src/components/AdminParts/AdminParts.js
--- a/app/web/web/src/components/AdminPartsCell/AdminPartsCell.js
+++ b/app/web/web/src/components/AdminPartsCell/AdminPartsCell.js
--- a/app/web/web/src/components/Breadcrumb/Breadcrumb.js
+++ b/app/web/web/src/components/Breadcrumb/Breadcrumb.js
--- a/app/web/web/src/components/Breadcrumb/Breadcrumb.stories.js
+++ b/app/web/web/src/components/Breadcrumb/Breadcrumb.stories.js
--- a/app/web/web/src/components/Breadcrumb/Breadcrumb.test.js
+++ b/app/web/web/src/components/Breadcrumb/Breadcrumb.test.js
--- a/app/web/web/src/components/Button/Button.js
+++ b/app/web/web/src/components/Button/Button.js
--- a/app/web/web/src/components/Button/Button.stories.js
+++ b/app/web/web/src/components/Button/Button.stories.js
--- a/app/web/web/src/components/Button/Button.test.js
+++ b/app/web/web/src/components/Button/Button.test.js
--- a/app/web/web/src/components/ConfirmDialog/ConfirmDialog.js
+++ b/app/web/web/src/components/ConfirmDialog/ConfirmDialog.js
--- a/app/web/web/src/components/ConfirmDialog/ConfirmDialog.stories.js
+++ b/app/web/web/src/components/ConfirmDialog/ConfirmDialog.stories.js
--- a/app/web/web/src/components/ConfirmDialog/ConfirmDialog.test.js
+++ b/app/web/web/src/components/ConfirmDialog/ConfirmDialog.test.js
--- a/app/web/web/src/components/EditSubjectAccessRequestCell/EditSubjectAccessRequestCell.js
+++ b/app/web/web/src/components/EditSubjectAccessRequestCell/EditSubjectAccessRequestCell.js
--- a/app/web/web/src/components/EditUserCell/EditUserCell.js
+++ b/app/web/web/src/components/EditUserCell/EditUserCell.js
--- a/app/web/web/src/components/EditUserCell/EditUserCell.mock.js
+++ b/app/web/web/src/components/EditUserCell/EditUserCell.mock.js
--- a/app/web/web/src/components/EditUserCell/EditUserCell.stories.js
+++ b/app/web/web/src/components/EditUserCell/EditUserCell.stories.js
--- a/app/web/web/src/components/EditUserCell/EditUserCell.test.js
+++ b/app/web/web/src/components/EditUserCell/EditUserCell.test.js
--- a/app/web/web/src/components/EmojiReaction/EmojiReaction.js
+++ b/app/web/web/src/components/EmojiReaction/EmojiReaction.js
--- a/app/web/web/src/components/EmojiReaction/EmojiReaction.stories.js
+++ b/app/web/web/src/components/EmojiReaction/EmojiReaction.stories.js
--- a/app/web/web/src/components/EmojiReaction/EmojiReaction.test.js
+++ b/app/web/web/src/components/EmojiReaction/EmojiReaction.test.js
--- a/app/web/web/src/components/Footer/Footer.js
+++ b/app/web/web/src/components/Footer/Footer.js
--- a/app/web/web/src/components/Footer/Footer.stories.js
+++ b/app/web/web/src/components/Footer/Footer.stories.js
--- a/app/web/web/src/components/Footer/Footer.test.js
+++ b/app/web/web/src/components/Footer/Footer.test.js
--- a/app/web/web/src/components/IdeCascadeStudio/IdeCascadeStudio.js
+++ b/app/web/web/src/components/IdeCascadeStudio/IdeCascadeStudio.js
--- a/Show More
+++ b/Show More