issue-181, created ci job for ui and fixed ui gracefuly

omc-college · Jul 20, 2020 · 8527d31 · 8527d31
1 parent 6633766
commit 8527d31
Show file tree

Hide file tree

Showing 21 changed files with 84 additions and 100 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,23 +1,27 @@
 os: linux
-
-language: go
-go:
-  - 1.13.11
-
-env:
-  - GO111MODULE=on
-
-install:
-- curl -L https://github.com/golang-migrate/migrate/releases/download/v4.11.0/migrate.linux-amd64.tar.gz | tar xvz
-
-# Don't email me the results of the test runs.
-notifications:
-  email: false
-
-script:
-  - go build ./cmd/ims
-  - go build ./cmd/rbac
-  - go build ./cmd/rbacgen
-
-after_success:
-  - echo "Process Done."
+matrix:
+  include:
+    - language: go
+      go:
+        - 1.13.11
+      env:
+        - GO111MODULE=on
+      install:
+        - curl -L https://github.com/golang-migrate/migrate/releases/download/v4.11.0/migrate.linux-amd64.tar.gz | tar xvz
+      script:
+        - go build ./cmd/ims
+        - go build ./cmd/rbac
+        - go build ./cmd/rbacgen
+      after_success:
+        - echo "Process Done."
+    - language: node_js
+      node_js:
+        - "14.3.0"
+      before_script:
+        - npm install -g @angular/cli
+        - cd ui
+      script:
+        - npm install
+        - npm run build
+        - npm run prettier
+        - npm run lint
diff --git a/ui/package.json b/ui/package.json
@@ -53,7 +53,7 @@
     "karma-coverage-istanbul-reporter": "~2.1.0",
     "karma-jasmine": "~2.0.1",
     "karma-jasmine-html-reporter": "^1.4.2",
-    "prettier": "2.0.5",
+    "prettier": "^2.0.5",
     "protractor": "~5.4.3",
     "ts-node": "~8.3.0",
     "tslint": "~5.18.0",

diff --git a/ui/src/app/admin/admin.component.ts b/ui/src/app/admin/admin.component.ts
@@ -1,15 +1,12 @@
-import { Component, OnInit } from '@angular/core';
+import {Component, OnInit} from '@angular/core';
 
 @Component({
   selector: 'app-admin',
   templateUrl: './admin.component.html',
-  styleUrls: ['./admin.component.sass']
+  styleUrls: ['./admin.component.sass'],
 })
 export class AdminComponent implements OnInit {
+  constructor() {}
 
-  constructor() { }
-
-  ngOnInit(): void {
-  }
-
+  ngOnInit(): void {}
 }
diff --git a/ui/src/app/core/auth/auth.module.ts b/ui/src/app/core/auth/auth.module.ts
@@ -1,12 +1,8 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-
-
+import {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
 
 @NgModule({
   declarations: [],
-  imports: [
-    CommonModule
-  ]
+  imports: [CommonModule],
 })
-export class AuthModule { }
+export class AuthModule {}
diff --git a/ui/src/app/error-page/error-page.component.ts b/ui/src/app/error-page/error-page.component.ts
@@ -1,15 +1,12 @@
-import { Component, OnInit } from '@angular/core';
+import {Component, OnInit} from '@angular/core';
 
 @Component({
   selector: 'app-error-page',
   templateUrl: './error-page.component.html',
-  styleUrls: ['./error-page.component.sass']
+  styleUrls: ['./error-page.component.sass'],
 })
 export class ErrorPageComponent implements OnInit {
+  constructor() {}
 
-  constructor() { }
-
-  ngOnInit(): void {
-  }
-
+  ngOnInit(): void {}
 }
diff --git a/ui/src/app/landing-page/landing-header/landing-header.component.ts b/ui/src/app/landing-page/landing-header/landing-header.component.ts
@@ -1,15 +1,12 @@
-import { Component, OnInit } from '@angular/core';
+import {Component, OnInit} from '@angular/core';
 
 @Component({
   selector: 'app-landing-header',
   templateUrl: './landing-header.component.html',
-  styleUrls: ['./landing-header.component.sass']
+  styleUrls: ['./landing-header.component.sass'],
 })
 export class LandingHeaderComponent implements OnInit {
+  constructor() {}
 
-  constructor() { }
-
-  ngOnInit(): void {
-  }
-
+  ngOnInit(): void {}
 }
diff --git a/ui/src/app/landing-page/landing-main-content/landing-main-content.component.ts b/ui/src/app/landing-page/landing-main-content/landing-main-content.component.ts
@@ -1,15 +1,12 @@
-import { Component, OnInit } from '@angular/core';
+import {Component, OnInit} from '@angular/core';
 
 @Component({
   selector: 'app-landing-main-content',
   templateUrl: './landing-main-content.component.html',
-  styleUrls: ['./landing-main-content.component.sass']
+  styleUrls: ['./landing-main-content.component.sass'],
 })
 export class LandingMainContentComponent implements OnInit {
+  constructor() {}
 
-  constructor() { }
-
-  ngOnInit(): void {
-  }
-
+  ngOnInit(): void {}
 }
diff --git a/ui/src/app/landing-page/landing-page.component.ts b/ui/src/app/landing-page/landing-page.component.ts
@@ -1,15 +1,12 @@
-import { Component, OnInit } from '@angular/core';
+import {Component, OnInit} from '@angular/core';
 
 @Component({
   selector: 'app-landing-page',
   templateUrl: './landing-page.component.html',
-  styleUrls: ['./landing-page.component.sass']
+  styleUrls: ['./landing-page.component.sass'],
 })
 export class LandingPageComponent implements OnInit {
+  constructor() {}
 
-  constructor() { }
-
-  ngOnInit(): void {
-  }
-
+  ngOnInit(): void {}
 }
diff --git a/ui/src/app/landing-page/landing-sidenav/landing-sidenav.component.ts b/ui/src/app/landing-page/landing-sidenav/landing-sidenav.component.ts
@@ -1,15 +1,12 @@
-import { Component, OnInit } from '@angular/core';
+import {Component, OnInit} from '@angular/core';
 
 @Component({
   selector: 'app-landing-sidenav',
   templateUrl: './landing-sidenav.component.html',
-  styleUrls: ['./landing-sidenav.component.sass']
+  styleUrls: ['./landing-sidenav.component.sass'],
 })
 export class LandingSidenavComponent implements OnInit {
+  constructor() {}
 
-  constructor() { }
-
-  ngOnInit(): void {
-  }
-
+  ngOnInit(): void {}
 }
diff --git a/ui/src/app/models/Lesson.ts b/ui/src/app/models/Lesson.ts
@@ -2,10 +2,10 @@ import * as moment from 'moment';
 import {Group} from './Group';
 import {User} from './User';
 import {Room} from './Room';
-import {iSubject} from './Subject';
+import {ISubject} from './Subject';
 export interface Lesson {
   readonly id: string;
-  subject: iSubject;
+  subject: ISubject;
   lecturer: User;
   group: Group;
   startAt: moment.Moment;

diff --git a/ui/src/app/models/Subject.ts b/ui/src/app/models/Subject.ts
@@ -1,4 +1,4 @@
-export interface iSubject {
+export interface ISubject {
   id: string;
   nameOfSubject: string;
 }
diff --git a/ui/src/app/timetable/in-memory-data.service.ts b/ui/src/app/timetable/in-memory-data.service.ts
@@ -5,7 +5,7 @@ import * as moment from 'moment';
 import {Lesson} from '../models/Lesson';
 import {Group} from '../models/Group';
 import {Room} from '../models/Room';
-import {iSubject} from '../models/Subject';
+import {ISubject} from '../models/Subject';
 import {User} from '../models/User';
 import {Role, FeatureEntry, Endpoint} from '../models/role';
 
@@ -289,7 +289,7 @@ export class InMemoryDataService implements InMemoryDbService {
         room: '4',
       },
     ];
-    const subjects: iSubject[] = [
+    const subjects: ISubject[] = [
       {
         id: '11',
         nameOfSubject: 'Programming',

diff --git a/ui/src/app/timetable/search-result/search-result.component.ts b/ui/src/app/timetable/search-result/search-result.component.ts
@@ -4,7 +4,7 @@ import {TimetableHttpService} from '../shared/timetable-http.service';
 
 import {Group} from '../../models/Group';
 import {User} from '../../models/User';
-import {iSubject} from '../../models/Subject';
+import {ISubject} from '../../models/Subject';
 import {Room} from '../../models/Room';
 @Component({
   selector: 'app-search-result',
@@ -18,7 +18,7 @@ export class SearchResultComponent implements OnInit {
   private usersUrl = 'api/users';
   groups: Group[] = [];
   lecturers: User[] = [];
-  subjects: iSubject[] = [];
+  subjects: ISubject[] = [];
   rooms: Room[] = [];
   constructor(
     private timetableHttpService: TimetableHttpService,

diff --git a/ui/src/app/timetable/shared/timetable-http.service.ts b/ui/src/app/timetable/shared/timetable-http.service.ts
@@ -46,13 +46,17 @@ export class TimetableHttpService {
     if (filters.startDateFormControl) {
       params = params.append(
         'datefrom',
-        `${filters.startDateFormControl.getFullYear()}-${filters.startDateFormControl.getMonth()}-${filters.startDateFormControl.getDate()}`,
+        `${filters.startDateFormControl.getFullYear()}
+        -${filters.startDateFormControl.getMonth()}
+        -${filters.startDateFormControl.getDate()}`,
       );
     }
     if (filters.endDateFormControl) {
       params = params.append(
         'dateto',
-        `${filters.endDateFormControl.getFullYear()}-${filters.endDateFormControl.getMonth()}-${filters.endDateFormControl.getDate()}`,
+        `${filters.endDateFormControl.getFullYear()}
+        -${filters.endDateFormControl.getMonth()}
+        -${filters.endDateFormControl.getDate()}`,
       );
     }
     if (filters.startTimeFormControl) {
@@ -61,6 +65,6 @@ export class TimetableHttpService {
     if (filters.endTimeFormControl) {
       params = params.append('timeto', filters.endTimeFormControl);
     }
-    return this.http.get<any[]>(url, {params: params});
+    return this.http.get<any[]>(url, {params});
   }
 }
diff --git a/ui/src/app/timetable/sidebar/sidebar.component.ts b/ui/src/app/timetable/sidebar/sidebar.component.ts
@@ -8,7 +8,7 @@ import {SearchResultComponent} from '../search-result/search-result.component';
 
 import {Group} from '../../models/Group';
 import {User} from '../../models/User';
-import {iSubject} from '../../models/Subject';
+import {ISubject} from '../../models/Subject';
 import {Room} from '../../models/Room';
 import {Error} from '../../models/Error';
 
@@ -29,7 +29,7 @@ export class SidebarComponent implements OnInit {
 
   groups: Group[] = [];
   lecturers: User[] = [];
-  subjects: iSubject[] = [];
+  subjects: ISubject[] = [];
   rooms: Room[] = [];
   constructor(
     private timetableHttpService: TimetableHttpService,
@@ -81,7 +81,7 @@ export class SidebarComponent implements OnInit {
       filters.endDateFormControl ||
       filters.startTimeFormControl ||
       filters.endTimeFormControl
-    )
+    ) {
       this.timetableHttpService.search(this.lessonsUrl, filters).subscribe(lessons => {
         this.timetableService.setSearchResult(lessons);
         const dialogRef = this.dialog.open(SearchResultComponent, {
@@ -94,6 +94,7 @@ export class SidebarComponent implements OnInit {
         });
         dialogRef.afterClosed().subscribe();
       });
+    }
   }
 
   dateFilter(d: Date | null): boolean {

diff --git a/ui/src/app/timetable/slider-menu/slider-menu.component.ts b/ui/src/app/timetable/slider-menu/slider-menu.component.ts
@@ -10,7 +10,7 @@ import {MatDialog, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog
 import {Lesson} from '../../models/Lesson';
 import {Group} from '../../models/Group';
 import {User} from '../../models/User';
-import {iSubject} from '../../models/Subject';
+import {ISubject} from '../../models/Subject';
 import {Room} from '../../models/Room';
 
 @Component({
@@ -35,7 +35,7 @@ export class SliderMenuComponent implements OnInit {
 
   groups: Group[] = [];
   lecturers: User[] = [];
-  subjects: iSubject[] = [];
+  subjects: ISubject[] = [];
   rooms: Room[] = [];
   constructor(
     private timetableHttpService: TimetableHttpService,
@@ -123,7 +123,7 @@ export class SliderMenuComponent implements OnInit {
     this.addNewForm.reset();
   }
   updateLesson(
-    subject: iSubject,
+    subject: ISubject,
     room: Room,
     lecturer: User,
     group: Group,

diff --git a/ui/src/app/timetable/timetable.component.ts b/ui/src/app/timetable/timetable.component.ts
@@ -1,15 +1,12 @@
-import { Component, OnInit } from '@angular/core';
+import {Component, OnInit} from '@angular/core';
 
 @Component({
   selector: 'app-timetable',
   templateUrl: './timetable.component.html',
-  styleUrls: ['./timetable.component.sass']
+  styleUrls: ['./timetable.component.sass'],
 })
 export class TimetableComponent implements OnInit {
+  constructor() {}
 
-  constructor() { }
-
-  ngOnInit(): void {
-  }
-
+  ngOnInit(): void {}
 }
diff --git a/ui/src/app/timetable/timetable.service.ts b/ui/src/app/timetable/timetable.service.ts
@@ -5,7 +5,7 @@ import {TimetableHttpService} from './shared/timetable-http.service';
 import {Lesson} from '../models/Lesson';
 import {Group} from '../models/Group';
 import {User} from '../models/User';
-import {iSubject} from '../models/Subject';
+import {ISubject} from '../models/Subject';
 import {Room} from '../models/Room';
 
 @Injectable({
@@ -18,7 +18,7 @@ export class TimetableService {
   private selectedDate$: Subject<Date> = new Subject<Date>();
 
   private lecturers$: Subject<User[]> = new Subject<User[]>();
-  private subjects$: Subject<iSubject[]> = new Subject<iSubject[]>();
+  private subjects$: Subject<ISubject[]> = new Subject<ISubject[]>();
   private groups$: Subject<Group[]> = new Subject<Group[]>();
   private rooms$: Subject<Room[]> = new Subject<Room[]>();
 
@@ -38,11 +38,11 @@ export class TimetableService {
     this.searchResult$.next(result);
   }
 
-  setSubjects(subjects: iSubject[]): void {
+  setSubjects(subjects: ISubject[]): void {
     this.subjects$.next(subjects);
   }
 
-  getSubjects(): Observable<iSubject[]> {
+  getSubjects(): Observable<ISubject[]> {
     return this.subjects$;
   }
 

diff --git a/ui/src/assets/img/deadman.svg b/ui/src/assets/img/deadman.svg
diff --git a/ui/src/assets/img/junk.svg b/ui/src/assets/img/junk.svg
diff --git a/ui/src/assets/img/junks.svg b/ui/src/assets/img/junks.svg