Skip to content

Add a provider for linked collaboration resources#1611

Merged
nickvergessen merged 20 commits into
masterfrom
feature/noid/linked-collaboration-resources
Mar 29, 2019
Merged

Add a provider for linked collaboration resources#1611
nickvergessen merged 20 commits into
masterfrom
feature/noid/linked-collaboration-resources

Conversation

@nickvergessen

@nickvergessen nickvergessen commented Mar 13, 2019 •
edited by juliusknorr
Loading

Copy link
Copy Markdown
Member

image
image
image

@nickvergessen nickvergessen added this to the 💚 Next Major milestone Mar 13, 2019
@nickvergessen
nickvergessen force-pushed the feature/noid/linked-collaboration-resources branch 3 times, most recently from 4915b8b to e153883 Compare March 14, 2019 11:36
juliusknorr
juliusknorr reviewed Mar 14, 2019
View reviewed changes
Comment thread lib/Collaboration/Resources/ConversationProvider.php Outdated
juliusknorr
juliusknorr reviewed Mar 22, 2019
View reviewed changes
Comment thread lib/Collaboration/Resources/ConversationProvider.php Outdated
$resource->getId(),
$user instanceof IUser ? $user->getUID() : null
);
return $room->getType() === Room::PUBLIC_CALL;

@juliusknorr juliusknorr Mar 22, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Shouldn't this also be true if the user is part of the call?

@nickvergessen nickvergessen Mar 22, 2019

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Right, I messed this up. Will fix

@juliusknorr
juliusknorr force-pushed the feature/noid/linked-collaboration-resources branch from b94b3d1 to f3b9d95 Compare March 22, 2019 15:55
@juliusknorr

juliusknorr commented Mar 22, 2019

Copy link
Copy Markdown
Member

Added some screenshots of the UI to the first post.

@juliusknorr
juliusknorr force-pushed the feature/noid/linked-collaboration-resources branch 2 times, most recently from 4c0ac5f to 074698d Compare March 25, 2019 13:48
@juliusknorr

juliusknorr commented Mar 25, 2019

Copy link
Copy Markdown
Member

@nickvergessen Frontend part is ready now.

@nickvergessen
nickvergessen force-pushed the feature/noid/linked-collaboration-resources branch from 074698d to c21ac2a Compare March 25, 2019 14:52
@nickvergessen

nickvergessen commented Mar 25, 2019 •
edited by juliusknorr
Loading

Copy link
Copy Markdown
Member Author

Bildschirmfoto von 2019-03-25 16-08-31

  • Current room is listed normally in the UI to select a room to link to, should be disabled?
  • There is a white box below the scrollbar in dark theme
  • (+) button in the file picker is missing some CSS beauty (it's not round but has height 16px)
  • Only public rooms work atm

@nickvergessen

nickvergessen commented Mar 25, 2019

Copy link
Copy Markdown
Member Author
  • Icon is black on dark-theme. I guess they should all be delivered in black all the time (for android and other clients) and then be inverted to white in the collection UI?

@juliusknorr

juliusknorr commented Mar 25, 2019

Copy link
Copy Markdown
Member

(+) button in the file picker is missing some CSS beauty (it's not round but has height 16px)

This will need a fix in the files app.

@juliusknorr

juliusknorr commented Mar 25, 2019

Copy link
Copy Markdown
Member

Icon is black on dark-theme. I guess they should all be delivered in black all the time (for android and other clients) and then be inverted to white in the collection UI?

We have a class available depending on the resource type so we could probably set some individual icons for the web frontend and hide the regular image in that case. For talk this is .resource-type-room

@nickvergessen

nickvergessen commented Mar 26, 2019

Copy link
Copy Markdown
Member Author

We have a class available depending on the resource type so we could probably set some individual icons for the web frontend and hide the regular image in that case. For talk this is .resource-type-room

Or we do it similar to the navigation and invert the icons with a filter in the webUI?
Or well let's just take over the icons so we can render the room icon in the future.

@juliusknorr

juliusknorr commented Mar 26, 2019

Copy link
Copy Markdown
Member

Or we do it similar to the navigation and invert the icons with a filter in the webUI?
Or well let's just take over the icons so we can render the room icon in the future.

I think we shouldn't invert in general, as for the files app for example, we already use mimetype icons, which should not be inverted.

@nickvergessen

nickvergessen commented Mar 26, 2019

Copy link
Copy Markdown
Member Author

Okay, ready for testing I guess

@nickvergessen
nickvergessen force-pushed the feature/noid/linked-collaboration-resources branch 2 times, most recently from 3219d35 to baed159 Compare March 27, 2019 09:10
nickvergessen and others added 2 commits March 27, 2019 10:43
@nickvergessen
Add a provider for linked collaboration resources
18b75cf 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@juliusknorr @nickvergessen
Update lib/Collaboration/Resources/ConversationProvider.php
22137e0 
Signed-off-by: Joas Schilling <coding@schilljs.com>
juliusknorr and others added 14 commits March 27, 2019 10:43
@juliusknorr @nickvergessen
WIP: Add collections frontend
5dd9930 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@juliusknorr @nickvergessen
Add sidebar tab
a85b533 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@juliusknorr @nickvergessen
Add icon to resource objects
c0bc066 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@juliusknorr @nickvergessen
Move views to proper folder
35c5adf 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@juliusknorr @nickvergessen
Fix eslint
536c649 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@juliusknorr @nickvergessen
Adapt new library version
0b4e604 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@juliusknorr @nickvergessen
Bump bundles
59699e7 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@nickvergessen
Adjust ignore files
4e8deb4 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Make the image-path absolute and fix non-public-rooms
e013471 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@juliusknorr @nickvergessen
Fix scrollbar and hide current room
b906238 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@nickvergessen
Add a link for rooms
95c1148 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Fix eslint warning
bc1614a 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
'Handlebars' is defined but never used no-unused-vars
c83f0c3 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Catch a missing resource, so the tests work again
2b660fb 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
nickvergessen force-pushed the feature/noid/linked-collaboration-resources branch from baed159 to 2b660fb Compare March 27, 2019 09:44
@nickvergessen

nickvergessen commented Mar 27, 2019

Copy link
Copy Markdown
Member Author

Rebased merge conflicts after webrtc merge

@nickvergessen
Remove unused global
baa0cdc 
Signed-off-by: Joas Schilling <coding@schilljs.com>
Ivansss
Ivansss reviewed Mar 27, 2019
View reviewed changes

@Ivansss Ivansss left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

There is no feedback about which room is selected in the room-picker.

@nickvergessen
Fix highlight when room is selected and exclude file/password rooms
7ba4a58 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen

nickvergessen commented Mar 27, 2019

Copy link
Copy Markdown
Member Author

@nickvergessen
Fix missing room name of one-to-one rooms
3243de8 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Update the lib to the latest
1c3f4d3 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen

nickvergessen commented Mar 28, 2019

Copy link
Copy Markdown
Member Author

Requires nextcloud/server#14892 on the server.

@nickvergessen
nickvergessen merged commit da2abd7 into master Mar 29, 2019
@nickvergessen
nickvergessen deleted the feature/noid/linked-collaboration-resources branch March 29, 2019 09:20
@nickvergessen nickvergessen mentioned this pull request Apr 10, 2019
Merged
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@juliusknorr juliusknorr juliusknorr left review comments
@Ivansss Ivansss Ivansss left review comments

Assignees

@juliusknorr juliusknorr

Labels

enhancement feature: frontend 🖌️ "Web UI" client

Projects

None yet

Milestone

6.0.0

Development

Successfully merging this pull request may close these issues.

3 participants

@nickvergessen @juliusknorr @Ivansss