Merge branch 'development' into useful_links_and_menu
This commit is contained in:
commit
e0199589dc
4 changed files with 24 additions and 10 deletions
27
.github/workflows/run_tests.yml
vendored
27
.github/workflows/run_tests.yml
vendored
|
@ -2,15 +2,34 @@ name: Laravel
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [ main ]
|
branches: [ main, development ]
|
||||||
pull_request:
|
pull_request:
|
||||||
branches: [ main ]
|
branches: [ main, development ]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
laravel-tests:
|
docker:
|
||||||
|
runs-on: ubuntu-20.04
|
||||||
|
steps:
|
||||||
|
- name: Set up QEMU
|
||||||
|
uses: docker/setup-qemu-action@v1
|
||||||
|
- name: Set up Docker Buildx
|
||||||
|
uses: docker/setup-buildx-action@v1
|
||||||
|
- name: Login to DockerHub
|
||||||
|
uses: docker/login-action@v1
|
||||||
|
with:
|
||||||
|
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
|
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
|
- name: Build and push
|
||||||
|
id: docker_build
|
||||||
|
uses: docker/build-push-action@v2
|
||||||
|
with:
|
||||||
|
push: true
|
||||||
|
tags: bitsechosting/controlpanel:latest
|
||||||
|
- name: Image digest
|
||||||
|
run: echo ${{ steps.docker_build.outputs.digest }}
|
||||||
|
|
||||||
|
tests:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: shivammathur/setup-php@15c43e89cdef867065b0213be354c2841860869e
|
- uses: shivammathur/setup-php@15c43e89cdef867065b0213be354c2841860869e
|
||||||
with:
|
with:
|
||||||
|
|
|
@ -26,8 +26,6 @@ class UsefulLinkController extends Controller
|
||||||
/**
|
/**
|
||||||
* Show the form for creating a new resource.
|
* Show the form for creating a new resource.
|
||||||
*
|
*
|
||||||
* @return Application|Factory|View|Response
|
|
||||||
*/
|
|
||||||
public function create()
|
public function create()
|
||||||
{
|
{
|
||||||
return view('admin.usefullinks.create');
|
return view('admin.usefullinks.create');
|
||||||
|
@ -133,5 +131,4 @@ class UsefulLinkController extends Controller
|
||||||
->rawColumns(['actions' , 'icon'])
|
->rawColumns(['actions' , 'icon'])
|
||||||
->make();
|
->make();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -93,7 +93,6 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<div class="form-group text-right">
|
<div class="form-group text-right">
|
||||||
<button type="submit" class="btn btn-primary">
|
<button type="submit" class="btn btn-primary">
|
||||||
Submit
|
Submit
|
||||||
|
@ -108,7 +107,6 @@
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
<!-- END CONTENT -->
|
<!-- END CONTENT -->
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
document.addEventListener('DOMContentLoaded', (event) => {
|
document.addEventListener('DOMContentLoaded', (event) => {
|
||||||
// Summernote
|
// Summernote
|
||||||
|
|
Loading…
Reference in a new issue