Skip to content
Next
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Switch to GitLab Next
Sign in / Register
Toggle navigation
Minds Frontend
Project
Project
Details
Activity
Releases
Dependency List
Cycle Analytics
Insights
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
839
Issues
839
List
Boards
Labels
Service Desk
Milestones
Merge Requests
45
Merge Requests
45
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
357f9802
Commit
357f9802
authored
11 minutes ago
by
Marcelo Rivera
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(feat): media & blog tile
parent
b56aeedb
epic/minds-pro
1 merge request
!459
WIP: (feat): Minds Pro
Pipeline
#73133705
running with stages
Changes
6
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
102 additions
and
44 deletions
+102
-44
list.component.html
src/app/modules/pro/channel/list/list.component.html
+6
-40
list.component.scss
src/app/modules/pro/channel/list/list.component.scss
+0
-3
list.component.ts
src/app/modules/pro/channel/list/list.component.ts
+1
-1
tile.component.scss
src/app/modules/pro/channel/tile/tile.component.scss
+48
-0
tile.component.ts
src/app/modules/pro/channel/tile/tile.component.ts
+45
-0
pro.module.ts
src/app/modules/pro/pro.module.ts
+2
-0
No files found.
src/app/modules/pro/channel/list/list.component.html
View file @
357f9802
<!--<!– TODO: i18n –>-->
<!--<h1>{{type | titlecase}}</h1>-->
<!--<div class="m-proChannelList__content">-->
<!-- <i class="material-icons">keyboard_arrow_left</i>-->
<!-- <ul class="m-proChannelListContent__list">-->
<!-- <!– <li *ngFor="let entity of (feedsService.feed | async); let i = index">–>-->
<!-- <!– TODO: custom tile here –>-->
<!-- <!– </li>–>-->
<!-- <li>-->
<!-- <video src="https://cdn-cinemr.minds.com/cinemr_com/943902545938489353/720.mp4"></video>-->
<!-- </li>-->
<!-- <li>-->
<!-- <video src="https://cdn-cinemr.minds.com/cinemr_com/943902545938489353/720.mp4"></video>-->
<!-- </li>-->
<!-- <li>-->
<!-- <video src="https://cdn-cinemr.minds.com/cinemr_com/943902545938489353/720.mp4"></video>-->
<!-- </li>-->
<!-- <li>-->
<!-- <video src="https://cdn-cinemr.minds.com/cinemr_com/943902545938489353/720.mp4"></video>-->
<!-- </li>-->
<!-- <li>-->
<!-- <video src="https://cdn-cinemr.minds.com/cinemr_com/943902545938489353/720.mp4"></video>-->
<!-- </li>-->
<!-- <li>-->
<!-- <video src="https://cdn-cinemr.minds.com/cinemr_com/943902545938489353/720.mp4"></video>-->
<!-- </li>-->
<!-- <li>-->
<!-- <video src="https://cdn-cinemr.minds.com/cinemr_com/943902545938489353/720.mp4"></video>-->
<!-- </li>-->
<!-- <li>-->
<!-- <video src="https://cdn-cinemr.minds.com/cinemr_com/943902545938489353/720.mp4"></video>-->
<!-- </li>-->
<!-- </ul>-->
<!-- <i class="material-icons">keyboard_arrow_right</i>-->
<!--</div>-->
<!--<!– TODO: add infinite scroll or something to load more –>-->
<h1
[
ngSwitch
]="
type
"
>
<ng-template
ngSwitchCase=
"videos"
i18n
>
Videos
</ng-template>
<ng-template
ngSwitchCase=
"images"
i18n
>
Images
</ng-template>
...
...
@@ -48,15 +10,19 @@
<div
class=
"m-proChannelList__content"
>
<ng-container
*
ngIf=
"type === 'images' || type === 'videos' || type === 'blogs'"
>
<ul
class=
"m-proChannelListContent__list"
>
<li
*
ngFor=
"let entity of (feedsService.feed | async)"
>
<img
style=
"max-height: 320px; width: 100%; height: 100%; object-fit: cover"
[
src
]="(
entity
|
async
).
thumbnail_src
"
alt=
""
>
<li
class=
"img-tile"
*
ngFor=
"let entity of (feedsService.feed | async)"
>
<m-pro--channel-tile
[
entity
]="
entity
|
async
"
></m-pro--channel-tile>
</li>
</ul>
</ng-container>
<ng-container
*
ngIf=
"type === 'activities'"
>
<pre
*
ngFor=
"let entity of (feedsService.feed | async)"
>
{{entity | async | json}}
</pre>
<!-- talk to Emi about this -->
</ng-container>
<ng-container
*
ngIf=
"type === 'groups'"
>
<pre
*
ngFor=
"let entity of (feedsService.feed | async)"
>
{{entity | async | json}}
</pre>
<!-- TODO: see if we can use old tile, or create a new one based on the old one // use name, avatar and banner -->
</ng-container>
</div>
This diff is collapsed.
Click to expand it.
src/app/modules/pro/channel/list/list.component.scss
View file @
357f9802
...
...
@@ -38,9 +38,6 @@ m-pro--channel-list {
justify-content
:
center
;
align-items
:
center
;
//width: 100px;
//height:
&
:nth-child
(
1
),
&
:nth-child
(
2
)
{
&
>
video
{
width
:
500px
;
...
...
This diff is collapsed.
Click to expand it.
src/app/modules/pro/channel/list/list.component.ts
View file @
357f9802
...
...
@@ -51,7 +51,7 @@ export class ProChannelListComponent implements OnInit {
this
.
load
(
true
);
});
}
}
async
load
(
refresh
:
boolean
=
false
)
{
if
(
refresh
)
{
...
...
This diff is collapsed.
Click to expand it.
src/app/modules/pro/channel/tile/tile.component.scss
0 → 100644
View file @
357f9802
@import
"defaults"
;
m-pro--channel-tile
{
position
:
relative
;
img
{
max-height
:
320px
;
width
:
100%
;
object-fit
:
cover
}
.m-proChannelTile__text
{
position
:
absolute
;
bottom
:
0
;
background-color
:
white
;
color
:
black
;
min-width
:
stretch
;
padding
:
$minds-padding
*
2
$minds-padding
*
2
0
;
font-size
:
20px
;
h2
{
font-size
:
20px
;
line-height
:
20px
;
overflow
:
visible
;
color
:
rgba
(
0
,
0
,
0
,
.75
)
!
important
;
margin
:
0
;
}
p
{
font-size
:
13px
;
text-overflow
:
ellipsis
;
text-rendering
:
auto
;
white-space
:
pre-wrap
;
overflow
:
hidden
;
max-height
:
48px
;
margin
:
8px
0
;
padding
:
0
;
line-height
:
1
.25
;
color
:
#263238
!
important
;
}
a
{
text-decoration
:
none
;
color
:
#333
;
}
}
}
This diff is collapsed.
Click to expand it.
src/app/modules/pro/channel/tile/tile.component.ts
0 → 100644
View file @
357f9802
import
{
Component
,
Input
}
from
'
@angular/core
'
;
@
Component
({
selector
:
'
m-pro--channel-tile
'
,
template
:
`
<img [src]="entity.thumbnail_src">
<div class="m-proChannelTile__text" *ngIf="getTitle() || getText()">
<h2>{{getTitle()}}</h2>
<p [innerHTML]="getText()"></p>
</div>
`
})
export
class
ProTileComponent
{
@
Input
()
entity
:
any
;
static
getType
(
entity
:
any
)
{
return
entity
.
type
===
'
object
'
?
`
${
entity
.
type
}
:
${
entity
.
subtype
}
`
:
entity
.
type
;
}
getTitle
()
{
switch
(
ProTileComponent
.
getType
(
this
.
entity
))
{
case
'
blog
'
:
return
this
.
entity
.
title
;
case
'
object:image
'
:
case
'
object:video
'
:
return
this
.
entity
.
title
&&
this
.
entity
.
title
.
trim
()
!==
''
?
this
.
entity
.
title
:
this
.
entity
.
message
;
default
:
return
''
;
}
}
getText
()
{
switch
(
ProTileComponent
.
getType
(
this
.
entity
))
{
case
'
blog
'
:
return
this
.
entity
.
description
;
case
'
object:image
'
:
case
'
object:video
'
:
return
this
.
entity
.
description
;
default
:
return
''
;
}
}
}
This diff is collapsed.
Click to expand it.
src/app/modules/pro/pro.module.ts
View file @
357f9802
...
...
@@ -11,6 +11,7 @@ import { ProChannelSignupComponent } from "./channel/signup/signup.component";
import
{
MindsFormsModule
}
from
"
../forms/forms.module
"
;
import
{
ProChannelListComponent
}
from
"
./channel/list/list.component
"
;
import
{
ProChannelDonateComponent
}
from
'
./channel/donate/donate.component
'
;
import
{
ProTileComponent
}
from
"
./channel/tile/tile.component
"
;
const
routes
:
Routes
=
[
{
...
...
@@ -45,6 +46,7 @@ const routes: Routes = [
declarations
:
[
ProMarketingComponent
,
ProSubscriptionComponent
,
ProTileComponent
,
ProChannelComponent
,
ProChannelSignupComponent
,
ProChannelListComponent
,
...
...
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