Merge remote-tracking branch 'origin/dev'

This commit is contained in:
schrumpel 2022-05-22 11:07:35 +00:00
commit d864679775
4 changed files with 51 additions and 34 deletions

3
.gitignore vendored
View File

@ -4,4 +4,7 @@ config.json
public/b
public/ca
public/t
deleted/b
deleted/ca
deleted/t
tmp/*

View File

@ -22,7 +22,7 @@ cd f0ckv2
#(for developers: git checkout dev)
npm i
psql f0ck < f0ck.sql
mkdir -p public/ca
mkdir -p public/ca deleted/{ca,b,t}
cp config_example.json config.json
- edit config.json
- set up clients, as described here: https://git.lat/keinBot/cuffeo

View File

@ -868,6 +868,14 @@ html[theme="f0ck95"] ._error_topbar {
background: -webkit-linear-gradient(left,#08216b,#a5cef7);
}
html[theme="f0ck95"] .f0ckgle {
color: black;
}
html[theme="f0ck95"] .admin-search button {
color: black;
}
/* f0ck95dARK */
html[theme='f0ck95d'] {
--accent: #fff;
@ -877,7 +885,7 @@ html[theme='f0ck95d'] {
--gray: silver;
--nav-bg: #0b0a0a;
--nav-brand-border: inset 1px black;
--nav-brand-bg: #4c4c4c;
--nav-brand-bg: #0000;
--navigation-links-bg: #0b0b0b;
--navigation-links-background-linear-gradient: rgba(0,0,0,.12),rgba(0,0,0,0);
--navigation-links-border-color: rgba(0,0,0,.8) rgba(0,0,0,.65) rgba(0,0,0,.5);
@ -1071,6 +1079,10 @@ html[theme="f0ck95d"] .badge-danger {
border-radius: 0;
}
html[theme="f0ck95d"] .admin-search button {
color: black;
}
::-webkit-scrollbar {
width: 2px;
}

View File

@ -1,35 +1,37 @@
@include(snippets/header)
<h1 style="text-align: center">f0ckgle</h1>
<form action="/search" class="admin-search">
<input type="text" name="tag" value="{!! searchstring || '' !!}" /><button type="submit"><b>f0ck</b></button>
</form>
<div class="results">
@if(result)
<h2>{{ count }} f0cks given (page {{ pagination.page }} of {{ pagination.end }}):</h2>
<table style="width: 100%" class="table">
<thead>
<tr>
<th>Thumbnail</th>
<th>ID</th>
<th>Tag</th>
<th>Mime</th>
<th>Username</th>
<th>Score</th>
</tr>
</thead>
<tbody>
@each(result as line)
<tr>
<td style="width: 128px;"><a href="/tag/{!! line.tag !!}/{{ line.id }}" target="_blank"><img src="/t/{{ line.id }}.webp" /></a></td>
<td><span class="mview_desc">ID:</span><a href="/tag/{!! line.tag !!}/{{ line.id }}" target="_blank">{{ line.id }}</a></td>
<td><span class="mview_desc">Tag:</span><a href="/tag/{!! line.tag !!}">{!! line.tag !!}</a></td>
<td><span class="mview_desc">Mime:</span>{{ line.mime }}</td>
<td><span class="mview_desc">User:</span><a href="/user/{!! line.username !!}/f0cks/{{ line.id }}">{!! line.username !!}</a></td>
<td><span class="mview_desc">Score:</span>{{ line.score?.toFixed(2) }}</td>
</tr>
@endeach
</tbody>
</table>
@endif
<div class="f0ckgle">
<h1 style="text-align: center">f0ckgle</h1>
<form action="/search" class="admin-search">
<input type="text" name="tag" value="{!! searchstring || '' !!}" /><button type="submit"><b>f0ck</b></button>
</form>
<div class="results">
@if(result)
<h2>{{ count }} f0cks given (page {{ pagination.page }} of {{ pagination.end }}):</h2>
<table style="width: 100%" class="table">
<thead>
<tr>
<th>Thumbnail</th>
<th>ID</th>
<th>Tag</th>
<th>Mime</th>
<th>Username</th>
<th>Score</th>
</tr>
</thead>
<tbody>
@each(result as line)
<tr>
<td style="width: 128px;"><a href="/tag/{!! line.tag !!}/{{ line.id }}" target="_blank"><img src="/t/{{ line.id }}.webp" /></a></td>
<td><span class="mview_desc">ID:</span><a href="/tag/{!! line.tag !!}/{{ line.id }}" target="_blank">{{ line.id }}</a></td>
<td><span class="mview_desc">Tag:</span><a href="/tag/{!! line.tag !!}">{!! line.tag !!}</a></td>
<td><span class="mview_desc">Mime:</span>{{ line.mime }}</td>
<td><span class="mview_desc">User:</span><a href="/user/{!! line.username !!}/f0cks/{{ line.id }}">{!! line.username !!}</a></td>
<td><span class="mview_desc">Score:</span>{{ line.score?.toFixed(2) }}</td>
</tr>
@endeach
</tbody>
</table>
@endif
</div>
</div>
@include(snippets/footer)