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
864
Issues
864
List
Boards
Labels
Service Desk
Milestones
Merge Requests
46
Merge Requests
46
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
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
Commits
cc328524
Commit
cc328524
authored
1 hour ago
by
Juan Manuel Solaro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(feat) Add ellipsis menu that contains common channel actions
parent
42344414
epic/minds-pro
1 merge request
!486
WIP: (feat): Minds Pro (development branch) - Release 2
Pipeline
#75252648
failed with stages
in 13 minutes and 12 seconds
Changes
9
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
123 additions
and
15 deletions
+123
-15
channel.component.html
src/app/modules/pro/channel/channel.component.html
+44
-2
channel.component.scss
src/app/modules/pro/channel/channel.component.scss
+36
-0
channel.component.ts
src/app/modules/pro/channel/channel.component.ts
+10
-0
footer.component.html
src/app/modules/pro/channel/footer/footer.component.html
+6
-0
footer.component.scss
src/app/modules/pro/channel/footer/footer.component.scss
+13
-0
footer.component.ts
src/app/modules/pro/channel/footer/footer.component.ts
+13
-3
pro-user-menu.component.html
...es/pro/channel/pro-user-menu/pro-user-menu.component.html
+0
-2
pro-user-menu.component.scss
...es/pro/channel/pro-user-menu/pro-user-menu.component.scss
+1
-4
pro-user-menu.component.ts
...ules/pro/channel/pro-user-menu/pro-user-menu.component.ts
+0
-4
No files found.
src/app/modules/pro/channel/channel.component.html
View file @
cc328524
...
...
@@ -67,8 +67,50 @@
>
Donate
</a>
</ng-container>
<m-pro-user-menu
[channelName]=
"channel.username"
[showNavItems]=
"collapseNavItems"
[query]=
"searchedText"
></m-pro-user-menu>
<div
class=
"m-proChannelTopbar_menu m-dropdown"
>
<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"
[hidden]=
"!isMenuOpen"
>
<ng-container
*ngIf=
"collapseNavItems"
>
<li
class=
"m-dropdownList__item m-proChannelTopbarMenuDropdown__item"
(click)=
"closeMenu()"
>
<a
[routerLink]=
"linkTo('videos', query)"
routerLinkActive=
"active"
i18n
>
Videos
</a>
</li>
<li
class=
"m-dropdownList__item m-proChannelTopbarMenuDropdown__item"
(click)=
"closeMenu()"
>
<a
[routerLink]=
"linkTo('images', query)"
routerLinkActive=
"active"
i18n
>
Images
</a>
</li>
<li
class=
"m-dropdownList__item m-proChannelTopbarMenuDropdown__item"
(click)=
"closeMenu()"
>
<a
[routerLink]=
"linkTo('articles', query)"
routerLinkActive=
"active"
i18n
>
Articles
</a>
</li>
<li
class=
"m-dropdownList__item m-proChannelTopbarMenuDropdown__item"
(click)=
"closeMenu()"
>
<a
[routerLink]=
"linkTo('groups', query)"
routerLinkActive=
"active"
i18n
>
Groups
</a>
</li>
<li
class=
"m-dropdownList__item m-proChannelTopbarMenuDropdown__item"
(click)=
"closeMenu()"
>
<a
[routerLink]=
"['/pro', channel.username, 'donate']"
routerLinkActive=
"active"
>
Donate
</a>
</li>
</ng-container>
</ul>
</div>
<div
class=
"minds-bg-overlay"
(click)=
"closeMenu()"
[hidden]=
"!isMenuOpen"
></div>
</div>
<div
class=
"m-proChannel__categories"
>
...
...
This diff is collapsed.
Click to expand it.
src/app/modules/pro/channel/channel.component.scss
View file @
cc328524
...
...
@@ -97,6 +97,42 @@ m-pro--channel {
}
.m-proChannelTopbar_menu.m-dropdown
{
display
:
inline-block
;
position
:
relative
;
cursor
:
pointer
;
@media
screen
and
(
min-width
:
1000px
)
{
display
:
none
;
}
.m-proChannelTopbarMenu__dropdown
{
list-style
:
none
;
margin
:
34px
0
0
;
@include
m-theme
()
{
background-color
:
themed
(
'm-white'
);
color
:
themed
(
'm-grey-700'
);
}
li
.proChannelTopbarMenuDropdown__item
{
&
:hover
{
@include
m-theme
()
{
background-color
:
rgba
(
themed
(
'm-grey-50'
)
,
0
.5
);
}
}
a
{
color
:
#555
!
important
;
}
i
{
color
:
#555
!
important
;
}
}
}
}
}
a
.m-proChannelTopbar__navItem
{
...
...
This diff is collapsed.
Click to expand it.
src/app/modules/pro/channel/channel.component.ts
View file @
cc328524
...
...
@@ -46,6 +46,8 @@ export class ProChannelComponent implements OnInit, OnDestroy {
query
:
string
;
isMenuOpen
:
boolean
=
false
;
constructor
(
protected
element
:
ElementRef
,
protected
session
:
Session
,
...
...
@@ -187,6 +189,14 @@ export class ProChannelComponent implements OnInit, OnDestroy {
return
this
.
session
.
getLoggedInUser
();
}
toggleMenu
()
{
this
.
isMenuOpen
=
!
this
.
isMenuOpen
;
}
closeMenu
()
{
this
.
isMenuOpen
=
false
;
}
search
()
{
if
(
!
this
.
currentURL
)
{
this
.
currentURL
=
`/pro/
${
this
.
channel
.
username
}
/articles`
;
//TODO ADD /TOP when algorithm is enabled
...
...
This diff is collapsed.
Click to expand it.
src/app/modules/pro/channel/footer/footer.component.html
View file @
cc328524
...
...
@@ -16,4 +16,10 @@
class=
"m-pro--channel-footer--link"
[href]=
"link.href"
>
{{link.title}}
</a>
<ng-container
*ngIf=
"session.getLoggedInUser()"
>
<span
style=
"position: relative"
>
<minds-button-user-dropdown
[(user)]=
"user"
*ngIf=
"session.getLoggedInUser().guid != user.guid"
></minds-button-user-dropdown>
</span>
</ng-container>
</div>
This diff is collapsed.
Click to expand it.
src/app/modules/pro/channel/footer/footer.component.scss
View file @
cc328524
...
...
@@ -10,4 +10,17 @@
text-decoration
:
none
;
padding
:
0
16px
;
}
minds-button-user-dropdown
{
button
.material-icons
{
border
:
none
;
color
:
var
(
--
text-color
)
!
important
;
}
.minds-dropdown-menu
{
top
:
-100px
;
left
:
-130px
;
}
}
}
This diff is collapsed.
Click to expand it.
src/app/modules/pro/channel/footer/footer.component.ts
View file @
cc328524
import
{
Component
}
from
'
@angular/core
'
;
import
{
ProChannelService
}
from
"
../channel.service
"
;
import
{
Session
}
from
'
../../../../services/session
'
;
export
interface
SocialProfileMeta
{
...
...
@@ -19,6 +20,13 @@ export interface SocialProfileMeta {
export
class
ProChannelFooterComponent
{
constructor
(
private
channelService
:
ProChannelService
,
protected
_session
:
Session
)
{
}
private
socialProfileMeta
:
SocialProfileMeta
[]
=
[
{
key
:
'
facebook
'
,
...
...
@@ -270,9 +278,11 @@ export class ProChannelFooterComponent {
return
defaultMeta
;
}
constructor
(
private
channelService
:
ProChannelService
,
)
{
get
user
()
{
return
this
.
channelService
.
currentChannel
;
}
get
session
()
{
return
this
.
_session
;
}
}
This diff is collapsed.
Click to expand it.
src/app/modules/pro/channel/pro-user-menu/pro-user-menu.component.html
View file @
cc328524
...
...
@@ -2,7 +2,6 @@
<a
class=
"m-pro-user-menu__Anchor"
(click)=
"toggleMenu()"
><i
class=
"material-icons"
>
menu
</i></a>
<ul
class=
"m-dropdown__list m-pro-user-menu__dropdown mdl-shadow--3dp"
[hidden]=
"!isOpen"
>
<ng-container
*ngIf=
"showNavItems"
>
<!-- <li
class="m-dropdownList__item m-pro-user-menuDropdown__item"
(click)="closeMenu()"
...
...
@@ -44,7 +43,6 @@
>
<a
[routerLink]=
"['/pro', channel.username, 'donate']"
routerLinkActive=
"active"
>
Donate
</a>
</li>
</ng-container>
</ul>
</div>
...
...
This diff is collapsed.
Click to expand it.
src/app/modules/pro/channel/pro-user-menu/pro-user-menu.component.scss
View file @
cc328524
...
...
@@ -2,13 +2,10 @@ m-pro-user-menu {
display
:
inline-block
;
position
:
relative
;
cursor
:
pointer
;
@media
screen
and
(
min-width
:
1000px
)
{
display
:
none
;
}
}
.m-pro-user-menu__dropdown
{
top
:
-238px
!
important
;
list-style
:
none
;
margin
:
34px
0
0
;
@include
m-theme
()
{
...
...
This diff is collapsed.
Click to expand it.
src/app/modules/pro/channel/pro-user-menu/pro-user-menu.component.ts
View file @
cc328524
...
...
@@ -11,10 +11,6 @@ import { ProChannelService } from "../channel.service";
export
class
ProUserMenuComponent
implements
OnInit
{
isOpen
:
boolean
=
false
;
@
Input
()
channelName
:
string
;
@
Input
()
showNavItems
:
boolean
;
@
Input
()
query
:
string
;
get
channel
()
{
return
this
.
channelService
.
currentChannel
;
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
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 comment