From 5d74e2e6e3a6c4bf9bd661bd02efbddc51eb8a86 Mon Sep 17 00:00:00 2001 From: Louis Jeckel Date: Tue, 8 Sep 2020 23:55:12 +0200 Subject: [PATCH] archives --- app/SearchableText.php | 2 +- public/admin/js/admin.js | 23 ++++++++++--------- public/css/app.css | 10 ++++++-- public/js/app.js | 23 ++++++++++--------- .../js/components/FileSearch/FileHit.vue | 4 ++-- .../FileSearch/FileInstantSearch.vue | 6 ++--- resources/sass/app.scss | 6 ++++- 7 files changed, 43 insertions(+), 31 deletions(-) diff --git a/app/SearchableText.php b/app/SearchableText.php index 30b07a6..be39496 100644 --- a/app/SearchableText.php +++ b/app/SearchableText.php @@ -26,7 +26,7 @@ class SearchableText extends Model 'slug' => $this->file->slug, 'tags' => $this->file->fileTags()->pluck('content')->toArray(), 'collection' => (string) $this->file->collection, - 'ref' => $this->file->ref, + 'title' => $this->file->title, 'cover' => $this->file->coverUrl, 'created_at' => $this->file->created_at->format('U'), ], diff --git a/public/admin/js/admin.js b/public/admin/js/admin.js index 9881291..3f191a7 100644 --- a/public/admin/js/admin.js +++ b/public/admin/js/admin.js @@ -50585,10 +50585,10 @@ var render = function() { }), _vm._v(" "), _c("div", { staticClass: "card-body" }, [ - _c("h5", { staticClass: "card-title" }, [ - _vm._v(_vm._s(_vm.hit.file.collection) + " - "), - _c("strong", [_vm._v(_vm._s(_vm.hit.file.ref))]) - ]), + _c("h5", { + staticClass: "card-title", + domProps: { textContent: _vm._s(_vm.hit.file.title) } + }), _vm._v(" "), _c( "p", @@ -50619,11 +50619,11 @@ var render = function() { _c( "a", { - staticClass: "btn btn-primary", + staticClass: "btn btn-big mb-0", attrs: { href: _vm.viewLink, target: "_blank" } }, [ - _c("i", { staticClass: "fas fa-book-open" }), + _c("i", { staticClass: "fas fa-book-open mr-1" }), _vm._v(" Lire cette édition") ] ) @@ -50663,7 +50663,7 @@ var render = function() { } }, [ - _c("ais-configure", { attrs: { hitsPerPage: 10 } }), + _c("ais-configure", { attrs: { hitsPerPage: 12 } }), _vm._v(" "), _c("div", { staticClass: "row" }, [ _c( @@ -50716,14 +50716,15 @@ var render = function() { return _c( "button", { - staticClass: "ais-InfiniteHits-loadMore", + staticClass: "btn btn-big", attrs: { disabled: isLastPage }, on: { click: refineNext } }, [ - _vm._v( - "\n Voir plus\n " - ) + _c("i", { + staticClass: "far fa-plus-square mr-1" + }), + _vm._v("Voir plus\n ") ] ) } diff --git a/public/css/app.css b/public/css/app.css index 40ff02e..ec1de1c 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -11088,7 +11088,8 @@ mark.mark { } .highlight-blue, -.btn-back { +.btn-back, +.btn-big { color: white; background-color: #074e9c; } @@ -11664,7 +11665,8 @@ div.pill-box div > a.bottom-right { font-size: small; } -.btn-back { +.btn-back, +.btn-big { text-transform: uppercase; font-weight: bold; margin-bottom: 1rem; @@ -11724,3 +11726,7 @@ article h3 { max-height: 120px; } +.badge-light { + font-weight: 300; +} + diff --git a/public/js/app.js b/public/js/app.js index 65c92d4..74bb23b 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -80121,10 +80121,10 @@ var render = function() { }), _vm._v(" "), _c("div", { staticClass: "card-body" }, [ - _c("h5", { staticClass: "card-title" }, [ - _vm._v(_vm._s(_vm.hit.file.collection) + " - "), - _c("strong", [_vm._v(_vm._s(_vm.hit.file.ref))]) - ]), + _c("h5", { + staticClass: "card-title", + domProps: { textContent: _vm._s(_vm.hit.file.title) } + }), _vm._v(" "), _c( "p", @@ -80155,11 +80155,11 @@ var render = function() { _c( "a", { - staticClass: "btn btn-primary", + staticClass: "btn btn-big mb-0", attrs: { href: _vm.viewLink, target: "_blank" } }, [ - _c("i", { staticClass: "fas fa-book-open" }), + _c("i", { staticClass: "fas fa-book-open mr-1" }), _vm._v(" Lire cette édition") ] ) @@ -80199,7 +80199,7 @@ var render = function() { } }, [ - _c("ais-configure", { attrs: { hitsPerPage: 10 } }), + _c("ais-configure", { attrs: { hitsPerPage: 12 } }), _vm._v(" "), _c("div", { staticClass: "row" }, [ _c( @@ -80252,14 +80252,15 @@ var render = function() { return _c( "button", { - staticClass: "ais-InfiniteHits-loadMore", + staticClass: "btn btn-big", attrs: { disabled: isLastPage }, on: { click: refineNext } }, [ - _vm._v( - "\n Voir plus\n " - ) + _c("i", { + staticClass: "far fa-plus-square mr-1" + }), + _vm._v("Voir plus\n ") ] ) } diff --git a/resources/js/components/FileSearch/FileHit.vue b/resources/js/components/FileSearch/FileHit.vue index da601ca..e2b3ce9 100644 --- a/resources/js/components/FileSearch/FileHit.vue +++ b/resources/js/components/FileSearch/FileHit.vue @@ -3,7 +3,7 @@
Cover
-
{{hit.file.collection}} - {{hit.file.ref}}
+

@@ -15,7 +15,7 @@

-  Lire cette édition +  Lire cette édition diff --git a/resources/js/components/FileSearch/FileInstantSearch.vue b/resources/js/components/FileSearch/FileInstantSearch.vue index fac11f6..2912357 100644 --- a/resources/js/components/FileSearch/FileInstantSearch.vue +++ b/resources/js/components/FileSearch/FileInstantSearch.vue @@ -6,7 +6,7 @@ :index-name="prefix+'searchable_texts'" >
@@ -38,9 +38,9 @@ slot-scope="{ page, isLastPage, refineNext }" :disabled="isLastPage" @click="refineNext" - class="ais-InfiniteHits-loadMore" + class="btn btn-big" > - Voir plus + Voir plus
diff --git a/resources/sass/app.scss b/resources/sass/app.scss index c3cf226..4055b66 100644 --- a/resources/sass/app.scss +++ b/resources/sass/app.scss @@ -97,7 +97,7 @@ a { } -.btn-back { +.btn-back, .btn-big { @extend .highlight-blue; text-transform: uppercase; font-weight: bold; @@ -165,3 +165,7 @@ article { .mh-campaign{ max-height: 120px; } + +.badge-light { + font-weight: 300; +} -- 2.39.5