yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,317 Commits 5 Branches 0 Tags
2ec00a2e36f41e288a9c7017a99c889288edd12f
Commit Graph
67 Commits
Author SHA1 Message Date
Nathan Sobo d1bcff6ea8 Merge remote-tracking branch 'origin/main' into invite-codes-2 2022-05-23 15:46:39 -06:00
Antonio ScandurraandNathan Sobo 5954c1b146 Show contacts panel the first time a new user connects to collab 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-05-20 17:33:09 +02:00
Antonio Scandurra d3a80c0f7c Update users and invite count after an invite gets redeemed 2022-05-20 12:02:31 +02:00
Nathan SoboandAntonio Scandurra 3b4085b654 Add affordance to copy user's invite link if they have a code 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-05-19 17:57:46 -06:00
Max Brunsfeld a500249333 Replace build_workspace fn with an initialize function that takes a workspace 
This makes it clearer that the function is not providing necessary
dependencies to a workspace, but rather configuring it with all of
the panels and widgets which are defined in downstream crates.
 2022-05-19 16:50:22 -07:00
Max Brunsfeld a6cbf0e557 Pass UserStore to ContactsPanel instead of AppState 2022-05-19 14:43:36 -07:00
Max Brunsfeld e6011794ca Remove AppState from workspace actions 
This allows those actions to be bound to keystrokes in the keymap.
Also, remove the WorkspaceParams struct, simplify how Workspaces are
constructed.
 2022-05-19 14:37:26 -07:00
Max BrunsfeldandNathan Sobo 221bb40dc4 Avoid duplicate notifications 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-05-17 11:19:22 -07:00
Antonio ScandurraandNathan Sobo 0bb77237db Show guest only once even if they joined on two different windows 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-05-17 16:21:09 +02:00
Antonio Scandurra 3bc2358e17 Send LeaveProject when waiting room is dismissed while waiting 2022-05-17 11:25:14 +02:00
Nathan Sobo 30a1f0275b Refine messages on waiting to join screen and include host avatar 2022-05-16 16:52:31 -06:00
Nathan Sobo 9620e6e77b Remove "They won't know if you decline" message 2022-05-16 13:15:46 -06:00
Antonio Scandurra 9cff0a822b Don't show "they won't know if you decline" when request is accepted 2022-05-16 15:37:29 +02:00
Max BrunsfeldandNathan Sobo 8d00fab9b1 Start work on requesting to join projects 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-05-12 17:53:11 -07:00
Max BrunsfeldandAntonio Scandurra 7a93292dfa Select the first contact when changing the filter in the contacts panel 
Co-authored-by: Antonio Scandurra <me@as-cii.com>
 2022-05-12 09:56:32 -07:00
Antonio Scandurra 33c6c80b7e Use cmd-9 and cmd-shift-9 to toggle contacts panel focus/visibility 2022-05-12 12:11:27 +02:00
Antonio Scandurra 390cfb341a Allow toggling sections in contacts panel by clicking on them 2022-05-12 11:48:11 +02:00
Max Brunsfeld 00af7d0273 Merge branch 'main' into contact-panel-keyboard-nav 2022-05-11 17:45:44 -07:00
Max Brunsfeld 957a220899 Add the ability to expand and collapse sections of the contacts panel 
Also, allow joining projects using the keyboard.
 2022-05-11 17:28:35 -07:00
Max BrunsfeldandNathan Sobo afd6eaed3f Rework the contact panel's styling to allow keyboard navigation 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-05-11 16:50:51 -07:00
Max BrunsfeldandNathan Sobo 449e7d69cb Improve layout and styling of contact notifications 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-05-11 14:20:05 -07:00
Max BrunsfeldandNathan Sobo 0a1ca3dfc5 Add notifications for accepted contact requests 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-05-11 11:39:01 -07:00
Antonio ScandurraandNathan Sobo 0aa63af210 Show badge when there are pending contact requests 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-05-11 17:39:03 +02:00
Antonio Scandurra 6f72234725 Allow accepting/rejecting incoming requests via notification 2022-05-11 15:25:33 +02:00
Antonio Scandurra 95202cc7f8 Show incoming request notification and implement dismissal 2022-05-11 15:13:37 +02:00
Max Brunsfeld 360f204dda WIP - start work on keyboard navigation in contacts panel 2022-05-10 21:45:49 -07:00
Nathan Sobo 09f9c45a0e Dismiss contact request notification if request is cancelled 2022-05-10 18:50:18 -06:00
Nathan Sobo 65139408ea Present a blank notification upon receipt of a contact request 2022-05-10 18:33:39 -06:00
Nathan Sobo 472b313309 Put context parameter last in toggle_modal callback 
This is more consistent with our treatment of context params everywhere else.
 2022-05-10 16:46:53 -06:00
Max Brunsfeld 3e92d0f906 Consolidate logic for rendering contact requests 2022-05-10 14:52:13 -07:00
Max Brunsfeld 7bf1caa288 Don't use pointing hand cursor for the user's own projects 2022-05-10 14:46:42 -07:00
Max BrunsfeldandNathan Sobo 29f454e092 Give the contact panel's filter editor some placeholder text 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-05-10 11:25:12 -07:00
Max BrunsfeldandNathan Sobo 6c172d7e70 Clear contact panel filter editor on escape 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-05-10 11:18:30 -07:00
Max BrunsfeldandNathan Sobo e204b9e603 Improve layout of contact panel rows 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-05-10 11:14:31 -07:00
Max BrunsfeldNathan SoboAntonio Scandurra
 		3812330af8 Style the buttons in the contact panel and contact finder 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
Co-authored-by: Antonio Scandurra <me@as-cii.com>
 2022-05-10 10:47:25 -07:00
Antonio Scandurra 1be8871fc6 WIP 2022-05-10 18:25:47 +02:00
Antonio ScandurraandNathan Sobo cf90ddd3e9 Eliminate flicker when contact status is pending 
We do this by using a bullet. When we have animations, a spinner would be better.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-05-10 17:32:57 +02:00
Antonio ScandurraandNathan Sobo 14887ba58c Pull out contact finder as a picker 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-05-10 16:43:51 +02:00
Nathan SoboandAntonio Scandurra b87a43b67d Start on contact finder modal 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-05-10 07:24:14 -06:00
Nathan SoboandAntonio Scandurra df90c774da Make flex elements fill available space when they contain a float 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-05-10 06:14:30 -06:00
Antonio Scandurra 5369a6fa57 Start on adding icon for requesting contacts 2022-05-10 12:09:24 +02:00
Antonio Scandurra 606f7548a0 Maintain online status in contacts panel 2022-05-10 10:33:57 +02:00
Nathan Sobo f4176d17ac Filter out empty projects in contacts panel 2022-05-09 20:57:41 -06:00
Max Brunsfeld d0b0414ad7 Remove stray printing in contacts panel 2022-05-09 16:31:30 -07:00
Nathan SoboandMax Brunsfeld 52cce93287 Show requests in contacts panel 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2022-05-09 12:48:07 -06:00
Nathan SoboandMax Brunsfeld ab1ed218dd Wire up UI for requesting contacts and cancelling requests 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2022-05-09 11:24:05 -06:00
Antonio Scandurra 333488cc7a WIP 2022-05-09 17:06:21 +02:00
Antonio ScandurraandNathan Sobo 3ef822122d Define data types for the new contacts model 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-05-06 16:24:44 +02:00
Max Brunsfeld c9b8995e72 Filter existing contacts when searching in the contacts panel 2022-05-05 15:04:50 -07:00
Max BrunsfeldandNathan Sobo a7359d0c77 Allow fuzzy-search for potential contacts in the contacts panel 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-05-05 14:14:44 -07:00