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.

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

feat(editors): redesign editors #5675

Merged
merged 1 commit into from
Feb 20, 2024
Merged

feat(editors): redesign editors #5675

merged 1 commit into from
Feb 20, 2024

Conversation

st3iny
Copy link
Member

@st3iny st3iny commented Jan 9, 2024

Fix #3543

Screenshots

Simple Editor

Read-only Edit mode View Mode
simple-ro simple-rw-edit simple-rw-view

Sidebar Editor

Header Attachments Read-only
sidebar-rw attachments sidebar-ro

Invitations

I moved the invitation response button below the date and time fields. They looked a bit awkward at the bottom.

Simple Sidebar
simple-invitation sidebar-invitation

TODO

  • Sidebar redesign
  • Attachments redesign
  • Fix conflicts

@st3iny st3iny added 2. developing Work in progress design Related to design, interface, interaction design, UX, etc. enhancement New feature request Feature: Editor labels Jan 9, 2024
@st3iny st3iny self-assigned this Jan 9, 2024
Copy link

codecov bot commented Jan 9, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (dba8c91) 24.48% compared to head (3369fc8) 24.19%.
Report is 7 commits behind head on main.

Additional details and impacted files
@@             Coverage Diff              @@
##               main    #5675      +/-   ##
============================================
- Coverage     24.48%   24.19%   -0.29%     
  Complexity      423      423              
============================================
  Files           243      243              
  Lines         10954    11005      +51     
  Branches       1803     1825      +22     
============================================
- Hits           2682     2663      -19     
- Misses         8272     8342      +70     
Flag Coverage Δ
javascript 15.11% <ø> (-0.31%) ⬇️
php 61.97% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@st3iny st3iny force-pushed the feat/editor/redesign-editors branch from 91b7a0b to 77e8265 Compare January 22, 2024 15:05
@st3iny st3iny changed the title wip! feat(editors): redesign editors feat(editors): redesign editors Jan 22, 2024
@st3iny st3iny marked this pull request as ready for review January 22, 2024 18:05
@st3iny st3iny added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Jan 22, 2024
Copy link
Contributor

@GretaD GretaD left a comment

Choose a reason for hiding this comment

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

it looks like in the screenshots, and no errors were shown. 🥳

@GretaD
Copy link
Contributor

GretaD commented Jan 26, 2024

ah, i have this warning while building:

WARNING in ./node_modules/moment/min/moment-with-locales.js 2159:16-50 Module not found: Error: Can't resolve './locale' in '/var/www/nextcloud/server/apps/calendar/node_modules/moment/min' @ ./node_modules/@nextcloud/moment/dist/index.mjs 1:0-50 2:0-65 6:0-8 9:58-72 9:73-81 15:0-17:2 @ ./src/filters/dateRangeFormat.js 22:0-39 36:13-19 39:16-22 40:14-20 43:13-19 47:13-19 @ ./src/services/windowTitleService.js 22:0-60 42:18-33 @ ./src/main.js 41:0-66 67:0-18

@st3iny
Copy link
Member Author

st3iny commented Jan 26, 2024

ah, i have this warning while building:

WARNING in ./node_modules/moment/min/moment-with-locales.js 2159:16-50 Module not found: Error: Can't resolve './locale' in '/var/www/nextcloud/server/apps/calendar/node_modules/moment/min' @ ./node_modules/@nextcloud/moment/dist/index.mjs 1:0-50 2:0-65 6:0-8 9:58-72 9:73-81 15:0-17:2 @ ./src/filters/dateRangeFormat.js 22:0-39 36:13-19 39:16-22 40:14-20 43:13-19 47:13-19 @ ./src/services/windowTitleService.js 22:0-60 42:18-33 @ ./src/main.js 41:0-66 67:0-18

Yeah, that is likely related to a recent bump of nextcloud/moment #5699. I'll have a look next week but it should not be related to this PR.

I'll also fix js unit tests ASAP.

@st3iny
Copy link
Member Author

st3iny commented Jan 29, 2024

The warning is unrelated (also on main) and will be fixed in #5722.

@st3iny st3iny force-pushed the feat/editor/redesign-editors branch from 0ca10aa to 201da78 Compare January 29, 2024 12:13
@st3iny st3iny added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jan 29, 2024
@st3iny st3iny added this to the v4.7.0 milestone Jan 29, 2024
@st3iny st3iny added the blocked This ticket or PR is blocked by another one label Jan 29, 2024
@st3iny
Copy link
Member Author

st3iny commented Jan 29, 2024

Blocked until the nextcloud/vue 8 migration was merged.

Copy link
Member

@nimishavijay nimishavijay left a comment

Choose a reason for hiding this comment

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

This is super super cool! :D really great :) Some minor comments:

  • The title of the event could be more eye catching, so it could be bold and even in bigger font size
  • All the icons on the left could be center aligned. Currently the icon of the details are slightly more to the left, the icon of the calendar on top is a bit to the right, and the icons in the top and bottom section in the sidebar are slightly misaligned. All these should ideally be center aligned :) (suggestion: add some left margin for the details elements in the card and the top section of the sidebar)
  • There should also be an icon for the date time, it could be the event MDI icon

Nice-to-haves that are not in the original mockups:

  • if there is no recurrence, the "No recurrence" wording can be changed to "Does not repeat" to keep it simple
  • Use a edit icon for the edit button
  • Use a done icon for the save button

Regarding the accept/reject/tentative buttons:

  • You are right, placing it directly as the last row looks off. I am not sure about placing such bold buttons in the middle of the card either. How about placing it as the second-last row and making the edit button a tertiary button?
  • Hide accept/decline/reject buttons in edit mode

Artboard-2

Or alternatively no full width buttons, but all right justified
Artboard-1

What do you think? Also pinging the rest of @nextcloud/designers for your thoughts on the accept buttons :)

@szaimen
Copy link
Contributor

szaimen commented Jan 30, 2024

Or alternatively no full width buttons, but all right justified
Artboard-1

I like this one. It is not so much in your face compared to the other one 😅

@ChristophWurst ChristophWurst added 2. developing Work in progress and removed 4. to release Ready to be released and/or waiting for tests to finish labels Feb 1, 2024
@st3iny st3iny dismissed nimishavijay’s stale review February 5, 2024 09:08

Feedback has been addressed. This PR is still waiting for the nc/vue upgrade.

Signed-off-by: Richard Steinmetz <[email protected]>
@st3iny st3iny force-pushed the feat/editor/redesign-editors branch from 4bf540c to 3369fc8 Compare February 20, 2024 15:41
@st3iny st3iny added 4. to release Ready to be released and/or waiting for tests to finish and removed 2. developing Work in progress blocked This ticket or PR is blocked by another one labels Feb 20, 2024
@st3iny st3iny enabled auto-merge February 20, 2024 15:43
@st3iny st3iny merged commit 94d3b8f into main Feb 20, 2024
39 of 40 checks passed
@st3iny st3iny deleted the feat/editor/redesign-editors branch February 20, 2024 15:47
@skjnldsv
Copy link
Member

skjnldsv commented Jul 7, 2024

Oh, I just realized we don't have the illustrations on the sidebar anymore :(
I loved those!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish design Related to design, interface, interaction design, UX, etc. enhancement New feature request Feature: Editor
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Event details design improvements
6 participants