Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Codecrew
/
Moya
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
30
Merge Requests
2
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 2bccadf0
authored
Apr 02, 2018
by
Linnea Samila
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
renamed left-menu to sidebar
1 parent
004889b3
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
17 additions
and
19 deletions
code/moya-angular/src/app/app.component.html
code/moya-angular/src/app/app.component.ts
code/moya-angular/src/app/app.module.ts
code/moya-angular/src/app/menu/admin-menu/admin-menu.component.html
code/moya-angular/src/app/menu/info-menu/info-menu.component.html
code/moya-angular/src/app/menu/left-menu/left-menu.component.html → code/moya-angular/src/app/menu/sidebar/sidebar.component.html
code/moya-angular/src/app/menu/left-menu/left-menu.component.scss → code/moya-angular/src/app/menu/sidebar/sidebar.component.scss
code/moya-angular/src/app/menu/left-menu/left-menu.component.spec.ts → code/moya-angular/src/app/menu/sidebar/sidebar.component.spec.ts
code/moya-angular/src/app/menu/left-menu/left-menu.component.ts → code/moya-angular/src/app/menu/sidebar/sidebar.component.ts
code/moya-angular/src/app/menu/user-menu/user-menu.component.html
code/moya-angular/src/app/app.component.html
View file @
2bccadf
<div
id=
"top-container"
>
<div
id=
"top-container"
>
<div
id=
"
left-menu
"
>
<div
id=
"
sidebar
"
>
<router-outlet
name=
"
left-menu
"
></router-outlet>
<router-outlet
name=
"
sidebar
"
></router-outlet>
</div>
</div>
...
...
code/moya-angular/src/app/app.component.ts
View file @
2bccadf
...
@@ -19,6 +19,4 @@ export class AppComponent {
...
@@ -19,6 +19,4 @@ export class AppComponent {
});
});
}
}
}
}
code/moya-angular/src/app/app.module.ts
View file @
2bccadf
...
@@ -10,7 +10,7 @@ import { FormsModule } from '@angular/forms';
...
@@ -10,7 +10,7 @@ import { FormsModule } from '@angular/forms';
import
{
AppRoutingModule
}
from
'./app-routing.module'
;
import
{
AppRoutingModule
}
from
'./app-routing.module'
;
import
{
BrowserModule
}
from
'@angular/platform-browser'
;
import
{
BrowserModule
}
from
'@angular/platform-browser'
;
import
{
MoyaLocaleComponent
}
from
'./components/moya-locale/moya-locale.component'
;
import
{
MoyaLocaleComponent
}
from
'./components/moya-locale/moya-locale.component'
;
import
{
TopMenuComponent
}
from
'./menu/top-menu/top-menu
.component'
;
import
{
SidebarComponent
}
from
'./menu/sidebar/sidebar
.component'
;
import
{
AppComponent
}
from
'./app.component'
;
import
{
AppComponent
}
from
'./app.component'
;
import
{
LoginComponent
}
from
'./pages/login/login.component'
;
import
{
LoginComponent
}
from
'./pages/login/login.component'
;
import
{
NgModule
}
from
'@angular/core'
;
import
{
NgModule
}
from
'@angular/core'
;
...
@@ -19,7 +19,7 @@ import { NgModule } from '@angular/core';
...
@@ -19,7 +19,7 @@ import { NgModule } from '@angular/core';
declarations
:
[
declarations
:
[
LoginComponent
,
LoginComponent
,
AppComponent
,
AppComponent
,
TopMenu
Component
,
Sidebar
Component
,
MoyaLocaleComponent
MoyaLocaleComponent
],
],
imports
:
[
imports
:
[
...
...
code/moya-angular/src/app/menu/admin-menu/admin-menu.component.html
View file @
2bccadf
<
left-menu
[
menu
]="
menu
"
styleClass=
"adminMenu"
></left-menu
>
<
sidebar
[
menu
]="
menu
"
styleClass=
"adminMenu"
></sidebar
>
code/moya-angular/src/app/menu/info-menu/info-menu.component.html
View file @
2bccadf
<
left-menu
[
menu
]="
menu
"
styleClass=
"infoMenu"
></left-menu
>
<
sidebar
[
menu
]="
menu
"
styleClass=
"infoMenu"
></sidebar
>
code/moya-angular/src/app/menu/
left-menu/left-menu
.component.html
→
code/moya-angular/src/app/menu/
sidebar/sidebar
.component.html
View file @
2bccadf
File moved
code/moya-angular/src/app/menu/
left-menu/left-menu
.component.scss
→
code/moya-angular/src/app/menu/
sidebar/sidebar
.component.scss
View file @
2bccadf
File moved
code/moya-angular/src/app/menu/
left-menu/left-menu
.component.spec.ts
→
code/moya-angular/src/app/menu/
sidebar/sidebar
.component.spec.ts
View file @
2bccadf
import
{
async
,
ComponentFixture
,
TestBed
}
from
'@angular/core/testing'
;
import
{
async
,
ComponentFixture
,
TestBed
}
from
'@angular/core/testing'
;
import
{
LeftMenuComponent
}
from
'./left-menu
.component'
;
import
{
SidebarComponent
}
from
'./sidebar
.component'
;
describe
(
'
LeftMenu
Component'
,
()
=>
{
describe
(
'
Sidebar
Component'
,
()
=>
{
let
component
:
LeftMenu
Component
;
let
component
:
Sidebar
Component
;
let
fixture
:
ComponentFixture
<
LeftMenu
Component
>
;
let
fixture
:
ComponentFixture
<
Sidebar
Component
>
;
beforeEach
(
async
(()
=>
{
beforeEach
(
async
(()
=>
{
TestBed
.
configureTestingModule
({
TestBed
.
configureTestingModule
({
declarations
:
[
LeftMenu
Component
]
declarations
:
[
Sidebar
Component
]
})
})
.
compileComponents
();
.
compileComponents
();
}));
}));
beforeEach
(()
=>
{
beforeEach
(()
=>
{
fixture
=
TestBed
.
createComponent
(
LeftMenu
Component
);
fixture
=
TestBed
.
createComponent
(
Sidebar
Component
);
component
=
fixture
.
componentInstance
;
component
=
fixture
.
componentInstance
;
fixture
.
detectChanges
();
fixture
.
detectChanges
();
});
});
...
...
code/moya-angular/src/app/menu/
left-menu/left-menu
.component.ts
→
code/moya-angular/src/app/menu/
sidebar/sidebar
.component.ts
View file @
2bccadf
...
@@ -2,11 +2,11 @@ import {Component, OnInit, Input} from '@angular/core';
...
@@ -2,11 +2,11 @@ import {Component, OnInit, Input} from '@angular/core';
import
{
MenuGroup
}
from
'../models/menu-group.model'
;
import
{
MenuGroup
}
from
'../models/menu-group.model'
;
@
Component
({
@
Component
({
selector
:
'
left-menu
'
,
selector
:
'
sidebar
'
,
templateUrl
:
'./
left-menu
.component.html'
,
templateUrl
:
'./
sidebar
.component.html'
,
styleUrls
:
[
'./
left-menu
.component.scss'
]
styleUrls
:
[
'./
sidebar
.component.scss'
]
})
})
export
class
LeftMenu
Component
implements
OnInit
{
export
class
Sidebar
Component
implements
OnInit
{
@
Input
()
@
Input
()
menu
:
MenuGroup
[];
menu
:
MenuGroup
[];
...
...
code/moya-angular/src/app/menu/user-menu/user-menu.component.html
View file @
2bccadf
<
left-menu
[
menu
]="
menu
"
styleClass=
"userMenu"
></left-menu
>
<
sidebar
[
menu
]="
menu
"
styleClass=
"userMenu"
></sidebar
>
Write
Preview
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment