瀏覽代碼

Merge branch 'development' into useful_links_and_menu

AVMG 4 年之前
父節點
當前提交
e0199589dc

+ 23 - 4
.github/workflows/run_tests.yml

@@ -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:

+ 0 - 3
app/Http/Controllers/Admin/UsefulLinkController.php

@@ -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();
     }
-
 }

文件差異過大導致無法顯示
+ 0 - 0
public/plugins/summernote/summernote-bs4.min.js.map


+ 0 - 2
resources/views/admin/usefullinks/create.blade.php

@@ -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

部分文件因文件數量過多而無法顯示