Merge pull request #231 from Kovah/dev

Release
Kovah · Feb 6, 2021 · 0b3f11d · 0b3f11d
2 parents 68612ca + e61693b
commit 0b3f11d
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 34 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "linkace",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "A small, selfhosted bookmark manager with advanced features, built with Laravel and Docker",
   "homepage": "https://github.com/Kovah/LinkAce",
   "repository": {

diff --git a/resources/docker/dockerfiles/release-simple.Dockerfile b/resources/docker/dockerfiles/release-simple.Dockerfile
@@ -2,7 +2,7 @@
 
 # ================================
 # PHP Dependency Setup
-FROM bitnami/php-fpm:7.4-prod AS builder
+FROM composer AS builder
 WORKDIR /app
 
 # Make needed parts of the app available in the container
@@ -25,7 +25,7 @@ RUN composer install -n --prefer-dist --no-dev
 
 # ================================
 # Compile all assets
-FROM node:12.19.0 AS npm_builder
+FROM node:14.15.4 AS npm_builder
 WORKDIR /srv
 
 # Copy package.json and Gruntfile

diff --git a/resources/docker/dockerfiles/release.Dockerfile b/resources/docker/dockerfiles/release.Dockerfile
@@ -2,7 +2,7 @@
 
 # ================================
 # PHP Dependency Setup
-FROM bitnami/php-fpm:7.4-prod AS builder
+FROM composer AS builder
 WORKDIR /app
 
 # Make needed parts of the app available in the container
@@ -25,7 +25,7 @@ RUN composer install -n --prefer-dist --no-dev
 
 # ================================
 # Compile all assets
-FROM node:12.19.0 AS npm_builder
+FROM node:14.15.4 AS npm_builder
 WORKDIR /srv
 
 # Copy package.json and Gruntfile
@@ -39,7 +39,7 @@ RUN npm run production
 
 # ================================
 # Prepare the final image
-FROM bitnami/php-fpm:7.4-prod
+FROM bitnami/php-fpm:8.0-prod
 WORKDIR /app
 
 # Copy the app into the container

diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php
@@ -100,9 +100,14 @@ class="form-control{{ $errors->has('url') ? ' is-invalid' : '' }}"
                     <li class="list-group-item">
                         <div class="d-flex align-items-center">
                             <span class="mr-1">@lang('stats.total_broken_links')</span>
-                            <span class="badge {{ $stats['total_broken_links'] > 0 ? 'badge-danger' : 'badge-secondary' }} ml-auto">
-                                {{ $stats['total_broken_links'] }}
-                            </span>
+                            <form action="{{ route('do-search') }}" method="post" class="d-inline-block ml-auto">
+                                @csrf
+                                <input type="hidden" name="broken_only" value="on">
+                                <button type="submit"
+                                    class="badge border-0 {{ $stats['total_broken_links'] > 0 ? 'badge-danger' : 'badge-secondary' }}">
+                                    {{ $stats['total_broken_links'] }}
+                                </button>
+                            </form>
                         </div>
                     </li>
                 </ul>