This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

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
  • Loading branch information...
snatchev committed Mar 26, 2018
1 parent 55efe98 commit 8fa2ba59e784782c6b9c116fb14da450a305a0cc
Showing with 15 additions and 18 deletions.
  1. +3 −3 {app → }/.angular-cli.json
  2. +1 −0 .gitignore
  3. +3 −7 README.md
  4. +1 −1 Rakefile
  5. +6 −6 docs/ProjectLayout.md
  6. 0 {app → }/karma.conf.js
  7. 0 {app → }/package.json
  8. +1 −1 {app → }/tsconfig.json
  9. 0 {app → }/tslint.json
  10. 0 {app → web}/README.md
  11. 0 {app/src → web}/app/app-routing.module.ts
  12. 0 {app/src → web}/app/app.component.html
  13. 0 {app/src → web}/app/app.component.ts
  14. 0 {app/src → web}/app/app.module.ts
  15. 0 {app/src → web}/app/dashboard/dashboard.component.html
  16. 0 {app/src → web}/app/dashboard/dashboard.component.scss
  17. 0 {app/src → web}/app/dashboard/dashboard.component.spec.ts
  18. 0 {app/src → web}/app/dashboard/dashboard.component.ts
  19. 0 {app/src → web}/app/models/project.spec.ts
  20. 0 {app/src → web}/app/models/project.ts
  21. 0 {app/src → web}/app/models/test_helpers/mock_project_response.ts
  22. 0 {app/src → web}/app/overview/overview.component.html
  23. 0 {app/src → web}/app/overview/overview.component.scss
  24. 0 {app/src → web}/app/overview/overview.component.spec.ts
  25. 0 {app/src → web}/app/overview/overview.component.ts
  26. 0 {app/src → web}/app/services/data.service.spec.ts
  27. 0 {app/src → web}/app/services/data.service.ts
  28. 0 {app/src → web}/app/services/test_helpers/mock_project_response.ts
  29. 0 {app/src → web}/assets/.gitkeep
  30. 0 {app/src → web}/environments/environment.prod.ts
  31. 0 {app/src → web}/environments/environment.ts
  32. BIN {app/src → web}/favicon.ico
  33. 0 {app/src → web}/global/grid.scss
  34. 0 {app/src → web}/global/theme.scss
  35. 0 {app/src → web}/index.html
  36. 0 {app/src → web}/main.ts
  37. 0 {app/src → web}/polyfills.ts
  38. 0 {app/src → web}/shared/_layout.scss
  39. 0 {app/src → web}/test.ts
  40. 0 {app/src → web}/tsconfig.app.json
  41. 0 {app/src → web}/tsconfig.spec.json
  42. 0 {app/src → web}/typings.d.ts
@@ -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/**"
}
],
@@ -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
@@ -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
@@ -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
@@ -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
---
File renamed without changes.
File renamed without changes.
@@ -1,7 +1,7 @@
{
"compileOnSave": false,
"compilerOptions": {
"outDir": "./dist/out-tsc",
"outDir": "./web/dist/out-tsc",
"sourceMap": true,
"declaration": false,
"moduleResolution": "node",
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 8fa2ba5

Please sign in to comment.