Skip to content

Commit

Permalink
Promote staging to production (#2235)
Browse files Browse the repository at this point in the history
* Add / edit deploy configuration

* Add / edit deploy configuration

* Add / edit deploy configuration

* Add / edit deploy configuration

* Add / edit deploy configuration

* Add / edit deploy configuration

* Add / edit deploy configuration

* Add / edit deploy configuration

* Add / edit deploy configuration

* fix: split the healthcheck and external Node Ping paths (resolve #2042) (#2152)

* ci: 👷 changed internal healthcheck path

* fix: create maintance mode exception paths that will bypass maintenance mode

* ci: 👷 added vite build to container

* build: 👷 removed npm build since it is redundant

---------

Co-authored-by: Justin Obara <[email protected]>

* feat: enable searching for engagements (resolves #2079( (#2165)

* fix: org url on project page goes to 404

* feat: browse engagements

* test: remove seeders from engagement tests

* style: remove trailing commas from json file

* feat: engagements i've joined page

* feat: my projects page only for organizations

* test: update organization tests

* chore(localization): update translations (#2179)

* chore(localization): translate en.json into French, Canada

* chore(localization): translate routes.php into French, Canada

* chore(localization): translate en.json into French, Canada

---------

Co-authored-by: Justin Obara <[email protected]>

* fix: php values breaking alpine model data (resolves #2180) (#2185)

* fix: php values breaking alpine model data
* fix: cannot remove other access need
* fix: training module progress not recorded
* test: fix tests for encoded urls in blade views

fix: cannot remove other access need
fix: training module progress not recorded

* chore(deps): bump ralphjsmit/livewire-urls from 1.3.1 to 1.4.0 (#2186)

Bumps [ralphjsmit/livewire-urls](https://github.com/ralphjsmit/livewire-urls) from 1.3.1 to 1.4.0.
- [Release notes](https://github.com/ralphjsmit/livewire-urls/releases)
- [Changelog](https://github.com/ralphjsmit/livewire-urls/blob/main/CHANGELOG.md)
- [Commits](ralphjsmit/livewire-urls@1.3.1...1.4.0)

---
updated-dependencies:
- dependency-name: ralphjsmit/livewire-urls
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

* chore(deps-dev): bump vite-plugin-static-copy from 1.0.1 to 1.0.2 (#2188)

Bumps [vite-plugin-static-copy](https://github.com/sapphi-red/vite-plugin-static-copy) from 1.0.1 to 1.0.2.
- [Release notes](https://github.com/sapphi-red/vite-plugin-static-copy/releases)
- [Changelog](https://github.com/sapphi-red/vite-plugin-static-copy/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sapphi-red/vite-plugin-static-copy/compare/[email protected]@1.0.2)

---
updated-dependencies:
- dependency-name: vite-plugin-static-copy
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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

* chore(deps-dev): bump stylelint-plugin-logical-css from 1.0.0 to 1.2.0 (#2189)

Bumps [stylelint-plugin-logical-css](https://github.com/yuschick/stylelint-plugin-logical-css) from 1.0.0 to 1.2.0.
- [Commits](https://github.com/yuschick/stylelint-plugin-logical-css/commits)

---
updated-dependencies:
- dependency-name: stylelint-plugin-logical-css
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

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

* chore(deps-dev): bump postcss from 8.4.35 to 8.4.38 (#2191)

Bumps [postcss](https://github.com/postcss/postcss) from 8.4.35 to 8.4.38.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](postcss/postcss@8.4.35...8.4.38)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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

* chore(deps): bump spatie/laravel-options from 1.1.0 to 1.1.1 (#2187)

Bumps [spatie/laravel-options](https://github.com/spatie/laravel-options) from 1.1.0 to 1.1.1.
- [Release notes](https://github.com/spatie/laravel-options/releases)
- [Changelog](https://github.com/spatie/laravel-options/blob/main/CHANGELOG.md)
- [Commits](spatie/laravel-options@1.1.0...1.1.1)

---
updated-dependencies:
- dependency-name: spatie/laravel-options
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

* chore(deps): bump @vimeo/player from 2.20.1 to 2.22.0 (#2192)

Bumps [@vimeo/player](https://github.com/vimeo/player.js) from 2.20.1 to 2.22.0.
- [Release notes](https://github.com/vimeo/player.js/releases)
- [Commits](vimeo/player.js@v2.20.1...v2.22.0)

---
updated-dependencies:
- dependency-name: "@vimeo/player"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

* chore(deps-dev): bump prettier from 3.0.3 to 3.2.5 (#2193)

Bumps [prettier](https://github.com/prettier/prettier) from 3.0.3 to 3.2.5.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](prettier/prettier@3.0.3...3.2.5)

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

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

* chore(deps): bump axlon/laravel-postal-code-validation from 3.5.0 to 3.6.0 (#2190)

chore(deps): bump axlon/laravel-postal-code-validation

Bumps [axlon/laravel-postal-code-validation](https://github.com/axlon/laravel-postal-code-validation) from 3.5.0 to 3.6.0.
- [Release notes](https://github.com/axlon/laravel-postal-code-validation/releases)
- [Changelog](https://github.com/axlon/laravel-postal-code-validation/blob/3.x/CHANGELOG.md)
- [Commits](axlon/laravel-postal-code-validation@v3.5.0...v3.6.0)

---
updated-dependencies:
- dependency-name: axlon/laravel-postal-code-validation
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

* chore(deps-dev): bump spatie/laravel-ray from 1.35.1 to 1.36.0 (#2194)

Bumps [spatie/laravel-ray](https://github.com/spatie/laravel-ray) from 1.35.1 to 1.36.0.
- [Release notes](https://github.com/spatie/laravel-ray/releases)
- [Changelog](https://github.com/spatie/laravel-ray/blob/main/CHANGELOG.md)
- [Commits](spatie/laravel-ray@1.35.1...1.36.0)

---
updated-dependencies:
- dependency-name: spatie/laravel-ray
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

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

* chore(deps): bump filament/spatie-laravel-settings-plugin from 3.2.34 to 3.2.35 (#2195)

chore(deps): bump filament/spatie-laravel-settings-plugin

Bumps [filament/spatie-laravel-settings-plugin](https://github.com/filamentphp/spatie-laravel-settings-plugin) from 3.2.34 to 3.2.35.
- [Commits](filamentphp/spatie-laravel-settings-plugin@v3.2.34...v3.2.35)

---
updated-dependencies:
- dependency-name: filament/spatie-laravel-settings-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

* chore(deps-dev): bump vite from 5.1.5 to 5.1.7 (#2197)

Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.1.5 to 5.1.7.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v5.1.7/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v5.1.7/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-type: direct:development
...

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

* feat: improved sign up/getting started workflow (resolves #2142) (#2184)

* fix: prompt doesn't dismiss when action followed

* feat: add link to rewatch introduction video

* refactor: move prompts from getting started to dashboard

* feat: new getting started flow for Individuals

Work in progress, still missing tests, updates to interpretation files, and etc.

* feat: consolidate application form

* feat: update interpretation placeholder and seeder

* chore(localization): run localization

* style: fix trailing comma in json file

* test: update tests

* test: add test for individual getting started flow

fix: prompt doesn't dismiss when action followed
feat: add link to rewatch introduction video
feat: consolidate application form

* chore(localization): update translations (#2202)

* fix: remove reference to ac_application and cc_application (resolves #2203) (#2205)

* fix: estimate and agreement copy (resolves #2204) (#2206)

* fix: estimate and agreement copy

* fix: regulated organization contact info not displayed on public page

fix: regulated organization contact info not displayed on public page

* chore(localization): update translations (#2208)

chore(localization): translate en.json into French, Canada

* chore(release): release 1.4.0 (#2183)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Promotion from dev to staging (#2234)

* chore(deps-dev): bump pestphp/pest from 2.33.6 to 2.34.8 (#2230)

* chore(deps-dev): bump pestphp/pest from 2.33.6 to 2.34.8

Bumps [pestphp/pest](https://github.com/pestphp/pest) from 2.33.6 to 2.34.8.
- [Release notes](https://github.com/pestphp/pest/releases)
- [Changelog](https://github.com/pestphp/pest/blob/2.x/RELEASE.md)
- [Commits](pestphp/pest@v2.33.6...v2.34.8)

---
updated-dependencies:
- dependency-name: pestphp/pest
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* build: fixed healthcheck for meilisearch

* build: 🐛 removed IP restrictions for local nginx status healthcheck

---------

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

* chore(deps-dev): bump vite from 5.1.7 to 5.3.2 (#2229)

Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.1.7 to 5.3.2.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v5.3.2/packages/vite)

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

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

* chore(deps-dev): bump postcss-custom-media from 10.0.2 to 10.0.7 (#2228)

Bumps [postcss-custom-media](https://github.com/csstools/postcss-plugins/tree/HEAD/plugins/postcss-custom-media) from 10.0.2 to 10.0.7.
- [Changelog](https://github.com/csstools/postcss-plugins/blob/main/plugins/postcss-custom-media/CHANGELOG.md)
- [Commits](https://github.com/csstools/postcss-plugins/commits/HEAD/plugins/postcss-custom-media)

---
updated-dependencies:
- dependency-name: postcss-custom-media
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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

* chore(deps-dev): bump braces from 3.0.2 to 3.0.3 (#2227)

Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3.
- [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md)
- [Commits](micromatch/braces@3.0.2...3.0.3)

---
updated-dependencies:
- dependency-name: braces
  dependency-type: indirect
...

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

* chore(deps-dev): bump stylelint from 16.2.0 to 16.6.1 (#2223)

Bumps [stylelint](https://github.com/stylelint/stylelint) from 16.2.0 to 16.6.1.
- [Release notes](https://github.com/stylelint/stylelint/releases)
- [Changelog](https://github.com/stylelint/stylelint/blob/main/CHANGELOG.md)
- [Commits](stylelint/stylelint@16.2.0...16.6.1)

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

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

* chore(deps-dev): bump barryvdh/laravel-debugbar from 3.10.4 to 3.13.5 (#2222)

Bumps [barryvdh/laravel-debugbar](https://github.com/barryvdh/laravel-debugbar) from 3.10.4 to 3.13.5.
- [Release notes](https://github.com/barryvdh/laravel-debugbar/releases)
- [Commits](barryvdh/laravel-debugbar@v3.10.4...v3.13.5)

---
updated-dependencies:
- dependency-name: barryvdh/laravel-debugbar
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

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

* chore(deps-dev): bump postcss-logical from 7.0.0 to 7.0.1 (#2220)

Bumps [postcss-logical](https://github.com/csstools/postcss-plugins/tree/HEAD/plugins/postcss-logical) from 7.0.0 to 7.0.1.
- [Changelog](https://github.com/csstools/postcss-plugins/blob/main/plugins/postcss-logical/CHANGELOG.md)
- [Commits](https://github.com/csstools/postcss-plugins/commits/HEAD/plugins/postcss-logical)

---
updated-dependencies:
- dependency-name: postcss-logical
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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

* chore(deps-dev): bump husky from 8.0.3 to 9.0.11 (#2219)

Bumps [husky](https://github.com/typicode/husky) from 8.0.3 to 9.0.11.
- [Release notes](https://github.com/typicode/husky/releases)
- [Commits](typicode/husky@v8.0.3...v9.0.11)

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

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

* chore(deps): bump spatie/laravel-collection-macros from 7.13.1 to 7.14.1 (#2232)

Bumps [spatie/laravel-collection-macros](https://github.com/spatie/laravel-collection-macros) from 7.13.1 to 7.14.1.
- [Release notes](https://github.com/spatie/laravel-collection-macros/releases)
- [Changelog](https://github.com/spatie/laravel-collection-macros/blob/main/CHANGELOG.md)
- [Commits](spatie/laravel-collection-macros@7.13.1...7.14.1)

---
updated-dependencies:
- dependency-name: spatie/laravel-collection-macros
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

* chore(deps): bump codezero/laravel-unique-translation from 4.2.0 to 4.3.1 (#2211)

chore(deps): bump codezero/laravel-unique-translation

Bumps [codezero/laravel-unique-translation](https://github.com/codezero-be/laravel-unique-translation) from 4.2.0 to 4.3.1.
- [Release notes](https://github.com/codezero-be/laravel-unique-translation/releases)
- [Commits](codezero-be/laravel-unique-translation@4.2.0...4.3.1)

---
updated-dependencies:
- dependency-name: codezero/laravel-unique-translation
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

* chore(localization): update translations (#2209)

* chore(localization): translate en.json into French, Canada

* chore(localization): translate en.json into French, Canada

* chore(localization): translate en.json into French, Canada

* chore(localization): translate en.json into French, Canada

* chore(localization): translate en.json into French, Canada

* chore(localization): translate en.json into French, Canada

* chore: replaced single quote with apostrophe in translations

* chore: replace double quote with typographers quotes

* build: 🔧 updated so prettier ignores language files
Prettier will remove  from language files.

* revert: reverted translation of a variable string

---------

Co-authored-by: Marvin Roman <[email protected]>

* chore(release): release 1.4.1 (#2231)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: The Accessibility Exchange <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Justin Obara <[email protected]>
Co-authored-by: CoLab Kube Production V1 <[email protected]>
Co-authored-by: Justin Obara <[email protected]>
Co-authored-by: The Accessibility Exchange <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
7 people authored Jul 29, 2024
1 parent 10b2544 commit 2ff92dd
Show file tree
Hide file tree
Showing 114 changed files with 4,982 additions and 3,573 deletions.
3 changes: 2 additions & 1 deletion .kube/app/values.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
name: "IRIS Accessibility Exchange"
health: /
health: /status/db
nodeHealth: /
cronjobs:
- name: schedule
schedule: "* * * * *"
Expand Down
9 changes: 5 additions & 4 deletions .local-deploy/accessibility-app/etc/nginx/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,11 @@ http {

location /nginx_status {
stub_status on;
allow 127.0.0.1;
allow 10.0.0.0/8;
allow 172.0.0.0/8;
deny all;
# don't need ip restrictions for local testing
# allow 127.0.0.1;
# allow 10.0.0.0/8;
# allow 172.0.0.0/8;
# deny all;
}

include /etc/nginx/includes/laravel.conf;
Expand Down
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
resources/views/mail/**/*.blade.php
resources/views/vendor/mail/**/*.blade.php
resources/views/vendor/notifications/**/*.blade.php
resources/lang/*.json
2 changes: 1 addition & 1 deletion .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
".": "1.3.4"
".": "1.4.1"
}
58 changes: 58 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,63 @@
# Changelog

## [1.4.1](https://github.com/accessibility-exchange/platform/compare/v1.4.0...v1.4.1) (2024-07-23)


### Miscellaneous Chores

* **deps-dev:** bump barryvdh/laravel-debugbar from 3.10.4 to 3.13.5 ([#2222](https://github.com/accessibility-exchange/platform/issues/2222)) ([97b2120](https://github.com/accessibility-exchange/platform/commit/97b212095e39a15be0a085b46c3cdfbbfeaca5cd))
* **deps-dev:** bump braces from 3.0.2 to 3.0.3 ([#2227](https://github.com/accessibility-exchange/platform/issues/2227)) ([a9b7fef](https://github.com/accessibility-exchange/platform/commit/a9b7fef2831e5f07ac1596c176955987c78d5947))
* **deps-dev:** bump husky from 8.0.3 to 9.0.11 ([#2219](https://github.com/accessibility-exchange/platform/issues/2219)) ([6002553](https://github.com/accessibility-exchange/platform/commit/600255344c7da363ed9e6abeec185d845e0315b6))
* **deps-dev:** bump pestphp/pest from 2.33.6 to 2.34.8 ([#2230](https://github.com/accessibility-exchange/platform/issues/2230)) ([b002f1a](https://github.com/accessibility-exchange/platform/commit/b002f1af56580dd9cee026849937b5c4462eee45))
* **deps-dev:** bump postcss-custom-media from 10.0.2 to 10.0.7 ([#2228](https://github.com/accessibility-exchange/platform/issues/2228)) ([4c87172](https://github.com/accessibility-exchange/platform/commit/4c8717214437450fd278568e04662880afa4f530))
* **deps-dev:** bump postcss-logical from 7.0.0 to 7.0.1 ([#2220](https://github.com/accessibility-exchange/platform/issues/2220)) ([2a64c75](https://github.com/accessibility-exchange/platform/commit/2a64c7591c49a1bf1e7de3211477c72fce520724))
* **deps-dev:** bump stylelint from 16.2.0 to 16.6.1 ([#2223](https://github.com/accessibility-exchange/platform/issues/2223)) ([af0a60d](https://github.com/accessibility-exchange/platform/commit/af0a60dba2de4def6455a36dcd748c378b53ee1e))
* **deps-dev:** bump vite from 5.1.7 to 5.3.2 ([#2229](https://github.com/accessibility-exchange/platform/issues/2229)) ([dd58001](https://github.com/accessibility-exchange/platform/commit/dd580018a58ac923f51d7ffd098dc92c72a95632))
* **deps:** bump codezero/laravel-unique-translation from 4.2.0 to 4.3.1 ([#2211](https://github.com/accessibility-exchange/platform/issues/2211)) ([0ba4b94](https://github.com/accessibility-exchange/platform/commit/0ba4b94a0701b1316d9aa494f9a911e1a8baff92))
* **deps:** bump spatie/laravel-collection-macros from 7.13.1 to 7.14.1 ([#2232](https://github.com/accessibility-exchange/platform/issues/2232)) ([421fbea](https://github.com/accessibility-exchange/platform/commit/421fbea80104daff912d3ee6b443bd8e1188960d))
* **localization:** update translations ([#2209](https://github.com/accessibility-exchange/platform/issues/2209)) ([4bf3c36](https://github.com/accessibility-exchange/platform/commit/4bf3c36eb37db65beaedc30bc784ec4651a774bc))

## [1.4.0](https://github.com/accessibility-exchange/platform/compare/v1.3.4...v1.4.0) (2024-04-17)


### Features

* add link to rewatch introduction video ([65dc0dc](https://github.com/accessibility-exchange/platform/commit/65dc0dcb8ae404fd366f9a568ade16026d8d83ac))
* consolidate application form ([65dc0dc](https://github.com/accessibility-exchange/platform/commit/65dc0dcb8ae404fd366f9a568ade16026d8d83ac))
* enable searching for engagements (resolves [#2079](https://github.com/accessibility-exchange/platform/issues/2079)( ([#2165](https://github.com/accessibility-exchange/platform/issues/2165)) ([550f3f9](https://github.com/accessibility-exchange/platform/commit/550f3f933f600aa032a9ade2b8876dbe42e80c4c))
* improved sign up/getting started workflow (resolves [#2142](https://github.com/accessibility-exchange/platform/issues/2142)) ([#2184](https://github.com/accessibility-exchange/platform/issues/2184)) ([65dc0dc](https://github.com/accessibility-exchange/platform/commit/65dc0dcb8ae404fd366f9a568ade16026d8d83ac))


### Bug Fixes

* cannot remove other access need ([8bbc547](https://github.com/accessibility-exchange/platform/commit/8bbc54757d5559d59460fd684cf9315f5a54aab0))
* estimate and agreement copy (resolves [#2204](https://github.com/accessibility-exchange/platform/issues/2204)) ([#2206](https://github.com/accessibility-exchange/platform/issues/2206)) ([2f793ba](https://github.com/accessibility-exchange/platform/commit/2f793bacbc77469edb0a14ed024b99a0bcd53073))
* php values breaking alpine model data (resolves [#2180](https://github.com/accessibility-exchange/platform/issues/2180)) ([#2185](https://github.com/accessibility-exchange/platform/issues/2185)) ([8bbc547](https://github.com/accessibility-exchange/platform/commit/8bbc54757d5559d59460fd684cf9315f5a54aab0))
* prompt doesn't dismiss when action followed ([65dc0dc](https://github.com/accessibility-exchange/platform/commit/65dc0dcb8ae404fd366f9a568ade16026d8d83ac))
* regulated organization contact info not displayed on public page ([2f793ba](https://github.com/accessibility-exchange/platform/commit/2f793bacbc77469edb0a14ed024b99a0bcd53073))
* remove reference to ac_application and cc_application (resolves [#2203](https://github.com/accessibility-exchange/platform/issues/2203)) ([#2205](https://github.com/accessibility-exchange/platform/issues/2205)) ([5560fa9](https://github.com/accessibility-exchange/platform/commit/5560fa9b3ae3c71be85d12d6ce9e7d5dd856450a))
* split the healthcheck and external Node Ping paths (resolve [#2042](https://github.com/accessibility-exchange/platform/issues/2042)) ([#2152](https://github.com/accessibility-exchange/platform/issues/2152)) ([ba1c04d](https://github.com/accessibility-exchange/platform/commit/ba1c04db8f5550d78f8e1a2d3a807a8c1032f15f))
* training module progress not recorded ([8bbc547](https://github.com/accessibility-exchange/platform/commit/8bbc54757d5559d59460fd684cf9315f5a54aab0))


### Miscellaneous Chores

* **deps-dev:** bump postcss from 8.4.35 to 8.4.38 ([#2191](https://github.com/accessibility-exchange/platform/issues/2191)) ([dbff3c2](https://github.com/accessibility-exchange/platform/commit/dbff3c2896a715fae4b14f1891003cbf8d22cc7a))
* **deps-dev:** bump prettier from 3.0.3 to 3.2.5 ([#2193](https://github.com/accessibility-exchange/platform/issues/2193)) ([e2a4007](https://github.com/accessibility-exchange/platform/commit/e2a400772811ea564efbac10d8f550d316ef8db9))
* **deps-dev:** bump spatie/laravel-ray from 1.35.1 to 1.36.0 ([#2194](https://github.com/accessibility-exchange/platform/issues/2194)) ([ac8c0c4](https://github.com/accessibility-exchange/platform/commit/ac8c0c483d0d389ba280e80b639010122049f100))
* **deps-dev:** bump stylelint-plugin-logical-css from 1.0.0 to 1.2.0 ([#2189](https://github.com/accessibility-exchange/platform/issues/2189)) ([f5ba3c0](https://github.com/accessibility-exchange/platform/commit/f5ba3c014f98b6fa13f1d6da0f15f64188fcb387))
* **deps-dev:** bump vite from 5.1.5 to 5.1.7 ([#2197](https://github.com/accessibility-exchange/platform/issues/2197)) ([c6010e2](https://github.com/accessibility-exchange/platform/commit/c6010e2240ed7899581feb46f1f1d5503d8a5be8))
* **deps-dev:** bump vite-plugin-static-copy from 1.0.1 to 1.0.2 ([#2188](https://github.com/accessibility-exchange/platform/issues/2188)) ([1ed6f67](https://github.com/accessibility-exchange/platform/commit/1ed6f67f2f229aaf144cbafdf4f437cb089942b8))
* **deps:** bump @vimeo/player from 2.20.1 to 2.22.0 ([#2192](https://github.com/accessibility-exchange/platform/issues/2192)) ([eaaa6c1](https://github.com/accessibility-exchange/platform/commit/eaaa6c1fa08b4d3a848671552c629a669fb4b440))
* **deps:** bump axlon/laravel-postal-code-validation from 3.5.0 to 3.6.0 ([#2190](https://github.com/accessibility-exchange/platform/issues/2190)) ([45d4f5b](https://github.com/accessibility-exchange/platform/commit/45d4f5b239797acd21f64a1e5c61df5d195b612a))
* **deps:** bump filament/spatie-laravel-settings-plugin from 3.2.34 to 3.2.35 ([#2195](https://github.com/accessibility-exchange/platform/issues/2195)) ([381ce30](https://github.com/accessibility-exchange/platform/commit/381ce30ce137ff233d3f3981bf039f5f8478256b))
* **deps:** bump ralphjsmit/livewire-urls from 1.3.1 to 1.4.0 ([#2186](https://github.com/accessibility-exchange/platform/issues/2186)) ([22778c1](https://github.com/accessibility-exchange/platform/commit/22778c134f74e07b4bbcfef9324b57044b7e495b))
* **deps:** bump spatie/laravel-options from 1.1.0 to 1.1.1 ([#2187](https://github.com/accessibility-exchange/platform/issues/2187)) ([65417ac](https://github.com/accessibility-exchange/platform/commit/65417accfc033077a61c6804c73af5b181672db6))
* **localization:** translate en.json into French, Canada ([3970b67](https://github.com/accessibility-exchange/platform/commit/3970b67851710b7c7ab84213ade0d240e503686c))
* **localization:** update translations ([#2179](https://github.com/accessibility-exchange/platform/issues/2179)) ([94ff3fe](https://github.com/accessibility-exchange/platform/commit/94ff3fed4ced057c662fce95d5e239e108bda6cb))
* **localization:** update translations ([#2202](https://github.com/accessibility-exchange/platform/issues/2202)) ([b716df0](https://github.com/accessibility-exchange/platform/commit/b716df0617e7f2a9f1074a8df8447efa6f4a510f))
* **localization:** update translations ([#2208](https://github.com/accessibility-exchange/platform/issues/2208)) ([3970b67](https://github.com/accessibility-exchange/platform/commit/3970b67851710b7c7ab84213ade0d240e503686c))

## [1.3.4](https://github.com/accessibility-exchange/platform/compare/v1.3.3...v1.3.4) (2024-03-21)


Expand Down
17 changes: 17 additions & 0 deletions app/Enums/Compensation.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?php

namespace App\Enums;

enum Compensation: string
{
case Paid = 'paid';
case Volunteer = 'volunteer';

public static function labels(): array
{
return [
'paid' => __('Paid'),
'volunteer' => __('Volunteer'),
];
}
}
17 changes: 17 additions & 0 deletions app/Enums/EngagementSignUpStatus.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?php

namespace App\Enums;

enum EngagementSignUpStatus: string
{
case Open = 'open';
case Closed = 'closed';

public static function labels(): array
{
return [
'open' => __('Open'),
'closed' => __('Closed'),
];
}
}
17 changes: 17 additions & 0 deletions app/Enums/ProjectInitiator.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?php

namespace App\Enums;

enum ProjectInitiator: string
{
case Organization = 'organization';
case RegulatedOrganization = 'regulated-organization';

public static function labels(): array
{
return [
'organization' => __('Community organization'),
'regulated-organization' => __('Regulated organization'),
];
}
}
19 changes: 19 additions & 0 deletions app/Enums/SeekingForEngagement.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?php

namespace App\Enums;

enum SeekingForEngagement: string
{
case Participants = 'participants';
case Connectors = 'connectors';
case Organizations = 'organizations';

public static function labels(): array
{
return [
'participants' => __('Seeking Individual Consultation Participants'),
'connectors' => __('Seeking Community Connectors'),
'organizations' => __('Seeking Community Organizations to consult with'),
];
}
}
16 changes: 3 additions & 13 deletions app/Filament/Pages/ManageGeneralSettings.php
Original file line number Diff line number Diff line change
Expand Up @@ -104,23 +104,13 @@ public function form(Form $form): Form
->label(get_language_exonym('fr'))
->activeUrl(),
]),
Fieldset::make(__('Accessibility consultant application'))
Fieldset::make(__('Accessibility Consultant and Community Connector application'))
->schema([
TextInput::make('ac_application.en')
TextInput::make('ac_cc_application.en')
->label(get_language_exonym('en'))
->required()
->activeUrl(),
TextInput::make('ac_application.fr')
->label(get_language_exonym('fr'))
->activeUrl(),
]),
Fieldset::make(__('Community connector application'))
->schema([
TextInput::make('cc_application.en')
->label(get_language_exonym('en'))
->required()
->activeUrl(),
TextInput::make('cc_application.fr')
TextInput::make('ac_cc_application.fr')
->label(get_language_exonym('fr'))
->activeUrl(),
]),
Expand Down
4 changes: 4 additions & 0 deletions app/Http/Controllers/SettingsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,10 @@ public function updateAccessNeeds(UpdateAccessNeedsRequest $request): RedirectRe

$individual = Auth::user()->individual;

if (! $data['other']) {
$data['other_access_need'] = null;
}

if (! isset($data['meeting_access_needs']) || (isset($data['meeting_access_needs']) && ! in_array($signLanguageInterpretation, $data['meeting_access_needs']))) {
$data['signed_language_for_interpretation'] = null;
}
Expand Down
4 changes: 2 additions & 2 deletions app/Http/Controllers/UserController.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public function showIntroduction(): View
$user = Auth::user();

$skipTo = match ($user->context) {
'individual' => localized_route('individuals.show-role-selection'),
'individual' => localized_route('dashboard'),
'organization' => $user->extra_attributes->get('invitation') ? localized_route('dashboard') : localized_route('organizations.show-type-selection'),
'regulated-organization' => $user->extra_attributes->get('invitation') ? localized_route('dashboard') : localized_route('regulated-organizations.show-type-selection'),
default => localized_route('dashboard'),
Expand All @@ -76,7 +76,7 @@ public function updateIntroductionStatus(UpdateUserIntroductionStatusRequest $re
$user->save();

$redirectTo = match (Auth::user()->context) {
'individual' => localized_route('individuals.show-role-selection'),
'individual' => localized_route('dashboard'),
'organization' => $user->extra_attributes->get('invitation') ? localized_route('dashboard') : localized_route('organizations.show-type-selection'),
'regulated-organization' => $user->extra_attributes->get('invitation') ? localized_route('dashboard') : localized_route('regulated-organizations.show-type-selection'),
default => localized_route('dashboard'),
Expand Down
107 changes: 107 additions & 0 deletions app/Http/Controllers/UserEngagementsController.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
<?php

namespace App\Http\Controllers;

use App\Enums\ProjectInvolvement;
use App\Enums\UserContext;
use App\Models\User;
use Illuminate\Contracts\View\View;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Response;
use Illuminate\Support\Facades\Auth;

class UserEngagementsController extends Controller
{
public function show(): Response|View|RedirectResponse
{
$user = Auth::user();

if ($user->context === UserContext::Organization->value && ! $user->organization) {
return redirect(localized_route('organizations.show-type-selection'));
}

if ($this->isParticipant($user)) {
$section = ProjectInvolvement::Participating->value;
$activeEngagements = $user->{$user->context}->engagements()->active()->get();
$completeEngagements = $user->{$user->context}->engagements()->complete()->get();
} elseif ($this->isConnector($user)) {
$section = ProjectInvolvement::Contracted->value;
$activeEngagements = $user->{$user->context}->connectingEngagements()->active()->get();
$completeEngagements = $user->{$user->context}->connectingEngagements()->complete()->get();
} else {
abort(404);
}

return view('engagements.joined', [
'section' => $section ?? '',
'showParticipating' => $this->isParticipant($user),
'showConnecting' => $this->isConnector($user),
'activeEngagements' => $activeEngagements ?? [],
'completeEngagements' => $completeEngagements ?? [],
]);
}

public function showContracted(): Response|View|RedirectResponse
{
$user = Auth::user();

if ($user->context === UserContext::Organization->value && ! $user->organization) {
return redirect(localized_route('organizations.show-type-selection'));
}

if ($this->isConnector($user)) {
$activeEngagements = $user->{$user->context}->connectingEngagements()->active()->get();
$completeEngagements = $user->{$user->context}->connectingEngagements()->complete()->get();

return view('engagements.joined', [
'title' => __('Engagements I’ve joined as a Community Connector'),
'section' => 'contracted',
'showParticipating' => $this->isParticipant($user),
'showConnecting' => true,
'activeEngagements' => $activeEngagements,
'completeEngagements' => $completeEngagements,
]);
}

abort(404);
}

public function showParticipating(): Response|View|RedirectResponse
{
$user = Auth::user();

if ($user->context === UserContext::Organization->value && ! $user->organization) {
return redirect(localized_route('organizations.show-type-selection'));
}

if ($this->isParticipant($user)) {
$activeEngagements = $user->{$user->context}->engagements()->active()->get();
$completeEngagements = $user->{$user->context}->engagements()->complete()->get();

return view('engagements.joined', [
'title' => __('Engagements I’ve joined as a Consultation Participant'),
'section' => 'participating',
'showParticipating' => true,
'showConnecting' => $this->isConnector($user),
'activeEngagements' => $activeEngagements,
'completeEngagements' => $completeEngagements,
]);
}

abort(404);
}

public function isParticipant(User $user): bool
{
$userContext = $user->{$user->context};

return $userContext && ($userContext->isParticipant() || $userContext->engagements()->count());
}

public function isConnector(User $user): bool
{
$userContext = $user->{$user->context};

return $userContext && ($userContext->isConnector() || $userContext->connectingEngagements()->count());
}
}
Loading

0 comments on commit 2ff92dd

Please sign in to comment.