Skip to content
GitLab
Menu
Why GitLab
Pricing
Contact Sales
Explore
Why GitLab
Pricing
Contact Sales
Explore
Sign in
Get free trial
Commits on Source (2)
(feat): add routes for /media, /blog and /newsfeed
· 1d6e814b
Marcelo Rivera
authored
Aug 30, 2019
1d6e814b
(fix): added Feed option to collapsed nav menu and fixed ugly formatting
· bc60205e
Marcelo Rivera
authored
Aug 30, 2019
bc60205e
Hide whitespace changes
Inline
Side-by-side
src/app/modules/pro/channel/channel.component.html
View file @
bc60205e
...
...
@@ -30,40 +30,45 @@
[routerLink]=
"feedRouterLink"
routerLinkActive=
"active"
i18n
>
Feed
</a
>
Feed
</a>
<a
class=
"m-proChannelTopbar__navItem"
[routerLink]=
"videosRouterLink"
routerLinkActive=
"active"
i18n
>
Videos
</a
>
Videos
</a>
<a
class=
"m-proChannelTopbar__navItem"
[routerLink]=
"imagesRouterLink"
routerLinkActive=
"active"
i18n
>
Images
</a
>
Images
</a>
<a
class=
"m-proChannelTopbar__navItem"
[routerLink]=
"articlesRouterLink"
routerLinkActive=
"active"
i18n
>
Articles
</a
>
Articles
</a>
<a
class=
"m-proChannelTopbar__navItem"
[routerLink]=
"groupsRouterLink"
routerLinkActive=
"active"
i18n
>
Groups
</a
>
Groups
</a>
<ng-container
*ngIf=
"currentUser?.guid != channel.guid; else ownerNavLinks"
...
...
@@ -79,11 +84,12 @@
<ng-container
*ngIf=
"!channel.subscribed; else subscribedActionButton"
i18n
>
Subscribe
</ng-container
>
<ng-template
#subscribedActionButton
><ng-container
i18n
>
Subscribed
</ng-container></ng-template
>
Subscribe
</ng-container>
<ng-template
#subscribedActionButton
>
<ng-container
i18n
>
Subscribed
</ng-container>
</ng-template>
</span>
<span
class=
"m-proChannelTopbar__subscribe--counter"
>
...
...
@@ -98,23 +104,28 @@
[href]=
"proSettingsHref"
target=
"root_minds"
i18n
>
Settings
</a
>
Settings
</a>
<a
*ngIf=
"!isStandalone"
class=
"m-proChannelTopbar__navItem"
[routerLink]=
"proSettingsLink"
i18n
>
Settings
</a
>
Settings
</a>
</ng-template>
</ng-container>
<div
class=
"m-proChannelTopbar_menu m-dropdown"
>
<a
class=
"m-proChannelTopbarMenu__Anchor"
(click)=
"toggleMenu()"
><i
class=
"material-icons"
>
menu
</i></a
<a
class=
"m-proChannelTopbarMenu__Anchor"
(click)=
"toggleMenu()"
>
<i
class=
"material-icons"
>
menu
</i>
</a>
<ul
class=
"m-dropdown__list m-proChannelTopbarMenu__dropdown mdl-shadow--3dp"
...
...
@@ -125,43 +136,54 @@
class=
"m-dropdownList__item m-proChannelTopbarMenuDropdown__item"
(click)=
"closeMenu()"
>
<a
[routerLink]=
"videosRouterLink"
routerLinkActive=
"active"
i18n
>
Videos
</a
>
<a
[routerLink]=
"feedRouterLink"
routerLinkActive=
"active"
i18n
>
Feed
</a>
</li>
<li
class=
"m-dropdownList__item m-proChannelTopbarMenuDropdown__item"
(click)=
"closeMenu()"
>
<a
[routerLink]=
"videosRouterLink"
routerLinkActive=
"active"
i18n
>
Videos
</a>
</li>
<li
class=
"m-dropdownList__item m-proChannelTopbarMenuDropdown__item"
(click)=
"closeMenu()"
>
<a
[routerLink]=
"imagesRouterLink"
routerLinkActive=
"active"
i18n
>
Images
</a
>
<a
[routerLink]=
"imagesRouterLink"
routerLinkActive=
"active"
i18n
>
Images
</a
>
</li>
<li
class=
"m-dropdownList__item m-proChannelTopbarMenuDropdown__item"
(click)=
"closeMenu()"
>
<a
[routerLink]=
"articlesRouterLink"
routerLinkActive=
"active"
i18n
>
Articles
</a
>
<a
[routerLink]=
"articlesRouterLink"
routerLinkActive=
"active"
i18n
>
Articles
</a
>
</li>
<li
class=
"m-dropdownList__item m-proChannelTopbarMenuDropdown__item"
(click)=
"closeMenu()"
>
<a
[routerLink]=
"groupsRouterLink"
routerLinkActive=
"active"
i18n
>
Groups
</a
>
<a
[routerLink]=
"groupsRouterLink"
routerLinkActive=
"active"
i18n
>
Groups
</a
>
</li>
<li
class=
"m-dropdownList__item m-proChannelTopbarMenuDropdown__item"
(click)=
"closeMenu()"
>
<a
(click)=
"wire()"
routerLinkActive=
"active"
>
Wire
</a>
<a
(click)=
"wire()"
routerLinkActive=
"active"
>
Wire
</a>
</li>
</ng-container>
</ul>
...
...
src/app/modules/pro/pro.module.ts
View file @
bc60205e
...
...
@@ -23,6 +23,12 @@ import { ProUnsubscribeModalComponent } from './channel/unsubscribe-modal/modal.
import
{
ProCategoriesComponent
}
from
'
./channel/categories/categories.component
'
;
import
{
BlogView
}
from
'
../blogs/view/view
'
;
import
{
MediaModalComponent
}
from
'
../media/modal/modal.component
'
;
import
{
NewsfeedSingleComponent
}
from
"
../newsfeed/single/single.component
"
;
import
{
MediaViewComponent
}
from
"
../media/view/view.component
"
;
import
{
MediaEditComponent
}
from
"
../media/edit/edit.component
"
;
import
{
BlogViewInfinite
}
from
"
../blogs/view/infinite
"
;
import
{
BlogEdit
}
from
"
../blogs/edit/edit
"
;
import
{
CanDeactivateGuardService
}
from
"
../../services/can-deactivate-guard
"
;
const
routes
:
Routes
=
[
{
...
...
@@ -77,6 +83,36 @@ export const STANDALONE_ROUTES = [
},
],
},
{
path
:
'
newsfeed/:guid
'
,
component
:
NewsfeedSingleComponent
,
},
{
path
:
'
media/:guid
'
,
component
:
MediaViewComponent
,
},
{
path
:
'
media/edit/:guid
'
,
component
:
MediaEditComponent
},
{
path
:
'
blog/view/:guid/:title
'
,
component
:
BlogViewInfinite
},
{
path
:
'
blog/view/:guid
'
,
component
:
BlogViewInfinite
},
{
path
:
'
blog/edit/:guid
'
,
component
:
BlogEdit
,
canDeactivate
:
[
CanDeactivateGuardService
],
},
{
path
:
'
blog/:slugid
'
,
component
:
BlogViewInfinite
},
];
@
NgModule
({
...
...
@@ -114,4 +150,5 @@ export const STANDALONE_ROUTES = [
BlogView
,
],
})
export
class
ProModule
{}
export
class
ProModule
{
}