Merge base-path to dev

This commit is contained in:
Matthew Ross 2020-06-02 11:34:57 -04:00
commit cce6e23aee
2 changed files with 21 additions and 6 deletions

View File

@ -1,6 +1,7 @@
import { NgModule } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser';
import { FormsModule } from '@angular/forms';
import { APP_BASE_HREF } from '@angular/common';
import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
import { RouterModule } from '@angular/router';
import { DragDropModule } from '@angular/cdk/drag-drop';
@ -16,6 +17,16 @@ import { DashboardModule } from './dashboard/dashboard.module';
import { SettingsModule } from './settings/settings.module';
import { SharedModule } from './shared/shared.module';
function getBasePath() {
let path = window.location.pathname;
['/boards', '/settings', '/dashboard'].forEach(p => {
path = path.replace(p, '');
});
return path;
}
@NgModule({
imports: [
BrowserModule,
@ -30,11 +41,17 @@ import { SharedModule } from './shared/shared.module';
RouterModule.forRoot(ROUTES)
],
providers: [{
providers: [
{
provide: HTTP_INTERCEPTORS,
useClass: ApiInterceptor,
multi: true
}],
},
{
provide: APP_BASE_HREF,
useFactory: getBasePath
}
],
declarations: [
AppComponent,

View File

@ -1,10 +1,6 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>TaskBoard - Kanban App</title>
<base href="/TaskBoard/dist/">
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta http-equiv="cleartype" content="on">
@ -23,6 +19,8 @@
<meta name="msapplication-TileColor" content="#e6e6e6">
<meta name="msapplication-config" content="favicons/browserconfig.xml">
<meta name="theme-color" content="#ffffff">
<title>TaskBoard - Kanban App</title>
</head>
<body>
<tb-app-component>