DebaucheryLibrarian
/
traxxx-web
1
1
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: DebaucheryLibrarian:0f667ef74048d7bc043b5a82b12b0132b5113ee0
Branches Tags
DebaucheryLibrarian:main
...
compare: DebaucheryLibrarian:d31c8e9832ab2c4529429001b4e1b3ebc0565c4d
Branches Tags
DebaucheryLibrarian:main

3 Commits
0f667ef740 ... d31c8e9832

Author SHA1 Message Date
DebaucheryLibrarian d31c8e9832 0.23.1 2024-06-04 00:44:31 +02:00
DebaucheryLibrarian 774f171c5c Showing teaser of trailer is not available on scene page. 2024-06-04 00:44:28 +02:00
DebaucheryLibrarian 988ee9bdcf Improved consent page mobile layout. 2024-06-02 16:44:50 +02:00
6 changed files with 37 additions and 14 deletions
Show Stats Expand all files Collapse all files

23
assets/consent.html
View File

@ -2,8 +2,20 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>traxxx - consent</title>
<link rel="apple-touch-icon" sizes="180x180" href="/img/favicon/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/img/favicon/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/img/favicon/favicon-16x16.png">
<link rel="manifest" href="/img/favicon/site.webmanifest">
<link rel="mask-icon" href="/img/favicon/safari-pinned-tab.svg" color="#5bbad5">
<link rel="shortcut icon" href="/img/favicon/favicon.ico">
<meta name="msapplication-TileColor" content="#b91d47">
<meta name="msapplication-config" content="/img/favicon/browserconfig.xml">
<meta name="theme-color" content="#f65596">
<meta name="viewport" content="width=device-width,height=device-height,initial-scale=1.0,interactive-widget=resizes-content" />
<title>traxxx - Consent</title>
<style> <style>
:root { :root {
--primary: #f65596; --primary: #f65596;
@ -141,8 +153,17 @@
} }
@media(max-width: 800px) { @media(max-width: 800px) {
.heading {
font-size: 1.25rem;
}
.logo {
height: 1rem;
}
.actions { .actions {
flex-direction: column-reverse; flex-direction: column-reverse;
gap: 1.5rem;
} }
.leave { .leave {

4
package-lock.json generated
View File

@ -1,11 +1,11 @@
{ {
"name": "traxxx-web", "name": "traxxx-web",
"version": "0.23.0", "version": "0.23.1",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"version": "0.23.0", "version": "0.23.1",
"dependencies": { "dependencies": {
"@brillout/json-serializer": "^0.5.8", "@brillout/json-serializer": "^0.5.8",
"@dicebear/collection": "^7.0.5", "@dicebear/collection": "^7.0.5",

2
package.json
View File

@ -77,5 +77,5 @@
"postcss-custom-media": "^10.0.2", "postcss-custom-media": "^10.0.2",
"postcss-nesting": "^12.0.2" "postcss-nesting": "^12.0.2"
}, },
"version": "0.23.0" "version": "0.23.1"
} }

4
pages/entities/+Page.vue
View File

@ -36,7 +36,7 @@
> >
<img <img
v-if="network.hasLogo" v-if="network.hasLogo"
:src="`/logos/${network.slug}/network.png`" :src="network.type === 'network' || network.isIndependent || !network.parent ? `/logos/${network.slug}/network.png` : `/logos/${network.parent.slug}/${network.slug}.png`"
:alt="network.name" :alt="network.name"
class="logo" class="logo"
> >
@ -44,7 +44,7 @@
<span v-else>{{ network.name }}</span> <span v-else>{{ network.name }}</span>
<Icon <Icon
v-if="query && network.type === 'network'" v-if="pageContext.urlParsed.search.q && network.type === 'network'"
icon="device_hub" icon="device_hub"
/> />
</a> </a>

4
pages/scene/+Page.vue
View File

@ -7,11 +7,11 @@
> >
<div class="banner"> <div class="banner">
<div <div
v-if="scene.trailer" v-if="scene.trailer || scene.teaser"
class="trailer" class="trailer"
> >
<Player <Player
:video="scene.trailer" :video="scene.trailer || scene.teaser"
:poster="poster" :poster="poster"
class="item" class="item"
:class="{ playing }" :class="{ playing }"

14
src/entities.js
View File

@ -25,28 +25,30 @@ export function curateEntity(entity, context) {
export async function fetchEntities(options) { export async function fetchEntities(options) {
const entities = await knex('entities') const entities = await knex('entities')
.select('entities.*', knex.raw('row_to_json(parents) as parent'))
.modify((builder) => { .modify((builder) => {
if (options.query) { if (options.query) {
builder.where((whereBuilder) => { builder.where((whereBuilder) => {
whereBuilder whereBuilder
.whereILike('name', `%${options.query}%`) .whereILike('entities.name', `%${options.query}%`)
.orWhereILike('slug', `%${options.query}%`); .orWhereILike('entities.slug', `%${options.query}%`);
}); });
} }
if (options.type === 'primary') { if (options.type === 'primary') {
builder builder
.where('type', 'network') .where('entities.type', 'network')
.orWhere('independent', true) .orWhere('entities.independent', true)
.orWhereNull('parent_id'); .orWhereNull('entities.parent_id');
return; return;
} }
if (options.type) { if (options.type) {
builder.where('type', options.type); builder.where('entities.type', options.type);
} }
}) })
.leftJoin('entities as parents', 'parents.id', 'entities.parent_id')
.orderBy(...(options.order || ['name', 'asc'])) .orderBy(...(options.order || ['name', 'asc']))
.limit(options.limit || 1000); .limit(options.limit || 1000);