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
832
Issues
832
List
Boards
Labels
Service Desk
Milestones
Merge Requests
72
Merge Requests
72
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Packages
Packages
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
4d5c1bd1df0cfe6808490e8c4d0746a42c10beef...78c51325f58a3ed06b4f4110e62386c01baf327b
Source
78c51325f58a3ed06b4f4110e62386c01baf327b
Select Git revision
...
Target
4d5c1bd1df0cfe6808490e8c4d0746a42c10beef
Select Git revision
Compare
Commits (2)
(fix) Firehose frontend fixes
· 3bf27ffe
Brian Hatchet
authored
7 minutes ago
3bf27ffe
Merge branch 'firehose-frontend-fixes' into 'master'
· 78c51325
Mark Harding
authored
7 minutes ago
(fix) Firehose frontend fixes See merge request
!371
78c51325
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
62 additions
and
37 deletions
+62
-37
firehose.component.html
src/app/controllers/admin/firehose/firehose.component.html
+2
-1
firehose.component.scss
src/app/controllers/admin/firehose/firehose.component.scss
+58
-33
firehose.component.spec.ts
...app/controllers/admin/firehose/firehose.component.spec.ts
+1
-1
firehose.component.ts
src/app/controllers/admin/firehose/firehose.component.ts
+1
-2
No files found.
src/app/controllers/admin/firehose/firehose.component.html
View file @
78c51325
...
...
@@ -11,7 +11,8 @@
<m-sort-selector
[
algorithm
]="
algorithm
"
[
period
]="
period
"
[
customType
]="
customType
"
[
allowedCustomTypes
]="['
activities
',
'
images
',
'
videos
',
'
blogs
']"
(
onChange
)="
setSort
($
event
.
algorithm
,
$
event
.
period
,
$
event
.
customType
)"
></m-sort-selector>
</div>
...
...
This diff is collapsed.
Click to expand it.
src/app/controllers/admin/firehose/firehose.component.scss
View file @
78c51325
.m-firehose
{
max-width
:
1280px
;
.m-firehose__moderatorAction
{
display
:
flex
;
align-items
:
center
;
justify-content
:
center
;
padding
:
20px
;
margin-bottom
:
25px
;
max-width
:
270px
;
&
.m-firehose__moderatorAction--leftButton
{
justify-content
:
right
;
}
&
.m-firehose__moderatorAction--rightButton
{
justify-content
:
left
;
}
max-width
:
1280px
;
minds-activity
{
.item-image-video
{
video
{
width
:
100%
;
height
:auto
;
max-height
:
400px
;
}
}
.item-image
{
img
{
width
:
100%
;
max-height
:
400px
;
object-fit
:
contain
;
}
}
.m-firehose__sort-container
{
display
:
flex
;
flex-direction
:
row
;
align-items
:
center
;
justify-content
:
space-between
;
padding
:
12px
;
margin-bottom
:
16px
;
@include
m-theme
(){
background-color
:
themed
(
$m-white
);
minds-rich-embed
{
.thumbnail
{
img
{
width
:
auto
;
max-height
:
400px
;
}
}
}
}
m-sort-selector
{
flex-grow
:
1
;
}
.m-firehose__moderatorAction
{
display
:
flex
;
align-items
:
center
;
justify-content
:
center
;
padding
:
20px
;
margin-bottom
:
25px
;
max-width
:
270px
;
&
.m-firehose__moderatorAction--leftButton
{
justify-content
:
right
;
}
&
.m-firehose__moderatorAction--rightButton
{
justify-content
:
left
;
}
}
.m-firehose__sort-container
{
display
:
flex
;
flex-direction
:
row
;
align-items
:
center
;
justify-content
:
space-between
;
padding
:
12px
;
margin-bottom
:
16px
;
@include
m-theme
(){
background-color
:
themed
(
$m-white
);
}
.m-firehose__spinne
r
{
text-align
:
center
;
m-sort-selecto
r
{
flex-grow
:
1
;
}
}
}
\ No newline at end of file
.m-firehose__spinner
{
text-align
:
center
;
}
}
This diff is collapsed.
Click to expand it.
src/app/controllers/admin/firehose/firehose.component.spec.ts
View file @
78c51325
...
...
@@ -28,7 +28,7 @@ class MindsActivityMockComponent {
class
MindsSortSelectorMockComponent
{
@
Input
()
algorithm
:
string
;
@
Input
()
period
:
string
;
@
Input
()
customType
:
string
;
@
Input
()
allowedCustomTypes
:
Array
<
string
>
;
@
Output
()
onChange
:
EventEmitter
<
any
>
=
new
EventEmitter
<
any
>
();
}
...
...
This diff is collapsed.
Click to expand it.
src/app/controllers/admin/firehose/firehose.component.ts
View file @
78c51325
...
...
@@ -60,7 +60,7 @@ export class AdminFirehoseComponent implements OnInit, OnDestroy {
this
.
algorithm
=
'
top
'
;
this
.
updateSortRoute
();
}
this
.
entity
=
null
;
this
.
load
();
});
...
...
@@ -83,7 +83,6 @@ export class AdminFirehoseComponent implements OnInit, OnDestroy {
try
{
const
url
=
`api/v2/admin/firehose/
${
this
.
algorithm
}
/
${
this
.
customType
}
?hashtags=
${
hashtags
}
&period=
${
period
}
&all=
${
all
}
`
;
console
.
log
(
url
);
const
response
:
any
=
await
this
.
client
.
get
(
url
);
this
.
entities
=
response
.
entities
;
...
...
This diff is collapsed.
Click to expand it.