Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Show shared forms on navigation #763

Merged
merged 5 commits into from
Feb 26, 2021
Merged

Show shared forms on navigation #763

merged 5 commits into from
Feb 26, 2021

Conversation

jotoeri
Copy link
Member

@jotoeri jotoeri commented Feb 1, 2021 •
edited
Loading

Show the shared forms on navigation. Implements #364

  • API Docs are still missing.
  • Probably better split API to have getForms & getSharedForms, which might somewhen be extended with e.g. shared Results

grafik
grafik

@jotoeri jotoeri added enhancement New feature or request 2. developing Work in progress labels Feb 1, 2021
@jotoeri jotoeri force-pushed the enh/show_shared_forms branch 12 times, most recently from 292f12b to d8e25c1 Compare February 7, 2021 15:05
@jotoeri

This comment has been minimized.

Sign in to view
@jotoeri

This comment has been minimized.

Sign in to view
@jotoeri jotoeri linked an issue Feb 11, 2021 that may be closed by this pull request
Show forms that are shared with me on the navigation #364
Closed
@skjnldsv
Copy link
Member

Should probably be "My forms" instead. cc @jancborchardt

@jotoeri jotoeri force-pushed the enh/show_shared_forms branch from f39287f to a823386 Compare February 17, 2021 15:35
@jotoeri
Copy link
Member Author

jotoeri commented Feb 17, 2021 •
edited
Loading

Should probably be "My forms" instead. cc @jancborchardt

Yeah, if you have a look onto the first two pictures of my prev. comment, this is already 'Your Forms' and 'Shared with you', as Jan told me.

I think the most important question is for now: How do we list the forms on navigation? @jancborchardt @skjnldsv

  • Collapsable Navigation Item? Maybe with a decreased inset, as on the last picture of my previous comment? @skjnldsv Do you think we would get that through on vue-components? (This is my favourite)
  • Non-Collapsable just listed with AppNavigationCaption (w/o icon) or with AppNavigationItem (w/ icon)

@jotoeri jotoeri marked this pull request as ready for review February 17, 2021 16:17
@jotoeri jotoeri requested review from jancborchardt and skjnldsv and removed request for jancborchardt February 17, 2021 16:17
@jotoeri jotoeri force-pushed the enh/show_shared_forms branch from a823386 to 1bbea36 Compare February 21, 2021 21:39
@jancborchardt
Copy link
Member

I think this one you posted looks most proper @jotoeri? It’s similar to the Settings with "Personal" and "Admin" headings in the nav, isn’t that in the components as well? Cause the headings themselves actually do not need to be selectable entries, just separators.

image

@jotoeri jotoeri force-pushed the enh/show_shared_forms branch 2 times, most recently from 39b2df3 to 08849e8 Compare February 22, 2021 14:28
@jotoeri
Copy link
Member Author

jotoeri commented Feb 22, 2021 •
edited
Loading

Yes, it's also a component. I would have liked more to have a collapsable solution, as e.g. Deck uses for 'All Boards'/'Archived Boards'. But ok. Now its the Caption-Version.

grafik
grafik

skjnldsv
skjnldsv requested changes Feb 23, 2021
View reviewed changes
src/Forms.vue Outdated Show resolved Hide resolved
@jotoeri jotoeri force-pushed the enh/show_shared_forms branch from 933254e to 0053b90 Compare February 23, 2021 17:02
@jotoeri jotoeri requested a review from skjnldsv February 23, 2021 17:09
@jotoeri jotoeri force-pushed the enh/show_shared_forms branch 3 times, most recently from e311b96 to 9b23728 Compare February 24, 2021 00:58
@jotoeri
Copy link
Member Author

jotoeri commented Feb 24, 2021

Just thougth about the access stuff again, to fix the redirect-thing #539. As it also clarifies/secures the work & code here, i squashed it in here, instead of a separate PR, that would change the changes of this PR afterwards.
Sorry for this change after the first review. The result here just seems to be more clear & clean to me. 🙈

@jotoeri jotoeri linked an issue Feb 24, 2021 that may be closed by this pull request
Forms link shows error when not logged in and shared with users #539
Closed
skjnldsv
skjnldsv reviewed Feb 24, 2021
View reviewed changes
src/Forms.vue Outdated Show resolved Hide resolved
@jotoeri jotoeri force-pushed the enh/show_shared_forms branch from 4ac1750 to 2eedc3d Compare February 24, 2021 09:44
@jotoeri jotoeri requested a review from skjnldsv February 24, 2021 09:46
@jotoeri jotoeri added this to the 2.2 milestone Feb 24, 2021
@jotoeri jotoeri force-pushed the enh/show_shared_forms branch from 171d43b to a0efe7d Compare February 24, 2021 23:08
@jotoeri
Copy link
Member Author

jotoeri commented Feb 24, 2021

Just added and already squashed one more small fix, that i just found: 171d43b

@jotoeri jotoeri mentioned this pull request Feb 24, 2021
Merged
skjnldsv
skjnldsv reviewed Feb 25, 2021
View reviewed changes
src/Forms.vue Outdated Show resolved Hide resolved
src/Forms.vue Show resolved Hide resolved
src/Forms.vue Outdated Show resolved Hide resolved
@jotoeri jotoeri mentioned this pull request Feb 25, 2021
Closed
@jotoeri
API return shared forms
1b26246 
Signed-off-by: Jonas Rittershofer <[email protected]>
@jotoeri
Include shared forms into Sidebar
437155a 
Signed-off-by: Jonas Rittershofer <[email protected]>
@jotoeri
Split Content/AppContent for Submit
5e0d88c 
Having separate Components to reuse AppContent
Signed-off-by: Jonas Rittershofer <[email protected]>
@jotoeri
Internal Submit-View
df243e4 
Signed-off-by: Jonas Rittershofer <[email protected]>
@jotoeri
Clarify Access, redirect if necessary, show EmptyContents if wanted
af0c72c 
Empty-Content if noForms
Empty-Content if unaccessable hash
Empty-Content if user can't submit anymore.
Reset Empty-Content and data, when switching form

Signed-off-by: Jonas Rittershofer <[email protected]>
@jotoeri jotoeri force-pushed the enh/show_shared_forms branch from abffe91 to af0c72c Compare February 25, 2021 14:59
@jotoeri jotoeri requested a review from skjnldsv February 25, 2021 15:03
skjnldsv
skjnldsv approved these changes Feb 26, 2021
View reviewed changes
Copy link
Member

@skjnldsv skjnldsv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good for me! Please rebase 🚀

@skjnldsv
Copy link
Member

skjnldsv commented Feb 26, 2021 •
edited
Loading

Ah, sorry, I thought I saw a fixup! ALl good then! 🚢

@skjnldsv skjnldsv merged commit 0172836 into master Feb 26, 2021
@skjnldsv skjnldsv deleted the enh/show_shared_forms branch February 26, 2021 08:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nickvergessen nickvergessen nickvergessen left review comments

@skjnldsv skjnldsv skjnldsv approved these changes

@jancborchardt jancborchardt Awaiting requested review from jancborchardt

Assignees
No one assigned
Labels
3. to review Waiting for reviews enhancement New feature or request
Projects
None yet
Milestone
2.2
5 participants
@jotoeri @skjnldsv @jancborchardt @codecov-io @nickvergessen