The Wayback Machine - https://web.archive.org/web/20220628124532/https://github.com/GitSquared/edex-ui/pull/953
Skip to content
This repository has been archived by the owner. It is now read-only.

feat: audio, video and pdf reader #953

Merged
merged 12 commits into from Dec 17, 2020

Conversation

ghost-in-the-machine-86
Copy link
Contributor

@ghost-in-the-machine-86 ghost-in-the-machine-86 commented Dec 11, 2020

Implementing audio tag to play music and pdf reader with pdfjs https://github.com/mozilla/pdf.js/ and custom buttons (zoom in/out and previous/next page)

@GitSquared
Copy link
Owner

@GitSquared GitSquared commented Dec 11, 2020

Love the PDF reader! But the audio player seems kind of out-of-place. Could we perhaps style it to fit in a bit more?

@ghost-in-the-machine-86
Copy link
Contributor Author

@ghost-in-the-machine-86 ghost-in-the-machine-86 commented Dec 11, 2020

No problem! I can change it

@KjartanOli
Copy link
Contributor

@KjartanOli KjartanOli commented Dec 12, 2020

I've been doing some testing, and ogg files trigger the video player, not the audio player. Not sure if this is an issue at all.

@GitSquared
Copy link
Owner

@GitSquared GitSquared commented Dec 12, 2020

Not ideal, but no blocking bug either, I'd say.

@KjartanOli
Copy link
Contributor

@KjartanOli KjartanOli commented Dec 12, 2020

Agreed, especialy since that happens because lstat reports the type as video.

@KjartanOli
Copy link
Contributor

@KjartanOli KjartanOli commented Dec 12, 2020

I made an attempt at creating controls for the audio player that fit more with the theme. I don't really like the way the volume controls look, but I haven't found a way to get any kind of speaker symbol that would respect the font colour of the user theme.
edex4
edex5

@GitSquared
Copy link
Owner

@GitSquared GitSquared commented Dec 12, 2020

Woah, those look great! Any chance you two could coordinate on merging those changes? Otherwise, we'd go the two-PRs route.

@KjartanOli
Copy link
Contributor

@KjartanOli KjartanOli commented Dec 12, 2020

That should be possible. @ghost-in-the-machine-86 how would it be best to get these changes to you? Or were you already working on something similar?

@ghost-in-the-machine-86
Copy link
Contributor Author

@ghost-in-the-machine-86 ghost-in-the-machine-86 commented Dec 13, 2020

I did this media player, but i prefer your style @KjartanOli! Maybe i can add volume/progress bars to your player

Captura de tela de 2020-12-12 22-44-30

@KjartanOli
Copy link
Contributor

@KjartanOli KjartanOli commented Dec 13, 2020

Sounds great. I had no idea how to implement those. How should I send my code to you?

@ghost-in-the-machine-86
Copy link
Contributor Author

@ghost-in-the-machine-86 ghost-in-the-machine-86 commented Dec 13, 2020

Idk how can you change my code from here (my first pull request), so i invited you to my repository

@KjartanOli
Copy link
Contributor

@KjartanOli KjartanOli commented Dec 13, 2020

I just pushed my code to you develop branch.

@ghost-in-the-machine-86
Copy link
Contributor Author

@ghost-in-the-machine-86 ghost-in-the-machine-86 commented Dec 13, 2020

thanks!

@GitSquared
Copy link
Owner

@GitSquared GitSquared commented Dec 13, 2020

You'll have to merge develop with master in the fork for changes to appear in this PR!

@ghost-in-the-machine-86
Copy link
Contributor Author

@ghost-in-the-machine-86 ghost-in-the-machine-86 commented Dec 16, 2020

Fixed ogg files to trigger audio player and applied @KjartanOli style to media player with some changes

@GitSquared
Copy link
Owner

@GitSquared GitSquared commented Dec 17, 2020

Is this ready for review?

@ghost-in-the-machine-86
Copy link
Contributor Author

@ghost-in-the-machine-86 ghost-in-the-machine-86 commented Dec 17, 2020

Yes

Copy link
Owner

@GitSquared GitSquared left a comment

image

Works great and looks amazing! Thanks guys.

@GitSquared GitSquared changed the title Audio play and pdf reader feat: audio, video and pdf reader Dec 17, 2020
@GitSquared GitSquared merged commit a445205 into GitSquared:master Dec 17, 2020
3 checks passed
eugene2candy pushed a commit to eugene2candy/edex-ui that referenced this issue Apr 10, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants