Commit graph

241 commits

Author SHA1 Message Date
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
ca016957cf
fix(data): update membership fee income in finances.json
Increased the monthly membership fee income to date from 50 EUR to 350 EUR. This change ensures accurate financial reporting and budget planning.
2024-06-14 09:26:10 +02:00
31b6f3325c
fix: update server costs in finances.json
Adjusted the EUR server costs entry in finances.json to reflect the recent increase in expenditures. This ensures financial data accuracy and up-to-date budgeting.
2024-06-12 12:45:22 +02:00
b29ba5b52d
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-12 12:07:44 +02:00
d7c309a585
feat: add VSCode debug configuration for Python
Introduces a new VSCode debug configuration to streamline debugging for Python scripts. This configuration includes settings to launch the main.py program using the integrated terminal within the current workspace and sets an environment variable for development purposes.
2024-06-12 12:07:29 +02:00
47c2fa9455
fix(finances): update server costs in EUR
Adjusted the server costs in the finances dataset to reflect the latest expense of -85.62 EUR. This ensures the financial records are accurate and up-to-date.
2024-06-12 12:00:40 +02:00
54cfe65cd5
feat(icons): add LGBTIQ+ rainbow icon
Introduced a new LGBTIQ+ rainbow icon SVG to enhance visual representation and inclusivity on the platform. This update includes the integration of the icon within the base template, specifically at the footer section to signal support for the LGBTIQ+ community. This change aligns with our commitment to diversity and inclusiveness.
2024-06-08 13:41:04 +02:00
7e8a6e655b
Merge branch 'pride' into dev 2024-06-08 13:25:05 +02:00
5f1de8b4f0
feat: Improve responsive design for larger screens
Adjust the media query breakpoint to 991px to enhance the responsive layout for devices with larger screens. Added specific styling for `p.text-center.special-header` to increase the font size for improved readability. Optimized CSS to ensure primary buttons and navigation elements adapt more smoothly across a wider range of device widths. These adjustments make the UI more flexible and visually accessible, addressing user feedback on readability and interaction with key UI elements on tablets and smaller laptop screens.
2024-06-08 09:17:13 +02:00
abb6c8def0
feat(base.html): improve navbar responsiveness
Removed the 'sticky-top' and 'navbar-shrink' classes from the navbar in base.html to enhance its responsiveness and adaptability across different screen sizes. This change aims to offer a more streamlined user experience by ensuring the navbar's style and position remain consistent and unobtrusive, particularly on mobile devices where screen real estate is limited.
2024-06-08 09:16:42 +02:00
8b4f7eb6ce
feat: Introduce Pride theme and improve layout readability
- Added '.bg-pride-gradient' class to CSS for a colorful background gradient celebrating Pride Month, replacing the previous primary gradient. This change visually signifies our support for the LGBTQ+ community.
- Replaced the header logo with a detailed vector image to enhance visual engagement.
- Reformatted the HTML structure to improve code readability and maintainability. This involves adjusting indentation and whitespace, making the code easier to follow and modify.
- Updated section headers and content organization in the index page to enhance information flow and user engagement.

This update aligns with the initiative to celebrate and acknowledge Pride Month, reflecting our commitment to inclusivity. Additionally, the introduction of a more detailed logo and the restructured HTML seeks to enhance overall site aesthetics and user experience.
2024-06-07 22:51:24 +02:00
2b7ab71476
feat(icons): add LGBTIQ+ rainbow icon
Introduced a new LGBTIQ+ rainbow icon SVG to enhance visual representation and inclusivity on the platform. This update includes the integration of the icon within the base template, specifically at the footer section to signal support for the LGBTIQ+ community. This change aligns with our commitment to diversity and inclusiveness.
2024-06-07 18:54:15 +02:00
a874ae944a
feat(index.html): update call-to-action text
Updated the call-to-action text in the card body from "Join and support us" to "Join or donate" to offer website visitors a clearer choice between joining the community or making a donation. This change aims to streamline user decisions and potentially increase conversions by directly addressing the primary actions users can take to support the open-source community.
2024-06-07 18:13:54 +02:00
1032650185
feat(index.html): Update membership CTA messaging
Updated the call-to-action text from "Join and rebel" to "Join or donate" on the homepage membership section. This change aims to communicate a more inclusive and supportive stance towards potential members, encouraging broader participation in the open source community. The adjustment reflects a strategic shift to emphasize collaboration and support over confrontation.
2024-06-07 18:13:00 +02:00
e37aff88a3
feat(finances): increase server costs in budget
Updated the budget to reflect a more accurate estimation of monthly server costs. The increase from EUR 21.94 to EUR 69.67 addresses recent upgrades and higher usage rates, ensuring the budget more closely matches operational expenditures. This change is crucial for maintaining financial transparency and aids in future planning.
2024-06-05 14:01:54 +02:00
5e20c5f225
feat(finances): Add membership fees to budget
Introduce a new "Membership Fees" category in the financial data, with an initial amount of 50 EUR. This update is crucial for providing a more comprehensive view of our income streams alongside our expenditures, ensuring our budget reflects all financial aspects accurately. This addition aids in better financial planning and resource allocation for future projects and needs.
2024-06-03 18:36:48 +02:00
1a10e8968b
feat: Enhance financial transparency
Introduced detailed financial reporting on a per-category basis, including notes for specific expenses and administrative costs in the data model. Enhanced the financial transparency feature by integrating a monthly financial report generator in the backend, enabling dynamic generation and display of detailed financial reports on the website. This commit also includes a new transparency report page, enriching user engagement with detailed insights into financial allocations and expenditures.

- Refactored finance-related data structures to include notes about specific financial activities.
- Extended the financial reporting capabilities to generate and display detailed notes and categorizations of expenses and incomes, improving transparency.
- Updated the UI to display these detailed reports, ensuring that users have access to comprehensive financial information.

This change aligns with our commitment to transparency and accountability by providing clear, detailed financial information to our members and donors.
2024-06-03 16:12:21 +02:00
f9c23a6fca
feat: Add uWSGI config for privatecoffee-dev
Introduce a new uWSGI configuration for the Private.coffee development environment. This setup specifies the main application module, user/group IDs, process management settings, Python plugin usage, virtual environment path, working directory, environment variables, and socket ownership settings. It is tailored to streamline development workflows by ensuring that the server environment closely mirrors production settings while incorporating development-specific features such as debug mode. This addition marks a foundational step in improving local development setup and potentially eases the transition between development and production environments.

This configuration uses environment variables to flag development mode, enabling enhanced logging and debug capabilities without affecting the production settings. It also outlines the setup for socket communication and permissions, ensuring secure and efficient inter-process communication during development.

The choice of uWSGI parameters and settings was made to optimize resource usage and facilitate a more controlled development environment, aiming for consistency across development and deployment stages.
2024-06-03 08:33:31 +02:00