Skip to content
  • Projects
  • Groups
  • Snippets
  • Help

Codecrew / Moya

  • This project
    • Loading...
  • Sign in
Go to a project
  • Project
  • Repository
  • Issues 30
  • Merge Requests 2
  • Wiki
  • Snippets
  • Settings
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Commits
  • Issue Boards
Merged
Merge Request !397 opened Apr 01, 2018 by Aino Leppänen@onja

Feature/routing

Implemented lazy loading

Edited Apr 01, 2018
Request to merge feature/routing into master
Pipeline #43 passed
for 9e0c1706.
Pipeline #43 passed with warnings
for 9e0c1706.
Pipeline #43 skipped
for 9e0c1706.
Pipeline #43 waiting for manual action
for 9e0c1706.
Pipeline #43 canceled
for 9e0c1706.
Pipeline #43 failed
for 9e0c1706.
Pipeline #43 running
for 9e0c1706.
Pipeline #43 pending
for 9e0c1706.

Merged

  • The changes were merged into master.
  • The source branch has been removed.
  • Discussion 20
  • Commits 23
  • Pipelines 5
  • Changes 32
  • {{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Jenkins @jenkins commented Apr 01, 2018
    Developer

    Build triggered.

  • Jenkins @jenkins commented Apr 01, 2018
    Developer

    Build Started: https://jenkins.codecrew.fi/job/Moya/job/moya-master/163/

  • Jenkins @jenkins commented Apr 01, 2018
    Developer

    Build finished. Tests PASSED. Build results available at: https://jenkins.codecrew.fi/job/Moya/job/moya-master/163/

  • 6df7c7fb78c180b4066222cf874b2c0a?s=80&d=identicon
    Antti Väyrynen
    @xeii started a discussion on an outdated diff Apr 01, 2018
    Resolved by Aino Leppänen Apr 01, 2018
    code/moya-angular/src/app/app.module.ts
    67 LeftMenuComponent,
    68 AdminMenuComponent,
    69 InfoMenuComponent,
    70 UserMenuComponent,
    71 UserComponent,
    72 InfoComponent,
    73 AdminComponent,
    74 SafePipe
    75
    25 TopMenuComponent
    76 26 ],
    77 27 imports: [
    78 CommonModule,
    79 28 BrowserModule,
    29 AppRoutingModule,
    30 CommonModule,
    • Antti Väyrynen @xeii commented Apr 01, 2018
      Master

      Should AppModule include BrowserModule as it's the bootstrapping module?

  • 6df7c7fb78c180b4066222cf874b2c0a?s=80&d=identicon
    Antti Väyrynen
    @xeii started a discussion on the diff Apr 01, 2018
    Resolved by Aino Leppänen Apr 01, 2018
    code/moya-angular/src/app/pages/info/info-routing.module.ts 0 → 100644
    2 import { OldMoyaComponent } from './../old-moya/old-moya.component';
    3 import { InfoMenuComponent } from './../../menu/info-menu/info-menu.component';
    4 import { NgModule } from '@angular/core';
    5 import { Routes, RouterModule } from '@angular/router';
    6 import { InfoComponent } from './info.component';
    7
    8 const routes: Routes = [
    9 { path: '', component: InfoMenuComponent, outlet: 'left-menu' },
    10 { path: '', pathMatch: 'full', component: OldMoyaComponent },
    11 { path: 'old', component: OldMoyaComponent },
    12 { path: 'viplist', component: ViplistComponent }
    13 ];
    14
    15 @NgModule({
    16 imports: [RouterModule.forChild(routes)],
    17 exports: [RouterModule]
    • Antti Väyrynen @xeii commented Apr 01, 2018
      Master

      Check if this is necessary

  • 6df7c7fb78c180b4066222cf874b2c0a?s=80&d=identicon
    Antti Väyrynen
    @xeii started a discussion on the diff Apr 01, 2018
    Resolved by Aino Leppänen Apr 01, 2018
    code/moya-angular/src/app/pages/login/login-routing.module.ts 0 → 100644
    1 import { NgModule } from '@angular/core';
    2 import { Routes, RouterModule } from '@angular/router';
    3 import { LoginComponent } from './login.component';
    4
    5 const routes: Routes = [
    6 { path: '', component: LoginComponent }
    7 ];
    8
    9 @NgModule({
    10 imports: [RouterModule.forChild(routes)],
    11 exports: [RouterModule]
    • Antti Väyrynen @xeii commented Apr 01, 2018
      Master

      Check if this necessary

  • Aino Leppänen @onja

    added 19 commits

    • 1e9c299b...1cbc86e7 - 18 commits from branch master
    • 875e9c45 - merge conflicts

    Compare with previous version

    Apr 01, 2018

    added 19 commits

    • 1e9c299b...1cbc86e7 - 18 commits from branch master
    • 875e9c45 - merge conflicts

    Compare with previous version

    Toggle commit list
  • 6df7c7fb78c180b4066222cf874b2c0a?s=80&d=identicon
    Antti Väyrynen
    @xeii started a discussion on the diff Apr 01, 2018
    Last updated by Aino Leppänen Apr 01, 2018
    code/moya-angular/src/app/pages/old-moya/old-moya.module.ts 0 → 100644
    1 import { PipesModule } from './../../shared/pipes/pipes.module';
    2 import { OldMoyaComponent } from './old-moya.component';
    3 import { NgModule } from '@angular/core';
    4 import { CommonModule } from '@angular/common';
    5
    6 @NgModule({
    7 imports: [
    8 CommonModule,
    9 PipesModule.forRoot()
    • Antti Väyrynen @xeii commented Apr 01, 2018
      Master

      forRoot in child module?

    • Aino Leppänen @onja commented Apr 01, 2018
      Master

      See pipes module

  • Jenkins @jenkins commented Apr 01, 2018
    Developer

    Build triggered.

  • Jenkins @jenkins commented Apr 01, 2018
    Developer

    Build Started: https://jenkins.codecrew.fi/job/Moya/job/moya-master/166/

  • Jenkins @jenkins commented Apr 01, 2018
    Developer

    Build finished. Tests PASSED. Build results available at: https://jenkins.codecrew.fi/job/Moya/job/moya-master/166/

  • Aino Leppänen @onja

    added 1 commit

    • 9165c2e3 - merge conflict resolve

    Compare with previous version

    Apr 01, 2018

    added 1 commit

    • 9165c2e3 - merge conflict resolve

    Compare with previous version

    Toggle commit list
  • Jenkins @jenkins commented Apr 01, 2018
    Developer

    Build Started: https://jenkins.codecrew.fi/job/Moya/job/moya-master/167/

  • Jenkins @jenkins commented Apr 01, 2018
    Developer

    Build triggered.

  • Jenkins @jenkins commented Apr 01, 2018
    Developer

    Build finished. Tests PASSED. Build results available at: https://jenkins.codecrew.fi/job/Moya/job/moya-master/167/

  • Aino Leppänen @onja

    added 1 commit

    • 0bea3269 - Removed useless imports

    Compare with previous version

    Apr 01, 2018

    added 1 commit

    • 0bea3269 - Removed useless imports

    Compare with previous version

    Toggle commit list
  • Jenkins @jenkins commented Apr 01, 2018
    Developer

    Build Started: https://jenkins.codecrew.fi/job/Moya/job/moya-master/168/

  • Jenkins @jenkins commented Apr 01, 2018
    Developer

    Build triggered.

  • Aino Leppänen @onja

    added 1 commit

    • 9e0c1706 - accidentally added back js files, mb

    Compare with previous version

    Apr 01, 2018

    added 1 commit

    • 9e0c1706 - accidentally added back js files, mb

    Compare with previous version

    Toggle commit list
  • Jenkins @jenkins commented Apr 01, 2018
    Developer

    Build finished. Tests PASSED. Build results available at: https://jenkins.codecrew.fi/job/Moya/job/moya-master/168/

  • Jenkins @jenkins commented Apr 01, 2018
    Developer

    Build triggered.

  • Jenkins @jenkins commented Apr 01, 2018
    Developer

    Build Started: https://jenkins.codecrew.fi/job/Moya/job/moya-master/169/

  • Jenkins @jenkins commented Apr 01, 2018
    Developer

    Build finished. Tests PASSED. Build results available at: https://jenkins.codecrew.fi/job/Moya/job/moya-master/169/

  • Tuukka Kivilahti @tkfftk

    mentioned in commit 091de5de

    Apr 01, 2018

    mentioned in commit 091de5de

    Toggle commit list
  • Tuukka Kivilahti @tkfftk

    merged

    Apr 01, 2018

    merged

    Toggle commit list
  • Write
  • Preview
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
  • Please register or sign in to post a comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View labels
4
4 participants
Reference: codecrew/moya!397
×

Revert this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.