projects
/
oweals
/
peertube.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Design video update
[oweals/peertube.git]
/
client
/
src
/
app
/
app.module.ts
diff --git
a/client/src/app/app.module.ts
b/client/src/app/app.module.ts
index 804a7a71ed693d7510a97f8f33fad5b58146a98c..ee7cb0c8aed47e8e509e836dac364793bbebbd8a 100644
(file)
--- a/
client/src/app/app.module.ts
+++ b/
client/src/app/app.module.ts
@@
-7,8
+7,6
@@
import {
} from '@angularclass/hmr'
import { MetaModule, MetaLoader, MetaStaticLoader, PageTitlePositioning } from '@ngx-meta/core'
} from '@angularclass/hmr'
import { MetaModule, MetaLoader, MetaStaticLoader, PageTitlePositioning } from '@ngx-meta/core'
-// TODO: remove, we need this to avoid error in ng2-smart-table
-import 'rxjs/add/operator/toPromise'
import 'bootstrap-loader'
import { ENV_PROVIDERS } from './environment'
import 'bootstrap-loader'
import { ENV_PROVIDERS } from './environment'
@@
-22,6
+20,8
@@
import { LoginModule } from './login'
import { SignupModule } from './signup'
import { SharedModule } from './shared'
import { VideosModule } from './videos'
import { SignupModule } from './signup'
import { SharedModule } from './shared'
import { VideosModule } from './videos'
+import { MenuComponent, MenuAdminComponent } from './menu'
+import { HeaderComponent } from './header'
export function metaFactory (): MetaLoader {
return new MetaStaticLoader({
export function metaFactory (): MetaLoader {
return new MetaStaticLoader({
@@
-49,7
+49,11
@@
const APP_PROVIDERS = [
@NgModule({
bootstrap: [ AppComponent ],
declarations: [
@NgModule({
bootstrap: [ AppComponent ],
declarations: [
- AppComponent
+ AppComponent,
+
+ MenuComponent,
+ MenuAdminComponent,
+ HeaderComponent
],
imports: [
BrowserModule,
],
imports: [
BrowserModule,
@@
-129,7
+133,7
@@
export class AppModule {
/**
* Display new elements
*/
/**
* Display new elements
*/
- store.disposeOldHosts
()
+ store.disposeOldHosts()
delete store.disposeOldHosts
}
}
delete store.disposeOldHosts
}
}