From bbd0ff001209b3d18c9b4b304869ef58da5a33b0 Mon Sep 17 00:00:00 2001 From: Kovah Date: Thu, 24 Oct 2019 15:44:03 +0200 Subject: [PATCH 1/6] Reduce number of tags assigned to links in Example seeder --- database/seeds/ExampleSeeder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/seeds/ExampleSeeder.php b/database/seeds/ExampleSeeder.php index 54ac01ce..99c63478 100644 --- a/database/seeds/ExampleSeeder.php +++ b/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')); } }); } From 3a35066bde155217615fd1a65e832f166e5ec06d Mon Sep 17 00:00:00 2001 From: Kovah Date: Thu, 24 Oct 2019 15:44:28 +0200 Subject: [PATCH 2/6] Add an alternative link view as cards, controllable via setting --- resources/lang/en/settings.php | 4 ++ .../settings/partials/app-settings.blade.php | 25 +++++++ resources/views/models/links/index.blade.php | 14 ++-- .../links/partials/single-cards.blade.php | 72 +++++++++++++++++++ 4 files changed, 111 insertions(+), 4 deletions(-) create mode 100644 resources/views/models/links/partials/single-cards.blade.php diff --git a/resources/lang/en/settings.php b/resources/lang/en/settings.php index e900f957..d361a923 100644 --- a/resources/lang/en/settings.php +++ b/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', diff --git a/resources/views/actions/settings/partials/app-settings.blade.php b/resources/views/actions/settings/partials/app-settings.blade.php index a05f1bb2..1a6ed96e 100644 --- a/resources/views/actions/settings/partials/app-settings.blade.php +++ b/resources/views/actions/settings/partials/app-settings.blade.php @@ -162,6 +162,31 @@ class="custom-select{{ $errors->has('listitem_count') ? ' is-invalid' : '' }}"> +
+ +
+ + + @if ($errors->has('link_display_mode')) + + @endif +
+ +
diff --git a/resources/views/models/links/index.blade.php b/resources/views/models/links/index.blade.php index 35b5ed75..d268ac7c 100644 --- a/resources/views/models/links/index.blade.php +++ b/resources/views/models/links/index.blade.php @@ -12,12 +12,18 @@ -
+
@if(!$links->isEmpty()) - @foreach($links as $link) - @include('models.links.partials.single') - @endforeach +
+ @foreach($links as $link) + @if(usersettings('link_display_mode') === '1') + @include('models.links.partials.single-cards') + @else + @include('models.links.partials.single') + @endif + @endforeach +
@else diff --git a/resources/views/models/links/partials/single-cards.blade.php b/resources/views/models/links/partials/single-cards.blade.php new file mode 100644 index 00000000..30f25295 --- /dev/null +++ b/resources/views/models/links/partials/single-cards.blade.php @@ -0,0 +1,72 @@ +
+
+
+
+
+ @if($link->is_private) + + @endif + {!! $link->getIcon('mr-1') !!} + {{ $link->title }} +
+ ({{ $link->shortUrl() }}) +
+
+
+ +
    +
  • + @if($link->category) + + + {{ $link->category->name }} + + @else + + @endif +
    • +
  • + @if($link->tags->count() > 0) + + @foreach($link->tags as $tag) + + {{ $tag->name }} + + @endforeach + @else + @lang('tag.no_tags') + @endif +
    • +
+
+
+ + @lang('linkace.added') {!! $link->addedAt() !!} + +
+ +
+ + + + + + + + + + + +
+ + +
+
+ +
From add5361a74b307fcd93f1a37b64cd73152e4bb8b Mon Sep 17 00:00:00 2001 From: Kovah Date: Thu, 24 Oct 2019 16:10:58 +0200 Subject: [PATCH 3/6] Improve Docker setup for development --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 49e1b67a..c554bd42 100644 --- a/docker-compose.yml +++ b/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 From 6cf9148c06f5236f08cd8012db18600a8db850e7 Mon Sep 17 00:00:00 2001 From: Kovah Date: Thu, 24 Oct 2019 16:21:21 +0200 Subject: [PATCH 4/6] Move the navbar to bottom on mobile devices, improve overall nav styling --- app/Helper/functions.php | 4 +- resources/assets/js/fontawesome.js | 3 ++ resources/assets/sass/custom/_app.scss | 42 ++++++++++++++++--- .../bootstrap/_variables-dark.scss | 2 +- .../third-party/bootstrap/_variables.scss | 2 +- resources/lang/en/linkace.php | 1 + resources/views/layouts/app.blade.php | 5 +++ resources/views/partials/nav.blade.php | 41 +++++++++++------- 8 files changed, 74 insertions(+), 26 deletions(-) diff --git a/app/Helper/functions.php b/app/Helper/functions.php index e018713a..ee79b904 100644 --- a/app/Helper/functions.php +++ b/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; diff --git a/resources/assets/js/fontawesome.js b/resources/assets/js/fontawesome.js index ebb62fc0..6252390c 100644 --- a/resources/assets/js/fontawesome.js +++ b/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); diff --git a/resources/assets/sass/custom/_app.scss b/resources/assets/sass/custom/_app.scss index cc03e8ea..fb52aa18 100644 --- a/resources/assets/sass/custom/_app.scss +++ b/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); } } diff --git a/resources/assets/sass/third-party/bootstrap/_variables-dark.scss b/resources/assets/sass/third-party/bootstrap/_variables-dark.scss index ee65698f..52026c56 100644 --- a/resources/assets/sass/third-party/bootstrap/_variables-dark.scss +++ b/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; diff --git a/resources/assets/sass/third-party/bootstrap/_variables.scss b/resources/assets/sass/third-party/bootstrap/_variables.scss index 6bd5dc3d..70f81024 100644 --- a/resources/assets/sass/third-party/bootstrap/_variables.scss +++ b/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; diff --git a/resources/lang/en/linkace.php b/resources/lang/en/linkace.php index aa248dca..b3c0b599 100644 --- a/resources/lang/en/linkace.php +++ b/resources/lang/en/linkace.php @@ -26,6 +26,7 @@ 'update' => 'Update', 'delete' => 'Delete', + 'menu' => 'Menu', 'entries' => 'Entries', 'continue_adding' => 'Continue Adding', diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 87bd694d..ba09e819 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -10,6 +10,11 @@ @include('partials.nav')
+ + {!! displaySVG(public_path('assets/img/logo_linkace.svg'), 100, 30) !!} + + @include('partials.alerts') @yield('content')
diff --git a/resources/views/partials/nav.blade.php b/resources/views/partials/nav.blade.php index eac828ed..96cb5684 100644 --- a/resources/views/partials/nav.blade.php +++ b/resources/views/partials/nav.blade.php @@ -1,32 +1,39 @@ -