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
227b8a0d
Commit
227b8a0d
authored
4 years ago
by
Lucas Eduardo Schoenfelder
Browse files
Options
Downloads
Patches
Plain Diff
now with audio player...
parent
9cb14a7c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
3 merge requests
!57
Merge of develop into master
,
!56
Fixed buttons reportar, seguir, compartilhar, guardar and entrar (in comments...
,
!24
Tela recurso
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/Components/ResourcePageComponents/TextoObjeto.js
+27
-0
27 additions, 0 deletions
src/Components/ResourcePageComponents/TextoObjeto.js
src/Pages/ResourcePage.js
+5
-1
5 additions, 1 deletion
src/Pages/ResourcePage.js
with
32 additions
and
1 deletion
src/Components/ResourcePageComponents/TextoObjeto.js
+
27
−
0
View file @
227b8a0d
...
...
@@ -105,6 +105,16 @@ export default function TextoObjeto (props) {
<
span
className
=
{
"
dado-recurso
"
}
>
{
props
.
downloadCount
}
<
/span
>
<
/span
>
{
(
props
.
attachments
[
0
].
mime_type
===
"
/audio/mpeg
"
||
props
.
attachments
[
0
].
format
===
"
audio
"
)
&&
<
div
className
=
"
recurso-container-audio
"
>
<
audio
controls
className
=
"
audio audio-objeto
"
>
<
source
src
=
{
props
.
audioUrl
}
type
=
"
audio/mp3
"
/>
<
/audio
>
<
/div
>
}
{
/*|| checkUserRole('publisher')*/
}
{
props
.
stateRecurso
===
"
submitted
"
&&
...
...
@@ -191,4 +201,21 @@ const TextoObjetoDiv = styled.div`
border-radius: 4px;
font-size : 14px;
}
.recurso-container-audio {
width : 100%;
margin-top : 20px;
.audio-objeto {
height : 32px;
width : 100%;
margin : 10px 0 8px 0;
background-color : #e5e5e5;
}
.audio {
display : inline-block;
vertical-align : baseline;
}
}
`
This diff is collapsed.
Click to expand it.
src/Pages/ResourcePage.js
+
5
−
1
View file @
227b8a0d
...
...
@@ -30,6 +30,8 @@ import noAvatar from "../img/default_profile.png";
import
Snackbar
from
'
@material-ui/core/Snackbar
'
;
import
MuiAlert
from
'
@material-ui/lab/Alert
'
;
import
VideoPlayer
from
'
../Components/ResourcePageComponents/VideoPlayer.js
'
import
LoadingSpinner
from
'
../Components/LoadingSpinner.js
'
export
function
Alert
(
props
)
{
return
<
MuiAlert
elevation
=
{
6
}
variant
=
"
filled
"
{...
props
}
/>
;
...
...
@@ -96,7 +98,7 @@ export default function LearningObjectPage (props){
{
carregando
?
(
<
span
>
carregando
<
/span
>
<
LoadingSpinner
text
=
{
"
Carregando Recurso
"
}
/
>
)
:
(
...
...
@@ -150,6 +152,8 @@ export default function LearningObjectPage (props){
downloadCount
=
{
recurso
.
downloads_count
}
id
=
{
recurso
.
publisher
?
recurso
.
publisher
.
id
:
undefined
}
stateRecurso
=
{
recurso
.
state
}
attachments
=
{
recurso
.
attachments
}
audioUrl
=
{
recurso
.
default_attachment_location
}
/
>
<
/div
>
{
/*adicionar funcionalidade nos botoes do footer*/
}
...
...
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