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
/export*
/stashes*
/alerts*
*.heapprofile
*.heapsnapshot
.vscode

View File

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

View File

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

4
package-lock.json generated
View File

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

View File

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

View File

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