Compare commits

..

No commits in common. "4429169166c1fbaa5098ee24e592c16b97a9f99f" and "e7b72f5e99762eb2fb56d0dad54658d8aaa56a6a" have entirely different histories.

6 changed files with 20 additions and 39 deletions

1
.gitignore vendored
View File

@ -12,7 +12,6 @@ assets/js/config/
!assets/js/config/default.js !assets/js/config/default.js
/export* /export*
/stashes* /stashes*
/alerts*
*.heapprofile *.heapprofile
*.heapsnapshot *.heapsnapshot
.vscode .vscode

View File

@ -14,13 +14,11 @@
<div class="section-header"> <div class="section-header">
<h3 class="section-heading">Stashes</h3> <h3 class="section-heading">Stashes</h3>
<button <Icon
v-if="isMe" icon="plus3"
class="button button-secondary header-add" class="header-add"
@click="showAddStash = true" @click="showAddStash = true"
> />
<Icon icon="plus3" />Add stash
</button>
</div> </div>
<ul class="section-body stashes nolist"> <ul class="section-body stashes nolist">
@ -37,7 +35,6 @@
/> />
</li> </li>
<!--
<li <li
v-if="isMe" v-if="isMe"
class="stashes-stash stashes-add" class="stashes-stash stashes-add"
@ -45,7 +42,6 @@
> >
<Icon icon="plus2" /> <Icon icon="plus2" />
</li> </li>
-->
</ul> </ul>
<AddStash <AddStash
@ -58,13 +54,11 @@
<div class="section-header"> <div class="section-header">
<h3 class="section-heading">Alerts</h3> <h3 class="section-heading">Alerts</h3>
<button <Icon
v-if="isMe" icon="plus3"
class="button button-secondary header-add" class="header-add"
@click="showAddAlert = true" @click="showAddAlert = true"
> />
<Icon icon="plus3" />Set alert
</button>
</div> </div>
<ul class="section-body alerts nolist"> <ul class="section-body alerts nolist">
@ -80,14 +74,12 @@
/> />
</li> </li>
<!--
<li <li
class="alerts-add" class="alerts-add"
@click="showAddAlert = true" @click="showAddAlert = true"
> >
<Icon icon="plus2" /> <Icon icon="plus2" />
</li> </li>
-->
</ul> </ul>
<AddAlert <AddAlert
@ -194,7 +186,7 @@ export default {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
margin: 0 1rem 1rem 0; margin: 0 0 1rem 0;
} }
.section-body { .section-body {
@ -209,6 +201,14 @@ export default {
} }
.header-add { .header-add {
height: auto;
padding: .5rem 1rem;
fill: var(--shadow);
&:hover {
fill: var(--primary);
cursor: pointer;
}
} }
.stashes-stash { .stashes-stash {

View File

@ -26,8 +26,6 @@
} }
.button { .button {
display: inline-flex;
align-items: center;
border: none; border: none;
background: none; background: none;
padding: .5rem; padding: .5rem;
@ -51,11 +49,6 @@
background: var(--shadow-weak); background: var(--shadow-weak);
cursor: default; cursor: default;
} }
.icon {
fill: var(--text-light);
margin-right: .5rem;
}
} }
.button-secondary { .button-secondary {
@ -64,21 +57,12 @@
&:hover:not(:disabled) { &:hover:not(:disabled) {
color: var(--text-light); color: var(--text-light);
background: var(--primary); background: var(--primary);
.icon {
fill: var(--text-light);
}
} }
&:disabled { &:disabled {
color: var(--shadow-strong); color: var(--shadow-strong);
cursor: default; cursor: default;
} }
.icon {
fill: var(--primary);
margin-right: .5rem;
}
} }
.album-toggle { .album-toggle {

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "traxxx", "name": "traxxx",
"version": "1.227.1", "version": "1.227.0",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "traxxx", "name": "traxxx",
"version": "1.227.1", "version": "1.227.0",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@casl/ability": "^5.2.2", "@casl/ability": "^5.2.2",

View File

@ -1,6 +1,6 @@
{ {
"name": "traxxx", "name": "traxxx",
"version": "1.227.1", "version": "1.227.0",
"description": "All the latest porn releases in one place", "description": "All the latest porn releases in one place",
"main": "src/app.js", "main": "src/app.js",
"scripts": { "scripts": {

View File

@ -1,5 +1,3 @@
'use strict';
const fs = require('fs'); const fs = require('fs');
const knex = require('../knex'); const knex = require('../knex');
const args = require('../argv'); const args = require('../argv');