diff --git a/apps/red-ui/src/app/app.module.ts b/apps/red-ui/src/app/app.module.ts index 10e3ab56e..8e0c34413 100644 --- a/apps/red-ui/src/app/app.module.ts +++ b/apps/red-ui/src/app/app.module.ts @@ -109,6 +109,7 @@ import { FileDownloadBtnComponent } from './components/buttons/file-download-btn import { LicenseInformationScreenComponent } from './screens/admin/license-information-screen/license-information-screen.component'; import { DefaultColorsScreenComponent } from './screens/admin/default-colors-screen/default-colors-screen.component'; import { EditColorDialogComponent } from './screens/admin/default-colors-screen/edit-color-dialog/edit-color-dialog.component'; +import { DownloadsListScreenComponent } from './screens/downloads-list-screen/downloads-list-screen.component'; export function HttpLoaderFactory(httpClient: HttpClient) { return new TranslateHttpLoader(httpClient, '/assets/i18n/', '.json'); @@ -170,6 +171,14 @@ const routes = [ routeGuards: [AuthGuard, RedRoleGuard, AppStateGuard] } }, + { + path: 'downloads', + component: DownloadsListScreenComponent, + canActivate: [CompositeRouteGuard], + data: { + routeGuards: [AuthGuard, RedRoleGuard, AppStateGuard] + } + }, { path: 'admin', children: [ @@ -350,7 +359,8 @@ const matImports = [ RuleSetViewSwitchComponent, LicenseInformationScreenComponent, DefaultColorsScreenComponent, - EditColorDialogComponent + EditColorDialogComponent, + DownloadsListScreenComponent ], imports: [ BrowserModule, diff --git a/apps/red-ui/src/app/components/buttons/user-button/user-button.component.html b/apps/red-ui/src/app/components/buttons/user-button/user-button.component.html index 96be18c96..7a3a52216 100644 --- a/apps/red-ui/src/app/components/buttons/user-button/user-button.component.html +++ b/apps/red-ui/src/app/components/buttons/user-button/user-button.component.html @@ -1,4 +1,5 @@ - +
diff --git a/apps/red-ui/src/app/components/buttons/user-button/user-button.component.scss b/apps/red-ui/src/app/components/buttons/user-button/user-button.component.scss index b91354af0..13064f8ca 100644 --- a/apps/red-ui/src/app/components/buttons/user-button/user-button.component.scss +++ b/apps/red-ui/src/app/components/buttons/user-button/user-button.component.scss @@ -3,11 +3,6 @@ :host { button { padding: 0 10px 0 5px; - font-weight: 400 !important; - - &:hover { - background-color: $grey-6; - } mat-icon { width: 14px; @@ -19,4 +14,8 @@ background: rgba($primary, 0.1); } } + + .dot { + left: -2px; + } } diff --git a/apps/red-ui/src/app/components/buttons/user-button/user-button.component.ts b/apps/red-ui/src/app/components/buttons/user-button/user-button.component.ts index 689c967ef..fc4f2368a 100644 --- a/apps/red-ui/src/app/components/buttons/user-button/user-button.component.ts +++ b/apps/red-ui/src/app/components/buttons/user-button/user-button.component.ts @@ -8,6 +8,7 @@ import { UserWrapper } from '../../../user/user.service'; }) export class UserButtonComponent implements OnInit { @Input() user: UserWrapper; + @Input() showDot = false; constructor() {} diff --git a/apps/red-ui/src/app/components/rule-set-view-switch/rule-set-view-switch.component.html b/apps/red-ui/src/app/components/rule-set-view-switch/rule-set-view-switch.component.html index d4963056f..810deb91e 100644 --- a/apps/red-ui/src/app/components/rule-set-view-switch/rule-set-view-switch.component.html +++ b/apps/red-ui/src/app/components/rule-set-view-switch/rule-set-view-switch.component.html @@ -1,4 +1,4 @@ -
+
{{ 'dictionaries' | translate }} diff --git a/apps/red-ui/src/app/screens/admin/default-colors-screen/default-colors-screen.component.html b/apps/red-ui/src/app/screens/admin/default-colors-screen/default-colors-screen.component.html index bea85b27f..6eaa7379e 100644 --- a/apps/red-ui/src/app/screens/admin/default-colors-screen/default-colors-screen.component.html +++ b/apps/red-ui/src/app/screens/admin/default-colors-screen/default-colors-screen.component.html @@ -30,13 +30,13 @@ -
-
+
+
-
+
diff --git a/apps/red-ui/src/app/screens/admin/dictionary-listing-screen/dictionary-listing-screen.component.html b/apps/red-ui/src/app/screens/admin/dictionary-listing-screen/dictionary-listing-screen.component.html index d093da2ce..d3795db04 100644 --- a/apps/red-ui/src/app/screens/admin/dictionary-listing-screen/dictionary-listing-screen.component.html +++ b/apps/red-ui/src/app/screens/admin/dictionary-listing-screen/dictionary-listing-screen.component.html @@ -69,7 +69,7 @@
-
+
-
-
+
+
diff --git a/apps/red-ui/src/app/screens/admin/rule-sets-listing-screen/rule-sets-listing-screen.component.html b/apps/red-ui/src/app/screens/admin/rule-sets-listing-screen/rule-sets-listing-screen.component.html index 72a6cb048..9e10222a5 100644 --- a/apps/red-ui/src/app/screens/admin/rule-sets-listing-screen/rule-sets-listing-screen.component.html +++ b/apps/red-ui/src/app/screens/admin/rule-sets-listing-screen/rule-sets-listing-screen.component.html @@ -60,7 +60,7 @@
-
+
-
+
diff --git a/apps/red-ui/src/app/screens/admin/users/user-listing-screen.component.html b/apps/red-ui/src/app/screens/admin/users/user-listing-screen.component.html index 16ac46a6d..420e0c738 100644 --- a/apps/red-ui/src/app/screens/admin/users/user-listing-screen.component.html +++ b/apps/red-ui/src/app/screens/admin/users/user-listing-screen.component.html @@ -34,7 +34,7 @@ -
+
diff --git a/apps/red-ui/src/app/screens/base-screen/base-screen.component.html b/apps/red-ui/src/app/screens/base-screen/base-screen.component.html index 2e51b9a86..3f2ac8376 100644 --- a/apps/red-ui/src/app/screens/base-screen/base-screen.component.html +++ b/apps/red-ui/src/app/screens/base-screen/base-screen.component.html @@ -69,7 +69,11 @@