Skip to content

Commit

Permalink
Merge pull request #29 from Moros1138/refactor-frontend
Browse files Browse the repository at this point in the history
Refactor frontend
  • Loading branch information
Moros1138 authored Apr 27, 2024
2 parents 4962192 + c914b0d commit 57b2784
Show file tree
Hide file tree
Showing 15 changed files with 820 additions and 496 deletions.
2 changes: 1 addition & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ APP_ENV=local
APP_KEY=
APP_DEBUG=true
APP_TIMEZONE=UTC
APP_URL=http://localhost
APP_URL=http://127.0.0.1:8000

APP_LOCALE=en
APP_FALLBACK_LOCALE=en
Expand Down
25 changes: 6 additions & 19 deletions .github/workflows/test-on-pull-request-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,8 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4

- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: '20.x'

- name: Install and Build NodeJS dependencies
run: npm install && npm run build

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.3'
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite
coverage: none

- name: Install Composer dependencies
run: composer install --prefer-dist --no-interaction --no-progress
- name: Install Dependencies
run: npm install && npm run build && composer install --prefer-dist --no-interaction --no-progress && php artisan dusk:chrome-driver --detect

- name: Copy environment file
run: cp .env.example .env
Expand All @@ -46,6 +31,8 @@ jobs:
- name: Initial Database Migration
run: php artisan migrate

- name: Execute tests
- name: Execute Unit Tests
run: php artisan test


- name: Execute Browser Tests
run: php artisan dusk
25 changes: 6 additions & 19 deletions .github/workflows/test-on-push-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,8 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4

- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: '20.x'

- name: Install and Build NodeJS dependencies
run: npm install && npm run build

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.3'
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite
coverage: none

- name: Install Composer dependencies
run: composer install --prefer-dist --no-interaction --no-progress
- name: Install Dependencies
run: npm install && npm run build && composer install --prefer-dist --no-interaction --no-progress && php artisan dusk:chrome-driver --detect

- name: Copy environment file
run: cp .env.example .env
Expand All @@ -46,6 +31,8 @@ jobs:
- name: Initial Database Migration
run: php artisan migrate

- name: Execute tests
- name: Execute Unit Tests
run: php artisan test


- name: Execute Browser Tests
run: php artisan dusk
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
},
"require-dev": {
"fakerphp/faker": "^1.23",
"laravel/dusk": "^8.2",
"laravel/pint": "^1.13",
"laravel/sail": "^1.26",
"mockery/mockery": "^1.6",
Expand Down
140 changes: 139 additions & 1 deletion composer.lock

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

Loading

0 comments on commit 57b2784

Please sign in to comment.