Compare commits

..

No commits in common. "ab6365c0e3bb370d1ed55492d901eea9092dfdf9" and "ef2c832605723b5664233154a75a5fca97e20fd8" have entirely different histories.

7 changed files with 7 additions and 67 deletions

4
package-lock.json generated
View File

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

View File

@ -74,5 +74,5 @@
"postcss-custom-media": "^10.0.2",
"postcss-nesting": "^12.0.2"
},
"version": "0.18.6"
"version": "0.18.5"
}

View File

@ -1,22 +1,5 @@
<template>
<div class="page">
<form
class="search-container"
@submit.prevent="search"
>
<input
v-model="query"
type="search"
placeholder="Search channel"
class="search input"
>
<Icon
icon="search"
@click="search"
/>
</form>
<div
v-for="(section, index) in sections"
:key="`section-${index}`"
@ -49,10 +32,7 @@
</template>
<script setup>
import { ref, inject } from 'vue';
import { get } from '#/src/api.js';
import navigate from '#/src/navigate.js';
import { inject } from 'vue';
const pageContext = inject('pageContext');
@ -104,42 +84,14 @@ const sections = [
networks,
},
];
const query = ref(pageContext.urlParsed.search.q || null);
async function search() {
await get('/entities', { query: query.value });
navigate('/channels', { q: query.value });
}
</script>
<style scoped>
.search-container {
display: flex;
align-items: stretch;
padding: 1rem 1rem 0 1rem;
.icon {
padding: 0 1rem;
height: auto;
fill: var(--shadow);
&:hover {
cursor: pointer;
fill: var(--primary);
}
}
}
.search {
font-size: 1.1rem;
}
.networks {
display: grid;
grid-template-columns: repeat(auto-fit, minmax(15rem, 1fr));
gap: .5rem;
padding: .5rem 1rem;
padding: .5rem;
}
.section-label {

View File

@ -79,7 +79,7 @@
>
by
<Link
:href="`/${scene.network.type}/${scene.network.slug}`"
:href="`/${scene.network.type}/thumbs/${scene.network.slug}`"
class="network-link entity-link"
>
<img

View File

@ -10,7 +10,7 @@ export async function onBeforeRender(pageContext) {
}), {
page: Number(pageContext.routeParams.page) || 1,
limit: Number(pageContext.urlParsed.search.limit) || 30,
}, pageContext.user);
});
const {
scenes,

View File

@ -26,14 +26,6 @@ export function curateEntity(entity, context) {
export async function fetchEntities(options) {
const entities = await knex('entities')
.modify((builder) => {
if (options.query) {
builder.where((whereBuilder) => {
whereBuilder
.whereLike('name', options.query)
.orWhereLike('slug', options.query);
});
}
if (options.type === 'primary') {
builder
.where('type', 'network')

View File

@ -17,7 +17,6 @@ import errorHandler from './error.js';
import { fetchScenesApi } from './scenes.js';
import { fetchActorsApi } from './actors.js';
import { fetchMoviesApi } from './movies.js';
import { fetchEntitiesApi } from './entities.js';
import {
setUserApi,
@ -140,9 +139,6 @@ export default async function initServer() {
// MOVIES
router.get('/api/movies', fetchMoviesApi);
// ENTITIES
router.get('/api/entities', fetchEntitiesApi);
router.get('*', async (req, res, next) => {
const pageContextInit = {
urlOriginal: req.originalUrl,