+
+
{{ 'MENU.INSTANCEOVERVIEW' | translate }}
+
{{ instance.name }}
+
+
+
-
diff --git a/console/src/app/modules/new-header/instance-selector/instance-selector.component.scss b/console/src/app/modules/new-header/instance-selector/instance-selector.component.scss
index 344226d2fa..c91e1f4445 100644
--- a/console/src/app/modules/new-header/instance-selector/instance-selector.component.scss
+++ b/console/src/app/modules/new-header/instance-selector/instance-selector.component.scss
@@ -1,47 +1,40 @@
-:host {
- display: flex;
- flex-direction: column;
- justify-content: space-between;
-}
-
@mixin instance-selector-theme($theme) {
$background: map-get($theme, background);
$is-dark-theme: map-get($theme, is-dark);
- .upper-content {
- flex: 1;
+ .instance-selector-container {
+ background: map-get($background, footer);
+ height: 100%;
display: flex;
flex-direction: column;
- gap: 10px;
- padding: 10px;
- background: map-get($background, footer);
- }
-
- .dropdown-label {
- color: if($is-dark-theme, #ffffff60, #00000060);
- font-size: 14px;
- }
-
- .settings-button {
- width: 100%;
- }
-
- .dropdown-button {
- height: 32px;
- max-height: 32px;
- }
-
- .dropdown-button > span:nth-child(2) {
- width: 100%;
- display: flex;
justify-content: space-between;
- align-items: center;
- }
- .footer {
- padding: 10px;
- padding-top: 5px;
- background: map-get($background, cards);
- border-bottom-left-radius: inherit;
+ .upper-content {
+ flex: 1;
+ display: flex;
+ flex-direction: column;
+ gap: 10px;
+ padding: 10px;
+ }
+
+ .dropdown-label {
+ color: if($is-dark-theme, #ffffff60, #00000060);
+ font-size: 14px;
+ }
+
+ .footer {
+ padding: 10px;
+ padding-top: 5px;
+ border-bottom-left-radius: inherit;
+ }
+
+ .portal-link {
+ margin-right: 1rem;
+ width: 100%;
+
+ .portal-span {
+ margin-right: 0.5rem;
+ }
+ }
}
}
diff --git a/console/src/app/modules/new-header/instance-selector/instance-selector.component.ts b/console/src/app/modules/new-header/instance-selector/instance-selector.component.ts
index 6c0e310a9a..230d78c77e 100644
--- a/console/src/app/modules/new-header/instance-selector/instance-selector.component.ts
+++ b/console/src/app/modules/new-header/instance-selector/instance-selector.component.ts
@@ -6,6 +6,9 @@ import { InstanceDetail } from '@zitadel/proto/zitadel/instance_pb';
import { NgIconComponent, provideIcons } from '@ng-icons/core';
import { heroCog8ToothSolid } from '@ng-icons/heroicons/solid';
import { heroChevronRight } from '@ng-icons/heroicons/outline';
+import { EnvironmentService } from 'src/app/services/environment.service';
+import { map } from 'rxjs';
+import { CommonModule } from '@angular/common';
@Component({
selector: 'cnsl-instance-selector',
@@ -13,17 +16,21 @@ import { heroChevronRight } from '@ng-icons/heroicons/outline';
styleUrls: ['./instance-selector.component.scss'],
standalone: true,
changeDetection: ChangeDetectionStrategy.OnPush,
- imports: [TranslateModule, MatButtonModule, RouterLink, NgIconComponent],
+ imports: [TranslateModule, MatButtonModule, RouterLink, NgIconComponent, CommonModule],
providers: [provideIcons({ heroCog8ToothSolid, heroChevronRight })],
})
export class InstanceSelectorComponent {
+ protected readonly customerPortalLink$ = this.envService.env.pipe(map((env) => env.customer_portal));
@Output() public instanceChanged = new EventEmitter
();
@Output() public settingsClicked = new EventEmitter();
@Input({ required: true })
public instance!: InstanceDetail;
- constructor(private readonly router: Router) {}
+ constructor(
+ private readonly router: Router,
+ private envService: EnvironmentService,
+ ) {}
protected async setInstance({ id }: InstanceDetail) {
this.instanceChanged.emit(id);
diff --git a/console/src/app/modules/new-header/organization-selector/organization-selector.component.scss b/console/src/app/modules/new-header/organization-selector/organization-selector.component.scss
index b93e62cd18..b7f14ee829 100644
--- a/console/src/app/modules/new-header/organization-selector/organization-selector.component.scss
+++ b/console/src/app/modules/new-header/organization-selector/organization-selector.component.scss
@@ -10,6 +10,7 @@
.dropdown-label {
color: if($is-dark-theme, #ffffff60, #00000060);
+ font-size: 14px;
}
.back-button {
diff --git a/console/src/app/modules/settings-grid/settinglinks.ts b/console/src/app/modules/settings-grid/settinglinks.ts
deleted file mode 100644
index 7f967f865d..0000000000
--- a/console/src/app/modules/settings-grid/settinglinks.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-export interface SettingLinks {
- i18nTitle: string;
- i18nDesc: string;
- iamRouterLink: any;
- orgRouterLink?: any;
- queryParams: any;
- iamWithRole?: string[];
- orgWithRole?: string[];
- icon?: string;
- svgIcon?: string;
- color: string;
-}
-
-export const LOGIN_GROUP: SettingLinks = {
- i18nTitle: 'SETTINGS.GROUPS.LOGIN',
- i18nDesc: 'POLICY.LOGIN_POLICY.DESCRIPTION',
- iamRouterLink: ['/settings'],
- orgRouterLink: ['/org-settings'],
- queryParams: { id: 'login' },
- iamWithRole: ['iam.policy.read'],
- orgWithRole: ['policy.read'],
- icon: 'las la-sign-in-alt',
- color: 'green',
-};
-
-export const APPEARANCE_GROUP: SettingLinks = {
- i18nTitle: 'SETTINGS.GROUPS.APPEARANCE',
- i18nDesc: 'POLICY.PRIVATELABELING.DESCRIPTION',
- iamRouterLink: ['/settings'],
- orgRouterLink: ['/org-settings'],
- queryParams: { id: 'branding' },
- iamWithRole: ['iam.policy.read'],
- orgWithRole: ['policy.read'],
- icon: 'las la-swatchbook',
- color: 'blue',
-};
-
-export const PRIVACY_POLICY: SettingLinks = {
- i18nTitle: 'DESCRIPTIONS.SETTINGS.PRIVACY_POLICY.TITLE',
- i18nDesc: 'POLICY.PRIVACY_POLICY.DESCRIPTION',
- iamRouterLink: ['/settings'],
- orgRouterLink: ['/org-settings'],
- queryParams: { id: 'privacypolicy' },
- iamWithRole: ['iam.policy.read'],
- orgWithRole: ['policy.read'],
- icon: 'las la-file-contract',
- color: 'black',
-};
-
-export const NOTIFICATION_GROUP: SettingLinks = {
- i18nTitle: 'SETTINGS.GROUPS.NOTIFICATIONS',
- i18nDesc: 'SETTINGS.LIST.NOTIFICATIONS_DESC',
- iamRouterLink: ['/settings'],
- queryParams: { id: 'smtpprovider' },
- iamWithRole: ['iam.policy.read'],
- icon: 'las la-bell',
- color: 'red',
-};
-
-export const SETTINGLINKS: SettingLinks[] = [LOGIN_GROUP, APPEARANCE_GROUP, PRIVACY_POLICY, NOTIFICATION_GROUP];
diff --git a/console/src/app/modules/settings-grid/settings-grid.component.html b/console/src/app/modules/settings-grid/settings-grid.component.html
deleted file mode 100644
index 6f9b99e302..0000000000
--- a/console/src/app/modules/settings-grid/settings-grid.component.html
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
{{ 'DESCRIPTIONS.SETTINGS.INSTANCE.TITLE' | translate }}
-
-
- {{ 'DESCRIPTIONS.SETTINGS.INSTANCE.DESCRIPTION' | translate }}
-
-
-
-
-
-
-
-
-
-
- {{ setting.i18nTitle | translate }}
-
-
-
- {{ setting.i18nDesc ? (setting.i18nDesc | translate) : '' }}
-
-
-
-
-
-
-
{{ 'ONBOARDING.MOREDESCRIPTION' | translate }}
diff --git a/console/src/app/pages/home/home.component.scss b/console/src/app/pages/home/home.component.scss
index b8cb4a1ec5..eafcbcdd53 100644
--- a/console/src/app/pages/home/home.component.scss
+++ b/console/src/app/pages/home/home.component.scss
@@ -77,49 +77,6 @@
cursor: move;
}
- .grid-item-avatar {
- height: 40px;
- width: 40px;
- margin-right: 1rem;
- border-radius: 50%;
- display: flex;
- align-items: center;
- justify-content: center;
- background: linear-gradient(40deg, rgb(129, 85, 185) 30%, #7b8ada);
-
- &.purple {
- background: linear-gradient(40deg, #7c3aed 30%, #6d28d9);
- }
-
- &.red {
- background: linear-gradient(40deg, #dc2626 30%, #db2777);
- }
-
- &.green {
- background: linear-gradient(40deg, #03704e 30%, #047857);
- }
-
- &.blue {
- background: linear-gradient(40deg, #306ccc 30%, #4f46e5);
- }
-
- &.yellow {
- background: linear-gradient(40deg, #f59e0b 30%, #b45309);
- }
-
- &.black {
- background: linear-gradient(40deg, #1f2937, #111827);
- }
-
- .icon,
- i {
- font-size: 1.5rem;
- height: 1.5rem;
- line-height: 1.5rem;
- color: white;
- }
- }
-
.icon-wrapper {
display: flex;
justify-content: center;
diff --git a/console/src/app/pages/home/home.module.ts b/console/src/app/pages/home/home.module.ts
index 2e82f43666..2b750dd820 100644
--- a/console/src/app/pages/home/home.module.ts
+++ b/console/src/app/pages/home/home.module.ts
@@ -14,7 +14,6 @@ import { HasRolePipeModule } from 'src/app/pipes/has-role-pipe/has-role-pipe.mod
import { HomeRoutingModule } from './home-routing.module';
import { HomeComponent } from './home.component';
import { QuickstartComponent } from 'src/app/components/quickstart/quickstart.component';
-import { SettingsGridModule } from 'src/app/modules/settings-grid/settings-grid.module';
@NgModule({
declarations: [HomeComponent],
@@ -32,7 +31,6 @@ import { SettingsGridModule } from 'src/app/modules/settings-grid/settings-grid.
ShortcutsModule,
OnboardingModule,
MatRippleModule,
- SettingsGridModule,
],
})
export default class HomeModule {}
diff --git a/console/src/app/pages/instance/instance.component.html b/console/src/app/pages/instance/instance.component.html
index c73881f168..b53c65a9fa 100644
--- a/console/src/app/pages/instance/instance.component.html
+++ b/console/src/app/pages/instance/instance.component.html
@@ -8,20 +8,6 @@
stateTooltip="{{ 'INSTANCE.STATE.' + instance?.state | translate }}"
>
-
-
- {{ 'MENU.CUSTOMERPORTAL' | translate }}
-
-
-
;
- protected readonly customerPortalLink$ = this.envService.env.pipe(map((env) => env.customer_portal));
constructor(
protected readonly adminService: AdminService,
@@ -95,7 +94,6 @@ export class InstanceComponent {
breadcrumbService: BreadcrumbService,
private readonly router: Router,
private readonly authService: GrpcAuthService,
- private readonly envService: EnvironmentService,
activatedRoute: ActivatedRoute,
private readonly destroyRef: DestroyRef,
) {
diff --git a/console/src/app/pages/instance/instance.module.ts b/console/src/app/pages/instance/instance.module.ts
index 3102983438..c8e5a94fcd 100644
--- a/console/src/app/pages/instance/instance.module.ts
+++ b/console/src/app/pages/instance/instance.module.ts
@@ -21,7 +21,6 @@ import { InputModule } from 'src/app/modules/input/input.module';
import { MetaLayoutModule } from 'src/app/modules/meta-layout/meta-layout.module';
import { OrgTableModule } from 'src/app/modules/org-table/org-table.module';
import { RefreshTableModule } from 'src/app/modules/refresh-table/refresh-table.module';
-import { SettingsGridModule } from 'src/app/modules/settings-grid/settings-grid.module';
import { TopViewModule } from 'src/app/modules/top-view/top-view.module';
import { HasRolePipeModule } from 'src/app/pipes/has-role-pipe/has-role-pipe.module';
import { LocalizedDatePipeModule } from 'src/app/pipes/localized-date-pipe/localized-date-pipe.module';
@@ -64,7 +63,6 @@ import { SettingsListModule } from 'src/app/modules/settings-list/settings-list.
HasRolePipeModule,
SettingsListModule,
MatSortModule,
- SettingsGridModule,
],
})
export default class InstanceModule {}