import localeOc from '@app/helpers/locales/oc'
import { AppRoutingModule } from './app-routing.module'
import { AppComponent } from './app.component'
-import { CoreModule, PluginService, ServerService } from './core'
+import { CoreModule, PluginService, RedirectService, ServerService } from './core'
import { EmptyComponent } from './empty.component'
import { HeaderComponent, SearchTypeaheadComponent, SuggestionComponent } from './header'
import { HighlightPipe } from './header/highlight.pipe'
import { CustomModalComponent } from './modal/custom-modal.component'
import { InstanceConfigWarningModalComponent } from './modal/instance-config-warning-modal.component'
import { QuickSettingsModalComponent } from './modal/quick-settings-modal.component'
-import { WelcomeModalComponent } from './modal/welcome-modal.component'
-import { AccountSetupModalComponent } from './modal/account-setup-modal.component'
+import { AdminWelcomeModalComponent } from './modal/admin-welcome-modal.component'
+import { AccountSetupWarningModalComponent } from './modal/account-setup-warning-modal.component'
import { SharedActorImageModule } from './shared/shared-actor-image/shared-actor-image.module'
import { SharedFormModule } from './shared/shared-forms'
import { SharedGlobalIconModule } from './shared/shared-icons'
registerLocaleData(localeOc, 'oc')
-export function loadConfigFactory (server: ServerService, pluginService: PluginService) {
+export function loadConfigFactory (server: ServerService, pluginService: PluginService, redirectService: RedirectService) {
+ const initializeServices = () => {
+ redirectService.init()
+ pluginService.initializePlugins()
+ }
+
return () => {
const result = server.loadHTMLConfig()
+ if (result) return result.pipe(tap(() => initializeServices()))
- if (result) return result.pipe(tap(() => pluginService.initializePlugins()))
-
- return pluginService.initializePlugins()
+ initializeServices()
}
}
SuggestionComponent,
HighlightPipe,
- AccountSetupModalComponent,
+ AccountSetupWarningModalComponent,
CustomModalComponent,
- WelcomeModalComponent,
+ AdminWelcomeModalComponent,
InstanceConfigWarningModalComponent,
ConfirmComponent
],
{
provide: APP_INITIALIZER,
useFactory: loadConfigFactory,
- deps: [ ServerService, PluginService ],
+ deps: [ ServerService, PluginService, RedirectService ],
multi: true
}
]