Merge remote-tracking branch 'origin/dev'
This commit is contained in:
		
							
								
								
									
										3
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							@@ -4,4 +4,7 @@ config.json
 | 
				
			|||||||
public/b
 | 
					public/b
 | 
				
			||||||
public/ca
 | 
					public/ca
 | 
				
			||||||
public/t
 | 
					public/t
 | 
				
			||||||
 | 
					deleted/b
 | 
				
			||||||
 | 
					deleted/ca
 | 
				
			||||||
 | 
					deleted/t
 | 
				
			||||||
tmp/*
 | 
					tmp/*
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -22,7 +22,7 @@ cd f0ckv2
 | 
				
			|||||||
 #(for developers: git checkout dev)
 | 
					 #(for developers: git checkout dev)
 | 
				
			||||||
npm i
 | 
					npm i
 | 
				
			||||||
psql f0ck < f0ck.sql
 | 
					psql f0ck < f0ck.sql
 | 
				
			||||||
mkdir -p public/ca
 | 
					mkdir -p public/ca deleted/{ca,b,t}
 | 
				
			||||||
cp config_example.json config.json
 | 
					cp config_example.json config.json
 | 
				
			||||||
  - edit config.json
 | 
					  - edit config.json
 | 
				
			||||||
  - set up clients, as described here: https://git.lat/keinBot/cuffeo
 | 
					  - set up clients, as described here: https://git.lat/keinBot/cuffeo
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -868,6 +868,14 @@ html[theme="f0ck95"] ._error_topbar {
 | 
				
			|||||||
  background: -webkit-linear-gradient(left,#08216b,#a5cef7);
 | 
					  background: -webkit-linear-gradient(left,#08216b,#a5cef7);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					html[theme="f0ck95"] .f0ckgle {
 | 
				
			||||||
 | 
					  color: black;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					html[theme="f0ck95"] .admin-search button {
 | 
				
			||||||
 | 
					  color: black;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* f0ck95dARK */
 | 
					/* f0ck95dARK */
 | 
				
			||||||
html[theme='f0ck95d'] {
 | 
					html[theme='f0ck95d'] {
 | 
				
			||||||
  --accent: #fff;
 | 
					  --accent: #fff;
 | 
				
			||||||
@@ -877,7 +885,7 @@ html[theme='f0ck95d'] {
 | 
				
			|||||||
  --gray: silver;
 | 
					  --gray: silver;
 | 
				
			||||||
  --nav-bg: #0b0a0a;
 | 
					  --nav-bg: #0b0a0a;
 | 
				
			||||||
  --nav-brand-border: inset 1px black;
 | 
					  --nav-brand-border: inset 1px black;
 | 
				
			||||||
  --nav-brand-bg: #4c4c4c;
 | 
					  --nav-brand-bg: #0000;
 | 
				
			||||||
  --navigation-links-bg: #0b0b0b;
 | 
					  --navigation-links-bg: #0b0b0b;
 | 
				
			||||||
  --navigation-links-background-linear-gradient: rgba(0,0,0,.12),rgba(0,0,0,0);
 | 
					  --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);
 | 
					  --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; 
 | 
					  border-radius: 0; 
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					html[theme="f0ck95d"] .admin-search button {
 | 
				
			||||||
 | 
					  color: black;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
::-webkit-scrollbar {
 | 
					::-webkit-scrollbar {
 | 
				
			||||||
  width: 2px;
 | 
					  width: 2px;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,9 +1,10 @@
 | 
				
			|||||||
@include(snippets/header)
 | 
					@include(snippets/header)
 | 
				
			||||||
<h1 style="text-align: center">f0ckgle</h1>
 | 
					<div class="f0ckgle">
 | 
				
			||||||
<form action="/search" class="admin-search">
 | 
					  <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>
 | 
					    <input type="text" name="tag" value="{!! searchstring || '' !!}" /><button type="submit"><b>f0ck</b></button>
 | 
				
			||||||
</form>
 | 
					  </form>
 | 
				
			||||||
<div class="results">
 | 
					  <div class="results">
 | 
				
			||||||
    @if(result)
 | 
					    @if(result)
 | 
				
			||||||
    <h2>{{ count }} f0cks given (page {{ pagination.page }} of {{ pagination.end }}):</h2>
 | 
					    <h2>{{ count }} f0cks given (page {{ pagination.page }} of {{ pagination.end }}):</h2>
 | 
				
			||||||
    <table style="width: 100%" class="table">
 | 
					    <table style="width: 100%" class="table">
 | 
				
			||||||
@@ -31,5 +32,6 @@
 | 
				
			|||||||
      </tbody>
 | 
					      </tbody>
 | 
				
			||||||
    </table>
 | 
					    </table>
 | 
				
			||||||
    @endif
 | 
					    @endif
 | 
				
			||||||
 | 
					  </div>
 | 
				
			||||||
</div>
 | 
					</div>
 | 
				
			||||||
@include(snippets/footer)
 | 
					@include(snippets/footer)
 | 
				
			||||||
		Reference in New Issue
	
	Block a user