Skip to content
Next
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Switch to GitLab Next
Sign in / Register
Toggle navigation
Minds Frontend
Project
Project
Details
Activity
Releases
Cycle Analytics
Insights
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
891
Issues
891
List
Boards
Labels
Service Desk
Milestones
Merge Requests
49
Merge Requests
49
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Security & Compliance
Security & Compliance
Dependency List
Packages
Packages
List
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Minds
Minds Frontend
Compare Revisions
49634e7b4d74465dcd6cf9b8abb0df394f16e4db...bc60205e44713bfbfa72dbea6b79f53786323c7d
Source
bc60205e44713bfbfa72dbea6b79f53786323c7d
Select Git revision
...
Target
49634e7b4d74465dcd6cf9b8abb0df394f16e4db
Select Git revision
Compare
Commits (2)
(feat): add routes for /media, /blog and /newsfeed
· 1d6e814b
Marcelo Rivera
authored
1 hour ago
1d6e814b
(fix): added Feed option to collapsed nav menu and fixed ugly formatting
· bc60205e
Marcelo Rivera
authored
1 hour ago
bc60205e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
86 additions
and
27 deletions
+86
-27
channel.component.html
src/app/modules/pro/channel/channel.component.html
+48
-26
pro.module.ts
src/app/modules/pro/pro.module.ts
+38
-1
No files found.
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>
...
...
This diff is collapsed.
Click to expand it.
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
{
}
This diff is collapsed.
Click to expand it.