Skip to content

Linnea Samila / Moya

Go to a project
Commit 9165c2e3 by Aino Leppänen
Options

merge conflict resolve

1 parent 875e9c45
Inline Side-by-side
Showing with 32 additions and 102 deletions
code/moya-angular/src/app/app.component.html
<div id="top-container"> <div id="top-container">
<<<<<<< HEAD
<div id="left-menu">
<router-outlet name="left-menu"></router-outlet>
</div>
<div id="contentarea">
<div id="topbar">
<top-menu></top-menu>
</div>
<div id="content">
<router-outlet></router-outlet>
</div>
=======
<div id="left-menu"> <div id="left-menu">
<router-outlet name="left-menu"></router-outlet> <router-outlet name="left-menu"></router-outlet>
</div> </div>
...@@ -24,7 +11,6 @@ ...@@ -24,7 +11,6 @@
<div id="content"> <div id="content">
<router-outlet></router-outlet> <router-outlet></router-outlet>
>>>>>>> 1cbc86e7a97395b4e066423d4e947bd68e293b1d
</div> </div>
</div> </div>
\ No newline at end of file
code/moya-angular/src/app/app.module.ts
import {BrowserModule} from '@angular/platform-browser'; import { BrowserModule } from '@angular/platform-browser';
import {NgModule} from '@angular/core'; import { NgModule } from '@angular/core';
import {FormsModule} from '@angular/forms'; import { FormsModule } from '@angular/forms';
import {AppComponent} from './app.component'; import { AppComponent } from './app.component';
import {ViplistComponent} from './pages/info/viplist/viplist.component'; import { ViplistComponent } from './pages/info/viplist/viplist.component';
import {AlertModule} from 'ngx-bootstrap'; import { AlertModule } from 'ngx-bootstrap';
import { Router, RouterModule, PreloadAllModules} from '@angular/router'; import { Router, RouterModule, PreloadAllModules } from '@angular/router';
import {TestComponent} from './test/test.component'; import { TestComponent } from './test/test.component';
import {AdminMenuComponent} from './menu/admin-menu/admin-menu.component'; import { AdminMenuComponent } from './menu/admin-menu/admin-menu.component';
import {TopMenuComponent} from './menu/top-menu/top-menu.component'; import { TopMenuComponent } from './menu/top-menu/top-menu.component';
import {UserMenuComponent} from './menu/user-menu/user-menu.component'; import { UserMenuComponent } from './menu/user-menu/user-menu.component';
<<<<<<< HEAD
import {HttpClientModule, HttpHandler } from '@angular/common/http';
import { HttpModule } from '@angular/http'; import { HttpModule } from '@angular/http';
import {StaticInjector} from "@angular/core/src/di/injector"; import { StaticInjector } from "@angular/core/src/di/injector";
import {CommonModule} from "@angular/common";
import {CacheService} from "./shared/services/cache.service";
import {MoyaRestModule} from "./moya-rest";
import { AppRoutingModule } from './app-routing.module'; import { AppRoutingModule } from './app-routing.module';
import { LoginComponent } from './pages/login/login.component'; import { LoginComponent } from './pages/login/login.component';
======= import { UserComponent } from './pages/user/user.component';
import {UserComponent} from './pages/user/user.component'; import { InfoComponent } from './pages/info/info.component';
import {InfoComponent} from './pages/info/info.component'; import { AdminComponent } from './pages/admin/admin.component';
import {AdminComponent} from './pages/admin/admin.component'; import { HTTP_INTERCEPTORS, HttpClient, HttpClientModule, HttpHandler } from '@angular/common/http';
import {HTTP_INTERCEPTORS, HttpClient, HttpClientModule} from '@angular/common/http'; import { CommonModule } from '@angular/common';
import {CommonModule} from '@angular/common'; import { CacheService } from './shared/services/cache.service';
import {CacheService} from './shared/services/cache.service'; import { SafePipe } from './shared/pipes/safe.pipe';
import {SafePipe} from './shared/pipes/safe.pipe'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
import {TranslateLoader, TranslateModule} from '@ngx-translate/core'; import { TranslateHttpLoader } from '@ngx-translate/http-loader';
import {TranslateHttpLoader} from '@ngx-translate/http-loader'; import { MoyaLocaleService } from './components/moya-locale/moya-locale.service';
import {MoyaLocaleService} from './components/moya-locale/moya-locale.service';
import { MoyaLocaleComponent } from './components/moya-locale/moya-locale.component'; import { MoyaLocaleComponent } from './components/moya-locale/moya-locale.component';
import {ErrorInterceptor} from './shared/interceptors/error.interceptor'; import { ErrorInterceptor } from './shared/interceptors/error.interceptor';
import {ViplistService} from './pages/info/viplist/viplist.service'; import { ViplistService } from './pages/info/viplist/viplist.service';
import {UserService} from './shared/services/user.service'; import { UserService } from './shared/services/user.service';
const appRoutes: Routes = [
{
path: 'user',
children: [
{path: '', component: UserMenuComponent, outlet: 'left-menu'},
{path: '', pathMatch: 'full', component: UserComponent},
{path: 'old', component: OldMoyaComponent},
]
},
{
path: 'info',
children: [
{path: '', component: InfoMenuComponent, outlet: 'left-menu'},
{path: '', pathMatch: 'full', component: OldMoyaComponent},
{path: 'old', component: OldMoyaComponent},
{path: 'viplist', component: ViplistComponent},
]
},
{
path: 'admin',
children: [
{path: '', component: AdminMenuComponent, outlet: 'left-menu'},
{path: '', pathMatch: 'full', component: AdminComponent},
{path: 'old', component: OldMoyaComponent},
]
},
{path: 'old', pathMatch: 'prefix', component: OldMoyaComponent},
];
>>>>>>> 1cbc86e7a97395b4e066423d4e947bd68e293b1d
@NgModule({ @NgModule({
declarations: [ declarations: [
LoginComponent, LoginComponent,
AppComponent, AppComponent,
<<<<<<< HEAD
TopMenuComponent
=======
ViplistComponent,
OldMoyaComponent,
TestComponent,
TopMenuComponent, TopMenuComponent,
LeftMenuComponent,
AdminMenuComponent,
InfoMenuComponent,
UserMenuComponent,
UserComponent,
InfoComponent,
AdminComponent,
SafePipe,
MoyaLocaleComponent MoyaLocaleComponent
>>>>>>> 1cbc86e7a97395b4e066423d4e947bd68e293b1d
], ],
imports: [ imports: [
BrowserModule, BrowserModule,
...@@ -96,10 +43,6 @@ const appRoutes: Routes = [ ...@@ -96,10 +43,6 @@ const appRoutes: Routes = [
FormsModule, FormsModule,
HttpClientModule, HttpClientModule,
AlertModule.forRoot(), AlertModule.forRoot(),
<<<<<<< HEAD
MoyaRestModule
=======
RouterModule.forRoot(appRoutes),
TranslateModule.forRoot({ TranslateModule.forRoot({
loader: { loader: {
provide: TranslateLoader, provide: TranslateLoader,
...@@ -109,7 +52,6 @@ const appRoutes: Routes = [ ...@@ -109,7 +52,6 @@ const appRoutes: Routes = [
deps: [HttpClient] deps: [HttpClient]
} }
}) })
>>>>>>> 1cbc86e7a97395b4e066423d4e947bd68e293b1d
], ],
providers: [ providers: [
CacheService, CacheService,
...@@ -118,4 +60,4 @@ const appRoutes: Routes = [ ...@@ -118,4 +60,4 @@ const appRoutes: Routes = [
UserService], UserService],
bootstrap: [AppComponent] bootstrap: [AppComponent]
}) })
export class AppModule {} export class AppModule { }
code/moya-angular/src/app/pages/info/info-routing.module.ts
import { ViplistComponent } from './../../viplist/viplist.component'; import { ViplistComponent } from './viplist/viplist.component';
import { OldMoyaComponent } from './../old-moya/old-moya.component'; import { OldMoyaComponent } from './../old-moya/old-moya.component';
import { InfoMenuComponent } from './../../menu/info-menu/info-menu.component'; import { InfoMenuComponent } from './../../menu/info-menu/info-menu.component';
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
......
code/moya-angular/src/app/pages/info/info.module.ts
import { ViplistComponent } from './viplist/viplist.component';
import { OldMoyaModule } from './../old-moya/old-moya.module'; import { OldMoyaModule } from './../old-moya/old-moya.module';
import { ViplistComponent } from './../../viplist/viplist.component';
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { InfoRoutingModule } from './info-routing.module'; import { InfoRoutingModule } from './info-routing.module';
......
code/moya-angular/src/app/pages/user/user.module.ts
import { PipesModule } from './../../shared/pipes/pipes.module';
import { OldMoyaModule } from './../old-moya/old-moya.module'; import { OldMoyaModule } from './../old-moya/old-moya.module';
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
...@@ -6,13 +7,15 @@ import { UserRoutingModule } from './user-routing.module'; ...@@ -6,13 +7,15 @@ import { UserRoutingModule } from './user-routing.module';
import { UserComponent } from './user.component'; import { UserComponent } from './user.component';
import { UserMenuComponent } from '../../menu/user-menu/user-menu.component'; import { UserMenuComponent } from '../../menu/user-menu/user-menu.component';
import { LeftMenuModule } from '../../menu/left-menu/left-menu.module'; import { LeftMenuModule } from '../../menu/left-menu/left-menu.module';
import { TranslateModule } from '@ngx-translate/core';
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
UserRoutingModule, UserRoutingModule,
LeftMenuModule, LeftMenuModule,
OldMoyaModule OldMoyaModule,
TranslateModule.forRoot()
], ],
declarations: [UserComponent, UserMenuComponent] declarations: [UserComponent, UserMenuComponent]
}) })
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!