-
Notifications
You must be signed in to change notification settings - Fork 906
Remote Content Browsing: Clean the library page when displaying other available libraries #10354
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
1ee19e2
fixes device icon
AllanOXDi 0e7023f
fixes device router
AllanOXDi d1610cc
fixed the number of channels not rendering on the cards
AllanOXDi 0d443e2
fixes pinned devices channels
AllanOXDi 23c94a3
removed hard coded pinned devices
AllanOXDi 651c1df
removed unncessary check on devices
AllanOXDi 00cd371
implemented the dry principal
AllanOXDi f381b95
Used props on the morenetworkdevices component
AllanOXDi 4c9199e
fixes chanells not displaying corectly
AllanOXDi f792bf5
deleted unused component
AllanOXDi 29112e0
changed the prop name
AllanOXDi 091de96
utilised syncElementStrings instead of the translatable string
AllanOXDi f72f107
removed commented code and console logs
AllanOXDi 7ac1d90
changed to refresh string to read from corestrings
AllanOXDi d74f0c8
added explore cards
AllanOXDi deee779
routing of the card to the explorer library
AllanOXDi 81d5f0e
fixing failing test
AllanOXDi 6b061bc
fixing failing test
AllanOXDi 46610c4
changed the naming of the prop
AllanOXDi File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
88 changes: 0 additions & 88 deletions
88
kolibri/plugins/learn/assets/src/views/LibraryPage/CardContent.vue
This file was deleted.
Oops, something went wrong.
81 changes: 81 additions & 0 deletions
81
kolibri/plugins/learn/assets/src/views/LibraryPage/ExploreCard.vue
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| <template> | ||
|
|
||
| <router-link | ||
| :to="exploreLibraries" | ||
| class="card-main-wrapper" | ||
| > | ||
| <div class="cards" style="height:270px;"> | ||
| <div> | ||
| <div class="card-title"> | ||
| <h1> | ||
| {{ coreString('explore') }} | ||
| </h1> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </router-link> | ||
|
|
||
| </template> | ||
|
|
||
|
|
||
| <script> | ||
|
|
||
| import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings'; | ||
| import { PageNames } from './../../constants'; | ||
|
|
||
| export default { | ||
| name: 'ExploreCard', | ||
| mixins: [commonCoreStrings], | ||
| computed: { | ||
| exploreLibraries() { | ||
| return { name: PageNames.EXPLORE_LIBRARIES }; | ||
| }, | ||
| }, | ||
| created() {}, | ||
| methods: {}, | ||
| }; | ||
|
|
||
| </script> | ||
|
|
||
|
|
||
| <style lang="scss" scoped> | ||
|
|
||
| @import '~kolibri-design-system/lib/styles/definitions'; | ||
|
|
||
| $margin: 16px; | ||
|
|
||
| .card-main-wrapper { | ||
| @extend %dropshadow-1dp; | ||
|
|
||
| position: relative; | ||
| display: inline-block; | ||
| width: 100%; | ||
| max-height: 270px; | ||
| padding-bottom: $margin; | ||
| text-decoration: none; | ||
| vertical-align: top; | ||
| border-radius: $radius; | ||
| transition: box-shadow $core-time ease; | ||
|
|
||
| &:hover { | ||
| @extend %dropshadow-8dp; | ||
| } | ||
|
|
||
| &:focus { | ||
| outline-width: 4px; | ||
| outline-offset: 6px; | ||
| } | ||
| } | ||
|
|
||
| .cards { | ||
| margin: auto; | ||
| text-align: center; | ||
| } | ||
|
|
||
| .card-title { | ||
| margin: auto; | ||
| margin-top: 100px; | ||
| letter-spacing: normal; | ||
| } | ||
|
|
||
| </style> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think you may want to use a link that goes directly to the library of this device, similar to what @akolson uses within the
LibraryItemTo me, if the user is clicking on the explore within a particular library, it seems helpful to bring them to that specific library, rather than the entire "explore libraries" page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That was my initial thought. But when I was chatting with @akolson about this. He suggested that we should route to explore Library page. If I got him right. we could make a follow up issue to address this in a different PR. As this PR is just to display the remote content on the library page?
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @AllanOXDi, I think I didn't understand the context of your question, my apologies, but Marcella is right about how this should be implemented and swapping out the current
exploreLibrariesproperty for thelibraryPageRouteproperty as suggested Marcella should do the trick without having to open a different PR as i think we already have adevivcIdprop withinLibraryPagecomponent. Please confirm this if you get to proceed with this :)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great! Thanks, I have updated it.