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 b8339459
authored
Apr 02, 2018
by
Linnea Samila
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
renamed top-menu to group-selector-menu
1 parent
ed3f0265
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
14 additions
and
14 deletions
code/moya-angular/src/app/app.module.ts
code/moya-angular/src/app/menu/top-menu/top-menu.component.html → code/moya-angular/src/app/menu/group-selector-menu/group-selector-menu.component.html
code/moya-angular/src/app/menu/top-menu/top-menu.component.scss → code/moya-angular/src/app/menu/group-selector-menu/group-selector-menu.component.scss
code/moya-angular/src/app/menu/top-menu/top-menu.component.spec.ts → code/moya-angular/src/app/menu/group-selector-menu/group-selector-menu.component.spec.ts
code/moya-angular/src/app/menu/top-menu/top-menu.component.ts → code/moya-angular/src/app/menu/group-selector-menu/group-selector-menu.component.ts
code/moya-angular/src/app/menu/sidebar/sidebar.component.html
code/moya-angular/src/app/menu/sidebar/sidebar.component.scss
code/moya-angular/src/app/app.module.ts
View file @
b833945
...
@@ -11,7 +11,7 @@ import {RouterModule, Routes} from '@angular/router';
...
@@ -11,7 +11,7 @@ import {RouterModule, Routes} from '@angular/router';
import
{
OldMoyaComponent
}
from
'./pages/old-moya/old-moya.component'
;
import
{
OldMoyaComponent
}
from
'./pages/old-moya/old-moya.component'
;
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
{
GroupSelectorComponent
}
from
'./menu/group-selector-menu/group-selector
-menu.component'
;
import
{
SidebarComponent
}
from
'./menu/sidebar/sidebar.component'
;
import
{
SidebarComponent
}
from
'./menu/sidebar/sidebar.component'
;
import
{
InfoMenuComponent
}
from
'./menu/info-menu/info-menu.component'
;
import
{
InfoMenuComponent
}
from
'./menu/info-menu/info-menu.component'
;
import
{
UserMenuComponent
}
from
'./menu/user-menu/user-menu.component'
;
import
{
UserMenuComponent
}
from
'./menu/user-menu/user-menu.component'
;
...
@@ -67,7 +67,7 @@ const appRoutes: Routes = [
...
@@ -67,7 +67,7 @@ const appRoutes: Routes = [
ViplistComponent
,
ViplistComponent
,
OldMoyaComponent
,
OldMoyaComponent
,
TestComponent
,
TestComponent
,
TopMenu
Component
,
GroupSelector
Component
,
SidebarComponent
,
SidebarComponent
,
AdminMenuComponent
,
AdminMenuComponent
,
InfoMenuComponent
,
InfoMenuComponent
,
...
...
code/moya-angular/src/app/menu/
top-menu/top
-menu.component.html
→
code/moya-angular/src/app/menu/
group-selector-menu/group-selector
-menu.component.html
View file @
b833945
File moved
code/moya-angular/src/app/menu/
top-menu/top
-menu.component.scss
→
code/moya-angular/src/app/menu/
group-selector-menu/group-selector
-menu.component.scss
View file @
b833945
File moved
code/moya-angular/src/app/menu/
top-menu/top
-menu.component.spec.ts
→
code/moya-angular/src/app/menu/
group-selector-menu/group-selector
-menu.component.spec.ts
View file @
b833945
import
{
async
,
ComponentFixture
,
TestBed
}
from
'@angular/core/testing'
;
import
{
async
,
ComponentFixture
,
TestBed
}
from
'@angular/core/testing'
;
import
{
TopMenuComponent
}
from
'./top
-menu.component'
;
import
{
GroupSelectorComponent
}
from
'./group-selector
-menu.component'
;
describe
(
'
TopMenu
Component'
,
()
=>
{
describe
(
'
GroupSelector
Component'
,
()
=>
{
let
component
:
TopMenu
Component
;
let
component
:
GroupSelector
Component
;
let
fixture
:
ComponentFixture
<
TopMenu
Component
>
;
let
fixture
:
ComponentFixture
<
GroupSelector
Component
>
;
beforeEach
(
async
(()
=>
{
beforeEach
(
async
(()
=>
{
TestBed
.
configureTestingModule
({
TestBed
.
configureTestingModule
({
declarations
:
[
TopMenu
Component
]
declarations
:
[
GroupSelector
Component
]
})
})
.
compileComponents
();
.
compileComponents
();
}));
}));
beforeEach
(()
=>
{
beforeEach
(()
=>
{
fixture
=
TestBed
.
createComponent
(
TopMenu
Component
);
fixture
=
TestBed
.
createComponent
(
GroupSelector
Component
);
component
=
fixture
.
componentInstance
;
component
=
fixture
.
componentInstance
;
fixture
.
detectChanges
();
fixture
.
detectChanges
();
});
});
...
...
code/moya-angular/src/app/menu/
top-menu/top
-menu.component.ts
→
code/moya-angular/src/app/menu/
group-selector-menu/group-selector
-menu.component.ts
View file @
b833945
import
{
Component
,
OnInit
}
from
'@angular/core'
;
import
{
Component
,
OnInit
}
from
'@angular/core'
;
@
Component
({
@
Component
({
selector
:
'
top
-menu'
,
selector
:
'
group-selector
-menu'
,
templateUrl
:
'./
top
-menu.component.html'
,
templateUrl
:
'./
group-selector
-menu.component.html'
,
styleUrls
:
[
'./
top
-menu.component.scss'
]
styleUrls
:
[
'./
group-selector
-menu.component.scss'
]
})
})
export
class
TopMenu
Component
implements
OnInit
{
export
class
GroupSelector
Component
implements
OnInit
{
constructor
()
{
}
constructor
()
{
}
...
...
code/moya-angular/src/app/menu/sidebar/sidebar.component.html
View file @
b833945
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
<h1>
Tapahtuma
</h1>
<h1>
Tapahtuma
</h1>
<h2>
Lippukauppa
</h2>
<h2>
Lippukauppa
</h2>
<
top-menu></top
-menu>
<
group-selector-menu></group-selector
-menu>
<nav
id=
"leftNav"
>
<nav
id=
"leftNav"
>
...
...
code/moya-angular/src/app/menu/sidebar/sidebar.component.scss
View file @
b833945
@import
'../../../common'
;
@import
'../../../common'
;
:host
{
:host
{
color
:
white
;
color
:
white
;
}
}
...
...
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