Big UI update

This commit is contained in:
simon987 2019-08-27 15:15:39 -04:00
parent 7f935b069a
commit 9ac73a8aff
8 changed files with 312 additions and 831 deletions

View File

@ -1,3 +1,51 @@
#help-button {
margin-bottom: 1rem;
display: block;
}
.connecting,.connecting:focus,.connecting.active,.connecting:hover {
background-color: orange !important;
transition: none;
}
.connected,.connected:focus,.connected.active,.connected:hover {
background-color: greenyellow !important;
color: black;
transition: none;
}
.disconnected,.disconnected:focus,.disconnected.active,.disconnected:hover {
background-color: orangered !important;
transition: none;
}
code {
color: deeppink;
}
.help {
font-size: 25px;
font-weight: bold;
}
@media screen and (max-width: 1200px){
.card {
margin-top: 0;
}
}
form .btn {
padding: 0 6px;
}
.card {
max-width: 1200px;
margin-left: auto;
margin-right: auto;
}
#tabs {
margin-bottom: 2rem;
}
.img-wrapper {
width: 33.33%;
display: inline-block;
@ -8,397 +56,11 @@
margin-bottom: 0.25rem;
}
form {
padding: 1rem;
background: #b3d4fc;
margin-bottom: 0.5rem;
}
form textarea {
width: 100%;
padding: 0.4rem 0.2rem;
}
form .row {
margin-bottom: 0.5rem;
#output .img {
cursor: pointer;
}
body,html {
padding: 0;
margin: 0;
}
.col .row {
margin-left: -0.25rem;
margin-right: -0.25rem;
}
.row .col {
float: left;
-webkit-box-sizing: border-box;
box-sizing: border-box;
padding: 0 0.25rem;
min-height: 1px;
}
.row .col.s1 {
width: 8.3333333333%;
margin-left: auto;
left: auto;
right: auto;
}
.row .col.s2 {
width: 16.6666666667%;
margin-left: auto;
left: auto;
right: auto;
}
.row .col.s3 {
width: 25%;
margin-left: auto;
left: auto;
right: auto;
}
.row .col.s4 {
width: 33.3333333333%;
margin-left: auto;
left: auto;
right: auto;
}
.row .col.s5 {
width: 41.6666666667%;
margin-left: auto;
left: auto;
right: auto;
}
.row .col.s6 {
width: 50%;
margin-left: auto;
left: auto;
right: auto;
}
.row .col.s7 {
width: 58.3333333333%;
margin-left: auto;
left: auto;
right: auto;
}
.row .col.s8 {
width: 66.6666666667%;
margin-left: auto;
left: auto;
right: auto;
}
.row .col.s9 {
width: 75%;
margin-left: auto;
left: auto;
right: auto;
}
.row .col.s10 {
width: 83.3333333333%;
margin-left: auto;
left: auto;
right: auto;
}
.row .col.s11 {
width: 91.6666666667%;
margin-left: auto;
left: auto;
right: auto;
}
.row .col.s12 {
width: 100%;
margin-left: auto;
left: auto;
right: auto;
}
/*! HTML5 Boilerplate v7.2.0 | MIT License | https://html5boilerplate.com/ */
/* main.css 2.0.0 | MIT License | https://github.com/h5bp/main.css#readme */
/*
* What follows is the result of much research on cross-browser styling.
* Credit left inline and big thanks to Nicolas Gallagher, Jonathan Neal,
* Kroc Camen, and the H5BP dev community and team.
*/
/* ==========================================================================
Base styles: opinionated defaults
========================================================================== */
html {
color: #222;
font-size: 1em;
line-height: 1.4;
}
/*
* Remove text-shadow in selection highlight:
* https://twitter.com/miketaylr/status/12228805301
*
* Vendor-prefixed and regular ::selection selectors cannot be combined:
* https://stackoverflow.com/a/16982510/7133471
*
* Customize the background color to match your design.
*/
::-moz-selection {
background: #b3d4fc;
text-shadow: none;
}
::selection {
background: #b3d4fc;
text-shadow: none;
}
/*
* A better looking default horizontal rule
*/
hr {
display: block;
height: 1px;
border: 0;
border-top: 1px solid #ccc;
margin: 1em 0;
padding: 0;
}
/*
* Remove the gap between audio, canvas, iframes,
* images, videos and the bottom of their containers:
* https://github.com/h5bp/html5-boilerplate/issues/440
*/
audio,
canvas,
iframe,
img,
svg,
video {
vertical-align: middle;
}
/*
* Remove default fieldset styles.
*/
fieldset {
border: 0;
margin: 0;
padding: 0;
}
/*
* Allow only vertical resizing of textareas.
*/
textarea {
resize: vertical;
}
/* ==========================================================================
Browser Upgrade Prompt
========================================================================== */
.browserupgrade {
margin: 0.2em 0;
background: #ccc;
color: #000;
padding: 0.2em 0;
}
/* ==========================================================================
Author's custom styles
========================================================================== */
/* ==========================================================================
Helper classes
========================================================================== */
/*
* Hide visually and from screen readers
*/
.hidden {
display: none !important;
}
/*
* Hide only visually, but have it available for screen readers:
* https://snook.ca/archives/html_and_css/hiding-content-for-accessibility
*
* 1. For long content, line feeds are not interpreted as spaces and small width
* causes content to wrap 1 word per line:
* https://medium.com/@jessebeach/beware-smushed-off-screen-accessible-text-5952a4c2cbfe
*/
.sr-only {
border: 0;
clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
overflow: hidden;
padding: 0;
position: absolute;
white-space: nowrap;
width: 1px;
/* 1 */
}
/*
* Extends the .sr-only class to allow the element
* to be focusable when navigated to via the keyboard:
* https://www.drupal.org/node/897638
*/
.sr-only.focusable:active,
.sr-only.focusable:focus {
clip: auto;
height: auto;
margin: 0;
overflow: visible;
position: static;
white-space: inherit;
width: auto;
}
/*
* Hide visually and from screen readers, but maintain layout
*/
.invisible {
visibility: hidden;
}
/*
* Clearfix: contain floats
*
* For modern browsers
* 1. The space content is one way to avoid an Opera bug when the
* `contenteditable` attribute is included anywhere else in the document.
* Otherwise it causes space to appear at the top and bottom of elements
* that receive the `clearfix` class.
* 2. The use of `table` rather than `block` is only necessary if using
* `:before` to contain the top-margins of child elements.
*/
.clearfix:before,
.clearfix:after {
content: " ";
/* 1 */
display: table;
/* 2 */
}
.clearfix:after {
clear: both;
}
/* ==========================================================================
EXAMPLE Media Queries for Responsive Design.
These examples override the primary ('mobile first') styles.
Modify as content requires.
========================================================================== */
@media only screen and (min-width: 35em) {
/* Style adjustments for viewports that meet the condition */
}
@media print,
(-webkit-min-device-pixel-ratio: 1.25),
(min-resolution: 1.25dppx),
(min-resolution: 120dpi) {
/* Style adjustments for high resolution devices */
}
/* ==========================================================================
Print styles.
Inlined to avoid the additional HTTP request:
https://www.phpied.com/delay-loading-your-print-css/
========================================================================== */
@media print {
*,
*:before,
*:after {
background: transparent !important;
color: #000 !important;
/* Black prints faster */
-webkit-box-shadow: none !important;
box-shadow: none !important;
text-shadow: none !important;
}
a,
a:visited {
text-decoration: underline;
}
a[href]:after {
content: " (" attr(href) ")";
}
abbr[title]:after {
content: " (" attr(title) ")";
}
/*
* Don't show links that are fragment identifiers,
* or use the `javascript:` pseudo protocol
*/
a[href^="#"]:after,
a[href^="javascript:"]:after {
content: "";
}
pre {
white-space: pre-wrap !important;
}
pre,
blockquote {
border: 1px solid #999;
page-break-inside: avoid;
}
/*
* Printing Tables:
* https://web.archive.org/web/20180815150934/http://css-discuss.incutio.com/wiki/Printing_Tables
*/
thead {
display: table-header-group;
}
tr,
img {
page-break-inside: avoid;
}
p,
h2,
h3 {
orphans: 3;
widows: 3;
}
h2,
h3 {
page-break-after: avoid;
}
}

20
css/material-icons.css Normal file
View File

@ -0,0 +1,20 @@
@font-face {
font-family: 'Material Icons';
font-style: normal;
font-weight: 400;
src: url(mi.ttf) format('truetype');
}
.material-icons {
font-family: 'Material Icons';
font-weight: normal;
font-style: normal;
font-size: 24px;
line-height: 1;
letter-spacing: normal;
text-transform: none;
display: inline-block;
white-space: nowrap;
word-wrap: normal;
direction: ltr;
}

1
css/materialize.min.css vendored Normal file

File diff suppressed because one or more lines are too long

BIN
css/mi.ttf Normal file

Binary file not shown.

349
css/normalize.css vendored
View File

@ -1,349 +0,0 @@
/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */
/* Document
========================================================================== */
/**
* 1. Correct the line height in all browsers.
* 2. Prevent adjustments of font size after orientation changes in iOS.
*/
html {
line-height: 1.15; /* 1 */
-webkit-text-size-adjust: 100%; /* 2 */
}
/* Sections
========================================================================== */
/**
* Remove the margin in all browsers.
*/
body {
margin: 0;
}
/**
* Render the `main` element consistently in IE.
*/
main {
display: block;
}
/**
* Correct the font size and margin on `h1` elements within `section` and
* `article` contexts in Chrome, Firefox, and Safari.
*/
h1 {
font-size: 2em;
margin: 0.67em 0;
}
/* Grouping content
========================================================================== */
/**
* 1. Add the correct box sizing in Firefox.
* 2. Show the overflow in Edge and IE.
*/
hr {
box-sizing: content-box; /* 1 */
height: 0; /* 1 */
overflow: visible; /* 2 */
}
/**
* 1. Correct the inheritance and scaling of font size in all browsers.
* 2. Correct the odd `em` font sizing in all browsers.
*/
pre {
font-family: monospace, monospace; /* 1 */
font-size: 1em; /* 2 */
}
/* Text-level semantics
========================================================================== */
/**
* Remove the gray background on active links in IE 10.
*/
a {
background-color: transparent;
}
/**
* 1. Remove the bottom border in Chrome 57-
* 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
*/
abbr[title] {
border-bottom: none; /* 1 */
text-decoration: underline; /* 2 */
text-decoration: underline dotted; /* 2 */
}
/**
* Add the correct font weight in Chrome, Edge, and Safari.
*/
b,
strong {
font-weight: bolder;
}
/**
* 1. Correct the inheritance and scaling of font size in all browsers.
* 2. Correct the odd `em` font sizing in all browsers.
*/
code,
kbd,
samp {
font-family: monospace, monospace; /* 1 */
font-size: 1em; /* 2 */
}
/**
* Add the correct font size in all browsers.
*/
small {
font-size: 80%;
}
/**
* Prevent `sub` and `sup` elements from affecting the line height in
* all browsers.
*/
sub,
sup {
font-size: 75%;
line-height: 0;
position: relative;
vertical-align: baseline;
}
sub {
bottom: -0.25em;
}
sup {
top: -0.5em;
}
/* Embedded content
========================================================================== */
/**
* Remove the border on images inside links in IE 10.
*/
img {
border-style: none;
}
/* Forms
========================================================================== */
/**
* 1. Change the font styles in all browsers.
* 2. Remove the margin in Firefox and Safari.
*/
button,
input,
optgroup,
select,
textarea {
font-family: inherit; /* 1 */
font-size: 100%; /* 1 */
line-height: 1.15; /* 1 */
margin: 0; /* 2 */
}
/**
* Show the overflow in IE.
* 1. Show the overflow in Edge.
*/
button,
input { /* 1 */
overflow: visible;
}
/**
* Remove the inheritance of text transform in Edge, Firefox, and IE.
* 1. Remove the inheritance of text transform in Firefox.
*/
button,
select { /* 1 */
text-transform: none;
}
/**
* Correct the inability to style clickable types in iOS and Safari.
*/
button,
[type="button"],
[type="reset"],
[type="submit"] {
-webkit-appearance: button;
}
/**
* Remove the inner border and padding in Firefox.
*/
button::-moz-focus-inner,
[type="button"]::-moz-focus-inner,
[type="reset"]::-moz-focus-inner,
[type="submit"]::-moz-focus-inner {
border-style: none;
padding: 0;
}
/**
* Restore the focus styles unset by the previous rule.
*/
button:-moz-focusring,
[type="button"]:-moz-focusring,
[type="reset"]:-moz-focusring,
[type="submit"]:-moz-focusring {
outline: 1px dotted ButtonText;
}
/**
* Correct the padding in Firefox.
*/
fieldset {
padding: 0.35em 0.75em 0.625em;
}
/**
* 1. Correct the text wrapping in Edge and IE.
* 2. Correct the color inheritance from `fieldset` elements in IE.
* 3. Remove the padding so developers are not caught out when they zero out
* `fieldset` elements in all browsers.
*/
legend {
box-sizing: border-box; /* 1 */
color: inherit; /* 2 */
display: table; /* 1 */
max-width: 100%; /* 1 */
padding: 0; /* 3 */
white-space: normal; /* 1 */
}
/**
* Add the correct vertical alignment in Chrome, Firefox, and Opera.
*/
progress {
vertical-align: baseline;
}
/**
* Remove the default vertical scrollbar in IE 10+.
*/
textarea {
overflow: auto;
}
/**
* 1. Add the correct box sizing in IE 10.
* 2. Remove the padding in IE 10.
*/
[type="checkbox"],
[type="radio"] {
box-sizing: border-box; /* 1 */
padding: 0; /* 2 */
}
/**
* Correct the cursor style of increment and decrement buttons in Chrome.
*/
[type="number"]::-webkit-inner-spin-button,
[type="number"]::-webkit-outer-spin-button {
height: auto;
}
/**
* 1. Correct the odd appearance in Chrome and Safari.
* 2. Correct the outline style in Safari.
*/
[type="search"] {
-webkit-appearance: textfield; /* 1 */
outline-offset: -2px; /* 2 */
}
/**
* Remove the inner padding in Chrome and Safari on macOS.
*/
[type="search"]::-webkit-search-decoration {
-webkit-appearance: none;
}
/**
* 1. Correct the inability to style clickable types in iOS and Safari.
* 2. Change font properties to `inherit` in Safari.
*/
::-webkit-file-upload-button {
-webkit-appearance: button; /* 1 */
font: inherit; /* 2 */
}
/* Interactive
========================================================================== */
/*
* Add the correct display in Edge, IE 10+, and Firefox.
*/
details {
display: block;
}
/*
* Add the correct display in all browsers.
*/
summary {
display: list-item;
}
/* Misc
========================================================================== */
/**
* Add the correct display in IE 10+.
*/
template {
display: none;
}
/**
* Add the correct display in IE 10.
*/
[hidden] {
display: none;
}

View File

@ -3,81 +3,173 @@
<head>
<meta charset="utf-8">
<title>feed_viz V1.0</title>
<title>feed_viz V1.2</title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="referrer" content="no-referrer">
<link rel="stylesheet" href="css/normalize.css">
<link rel="stylesheet" href="css/main.css">
<meta name="theme-color" content="#fafafa">
<link href="css/material-icons.css" rel="stylesheet">
<link rel="stylesheet" href="css/materialize.min.css">
<link rel="stylesheet" href="css/main.css?v=1.2">
</head>
<body>
<div>
<form id="panel">
<div class="row">
<label for="exchange">Exchange</label>
<select name="exchange" id="exchange">
<option name="reddit">Reddit</option>
<option name="4chan" disabled title="Coming soon">4chan</option>
</select>
<div class="card">
<div class="card-content">
<form>
<div class="col s12">
<ul class="tabs" id="tabs">
<li class="tab col s3"><a class="active" href="#conntab">Connect</a></li>
<li class="tab col s3"><a href="#preftab">Display</a></li>
<li class="tab col s3"><a href="#presettab">Presets</a></li>
</ul>
</div>
<label for="nsfw" title="Show items with 'over_18' flag">over 18
<input type="checkbox" id="nsfw" onchange="onNsfwChange()">
</label>
<div id="conntab">
<div style="float:right">
<span id="status">Idle</span>
<button type="button" onclick="onConnectClick()">Connect</button>
</div>
<a id="help-button" class="modal-trigger" href="#help">Help!</a>
<div class="row">
<div class="input-field col s5">
<select name="exchange" id="exchange" onchange="onExchangeChange()">
<option value="reddit">Reddit</option>
<option value="chan">*chan</option>
</select>
<label for="exchange">Exchange</label>
</div>
<p class="col s3">
<label for="nsfw" title="Show items with 'over_18' flag" style="line-height: 85px">
<input type="checkbox" class="filled-in" id="nsfw" onchange="onNsfwChange()">
<span>NSFW</span>
</label>
</p>
<div class="col s3" style="line-height: 75px">
<button type="button" class="btn"
onclick="onConnectClick()" id="connect">Connect
</button>
</div>
</div>
<div class="row">
<div class="col s12">
<label for="topics">Topics</label>
<div class="chips" id="chips">
<input name="topics" id="topics">
</div>
</div>
</div>
</div>
<!-- Preferences -->
<div class="row" id="preftab">
<div class="input-field col s6">
<select id="col-count" onchange="onColCountChange()">
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
<option value="4" selected>4</option>
<option value="6">6</option>
<option value="12">12</option>
</select>
<label for="col-count">Columns</label>
</div>
<div class="input-field col s6">
<select id="max-images" onchange="onMaxImageChange()">
<option value="256">256</option>
<option value="512">512</option>
<option value="1024" selected>1024</option>
<option value="2048">2048</option>
<option value="4096">4096</option>
</select>
<label for="max-images">Maximum images</label>
</div>
</div>
<!-- Presets -->
<div id="presettab">
<div class="row">
<div class="col s9">
<div class="input-field">
<input type="text" name="preset-name" id="preset-name">
<label for="preset-name">Preset name</label>
</div>
</div>
<div class="col s3">
<button type="button" class="btn" onclick="onSavePresetClick()">Save</button>
</div>
</div>
<div class="row">
<div class="input-field col s12">
<select id="presets" class="browser-default" onchange="onPresetSelect()"></select>
</div>
</div>
</div>
</form>
</div>
</div>
<div class="row">
<label for="topics">Comma-separated topics</label>
<textarea name="topics" id="topics"
placeholder="Comma-separated topics in format (submission|comment).(<subreddit>|*) (See presets for examples)"
rows="2"
></textarea>
</div>
<div class="row">
<input name="preset-name" id="preset-name"
placeholder="Name"
>
<button type="button" onclick="onSavePresetClick()">Save preset</button>
<label for="presets">Load preset</label>
<select id="presets" onchange="onPresetSelect()"></select>
<div style="float: right">
<label for="col-count">Columns</label>
<select id="col-count" onchange="onColCountChange()">
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
<option value="4">4</option>
<option value="6" selected>6</option>
<option value="12">12</option>
</select>
<label for="max-images">Maximum images</label>
<select id="max-images" onchange="onMaxImageChange()">
<option value="256" selected>256</option>
<option value="512" selected>512</option>
<option value="1024" selected>1024</option>
<option value="2048">2048</option>
<option value="2048">4096</option>
</select>
</div>
</div>
</form>
</div>
<div id="output"></div>
<script src="js/main.js"></script>
<div class="fixed-action-btn">
<a class="btn-floating btn-large waves-effect waves-light modal-trigger" href="#help">
<span class="help">?</span>
</a>
</div>
<!-- Help -->
<div id="help" class="modal">
<div class="modal-content">
<h3>Help</h3>
<h4>What is it</h4>
<p>This is a tool that displays images from various feeds as they are posted
in real time.</p>
<p>You can subscribe to the feed via Websocket to display the image
gallery in your browser.</p>
<h4>How to use</h4>
<ol>
<li>Select feed from the <b>Exchange</b> list</li>
<li>Enter topics<sup>*</sup> or load a preset from the <b>Presets</b> tab</li>
<li>Press the <b>Connect</b> button.</li>
</ol>
<p>*<i>See <a href="#help-topic">topic format</a></i></p>
<h4 id="help-topic">Topic format</h4>
<p><b>For Reddit</b>: Format is <code>&lt;type&gt;.&lt;subreddit&gt;</code></p>
<p>Examples:</p>
<p><code>submission.aww</code> gets all posts from /r/aww</p>
<p><code>comment.aww</code> gets all comments from /r/aww</p>
<p><code>*.aww</code> gets everything from /r/aww</p>
<p><code>comment.*</code> gets <i>all</i> comments from reddit (Not recommended)</p>
<p><code>#</code> gets <i>everything</i> from reddit (Not recommended)</p>
<p><b>For *chan</b>: Format is <code>&lt;chan&gt;.&lt;type&gt;.&lt;board&gt;</code></p>
<p><code>4chan.post.a</code> gets all the posts from /a/</p>
<p><code>4chan.thread.a</code> gets all the threads from /a/</p>
<p><code>4chan.*.a</code> gets everything from /a/</p>
<p><code>4chan.*.*</code> gets everything from 4chan</p>
<p><code>4chan.#</code> is the same as above</p>
<p>See <a href="https://github.com/simon987/chan_feed" target="_blank">chan_feed</a> for an up to date list of
supported image boards</p>
<h4>Source code</h4>
<ul>
<li><a href="https://github.com/simon987/reddit_feed" target="_blank">reddit_feed</a>: reddit crawler</li>
<li><a href="https://github.com/simon987/chan_feed" target="_blank">chan_feed</a>: *chan crawler</li>
<li><a href="https://github.com/simon987/ws_feed_adapter" target="_blank">ws_feed_adapter</a>: WebSocket server</li>
<li><a href="https://github.com/simon987/feed_viz" target="_blank">feed_viz</a>: This website</li>
<li><a href="https://github.com/simon987/feed_arhiver" target="_blank">feed_archiver</a>: offline archival</li>
</ul>
</div>
</div>
<script src="js/materialize.min.js"></script>
<script src="js/main.js?v=1.2"></script>
</body>
</html>

View File

@ -3,15 +3,36 @@ let currentImages = 0;
let socket = undefined;
let colCount = 6;
let colCount = 4;
let cols = [];
let colHeights = [];
let loadNsfw = false;
let storage = window.localStorage;
let chips;
let exchange = "reddit";
let helpModal;
window.onload = function () {
M.Tabs.init(document.getElementById("tabs"), {});
M.FormSelect.init(document.querySelectorAll("select"), {});
M.Chips.init(document.querySelectorAll(".chips"), {
placeholder: "Type topic and press 'Enter'",
secondaryPlaceholder: "+Topic",
onChipAdd: function(elem, chip) {
if (!validateTopic(chip.firstChild.wholeText)) {
helpModal.open();
chips.deleteChip(chips.chipsData.length-1);
}
}
});
chips = M.Chips.getInstance(document.getElementById("chips"));
M.Modal.init(document.querySelectorAll(".modal"), {});
helpModal = M.Modal.getInstance(document.getElementById("help"));
setDefaultPresets();
updatePresets();
@ -46,60 +67,67 @@ function resetGallery() {
function onConnectClick() {
document.getElementById("topics")
.dispatchEvent(
new KeyboardEvent(
"keydown",
{bubbles : true, cancelable : true, key : "Enter", keyCode: 13}
)
);
if (socket) {
socket.close()
}
document.getElementById("status").innerHTML = "Connecting...";
document.getElementById("status").style = "color: orange";
document.getElementById("connect").innerHTML = "Connecting..";
document.getElementById("connect").classList.add("connecting");
resetGallery();
let topics = document.getElementById("topics").value
.toLowerCase()
.split(/[\s,]+/ig)
.filter(topic => topic !== "");
let topics = chips.chipsData.map(chip => chip.tag);
if (topics.length === 0) {
alert("You must specify at least one topic");
return
}
connect(topics);
connect(exchange, topics);
}
function connect(topics) {
function connect(exchange, topics) {
socket = new WebSocket("ws://localhost:3090/socket");
socket = new WebSocket("wss://feed.the-eye.eu/socket");
socket.onmessage = msg => {
let j = JSON.parse(msg.data);
if (j.urls && ((loadNsfw && j.over_18) || !j.over_18)) {
if (j.urls && ((loadNsfw && j.over_18) || !j.over_18 || !j.hasOwnProperty("over_18"))) {
j.urls
.filter(url => /http?s:\/\/.*(.jpg|.jpeg|.bmp|.png|.gif|.jpeg:orig|.jpg:orig)$/.test(url))
.forEach(url => appendToGallery(createImage(url)));
.forEach(url => appendToGallery(createImage(url, j)));
}
};
socket.onopen = () => {
socket.send(JSON.stringify({
exchange: "reddit",
exchange: exchange,
topics: topics
}));
document.getElementById("status").innerHTML = "Connected";
document.getElementById("status").style = "color: green";
document.getElementById("connect").innerHTML = "Connected";
document.getElementById("connect").classList.remove("connecting");
document.getElementById("connect").classList.remove("disconnected");
document.getElementById("connect").classList.add("connected");
};
socket.onclose = () => {
document.getElementById("status").innerHTML = "Disconnected";
document.getElementById("status").style = "color: red";
socket.onclose = (e) => {
document.getElementById("connect").innerHTML = "Disconnected";
document.getElementById("connect").classList.remove("connected");
document.getElementById("connect").classList.remove("connecting");
document.getElementById("connect").classList.add("disconnected");
};
socket.onerror = (e) => {
document.getElementById("status").innerHTML = "Websocket error";
document.getElementById("status").style = "color: orange";
console.log(e)
};
@ -108,10 +136,13 @@ function connect(topics) {
}
}
function createImage(src) {
function createImage(src, j) {
const img = document.createElement("img");
img.setAttribute("class", "img");
img.setAttribute("src", src);
img.onclick = function () {
window.open("https://reddit.com/" + j["id"]);
};
img.onerror = function () {
//Don't display broken images
@ -194,33 +225,42 @@ function setPreset(name, topics) {
}
function setDefaultPresets() {
setPreset("Reddit animals", "*.aww, *.awww, *.cats, *.eyebleach, *.cute, *.dogs, " +
"*.koalas, *.lynxes, comment.dogs, *.dogpictures, submission.puppies, submission.puppy, " +
"submission.doge");
setPreset("Reddit birds", "submission.birds, submission.bird, submission.parrots, " +
"submission.birdpics, submission.birdwatching, submission.birding, submission.birdphotography");
setPreset("Reddit ocean", "*.ocean, *.oceangifs, *.swimming, " +
"*.algae, *.costalforaging, *.earthscience, *.freediving, " +
"*.hydrology *.lifeaquatic, *.marinelife, *.octopuses, " +
"*.scuba, *.seacreatureporn, *.seaweed, *.sharks, " +
"*.shipwrecks, *.water, *.whales, *.underwaterphotography");
setPreset("Reddit animals", ["*.aww", "*.awww", "*.cats", "*.eyebleach", "*.cute", "*.dogs",
"*.koalas", "*.lynxes", "comment.dogs", "*.dogpictures", "submission.puppies", "submission.puppy",
"submission.doge"]);
setPreset("Reddit birds", ["submission.birds", "submission.bird", "submission.parrots",
"submission.birdpics", "submission.birdwatching", "submission.birding", "submission.birdphotography"]);
setPreset("Reddit ocean", ["*.ocean", "*.oceangifs", "*.swimming",
"*.algae", "*.costalforaging", "*.earthscience", "*.freediving",
"*.hydrology", "*.lifeaquatic", "*.marinelife", "*.octopuses",
"*.scuba", "*.seacreatureporn", "*.seaweed", "*.sharks",
"*.shipwrecks", "*.water", "*.whales", "*.underwaterphotography"]);
}
function onPresetSelect() {
let selection = document.getElementById("presets").value;
document.getElementById("topics").value = getPreset(selection);
while (chips.chipsData.length > 0) {
chips.deleteChip(0)
}
getPreset(selection).forEach(topic => {
chips.addChip({tag: topic})
});
M.toast({html: "Loaded preset"})
}
function onSavePresetClick() {
let name = document.getElementById("preset-name").value;
let topics = document.getElementById("topics").value;
let topics = chips.chipsData.map(chip => chip.tag);
if (name === "") {
alert("Invalid preset name!")
alert("Invalid preset name");
return;
}
setPreset(name, topics);
updatePresets();
M.toast({html: "Saved preset"})
}
function updatePresets() {
@ -252,6 +292,11 @@ function onMaxImageChange() {
storage.setItem("max-images", maxImages);
}
function onExchangeChange() {
exchange = document.getElementById("exchange").value;
document.getElementById("nsfw").disabled = exchange !== "reddit"
}
function onNsfwChange() {
loadNsfw = document.getElementById("nsfw").checked;
storage.setItem("nsfw", loadNsfw);
@ -284,3 +329,7 @@ function onColCountChange() {
images.forEach(img => appendToGallery(img));
}
function validateTopic(topic) {
return (exchange === "reddit" && /^(#$|((submission|comment|\*)\.(\w+|\*)$))/.test(topic)) ||
(exchange === "chan" && /^(#$|#\.\w+$|(4chan|lainchan|uboachan|22chan|wizchan|1chan|\*)\.(#$|(post|thread|\*)\.(\w+|\*)$))/.test(topic));
}

6
js/materialize.min.js vendored Normal file

File diff suppressed because one or more lines are too long