Move ng app into web (#370)

* move app/src => web/ for the angular app * move some js/ts config files into root * Move overview and new style to the web folder
fastlane · Mar 26, 2018 · 8fa2ba5 · 8fa2ba5
1 parent 55efe98
commit 8fa2ba5
Show file tree

Hide file tree

Showing 42 changed files with 15 additions and 18 deletions.
diff --git a/app/.angular-cli.json → .angular-cli.json b/app/.angular-cli.json → .angular-cli.json
@@ -5,7 +5,7 @@
   },
   "apps": [
     {
-      "root": "src",
+      "root": "web",
       "outDir": "../public/.dist",
       "assets": [
         "assets",
@@ -32,11 +32,11 @@
   ],
   "lint": [
     {
-      "project": "src/tsconfig.app.json",
+      "project": "web/tsconfig.app.json",
       "exclude": "**/node_modules/**"
     },
     {
-      "project": "src/tsconfig.spec.json",
+      "project": "web/tsconfig.spec.json",
       "exclude": "**/node_modules/**"
     }
   ],

diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,7 @@ fastlane.verbose.log
 public/.dist/*
 **/node_modules/*
 package-lock.json
+npm-debug.log
 
 # from https://github.com/github/gitignore/blob/master/Ruby.gitignore
 

diff --git a/README.md b/README.md
@@ -57,13 +57,9 @@ Requires Ruby 2.3.3 or higher. macOS and Xcode are required when building iOS pr
 
 ## Development installation
 
-**Note:** We have a couple dependencies that aren't standalone gems yet, so we included them as git submodules for now
-
-```
-bundle install
-git submodule init
-git submodule update
-```
+Run the rake task: `rake devboostrap`.
+1. Install all dependencies (ruby, javascript)
+2. Add a pre-commit hook
 
 ## Environment variables for first run
 

diff --git a/Rakefile b/Rakefile
@@ -4,7 +4,7 @@ end
 
 task :devbootstrap do
   sh "bundle install"
-  sh "git submodule update --init --recursive"
+  sh "npm install"
   sh "ln -sf ../../.pre-commit .git/hooks/pre-commit"
 end
 

diff --git a/docs/ProjectLayout.md b/docs/ProjectLayout.md
@@ -7,11 +7,11 @@ ci
 │   ├── [features](#features)
 │   ├── [services](#services)
 │   ├── [shared](#shared)
-│   ├── [src](#src)
 │   └── [workers](#workers)
 ├── docs
 ├── public
 ├── [spec](#spec)
+├── [web](#web)
 └── [vendor](#vendor)
 ```
 
@@ -33,11 +33,6 @@ Services are like controllers for your data
 shared
 ---
 
-src
----
-
-Front-end code for the browser UI of the application
-
 workers
 ---
 
@@ -48,6 +43,11 @@ spec
 
 Rspec tests for the ruby implementation of the web application. Sub-folders here should match the relevant files under test in `app/`
 
+web
+---
+
+Front-end code for the browser UI of the application
+
 vendor
 ---
 

diff --git a/app/karma.conf.js → karma.conf.js b/app/karma.conf.js → karma.conf.js
diff --git a/app/package.json → package.json b/app/package.json → package.json
diff --git a/app/tsconfig.json → tsconfig.json b/app/tsconfig.json → tsconfig.json
@@ -1,7 +1,7 @@
 {
   "compileOnSave": false,
   "compilerOptions": {
-    "outDir": "./dist/out-tsc",
+    "outDir": "./web/dist/out-tsc",
     "sourceMap": true,
     "declaration": false,
     "moduleResolution": "node",

diff --git a/app/tslint.json → tslint.json b/app/tslint.json → tslint.json
diff --git a/app/README.md → web/README.md b/app/README.md → web/README.md
diff --git a/app/src/app/app-routing.module.ts → web/app/app-routing.module.ts b/app/src/app/app-routing.module.ts → web/app/app-routing.module.ts
diff --git a/app/src/app/app.component.html → web/app/app.component.html b/app/src/app/app.component.html → web/app/app.component.html
diff --git a/app/src/app/app.component.ts → web/app/app.component.ts b/app/src/app/app.component.ts → web/app/app.component.ts
diff --git a/app/src/app/app.module.ts → web/app/app.module.ts b/app/src/app/app.module.ts → web/app/app.module.ts
diff --git a/...rc/app/dashboard/dashboard.component.html → web/app/dashboard/dashboard.component.html b/...rc/app/dashboard/dashboard.component.html → web/app/dashboard/dashboard.component.html
diff --git a/...rc/app/dashboard/dashboard.component.scss → web/app/dashboard/dashboard.component.scss b/...rc/app/dashboard/dashboard.component.scss → web/app/dashboard/dashboard.component.scss
diff --git a/...app/dashboard/dashboard.component.spec.ts → ...app/dashboard/dashboard.component.spec.ts b/...app/dashboard/dashboard.component.spec.ts → ...app/dashboard/dashboard.component.spec.ts
diff --git a/app/src/app/dashboard/dashboard.component.ts → web/app/dashboard/dashboard.component.ts b/app/src/app/dashboard/dashboard.component.ts → web/app/dashboard/dashboard.component.ts
diff --git a/app/src/app/models/project.spec.ts → web/app/models/project.spec.ts b/app/src/app/models/project.spec.ts → web/app/models/project.spec.ts
diff --git a/app/src/app/models/project.ts → web/app/models/project.ts b/app/src/app/models/project.ts → web/app/models/project.ts
diff --git a/...els/test_helpers/mock_project_response.ts → ...els/test_helpers/mock_project_response.ts b/...els/test_helpers/mock_project_response.ts → ...els/test_helpers/mock_project_response.ts
diff --git a/app/src/app/overview/overview.component.html → web/app/overview/overview.component.html b/app/src/app/overview/overview.component.html → web/app/overview/overview.component.html
diff --git a/app/src/app/overview/overview.component.scss → web/app/overview/overview.component.scss b/app/src/app/overview/overview.component.scss → web/app/overview/overview.component.scss
diff --git a/...c/app/overview/overview.component.spec.ts → web/app/overview/overview.component.spec.ts b/...c/app/overview/overview.component.spec.ts → web/app/overview/overview.component.spec.ts
diff --git a/app/src/app/overview/overview.component.ts → web/app/overview/overview.component.ts b/app/src/app/overview/overview.component.ts → web/app/overview/overview.component.ts
diff --git a/app/src/app/services/data.service.spec.ts → web/app/services/data.service.spec.ts b/app/src/app/services/data.service.spec.ts → web/app/services/data.service.spec.ts
diff --git a/app/src/app/services/data.service.ts → web/app/services/data.service.ts b/app/src/app/services/data.service.ts → web/app/services/data.service.ts
diff --git a/...ces/test_helpers/mock_project_response.ts → ...ces/test_helpers/mock_project_response.ts b/...ces/test_helpers/mock_project_response.ts → ...ces/test_helpers/mock_project_response.ts
diff --git a/app/src/assets/.gitkeep → web/assets/.gitkeep b/app/src/assets/.gitkeep → web/assets/.gitkeep
diff --git a/app/src/environments/environment.prod.ts → web/environments/environment.prod.ts b/app/src/environments/environment.prod.ts → web/environments/environment.prod.ts
diff --git a/app/src/environments/environment.ts → web/environments/environment.ts b/app/src/environments/environment.ts → web/environments/environment.ts
diff --git a/app/src/favicon.ico → web/favicon.ico b/app/src/favicon.ico → web/favicon.ico
diff --git a/app/src/global/grid.scss → web/global/grid.scss b/app/src/global/grid.scss → web/global/grid.scss
diff --git a/app/src/global/theme.scss → web/global/theme.scss b/app/src/global/theme.scss → web/global/theme.scss
diff --git a/app/src/index.html → web/index.html b/app/src/index.html → web/index.html
diff --git a/app/src/main.ts → web/main.ts b/app/src/main.ts → web/main.ts
diff --git a/app/src/polyfills.ts → web/polyfills.ts b/app/src/polyfills.ts → web/polyfills.ts
diff --git a/app/src/shared/_layout.scss → web/shared/_layout.scss b/app/src/shared/_layout.scss → web/shared/_layout.scss
diff --git a/app/src/test.ts → web/test.ts b/app/src/test.ts → web/test.ts
diff --git a/app/src/tsconfig.app.json → web/tsconfig.app.json b/app/src/tsconfig.app.json → web/tsconfig.app.json
diff --git a/app/src/tsconfig.spec.json → web/tsconfig.spec.json b/app/src/tsconfig.spec.json → web/tsconfig.spec.json
diff --git a/app/src/typings.d.ts → web/typings.d.ts b/app/src/typings.d.ts → web/typings.d.ts