Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue 32 -- update client dependencies (WIP) #44

Closed
wants to merge 12 commits into from
Closed

Issue 32 -- update client dependencies (WIP) #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0fccb6f
[update-client-packages] application compiles
slmyers Dec 2, 2018
7724e67
issue_32: frontend runtime errors fixed
slmyers Dec 11, 2018
5014036
issue_32: user facing side works
slmyers Dec 16, 2018
56e54da
issue_32 -- fix quick-links
slmyers Dec 16, 2018
6429128
in progress
slmyers Jan 5, 2019
1d51bf9
[issue_32] -- got the form builder working:
slmyers Jan 13, 2019
2a1a378
Merge pull request #1 from yeg-relief/master
slmyers Jan 13, 2019
926ae3f
[issue_32] -- merge and remove+ignore .idea/
slmyers Jan 13, 2019
73a92af
[issue_32] -- remove unused dep
slmyers Jan 13, 2019
20270e4
[issue_32] -- remove debugging code in protected.controller
slmyers Jan 13, 2019
a51d7e9
update guidance on install
slmyers Jan 13, 2019
f54a2a1
[issue_32] -- build is now minified properly
slmyers Jan 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
.DS_STORE
.DS_STORE
.idea/
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ There are 3 components required to run YCB.
#### Frontend
This is built using Angular (the new one). Navigate to the folder `frontend` inside the project root in your favorite cli.

Run `npm install` to install the dependencies.
Run `npm ci` to install the dependencies.

Run `npm start` to start the frontend of the app up. You should see the app at `localhost:4200`.

#### Backend
This is built using a Node.js framework called [Nest](https://github.com/nestjs/nest). Navigate to the folder `backend` inside the project root in your favorite cli.

Run `npm install` to install the dependencies.
Run `npm ci` to install the dependencies.

Run `npm start` to start the backend of the app up. You should see the routes at `localhost:3000`. To confirm it's working, sending a GET to `localhost:3000` should yield Hello World!.

Expand Down
106 changes: 13 additions & 93 deletions backend/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion backend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@types/node": "^8.10.36",
"@types/winston": "^2.4.4",
"jest": "^21.2.1",
"nodemon": "^1.18.5",
"nodemon": "^1.18.9",
"supertest": "^3.3.0",
"ts-jest": "^21.2.4",
"ts-node": "^3.3.0"
Expand Down
6 changes: 2 additions & 4 deletions backend/src/modules/protected/protected.controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,14 +104,12 @@ export class ProtectedController {
createProgramWithQueries(
@Body("user") user,
@Body("application") application,
@Body("guid") guid,
@Req() req
): any {
return Observable.zip(
this.programService.create(user),
Observable.from(application)
.mergeMap( (query: ApplicationQueryDto) => this.queryService.create(query))
.catch(error => Observable.throw(false))
.catch(() => Observable.throw(false))
)
.map( ([{created}, queriesCreated]) => {
return created === true && queriesCreated === true ? { created: true} : { created: false }
Expand Down Expand Up @@ -145,7 +143,7 @@ export class ProtectedController {
.map(res => res.deleted ? {found: true, deleted: true } : { found: null, deleted: false} )
}

@Post('/query')
@Post('/query/')
updateOrCreateQuery(@Body("query") query, @Body("guid") guid): Promise<any> {
return this.queryService.index({
...query,
Expand Down
1 change: 1 addition & 0 deletions frontend/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

# compiled output
/tmp
/dist

# dependencies
/node_modules
Expand Down
Loading