Commit graph

308 commits

Author SHA1 Message Date
e5f82fdc41
Merge branch 'main' into dev 2024-07-01 14:56:41 +02:00
a4540c1f41
chore: update .gitignore to include build directory
Added the 'build/' directory to .gitignore to exclude build artifacts from version control. This change helps keep the repository clean by avoiding unnecessary files. No functional code changes were made.
2024-07-01 14:53:33 +02:00
ee2d53a36d
feat: extend asset copying to include data directory
All checks were successful
Build and Deploy Static Site / build (push) Successful in 58s
Expanded the asset copying functionality to also handle the 'data' directory in addition to the 'assets' folder. This ensures that both static assets and data files are included in the output directory, streamlining the build process and ensuring all necessary resources are available in the generated static site.
2024-07-01 12:12:39 +02:00
d57046fa57
Merge branch 'main' into dev 2024-07-01 12:11:05 +02:00
3c5b8ebc33
feat(data): update membership fees for July
Updated the EUR membership fee income from 20 to 45.
2024-07-01 12:10:53 +02:00
5cdb9ad43b
feat: add filter to convert month number to name
All checks were successful
Build and Deploy Static Site / build (push) Successful in 57s
Added a custom filter `month_name` to convert month numbers to their full names in templates. Updated the Transparency Report title to use this filter, enhancing readability and user experience. This change ensures that month names are displayed instead of numeric values, making the report titles clearer and more user-friendly.
2024-07-01 12:06:30 +02:00
feb273a8b0
Merge branch 'main' into dev
All checks were successful
Build and Deploy Static Site / build (push) Successful in 57s
2024-07-01 11:11:25 +02:00
7e89a67951
fix: include additional transparency data
Modified generate_transparency_table to include more detailed
transparency data by passing an additional boolean argument.
This change helps ensure all relevant data is captured and handled
properly, improving financial data accuracy and reporting.
2024-07-01 11:11:04 +02:00
8e81ba73b2
chore: remove Flask from requirements
All checks were successful
Build and Deploy Static Site / build (push) Successful in 57s
Removed Flask from the requirements.txt file as it is no longer needed for the project dependencies. This helps to streamline the dependency management and reduces potential security vulnerabilities that come with maintaining unnecessary packages.
2024-07-01 10:59:34 +02:00
3219a5019f
Merge branch 'main' into dev
All checks were successful
Build and Deploy Static Site / build (push) Successful in 1m0s
2024-07-01 10:51:12 +02:00
4f83a97f17
feat(build-dev): add --dev flag to generate static site
Added the --dev flag to the static site generation command in the build-dev workflow to ensure the development environment configurations are used during the build process. This change aims to align the build process with development-specific settings, enhancing consistency and correctness in the environment used for development builds.
2024-07-01 10:51:01 +02:00
69ef1f7a1a
feat: update README and asset paths for static site generation
All checks were successful
Build and Deploy Static Site / build (push) Successful in 1m0s
Switched the project description from a Flask application to a Jinja2 static website generator. Adjusted asset links in the base template to be relative, enhancing portability and simplifying deployments. These changes aim to better reflect the project's current architecture and usage.
2024-07-01 10:50:00 +02:00
b27ace9cb0
feat(build): add dev flag to static site generation
All checks were successful
Build and Deploy Static Site / build (push) Successful in 58s
Updated the build-dev CI workflow to run the static site generation with a development flag. This ensures the build script runs in the appropriate context for development environments. No issues referenced.
2024-07-01 10:47:28 +02:00
0b0f8bb3b2
fix(build): ensure .gitignore is included in temp site
All checks were successful
Build and Deploy Static Site / build (push) Successful in 58s
Added copying of .gitignore to the temporary static site location in both development and production build scripts. This prevents unnecessary files from being included in the new orphan branches, ensuring a cleaner and more efficient build process.
2024-07-01 10:37:42 +02:00
1434a3b552
Merge branch 'main' into dev
All checks were successful
Build and Deploy Static Site / build (push) Successful in 58s
2024-07-01 10:34:24 +02:00
1c9e1d6c68
fix(ci): force push to 'pages-dev' branch in build-dev workflow
Changed the force push target from 'pages' to 'pages-dev' to ensure the dev build process does not interfere with the production pages. This helps maintain a clear separation between development and production environments, reducing the risk of unintentional overwrites.
2024-07-01 10:34:16 +02:00
22529bfa65
Some checks failed
Build and Deploy Static Site / build (push) Failing after 58s
2024-07-01 10:31:52 +02:00
9030c527ef
Merge branch 'main' into dev
Some checks failed
Build and Deploy Static Site / build (push) Has been cancelled
2024-07-01 10:28:54 +02:00
ae2742ca58
chore(ci): rename build workflow and update branch targets
Renamed 'build.yml' to 'build-dev.yml' to clarify its purpose for development builds. Updated branch triggers and orphan branch naming to 'dev' and 'pages-dev' respectively to distinguish development deployment processes from production. This enhances workflow clarity and separation of concerns in CI/CD practices.
2024-07-01 10:27:21 +02:00
d337e8a207
feat(ci): automate build and deploy for dev and main branches
Some checks failed
Build and Deploy Static Site / build (push) Failing after 59s
- Added a new GitHub Actions workflow for the development branch to build and deploy the static site.
- Modified the existing workflow to trigger on the main branch instead of the static branch.
- Refactored the main.py script for consistency in string quotation.

The new workflow simplifies deployment processes during development, ensuring seamless and automated integration and testing.
2024-07-01 10:24:24 +02:00
03c1885af1
Merge branch 'dev' into static
All checks were successful
Build and Deploy Static Site / build (push) Successful in 1m1s
2024-07-01 10:07:45 +02:00
22cea7ea5c
fix(build): simplify Python package installation
Condensed the installation commands to streamline the setup process. Removed redundant pip upgrade step to avoid potential conflicts and expedite build workflow. No change to the overall functionality or dependency management.
2024-07-01 10:07:32 +02:00
b8851c8049
Merge branch 'dev' into static
Some checks failed
Build and Deploy Static Site / build (push) Failing after 55s
2024-07-01 10:04:39 +02:00
61ccd25ab5
fix(build): correct Python command invocations for build
Updated the build script to use `python3` and `pip3` commands, ensuring compatibility with environments where Python 2 might be the default. Also added `--break-system-packages` flag to `pip3` install to handle specific package installations without breaking the environment.
2024-07-01 10:04:05 +02:00
438461f333
Merge branch 'dev' into static
Some checks failed
Build and Deploy Static Site / build (push) Failing after 57s
2024-07-01 10:01:07 +02:00
7d23e465e2
fix(build): switch to container for build jobs
Replaces `runs-on` with `container` to utilize a Docker container
for node:20-bookworm. This enhances consistency and reproducibility
by standardizing the build environment across different runs.
2024-07-01 09:59:48 +02:00
d03828724f
feat(workflows): add CI/CD pipeline for static site
Set up a GitHub Actions workflow to build and deploy the static site from the 'static' branch to the 'pages' branch. This workflow includes steps to install dependencies, generate the static site using Python, and handle deployment through Git configuration and git commands.
2024-07-01 09:58:59 +02:00
61de9ec81b
feat: convert Flask app to static site generator
Refactored the Flask application to generate a static site instead of running as a dynamic web app. Added a CI workflow to build and deploy the static site on pushes to the 'static' branch.

- Replaced Flask route handling with a function that generates HTML files using Jinja2 templates.
- Modified the argparse logic to trigger the static site generation.
- Updated the .gitignore file to exclude the build directory.
- Created a Forgejo Actions workflow to automate the build and deploy process.

This change improves performance and reduces server overhead by serving pre-rendered static content.
2024-07-01 09:56:04 +02:00
f9fa18a8c1
fix: update metrics endpoint URL
Changed the metrics route from "/_metrics/" to "/metrics/" for consistency and better readability. This should enhance usability and clarity for users accessing the metrics endpoint.
2024-07-01 07:10:13 +02:00
1e2d1e4119
feat: add support for current balances in metrics
Extended `get_transparency_data` function to allow current balances by adding an `allow_current` parameter. This change facilitates the inclusion of up-to-date balance information in the metrics output, enhancing the accuracy of financial reporting.
2024-07-01 07:06:19 +02:00
1acc142dba
feat: add production debug config and enhance data handling
Introduced a new debug configuration for production mode in VSCode, facilitating easier debugging in different environments. Additionally, updated the `get_transparency_data` function to handle year and month as strings, ensuring compatibility with subsequent operations. Added a necessary parameter to a function call in `main.py` to align with the updated function signature.
2024-07-01 07:04:47 +02:00
a37e8ec5c3
feat: add option to exclude current month data
Enhanced `get_transparency_data` to support an `allow_current` flag, preventing the inclusion of data from the current month. This ensures historical data analysis remains consistent when current month data might be incomplete. Updated calls to the function to pass appropriate parameters.
2024-07-01 06:57:16 +02:00
7ac2d0e63a
feat(data): add new membership fees entry to finances
Added entry for membership fees in July to track additional revenue correctly. This update ensures financial data completeness and accuracy. No functional changes to the application's logic.
2024-07-01 06:51:28 +02:00
3cd2c7e551
Merge branch 'dev' 2024-06-30 19:18:53 +02:00
2357427d96
feat: add metrics endpoint and improve month handling
Added a new /_metrics/ endpoint to expose financial data in Prometheus format, facilitating better monitoring and analytics.

Enhanced the get_latest_month function to optionally exclude the current month, preventing potential issues in incomplete data scenarios, with this behavior being toggled by the application's development mode status.
2024-06-30 19:15:45 +02:00
ac5b16d2f7
feat: add onion service alternative for Invidious
Introduced a Tor-based alternative URL for Invidious to the services list.
This enhances accessibility for users preferring or requiring access
via the Tor network, improving privacy and circumventing network restrictions.
2024-06-30 18:47:19 +02:00
48f6055d1d
feat: update home header styling and messaging
Replaced "Pride" references with "Privacy" to revert pride month styling. Updated header background to primary gradient and replaced SVG with an image for improved maintainability. The changes aim to enhance visual appeal and clarity of the site's purpose.
2024-06-29 11:45:11 +02:00
94c71e340d
feat(data): add bank fees to financial records
Included bank fees under financial expenses in the JSON data. This ensures a more accurate and comprehensive representation of all outgoing costs, improving financial tracking and reporting.
2024-06-29 09:04:47 +02:00
0624fd6f13
fix(finances): update membership fees in EUR
Adjusted the membership fees value to 382.42 EUR to reflect the latest financial data. Ensures accurate financial reporting and accounting. No other changes to costs or revenue items.
2024-06-24 16:55:04 +02:00
413ea4593f
feat: Enhance membership section with CTA button
Updated membership information with pricing details and added
a call-to-action button linking to the join page. This aims to
increase engagement and improve user experience by providing
clear steps for potential new members.
2024-06-21 17:25:16 +02:00
374befd727
chore(finances): update membership fees and server costs
Increased membership fees to 375 EUR and adjusted server costs to -317.62 EUR. These changes reflect the latest budget review and ensure accurate financial reporting.
2024-06-21 13:12:15 +02:00
fefac8af6e
Merge branch 'main' into dev 2024-06-18 18:43:23 +02:00
791981b7f4
fix(css): remove redundant padding from .btn-primary .main-link
The padding on .btn-primary .main-link was redundant and inconsistent with the overall button styling. Removing it ensures better alignment and consistency in button appearance across the application.
2024-06-18 14:29:17 +02:00
f0ef0667a0
refactor(services): merge Piped and Invidious entries
Combined Piped and Invidious into a single service entry in the JSON file to avoid redundancy and simplify maintenance. Adjusted the descriptions and links accordingly to reflect the merged entry.
2024-06-18 14:26:50 +02:00
a664611f2d
feat(dropdown): add dropdown menu to service links
Enhanced the UI by adding dropdown menus to service links. This includes new styles for dropdowns in CSS and corresponding changes in the HTML templates. Also, extended `services.json` to support alternative links with Tor options for better accessibility.

Adjusted the maximum width for service cards to improve layout on larger screens.
2024-06-18 12:18:43 +02:00
2aed2b7cb4
fix: update room link to 'coffeespace'
Replaced the outdated room link to '#private-coffee:private.coffee' with the correct '#coffeespace:private.coffee' to ensure users are directed to the updated Private.coffee space.
2024-06-16 08:22:12 +02:00
7304b4dc6e
fix(data): move Transfer.coffee entry
Moved the  entry for Transfer.coffee in services.json. This prevents any potential confusion or discrepancies. No other entries were affected.
2024-06-15 15:32:46 +02:00
c8ba331e4c
feat(icons, services): add upload icon and new service
Added a new upload icon to the assets directory to enhance usability and UI consistency. Incorporated Transfer.coffee service for secure file transfers and moved GotHub entry for better data organization. This improves service discoverability and aligns with the project’s goal of providing diverse, privacy-respecting tools.
2024-06-15 15:29:53 +02:00
b47782b5e6
fix(finances): update EUR server costs in finances.json
Updated the server costs in EUR to reflect the latest billing.
Ensures financial records are accurate and up-to-date.
2024-06-14 14:29:45 +02:00
7f8592ea29
fix: update membership button text for inclusivity
Changed the text on the membership button from "JOIN & REBEL" to "JOIN & SUPPORT" in the base template. This adjustment better reflects the community spirit and aims to be more inclusive, encouraging broader participation. The update is part of ongoing efforts to make our digital spaces more welcoming and representative of our values.
2024-06-14 09:41:16 +02:00