Skip to content

Commit

Permalink
Merge tag 'v1.4.0' into staging
Browse files Browse the repository at this point in the history
  • Loading branch information
jobara committed Apr 17, 2024
2 parents 6308a2b + 702edaf commit 1d20b73
Show file tree
Hide file tree
Showing 111 changed files with 3,843 additions and 2,051 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
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.0"
}
41 changes: 41 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,46 @@
# Changelog

## [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 1d20b73

Please sign in to comment.