boiii/traxxx
1
0
Fork 0
forked from DebaucheryLibrarian/traxxx
Code Issues Pull Requests Projects Releases Wiki Activity

Improved sidebar design, added sfw and theme toggles.

Browse Source
This commit is contained in:
DebaucheryLibrarian
2020-07-15 00:15:00 +02:00
parent cb51a2a81b
commit eca54c2a09
35 changed files with 294 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
assets/components/actors/actors.vue
View File

@@ -33,6 +33,13 @@
replace
><Icon icon="question5" /></router-link>
</li>
<li class="gender">
<router-link
:to="{ name: 'actors', params: { gender: 'all', letter, pageNumber: 1 } }"
:class="{ selected: gender === 'all' }"
class="gender-link all"
>all</router-link>
</li>
</ul>
<ul class="letters nolist">
@@ -143,8 +150,6 @@ export default {
</script>
<style lang="scss">
@import 'theme';
.gender-link {
&.selected .gender .icon {
fill: var(--text-light);
@@ -173,7 +178,7 @@ export default {
</style>
<style lang="scss" scoped>
@import 'theme';
@import 'breakpoints';
.actors {
display: flex;
@@ -253,13 +258,15 @@ export default {
}
}
@media(max-width: $breakpoint0) {
.tiles {
grid-template-columns: repeat(auto-fill, minmax(8rem, 1fr));
}
@media(max-width: $breakpoint) {
.genders {
flex-direction: column;
}
}
@media(max-width: $breakpoint-micro) {
.tiles {
grid-template-columns: repeat(auto-fill, minmax(8rem, 1fr));
}
}
</style>

55
assets/components/header/header.vue
View File

@@ -1,11 +1,16 @@
<template>
<header class="header">
<div class="header-nav">
<Icon
icon="menu"
<div
class="sidebar-toggle"
@click.native.stop="toggleSidebar"
/>
@click.stop="toggleSidebar"
>
<Icon icon="menu" />
<div
class="logo"
v-html="logo"
/>
</div>
<router-link
to="/"
@@ -68,7 +73,7 @@
<div class="header-toggles">
<Icon
v-show="!sfw"
v-tooltip="'Hit S to use SFW mode'"
v-tooltip="'Hit S to enable safe mode'"
icon="flower"
class="toggle noselect"
@click.native="setSfw(true)"
@@ -76,9 +81,9 @@
<Icon
v-show="sfw"
v-tooltip="'Hit N to use NSFW mode'"
icon="flower"
class="toggle active noselect"
v-tooltip="'Hit N to disable safe mode'"
icon="evil2"
class="toggle noselect"
@click.native="setSfw(false)"
/>
@@ -207,14 +212,27 @@ export default {
.sidebar-toggle {
display: none;
fill: var(--shadow-modest);
padding: 0 1rem;
width: 1.5rem;
height: 100%;
height: 100%;
.logo {
fill: var(--primary);
padding: .5rem;
}
.icon {
display: inline-block;
fill: var(--shadow-modest);
padding: 0 1rem;
width: 1.5rem;
height: 100%;
}
&:hover {
fill: var(--primary);
cursor: pointer;
cursor: pointer;
.icon {
fill: var(--primary);
}
}
}
@@ -335,16 +353,13 @@ export default {
}
@media(max-width: $breakpoint-micro) {
.nav {
.nav,
.header-logo {
display: none;
}
.sidebar-toggle {
display: inline-block;
}
.header-logo {
padding: 0 0 0 .5rem;
display: flex;
}
}

271
assets/components/sidebar/sidebar.vue
View File

@@ -1,98 +1,146 @@
<template>
<div
class="sidebar"
@click.stop
>
<div class="sidebar-header">
<Icon
icon="cross2"
class="sidebar-close"
@click.native="toggleSidebar(false)"
/>
<router-link
to="/updates"
class="logo-link"
@click.native="toggleSidebar(false)"
>
<h1 class="sidebar-logo">
<div
class="logo"
v-html="logo"
<div class="sidebar-container">
<div
class="sidebar"
@click.stop
>
<div class="sidebar-section">
<div class="sidebar-header">
<Icon
icon="cross2"
class="sidebar-close"
@click.native="toggleSidebar(false)"
/>
</h1>
</router-link>
</div>
<nav class="nav">
<ul class="nolist">
<li class="nav-item">
<router-link
v-slot="{ href, isActive, navigate }"
to="/updates"
class="logo-link"
@click.native="toggleSidebar(false)"
>
<a
class="nav-link"
:href="href"
:class="{ active: isActive }"
@click="navigate"
>Home</a>
<h1 class="sidebar-logo">
<div
class="logo"
v-html="logo"
/>
</h1>
</router-link>
</li>
</div>
<li class="nav-item">
<router-link
v-slot="{ href, isActive, navigate }"
to="/actors"
@click.native="toggleSidebar(false)"
>
<a
class="nav-link"
:href="href"
:class="{ active: isActive }"
@click="navigate"
>Actors</a>
</router-link>
</li>
<nav class="nav">
<ul class="nolist">
<li class="nav-item">
<router-link
v-slot="{ href, isActive, navigate }"
to="/updates"
@click.native="toggleSidebar(false)"
>
<a
class="nav-link"
:href="href"
:class="{ active: isActive }"
@click="navigate"
>Home</a>
</router-link>
</li>
<li class="nav-item">
<router-link
v-slot="{ href, isActive, navigate }"
to="/networks"
@click.native="toggleSidebar(false)"
>
<a
class="nav-link"
:href="href"
:class="{ active: isActive }"
@click="navigate"
>Channels</a>
</router-link>
</li>
<li class="nav-item">
<router-link
v-slot="{ href, isActive, navigate }"
to="/actors"
@click.native="toggleSidebar(false)"
>
<a
class="nav-link"
:href="href"
:class="{ active: isActive }"
@click="navigate"
>Actors</a>
</router-link>
</li>
<li class="nav-item">
<router-link
v-slot="{ href, isActive, navigate }"
to="/tags"
@click.native="toggleSidebar(false)"
>
<a
class="nav-link"
:href="href"
:class="{ active: isActive }"
@click="navigate"
>Tags</a>
</router-link>
</li>
</ul>
</nav>
<li class="nav-item">
<router-link
v-slot="{ href, isActive, navigate }"
to="/networks"
@click.native="toggleSidebar(false)"
>
<a
class="nav-link"
:href="href"
:class="{ active: isActive }"
@click="navigate"
>Channels</a>
</router-link>
</li>
<li class="nav-item">
<router-link
v-slot="{ href, isActive, navigate }"
to="/tags"
@click.native="toggleSidebar(false)"
>
<a
class="nav-link"
:href="href"
:class="{ active: isActive }"
@click="navigate"
>Tags</a>
</router-link>
</li>
</ul>
</nav>
</div>
<div class="sidebar-section toggles noselect">
<label
v-show="sfw"
class="toggle"
@click="setSfw(false)"
><Icon icon="evil2" />Disable safe mode</label>
<label
v-show="!sfw"
class="toggle"
@click="setSfw(true)"
><Icon icon="flower" />Enable safe mode</label>
<label
v-show="theme === 'dark'"
class="toggle"
@click="setTheme('light')"
><Icon icon="sun" />Use light theme</label>
<label
v-show="theme === 'light'"
class="toggle"
@click="setTheme('dark')"
><Icon icon="moon" />Use dark theme</label>
</div>
</div>
</div>
</template>
<script>
import { mapState } from 'vuex';
import logo from '../../img/logo.svg';
function sfw(state) {
return state.ui.sfw;
}
function theme(state) {
return state.ui.theme;
}
function setTheme(newTheme) {
this.$store.dispatch('setTheme', newTheme);
}
function setSfw(enabled) {
this.$store.dispatch('setSfw', enabled);
}
export default {
props: {
toggleSidebar: {
@@ -105,17 +153,34 @@ export default {
logo,
};
},
computed: {
...mapState({
sfw,
theme,
}),
},
methods: {
setTheme,
setSfw,
},
};
</script>
<style lang="scss" scoped>
.sidebar-container {
height: 100%;
width: 100%;
position: absolute;
z-index: 10;
background: var(--darken-hint);
}
.sidebar {
display: flex;
flex-direction: column;
justify-content: space-between;
width: 15rem;
height: 100%;
position: absolute;
z-index: 10;
color: var(--text);
background: var(--background);
box-shadow: 0 0 3px var(--darken);
@@ -130,13 +195,13 @@ export default {
}
.sidebar-close {
width: 1.5rem;
width: 1.25rem;
height: 100%;
padding: 0 1rem;
fill: var(--darken);
padding: 0 1.125rem;
fill: var(--shadow-modest);
&:hover {
fill: var(--text);
fill: var(--primary);
cursor: pointer;
}
}
@@ -167,22 +232,52 @@ export default {
}
.nav-link {
color: var(--shadow-strong);
color: var(--shadow);
display: block;
padding: 1rem;
text-decoration: none;
font-weight: bold;
&:hover {
color: var(--primary);
color: var(--shadow-strong);
}
&.active {
background: var(--primary);
color: var(--text-light);
color: var(--primary);
}
}
.toggles {
border-top: solid 1px var(--shadow-hint);
margin: .5rem 0 0 0;
}
.toggle {
display: flex;
align-self: flex-end;
padding: 1rem;
color: var(--shadow);
font-weight: bold;
.icon {
fill: var(--shadow);
margin: 0 1rem 0 0;
}
&.active .icon {
fill: var(--primary);
}
&:hover {
cursor: pointer;
color: var(--shadow-strong);
&:not(.active) .icon {
fill: var(--shadow-strong);
}
}
}
.dark .sidebar {
background: var(--profile);