frontend: fix mobile view of materialLists #3996
Merged
Conversation
This file contains 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
Navigate to the list of materiallists in the NavBottombar. Add new view for the list of materiallists to navigate to the details of one materiallist. Rename the views/admin/(,Admin)MaterialLists component to avoid name clash with the new component. Add quick way to differentiate the target routes in the materialListRoute helper for the NavBottombar and NavTopbar. May have been introduced in ecamp#3841. Also add guard if camp is not loaded to materialListRoute.
⛔ Feature branch deployment currently inactive.If the PR is still open, you can add the |
carlobeltrame
approved these changes
Oct 21, 2023
| @@ -3,7 +3,7 @@ Show all material lists for a camp on mobile | |||
| --> | |||
There was a problem hiding this comment.
Update or delete the comment on the line above this
Comment on lines
+7
to
+15
| <template v-if="!isGuest" #title-actions> | ||
| <DialogMaterialListCreate :camp="camp()"> | ||
| <template #activator="{ on }"> | ||
| <ButtonAdd class="mr-n2" height="32" v-on="on" | ||
| >{{ $tc('global.button.create') }} | ||
| </ButtonAdd> | ||
| </template> | ||
| </DialogMaterialListCreate> | ||
| </template> |
There was a problem hiding this comment.
So you actively decided to keep this button in this view?
manuelmeister
approved these changes
Oct 21, 2023
There was a problem hiding this comment.
Thanks for the fix. I think my change requests can be done in the followup issue #3997
| camp: campFromRoute(route), | ||
| }), | ||
| }, | ||
| }, |
There was a problem hiding this comment.
I think material/lists should move to the camp route object as a child. (But not material/all as it needs the sidebar.
Comment on lines
+540
to
547
| if (camp._meta.loading) return {} | ||
| if (typeof materialListOrRoute === 'string') { | ||
| return { | ||
| name: 'material/overview', | ||
| name: `material${materialListOrRoute}`, | ||
| params: { campId: camp.id, campTitle: slugify(camp.title) }, | ||
| query, | ||
| } | ||
| } |
There was a problem hiding this comment.
/all and /lists should probably move to campRoute and have a route name prefix "camp/material/$1"
carlobeltrame
temporarily deployed
to
feature-branch
GitHub Actions
Inactive
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #3899
Navigate to the list of materiallists in the NavBottombar. Add new view for the list of materiallists
to navigate to the details of one materiallist.
Rename the views/admin/(,Admin)MaterialLists component to avoid name clash with the new component.
Add quick way to differentiate the target routes in the materialListRoute helper for the NavBottombar and NavTopbar.
May have been introduced in #3841.
Also add guard if camp is not loaded to materialListRoute.