Skip to content

Commit

Permalink
Merge pull request #994 from dbarzin/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
dbarzin authored Dec 3, 2024
2 parents 14f7b90 + 62a5a69 commit dba88dc
Show file tree
Hide file tree
Showing 3 changed files with 85 additions and 37 deletions.
74 changes: 38 additions & 36 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,39 +66,41 @@ jobs:
run: |
mysql mercator --host 127.0.0.1 --port 3306 -uroot < mercator_data.sql
- name: Install Chrome Driver
run: php artisan dusk:chrome-driver --detect

- name: Check Chrome Driver version
run: ./vendor/laravel/dusk/bin/chromedriver-linux -v

- name: Start Chrome Driver
run: ./vendor/laravel/dusk/bin/chromedriver-linux --port=9515 &

- name: Run Laravel Server
run: php artisan serve --no-reload &

- name: Run Dusk Tests
env:
APP_ENV: local
APP_URL: "http://127.0.0.1:8000"
DB_CONNECTION: mysql
DB_DATABASE: mercator
DB_PORT: ${{ job.services.mysql.ports[3306] }}
DB_USER: root
run: |
php artisan dusk --stop-on-error --stop-on-failure
- name: Upload Screenshots
if: failure()
uses: actions/upload-artifact@v4
with:
name: screenshots
path: tests/Browser/screenshots

- name: Upload Console Logs
if: failure()
uses: actions/upload-artifact@v4
with:
name: console
path: tests/Browser/console
# SKIP Test on GitHub
#
# - name: Install Chrome Driver
# run: php artisan dusk:chrome-driver --detect
#
# - name: Check Chrome Driver version
# run: ./vendor/laravel/dusk/bin/chromedriver-linux -v
#
# - name: Start Chrome Driver
# run: ./vendor/laravel/dusk/bin/chromedriver-linux --port=9515 &
#
# - name: Run Laravel Server
# run: php artisan serve --no-reload &
#
# - name: Run Dusk Tests
# env:
# APP_ENV: local
# APP_URL: "http://127.0.0.1:8000"
# DB_CONNECTION: mysql
# DB_DATABASE: mercator
# DB_PORT: ${{ job.services.mysql.ports[3306] }}
# DB_USER: root
# run: |
#
# php artisan dusk --stop-on-error --stop-on-failure
# - name: Upload Screenshots
# if: failure()
# uses: actions/upload-artifact@v4
# with:
# name: screenshots
# path: tests/Browser/screenshots
#
# - name: Upload Console Logs
# if: failure()
# uses: actions/upload-artifact@v4
# with:
# name: console
# path: tests/Browser/console
46 changes: 46 additions & 0 deletions resources/views/admin/config/parameters.blade.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
@extends('layouts.admin')
@section('content')
<form method="POST" action="{{ route('admin.config.parameters.save') }}" enctype="multipart/form-data">
@method('PUT')
@csrf
<div class="card">
<div class="card-header">
{{ trans("cruds.configuration.parameters.title") }}
</div>
<div class="card-body">
<div class="form-group">
<label for="name">{{ trans("cruds.configuration.parameters.help") }}</label>
</div>

</div>
<!---------------------------------------------------------------------------------------------------->
<div class="card-header">
{{ trans("cruds.menu.logical_infrastructure.title_short") }}
</div>
<!---------------------------------------------------------------------------------------------------->
<div class="card-body">

<div class="form-group">
<label for="name">{{ trans("cruds.configuration.parameters.security_need_auth_helper") }}</label>
<div class="form-switch">
<input name="security_need_auth" id='security_need_auth' type="checkbox" class="form-check-input"
{{ $security_need_auth ? 'checked' : '' }}>
<label for="is_external">{{ trans('cruds.configuration.parameters.security_need_auth') }}</label>
</div>
</div>
</div>
</div>

<div class="form-group">
<a class="btn btn-default" href="{{ route('admin.home') }}">
{{ trans('global.back_to_list') }}
</a>
<button class="btn btn-danger" type="submit" name="action" value="save">
{{ trans('global.save') }}
</button>
</div>


</form>

@endsection
2 changes: 1 addition & 1 deletion resources/views/partials/menu.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -810,5 +810,5 @@
</li>
</ul>
</nav>
<button class="sidebar-minimizer brand-minimizer" type="button">Version 2024-11-R1</button>
<button class="sidebar-minimizer brand-minimizer" type="button">Version 2024.12.1</button>
</div>

0 comments on commit dba88dc

Please sign in to comment.