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

chore(web): Update Terms and Conditions and Privacy Policy #282

Merged
merged 16 commits into from
Jun 27, 2024

Conversation

Aleesssino
Copy link
Contributor

@Aleesssino Aleesssino commented Jun 16, 2024

User description

Description

  • Updated Terms and Conditions and Privacy Policy documents to reflect current policies and legal requirements.
  • Fixed style prop error in Privacy Policy markdown:
    Replace
  <span style="text-decoration:underline;">Withdrawing your consent:</span>

with

   <span style={{ textDecoration: 'underline' }}>Withdrawing your consent:</span>

to correctly apply inline style formatting using JSX.

Fixes #281

Mentions

@kriptonian1

Developer's checklist

  • My PR follows the style guidelines of this project
  • I have performed a self-check on my work

If changes are made in the code:

  • I have followed the coding guidelines
  • My changes in code generate no new warnings
  • My changes are breaking another fix/feature of the project
  • I have added test cases to show that my feature works
  • I have added relevant screenshots in my PR
  • There are no UI/UX issues

PR Type

documentation, bug fix


Description

  • Updated Terms and Conditions and Privacy Policy documents to reflect current policies and legal requirements.
  • Corrected markdown syntax for headers in Privacy Policy document.
  • Fixed inline style formatting for JSX in Privacy Policy document.
  • Improved formatting and readability in both documents.
  • Added detailed sections on services, intellectual property, user responsibilities, and dispute resolution in Terms and Conditions document.

Changes walkthrough 📝

Relevant files
Documentation
page.mdx
Update Privacy Policy document with formatting fixes and style
corrections.

apps/web/src/app/(main)/(mdx)/privacy/page.mdx

  • Corrected markdown syntax for headers.
  • Fixed inline style formatting for JSX.
  • Added missing punctuation and improved formatting.
  • +41/-22 
    page.mdx
    Comprehensive update to Terms and Conditions document.     

    apps/web/src/app/(main)/(mdx)/terms_and_condition/page.mdx

  • Updated terms and conditions to reflect current policies.
  • Improved formatting and readability.
  • Added detailed sections on services, intellectual property, user
    responsibilities, and dispute resolution.
  • +488/-241

    💡 PR-Agent usage:
    Comment /help on the PR to get a list of all available PR-Agent tools and their descriptions

    Copy link

    sonarcloud bot commented Jun 16, 2024

    Quality Gate Passed Quality Gate passed

    Issues
    0 New issues
    0 Accepted issues

    Measures
    0 Security Hotspots
    No data about Coverage
    No data about Duplication

    See analysis details on SonarCloud

    Copy link
    Contributor

    PR Reviewer Guide 🔍

    ⏱️ Estimated effort to review [1-5] 4
    🧪 Relevant tests No
    🔒 Security concerns No
    ⚡ Key issues to review Possible Bug:
    The PR includes changes to the markdown headers (e.g., "## 1. WHAT INFORMATION DO WE COLLECT?" changed to "## 1 WHAT INFORMATION DO WE COLLECT?"). This might affect the rendering or the style of the document if the system expects a specific format.
    Code Consistency:
    The PR changes the style of bullet points inconsistently. In some sections, bullet points are introduced, while in others, the existing format of dashes is maintained. This could lead to inconsistent styling across documents.
    Content Clarity:
    The section on "Withdrawing your consent" in the privacy policy is modified to use JSX for styling, which is good for consistency in a web application. However, ensure that this change is compatible with all browsers and does not affect accessibility.

    Copy link
    Contributor

    PR Code Suggestions ✨

    CategorySuggestion                                                                                                                                    Score
    Possible issue
    Ensure consistency in contact email addresses to avoid confusion

    To prevent potential legal issues, ensure that the contact email provided is consistent
    throughout the document. There is a discrepancy between 'support@keyshade.xyz' and
    'support@keyshade.com'. It is crucial to use the correct and consistent email address.

    apps/web/src/app/(main)/(mdx)/terms_and_condition/page.mdx [20-181]

     by email at support@keyshade.xyz
    -Please contact keyshade at support@keyshade.com
    +Please contact keyshade at support@keyshade.xyz
     
    Suggestion importance[1-10]: 10

    Why: Ensuring consistency in contact email addresses is crucial to prevent potential legal issues and user confusion. This suggestion addresses a significant issue in the new code.

    10
    Enhancement
    Add a table of contents for better navigation and accessibility

    To enhance the accessibility and usability of the document, consider adding a table of
    contents at the beginning. This would help users navigate through the various sections
    more efficiently, especially given the document's length and complexity.

    apps/web/src/app/(main)/(mdx)/terms_and_condition/page.mdx [1]

     # TERMS AND CONDITIONS
    +- [Agreement to Our Legal Terms](#agreement-to-our-legal-terms)
    +- [Our Services](#our-services)
    +- [Intellectual Property Rights](#intellectual-property-rights)
    +- [User Representations](#user-representations)
    +- [Prohibited Activities](#prohibited-activities)
    +- [User-Generated Contributions](#user-generated-contributions)
    +- [Contribution License](#contribution-license)
    +- [Guidelines for Reviews](#guidelines-for-reviews)
     
    Suggestion importance[1-10]: 9

    Why: Adding a table of contents significantly enhances the usability and accessibility of the document, especially given its length and complexity. This is a valuable enhancement for user experience.

    9
    Specify server locations to enhance transparency in data transfer disclosures

    It's beneficial to specify the location of the servers when mentioning international data
    transfers to maintain transparency and trust with the users. This could be a specific
    country or region.

    apps/web/src/app/(main)/(mdx)/privacy/page.mdx [73]

    -Our servers are located in. If you are accessing our Services from outside, please be aware that your information may be transferred to, stored, and processed by us in our facilities and by those third parties with whom we may share your personal information (see "WHEN AND WITH WHOM DO WE SHARE YOUR PERSONAL INFORMATION?" above), in and other countries.
    +Our servers are located in [specific country or region]. If you are accessing our Services from outside, please be aware that your information may be transferred to, stored, and processed by us in our facilities and by those third parties with whom we may share your personal information (see "WHEN AND WITH WHOM DO WE SHARE YOUR PERSONAL INFORMATION?" above), in [specific country or region] and other countries.
     
    Suggestion importance[1-10]: 9

    Why: Specifying the server location enhances transparency and trust, which is crucial for user confidence in data handling practices. This is a significant improvement for legal and user trust reasons.

    9
    Standardize the date format for clarity and consistency

    To ensure clarity and consistency, consider using a consistent date format throughout the
    document. The date format "April 11, 2024" could be standardized to a more universally
    accepted format such as "11 April 2024" or "2024-04-11" to avoid regional ambiguities.

    apps/web/src/app/(main)/(mdx)/terms_and_condition/page.mdx [4]

    -Last updated: April 11, 2024.
    +Last updated: 2024-04-11.
     
    Suggestion importance[1-10]: 7

    Why: Standardizing the date format can improve clarity and avoid regional ambiguities, making the document more universally understandable. However, this is a minor enhancement and not crucial.

    7
    Improve readability and context by adding an introductory sentence before section headers

    Consider adding a brief introductory sentence before jumping directly into the section
    headers to improve the flow and context for the reader. This can help in setting the stage
    for the detailed sections that follow.

    apps/web/src/app/(main)/(mdx)/privacy/page.mdx [10]

    -+
    +In this section, we explain the types of information we collect from you.
     ## 1. WHAT INFORMATION DO WE COLLECT?
     
    Suggestion importance[1-10]: 7

    Why: Adding an introductory sentence can improve readability and provide better context for the reader, making the document more user-friendly. However, it is not a critical change.

    7
    Maintainability
    Remove redundant phrases to improve document conciseness

    It's recommended to avoid redundancy in the text to make the document more concise and
    easier to read. The phrase "collectively, the 'Agreement'" is repeated unnecessarily and
    can be removed in one instance to improve readability.

    apps/web/src/app/(main)/(mdx)/terms_and_condition/page.mdx [43]

    -(collectively, the "Agreement"). If you do not agree to this Agreement, you may not use, access, or submit information to the Services. (collectively, the "Agreement"). If you do not agree to this Agreement, you may not use, access, or submit information to the Services.
    +If you do not agree to this Agreement, you may not use, access, or submit information to the Services.
     
    Suggestion importance[1-10]: 8

    Why: Removing redundant phrases improves readability and conciseness, which is important for maintaining a professional and clear document. This suggestion directly addresses a readability issue in the new code.

    8
    Clarity
    Clarify the age limit for data collection from minors to enhance understanding and legal clarity

    To enhance clarity and avoid potential legal ambiguities, explicitly state the age limit
    when discussing the collection of information from minors, rather than using the term
    "children under 18 years of age."

    apps/web/src/app/(main)/(mdx)/privacy/page.mdx [89]

    -We do not knowingly solicit data from or market to children under 18 years of age.
    +We do not knowingly solicit data from or market to individuals under the age of 18.
     
    Suggestion importance[1-10]: 8

    Why: Clarifying the age limit improves legal clarity and user understanding, which is important for compliance and clear communication.

    8
    Readability
    Use simpler and more engaging language to make the privacy notice more accessible

    For better user engagement and clarity, consider using more engaging and less technical
    language in the introductory sentences of each section. This can make the document more
    accessible to a broader audience.

    apps/web/src/app/(main)/(mdx)/privacy/page.mdx [35]

    -_In Short: We process your information to provide, improve, and administer our Services, communicate with you, for security and fraud prevention, and to comply with law. We may also process your information for other purposes with your consent._
    +_Simply put: We use your information to enhance our services, communicate with you, ensure security, and meet legal requirements. Sometimes, we might use your information for other reasons, but we'll get your consent first._
     
    Suggestion importance[1-10]: 6

    Why: Using simpler language can make the document more accessible to a wider audience, improving user engagement. However, the current language is already clear, so this is a minor enhancement.

    6

    @rajdip-b
    Copy link
    Member

    @kriptonian1 yo ser drop your reviews!

    Copy link
    Member

    @rajdip-b rajdip-b left a comment

    Choose a reason for hiding this comment

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

    LGTM

    Copy link
    Contributor

    @kriptonian1 kriptonian1 left a comment

    Choose a reason for hiding this comment

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

    I think after this updates it should be good to merge


    You may be required to register to use the Services. You agree to keep your password confidential and will be responsible for all use of your account and password. We reserve the right to remove, reclaim, or change a username you select if we determine, in our sole discretion, that such username is inappropriate, obscene, or otherwise objectionable.
    You agree to pay all fees and charges applicable to your use of the Services. Please contact keyshade at support@keyshade.com for detailed pricing information. We partner with Paddle.com Market Ltd. (“Paddle”) to manage payments. By using our Services you agree to provide Paddle accurate, current, complete and authorized information about yourself and your business, and your credit, debit or other payment card data. By providing Paddle with your payment information, you agree that keyshade is authorized to immediately charge you for all fees and charges due and payable to keyshade hereunder and that no additional notice or consent is required. You agree to immediately update your payment details in Paddle if there is any change in your billing address or the credit card used for payment hereunder.
    Copy link
    Contributor

    Choose a reason for hiding this comment

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

    Here the email id is support@keyshade.com which is not right, update it to [support@keyshade.xyz](mailto:support@keyshade.xyz)


    _In Short: If you choose to register or log in to our Services using a social media account, we may have access to certain information about you._

    Our Services offer you the ability to register and log in using your third-party social media account details (like your Facebook or Twitter logins). Where you choose to do this, we will receive certain profile information about you from your social media provider. The profile information we receive may vary depending on the social media provider concerned, but will often include your name, email address, friends list, and profile picture, as well as other information you choose to make public on such a social media platform.

    We will use the information we receive only for the purposes that are described in this privacy notice or that are otherwise made clear to you on the relevant Services. Please note that we do not control, and are not responsible for, other uses of your personal information by your third-party social media provider. We recommend that you review their privacy notice to understand how they collect, use, and share your personal information, and how you can set your privacy preferences on their sites and apps.

    ## 6\. IS YOUR INFORMATION TRANSFERRED INTERNATIONALLY?

    ## 6. IS YOUR INFORMATION TRANSFERRED INTERNATIONALLY?

    _In Short: We may transfer, store, and process your information in countries other than your own._

    Our servers are located in. If you are accessing our Services from outside, please be aware that your information may be transferred to, stored, and processed by us in our facilities and by those third parties with whom we may share your personal information (see "WHEN AND WITH WHOM DO WE SHARE YOUR PERSONAL INFORMATION?" above), in and other countries.
    Copy link
    Contributor

    Choose a reason for hiding this comment

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

    update this too Our servers are located in India. If you are accessing our Services from outside, please be aware that your information may be transferred to, stored, and processed by us in our facilities and by those third parties with whom we may share your personal information (see "WHEN AND WITH WHOM DO WE SHARE YOUR PERSONAL INFORMATION?" above), in India and other countries.


    When we have no ongoing legitimate business need to process your personal information, we will either delete or anonymize such information, or, if this is not possible (for example, because your personal information has been stored in backup archives), then we will securely store your personal information and isolate it from any further processing until deletion is possible.

    ## 8\. DO WE COLLECT INFORMATION FROM MINORS?

    ## 8. DO WE COLLECT INFORMATION FROM MINORS?

    _In Short: We do not knowingly collect data from or market to children under 18 years of age._

    We do not knowingly solicit data from or market to children under 18 years of age. By using the Services, you represent that you are at least 18 or that you are the parent or guardian of such a minor and consent to such minor dependent’s use of the Services. If we learn that personal information from users less than 18 years of age has been collected, we will deactivate the account and take reasonable measures to promptly delete such data from our records. If you become aware of any data we may have collected from children under age 18, please contact us at [support@keyshade.xyz](mailto:support@keyshade.xyz) .
    Copy link
    Contributor

    Choose a reason for hiding this comment

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

    Update this We do not knowingly solicit data from or market to children under 18 years of age. to We do not knowingly solicit data from or market to individuals under the age of 18.

    @@ -1,299 +1,547 @@
    # TERMS AND CONDITIONS

    Last updated April 01, 2024

    Last updated: April 11, 2024.
    Copy link
    Contributor

    Choose a reason for hiding this comment

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

    Update the date to 11 April 2024

    @Aleesssino
    Copy link
    Contributor Author

    I think after this updates it should be good to merge

    Done 🚀

    Copy link
    Contributor Author

    Choose a reason for hiding this comment

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

    I added some spacing for readability.

    @rajdip-b
    Copy link
    Member

    @kriptonian1 can you review this now?

    @kriptonian1
    Copy link
    Contributor

    Sorry guys, I was not available. Let me review it for you

    Copy link
    Contributor

    @kriptonian1 kriptonian1 left a comment

    Choose a reason for hiding this comment

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

    There are just some formatting issues with the email, after fixing this we will be good to merge ig


    If you have questions or comments about this notice, you may contact us by post at:

    [support@keyshade.xyz](mailto:support@keyshade.xyz)
    support@keyshade.xyz
    Copy link
    Contributor

    Choose a reason for hiding this comment

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

    this should be [support@keyshade.xyz](mailto:support@keyshade.xyz)




    You can contact us by phone at, by email at support@keyshade.xyz, or by mail at 30/17 SHIB CHANDRA CHATTERJEE STRT, Howrah, West Bengal 711202, India.
    Copy link
    Contributor

    Choose a reason for hiding this comment

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

    format this email as [support@keyshade.xyz](mailto:support@keyshade.xyz)


    We operate the website [https://keyshade.xyz](https://keyshade.xyz/) (the "Site"), as well as any other related products and services that refer or link to these legal terms (the "Legal Terms") (collectively, the "Services").
    We will provide you with prior notice of any scheduled changes to the services you are using. The modified legal terms will become effective upon posting or notifying you at support@keyshade.xyz, as stated in the email message. By continuing to use the services after the effective date of any changes, you agree to be bound by the modified terms.
    Copy link
    Contributor

    Choose a reason for hiding this comment

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

    format the email as [support@keyshade.xyz](mailto:support@keyshade.xyz)


    We reserve all rights not expressly granted to you in and to the Services, Content, and Marks.
    If you wish to make any use of the Services, Content, or Marks other than as set out in this section or elsewhere in our Legal Terms, please address your request to: support@keyshade.xyz. If we ever grant you permission to post, reproduce, or publicly display any part of our services or content, you must identify us as the owners or licensors of the services, content, or marks and ensure that any copyright or proprietary notice appears or is visible when posting, reproducing, or displaying our content.
    Copy link
    Contributor

    Choose a reason for hiding this comment

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

    format the email as [support@keyshade.xyz](mailto:support@keyshade.xyz)

    All purchases are non-refundable. You can cancel your subscription at any time by logging into your account.Your cancellation will take effect at the end of the current paid term. If you have any questions or are unsatisfied with our Services, please email us at [support@keyshade.xyz](mailto:support@keyshade.xyz).


    All purchases are non-refundable. You can cancel your subscription at any time by logging into your account. Your cancellation will take effect at the end of the current paid term. If you have any questions or are unsatisfied with our services, please email us at support@keyshade.xyz.
    Copy link
    Contributor

    Choose a reason for hiding this comment

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

    format the email to [support@keyshade.xyz](mailto:support@keyshade.xyz)

    @rajdip-b rajdip-b merged commit ef67bde into keyshade-xyz:develop Jun 27, 2024
    4 checks passed
    yogesh1801 pushed a commit to yogesh1801/keyshade that referenced this pull request Jun 29, 2024
    …xyz#282)
    
    Co-authored-by: Rajdip Bhattacharya <agentR47@gmail.com>
    rajdip-b added a commit that referenced this pull request Jul 11, 2024
    Co-authored-by: Rajdip Bhattacharya <agentR47@gmail.com>
    rajdip-b pushed a commit that referenced this pull request Jul 11, 2024
    ## [2.2.0](v2.1.0...v2.2.0) (2024-07-11)
    
    ### 🚀 Features
    
    * **api-client:** Added API Client package ([#346](#346)) ([6734e1e](6734e1e))
    * **api:** Updated API key ([fbac312](fbac312))
    * **platform:** View [secure]s ([#313](#313)) ([97c4541](97c4541))
    * **web:** Add Pricing Page ([#243](#243)) ([2c7f1d6](2c7f1d6))
    
    ### 📚 Documentation
    
    * **cli:** Added docs for the CLI package ([#329](#329)) ([edad166](edad166))
    * **cli:** Added usage docs ([#330](#330)) ([b6963d5](b6963d5))
    * Update Discord link ([871b6cd](871b6cd))
    * Update README.md ([e66fcd2](e66fcd2))
    * **web:** Add documentation about our web package ([#268](#268)) ([3d848e7](3d848e7))
    
    ### 🔧 Miscellaneous Chores
    
    * **api:** Updated response types in environment service ([b8a3ddd](b8a3ddd))
    * **ci:** Added release scripts for platform and api ([02dae60](02dae60))
    * **CI:** Updated action plugin versions ([88bb317](88bb317))
    * **CI:** Updated pnpm version in CI file ([2692e88](2692e88))
    * **platform:** Fixed env parsing in platform ([d6ffafa](d6ffafa))
    * **web:** Update Terms and Conditions and Privacy Policy ([#282](#282)) ([d621dcb](d621dcb))
    
    ### 🔨 Code Refactoring
    
    * **api:** Update [secure] and variable fetching endpoints ([7d9acd0](7d9acd0))
    * **cli:** Refactored profile commands into readable blocks ([#331](#331)) ([4a8a089](4a8a089))
    * **cli:** Updated configuration commands and mechanism ([#310](#310)) ([9079b6d](9079b6d))
    rajdip-b pushed a commit that referenced this pull request Jul 11, 2024
    ## [2.2.0](v2.1.0...v2.2.0) (2024-07-11)
    
    ### 🚀 Features
    
    * **api-client:** Added API Client package ([#346](#346)) ([6734e1e](6734e1e))
    * **api:** Updated API key ([fbac312](fbac312))
    * **platform:** View [secure]s ([#313](#313)) ([97c4541](97c4541))
    * **web:** Add Pricing Page ([#243](#243)) ([2c7f1d6](2c7f1d6))
    
    ### 📚 Documentation
    
    * **cli:** Added docs for the CLI package ([#329](#329)) ([edad166](edad166))
    * **cli:** Added usage docs ([#330](#330)) ([b6963d5](b6963d5))
    * Update Discord link ([871b6cd](871b6cd))
    * Update README.md ([e66fcd2](e66fcd2))
    * **web:** Add documentation about our web package ([#268](#268)) ([3d848e7](3d848e7))
    
    ### 🔧 Miscellaneous Chores
    
    * **api:** Updated response types in environment service ([b8a3ddd](b8a3ddd))
    * **ci:** Added release scripts for platform and api ([02dae60](02dae60))
    * **CI:** Updated action plugin versions ([88bb317](88bb317))
    * **CI:** Updated pnpm version in CI file ([2692e88](2692e88))
    * **platform:** Fixed env parsing in platform ([d6ffafa](d6ffafa))
    * **web:** Update Terms and Conditions and Privacy Policy ([#282](#282)) ([d621dcb](d621dcb))
    
    ### 🔨 Code Refactoring
    
    * **api:** Update [secure] and variable fetching endpoints ([7d9acd0](7d9acd0))
    * **cli:** Refactored profile commands into readable blocks ([#331](#331)) ([4a8a089](4a8a089))
    * **cli:** Updated configuration commands and mechanism ([#310](#310)) ([9079b6d](9079b6d))
    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.

    WEB: Update Terms and Condition, and Privacy Policy with attached markdown
    3 participants