Merge branch 'JoinGame' into 'Development' (ffadbc84) · Commits · WIMMA Lab 2019 / Overflow / ehasa-backend · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

ehasa-backend
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

ffadbc84

Commit ffadbc84 authored 5 years ago by L4721

Downloads
- Plain Diff

Merge branch 'JoinGame' into 'Development'

Join game

See merge request !18

parents cab7ecb0 631e4935

No related branches found

No related tags found

Loading

Changes 23

Hide whitespace changes

Inline Side-by-side

Showing

Dockerfile 1 addition, 1 deletion

Dockerfile
package-lock.json 49 additions, 0 deletions

package-lock.json
package.json 2 additions, 0 deletions

package.json
src/app.module.ts 7 additions, 1 deletion

src/app.module.ts
src/game/coordinate.entity.ts 29 additions, 83 deletions

src/game/coordinate.entity.ts
src/game/faction.entity.ts 94 additions, 94 deletions

src/game/faction.entity.ts
src/game/game.controller.ts 65 additions, 33 deletions

src/game/game.controller.ts
src/game/game.dto.ts 23 additions, 52 deletions

src/game/game.dto.ts
src/game/game.entity.ts 25 additions, 85 deletions

src/game/game.entity.ts
src/game/game.module.ts 3 additions, 9 deletions

src/game/game.module.ts
src/game/game.service.ts 127 additions, 46 deletions

src/game/game.service.ts
src/game/group.entity.ts 28 additions, 0 deletions

src/game/group.entity.ts
src/main.ts 5 additions, 0 deletions

src/main.ts
src/mapmarkers/mapmarker.entity.ts 23 additions, 16 deletions

src/mapmarkers/mapmarker.entity.ts
src/mapmarkers/mapmarker.service.ts 45 additions, 36 deletions

src/mapmarkers/mapmarker.service.ts
src/mapmarkers/mapmarkers.controller.ts 5 additions, 1 deletion

src/mapmarkers/mapmarkers.controller.ts
src/shared/auth.guard.ts 34 additions, 21 deletions

src/shared/auth.guard.ts
src/shared/roles.decorator.ts 3 additions, 0 deletions

src/shared/roles.decorator.ts
src/shared/roles.guard.ts 51 additions, 0 deletions

src/shared/roles.guard.ts
src/user/user.controller.ts 25 additions, 18 deletions

src/user/user.controller.ts

with 644 additions and 496 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment