Skip to content

Commit

Permalink
Merge pull request #367 from canyongbs/develop
Browse files Browse the repository at this point in the history
1.0-rc11
  • Loading branch information
Orrison authored Dec 14, 2023
2 parents c41adb6 + 1e50e6f commit e1ed32a
Show file tree
Hide file tree
Showing 1,286 changed files with 15,392 additions and 13,553 deletions.
2 changes: 1 addition & 1 deletion .env.example
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
APP_NAME=ASSIST
APP_NAME="Advising App"
APP_ENV=local
APP_KEY=
APP_DEBUG=true
Expand Down
4 changes: 2 additions & 2 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ A deployment step could be a command that needs to be executed or an ENV key tha
_______________________________________________

## Before contributing and submitting this PR, make sure you have:
* [ ] Read the [contributing guidelines](https://github.com/canyongbs/assistbycanyongbs/blob/main/README.md#contributing).
* [ ] Read the [contributing guidelines](https://github.com/canyongbs/advisingapp/blob/main/README.md#contributing).
* [ ] Title the PR with the ticket/issue number and a short description of the changes made. Or if no ticket/issue exists, title the PR with a short description of the changes made
* [ ] Linked a relevant ticket or issue or describe the issue/feature which this PR resolves/implements.
* [ ] Resolved all conflicts, if any.
* [ ] Rebased your branch PR on top of the latest upstream `develop` branch.
* [ ] Rebased your branch PR on top of the latest upstream `develop` branch.
5 changes: 4 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
token: ${{ secrets.pat-token }}

- name: Set up Ruby
uses: actions/setup-ruby@v1
uses: ruby/setup-ruby@v1

- name: Run Ruby Script
run: ruby ./copyright.rb
Expand Down Expand Up @@ -168,6 +168,9 @@ jobs:
--health-retries 5
steps:
- name: Install git
run: apt-get update ; apt-get install -y git zip unzip

- uses: shivammathur/setup-php@v2
with:
php-version: "8.2"
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,7 @@ app-modules/**/vendor
app-modules/**/resources/js/dist/*
/.phpactor.json
**/.DS_Store
public/api-docs/*
/_lighthouse_ide_helper.php
/programmatic-types.graphql
/schema-directives.graphql
3 changes: 2 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
resources/views/vendor/mail/**/*.blade.php
resources/views/mail/**/*.blade.php
resources/lang/**/*.php
**/vendor
**/vendor
app-modules/notifications/graphql/notifications.graphql
5 changes: 4 additions & 1 deletion .prettierrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
"options": {
"tabWidth": 4
}
}
},
{
"files": ["*.graphql"]
}
]
}
1,097 changes: 587 additions & 510 deletions _ide_helper_models.php

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions app-modules/alert/composer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "canyon-gbs/alert",
"name": "canyon-gbs/advising-app-alert",
"description": "",
"type": "library",
"version": "1.0",
Expand All @@ -9,17 +9,17 @@
},
"autoload": {
"psr-4": {
"Assist\\Alert\\": "src/",
"Assist\\Alert\\Tests\\": "tests/",
"Assist\\Alert\\Database\\Factories\\": "database/factories/",
"Assist\\Alert\\Database\\Seeders\\": "database/seeders/"
"AdvisingApp\\Alert\\": "src/",
"AdvisingApp\\Alert\\Tests\\": "tests/",
"AdvisingApp\\Alert\\Database\\Factories\\": "database/factories/",
"AdvisingApp\\Alert\\Database\\Seeders\\": "database/seeders/"
}
},
"minimum-stability": "stable",
"extra": {
"laravel": {
"providers": [
"Assist\\Alert\\Providers\\AlertServiceProvider"
"AdvisingApp\\Alert\\Providers\\AlertServiceProvider"
]
}
}
Expand Down
12 changes: 6 additions & 6 deletions app-modules/alert/database/factories/AlertFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@
</COPYRIGHT>
*/

namespace Assist\Alert\Database\Factories;
namespace AdvisingApp\Alert\Database\Factories;

use Assist\Alert\Models\Alert;
use Assist\Alert\Enums\AlertStatus;
use Assist\Prospect\Models\Prospect;
use Assist\Alert\Enums\AlertSeverity;
use Assist\AssistDataModel\Models\Student;
use AdvisingApp\Alert\Models\Alert;
use AdvisingApp\Alert\Enums\AlertStatus;
use AdvisingApp\Prospect\Models\Prospect;
use AdvisingApp\Alert\Enums\AlertSeverity;
use AdvisingApp\StudentDataModel\Models\Student;
use Illuminate\Database\Eloquent\Factories\Factory;
use Illuminate\Database\Eloquent\Relations\Relation;

Expand Down
4 changes: 2 additions & 2 deletions app-modules/alert/database/seeders/AlertSeeder.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
</COPYRIGHT>
*/

namespace Assist\Alert\Database\Seeders;
namespace AdvisingApp\Alert\Database\Seeders;

use Assist\Alert\Models\Alert;
use Illuminate\Database\Seeder;
use AdvisingApp\Alert\Models\Alert;

class AlertSeeder extends Seeder
{
Expand Down
4 changes: 2 additions & 2 deletions app-modules/alert/src/AlertPlugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</COPYRIGHT>
*/

namespace Assist\Alert;
namespace AdvisingApp\Alert;

use Filament\Panel;
use Filament\Contracts\Plugin;
Expand All @@ -50,7 +50,7 @@ public function register(Panel $panel): void
{
$panel->discoverResources(
in: __DIR__ . '/Filament/Resources',
for: 'Assist\\Alert\\Filament\\Resources'
for: 'AdvisingApp\\Alert\\Filament\\Resources'
);
}

Expand Down
2 changes: 1 addition & 1 deletion app-modules/alert/src/Enums/AlertSeverity.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</COPYRIGHT>
*/

namespace Assist\Alert\Enums;
namespace AdvisingApp\Alert\Enums;

use Filament\Support\Contracts\HasLabel;

Expand Down
2 changes: 1 addition & 1 deletion app-modules/alert/src/Enums/AlertStatus.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</COPYRIGHT>
*/

namespace Assist\Alert\Enums;
namespace AdvisingApp\Alert\Enums;

use Filament\Support\Contracts\HasLabel;

Expand Down
4 changes: 2 additions & 2 deletions app-modules/alert/src/Events/AlertCreated.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
</COPYRIGHT>
*/

namespace Assist\Alert\Events;
namespace AdvisingApp\Alert\Events;

use Assist\Alert\Models\Alert;
use AdvisingApp\Alert\Models\Alert;
use Illuminate\Queue\SerializesModels;
use Illuminate\Foundation\Events\Dispatchable;
use Illuminate\Broadcasting\InteractsWithSockets;
Expand Down
6 changes: 3 additions & 3 deletions app-modules/alert/src/Filament/Resources/AlertResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@
</COPYRIGHT>
*/

namespace Assist\Alert\Filament\Resources;
namespace AdvisingApp\Alert\Filament\Resources;

use Assist\Alert\Models\Alert;
use Filament\Resources\Resource;
use Assist\Alert\Filament\Resources\AlertResource\Pages;
use AdvisingApp\Alert\Models\Alert;
use AdvisingApp\Alert\Filament\Resources\AlertResource\Pages;

class AlertResource extends Resource
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,38 +34,38 @@
</COPYRIGHT>
*/

namespace Assist\Alert\Filament\Resources\AlertResource\Pages;
namespace AdvisingApp\Alert\Filament\Resources\AlertResource\Pages;

use Filament\Tables\Table;
use Assist\Alert\Models\Alert;
use Filament\Infolists\Infolist;
use App\Filament\Columns\IdColumn;
use Filament\Actions\CreateAction;
use Assist\Alert\Enums\AlertStatus;
use AdvisingApp\Alert\Models\Alert;
use Filament\Tables\Filters\Filter;
use Assist\Prospect\Models\Prospect;
use Filament\Forms\Components\Group;
use Assist\Alert\Enums\AlertSeverity;
use Filament\Forms\Components\Select;
use Filament\Forms\Components\Textarea;
use Filament\Tables\Actions\ViewAction;
use Filament\Tables\Columns\TextColumn;
use Illuminate\Database\Eloquent\Model;
use AdvisingApp\Alert\Enums\AlertStatus;
use AdvisingApp\Prospect\Models\Prospect;
use Filament\Resources\Pages\ListRecords;
use Filament\Tables\Filters\SelectFilter;
use Illuminate\Database\Eloquent\Builder;
use Assist\AssistDataModel\Models\Student;
use AdvisingApp\Alert\Enums\AlertSeverity;
use Filament\Forms\Components\MorphToSelect;
use Filament\Infolists\Components\TextEntry;
use Filament\Tables\Actions\BulkActionGroup;
use Filament\Tables\Actions\DeleteBulkAction;
use Assist\CaseloadManagement\Models\Caseload;
use AdvisingApp\StudentDataModel\Models\Student;
use Filament\Forms\Components\MorphToSelect\Type;
use Assist\Alert\Filament\Resources\AlertResource;
use Assist\AssistDataModel\Models\Scopes\EducatableSearch;
use Assist\CaseloadManagement\Actions\TranslateCaseloadFilters;
use Assist\Prospect\Filament\Resources\ProspectResource\Pages\ManageProspectAlerts;
use Assist\AssistDataModel\Filament\Resources\StudentResource\Pages\ManageStudentAlerts;
use AdvisingApp\CaseloadManagement\Models\Caseload;
use AdvisingApp\Alert\Filament\Resources\AlertResource;
use AdvisingApp\StudentDataModel\Models\Scopes\EducatableSearch;
use AdvisingApp\CaseloadManagement\Actions\TranslateCaseloadFilters;
use AdvisingApp\Prospect\Filament\Resources\ProspectResource\Pages\ManageProspectAlerts;
use AdvisingApp\StudentDataModel\Filament\Resources\StudentResource\Pages\ManageStudentAlerts;

class ListAlerts extends ListRecords
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@
</COPYRIGHT>
*/

namespace Assist\Alert\Listeners;
namespace AdvisingApp\Alert\Listeners;

use Assist\Prospect\Models\Prospect;
use Assist\Alert\Events\AlertCreated;
use Assist\AssistDataModel\Models\Student;
use AdvisingApp\Prospect\Models\Prospect;
use AdvisingApp\Alert\Events\AlertCreated;
use Illuminate\Contracts\Queue\ShouldQueue;
use Assist\Notifications\Models\Subscription;
use Assist\Alert\Notifications\AlertCreatedNotification;
use AdvisingApp\StudentDataModel\Models\Student;
use AdvisingApp\Notifications\Models\Subscription;
use AdvisingApp\Alert\Notifications\AlertCreatedNotification;

class NotifySubscribersOfAlertCreated implements ShouldQueue
{
Expand Down
22 changes: 11 additions & 11 deletions app-modules/alert/src/Models/Alert.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,24 +34,24 @@
</COPYRIGHT>
*/

namespace Assist\Alert\Models;
namespace AdvisingApp\Alert\Models;

use Exception;
use App\Models\BaseModel;
use Assist\Alert\Enums\AlertStatus;
use Assist\Prospect\Models\Prospect;
use Assist\Alert\Enums\AlertSeverity;
use AdvisingApp\Alert\Enums\AlertStatus;
use OwenIt\Auditing\Contracts\Auditable;
use AdvisingApp\Prospect\Models\Prospect;
use Illuminate\Database\Eloquent\Builder;
use Assist\AssistDataModel\Models\Student;
use Assist\Campaign\Models\CampaignAction;
use AdvisingApp\Alert\Enums\AlertSeverity;
use Illuminate\Database\Eloquent\SoftDeletes;
use AdvisingApp\Campaign\Models\CampaignAction;
use AdvisingApp\StudentDataModel\Models\Student;
use Illuminate\Database\Eloquent\Relations\MorphTo;
use Assist\AssistDataModel\Models\Contracts\Educatable;
use Assist\Notifications\Models\Contracts\Subscribable;
use Assist\Audit\Models\Concerns\Auditable as AuditableTrait;
use Assist\Campaign\Models\Contracts\ExecutableFromACampaignAction;
use Assist\Notifications\Models\Contracts\CanTriggerAutoSubscription;
use AdvisingApp\Notifications\Models\Contracts\Subscribable;
use AdvisingApp\StudentDataModel\Models\Contracts\Educatable;
use AdvisingApp\Audit\Models\Concerns\Auditable as AuditableTrait;
use AdvisingApp\Campaign\Models\Contracts\ExecutableFromACampaignAction;
use AdvisingApp\Notifications\Models\Contracts\CanTriggerAutoSubscription;

/**
* @property-read Student|Prospect $concern
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@
</COPYRIGHT>
*/

namespace Assist\Alert\Notifications;
namespace AdvisingApp\Alert\Notifications;

use App\Models\User;
use Illuminate\Bus\Queueable;
use Assist\Alert\Models\Alert;
use Filament\Facades\Filament;
use Illuminate\Support\HtmlString;
use AdvisingApp\Alert\Models\Alert;
use Illuminate\Notifications\Notification;
use Illuminate\Contracts\Queue\ShouldQueue;
use Filament\Notifications\Notification as FilamentNotification;
Expand Down
8 changes: 4 additions & 4 deletions app-modules/alert/src/Observers/AlertObserver.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@
</COPYRIGHT>
*/

namespace Assist\Alert\Observers;
namespace AdvisingApp\Alert\Observers;

use Assist\Alert\Models\Alert;
use Assist\Alert\Events\AlertCreated;
use AdvisingApp\Alert\Models\Alert;
use Illuminate\Support\Facades\Cache;
use Assist\Notifications\Actions\SubscriptionCreate;
use AdvisingApp\Alert\Events\AlertCreated;
use AdvisingApp\Notifications\Actions\SubscriptionCreate;

class AlertObserver
{
Expand Down
Loading

0 comments on commit e1ed32a

Please sign in to comment.