Commit 00127aca authored 5 years ago by Pavel Kirilin

Merge branch 'feature/pages' into 'master'

Feature/pages

See merge request !1

parents 50088551 39b15b92

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

src/main/kotlin/com/s3ai/corporate_app2/controllers/CinemasController.kt 19 additions, 15 deletions

.../com/s3ai/corporate_app2/controllers/CinemasController.kt
src/main/kotlin/com/s3ai/corporate_app2/controllers/TicketsController.kt 53 additions, 0 deletions

.../com/s3ai/corporate_app2/controllers/TicketsController.kt
src/main/kotlin/com/s3ai/corporate_app2/controllers/UserController.kt 0 additions, 20 deletions

...lin/com/s3ai/corporate_app2/controllers/UserController.kt
src/main/kotlin/com/s3ai/corporate_app2/controllers/UsersController.kt 44 additions, 0 deletions

...in/com/s3ai/corporate_app2/controllers/UsersController.kt
src/main/kotlin/com/s3ai/corporate_app2/controllers/controllerUtils.kt 23 additions, 0 deletions

...in/com/s3ai/corporate_app2/controllers/controllerUtils.kt
src/main/kotlin/com/s3ai/corporate_app2/controllers/rest/CinemaApiController.kt 40 additions, 0 deletions

...ai/corporate_app2/controllers/rest/CinemaApiController.kt
src/main/kotlin/com/s3ai/corporate_app2/controllers/rest/TicketApiController.kt 50 additions, 0 deletions

...ai/corporate_app2/controllers/rest/TicketApiController.kt
src/main/kotlin/com/s3ai/corporate_app2/controllers/rest/UserApiController.kt 38 additions, 0 deletions

...s3ai/corporate_app2/controllers/rest/UserApiController.kt
src/main/kotlin/com/s3ai/corporate_app2/entities.kt 65 additions, 0 deletions

src/main/kotlin/com/s3ai/corporate_app2/entities.kt
src/main/kotlin/com/s3ai/corporate_app2/entities/Ticket.kt 0 additions, 24 deletions

src/main/kotlin/com/s3ai/corporate_app2/entities/Ticket.kt
src/main/kotlin/com/s3ai/corporate_app2/entities/User.kt 0 additions, 21 deletions

src/main/kotlin/com/s3ai/corporate_app2/entities/User.kt
src/main/kotlin/com/s3ai/corporate_app2/repos/TicketRepository.kt 0 additions, 11 deletions

.../kotlin/com/s3ai/corporate_app2/repos/TicketRepository.kt
src/main/kotlin/com/s3ai/corporate_app2/repos/UserRepository.kt 0 additions, 12 deletions

...in/kotlin/com/s3ai/corporate_app2/repos/UserRepository.kt
src/main/kotlin/com/s3ai/corporate_app2/repositories.kt 13 additions, 3 deletions

src/main/kotlin/com/s3ai/corporate_app2/repositories.kt
src/main/kotlin/com/s3ai/corporate_app2/services.kt 36 additions, 0 deletions

src/main/kotlin/com/s3ai/corporate_app2/services.kt
src/main/kotlin/com/s3ai/corporate_app2/services/CinemaService.kt 0 additions, 19 deletions

.../kotlin/com/s3ai/corporate_app2/services/CinemaService.kt
src/main/kotlin/com/s3ai/corporate_app2/services/TicketService.kt 0 additions, 18 deletions

.../kotlin/com/s3ai/corporate_app2/services/TicketService.kt
src/main/kotlin/com/s3ai/corporate_app2/services/UserService.kt 0 additions, 18 deletions

...in/kotlin/com/s3ai/corporate_app2/services/UserService.kt
src/main/resources/application.properties 1 addition, 1 deletion

src/main/resources/application.properties
src/main/resources/static/coffee/cinemas.coffee 7 additions, 3 deletions

src/main/resources/static/coffee/cinemas.coffee

with 389 additions and 165 deletions

Please register or to comment