Skip to content

Merge Main into v2-upgrades#14

Merged
AussieScorcher merged 8 commits intov2-upgradesfrom
main
Jul 14, 2025
Merged

Merge Main into v2-upgrades#14
AussieScorcher merged 8 commits intov2-upgradesfrom
main

Conversation

@AussieScorcher
Copy link
Member

@AussieScorcher AussieScorcher commented Jul 14, 2025

This pull request introduces several updates, including enhancements to CI/CD workflows, dependency management, and code readability improvements. The most important changes include adding Dependabot configuration for automated dependency updates, setting up a CI workflow for testing and building the project, upgrading React-related dependencies, and implementing a utility function to improve the readability of download counts.

CI/CD and Dependency Management Updates:

  • .github/dependabot.yml: Added configuration for Dependabot to automate weekly dependency updates for npm, cargo, and nuget ecosystems, with a limit of 5 open pull requests per ecosystem.
  • .github/workflows/ci.yml: Created a CI workflow to run tests, linting, and build processes on pull requests and pushes to the main branch.

Dependency Upgrades:

  • package.json: Upgraded react and react-dom to version ^19.1.0, and updated react-leaflet to version ^5.0.0. Corresponding type definitions (@types/react and @types/react-dom) were also updated to match the new versions. Additionally, upgraded eslint to version ^9.31.0. [1] [2]

Code Readability Improvements:

  • src/utils/numberUtils.js: Added a new utility function roundDownloadCount to round download numbers to the nearest 100 or 1000 for better readability.
  • src/components/home/Hero.jsx: Integrated roundDownloadCount into the DownloadButton component to display rounded download counts. [1] [2]

AussieScorcher and others added 8 commits July 14, 2025 00:20
@AussieScorcher
chore: add dependabot configuration for npm, cargo, and nuget (#3)
075e965
@AussieScorcher
chore: add CI workflow for testing and building the project
b146e0e
@dependabot
chore(deps): bump @react-google-maps/api from 2.20.6 to 2.20.7 (#7)
5468034 
Bumps [@react-google-maps/api](https://github.com/JustFly1984/react-google-maps-api/tree/HEAD/packages/react-google-maps-api) from 2.20.6 to 2.20.7.
- [Changelog](https://github.com/JustFly1984/react-google-maps-api/blob/develop/packages/react-google-maps-api/CHANGELOG.md)
- [Commits](https://github.com/JustFly1984/react-google-maps-api/commits/HEAD/packages/react-google-maps-api)

---
updated-dependencies:
- dependency-name: "@react-google-maps/api"
  dependency-version: 2.20.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
chore(deps-dev): bump eslint from 9.28.0 to 9.31.0 (#6)
be1f3f2 
Bumps [eslint](https://github.com/eslint/eslint) from 9.28.0 to 9.31.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](eslint/eslint@v9.28.0...v9.31.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-version: 9.31.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@AussieScorcher
chore: remove unused dependencies from package.json
6929e77
@dependabot @AussieScorcher
chore(deps): bump react and @types/react (#8)
1170946 
* chore(deps): bump react and @types/react

Bumps [react](https://github.com/facebook/react/tree/HEAD/packages/react) and [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react). These dependencies needed to be updated together.

Updates `react` from 18.3.1 to 19.1.0
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/v19.1.0/packages/react)

Updates `@types/react` from 18.3.23 to 19.1.8
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react)

---
updated-dependencies:
- dependency-name: react
  dependency-version: 19.1.0
  dependency-type: direct:production
  update-type: version-update:semver-major
- dependency-name: "@types/react"
  dependency-version: 19.1.8
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* chore: update dependencies for React and related packages

- Upgraded react-dom from ^18.3.1 to ^19.1.0
- Upgraded react-leaflet from ^4.2.1 to ^5.0.0
- Updated @types/react-dom from ^18.3.5 to ^19.1.6

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: AussieScorcher <edward@stopbars.com>
@AussieScorcher
Round download numbers for better readability (#11)
dcd6e79 
* Initial plan

* Add utility function for rounding download numbers and integrate it into Hero component

Co-authored-by: AussieScorcher <67866285+AussieScorcher@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: AussieScorcher <67866285+AussieScorcher@users.noreply.github.com>
Co-authored-by: Scorcher <edward@stopbars.com>
@AussieScorcher @github-advanced-security
Potential fix for code scanning alert no. 1: Workflow does not contai…
9e9ccd1 
…n permissions (#13)

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
@AussieScorcher AussieScorcher merged commit 1c8ba0d into v2-upgrades Jul 14, 2025
4 checks passed
AussieScorcher added a commit that referenced this pull request Jul 26, 2025
@AussieScorcher @llamavert
@dependabot @github-advanced-security
V2 Upgrades (#25)
1644b38 
* feat: Initial major website overhaul for v2

* feat: Removed old division name requirement, updated formatting for VAT and vACC division naming

* feat: Added NOTAM management backend intergration with publish and edit functionality,, localStorage cache updates, etc

* feat: Add console ASCII banner with contribution and donate links

* feat: Update Footer component layout and styling for mobile responsiveness and visual consistency

* feat: Add retry logic for API calls and improve error handling in Hero component

* fix: Correct typo in Support component help message

* feat: Enhance ConsentBanner component with improved styling and design

* refactor: Remove unused dependencies from package.json

* chore: update project name and dependencies

- Changed project name from "bars-website" to "bars-site".
- Updated React and React DOM to version 19.1.0.
- Upgraded react-leaflet to version 5.0.0.
- Added mapbox-gl dependency at version 3.9.4.
- Updated TypeScript types for React and React DOM to match the new versions.
- Bumped eslint version to 9.31.0.

* Merge Main into v2-upgrades (#14)

* chore: add dependabot configuration for npm, cargo, and nuget (#3)

* chore: add CI workflow for testing and building the project

* chore(deps): bump @react-google-maps/api from 2.20.6 to 2.20.7 (#7)

Bumps [@react-google-maps/api](https://github.com/JustFly1984/react-google-maps-api/tree/HEAD/packages/react-google-maps-api) from 2.20.6 to 2.20.7.
- [Changelog](https://github.com/JustFly1984/react-google-maps-api/blob/develop/packages/react-google-maps-api/CHANGELOG.md)
- [Commits](https://github.com/JustFly1984/react-google-maps-api/commits/HEAD/packages/react-google-maps-api)

---
updated-dependencies:
- dependency-name: "@react-google-maps/api"
  dependency-version: 2.20.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps-dev): bump eslint from 9.28.0 to 9.31.0 (#6)

Bumps [eslint](https://github.com/eslint/eslint) from 9.28.0 to 9.31.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](eslint/eslint@v9.28.0...v9.31.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-version: 9.31.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore: remove unused dependencies from package.json

* chore(deps): bump react and @types/react (#8)

* chore(deps): bump react and @types/react

Bumps [react](https://github.com/facebook/react/tree/HEAD/packages/react) and [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react). These dependencies needed to be updated together.

Updates `react` from 18.3.1 to 19.1.0
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/v19.1.0/packages/react)

Updates `@types/react` from 18.3.23 to 19.1.8
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react)

---
updated-dependencies:
- dependency-name: react
  dependency-version: 19.1.0
  dependency-type: direct:production
  update-type: version-update:semver-major
- dependency-name: "@types/react"
  dependency-version: 19.1.8
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* chore: update dependencies for React and related packages

- Upgraded react-dom from ^18.3.1 to ^19.1.0
- Upgraded react-leaflet from ^4.2.1 to ^5.0.0
- Updated @types/react-dom from ^18.3.5 to ^19.1.6

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: AussieScorcher <edward@stopbars.com>

* Round download numbers for better readability (#11)

* Initial plan

* Add utility function for rounding download numbers and integrate it into Hero component

Co-authored-by: AussieScorcher <67866285+AussieScorcher@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: AussieScorcher <67866285+AussieScorcher@users.noreply.github.com>
Co-authored-by: Scorcher <edward@stopbars.com>

* Potential fix for code scanning alert no. 1: Workflow does not contain permissions (#13)

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>

* chore: update dependencies and improve FAQ component styles

- Updated `lucide-react` from `0.471.2` to `0.525.0`
- Updated `react-markdown` from `9.0.3` to `10.1.0`
- Added `@tailwindcss/postcss` as a new dev dependency
- Updated `globals` from `15.14.0` to `16.3.0`
- Updated `tailwindcss` from `3.4.17` to `4.1.11`
- Updated `vite` from `6.0.5` to `7.0.4`
- Enhanced FAQ component styles for better user interaction and visual feedback

* chore: downgrade vite version from 7.0.5 to 7.0.4 in package-lock.json

* Merge Main into V2 (#20)

* chore: add dependabot configuration for npm, cargo, and nuget (#3)

* chore: add CI workflow for testing and building the project

* chore(deps): bump @react-google-maps/api from 2.20.6 to 2.20.7 (#7)

Bumps [@react-google-maps/api](https://github.com/JustFly1984/react-google-maps-api/tree/HEAD/packages/react-google-maps-api) from 2.20.6 to 2.20.7.
- [Changelog](https://github.com/JustFly1984/react-google-maps-api/blob/develop/packages/react-google-maps-api/CHANGELOG.md)
- [Commits](https://github.com/JustFly1984/react-google-maps-api/commits/HEAD/packages/react-google-maps-api)

---
updated-dependencies:
- dependency-name: "@react-google-maps/api"
  dependency-version: 2.20.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps-dev): bump eslint from 9.28.0 to 9.31.0 (#6)

Bumps [eslint](https://github.com/eslint/eslint) from 9.28.0 to 9.31.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](eslint/eslint@v9.28.0...v9.31.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-version: 9.31.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore: remove unused dependencies from package.json

* chore(deps): bump react and @types/react (#8)

* chore(deps): bump react and @types/react

Bumps [react](https://github.com/facebook/react/tree/HEAD/packages/react) and [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react). These dependencies needed to be updated together.

Updates `react` from 18.3.1 to 19.1.0
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/v19.1.0/packages/react)

Updates `@types/react` from 18.3.23 to 19.1.8
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react)

---
updated-dependencies:
- dependency-name: react
  dependency-version: 19.1.0
  dependency-type: direct:production
  update-type: version-update:semver-major
- dependency-name: "@types/react"
  dependency-version: 19.1.8
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* chore: update dependencies for React and related packages

- Upgraded react-dom from ^18.3.1 to ^19.1.0
- Upgraded react-leaflet from ^4.2.1 to ^5.0.0
- Updated @types/react-dom from ^18.3.5 to ^19.1.6

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: AussieScorcher <edward@stopbars.com>

* Round download numbers for better readability (#11)

* Initial plan

* Add utility function for rounding download numbers and integrate it into Hero component

Co-authored-by: AussieScorcher <67866285+AussieScorcher@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: AussieScorcher <67866285+AussieScorcher@users.noreply.github.com>
Co-authored-by: Scorcher <edward@stopbars.com>

* Potential fix for code scanning alert no. 1: Workflow does not contain permissions (#13)

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>

* chore(deps): bump react-markdown from 9.1.0 to 10.1.0 (#16)

* chore(deps-dev): bump vite from 6.3.5 to 7.0.4 (#17)

* chore(deps-dev): bump globals from 15.15.0 to 16.3.0 (#15)

* chore(deps): bump lucide-react from 0.471.2 to 0.525.0 (#18)

* chore(deps-dev): bump tailwindcss from 3.4.17 to 4.1.11 (#19)

* chore(deps-dev): bump tailwindcss from 3.4.17 to 4.1.11

Bumps [tailwindcss](https://github.com/tailwindlabs/tailwindcss/tree/HEAD/packages/tailwindcss) from 3.4.17 to 4.1.11.
- [Release notes](https://github.com/tailwindlabs/tailwindcss/releases)
- [Changelog](https://github.com/tailwindlabs/tailwindcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/tailwindlabs/tailwindcss/commits/v4.1.11/packages/tailwindcss)

---
updated-dependencies:
- dependency-name: tailwindcss
  dependency-version: 4.1.11
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* chore: update dependencies and improve button accessibility

- Added @tailwindcss/postcss to devDependencies for better PostCSS integration.
- Updated postcss.config.js to use '@tailwindcss/postcss' plugin.
- Enhanced button components with cursor-pointer class for better accessibility.
- Updated global styles to use direct CSS properties instead of Tailwind's @apply for better control.
- Fixed import statement in tailwind.config.js for the typography plugin.

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: AussieScorcher <edward@stopbars.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>

* update package-lock.json

* refactor: clean up dependencies and improve code quality

- Removed unused dependencies from package.json to streamline the project.
- Enhanced the parseMarkdown function in DocsContent.jsx for better key handling.
- Cleaned up console logs in DocsSidebar.jsx for improved performance.
- Added aria-labels for better accessibility in Airports.jsx and DonationBanner.jsx.
- Updated styles in Hero.jsx and Support.jsx for a more cohesive design.
- Improved button styles in Button.jsx for better focus and hover states.
- Added user divisions feature in Account.jsx to display user roles.
- Implemented CSS loading optimization in vite.config.js for better performance.

* feat: add 'VATSIM Divisions' to topic options in Contact component

* feat: enhance DivisionManagement with member removal confirmation and loading states
refactor: improve FAQ component transitions and styling
refactor: update icons in Account component for better clarity
style: adjust Footer text color for improved visibility
style: update button styles in AirportPointEditor for consistency

* feat: update Documentation and Support components with new content, designs, and icons

* Replaces localStorage with cross-domain cookie utils for token management

Introduces centralized cookie utilities to enable VATSIM token sharing across stopbars.com subdomains. Maintains backward compatibility by checking localStorage first, then falling back to cookies.

Improves user experience by allowing seamless authentication across different stopbars.com applications without requiring separate logins.

* fix: update cookie samesite attribute to 'strict' and clean up deleteCookie function

* feat: implement DivisionManagement and AirportManagement components with data fetching and UI enhancements

* feat: add getVatsimToken utility in DivisionManagement and PendingAirportRequests components

* feature: disable remove member button when only one member is present in Division

* feat: enhance Account and DivisionsManagement components with updated loading indicators and view mode toggle

- Added Loader component for loading states in Account and DivisionsManagement pages.

- Updated button text from "View Division" to "Manage Division" for clarity.

- Introduced view mode toggle (list/grid) in DivisionsManagement for improved user experience.

- Enhanced layout and styling for better visual consistency.

* feat: fetch current user ID in DivisionManagement and disable self-removal from division

- Added state to store current user ID and fetch it from the account API.
- Updated remove member button to disable when the current user attempts to remove themselves from the division.

* Update vite.config.js

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update vite.config.js

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update src/utils/cookieUtils.js

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Potential fix for code scanning alert no. 4: DOM text reinterpreted as HTML

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>

* feat: add dompurify and @types/trusted-types for improved security and type definitions

* feat: import getVatsimToken in multiple components and clean up unused imports

* refactor: update import path for getVatsimToken to use cookieUtils in AirportPointEditor and NewDivision components

* Add dompurify dependency and create wrangler configuration file

- Added "dompurify" as a dependency in package.json.
- Introduced a new wrangler.toml file for project configuration.

* fix: update ContributionDashboard for improved rendering and add cursor pointer to tab buttons; update wrangler.toml for single-page application handling

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Charlie <charliejharris09@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@AussieScorcher