FE-6 Merge FE-5, resolve conflicts & refactor
Showing
- src/app/api/configuration.api.ts 1 addition, 1 deletionsrc/app/api/configuration.api.ts
- src/app/api/dashboard.api.ts 14 additions, 3 deletionssrc/app/api/dashboard.api.ts
- src/app/components/configuration/configuration.component.ts 16 additions, 18 deletionssrc/app/components/configuration/configuration.component.ts
- src/app/components/dashboard-statistics/dashboard-statistics.component.html 77 additions, 1 deletion.../dashboard-statistics/dashboard-statistics.component.html
- src/app/components/dashboard-statistics/dashboard-statistics.component.scss 89 additions, 0 deletions.../dashboard-statistics/dashboard-statistics.component.scss
- src/app/components/dashboard-statistics/dashboard-statistics.component.ts 29 additions, 3 deletions...ts/dashboard-statistics/dashboard-statistics.component.ts
- src/app/components/dashboard/dashboard.component.scss 4 additions, 0 deletionssrc/app/components/dashboard/dashboard.component.scss
- src/app/interceptor/interceptor.ts 24 additions, 18 deletionssrc/app/interceptor/interceptor.ts
- src/app/interceptor/mock-interceptor.ts 2 additions, 2 deletionssrc/app/interceptor/mock-interceptor.ts
- src/app/interceptor/mocks/dashboard-statistics-2.json 33 additions, 0 deletionssrc/app/interceptor/mocks/dashboard-statistics-2.json
- src/app/interceptor/mocks/dashboard-statistics.json 33 additions, 0 deletionssrc/app/interceptor/mocks/dashboard-statistics.json
- src/app/models/dashboard-statistics.ts 47 additions, 0 deletionssrc/app/models/dashboard-statistics.ts
- src/app/pipes/decimal.pipe.ts 16 additions, 0 deletionssrc/app/pipes/decimal.pipe.ts
- src/app/pipes/time.pipe.ts 15 additions, 0 deletionssrc/app/pipes/time.pipe.ts
Please register or sign in to comment