Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
PortalMEC-React
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
PortalMEC
PortalMEC-React
Commits
edae67eb
Commit
edae67eb
authored
4 years ago
by
Raul Almeida
Browse files
Options
Downloads
Patches
Plain Diff
WIP Collection Page
parent
000a303d
No related branches found
No related tags found
5 merge requests
!57
Merge of develop into master
,
!56
Fixed buttons reportar, seguir, compartilhar, guardar and entrar (in comments...
,
!39
Update admin system
,
!32
Homologa
,
!23
Tela de coleção
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/Components/CollectionAuthor.js
+15
-2
15 additions, 2 deletions
src/Components/CollectionAuthor.js
src/Pages/CollectionPage.js
+1
-0
1 addition, 0 deletions
src/Pages/CollectionPage.js
with
16 additions
and
2 deletions
src/Components/CollectionAuthor.js
+
15
−
2
View file @
edae67eb
...
@@ -19,6 +19,7 @@ along with Plataforma Integrada MEC. If not, see <http://www.gnu.org/licenses/>
...
@@ -19,6 +19,7 @@ along with Plataforma Integrada MEC. If not, see <http://www.gnu.org/licenses/>
import
React
from
'
react
'
;
import
React
from
'
react
'
;
import
{
Grid
}
from
'
@material-ui/core
'
;
import
{
Grid
}
from
'
@material-ui/core
'
;
import
styled
from
'
styled-components
'
;
import
styled
from
'
styled-components
'
;
import
{
Link
}
from
'
react-router-dom
'
;
import
CircularProgress
from
'
@material-ui/core/CircularProgress
'
;
import
CircularProgress
from
'
@material-ui/core/CircularProgress
'
;
import
LinearProgress
from
'
@material-ui/core/LinearProgress
'
;
import
LinearProgress
from
'
@material-ui/core/LinearProgress
'
;
...
@@ -30,13 +31,19 @@ export default function CollectionAuthor(props) {
...
@@ -30,13 +31,19 @@ export default function CollectionAuthor(props) {
justify
=
"
center
"
justify
=
"
center
"
alignItems
=
"
center
"
>
alignItems
=
"
center
"
>
{
props
.
imgsrc
?
{
props
.
imgsrc
?
<
UserAvatar
src
=
{
props
.
imgsrc
}
/
>
<
UserLink
to
=
{
`/usuario-publico/
${
props
.
author_id
}
`
}
>
<
UserAvatar
src
=
{
props
.
imgsrc
}
/
>
<
/UserLink
>
:
:
<
CircularProgress
color
=
"
secondary
"
/>
<
CircularProgress
color
=
"
secondary
"
/>
}
}
<
InfoText
>
Coleção
organizada
por
:
<
/InfoText
>
<
InfoText
>
Coleção
organizada
por
:
<
/InfoText
>
{
props
.
name
?
{
props
.
name
?
<
UserName
>
{
props
.
name
}
<
/UserName
>
<
UserLink
to
=
{
`/usuario-publico/
${
props
.
author_id
}
`
}
>
<
UserName
>
{
props
.
name
}
<
/UserName
>
<
/UserLink
>
:
:
<
CircularProgress
/>
<
CircularProgress
/>
}
}
...
@@ -58,3 +65,9 @@ const UserName = styled.h1`
...
@@ -58,3 +65,9 @@ const UserName = styled.h1`
margin-top: 10px;
margin-top: 10px;
color: #673ab7;
color: #673ab7;
`
`
const
UserLink
=
styled
(
Link
)
`
text-decoration: none;
&:focus, &:hover, &:visited, &:link, &:active {
text-decoration: none;
}
`
This diff is collapsed.
Click to expand it.
src/Pages/CollectionPage.js
+
1
−
0
View file @
edae67eb
...
@@ -56,6 +56,7 @@ export default function CollectionPage(props) {
...
@@ -56,6 +56,7 @@ export default function CollectionPage(props) {
<
Grid
item
xs
=
{
10
}
md
=
{
3
}
>
<
Grid
item
xs
=
{
10
}
md
=
{
3
}
>
<
CollectionAuthor
<
CollectionAuthor
author_id
=
{
collection
.
owner
?
collection
.
owner
.
id
:
0
}
name
=
{
collection
.
owner
?
collection
.
owner
.
name
:
""
}
name
=
{
collection
.
owner
?
collection
.
owner
.
name
:
""
}
imgsrc
=
{
collection
.
owner
?
apiDomain
+
collection
.
owner
.
avatar
:
''
}
/
>
imgsrc
=
{
collection
.
owner
?
apiDomain
+
collection
.
owner
.
avatar
:
''
}
/
>
<
/Grid>
<
/Grid>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment