Added basic actor and network overview. Added DDF Network actor scraper. Various bug fixes and layout improvements.

This commit is contained in:
2019-11-30 05:55:32 +01:00
parent 0dbe853f39
commit bead69de49
44 changed files with 1697 additions and 527 deletions

View File

@@ -24,6 +24,7 @@
<li class="bio-header">
<h2 class="bio-name">{{ actor.name }}</h2>
<span
v-if="actor.gender"
class="bio-gender"
:class="{ male: actor.gender === 'male', female: actor.gender === 'female' }"
><Icon :icon="actor.gender" /></span>
@@ -60,7 +61,7 @@
v-if="actor.origin.city"
class="city"
>{{ actor.origin.city }}</span><span
v-if="actor.origin.state && actor.origin.country && actor.origin.country.alpha2 === 'US'"
v-if="actor.origin.state && (!actor.origin.city || (actor.origin.country && actor.origin.country.alpha2 === 'US'))"
class="state"
>{{ actor.origin.city ? `, ${actor.origin.state}` : actor.origin.state }}</span>
@@ -71,7 +72,7 @@
<img
class="flag"
:src="`/img/flags/${actor.origin.country.alpha2.toLowerCase()}.png`"
>{{ actor.origin.country.name }}
>{{ actor.origin.country.alias || actor.origin.country.name }}
</span>
</span>
</li>
@@ -98,7 +99,7 @@
<img
class="flag"
:src="`/img/flags/${actor.residence.country.alpha2.toLowerCase()}.png`"
>{{ actor.residence.country.name }}
>{{ actor.residence.country.alias || actor.residence.country.name }}
</span>
</span>
</li>
@@ -180,10 +181,10 @@
<span v-else>Yes</span>
</li>
<li class="bio-item scraped">Updated on {{ formatDate(actor.scrapedAt, 'YYYY-MM-DD HH:mm') }}</li>
<span class="scraped">Updated on {{ formatDate(actor.scrapedAt, 'YYYY-MM-DD HH:mm') }}</span>
</ul>
<div>
<div class="extra">
<p
v-if="actor.description"
class="description"
@@ -223,38 +224,13 @@
v-if="actor.photos && actor.photos.length > 0"
class="photos-container"
>
<div
class="photos"
:class="{ wide: actor.photos.length > 2 }"
@wheel.prevent="scrollPhotos"
>
<a
v-if="actor.avatar"
:href="`/media/${actor.avatar.path}`"
target="_blank"
rel="noopener noreferrer"
class="avatar-link photo-link"
>
<img
:src="`/media/${actor.avatar.thumbnail}`"
class="avatar photo"
>
</a>
<Photos :actor="actor" />
<a
v-for="photo in actor.photos"
:key="`photo-${photo.id}`"
:href="`/media/${photo.path}`"
target="_blank"
rel="noopener noreferrer"
class="photo-link"
>
<img
:src="`/media/${photo.thumbnail}`"
class="photo"
>
</a>
</div>
<Photos
:actor="actor"
class="compact"
@wheel.native.prevent="scrollPhotos"
/>
</div>
<Releases :releases="releases" />
@@ -268,6 +244,7 @@ import dayjs from 'dayjs';
import { cmToFeetInches, kgToLbs } from '../../../src/utils/convert';
import Photos from './photos.vue';
import FilterBar from '../header/filter-bar.vue';
import Releases from '../releases/releases.vue';
@@ -296,7 +273,7 @@ function scrollDescription(event) {
}
async function mounted() {
[[this.actor]] = await Promise.all([
[this.actor] = await Promise.all([
this.$store.dispatch('fetchActors', this.$route.params.actorSlug),
this.fetchReleases(),
]);
@@ -309,6 +286,7 @@ async function mounted() {
export default {
components: {
FilterBar,
Photos,
Releases,
},
data() {
@@ -358,7 +336,7 @@ export default {
}
.avatar {
height: 12rem;
height: 15rem;
width: 12rem;
flex-shrink: 0;
margin: 0 1rem 0 0;
@@ -385,24 +363,28 @@ export default {
.bio-item {
display: flex;
justify-content: space-between;
margin: 0 0 .5rem 0;
padding: 0 0 .25rem 0;
margin: 0 0 .25rem 0;
line-height: 1.75;
text-align: right;
font-size: .9rem;
font-weight: 600;
&:not(:last-of-type) {
border-bottom: solid 1px $highlight-hint;
}
}
.bio-label {
color: $highlight;
display: flex;
align-items: center;
margin: 0 1rem 0 0;
flex-shrink: 0;
font-style: normal;
font-weight: bold;
font-weight: 400;
.icon {
fill: $highlight;
margin: 0 .5rem .5rem 0;
margin: 0 .5rem 0 0;
}
}
@@ -469,9 +451,18 @@ export default {
padding: 0 .5rem;
}
.description {
max-height: 10rem;
.scraped {
color: $highlight-weak;
margin: 1rem 0 0 0;
font-size: .8rem;
}
.extra {
flex-grow: 1;
}
.description {
max-height: 12rem;
position: relative;
display: block;
box-sizing: border-box;
@@ -480,7 +471,6 @@ export default {
line-height: 1.5;
text-overflow: ellipsis;
font-size: .9rem;
cursor: pointer;
overflow: auto;
scrollbar-width: none;
@@ -509,12 +499,6 @@ export default {
}
}
.scraped {
color: $highlight-weak;
margin: 1rem 0 0 0;
font-size: .8rem;
}
.actor-content {
display: flex;
flex-grow: 1;
@@ -534,27 +518,8 @@ export default {
margin: 0 .5rem 0 0;
}
.photos {
display: inline-grid;
grid-template-columns: repeat(auto-fit, 15rem);
grid-gap: .5rem;
font-size: 0;
.avatar-link {
display: none;
}
}
.photo-link {
height: 15rem;
}
.photo {
width: 100%;
height: 100%;
object-fit: cover;
object-position: 50% 0;
box-shadow: 0 0 3px $shadow-weak;
.photos.compact {
display: none;
}
.releases {
@@ -568,15 +533,9 @@ export default {
}
}
@media(min-width: $breakpoint3) {
.photos.wide {
max-width: 35vw;
}
}
@media(max-width: $breakpoint3) {
.profile .avatar-link,
.social {
.extra {
display: none;
}
@@ -592,25 +551,11 @@ export default {
}
.photos {
width: 100%;
max-width: 100%;
display: flex;
overflow-x: scroll;
scrollbar-width: none;
.avatar-link {
display: inline-block;
}
&::-webkit-scrollbar {
display: none;
}
display: none;
}
.photo-link {
height: 15rem;
flex-shrink: 0;
margin: 0 .5rem 0 0;
.photos.compact {
display: flex;
}
}

View File

@@ -0,0 +1,38 @@
<template>
<div class="actors">
<Actor
v-for="actor in actors"
:key="`actor-${actor.id}`"
:actor="actor"
/>
</div>
</template>
<script>
import Actor from '../tile/actor.vue';
async function mounted() {
this.actors = await this.$store.dispatch('fetchActors');
}
export default {
components: {
Actor,
},
data() {
return {
actors: [],
};
},
mounted,
};
</script>
<style lang="scss" scoped>
.actors {
display: grid;
grid-template-columns: repeat(auto-fit, 10rem);
grid-gap: 0 .5rem;
padding: 1rem;
}
</style>

View File

@@ -0,0 +1,100 @@
<template>
<div
class="photos"
:class="{ wide: actor.photos.length > 2 }"
>
<a
v-if="actor.avatar"
:href="`/media/${actor.avatar.path}`"
target="_blank"
rel="noopener noreferrer"
class="avatar-link photo-link"
>
<img
:src="`/media/${actor.avatar.thumbnail}`"
class="avatar photo"
>
</a>
<a
v-for="photo in actor.photos"
:key="`photo-${photo.id}`"
:href="`/media/${photo.path}`"
target="_blank"
rel="noopener noreferrer"
class="photo-link"
>
<img
:src="`/media/${photo.thumbnail}`"
class="photo"
>
</a>
</div>
</template>
<script>
export default {
props: {
actor: {
type: Object,
default: null,
},
},
};
</script>
<style lang="scss" scoped>
@import 'theme';
.photos {
display: inline-grid;
grid-template-columns: repeat(auto-fit, 12rem);
grid-gap: .5rem;
font-size: 0;
.avatar-link {
display: none;
}
}
.photo-link {
height: 15rem;
}
.photo {
width: 100%;
height: 100%;
object-fit: cover;
box-shadow: 0 0 3px $shadow-weak;
}
@media(min-width: $breakpoint3) {
.photos.wide {
max-width: 30vw;
}
}
@media(max-width: $breakpoint3) {
.photos {
width: 100%;
max-width: 100%;
display: flex;
overflow-x: scroll;
scrollbar-width: none;
.avatar-link {
display: inline-block;
}
&::-webkit-scrollbar {
display: none;
}
}
.photo-link {
height: 15rem;
flex-shrink: 0;
margin: 0 .5rem 0 0;
}
}
</style>

View File

@@ -1,11 +1,40 @@
<template>
<header class="header">
<router-link
:to="{ name: 'home' }"
<a
href="/"
class="logo-link"
>
<h1 class="logo">traxxx</h1>
</router-link>
><h1 class="logo">traxxx</h1></a>
<nav class="nav">
<ul class="nolist">
<li class="nav-item">
<Icon icon="stars" />
<a
href="/actors"
class="nav-link"
>Actors</a>
</li>
<li class="nav-item">
<Icon icon="earth2" />
<a
href="/networks"
class="nav-link"
>Networks</a>
</li>
<li class="nav-item">
<Icon icon="price-tags" />
<a
href="/tags"
class="nav-link"
>Categories</a>
</li>
</ul>
</nav>
</header>
</template>
@@ -13,19 +42,41 @@
@import 'theme';
.header {
display: flex;
align-items: center;
background: $background;
color: $primary;
padding: .5rem 1rem;
border-bottom: solid 1px $shadow-hint;
font-size: 0;
}
.logo-link {
color: inherit;
display: inline-block;
text-decoration: none;
}
.logo {
display: inline-block;
margin: 0;
padding: .5rem 1rem;
margin: 0 1rem 0 0;
font-size: 2rem;
}
.nav {
display: inline-block;
}
.nav-link {
display: inline-block;
color: $shadow;
padding: 1rem;
text-decoration: none;
font-size: 1rem;
font-weight: bold;
&:hover {
color: $primary;
}
}
</style>

View File

@@ -0,0 +1,40 @@
<template>
<div class="networks">
<Network
v-for="network in networks"
:key="`network-${network.id}`"
:network="network"
/>
</div>
</template>
<script>
import Network from '../tile/network.vue';
async function mounted() {
this.networks = await this.$store.dispatch('fetchNetworks');
console.log(this.networks);
}
export default {
components: {
Network,
},
data() {
return {
networks: [],
};
},
mounted,
};
</script>
<style lang="scss" scoped>
.networks {
display: grid;
grid-template-columns: repeat(auto-fit, 15rem);
grid-gap: 1rem;
padding: 1rem;
}
</style>

View File

@@ -7,11 +7,14 @@
:href="`/actor/${actor.slug}`"
class="link"
>
<span class="name">{{ actor.name }}</span>
<span
v-tooltip.top="actor.name"
class="name"
>{{ actor.name }}</span>
<img
v-if="actor.avatar"
:src="`/media/${actor.avatar}`"
:src="`/media/${actor.avatar.thumbnail || actor.avatar}`"
class="avatar"
>
@@ -38,6 +41,7 @@ export default {
@import 'theme';
.actor {
width: 10rem;
background: $background;
display: inline-block;
margin: 0 .5rem .5rem 0;
@@ -57,6 +61,9 @@ export default {
.name {
display: block;
padding: .5rem;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
font-weight: bold;
}
@@ -64,10 +71,11 @@ export default {
color: $shadow-weak;
background: $shadow-hint;
height: 12rem;
width: 10rem;
width: 100%;
display: flex;
align-items: center;
justify-content: center;
object-fit: cover;
object-position: 50% 0;
}
</style>

View File

@@ -0,0 +1,66 @@
<template>
<a
:href="`/network/${network.slug}`"
:title="network.name"
class="tile"
>
<object
:data="`/img/logos/${network.slug}/network.png`"
type="image/png"
class="logo"
>{{ network.name }}</object>
</a>
</template>
<script>
export default {
props: {
network: {
type: Object,
default: null,
},
},
};
</script>
<style lang="scss" scoped>
@import 'theme';
.tile {
background: $background;
display: flex;
flex-direction: column;
align-items: center;
box-sizing: border-box;
padding: .5rem 1rem;
border-radius: .25rem;
box-shadow: 0 0 3px rgba(0, 0, 0, .25);
height: 100%;
text-align: center;
}
.link {
text-decoration: none;
}
.logo {
width: 100%;
height: 5rem;
color: $text;
display: flex;
align-items: center;
justify-content: center;
object-fit: contain;
font-size: 1rem;
font-weight: bold;
filter: drop-shadow(0 0 1px $shadow);
}
.title {
color: $text;
height: 100%;
display: flex;
align-items: center;
margin: 0;
}
</style>

View File

@@ -53,6 +53,7 @@ export default {
object-fit: contain;
font-size: 1rem;
font-weight: bold;
filter: drop-shadow(0 0 1px $shadow);
}
.title {

View File

@@ -17,9 +17,10 @@ $shadow-weak: rgba(0, 0, 0, .2);
$shadow-hint: rgba(0, 0, 0, .1);
$highlight: rgba(255, 255, 255, .5);
$highlight-weak: rgba(255, 255, 255, .2);
$highlight-extreme: rgba(255, 255, 255, .9);
$highlight-strong: rgba(255, 255, 255, .7);
$highlight-weak: rgba(255, 255, 255, .2);
$highlight-hint: rgba(255, 255, 255, .075);
$profile: #222;

73
assets/img/fancentro.svg Normal file
View File

@@ -0,0 +1,73 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="37.591999"
height="35.879002"
viewBox="0 0 37.591998 35.879002"
version="1.1"
id="svg13"
sodipodi:docname="fancentro.svg"
inkscape:version="0.92.4 5da689c313, 2019-01-14">
<metadata
id="metadata19">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs17" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1026"
id="namedview15"
showgrid="false"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:zoom="4.3779009"
inkscape:cx="57.7973"
inkscape:cy="19.477246"
inkscape:window-x="1047"
inkscape:window-y="930"
inkscape:window-maximized="1"
inkscape:current-layer="Group_7638" />
<g
id="Group_7639"
data-name="Group 7639"
transform="translate(-18.259,-0.342)">
<g
id="Group_7638"
data-name="Group 7638"
transform="translate(0,0.337)"
style="fill-opacity:1">
<path
id="Subtraction_220"
data-name="Subtraction 220"
d="m 8.54,35.879 v 0 l 1.837,-7.8 L 0,30.237 0.475,29.069 4.252,19.546 4.778,18.219 5.086,17.438 5.195,17.161 5.518,16.348 6.709,13.4 12.122,0 h 13.35 l 5.1,12.572 1.534,3.776 0.323,0.813 0.109,0.277 0.309,0.781 3.539,8.927 0.763,1.924 0.443,1.168 -10.344,-2.166 1.83,7.8 L 18.812,28.416 8.543,35.877 Z M 7.2,17.332 l 7.171,5.207 -2.292,7.053 -0.444,1.374 6.7,-4.873 0.46,-0.333 v 0 l 0.461,0.333 6.7,4.873 -0.447,-1.374 -2.289,-7.053 7.17,-5.207 H 21.534 L 18.8,8.905 16.064,17.331 Z"
transform="translate(18.259,0.005)"
style="opacity:1;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1"
inkscape:connector-curvature="0" />
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.6 KiB

View File

@@ -4,8 +4,10 @@ import VueRouter from 'vue-router';
import Home from '../components/home/home.vue';
import Release from '../components/release/release.vue';
import Site from '../components/site/site.vue';
import Network from '../components/network/network.vue';
import Actor from '../components/actor/actor.vue';
import Network from '../components/networks/network.vue';
import Networks from '../components/networks/networks.vue';
import Actor from '../components/actors/actor.vue';
import Actors from '../components/actors/actors.vue';
import Tag from '../components/tag/tag.vue';
import NotFound from '../components/errors/404.vue';
@@ -47,6 +49,16 @@ const routes = [
component: Tag,
name: 'tag',
},
{
path: '/actors',
component: Actors,
name: 'actors',
},
{
path: '/networks',
component: Networks,
name: 'networks',
},
{
path: '*',
component: NotFound,