github pages, lint

.github/workflows/static.yml

@@ -29,15 +29,17 @@ jobs:
  url: ${{ steps.deployment.outputs.page_url }}
  runs-on: ubuntu-latest
  steps:
- - name: Checkout
- uses: actions/checkout@v4
- - name: Setup Pages
- uses: actions/configure-pages@v4
- - name: Upload artifact
- uses: actions/upload-pages-artifact@v2
+ - uses: actions/checkout@v4
+ - uses: actions/setup-python@v5
  with:
- # Upload entire repository
- path: '.'
- - name: Deploy to GitHub Pages
- id: deployment
+ python-version: '3.11'
+ - run: pip install marko
+ - run: |
+ cd website
+ ./generate.py
+ - uses: actions/configure-pages@v4
+ - uses: actions/upload-pages-artifact@v2
+ with:
+ path: './website/_out'
+ - id: deployment
  uses: actions/deploy-pages@v3

setup.py

@@ -7,7 +7,7 @@
  'nginxfmt',
  'python-dotenv',
  'ruff',
- 'marko'
+ 'marko',
 ]
 
 

website/assets/style.css

@@ -197,4 +197,4 @@ hr {
  height: 1px;
  background-color: #555;
  margin: 2em 0;
-}
+}

website/blocks/main.md

@@ -93,5 +93,3 @@ You do not need to display the OpenFreeMap part, but it is nice if you do.
 ## License
 
 The license of this project is [MIT](https://www.tldrlegal.com/license/mit-license). Map data is from [OpenStreetMap](https://www.openstreetmap.org/copyright). The licenses for included projects are listed in [LICENSE.md](https://github.com/hyperknot/openfreemap/blob/main/LICENSE.md).
-
-### 

website/blocks/privacy.md

@@ -21,82 +21,79 @@ Your privacy is important to us, so Hyperknot Software Kft., a company based in
 The terms "You," "Your," "Yours" and "User" refer to the entity/person/organization using our Site.
 When this Policy mentions "We", "Us," and "Our" it refers to Hyperknot Software Kft. and its subsidiaries and affiliates.
 
-
 This Privacy Policy is governed by our [Terms of Services](https://openfreemap.org/tos).
 
 For any questions regarding this Policy or any requests regarding the processing of personal data, please contact us at privacy@openfreemap.org.
 
 ## 1. INFORMATION WE COLLECT AUTOMATICALLY
+
 When you use our Site or contact us directly we may collect information, including your personal information, about the way you act in our Site, the services You use and how You use them.
 This information is necessary for the adequate performance of the contract between You and us, to enable us to comply with legal obligations and given our legitimate interest in being able to provide and improve the functionalities of the Site.
 
- - Log data and Device information. We automatically collect log data and device information when you access and use the Site, even if you have not created an Account or logged in. That information includes, among other things: Internet protocol (IP) addresses, Browser type, Referring/exit pages, Date/time stamp, Operating system.
-
-
+- Log data and Device information. We automatically collect log data and device information when you access and use the Site, even if you have not created an Account or logged in. That information includes, among other things: Internet protocol (IP) addresses, Browser type, Referring/exit pages, Date/time stamp, Operating system.
 
 ## 2. THE WAY WE USE YOUR INFORMATION
+
 We process your information adhering to the general data processing principles.
 We may use the information we collect through our Site for a number of reasons, including to:
 
- - to ensure data security and prevent fraud
- - to improve services
+- to ensure data security and prevent fraud
+- to improve services
 
 We will normally collect personal information from you only where we have your consent to do so, where we need the personal information to perform a contract with you, or where the processing is in our legitimate business interests.
 
-
 ## 3. COOKIES
-We do not use cookies or other tracking technologies.
 
+We do not use cookies or other tracking technologies.
 
 ## 4. INFORMATION FROM MINORS
+
 This site and our Services are not intended for or directed to persons under the age of 18. We do not knowingly collect or ask for information from minors. We do not knowingly allow minors to use our Site or Services.
 We will delete any information we discover is collected from a minor. Please contact us using the contact details below if you believe we might have information about a minor.
 
-
 ## 5. SENSITIVE INFORMATION
+
 We do not collect sensitive information such as political opinions, religious or philosophical beliefs, racial or ethnic origin, genetic data, biometric data, health data or data related a sexual orientation.
 Please do not send, upload, or provide us any sensitive data and contact us using the contact details below if you believe that we might have such information. We have a right to delete any information we believe it might contain sensitive data.
 
-
 ## 6. PAYMENT INFORMATION
-To order and use our services we may require you to provide certain financial information to facilitate the processing of payments. We will not store or collect your payment card details. That information is provided directly to our third-party payment processors whose use of your Personal information is governed by their Privacy Policy. All payment data is stored by Paddle, Lemon Squeezy. You may find their privacy policy link(s) here: [https://www.paddle.com/legal/privacy](https://www.paddle.com/legal/privacy) [https://www.lemonsqueezy.com/privacy](https://www.lemonsqueezy.com/privacy).
 
+To order and use our services we may require you to provide certain financial information to facilitate the processing of payments. We will not store or collect your payment card details. That information is provided directly to our third-party payment processors whose use of your Personal information is governed by their Privacy Policy. All payment data is stored by Paddle, Lemon Squeezy. You may find their privacy policy link(s) here: [https://www.paddle.com/legal/privacy](https://www.paddle.com/legal/privacy) [https://www.lemonsqueezy.com/privacy](https://www.lemonsqueezy.com/privacy).
 
 ## 7. RETENTION
+
 We retain your personal information to provide services to you and as otherwise necessary to comply with our legal obligation, resolve disputes, and enforce our agreements.
 We will retain your personal information as long as we need it to provide services to you, unless we are otherwise required by law or regulations to retain your personal information longer.
 
-
 ## 8. SECURITY
+
 We have implemented security measures designed to protect the personal information you share with us, including physical, electronic and procedural measures. Among other things, we regularly monitor our systems for possible vulnerabilities and attacks.
 Regardless of the measures and efforts taken by us, the transmission of information via internet, email or text message is not completely secure. We do not guarantee the absolute protection and security of your personal information.
 We therefore encourage you to avoid providing us or anyone with any sensitive information of which you believe its disclosure could cause you substantial or irreparable harm.
 If you have any questions regarding the security of our Site or Services, you are welcome to contact us at security@openfreemap.org.
 
-
 ## 9. YOUR RIGHTS
-You are entitled to a range of rights regarding the protection of your personal information. Those rights are:
-
- - The right to access the information we have about you. If you wish to access your personal information that we collect, you can do so at any time by contacting us using the contact details provided below.
- - The right to rectify inaccurate information about you. You can correct, update or request deletion of your personal information by contacting us using the contact details provided below.
- - The right to object the processing. When we rely on your consent to process your personal information, you may withdraw consent at any time by contacting us using the contact details provided below. This will not affect the lawfulness of processing prior to the withdrawal of your consent.
- - The right to lodge a complaint. You can raise questions or complaints to the national Data Protection Agency in your country of residence in the event where your rights may have been infringed. However, we recommend attempting to reach a peaceful resolution of the possible dispute by contacting us first.
- - The right to erase any data concerning you. You may demand erasure of data without undue delay for legitimate reasons, e.g. where data is no longer necessary for the purposes it was collected, or where the data has been unlawfully processed.
 
+You are entitled to a range of rights regarding the protection of your personal information. Those rights are:
 
+- The right to access the information we have about you. If you wish to access your personal information that we collect, you can do so at any time by contacting us using the contact details provided below.
+- The right to rectify inaccurate information about you. You can correct, update or request deletion of your personal information by contacting us using the contact details provided below.
+- The right to object the processing. When we rely on your consent to process your personal information, you may withdraw consent at any time by contacting us using the contact details provided below. This will not affect the lawfulness of processing prior to the withdrawal of your consent.
+- The right to lodge a complaint. You can raise questions or complaints to the national Data Protection Agency in your country of residence in the event where your rights may have been infringed. However, we recommend attempting to reach a peaceful resolution of the possible dispute by contacting us first.
+- The right to erase any data concerning you. You may demand erasure of data without undue delay for legitimate reasons, e.g. where data is no longer necessary for the purposes it was collected, or where the data has been unlawfully processed.
 
 ## 10. APPLICATION OF POLICY
-This Policy applies only to the services offered by our Company. Our Policy does not apply to services offered by other companies or individuals, including products or sites that may be displayed to you in search results, sites that may include our services or other sites linked from our Site or Services.
 
+This Policy applies only to the services offered by our Company. Our Policy does not apply to services offered by other companies or individuals, including products or sites that may be displayed to you in search results, sites that may include our services or other sites linked from our Site or Services.
 
 ## 11. AMENDMENTS
-Our Policy may change from time to time. We will post any Policy changes on our Site and, if the changes are significant, we may consider providing a more explicit notice (including, for certain services, email notification of Policy changes).
 
+Our Policy may change from time to time. We will post any Policy changes on our Site and, if the changes are significant, we may consider providing a more explicit notice (including, for certain services, email notification of Policy changes).
 
 ## 12. ACCEPTANCE OF THIS POLICY
-We assume that all Users of this Site have carefully read this document and agree to its contents. If someone does not agree with this Policy, they should refrain from using our Site. We reserve the right to change our Policy at any time and inform by using the way as indicated in Section 11. Continued use of this Site implies acceptance of the revised Policy.
 
+We assume that all Users of this Site have carefully read this document and agree to its contents. If someone does not agree with this Policy, they should refrain from using our Site. We reserve the right to change our Policy at any time and inform by using the way as indicated in Section 11. Continued use of this Site implies acceptance of the revised Policy.
 
 ## 13. FURTHER INFORMATION
-If you have any further questions regarding the data we collect, or how we use it, then please feel free to contact us at the details as indicated above.
 
+If you have any further questions regarding the data we collect, or how we use it, then please feel free to contact us at the details as indicated above.