Merge branch 'development' into useful_links_and_menu

This commit is contained in:
AVMG 2021-06-10 23:36:50 +02:00 committed by GitHub
commit e0199589dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 10 deletions

View file

@ -2,15 +2,34 @@ name: Laravel
on:
push:
branches: [ main ]
branches: [ main, development ]
pull_request:
branches: [ main ]
branches: [ main, development ]
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
steps:
- uses: shivammathur/setup-php@15c43e89cdef867065b0213be354c2841860869e
with:

View file

@ -26,8 +26,6 @@ class UsefulLinkController extends Controller
/**
* Show the form for creating a new resource.
*
* @return Application|Factory|View|Response
*/
public function create()
{
return view('admin.usefullinks.create');
@ -133,5 +131,4 @@ class UsefulLinkController extends Controller
->rawColumns(['actions' , 'icon'])
->make();
}
}

File diff suppressed because one or more lines are too long

View file

@ -93,7 +93,6 @@
</div>
<div class="form-group text-right">
<button type="submit" class="btn btn-primary">
Submit
@ -108,7 +107,6 @@
</div>
</section>
<!-- END CONTENT -->
<script>
document.addEventListener('DOMContentLoaded', (event) => {
// Summernote