From ceb5907ca54305cf59ceb3e2c118a896faf569ca Mon Sep 17 00:00:00 2001 From: moonleay Date: Tue, 5 Dec 2023 12:31:21 +0100 Subject: [PATCH] WIP: fixed typos on about page, wrapped acknowledgements with div, fixed typo in features, added new line in how-do-i footer, edited imprint formatting, updated privacy-policy and terms-of-service, updated about page css, styled acknowledgements page, added color to links on contact page, edited how-do-i style, added css to imprint, added css to privacy-policy, edited style of the stack page, added css to terms-of-service page --- src/pages/about.astro | 4 +- src/pages/acknowledgements.astro | 95 +++++------ src/pages/features.astro | 2 +- src/pages/how-do-i.astro | 2 +- src/pages/imprint.astro | 8 +- src/pages/privacy-policy.astro | 213 ++++++++++++++----------- src/pages/terms-of-service.astro | 132 +++++---------- src/styles/pages/about.scss | 4 + src/styles/pages/acknowledgements.scss | 58 +++++++ src/styles/pages/contact.scss | 7 + src/styles/pages/how-do-i.scss | 10 +- src/styles/pages/imprint.scss | 32 ++++ src/styles/pages/privacy-policy.scss | 46 ++++++ src/styles/pages/stack.scss | 13 +- src/styles/pages/terms-of-service.scss | 34 ++++ 15 files changed, 417 insertions(+), 243 deletions(-) create mode 100644 src/styles/pages/acknowledgements.scss create mode 100644 src/styles/pages/imprint.scss create mode 100644 src/styles/pages/privacy-policy.scss create mode 100644 src/styles/pages/terms-of-service.scss diff --git a/src/pages/about.astro b/src/pages/about.astro index b8aeb10..ed8c3b7 100644 --- a/src/pages/about.astro +++ b/src/pages/about.astro @@ -30,7 +30,7 @@ import "../styles/pages/about.scss";

-

How can I trust you

+

How can I trust you?

The bot only requests permissions, which are needed for it to work. Additionally, if you want to check how the bot works under the hood, you can @@ -42,7 +42,7 @@ import "../styles/pages/about.scss";

Where is my data stored?

- Your data is stored in a VPS from Contabo in Germany. The bot used to be hosted on a server in my basement, + Your data is stored on a VPS from Contabo in Germany. The bot used to be hosted on a server in my basement, but I moved it to a VPS, because my internet connection was not stable enough.

diff --git a/src/pages/acknowledgements.astro b/src/pages/acknowledgements.astro index cbbf5d0..3ca10e1 100644 --- a/src/pages/acknowledgements.astro +++ b/src/pages/acknowledgements.astro @@ -1,12 +1,14 @@ --- import Layout from "@layouts/Layout.astro"; +import "../styles/pages/acknowledgements.scss"; --- -

Acknowledgements

-
- - +
+

Acknowledgements

+
+
+ - - + + @@ -70,7 +72,7 @@ import Layout from "@layouts/Layout.astro"; @@ -100,8 +102,8 @@ import Layout from "@layouts/Layout.astro"; @@ -129,35 +131,36 @@ import Layout from "@layouts/Layout.astro"; - - - - - - -

tool

@@ -18,16 +20,16 @@ import Layout from "@layouts/Layout.astro";

page

Kotlin

 Apache license 2.0Apache license 2.0 @@ -40,8 +42,8 @@ import Layout from "@layouts/Layout.astro"; MIT licenseMIT license @@ -54,13 +56,13 @@ import Layout from "@layouts/Layout.astro"; Mozilla Public License 2.0Mozilla Public License 2.0 websitewebsite
PostgreSQL licensePostgreSQL license @@ -83,14 +85,14 @@ import Layout from "@layouts/Layout.astro"; Apache license 2.0Apache license 2.0 reporepo
MIT licenseMIT license @@ -114,12 +116,12 @@ import Layout from "@layouts/Layout.astro"; Apache license 2.0Apache license 2.0 reporepo
Apache license 2.0Apache license 2.0 reporepo
-

Splatoon3.ink

- 		- MIT License - - website -
-
+ + +

Splatoon3.ink

+ + + MIT License + + + website + + + + +
+ diff --git a/src/pages/features.astro b/src/pages/features.astro index 5793c60..f9b3361 100644 --- a/src/pages/features.astro +++ b/src/pages/features.astro @@ -26,7 +26,7 @@ import "../styles/pages/features.scss"; imgUrl="https://static.moonleay.net/img/lilJuddWeb/features/notifs.png" imgAlt="Screenshot of the notification feature of li'l Judd" title="Notifications" - description="Make sure that you and your team members remember to vote in the Time Planner." + description="Make sure that you and your team members vote in the Time Planner." note="The bot can add roles. The first one gets pinged, when the time planner sends the messages, the other one gets assigned to the available members of the day, so that it is possible to ping all available people." />
-

Is something missing here? Please contact me!

+

Is something missing here?
Please contact me!

diff --git a/src/pages/imprint.astro b/src/pages/imprint.astro index b5838f6..05d4d55 100644 --- a/src/pages/imprint.astro +++ b/src/pages/imprint.astro @@ -1,31 +1,29 @@ --- import Layout from "@layouts/Layout.astro"; +import "../styles/pages/imprint.scss"; --- -
+

Imprint

In accordance with the applicable legal regulations, we would like to point out that this website is not subject to the imprint obligation. This notice is for clarification and transparent information for our visitors. -

According to § 5 TMG (Telemedia Act), certain providers of telemedia in Germany are obliged to provide an imprint with certain information. This obligation applies in particular to commercial websites or those that are used for business purposes. -

However, since this website has no business or commercial character and only provides non-commercial, informative or private content, it is not subject to the imprint obligation according to § 5 TMG. -

Nevertheless, we strive to keep all information on this website correct and up-to-date to the best of our knowledge and belief. However, if you have any questions or concerns, please feel free to contact us using the - contact options provided. + contact options provided.

diff --git a/src/pages/privacy-policy.astro b/src/pages/privacy-policy.astro index 45d5e80..528e7b1 100644 --- a/src/pages/privacy-policy.astro +++ b/src/pages/privacy-policy.astro @@ -1,95 +1,130 @@ --- import Layout from "@layouts/Layout.astro"; +import "../styles/pages/privacy-policy.scss"; --- -
-

Privacy Policy

-
-
- -

Introduction

- - This Privacy Policy outlines how the li'l Judd Discord bot ("the bot") collects, - uses, and protects user data. The bot is committed to complying with the General - Data Protection Regulation (GDPR) and ensuring the privacy and security of user - information. -
-
- -

1. Information Collection

- -

1.1. Data Collection

- - The bot does not collect or store any personal information from users. -
-
- -

1.2. Server Data

- - The bot may collect and store server-related data necessary for its functionality, - but this data is not associated with individual users and is used solely for - operational purposes. -
-
- -

2. Data Storage and Security

- -

2.1. Data Storage Location

- - All data collected by the bot is stored within servers located in Germany. -
-
- -

2.2. Security Measures

- - We employ industry-standard security measures to ensure the safety and confidentiality - of the data stored within our systems. -
-
- -

3. Data Sharing

- - The bot does not share any user or server data with third parties. -
-
- -

4. Rights of Users

- -

4.1. Access, Rectification, and Deletion

- - Users have the right to access, rectify, or delete any personal data held by - the bot. For such requests, please contact the bot's developer at contact at - moonleay dot net. -
-
- -

4.2. Data Retention

- - As the bot does not collect personal data, data retention is not applicable. - -
-
- -

5. Compliance with GDPR

- - The bot is designed to comply with the GDPR and respects the rights of individuals - regarding their personal data. -
-
- -

6. Changes to the Privacy Policy

- - We reserve the right to update or modify this Privacy Policy at any time. Changes - will be effective immediately upon posting. Continued use of the bot after any - modifications indicates acceptance of the updated Privacy Policy. -
-
- -

7. Contact

- - For any inquiries or concerns regarding this Privacy Policy, please contact - us at contact at moonleay dot net. By using the li'l Judd Discord bot, you acknowledge - that you have read, understood, and agree to this Privacy Policy. -
+
+
+

GDPR Privacy Policy for li'l Judd

+

Last updated: 2023-12-05

+
+
+

1. Introduction

+

Welcome to li'l Judd! This Privacy Policy explains how we collect, use, disclose, and safeguard your personal information when you use our Discord bot service.

+
+
+

2. Data Controller

+

The data controller for the processing of your personal data is: Eric L +
+ Reachable by email at contact at moonleay dot net (See contact page.) +

+
+
+

3. Information We Collect

+

3.1 Discord User Data

+

+ We may collect and process the following personal data related to your Discord account & guilds: +

+
    +
  • +

    - Discord User ID

    +
    • +
  • +

    - Discord username, discriminator and IDs of users

    +
    • +
  • +

    - Guild name and ID

    +
    • +
  • +

    - Channel names and IDs of channels with active features

    +
    • +
  • +

    - Message IDs of the bot messages

    +
    • +
  • +

    - Role IDs of created roles

    +
    • +
+

3.2 Usage Data

+

We may collect information on how you interact with our bot, including but not limited to:

+
    +
  • +

    - Commands issued

    +
    • +
  • +

    - Server and channel information

    +
    • +
  • +

    - Timestamps of interactions

    +
    • +
+
+
+

4. How we use your Information

+

We process your personal data for the following purposes:

+
    +
  • +

    - To provide and maintain the bot service.

    +
    • +
  • +

    - To improve, customize, and optimize our bot.

    +
    • +
  • +

    - To respond to your requests, comments, or inquiries.

    +
    • +
  • +

    - To comply with legal obligations.

    +
    • +
+
+
+

5. Legal Basis for Processing

+

We process your personal data on the following legal bases:

+
    +
  • +

    - Consent: You have given your consent for the processing of your personal data for one or more specific purposes.

    +
    • +
  • +

    - Performance of a contract: The processing is necessary for the performance of the agreement between you and us.

    +
    • +
+
+
+

6. Data Sharing

+

We do not sell, trade, or otherwise transfer your personal information to third parties. However, we may share your information with:

+
    +
  • +

    - Third-party service providers involved in the operation and maintenance of the bot.

    +
    • +
+
+
+

7. Data Security

+

We implement reasonable security measures to protect your personal information from unauthorized access, disclosure, alteration, and destruction.

+
+
+

8. Your Rights

+

You have the following rights regarding your personal data:

+
    +
  • +

    - Right to withdraw consent: You have the right to withdraw your consent at any time. You can do this by contacting us at contact@moonleay.net.

    +
    • +
  • +

    - Right to rectification: You can request corrections to inaccurate or incomplete information.

    +
    • +
  • +

    - Right to erasure: You can request the deletion of your personal data.

    +
    • +
+
+
+

9. Changes to this Privacy Policy

+

We may update this Privacy Policy to reflect changes in our practices. The updated version will be posted on https://liljudd.ink/privacy-policy.

+
+
+

10. Contact Information

+

If you have any questions or concerns about this Privacy Policy, please contact us at contact@moonleay.net.

+
+
diff --git a/src/pages/terms-of-service.astro b/src/pages/terms-of-service.astro index e279b76..3f49076 100644 --- a/src/pages/terms-of-service.astro +++ b/src/pages/terms-of-service.astro @@ -1,98 +1,52 @@ --- import Layout from "@layouts/Layout.astro"; +import "../styles/pages/terms-of-service.scss"; --- -

Terms of Service

+
+

Terms of Service

+
+

Usage Agreement

+

+ By inviting the bot and using its features (commands, planning system) are you agreeing to the below mentioned Terms and Privacy Policy (Policy) of the bot.
-

Introduction

-

- Welcome to li'l Judd, an open-source Discord bot licensed under GNU GPL 3.0. - This document outlines the terms of service ("Terms") for using the li'l - Judd Discord bot ("the Bot") and the services associated with it. -
- By using the Bot, you agree to comply with these Terms, the GNU GPL 3.0 - license, and Discord's Terms of Service. -

+ You acknowledge that you have the privilege to use the bot freely on any Discord Server (Server) you share with it, that you can invite it to any Server that you have "Manage Server" rights for and that this privilege might get revoked for you, if you're subject of breaking the terms and/or policy of this bot, or the Terms of Service, Privacy Policy and/or Community Guidelines of Discord Inc.
-

1. Acceptance of Terms

-

- By using the Bot, you agree to be bound by these Terms and the GNU GPL 3.0 - license. If you do not agree with any of these terms, you are prohibited - from using the Bot. -

+ Through Inviting the bot may it collect specific data as described in its Policy.
+ The intended usage of this data is for core functionalities of the bot such as command handling, guild-specific settings and the time-planning system.
+

+
+
+

Intended Age

+

+ The bot may not be used by individuals under the minimal age described in Discord's Terms of Service.
+ Doing so will be seen as a violation of these terms and will result in a removal of the bot from any servers you own.
+

+
+
+

Affiliation

+

+ The Bot is not affiliated with, supported or made by Discord Inc.
+ Any direct connection to Discord or any of its Trademark objects is purely coincidental. We do not claim to have the copyright ownership of any of Discord's assets, trademarks or other intellectual property.
+

+
+
+

Liability

+

+ The owner of the bot may not be made liable for individuals breaking these Terms at any given time.
+ He has faith in the end users being truthfull about their information and not misusing this bot or the services of Discord Inc in a malicious way.
-

2. License

-

- The li'l Judd Discord Bot is open-source and licensed under GNU General - Public License (GPL) version 3.0. You are free to use, modify, and - distribute the Bot in accordance with the terms specified in the GNU GPL 3.0 - license. -

- -

3. Use of the Bot

- -

3.1. Compliance with Discord's Terms of Service

-

- You must abide by Discord's Terms of Service and Community Guidelines while - using the Bot. Any violation of Discord's policies may result in termination - of access to the Bot. -

- -

3.2. No Warranty

-

- The Bot is provided "as is" without any warranty, expressed or implied. The - authors and maintainers of the Bot are not responsible for any damages or - consequences resulting from the use of the Bot. -

- -

3.3. User Conduct

-

- You agree to use the Bot in a manner that is respectful, lawful, and in - compliance with all applicable laws and regulations. Any harmful or abusive - behavior towards others is strictly prohibited. -

- -

3.4. Modifications

-

- You may modify, adapt, or extend the Bot in accordance with the GNU GPL 3.0 - license, as long as any derivative work remains open-source and is also - licensed under GNU GPL 3.0. -

- -

4. Limitation of Liability

-

- The authors and maintainers of the Bot shall not be liable for any direct, - indirect, incidental, special, consequential, or exemplary damages arising - out of the use or inability to use the Bot. -

- -

5. Indemnification

-

- You agree to indemnify and hold harmless the authors and maintainers of the - Bot from any claims, damages, losses, or liabilities arising from your use - of the Bot or your breach of these Terms. -

- -

6. Governing Law

-

- These Terms are governed by and construed in accordance with the laws of - Germany. Any disputes arising under or in connection with these Terms shall - be subject to the exclusive jurisdiction of the courts in Germany. -

- -

7. Changes to the Terms

-

- We reserve the right to update or modify these Terms at any time. Changes - will be effective immediately upon posting. Continued use of the Bot after - any modifications indicates your acceptance of the updated Terms. -

- -

Contact

-

- If you have any questions or concerns regarding these Terms, you may contact - us at contact at moonleay dot net. By using the li'l Judd Discord Bot, you - acknowledge that you have read, understood, and agree to these Terms of - Service. -

+ We reserve the right to update these terms at our own discretion, giving you a 1-Week (7 days) period to opt out of these terms if you're not agreeing with the new changes. + You may opt out by Removing the bot from any Server you have the rights for. +

+
+
+

Contact

+

+ People may get in contact through e-mail at contact@moonleay.net, or through the official Support Discord of the Bot. + Other ways of support may be provided but aren't guaranteed. +

+
+
diff --git a/src/styles/pages/about.scss b/src/styles/pages/about.scss index 53cd9a4..4be1161 100644 --- a/src/styles/pages/about.scss +++ b/src/styles/pages/about.scss @@ -5,6 +5,10 @@ h1 { } .aboutdiv { + max-width: 1100px; + margin: 1rem auto; + width: 100%; + section { background-color: rgba(0, 0, 0, 0.5); border-radius: 4px; diff --git a/src/styles/pages/acknowledgements.scss b/src/styles/pages/acknowledgements.scss new file mode 100644 index 0000000..0bb168c --- /dev/null +++ b/src/styles/pages/acknowledgements.scss @@ -0,0 +1,58 @@ +.wrapper { + h1 { + @media (min-width: 420px) { + font-size: 3rem; + } + font-size: 2.8rem; + text-align: center; + margin-bottom: 1.2rem; + } + + section { + margin: 1rem; + + p, a { + @media (max-width: 420px) { + font-size: 0.75rem; + } + } + a { + color: white; + text-decoration: underline; + font-size: 0.9rem; + transition: 0.5s; + + &:hover { + color: rgb(96 59 255) !important; + } + } + + table { + background-color: rgba(0, 0, 0, 0.5); + border-radius: 4px; + padding: 1rem; + max-width: 1100px; + margin: 1rem auto; + width: 100%; + thead { + tr { + th { + text-align: left; + border-bottom: 1px solid white; + padding: 0.5rem; + font-size: 1.5rem !important; + font-weight: bolder; + } + } + } + tbody { + tr { + td { + //padding: 1.5rem 2rem; + } + } + } + + } + } +} diff --git a/src/styles/pages/contact.scss b/src/styles/pages/contact.scss index cfca583..d727f68 100644 --- a/src/styles/pages/contact.scss +++ b/src/styles/pages/contact.scss @@ -13,11 +13,18 @@ flex-direction: column; align-items: center; a { + color: white; + font-size: 0.9rem; + transition: 0.5s; display: flex; align-items: center; img { margin: 0 5px; } + + &:hover { + color: rgb(96 59 255) !important; + } } } } diff --git a/src/styles/pages/how-do-i.scss b/src/styles/pages/how-do-i.scss index dd177fe..33ea791 100644 --- a/src/styles/pages/how-do-i.scss +++ b/src/styles/pages/how-do-i.scss @@ -5,9 +5,12 @@ } .section { + max-width: 1100px; + margin: 1rem auto; + width: 100%; + background-color: rgba(0, 0, 0, 0.5); border-radius: 4px; - margin: 1rem; padding: 1rem; display: block; @@ -37,9 +40,12 @@ } .footernotesection { + max-width: 1100px; + margin: 1rem auto; + width: 100%; + justify-content: space-between; background-color: rgba(0, 0, 0, 0.5); border-radius: 4px; - margin: 1rem; padding: 1rem; display: block; text-align: center; diff --git a/src/styles/pages/imprint.scss b/src/styles/pages/imprint.scss new file mode 100644 index 0000000..71b0c97 --- /dev/null +++ b/src/styles/pages/imprint.scss @@ -0,0 +1,32 @@ +.wrapper { + h1 { + font-size: 3rem; + text-align: center; + margin-bottom: 1.2rem; + } + + p { + background-color: rgba(0, 0, 0, 0.5); + border-radius: 4px; + margin: 1rem; + padding: 1.5rem; + + @media (min-width: 1150px) { + max-width: 1100px; + margin: 1rem auto; + width: 100%; + } + + a { + color: white; + text-decoration: underline; + font-size: 0.9rem; + transition: 0.5s; + + &:hover { + color: rgb(96 59 255) !important; + } + } + } + +} diff --git a/src/styles/pages/privacy-policy.scss b/src/styles/pages/privacy-policy.scss new file mode 100644 index 0000000..8816c81 --- /dev/null +++ b/src/styles/pages/privacy-policy.scss @@ -0,0 +1,46 @@ +.wrapper { + div { + h1 { + font-size: 3rem; + text-align: center; + } + h4{ + font-size: 1.5rem; + text-align: center; + margin-bottom: 1.2rem; + } + } + + section { + background-color: rgba(0, 0, 0, 0.5); + border-radius: 4px; + margin: 1rem; + padding: 1rem; + display: block; + + @media (min-width: 1150px) { + max-width: 1100px; + margin: 1rem auto; + width: 100%; + } + + ul { + li { + padding-left: 1rem; + } + } + } + + p { + a { + color: white; + text-decoration: underline; + font-size: 0.9rem; + transition: 0.5s; + + &:hover { + color: rgb(96 59 255) !important; + } + } + } +} diff --git a/src/styles/pages/stack.scss b/src/styles/pages/stack.scss index 9af3872..370fb00 100644 --- a/src/styles/pages/stack.scss +++ b/src/styles/pages/stack.scss @@ -11,15 +11,12 @@ padding: 1.5rem; display: block; - @media (min-width: 950px) { - max-width: 900px; + @media (min-width: 1150px) { + max-width: 1100px; margin: 1rem auto; - display: flex; width: 100%; + display: flex; justify-content: space-between; - - //display: grid; - //grid-template-columns: repeat(4, 1fr); } img { @@ -42,8 +39,8 @@ border-radius: 4px; margin: 1rem; - @media (min-width: 950px) { - width: 900px; + @media (min-width: 1150px) { + width: 1100px; margin: 1rem auto; } diff --git a/src/styles/pages/terms-of-service.scss b/src/styles/pages/terms-of-service.scss new file mode 100644 index 0000000..f891cbd --- /dev/null +++ b/src/styles/pages/terms-of-service.scss @@ -0,0 +1,34 @@ +.wrapper { + h1 { + font-size: 3rem; + text-align: center; + margin-bottom: 1.2rem; + } + + div { + background-color: rgba(0, 0, 0, 0.5); + border-radius: 4px; + margin: 1rem; + padding: 1rem; + display: block; + + @media (min-width: 1150px) { + max-width: 1100px; + margin: 1rem auto; + width: 100%; + } + } + + p { + a { + color: white; + text-decoration: underline; + font-size: 0.9rem; + transition: 0.5s; + + &:hover { + color: rgb(96 59 255) !important; + } + } + } +}