diff --git a/assets/components/container/container.vue b/assets/components/container/container.vue index c381b4b6..b6472dff 100644 --- a/assets/components/container/container.vue +++ b/assets/components/container/container.vue @@ -83,8 +83,7 @@ export default { } .content-inner { - flex-grow: 1; - padding: 1rem; - border-top: solid 1px var(--crease); + flex-grow: 1; + overflow-y: auto; } diff --git a/assets/components/entities/entity.vue b/assets/components/entities/entity.vue new file mode 100644 index 00000000..3d0d4a50 --- /dev/null +++ b/assets/components/entities/entity.vue @@ -0,0 +1,185 @@ + + + + + diff --git a/assets/components/entities/tile.vue b/assets/components/entities/tile.vue new file mode 100644 index 00000000..577a9021 --- /dev/null +++ b/assets/components/entities/tile.vue @@ -0,0 +1,74 @@ + + + + + diff --git a/assets/components/header/filters.vue b/assets/components/header/filters.vue index 8a46e764..b0a78a6c 100644 --- a/assets/components/header/filters.vue +++ b/assets/components/header/filters.vue @@ -30,7 +30,7 @@ {{ tag }} @@ -56,7 +56,7 @@ const tags = [ function getNewRange(tag) { if (this.selectedTags.includes(tag)) { if (this.selectedTags.length === 1) { - return 'all-tags'; + return 'all'; } return this.selectedTags.filter(selectedTag => selectedTag !== tag).join('+'); @@ -66,7 +66,7 @@ function getNewRange(tag) { } function selectedTags() { - return this.$route.params.tags.split('+').filter(selectedTag => selectedTag !== 'all-tags'); + return this.$route.params.tags.split('+').filter(selectedTag => selectedTag !== 'all'); } export default { diff --git a/assets/components/header/header.vue b/assets/components/header/header.vue index 361bb6aa..3575becc 100644 --- a/assets/components/header/header.vue +++ b/assets/components/header/header.vue @@ -43,7 +43,7 @@ :href="href" :class="{ active: isActive }" @click="navigate" - >Sites + >Channels diff --git a/assets/components/home/home.vue b/assets/components/home/home.vue index 83e5672b..7542c068 100644 --- a/assets/components/home/home.vue +++ b/assets/components/home/home.vue @@ -1,13 +1,13 @@ + + + + diff --git a/assets/css/_theme.scss b/assets/css/_theme.scss index bf16c90c..deee8411 100644 --- a/assets/css/_theme.scss +++ b/assets/css/_theme.scss @@ -51,7 +51,7 @@ $female: #f0a; --lighten-strong: rgba(255, 255, 255, .7); --lighten-extreme: rgba(255, 255, 255, .9); --lighten-weak: rgba(255, 255, 255, .2); - --lighten-hint: rgba(255, 255, 255, .1); + --lighten-hint: rgba(255, 255, 255, .05); --logo-shadow: drop-shadow(1px 0 0 $shadow-weak) drop-shadow(-1px 0 0 $shadow-weak) drop-shadow(0 1px 0 $shadow-weak) drop-shadow(0 -1px 0 $shadow-weak); --logo-highlight: drop-shadow(0 0 1px $highlight); diff --git a/assets/js/router.js b/assets/js/router.js index 2ba35e28..6df419d4 100644 --- a/assets/js/router.js +++ b/assets/js/router.js @@ -4,7 +4,7 @@ import VueRouter from 'vue-router'; import Home from '../components/home/home.vue'; import Release from '../components/releases/release.vue'; import Site from '../components/sites/site.vue'; -import Network from '../components/networks/network.vue'; +import Entity from '../components/entities/entity.vue'; import Networks from '../components/networks/networks.vue'; import Actor from '../components/actors/actor.vue'; import Actors from '../components/actors/actors.vue'; @@ -22,7 +22,7 @@ const routes = [ name: 'updates', params: { range: 'latest', - tags: 'all-tags', + tags: 'all', pageNumber: 1, }, }, @@ -33,7 +33,7 @@ const routes = [ name: 'updates', params: { range: 'latest', - tags: 'all-tags', + tags: 'all', pageNumber: 1, }, }, @@ -61,7 +61,7 @@ const routes = [ params: { ...from.params, range: 'latest', - tags: 'all-tags', + tags: 'all', pageNumber: 1, }, }), @@ -72,42 +72,41 @@ const routes = [ name: 'actorRange', }, { - path: '/site/:siteSlug', + path: '/channel/:entitySlug', component: Site, - name: 'site', + name: 'channelBase', redirect: from => ({ - name: 'siteRange', + name: 'channel', params: { ...from.params, range: 'latest', - tags: 'all-tags', + tags: 'all', pageNumber: 1, }, }), }, { - path: '/site/:siteSlug/:tags/:range/:pageNumber', - component: Site, - name: 'siteRange', + path: '/channel/:entitySlug/:tags/:range/:pageNumber', + component: Entity, + name: 'channel', }, { - path: '/network/:networkSlug', - component: Network, + path: '/network/:entitySlug', + name: 'networkBase', + redirect: from => ({ + name: 'network', + params: { + ...from.params, + range: 'latest', + tags: 'all', + pageNumber: 1, + }, + }), + }, + { + path: '/network/:entitySlug/:tags/:range/:pageNumber', + component: Entity, name: 'network', - redirect: from => ({ - name: 'networkRange', - params: { - ...from.params, - range: 'latest', - tags: 'all-tags', - pageNumber: 1, - }, - }), - }, - { - path: '/network/:networkSlug/:tags/:range/:pageNumber', - component: Network, - name: 'networkRange', }, { path: '/tag/:tagSlug', @@ -116,7 +115,7 @@ const routes = [ params: { ...from.params, range: 'latest', - tags: 'all-tags', + tags: 'all', }, }), }, @@ -133,7 +132,7 @@ const routes = [ ...from.params, gender: 'female', letter: 'all', - tags: 'all-tags', + tags: 'all', range: 'latest', pageNumber: 1, }, diff --git a/public/img/logos/burningangel/burningangel.png b/public/img/logos/burningangel/burningangel.png new file mode 100644 index 00000000..d09d3b65 Binary files /dev/null and b/public/img/logos/burningangel/burningangel.png differ diff --git a/public/img/logos/burningangel/lazy/burningangel.png b/public/img/logos/burningangel/lazy/burningangel.png new file mode 100644 index 00000000..b7543933 Binary files /dev/null and b/public/img/logos/burningangel/lazy/burningangel.png differ diff --git a/public/img/logos/burningangel/lazy/favicon.png b/public/img/logos/burningangel/lazy/favicon.png index 61e6abce..2bfa40f7 100644 Binary files a/public/img/logos/burningangel/lazy/favicon.png and b/public/img/logos/burningangel/lazy/favicon.png differ diff --git a/public/img/logos/burningangel/lazy/network.png b/public/img/logos/burningangel/lazy/network.png index 2b8a3df4..145af4cc 100644 Binary files a/public/img/logos/burningangel/lazy/network.png and b/public/img/logos/burningangel/lazy/network.png differ diff --git a/public/img/logos/burningangel/thumbs/burningangel.png b/public/img/logos/burningangel/thumbs/burningangel.png new file mode 100644 index 00000000..db17be7e Binary files /dev/null and b/public/img/logos/burningangel/thumbs/burningangel.png differ diff --git a/public/img/logos/burningangel/thumbs/favicon.png b/public/img/logos/burningangel/thumbs/favicon.png index 362bc269..1099502a 100644 Binary files a/public/img/logos/burningangel/thumbs/favicon.png and b/public/img/logos/burningangel/thumbs/favicon.png differ diff --git a/public/img/logos/burningangel/thumbs/network.png b/public/img/logos/burningangel/thumbs/network.png index 36766c60..03efa704 100644 Binary files a/public/img/logos/burningangel/thumbs/network.png and b/public/img/logos/burningangel/thumbs/network.png differ diff --git a/seeds/01_networks.js b/seeds/01_networks.js index 9b85e167..272659f1 100644 --- a/seeds/01_networks.js +++ b/seeds/01_networks.js @@ -120,6 +120,7 @@ const networks = [ name: 'Brazzers', url: 'https://www.brazzers.com', description: 'Brazzers homepage is updated daily with official HD porn scenes. Our hottest videos and sex series are filled with big tits, sexy milf, top pornstars and special events.', + parent: 'mindgeek', }, { slug: 'boobpedia', diff --git a/seeds/02_sites.js b/seeds/02_sites.js index 16c37c81..571b4146 100644 --- a/seeds/02_sites.js +++ b/seeds/02_sites.js @@ -3089,6 +3089,7 @@ const sites = [ url: 'https://www.pornhub.com', description: '', network: 'mindgeek', + type: 'info', }, { slug: 'tube8vip',