From 0e4c0d8fffcb9decb722462d0cb7d972ba2099af Mon Sep 17 00:00:00 2001 From: DebaucheryLibrarian Date: Mon, 20 Jul 2020 04:20:33 +0200 Subject: [PATCH] Added channel filter. --- assets/components/actors/actor.vue | 19 +- assets/components/entities/entity.vue | 2 +- assets/components/filters/channel-filter.vue | 144 ++++++++++ .../{header => filters}/filter-bar.vue | 190 +++++++++++-- assets/components/filters/tag-filter.vue | 111 ++++++++ assets/components/header/filters.vue | 249 ------------------ assets/components/header/header.vue | 22 +- assets/components/home/home.vue | 2 +- assets/components/sidebar/sidebar.vue | 2 +- assets/components/tags/tag.vue | 2 +- assets/components/tags/tags.vue | 2 +- assets/img/icons/antenna.svg | 7 + assets/img/icons/antenna2.svg | 5 + assets/img/icons/camera.svg | 5 + assets/img/icons/display.svg | 5 + assets/img/icons/display4.svg | 5 + assets/img/icons/station.svg | 5 + assets/img/icons/station2.svg | 9 + assets/img/icons/tv.svg | 5 + assets/js/actors/actions.js | 22 ++ migrations/20190325001339_releases.js | 16 +- .../img/logos/killergram/lazy/analrehab.png | Bin 3264 -> 3264 bytes .../logos/killergram/lazy/bitchfunkers.png | Bin 2978 -> 2978 bytes .../logos/killergram/lazy/bootypackers.png | Bin 4334 -> 4334 bytes .../img/logos/killergram/lazy/brownsugar.png | Bin 4911 -> 4911 bytes .../logos/killergram/lazy/burlesquexxx.png | Bin 17378 -> 17378 bytes .../logos/killergram/lazy/chainsmokers.png | Bin 4662 -> 4662 bytes .../img/logos/killergram/lazy/clubbabes.png | Bin 3232 -> 3232 bytes .../logos/killergram/lazy/collegebabes.png | Bin 3041 -> 3041 bytes .../img/logos/killergram/lazy/creammycunt.png | Bin 5423 -> 5423 bytes .../logos/killergram/lazy/cumpartysluts.png | Bin 3415 -> 3415 bytes .../logos/killergram/lazy/doggingmissions.png | Bin 4713 -> 4713 bytes public/img/logos/killergram/lazy/favicon.png | Bin 3167 -> 3167 bytes .../logos/killergram/lazy/fetishsexclinic.png | Bin 4770 -> 4770 bytes .../img/logos/killergram/lazy/getshafted.png | Bin 4144 -> 4144 bytes .../img/logos/killergram/lazy/girlyriders.png | Bin 3554 -> 3554 bytes .../logos/killergram/lazy/gloryholegirls.png | Bin 2527 -> 2527 bytes .../img/logos/killergram/lazy/hardfisex.png | Bin 4121 -> 4121 bytes .../img/logos/killergram/lazy/killergram.png | Bin 2625 -> 2625 bytes .../logos/killergram/lazy/killergramcuts.png | Bin 3250 -> 3250 bytes .../killergram/lazy/killergramplatinum.png | Bin 4721 -> 4721 bytes .../logos/killergram/lazy/kinkycouples.png | Bin 2791 -> 2791 bytes .../logos/killergram/lazy/letsgetslippy.png | Bin 5665 -> 5665 bytes public/img/logos/killergram/lazy/network.png | Bin 2625 -> 2625 bytes .../logos/killergram/lazy/nyloncumsluts.png | Bin 3105 -> 3105 bytes .../logos/killergram/lazy/officeantics.png | Bin 5062 -> 14709 bytes .../img/logos/killergram/lazy/pornostatic.png | Bin 2696 -> 2696 bytes .../logos/killergram/lazy/pornstarsutd.png | Bin 6924 -> 6924 bytes .../img/logos/killergram/lazy/rockchicks.png | Bin 3847 -> 3847 bytes public/img/logos/killergram/lazy/ru4hire.png | Bin 4156 -> 4156 bytes .../logos/killergram/lazy/spacehoppers.png | Bin 6824 -> 6824 bytes .../logos/killergram/lazy/streetwalkers.png | Bin 3041 -> 3041 bytes .../logos/killergram/lazy/tattooedsluts.png | Bin 5438 -> 5438 bytes .../img/logos/killergram/lazy/thehandyman.png | Bin 4505 -> 4505 bytes .../img/logos/killergram/lazy/theladypimp.png | Bin 3908 -> 3908 bytes .../img/logos/killergram/lazy/voyeurcams.png | Bin 2391 -> 2391 bytes .../img/logos/killergram/lazy/wifesluts.png | Bin 1672 -> 1672 bytes .../logos/killergram/lazy/wishescumtrue.png | Bin 5532 -> 5532 bytes public/img/logos/killergram/officeantics.png | Bin 61273 -> 71420 bytes .../img/logos/killergram/thumbs/analrehab.png | Bin 10604 -> 10604 bytes .../logos/killergram/thumbs/bitchfunkers.png | Bin 23487 -> 23487 bytes .../logos/killergram/thumbs/bootypackers.png | Bin 57980 -> 57980 bytes .../logos/killergram/thumbs/brownsugar.png | Bin 45590 -> 45590 bytes .../logos/killergram/thumbs/burlesquexxx.png | Bin 71324 -> 71324 bytes .../logos/killergram/thumbs/chainsmokers.png | Bin 59043 -> 59043 bytes .../img/logos/killergram/thumbs/clubbabes.png | Bin 24757 -> 24757 bytes .../logos/killergram/thumbs/collegebabes.png | Bin 21436 -> 21436 bytes .../logos/killergram/thumbs/creammycunt.png | Bin 42573 -> 42573 bytes .../logos/killergram/thumbs/cumpartysluts.png | Bin 23962 -> 23962 bytes .../killergram/thumbs/doggingmissions.png | Bin 73493 -> 73493 bytes .../img/logos/killergram/thumbs/favicon.png | Bin 3167 -> 3167 bytes .../killergram/thumbs/fetishsexclinic.png | Bin 46944 -> 46944 bytes .../logos/killergram/thumbs/getshafted.png | Bin 36292 -> 36292 bytes .../logos/killergram/thumbs/girlyriders.png | Bin 22981 -> 22981 bytes .../killergram/thumbs/gloryholegirls.png | Bin 28136 -> 28136 bytes .../img/logos/killergram/thumbs/hardfisex.png | Bin 64038 -> 64038 bytes .../logos/killergram/thumbs/killergram.png | Bin 16807 -> 16807 bytes .../killergram/thumbs/killergramcuts.png | Bin 28169 -> 28169 bytes .../killergram/thumbs/killergramplatinum.png | Bin 66249 -> 66249 bytes .../logos/killergram/thumbs/kinkycouples.png | Bin 29871 -> 29871 bytes .../logos/killergram/thumbs/letsgetslippy.png | Bin 48788 -> 48788 bytes .../img/logos/killergram/thumbs/network.png | Bin 16807 -> 16807 bytes .../logos/killergram/thumbs/nyloncumsluts.png | Bin 21786 -> 21786 bytes .../logos/killergram/thumbs/officeantics.png | Bin 63223 -> 72895 bytes .../logos/killergram/thumbs/pornostatic.png | Bin 19885 -> 19885 bytes .../logos/killergram/thumbs/pornstarsutd.png | Bin 18684 -> 18684 bytes .../logos/killergram/thumbs/rockchicks.png | Bin 32060 -> 32060 bytes .../img/logos/killergram/thumbs/ru4hire.png | Bin 26194 -> 26194 bytes .../logos/killergram/thumbs/spacehoppers.png | Bin 35909 -> 35909 bytes .../logos/killergram/thumbs/streetwalkers.png | Bin 36210 -> 36210 bytes .../logos/killergram/thumbs/tattooedsluts.png | Bin 34744 -> 34744 bytes .../logos/killergram/thumbs/thehandyman.png | Bin 53757 -> 53757 bytes .../logos/killergram/thumbs/theladypimp.png | Bin 17306 -> 17306 bytes .../logos/killergram/thumbs/voyeurcams.png | Bin 14154 -> 14154 bytes .../img/logos/killergram/thumbs/wifesluts.png | Bin 15655 -> 15655 bytes .../logos/killergram/thumbs/wishescumtrue.png | Bin 39594 -> 39594 bytes public/img/tags/69/1.jpeg | Bin 0 -> 1256472 bytes public/img/tags/69/lazy/1.jpeg | Bin 0 -> 8340 bytes public/img/tags/69/thumbs/1.jpeg | Bin 0 -> 35417 bytes public/img/tags/anal/5.jpeg | Bin 0 -> 1286241 bytes public/img/tags/anal/lazy/5.jpeg | Bin 0 -> 7094 bytes public/img/tags/anal/thumbs/0.jpeg | Bin 40055 -> 30517 bytes public/img/tags/anal/thumbs/1.jpeg | Bin 32599 -> 25092 bytes public/img/tags/anal/thumbs/3.jpeg | Bin 38115 -> 28265 bytes public/img/tags/anal/thumbs/4.jpeg | Bin 33994 -> 26434 bytes public/img/tags/anal/thumbs/5.jpeg | Bin 0 -> 27294 bytes public/img/tags/anal/thumbs/poster.jpeg | Bin 40074 -> 30886 bytes public/img/tags/blonde/0.jpeg | Bin 811284 -> 0 bytes public/img/tags/blonde/1.jpeg | Bin 903507 -> 984992 bytes public/img/tags/blonde/lazy/1.jpeg | Bin 9314 -> 9550 bytes public/img/tags/blonde/thumbs/1.jpeg | Bin 37485 -> 38567 bytes public/img/tags/brunette/0.jpeg | Bin 725734 -> 816510 bytes public/img/tags/brunette/lazy/0.jpeg | Bin 8340 -> 8596 bytes public/img/tags/brunette/thumbs/0.jpeg | Bin 38313 -> 39869 bytes public/img/tags/dp/3.jpeg | Bin 0 -> 371815 bytes public/img/tags/dp/lazy/3.jpeg | Bin 0 -> 7499 bytes public/img/tags/dp/thumbs/0.jpeg | Bin 43071 -> 33185 bytes public/img/tags/dp/thumbs/1.jpeg | Bin 48016 -> 37227 bytes public/img/tags/dp/thumbs/2.jpeg | Bin 43487 -> 34279 bytes public/img/tags/dp/thumbs/3.jpeg | Bin 0 -> 30498 bytes public/img/tags/dp/thumbs/poster.jpeg | Bin 37028 -> 29114 bytes public/img/tags/facial/2.jpeg | Bin 0 -> 440613 bytes public/img/tags/facial/lazy/2.jpeg | Bin 0 -> 7901 bytes public/img/tags/facial/thumbs/0.jpeg | Bin 40182 -> 31296 bytes public/img/tags/facial/thumbs/1.jpeg | Bin 34283 -> 26559 bytes public/img/tags/facial/thumbs/2.jpeg | Bin 0 -> 34198 bytes public/img/tags/facial/thumbs/poster.jpeg | Bin 37305 -> 29256 bytes public/img/tags/fake-boobs/6.jpeg | Bin 0 -> 371767 bytes public/img/tags/fake-boobs/7.jpeg | Bin 0 -> 286027 bytes public/img/tags/fake-boobs/lazy/6.jpeg | Bin 5440 -> 6107 bytes public/img/tags/fake-boobs/thumbs/6.jpeg | Bin 19026 -> 24951 bytes public/img/tags/gaping/3.jpeg | Bin 0 -> 683404 bytes public/img/tags/gaping/lazy/3.jpeg | Bin 0 -> 7443 bytes public/img/tags/gaping/thumbs/0.jpeg | Bin 36637 -> 28482 bytes public/img/tags/gaping/thumbs/1.jpeg | Bin 34965 -> 27533 bytes public/img/tags/gaping/thumbs/2.jpeg | Bin 35185 -> 27413 bytes public/img/tags/gaping/thumbs/3.jpeg | Bin 0 -> 32278 bytes public/img/tags/gaping/thumbs/poster.jpeg | Bin 42510 -> 33518 bytes public/img/tags/piercings/0.jpeg | Bin 6529584 -> 6751111 bytes public/img/tags/piercings/lazy/0.jpeg | Bin 8087 -> 8051 bytes public/img/tags/piercings/thumbs/0.jpeg | Bin 32391 -> 32297 bytes public/img/tags/tattoos/1.jpeg | Bin 382113 -> 395259 bytes seeds/04_media.js | 10 +- 143 files changed, 537 insertions(+), 302 deletions(-) create mode 100644 assets/components/filters/channel-filter.vue rename assets/components/{header => filters}/filter-bar.vue (51%) create mode 100644 assets/components/filters/tag-filter.vue delete mode 100644 assets/components/header/filters.vue create mode 100644 assets/img/icons/antenna.svg create mode 100644 assets/img/icons/antenna2.svg create mode 100644 assets/img/icons/camera.svg create mode 100644 assets/img/icons/display.svg create mode 100644 assets/img/icons/display4.svg create mode 100644 assets/img/icons/station.svg create mode 100644 assets/img/icons/station2.svg create mode 100644 assets/img/icons/tv.svg create mode 100644 public/img/tags/69/1.jpeg create mode 100644 public/img/tags/69/lazy/1.jpeg create mode 100644 public/img/tags/69/thumbs/1.jpeg create mode 100644 public/img/tags/anal/5.jpeg create mode 100644 public/img/tags/anal/lazy/5.jpeg create mode 100644 public/img/tags/anal/thumbs/5.jpeg delete mode 100644 public/img/tags/blonde/0.jpeg create mode 100644 public/img/tags/dp/3.jpeg create mode 100644 public/img/tags/dp/lazy/3.jpeg create mode 100644 public/img/tags/dp/thumbs/3.jpeg create mode 100644 public/img/tags/facial/2.jpeg create mode 100644 public/img/tags/facial/lazy/2.jpeg create mode 100644 public/img/tags/facial/thumbs/2.jpeg create mode 100644 public/img/tags/fake-boobs/6.jpeg create mode 100644 public/img/tags/fake-boobs/7.jpeg create mode 100644 public/img/tags/gaping/3.jpeg create mode 100644 public/img/tags/gaping/lazy/3.jpeg create mode 100644 public/img/tags/gaping/thumbs/3.jpeg diff --git a/assets/components/actors/actor.vue b/assets/components/actors/actor.vue index cf485bdc..1d4ac2ce 100644 --- a/assets/components/actors/actor.vue +++ b/assets/components/actors/actor.vue @@ -296,6 +296,7 @@ :items-total="totalCount" :items-per-page="limit" :available-tags="actor.tags" + :available-channels="actor.channels" /> @@ -312,7 +313,7 @@ + + diff --git a/assets/components/header/filter-bar.vue b/assets/components/filters/filter-bar.vue similarity index 51% rename from assets/components/header/filter-bar.vue rename to assets/components/filters/filter-bar.vue index 359688f0..6f9ce732 100644 --- a/assets/components/header/filter-bar.vue +++ b/assets/components/filters/filter-bar.vue @@ -1,6 +1,6 @@ + + diff --git a/assets/components/filters/tag-filter.vue b/assets/components/filters/tag-filter.vue new file mode 100644 index 00000000..ae3a8b98 --- /dev/null +++ b/assets/components/filters/tag-filter.vue @@ -0,0 +1,111 @@ + + + + + diff --git a/assets/components/header/filters.vue b/assets/components/header/filters.vue deleted file mode 100644 index c23cb43a..00000000 --- a/assets/components/header/filters.vue +++ /dev/null @@ -1,249 +0,0 @@ - - - - - diff --git a/assets/components/header/header.vue b/assets/components/header/header.vue index 4db57f17..dbe43367 100644 --- a/assets/components/header/header.vue +++ b/assets/components/header/header.vue @@ -4,13 +4,7 @@
- - + >
@@ -215,11 +209,6 @@ export default { align-items: center; height: 100%; - .logo { - fill: var(--primary); - padding: .5rem; - } - .icon { display: inline-block; fill: var(--shadow-modest); @@ -354,14 +343,17 @@ export default { } @media(max-width: $breakpoint-micro) { - .nav, - .header-logo { + .nav { display: none; } .sidebar-toggle { display: flex; } + + .header-logo { + padding: 0 0 0 .5rem; + } } @media(max-width: $breakpoint-nano) { diff --git a/assets/components/home/home.vue b/assets/components/home/home.vue index f883eebc..4089673a 100644 --- a/assets/components/home/home.vue +++ b/assets/components/home/home.vue @@ -25,7 +25,7 @@