+ @if (!currentToken) {
+
-
-
+ }
+ @if (currentToken) {
+
-
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 1a41a812..aa5c0cda 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -1,5 +1,7 @@
import { Component, OnDestroy, OnInit, inject } from '@angular/core';
-import { Router } from '@angular/router';
+import { Router, RouterOutlet, RouterLink } from '@angular/router';
+import { MatIconModule } from '@angular/material/icon';
+import { MatDividerModule } from '@angular/material/divider';
import { AuthService } from './auth/services/auth.service';
import { PwaService } from './services/pwa.service';
import { environment } from 'src/environments/environment';
@@ -8,7 +10,7 @@ import { environment } from 'src/environments/environment';
selector: 'app-root',
templateUrl: './app.component.html',
styleUrls: ['./app.component.css'],
- standalone: false
+ imports: [RouterOutlet, RouterLink, MatIconModule, MatDividerModule]
})
export class AppComponent implements OnInit, OnDestroy {
private readonly router = inject(Router);
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
deleted file mode 100644
index bc52cb9f..00000000
--- a/src/app/app.module.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-import '@angular/localize/init';
-
-import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
-import { ReactiveFormsModule } from '@angular/forms';
-import { provideHttpClient, HTTP_INTERCEPTORS, withInterceptorsFromDi } from '@angular/common/http';
-
-import { AppComponent } from './app.component';
-import { appRoutingModule } from './app.routing';
-
-import { LoginComponent } from './login';
-import { DashboardModule } from './dashboard-module/dashboard.module';
-import { AuthGuard } from './auth/guards/auth.guard';
-import { AuthService } from './auth/services/auth.service';
-import { TokenInterceptor } from './auth/token.interceptor';
-
-import { GraphQLModule } from './graphql.module';
-import { AppMaterialModule } from './shared/app-material.module';
-import { HomeComponent } from './home/home.component';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { SignupComponent } from './signup/signup.component';
-
-import { RecaptchaModule, RecaptchaFormsModule } from '../libs/ng-recaptcha-module';
-import { SignupTeamComponent } from './signup-team/signup-team.component';
-
-import { LocationStrategy, PathLocationStrategy, CommonModule } from '@angular/common';
-import { SettingsModule } from './settings-module/settings.module';
-import { LoginResetComponent } from './login-reset/login-reset.component';
-import { SignupDomainComponent } from './signup-domain/signup-domain.component';
-import { ServiceWorkerModule } from '@angular/service-worker';
-import { environment } from '../environments/environment';
-import { PwaService } from './services/pwa.service';
-import { SlackAuthComponent } from './slack-auth/slack-auth.component';
-import { AppVersionComponent } from './app-version/app-version.component';
-import { provideCharts, withDefaultRegisterables } from '../libs/ng2-charts/src/lib/ng-charts.provider';
-
-@NgModule({
- imports: [
- BrowserModule,
- CommonModule,
- ReactiveFormsModule,
- appRoutingModule,
- GraphQLModule,
- DashboardModule,
- AppMaterialModule,
- NgbModule,
- RecaptchaModule,
- RecaptchaFormsModule,
- SettingsModule,
- ServiceWorkerModule.register('./ngsw-worker.js', { enabled: environment.production })
- ],
- declarations: [
- AppComponent,
- LoginComponent,
- LoginResetComponent,
- HomeComponent,
- SignupComponent,
- SignupTeamComponent,
- SignupDomainComponent,
- SlackAuthComponent,
- AppVersionComponent
- ],
- providers: [
- PwaService,
- AuthGuard,
- AuthService,
- { provide: HTTP_INTERCEPTORS, useClass: TokenInterceptor, multi: true },
- { provide: LocationStrategy, useClass: PathLocationStrategy },
- provideHttpClient(withInterceptorsFromDi()),
- provideCharts(withDefaultRegisterables())
- ],
- bootstrap: [AppComponent],
- schemas: [CUSTOM_ELEMENTS_SCHEMA]
-})
-export class AppModule { }
\ No newline at end of file
diff --git a/src/app/app.routing.ts b/src/app/app.routing.ts
deleted file mode 100644
index 36725ccf..00000000
--- a/src/app/app.routing.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { Routes, RouterModule, mapToCanActivate } from '@angular/router';
-
-import { LoginComponent } from './login';
-import { HomeComponent } from './home/home.component';
-import { SignupComponent } from './signup/signup.component';
-import { SignupTeamComponent } from './signup-team/signup-team.component';
-import { AuthGuard } from './auth/guards/auth.guard';
-import { LoginResetComponent } from './login-reset/login-reset.component';
-import { SignupDomainComponent } from './signup-domain/signup-domain.component';
-import { SlackAuthComponent } from './slack-auth/slack-auth.component';
-import { environment } from 'src/environments/environment';
-
-const routes: Routes = [
- { path: '', component: environment.allowHomeView ? HomeComponent : LoginComponent },
-
- { path: 'login', component: LoginComponent },
-
- { path: 'login/reset', component: LoginResetComponent },
-
- { path: 'signup', component: SignupComponent },
-
- {
- path: 'settings',
- loadChildren: () => import('./settings-module/settings.module').then(mod => mod.SettingsModule),
- data: { preload: true }
- },
-
- {
- path: 'dashboard',
- loadChildren: () => import('./dashboard-module/dashboard.module').then(mod => mod.DashboardModule),
- data: { preload: true }
- },
-
- {
- path: 'documentation',
- loadChildren: () => import('./documentation-module/documentation.module').then(mod => mod.DocumentationModuleModule),
- data: { preload: true }
- },
-
- { path: 'collab/join', component: SignupTeamComponent, canActivate: mapToCanActivate([AuthGuard]) },
-
- { path: 'domain/transfer', component: SignupDomainComponent, canActivate: mapToCanActivate([AuthGuard]) },
-
- { path: 'slack/authorization', component: SlackAuthComponent, canActivate: mapToCanActivate([AuthGuard]) },
-
- { path: '**', redirectTo: '/dashboard' }
-];
-
-export const appRoutingModule = RouterModule.forRoot(routes, { scrollPositionRestoration: 'top', useHash: false });
\ No newline at end of file
diff --git a/src/app/dashboard-module/dashboard.module.ts b/src/app/dashboard-module/dashboard.module.ts
index 6427e4de..d0375979 100644
--- a/src/app/dashboard-module/dashboard.module.ts
+++ b/src/app/dashboard-module/dashboard.module.ts
@@ -1,33 +1,25 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
-import { DomainListComponent } from './domain-list/domain-list.component';
-import { DomainPreviewComponent } from './domain-preview/domain-preview.component';
import { DashboardRoutingModule } from './dashboard.routing';
import { AppMaterialModule } from '../shared/app-material.module';
-import { DomainCreateComponent } from './domain-create/domain-create.component';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
import { ToasterModule } from '../_helpers/toaster/toaster.module';
import { DomainRouteService } from '../services/domain-route.service';
@NgModule({
- declarations: [
- DomainListComponent,
- DomainPreviewComponent,
- DomainCreateComponent
- ],
- imports: [
- FormsModule,
- CommonModule,
- NgbModule,
- ReactiveFormsModule,
- DashboardRoutingModule,
- AppMaterialModule,
- ToasterModule
- ],
- providers: [
- DomainRouteService
- ]
+ imports: [
+ FormsModule,
+ CommonModule,
+ NgbModule,
+ ReactiveFormsModule,
+ DashboardRoutingModule,
+ AppMaterialModule,
+ ToasterModule
+ ],
+ providers: [
+ DomainRouteService
+ ]
})
export class DashboardModule { }
diff --git a/src/app/dashboard-module/dashboard.routing.ts b/src/app/dashboard-module/dashboard.routing.ts
index 9070ba61..e2d6d5e9 100644
--- a/src/app/dashboard-module/dashboard.routing.ts
+++ b/src/app/dashboard-module/dashboard.routing.ts
@@ -5,10 +5,10 @@ import { DomainListComponent } from './domain-list/domain-list.component';
import { AuthGuard } from '../auth/guards/auth.guard';
const routes: Routes = [
- { path: 'dashboard', component: DomainListComponent, canActivate: mapToCanActivate([AuthGuard]) },
+ { path: '', component: DomainListComponent, canActivate: mapToCanActivate([AuthGuard]) },
{
- path: 'dashboard/domain/:name/:domainid',
+ path: 'domain/:name/:domainid',
loadChildren: () => import('./domain-module/domain.module').then(mod => mod.DomainModule),
data: { preload: true }
}
diff --git a/src/app/dashboard-module/domain-create/domain-create.component.html b/src/app/dashboard-module/domain-create/domain-create.component.html
index 6fff6a11..35791e8c 100644
--- a/src/app/dashboard-module/domain-create/domain-create.component.html
+++ b/src/app/dashboard-module/domain-create/domain-create.component.html
@@ -1,5 +1,5 @@
-
+
New domain
-
+ @if (loading) {
+
-
{{ error }}
-
-
+ }
+ }
+ }
+ @if (error) {
+
- {{ error }}
+ }
+ @if (!loading) {
+ @for (domain of domains; track domain) {
@@ -31,16 +35,20 @@
-
+ @if (loadingCollab) {
+
-
{{ errorCollab }}
-
-
+ }
+ }
+ }
+ @if (errorCollab) {
+
- {{ errorCollab }}
+ }
+ @if (!loadingCollab) {
+ @for (domain of collabDomains; track domain) {