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

Add support for categories #1540

Merged
merged 1 commit into from
Oct 26, 2019
Merged

Add support for categories #1540

merged 1 commit into from
Oct 26, 2019

Conversation

georgehrke
Copy link
Member

@georgehrke georgehrke commented Oct 19, 2019 •
edited
Loading

fixes #107

ToDo:

  • read only view is missing

6CF201B5-1891-4898-8984-55D3786F2B33

B98F2439-E10D-459F-B4AC-D0A387885A9A

@georgehrke georgehrke added the 2. developing Work in progress label Oct 19, 2019
@georgehrke georgehrke added this to the 2.0.0 beta2 milestone Oct 19, 2019
@georgehrke georgehrke changed the title add list of default categories Add support for categories Oct 19, 2019
@georgehrke
Copy link
Member Author

Requires: nextcloud/calendar-js#38

@georgehrke georgehrke force-pushed the feature/107/categories branch 2 times, most recently from 28a505f to 0dc732d Compare October 21, 2019 14:30
@georgehrke
Copy link
Member Author

I also added an indicator in the calendar-grid view, but I'm not 100% sure about that.

3BDCD0F7-7D77-4EB8-A9D1-68E29FDAE97B

@georgehrke
Copy link
Member Author

@tcitworld What do you think about the indicator in the calendar-grid?

georgehrke
georgehrke commented Oct 21, 2019
View reviewed changes
src/components/Editor/Properties/PropertySelectMultiple.vue Outdated
return this.propModel.options
},
foo() {
return uidToColor('abc')
Copy link
Member Author

Choose a reason for hiding this comment

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

Remove me

@tcitworld
Copy link
Member

Can we ask to move @skjnldsv's uidToColor.js into a common @nextcloud package?

@georgehrke
Copy link
Member Author

georgehrke commented Oct 21, 2019 •
edited
Loading

Can we ask to move @skjnldsv's uidToColor.js into a common nextcloud package?

Yes. Please. We were wondering earlier whether to put it into a dedicated package or just nextcloud/vue

@georgehrke
Copy link
Member Author

(Damn, npm naming, sorry for mentioning everyone)

@tcitworld
Copy link
Member

tcitworld commented Oct 21, 2019 •
edited
Loading

What do you think about the indicator in the calendar-grid?

I've never seen any indicator apart from the thunderbird screenshot in the issue, so I'm not sure how much it would be useful.

Maybe we should get it consistent with nextcloud/server#13330 and nextcloud/server#6778 (even though it's not really the same thing)?

@skjnldsv
Copy link
Member

skjnldsv commented Oct 22, 2019 •
edited
Loading

Yes. Please. We were wondering earlier whether to put it into a dedicated package or just nextcloud/vue

Currently it's already in @nextcloud/vue :)
Just not exported https://github.com/nextcloud/nextcloud-vue/blob/master/src/utils/GenColors.js

@jancborchardt
Copy link
Member

With so many full-on colors, it probably makes sense to maybe look into using a similar way of coloring as macOS Calendar, with the events by default not being full-saturation (but only the active one):

More: https://support.apple.com/en-euro/guide/calendar/welcome/mac

@georgehrke
Copy link
Member Author

@jancborchardt How is that related to categories? :)

@jancborchardt
Copy link
Member

jancborchardt commented Oct 22, 2019 •
edited
Loading

Sorry, that was in reference to your comment above at #1540 (comment)

So basically I meant to say: Let’s not put any indicators in the view for now, especially when it comes to color. We have more stuff to clean up before we put stuff in again. :)

@georgehrke georgehrke force-pushed the feature/107/categories branch from 5b39aaf to 0435291 Compare October 24, 2019 11:46
@georgehrke
add list of default categories
351c0b0 
Signed-off-by: Georg Ehrke <[email protected]>

Add PropertySelectMultiple

Signed-off-by: Georg Ehrke <[email protected]>

Add Categories to EditorSidebar

Signed-off-by: Georg Ehrke <[email protected]>

Add category indicator to calendar-grid

Signed-off-by: Georg Ehrke <[email protected]>

Revert "Add category indicator to calendar-grid"

This reverts commit d71a70e.

Signed-off-by: Georg Ehrke <[email protected]>

Read-only version of category picker

Signed-off-by: Georg Ehrke <[email protected]>
@georgehrke georgehrke force-pushed the feature/107/categories branch from 0435291 to 351c0b0 Compare October 26, 2019 11:18
@georgehrke georgehrke added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Oct 26, 2019
@georgehrke georgehrke requested a review from tcitworld October 26, 2019 11:19
@georgehrke
Copy link
Member Author

I removed the indicator in the calendar-grid for now and added a read-only version:
BC208BD7-FBE3-48BF-990F-A45859A261B8

jancborchardt
jancborchardt approved these changes Oct 26, 2019
View reviewed changes
Copy link
Member

@jancborchardt jancborchardt left a comment

Choose a reason for hiding this comment

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

Nice nice!

tcitworld
tcitworld approved these changes Oct 26, 2019
View reviewed changes
Copy link
Member

@tcitworld tcitworld left a comment

Choose a reason for hiding this comment

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

I opened #1585 and #1587 but we can get this in.

@georgehrke georgehrke merged commit 5ce1704 into master Oct 26, 2019
@georgehrke georgehrke deleted the feature/107/categories branch October 26, 2019 13:46
@devillemereuil devillemereuil mentioned this pull request Oct 27, 2019
Closed
@Malspherus Malspherus mentioned this pull request Jan 31, 2020
Open
@fechnert fechnert mentioned this pull request Feb 23, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tcitworld tcitworld tcitworld approved these changes

@jancborchardt jancborchardt jancborchardt approved these changes

Assignees
No one assigned
Labels
3. to review Waiting for reviews
Projects
None yet
Milestone
2.0.0 beta2
Development

Successfully merging this pull request may close these issues.

Request: Support for CATEGORIES field
4 participants
@georgehrke @tcitworld @skjnldsv @jancborchardt