diff --git a/inc/processJsonSubreddit.js b/inc/processJsonSubreddit.js index 2c827ca..9829115 100644 --- a/inc/processJsonSubreddit.js +++ b/inc/processJsonSubreddit.js @@ -27,7 +27,7 @@ module.exports = function() { let images = null let is_self_link = false let valid_reddit_self_domains = ['reddit.com'] - + if(data.over_18) if((config.nsfw_enabled === false && user_preferences.nsfw_enabled != 'true') || user_preferences.nsfw_enabled === 'false') continue @@ -52,7 +52,8 @@ module.exports = function() { } else { if(data.preview.images[0].resolutions[0]) { images = { - thumb: await downloadAndSave(data.preview.images[0].resolutions[0].url, 'thumb_') + thumb: await downloadAndSave(data.preview.images[0].resolutions[0].url, 'thumb_'), + preview: await downloadAndSave(data.preview.images[0].source.url, 'preview_') } } } diff --git a/static/css/styles.css b/static/css/styles.css index ca3f703..f25b966 100644 --- a/static/css/styles.css +++ b/static/css/styles.css @@ -1051,8 +1051,10 @@ footer a { } /* SIDEBAR */ #sidebar { + box-sizing: border-box; float: left; width: 25%; + padding-left: 20px; } #sidebar .content { float: left; diff --git a/views/index.pug b/views/index.pug index aedd28a..a5c5db1 100644 --- a/views/index.pug +++ b/views/index.pug @@ -110,6 +110,27 @@ html .line .selftext != unescape(link.selftext_html) + if (link.images && link.images.preview) + style. + details.preview-container img { + width: 100% !important; + height: auto !important; + max-width: none !important; + max-height: none !important; + opacity: 0; + } + details.preview-container[open][data-url="#{link.images.preview}"] .preview { + width: 100%; + height: auto; + background-image: url('#{link.images.preview}'); + background-repeat: no-repeat; + background-size: contain; + } + details.preview-container(data-url="" + link.images.preview + "") + summary + span ▶ + .preview + img(src=""+ link.images.thumb +"", alt="") a(href="" + link.permalink + "", class="comments") | #{link.num_comments} comments if json.info.before || json.info.after @@ -128,4 +149,4 @@ html label(for="nsfw") include NSFW results input(type="checkbox", name="nsfw", id="nsfw", checked="checked") input(type="submit", value="search") - include includes/footer.pug + include includes/footer.pug diff --git a/views/subreddit.pug b/views/subreddit.pug index fded0b2..08b81bc 100644 --- a/views/subreddit.pug +++ b/views/subreddit.pug @@ -136,6 +136,27 @@ html .line .selftext != unescape(link.selftext_html) + if (link.images && link.images.preview) + style. + details.preview-container img { + width: 100% !important; + height: auto !important; + max-width: none !important; + max-height: none !important; + opacity: 0; + } + details.preview-container[open][data-url="#{link.images.preview}"] .preview { + width: 100%; + height: auto; + background-image: url('#{link.images.preview}'); + background-repeat: no-repeat; + background-size: contain; + } + details.preview-container(data-url="" + link.images.preview + "") + summary + span ▶ + .preview + img(src=""+ link.images.thumb +"", alt="") a(href="" + link.permalink + "", class="comments") | #{link.num_comments} comments if json.info.before || json.info.after