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: implement user collaboration features #1221

Merged
merged 23 commits into from Jun 7, 2023

Conversation

OgDev-01
Copy link
Contributor

@OgDev-01 OgDev-01 commented May 24, 2023

What type of PR is this? (check all applicable)

  • πŸ• Feature
  • πŸ› Bug Fix
  • πŸ“ Documentation Update
  • 🎨 Style
  • πŸ§‘β€πŸ’» Code Refactor
  • πŸ”₯ Performance Improvements
  • βœ… Test
  • πŸ€– Build
  • πŸ” CI
  • πŸ“¦ Chore (Release)
  • ⏩ Revert

Description

This PR:

  • Adds users collaboration feature
  • Fixes contributor profile header layout break
  • Forces a user to signup when they click on collaborate button and redirect back to where they left off
  • implement login to show and hide the collaboration tab based on user's preferences
  • Requesting collaborations is currently available to paid users only.

Related Tickets & Documents

Closes #719
Closes #1003

Mobile & Desktop Screenshots/Recordings

image

image

image

image

image

Added tests?

  • πŸ‘ yes
  • πŸ™… no, because they aren't needed
  • πŸ™‹ no, because I need help

Added to documentation?

  • πŸ“œ README.md
  • πŸ““ docs.opensauced.pizza
  • πŸ• dev.to/opensauced
  • πŸ“• storybook
  • πŸ™… no documentation needed

[optional] Are there any post-deployment tasks we need to perform?

[optional] What gif best describes this PR or how it makes you feel?

@netlify
Copy link

netlify bot commented May 24, 2023

βœ… Deploy Preview for design-insights ready!

Name Link
πŸ”¨ Latest commit 9a989d5
πŸ” Latest deploy log https://app.netlify.com/sites/design-insights/deploys/647f9f1be6df8000086ebfbd
😎 Deploy Preview https://deploy-preview-1221--design-insights.netlify.app
πŸ“± Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

@netlify
Copy link

netlify bot commented May 24, 2023

βœ… Deploy Preview for oss-insights ready!

Name Link
πŸ”¨ Latest commit 9a989d5
πŸ” Latest deploy log https://app.netlify.com/sites/oss-insights/deploys/647f9f1be6644b00080d0293
😎 Deploy Preview https://deploy-preview-1221--oss-insights.netlify.app
πŸ“± Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

@bdougie
Copy link
Member

bdougie commented May 25, 2023

@brandonroberts any chance we can implement feature flagging for this feature? I really think the UI is ready for prime time, but it would be nice to show the feature behind the scenes.

Perhaps we can make this for paid users only for now.

@brandonroberts
Copy link
Contributor

@bdougie yes, we can use the same logic for determining access to reports to restrict seeing this. We can land this and follow-up with the role check.

@OgDev-01 OgDev-01 marked this pull request as ready for review May 26, 2023 14:37
@bdougie
Copy link
Member

bdougie commented May 31, 2023

Reviewing this and not seeing the dropdown anymore.

Screen Shot 2023-05-31 at 12 26 56 PM

@OgDev-01
Copy link
Contributor Author

Reviewing this and not seeing the dropdown anymore.

Screen Shot 2023-05-31 at 12 26 56 PM

Should the dropdown also be used in the desktop view? I was thinking we use it on mobile alone.

@bdougie
Copy link
Member

bdougie commented May 31, 2023

We need it on desktop. 3 buttons is a bit much. We will ultimately need a better design eventually, but the dropdown works.

Copy link
Member

@bdougie bdougie left a comment

Choose a reason for hiding this comment

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

Per slack, we need to add a "paid user" feature flag for the collaboration button. This will allow us to test the feature and iterate.

Copy link
Contributor

@brandonroberts brandonroberts left a comment

Choose a reason for hiding this comment

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

LGTM

@brandonroberts brandonroberts added the merge conflicts Needs merge conflict resolved label Jun 6, 2023
@OgDev-01 OgDev-01 added needs-approval and removed awaiting review merge conflicts Needs merge conflict resolved labels Jun 6, 2023
@brandonroberts brandonroberts added the merge conflicts Needs merge conflict resolved label Jun 6, 2023
@OgDev-01 OgDev-01 removed the merge conflicts Needs merge conflict resolved label Jun 6, 2023
@brandonroberts brandonroberts merged commit 00b6d1a into beta Jun 7, 2023
11 checks passed
@brandonroberts brandonroberts deleted the 719-collaboration-workflow branch June 7, 2023 15:02
github-actions bot pushed a commit that referenced this pull request Jun 7, 2023
## [1.52.0-beta.1](v1.51.0...v1.52.0-beta.1) (2023-06-07)

### πŸ• Features

* implement user collaboration features ([#1221](#1221)) ([00b6d1a](00b6d1a))
@github-actions
Copy link

github-actions bot commented Jun 7, 2023

πŸŽ‰ This PR is included in version 1.52.0-beta.1 πŸŽ‰

The release is available on GitHub release

Your semantic-release bot πŸ“¦πŸš€

github-actions bot pushed a commit that referenced this pull request Jun 15, 2023
## [1.52.0](v1.51.0...v1.52.0) (2023-06-15)

### πŸ• Features

* add openGraph image to public insight pages ([#1258](#1258)) ([f0a7f7e](f0a7f7e))
* implement user collaboration features ([#1221](#1221)) ([00b6d1a](00b6d1a))

### πŸ› Bug Fixes

* add session check before redirecting in private wrapper component ([#1261](#1261)) ([891e4c9](891e4c9)), closes [#1260](#1260)
* remove duplicate redirect check and use server props on insight page ([#1255](#1255)) ([9ef2780](9ef2780))
* remove hard-coded height from layouts ([#1257](#1257)) ([20061bc](20061bc))
@github-actions
Copy link

πŸŽ‰ This PR is included in version 1.52.0 πŸŽ‰

The release is available on GitHub release

Your semantic-release bot πŸ“¦πŸš€

ElpisHelle added a commit to ElpisHelle/next.js-tailwindcss that referenced this pull request Aug 17, 2023
## [1.52.0-beta.1](open-sauced/app@v1.51.0...v1.52.0-beta.1) (2023-06-07)

### πŸ• Features

* implement user collaboration features ([#1221](open-sauced/app#1221)) ([00b6d1a](open-sauced/app@00b6d1a))
ElpisHelle added a commit to ElpisHelle/next.js-tailwindcss that referenced this pull request Aug 17, 2023
## [1.52.0](open-sauced/app@v1.51.0...v1.52.0) (2023-06-15)

### πŸ• Features

* add openGraph image to public insight pages ([#1258](open-sauced/app#1258)) ([f0a7f7e](open-sauced/app@f0a7f7e))
* implement user collaboration features ([#1221](open-sauced/app#1221)) ([00b6d1a](open-sauced/app@00b6d1a))

### πŸ› Bug Fixes

* add session check before redirecting in private wrapper component ([#1261](open-sauced/app#1261)) ([891e4c9](open-sauced/app@891e4c9)), closes [#1260](open-sauced/app#1260)
* remove duplicate redirect check and use server props on insight page ([#1255](open-sauced/app#1255)) ([9ef2780](open-sauced/app@9ef2780))
* remove hard-coded height from layouts ([#1257](open-sauced/app#1257)) ([20061bc](open-sauced/app@20061bc))
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

feat: Integrate the API into the collaboration feature: Request to collaborate workflow
3 participants