diff --git a/modules/imgur/config.json b/modules/imgur/config.json index 33cc3fa..a311754 100644 --- a/modules/imgur/config.json +++ b/modules/imgur/config.json @@ -1,4 +1,7 @@ { "dbKeys": [ "imgur" ], "dependencies": [ "web", "api" ] + "imagelength": 5, + "nsfwwarn": true, + "apikey": "86fd3a8da348b65" } diff --git a/modules/imgur/imgur.js b/modules/imgur/imgur.js index 40910a8..507e6f2 100644 --- a/modules/imgur/imgur.js +++ b/modules/imgur/imgur.js @@ -68,7 +68,7 @@ var imgur = function(dbot) { 'url': 'https://api.imgur.com/3/image/' + slug + '.json', 'json': true, 'headers': { - 'Authorization': 'Client-ID 86fd3a8da348b65' + 'Authorization': 'Client-ID ' + dbot.config.imgur.apikey } }, function(err, response, body) { this.db.totalApiRequests += 1; diff --git a/modules/web/config.json b/modules/web/config.json index e6b635e..1b7646b 100644 --- a/modules/web/config.json +++ b/modules/web/config.json @@ -1,6 +1,6 @@ { "webHost": "nourishedcloud.com", - "webPort": 8080, + "webPort": 9001, "externalPath": false, "help": "https://github.com/reality/depressionbot/blob/master/modules/web/README.md" } diff --git a/public/imgurr.css b/public/imgurr.css index f2a0cff..f7ad728 100644 --- a/public/imgurr.css +++ b/public/imgurr.css @@ -1,29 +1,53 @@ #container { - text-align:center; + text-align:center; } #container,#image { - margin:0; - max-height:100%; - padding:0; + margin:0; + max-height:100%; + padding:0; +} + +#details { + display:none; + font-weight:700; + left:25px; + min-width:280px; + padding:20px; + text-align:center; + top:25px; +} + +#link { + left:25px; + text-align:center; + width:168px; +} + +#link,#loading { + font-family:monospace; + font-size:10px; + padding:10px; + top:95px; } #loading { - background:rgba(43,43,43,0.8); - border-bottom-right-radius:5px; - border-top-right-radius:5px; - color:#85bf25; - font-family:sans-serif; - font-weight:700; - left:0; - padding:20px; - position:absolute; - top:50px; + font-weight:500; + left:220px; + min-width:95px; +} + +#loading,#details,#link { + background:rgba(43,43,43,0.8); + border-radius:5px; + color:#85bf25; + font-family:sans-serif; + position:absolute; } html,body { - background-color:#121211; - height:100%; - margin:0; - padding:0; + background-color:#121211; + height:100%; + margin:0; + padding:0; } diff --git a/views/imgur/imgurr.jade b/views/imgur/imgurr.jade index 3bcc1e8..0db41a2 100644 --- a/views/imgur/imgurr.jade +++ b/views/imgur/imgurr.jade @@ -11,21 +11,30 @@ html(lang='en') count += 1; $('#loading').show(); $('#loading').text('Loading image ' + count + '...'); + document.title = 'random imgur (' + count + ')'; + $('#loading').fadeIn(); $('#image').load(function(){}); $.get("/api/imgur/getRandomImage", function(d) { $('#image').attr('src', d.data[0]); + $('#details').text("Fetching info..."); + $('#link').text(d.data[0]); + $('#link').attr('href',d.data[0]); $.get("/api/imgur/getImageInfoString", { 'slug': d.data[1] }, function(info) { if(info.data[0].indexOf('undefined') == -1) { - $("#loading").text(count + ': ' + info.data[0]); + $("#details").text(count + ': ' + info.data[0]); + $('#details').show(); } else { - $("#loading").hide(); + $("#details").hide(); } + $('#loading').fadeOut(); }, "json"); }, "json"); } $(getNewImage()); $(document).on('keydown', function(e){(e.which==32)&&(getNewImage()) }); body - div#loading Loading Image + div#loading Loading image 1... + div#details Press [SPACE] to load a new image + a#link [SPACE] for next div#container img#image