ASWI - Pokročilé softwarové inženýrství » ASWI 2021 » Administrativní klient pro systém SensLog (KGM/ReliSA) - CodeBakers

Merge remote-tracking branch 'origin/dev'

1. Conflicts:
2. compose.yml
3. nginx.conf
4. package-lock.json
5. package.json
6. proxy-config.json
7. src/app/app-routing.module.ts
8. src/app/app.component.ts
9. src/app/app.module.ts
10. src/app/auth/guards/role.guard.ts
11. src/app/auth/interceptors/auth.interceptor.ts
12. src/app/auth/models/user.ts
13. src/app/auth/services/auth.service.ts
14. src/app/auth/states/user.state.ts
15. src/app/dashboard/components/dashboard.component.html
16. src/app/dashboard/components/dashboard.component.ts
17. src/app/dashboard/components/sensor-popup/sensor-popup.component.html
18. src/app/dashboard/components/sensor-popup/sensor-popup.component.ts
19. src/app/dashboard/components/sensors/sensors.component.html
20. src/app/dashboard/components/sensors/sensors.component.ts
21. src/app/dashboard/components/unit-popup/unit-popup.component.html
22. src/app/dashboard/components/unit-popup/unit-popup.component.ts
23. src/app/dashboard/dashboard.module.ts
24. src/app/login/components/login.component.html
25. src/app/login/components/login.component.ts
26. src/app/sensor/components/sensor.component.html
27. src/app/sensor/components/sensor.component.ts
28. src/app/sensor/sensor.module.ts
29. src/app/shared/api/endpoints/api.module.ts
30. src/app/shared/api/endpoints/models.ts
31. src/app/shared/api/endpoints/models/data.ts
32. src/app/shared/api/endpoints/models/observation.ts
33. src/app/shared/api/endpoints/models/user-info.ts
34. src/app/shared/api/endpoints/services.ts
35. src/app/shared/api/endpoints/services/data.service.ts
36. src/app/shared/api/endpoints/services/group.service.ts
37. src/app/shared/api/endpoints/services/login.service.ts
38. src/app/shared/api/endpoints/services/observation.service.ts
39. src/app/shared/api/openapi.yaml
40. src/app/shared/nav-bar/components/nav-bar.component.html
41. src/app/shared/nav-bar/components/nav-bar.component.ts
42. src/app/shared/nav-bar/nav-bar.module.ts
43. src/app/unit/components/unit.component.html
44. src/app/unit/components/unit.component.ts
45. src/app/unit/unit.module.ts
46. src/assets/scss/_dashboard.scss
47. src/assets/scss/_fonts.scss
48. src/assets/scss/_login.scss
49. src/assets/scss/_navbar.scss
50. src/assets/scss/_themes.scss
51. src/assets/scss/_variables.scss
52. src/assets/scss/styles.scss
53. src/index.html
54. src/styles.scss