Fix toolbar and reformat backend code

backend/src/controllers/course-requirement.controller.ts

@@ -19,12 +19,13 @@ import {
     Course,
     Requirement,
 } from '../models';
-import {CourseRepository} from '../repositories';
+import { CourseRepository } from '../repositories';
 
 export class CourseRequirementController {
     constructor(
         @repository(CourseRepository) protected courseRepository: CourseRepository,
-  ) { }
+    ) {
+    }
 
     @get('/courses/{id}/requirements', {
         responses: {

backend/src/controllers/course-subject.controller.ts

@@ -10,13 +10,14 @@ import {
     Course,
     Subject,
 } from '../models';
-import {CourseRepository} from '../repositories';
+import { CourseRepository } from '../repositories';
 
 export class CourseSubjectController {
     constructor(
         @repository(CourseRepository)
         public courseRepository: CourseRepository,
-  ) { }
+    ) {
+    }
 
     @get('/courses/{id}/subject', {
         responses: {

backend/src/controllers/course-user.controller.ts

@@ -5,7 +5,7 @@ import {
     repository,
     Where,
 } from '@loopback/repository';
-  import {
+import {
     del,
     get,
     getModelSchemaRef,
@@ -16,15 +16,16 @@ import {
     requestBody,
 } from '@loopback/rest';
 import {
-Course,
-User,
+    Course,
+    User,
 } from '../models';
-import {CourseRepository} from '../repositories';
+import { CourseRepository } from '../repositories';
 
 export class CourseUserController {
     constructor(
         @repository(CourseRepository) protected courseRepository: CourseRepository,
-  ) { }
+    ) {
+    }
 
     @get('/courses/{id}/users', {
         responses: {

backend/src/controllers/subject-course.controller.ts

@@ -19,12 +19,13 @@ import {
     Subject,
     Course,
 } from '../models';
-import {SubjectRepository} from '../repositories';
+import { SubjectRepository } from '../repositories';
 
 export class SubjectCourseController {
     constructor(
         @repository(SubjectRepository) protected subjectRepository: SubjectRepository,
-  ) { }
+    ) {
+    }
 
     @get('/subjects/{id}/courses', {
         responses: {

backend/src/controllers/user-course.controller.ts

@@ -5,7 +5,7 @@ import {
     repository,
     Where,
 } from '@loopback/repository';
-  import {
+import {
     del,
     get,
     getModelSchemaRef,
@@ -16,15 +16,16 @@ import {
     requestBody,
 } from '@loopback/rest';
 import {
-User,
-Course,
+    User,
+    Course,
 } from '../models';
-import {UserRepository} from '../repositories';
+import { UserRepository } from '../repositories';
 
 export class UserCourseController {
     constructor(
         @repository(UserRepository) protected userRepository: UserRepository,
-  ) { }
+    ) {
+    }
 
     @get('/users/{id}/courses', {
         responses: {

backend/src/controllers/user.controller.ts

@@ -1,16 +1,16 @@
-import {Count, CountSchema, Filter, FilterExcludingWhere, repository, Where,} from '@loopback/repository';
+import { Count, CountSchema, Filter, FilterExcludingWhere, repository, Where, } from '@loopback/repository';
 import { del, get, getModelSchemaRef, HttpErrors, param, patch, post, Request, requestBody, response, RestBindings, } from '@loopback/rest';
-import {User} from '../models';
-import {UserRepository} from '../repositories';
+import { User } from '../models';
+import { UserRepository } from '../repositories';
 import {
     TokenServiceBindings,
     UserServiceBindings
 } from '@loopback/authentication-jwt';
-import {inject} from '@loopback/core';
-import {authenticate, TokenService} from '@loopback/authentication';
-import {SecurityBindings, UserProfile} from '@loopback/security';
-import {genSalt, hash} from 'bcryptjs';
-import {SzakdolgozatUserService} from '../services';
+import { inject } from '@loopback/core';
+import { authenticate, TokenService } from '@loopback/authentication';
+import { SecurityBindings, UserProfile } from '@loopback/security';
+import { genSalt, hash } from 'bcryptjs';
+import { SzakdolgozatUserService } from '../services';
 
 export class UserController {
     constructor(
@@ -197,11 +197,12 @@ export class UserController {
         })
             user: User,
     ): Promise<void> {
-        if(id === +this.user.id) {
+        if (id === +this.user.id) {
             const loggedInUser = await this.userService.findUserById(this.user.id);
-            if(user.isAdmin !== undefined && loggedInUser.isAdmin !== user.isAdmin)
+            if (user.isAdmin !== undefined && loggedInUser.isAdmin !== user.isAdmin) {
                 throw new HttpErrors.BadRequest('Cannot change admin status of self');
             }
+        }
         await this.userRepository.updateById(id, user);
     }
 

backend/src/models/course-user.model.ts

@@ -1,4 +1,4 @@
-import {Entity, model, property} from '@loopback/repository';
+import { Entity, model, property } from '@loopback/repository';
 
 @model()
 export class CourseUser extends Entity {

backend/src/models/course.model.ts

@@ -1,8 +1,8 @@
-import {Entity, model, property, belongsTo, hasMany} from '@loopback/repository';
-import {Subject} from './subject.model';
-import {User} from './user.model';
-import {CourseUser} from './course-user.model';
-import {Requirement} from './requirement.model';
+import { Entity, model, property, belongsTo, hasMany } from '@loopback/repository';
+import { Subject } from './subject.model';
+import { User } from './user.model';
+import { CourseUser } from './course-user.model';
+import { Requirement } from './requirement.model';
 
 @model()
 export class Course extends Entity {

backend/src/models/requirement.model.ts

@@ -1,4 +1,4 @@
-import {Entity, model, property} from '@loopback/repository';
+import { Entity, model, property } from '@loopback/repository';
 
 @model()
 export class Requirement extends Entity {

backend/src/models/subject.model.ts

@@ -1,5 +1,5 @@
-import {Entity, model, property, hasMany} from '@loopback/repository';
-import {Course} from './course.model';
+import { Entity, model, property, hasMany } from '@loopback/repository';
+import { Course } from './course.model';
 
 @model()
 export class Subject extends Entity {

backend/src/models/user.model.ts

@@ -1,6 +1,6 @@
-import {Entity, model, property, hasMany} from '@loopback/repository';
-import {Course} from './course.model';
-import {CourseUser} from './course-user.model';
+import { Entity, model, property, hasMany } from '@loopback/repository';
+import { Course } from './course.model';
+import { CourseUser } from './course-user.model';
 
 @model()
 export class User extends Entity {

backend/src/repositories/course-user.repository.ts

@@ -1,13 +1,11 @@
-import {inject} from '@loopback/core';
-import {DefaultCrudRepository} from '@loopback/repository';
-import {DatabaseDataSource} from '../datasources';
-import {CourseUser, CourseUserRelations} from '../models';
+import { inject } from '@loopback/core';
+import { DefaultCrudRepository } from '@loopback/repository';
+import { DatabaseDataSource } from '../datasources';
+import { CourseUser, CourseUserRelations } from '../models';
 
-export class CourseUserRepository extends DefaultCrudRepository<
-  CourseUser,
+export class CourseUserRepository extends DefaultCrudRepository<CourseUser,
     typeof CourseUser.prototype.id,
-  CourseUserRelations
-> {
+    CourseUserRelations> {
     constructor(
         @inject('datasources.database') dataSource: DatabaseDataSource,
     ) {

backend/src/repositories/course.repository.ts

@@ -1,24 +1,27 @@
-import {inject, Getter} from '@loopback/core';
-import {DefaultCrudRepository, repository, BelongsToAccessor, HasManyThroughRepositoryFactory, HasManyRepositoryFactory} from '@loopback/repository';
-import {DatabaseDataSource} from '../datasources';
-import {Course, CourseRelations, Subject, User, CourseUser, Requirement} from '../models';
-import {SubjectRepository} from './subject.repository';
-import {CourseUserRepository} from './course-user.repository';
-import {UserRepository} from './user.repository';
-import {RequirementRepository} from './requirement.repository';
+import { inject, Getter } from '@loopback/core';
+import {
+    DefaultCrudRepository,
+    repository,
+    BelongsToAccessor,
+    HasManyThroughRepositoryFactory,
+    HasManyRepositoryFactory
+} from '@loopback/repository';
+import { DatabaseDataSource } from '../datasources';
+import { Course, CourseRelations, Subject, User, CourseUser, Requirement } from '../models';
+import { SubjectRepository } from './subject.repository';
+import { CourseUserRepository } from './course-user.repository';
+import { UserRepository } from './user.repository';
+import { RequirementRepository } from './requirement.repository';
 
-export class CourseRepository extends DefaultCrudRepository<
-  Course,
+export class CourseRepository extends DefaultCrudRepository<Course,
     typeof Course.prototype.id,
-  CourseRelations
-> {
+    CourseRelations> {
 
     public readonly subject: BelongsToAccessor<Subject, typeof Course.prototype.id>;
 
     public readonly users: HasManyThroughRepositoryFactory<User, typeof User.prototype.id,
         CourseUser,
-          typeof Course.prototype.id
-        >;
+        typeof Course.prototype.id>;
 
     public readonly requirements: HasManyRepositoryFactory<Requirement, typeof Course.prototype.id>;
 

backend/src/repositories/requirement.repository.ts

@@ -1,13 +1,11 @@
-import {inject} from '@loopback/core';
-import {DefaultCrudRepository} from '@loopback/repository';
-import {DatabaseDataSource} from '../datasources';
-import {Requirement, RequirementRelations} from '../models';
+import { inject } from '@loopback/core';
+import { DefaultCrudRepository } from '@loopback/repository';
+import { DatabaseDataSource } from '../datasources';
+import { Requirement, RequirementRelations } from '../models';
 
-export class RequirementRepository extends DefaultCrudRepository<
-  Requirement,
+export class RequirementRepository extends DefaultCrudRepository<Requirement,
     typeof Requirement.prototype.id,
-  RequirementRelations
-> {
+    RequirementRelations> {
     constructor(
         @inject('datasources.database') dataSource: DatabaseDataSource,
     ) {

backend/src/repositories/subject.repository.ts

@@ -1,15 +1,13 @@
-import {inject, Getter} from '@loopback/core';
-import {DefaultCrudRepository, repository, HasManyRepositoryFactory} from '@loopback/repository';
-import {DatabaseDataSource} from '../datasources';
-import {Subject, SubjectRelations, Course} from '../models';
-import {UserRepository} from './user.repository';
-import {CourseRepository} from './course.repository';
+import { inject, Getter } from '@loopback/core';
+import { DefaultCrudRepository, repository, HasManyRepositoryFactory } from '@loopback/repository';
+import { DatabaseDataSource } from '../datasources';
+import { Subject, SubjectRelations, Course } from '../models';
+import { UserRepository } from './user.repository';
+import { CourseRepository } from './course.repository';
 
-export class SubjectRepository extends DefaultCrudRepository<
-  Subject,
+export class SubjectRepository extends DefaultCrudRepository<Subject,
     typeof Subject.prototype.id,
-  SubjectRelations
-> {
+    SubjectRelations> {
 
     public readonly courses: HasManyRepositoryFactory<Course, typeof Subject.prototype.id>;
 

backend/src/repositories/user.repository.ts

@@ -1,21 +1,18 @@
-import {inject, Getter} from '@loopback/core';
+import { inject, Getter } from '@loopback/core';
 import { repository, HasManyThroughRepositoryFactory, DefaultTransactionalRepository } from '@loopback/repository';
-import {DatabaseDataSource} from '../datasources';
-import {User, UserRelations, Course, CourseUser} from '../models';
-import {SubjectRepository} from './subject.repository';
-import {CourseUserRepository} from './course-user.repository';
-import {CourseRepository} from './course.repository';
+import { DatabaseDataSource } from '../datasources';
+import { User, UserRelations, Course, CourseUser } from '../models';
+import { SubjectRepository } from './subject.repository';
+import { CourseUserRepository } from './course-user.repository';
+import { CourseRepository } from './course.repository';
 
-export class UserRepository extends DefaultTransactionalRepository<
-  User,
+export class UserRepository extends DefaultTransactionalRepository<User,
     typeof User.prototype.id,
-  UserRelations
-> {
+    UserRelations> {
 
     public readonly courses: HasManyThroughRepositoryFactory<Course, typeof Course.prototype.id,
         CourseUser,
-          typeof User.prototype.id
-        >;
+        typeof User.prototype.id>;
 
     constructor(
         @inject('datasources.database') dataSource: DatabaseDataSource, @repository.getter('SubjectRepository') protected subjectRepositoryGetter: Getter<SubjectRepository>, @repository.getter('CourseUserRepository') protected courseUserRepositoryGetter: Getter<CourseUserRepository>, @repository.getter('CourseRepository') protected courseRepositoryGetter: Getter<CourseRepository>,

backend/src/services/user.service.ts

@@ -3,13 +3,13 @@
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
 
-import {UserService} from '@loopback/authentication';
-import {repository} from '@loopback/repository';
-import {HttpErrors} from '@loopback/rest';
-import {securityId, UserProfile} from '@loopback/security';
-import {compare} from 'bcryptjs';
-import {User, UserWithRelations} from '../models';
-import {UserRepository} from '../repositories';
+import { UserService } from '@loopback/authentication';
+import { repository } from '@loopback/repository';
+import { HttpErrors } from '@loopback/rest';
+import { securityId, UserProfile } from '@loopback/security';
+import { compare } from 'bcryptjs';
+import { User, UserWithRelations } from '../models';
+import { UserRepository } from '../repositories';
 
 /**
  * A pre-defined type for user credentials. It assumes a user logs in
@@ -23,7 +23,8 @@ export type Credentials = {
 export class SzakdolgozatUserService implements UserService<User, Credentials> {
     constructor(
         @repository(UserRepository) public userRepository: UserRepository,
-  ) { }
+    ) {
+    }
 
     async verifyCredentials(credentials: Credentials): Promise<User> {
         const invalidCredentialsError = 'Invalid email or password.';

frontend/src/app/app.component.html

@@ -10,7 +10,7 @@
     </mat-nav-list>
   </mat-sidenav>
   <mat-sidenav-content>
-    <mat-toolbar color="primary">
+    <mat-toolbar color="primary" style="z-index: 1000">
       <button
         type="button"
         aria-label="Oldalsáv"