Skip to content

Commit

Permalink
Pulling updates
Browse files Browse the repository at this point in the history
  • Loading branch information
MuchQuak committed Feb 10, 2025
2 parents dfabf28 + 24011f1 commit 0dbae6e
Show file tree
Hide file tree
Showing 8 changed files with 42 additions and 42 deletions.
22 changes: 15 additions & 7 deletions .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@ jobs:
- name: Copy .env
run: php -r "file_exists('.env') || copy('.env.example', '.env');"

# - name: Install Playwright Browsers
# run: npx playwright install --with-deps
#- name: Generate key
#run: php artisan key:generate

- name: Directory Permissions
run: chmod -R 777 storage bootstrap/cache

Expand All @@ -42,5 +37,18 @@ jobs:

- name: Execute tests (Unit and Feature tests) via PHPUnit/Pest
run: docker exec symbiota-laravel-web-1 php artisan test
#- name: Run Playwright tests
#run: npx playwright test

- name: Install Playwright Npm Package
run: docker exec symbiota-laravel-web-1 npm install -D

- name: Install Playwright Browsers
run: docker exec symbiota-laravel-web-1 npx playwright install --with-deps

- name: Run Playwright Tests
run: docker exec symbiota-laravel-web-1 npx playwright test
- uses: actions/upload-artifact@v4
if: ${{ !cancelled() }}
with:
name: playwright-report
path: playwright-report/
retention-days: 30
1 change: 1 addition & 0 deletions app/Http/Controllers/CollectionController.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ public static function collection(Request $request) {

public static function searchPage(Request $request) {
$collections = DB::table('omcollections')->select('*')->get();

return view('pages/collections', ['collections' => $collections]);
}

Expand Down
16 changes: 4 additions & 12 deletions app/Http/Controllers/MediaController.php
Original file line number Diff line number Diff line change
Expand Up @@ -77,19 +77,11 @@ public static function searchPage(Request $request) {
return view('pages/media/search', ['media' => $media, 'creators' => $creators, 'tags' => $tag_options]);
}

public static function getMediaData() {
public static function getMediaData() {}

}

public static function add() {

}
public static function add() {}

public static function delete() {
public static function delete() {}

}

public static function edit() {

}
public static function edit() {}
}
1 change: 0 additions & 1 deletion app/Http/Controllers/OccurrenceController.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ public static function profilePage(int $occid) {
return view('pages/occurrence/profile', ['occurrence' => $occurrence]);
}


public static function editPage(Request $request) {
$occurrence = DB::table('omoccurrences as o')
->select('*')
Expand Down
3 changes: 1 addition & 2 deletions app/Http/Controllers/ProjectController.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

namespace App\Http\Controllers;

use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;

class ProjectController extends Controller {
Expand All @@ -23,6 +22,6 @@ public static function getProjectData(int $pid) {
}

public static function project(int $pid) {
view('pages/project',self::getProjectData($pid));
view('pages/project', self::getProjectData($pid));
}
}
37 changes: 19 additions & 18 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
{
"name": "Symbiota-Laravel",
"private": true,
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build"
},
"devDependencies": {
"@playwright/test": "^1.47.2",
"@playwright/test": "^1.50.1",
"@types/node": "^22.7.1",
"autoprefixer": "^10.4.19",
"axios": "^1.1.2",
Expand Down
1 change: 0 additions & 1 deletion routes/web.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
use App\Models\User;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Route;
use Laravel\Socialite\Facades\Socialite;

Expand Down

0 comments on commit 0dbae6e

Please sign in to comment.