Merge pull request #74 from Kovah/dev

v0.0.24

app/Helper/functions.php

@@ -132,11 +132,11 @@ function displaySVG($path, $width = null, $height = null)
     $svg = file_get_contents($path);
 
     if ($width) {
-        $svg = preg_replace('/width="([\d]+)"/i', "width='$width'", $svg);
+        $svg = preg_replace('/\swidth="([\d]+)"/i', "width='$width'", $svg);
     }
 
     if ($height) {
-        $svg = preg_replace('/height="([\d]+)"/i', "height='$height'", $svg);
+        $svg = preg_replace('/\sheight="([\d]+)"/i', "height='$height'", $svg);
     }
 
     return $svg;

config/linkace.php

@@ -1,6 +1,6 @@
 <?php
 return [
-    'version' => 'v0.0.23',
+    'version' => 'v0.0.24',
 
     'default' => [
         'pagination' => 25,

database/seeds/ExampleSeeder.php

@@ -21,7 +21,7 @@ public function run()
         factory(\App\Models\Link::class, 50)->create()->each(function (\App\Models\Link $link) use ($tags) {
             if (random_int(0, 1)) {
                 // Attach a random number of tags to the link
-                $link->tags()->sync($tags->random(random_int(1, 30))->pluck('id'));
+                $link->tags()->sync($tags->random(random_int(1, 8))->pluck('id'));
             }
         });
     }

docker-compose.yml

@@ -26,7 +26,7 @@ services:
     depends_on:
       - db
     volumes:
-      - .:/app
+      - .:/app:delegated
       - ./resources/docker/php/php.ini:/opt/bitnami/php/etc/conf.d/php.ini:ro
 
   # --- nginx 1.14
@@ -38,7 +38,7 @@ services:
     depends_on:
       - php
     volumes:
-      - .:/app
+      - .:/app:delegated
       - ./resources/docker/nginx/site.conf:/opt/bitnami/nginx/conf/vhosts/site.conf:ro
 
   # --- Redis 4.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "linkace",
-  "version": "0.0.23",
+  "version": "0.0.24",
   "description": "A small, selfhosted bookmark manager with advanced features, built with Laravel and Docker",
   "homepage": "https://github.com/Kovah/LinkAce",
   "repository": {
@@ -16,17 +16,17 @@
     "cross-env": "^5.2.1",
     "laravel-mix": "^4.1.4",
     "resolve-url-loader": "^2.3.2",
-    "sass": "^1.22.12",
+    "sass": "^1.23.1",
     "sass-loader": "^7.3.1",
     "vue-template-compiler": "^2.6.10"
   },
   "dependencies": {
-    "@fortawesome/fontawesome-svg-core": "^1.2.22",
-    "@fortawesome/free-brands-svg-icons": "^5.10.2",
-    "@fortawesome/free-solid-svg-icons": "^5.10.2",
+    "@fortawesome/fontawesome-svg-core": "^1.2.25",
+    "@fortawesome/free-brands-svg-icons": "^5.11.2",
+    "@fortawesome/free-solid-svg-icons": "^5.11.2",
     "bootstrap": "^4.3.1",
     "jquery": "^3.4.1",
-    "popper.js": "^1.15.0",
+    "popper.js": "^1.16.0",
     "selectize": "^0.12.6"
   },
   "scripts": {

resources/assets/js/fontawesome.js

@@ -18,6 +18,7 @@ import { faUnlink } from '@fortawesome/free-solid-svg-icons/faUnlink';
 import { faRecycle } from '@fortawesome/free-solid-svg-icons/faRecycle';
 import { faSort } from '@fortawesome/free-solid-svg-icons/faSort';
 import { faToggleOn } from '@fortawesome/free-solid-svg-icons/faToggleOn';
+import { faCaretDown } from '@fortawesome/free-solid-svg-icons/faCaretDown';
 
 import { faFacebookSquare } from '@fortawesome/free-brands-svg-icons/faFacebookSquare';
 import { faTwitterSquare } from '@fortawesome/free-brands-svg-icons/faTwitterSquare';
@@ -39,6 +40,7 @@ import { faTumblrSquare } from '@fortawesome/free-brands-svg-icons/faTumblrSquar
 import { faXingSquare } from '@fortawesome/free-brands-svg-icons/faXingSquare';
 import { faLinkedin } from '@fortawesome/free-brands-svg-icons/faLinkedin';
 import { fa500px } from '@fortawesome/free-brands-svg-icons/fa500px';
+
 import { faAdobe } from '@fortawesome/free-brands-svg-icons/faAdobe';
 import { faAws } from '@fortawesome/free-brands-svg-icons/faAws';
 import { faAmazon } from '@fortawesome/free-brands-svg-icons/faAmazon';
@@ -158,6 +160,7 @@ export function initFontAwesome () {
   library.add(faUpload);
   library.add(faSort);
   library.add(faToggleOn);
+  library.add(faCaretDown);
 
   library.add(faFacebookSquare);
   library.add(faTwitterSquare);

resources/assets/sass/custom/_app.scss

@@ -1,16 +1,21 @@
 // Layout styles
 body:not(.bookmarklet) {
-  padding-top: $nav-link-height + ($navbar-padding-y * 2);
+  padding-bottom: $nav-link-height + ($navbar-padding-y * 2);
+
+  @include media-breakpoint-up('md') {
+    padding-bottom: 0;
+    padding-top: $nav-link-height + ($navbar-padding-y * 2);
+  }
 }
 
 .main {
-  padding-top: ($spacer * 2);
-  padding-bottom: ($spacer * 2);
+  padding-top: map_get($spacers, 4);
+  padding-bottom: map_get($spacers, 4);
 }
 
 .footer {
   opacity: .5;
-  padding-bottom: ($spacer * 2);
+  padding-bottom: map_get($spacers, 4);
 }
 
 @media (max-width: 991px) {
@@ -20,6 +25,31 @@ body:not(.bookmarklet) {
   }
 }
 
+.navbar {
+  position: fixed;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: $zindex-fixed;
+
+  @include media-breakpoint-up('md') {
+    top: 0;
+    bottom: auto;
+  }
+
+  @include media-breakpoint-down('sm') {
+
+    .nav-link {
+      display: flex;
+      align-items: center;
+
+      .fa-fw {
+        margin-left: auto;
+      }
+    }
+  }
+}
+
 .card-table {
   margin: -#{$card-border-width};
 
@@ -37,7 +67,7 @@ body:not(.bookmarklet) {
 
   .sharing-checkbox {
     flex: 0 0 auto;
-    padding: $spacer / 2;
+    padding: map_get($spacers, 2);
     font-size: $h4-font-size;
 
     input {
@@ -61,7 +91,7 @@ body:not(.bookmarklet) {
 
   .share-link {
     flex: 0 0 auto;
-    margin: $spacer / 4;
+    margin: map_get($spacers, 1);
   }
 }
 

resources/assets/sass/third-party/bootstrap/_variables-dark.scss

@@ -44,7 +44,7 @@ $yiq-contrasted-threshold:  170 !default;
 
 // Options
 
-$enable-caret:                                true !default;
+$enable-caret:                                false !default;
 $enable-rounded:                              true !default;
 $enable-shadows:                              false !default;
 $enable-gradients:                            false !default;

resources/assets/sass/third-party/bootstrap/_variables.scss

@@ -107,7 +107,7 @@ $yiq-text-light: $white !default;
 //
 // Quickly modify global styling by enabling or disabling optional features.
 
-$enable-caret:                                true !default;
+$enable-caret:                                false !default;
 $enable-rounded:                              true !default;
 $enable-shadows:                              false !default;
 $enable-gradients:                            false !default;

resources/lang/en/linkace.php

@@ -26,6 +26,7 @@
     'update' => 'Update',
     'delete' => 'Delete',
 
+    'menu' => 'Menu',
     'entries' => 'Entries',
 
     'continue_adding' => 'Continue Adding',

resources/lang/en/settings.php

@@ -17,6 +17,10 @@
     'notes_private_default' => 'Private Notes by default',
     'notes_private_default_help' => 'Enabling this will make all new notes private by default',
 
+    'display_mode' => 'Display links as',
+    'display_mode_standard' => 'rows with much details',
+    'display_mode_cards' => 'cards with less details',
+
     'sharing' => 'Link Sharing',
     'sharing_help' => 'Enable all services you want to display for links, to be able to share them easily with one click.',
     'sharing_toggle' => 'Toggle all on/off',

resources/views/actions/settings/partials/app-settings.blade.php

@@ -162,6 +162,31 @@ class="custom-select{{ $errors->has('listitem_count') ? ' is-invalid' : '' }}">
                     </div>
 
                 </div>
+                <div class="col">
+
+                    <div class="form-group">
+                        <label for="link_display_mode">
+                            @lang('settings.display_mode')
+                        </label>
+                        <select id="link_display_mode" name="link_display_mode"
+                            class="custom-select{{ $errors->has('link_display_mode') ? ' is-invalid' : '' }}">
+                            <option value="0"
+                                @if($user->settings()->get('link_display_mode') === '0') selected @endif>
+                                @lang('settings.display_mode_standard')
+                            </option>
+                            <option value="1"
+                                @if($user->settings()->get('link_display_mode') === '1') selected @endif>
+                                @lang('settings.display_mode_cards')
+                            </option>
+                        </select>
+                        @if ($errors->has('link_display_mode'))
+                            <p class="invalid-feedback" role="alert">
+                                {{ $errors->first('link_display_mode') }}
+                            </p>
+                        @endif
+                    </div>
+
+                </div>
             </div>
 
             <div class="form-group mt-5 mb-5">

resources/views/layouts/app.blade.php

@@ -10,6 +10,11 @@
     @include('partials.nav')
 
     <main class="main container">
+        <a class="d-block d-md-none mb-4"
+            href="{{ auth()->guest() ? route('front') : route('dashboard') }}">
+            {!! displaySVG(public_path('assets/img/logo_linkace.svg'), 100, 30) !!}
+        </a>
+
         @include('partials.alerts')
         @yield('content')
     </main>

resources/views/models/links/index.blade.php

@@ -12,12 +12,18 @@
         </a>
     </header>
 
-    <section class="link-wrapper my-3">
+    <section class="my-3">
         @if(!$links->isEmpty())
 
-            @foreach($links as $link)
-                @include('models.links.partials.single')
-            @endforeach
+            <div class="link-wrapper {{ usersettings('link_display_mode') === '1' ? 'row' : '' }}">
+                @foreach($links as $link)
+                    @if(usersettings('link_display_mode') === '1')
+                        @include('models.links.partials.single-cards')
+                    @else
+                        @include('models.links.partials.single')
+                    @endif
+                @endforeach
+            </div>
 
         @else