diff --git a/css/styles.css b/css/styles.css
index c221c1b..7817155 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -108,7 +108,7 @@ body {
padding: 10px;
}
-.settings-link, .reload, .rate-link {
+.settings-link, .reload, .rate-link, .report {
opacity: .5;
cursor: pointer;
transition: all .2s;
@@ -138,11 +138,16 @@ body {
left: 10px;
}
-.reload .loader {
+.report {
+ left: 45px;
+}
+
+.reload .loader,
+.report .loader {
font-size: 20px !important;
}
-.settings-link:hover, .reload:hover, .rate-link:hover {
+.settings-link:hover, .reload:hover, .rate-link:hover, .report:hover {
opacity: 1;
}
diff --git a/js/json/blacklist-images.json b/js/json/blacklist-images.json
new file mode 100644
index 0000000..02e45d6
--- /dev/null
+++ b/js/json/blacklist-images.json
@@ -0,0 +1,6 @@
+{
+ "images": [
+ "https://images.unsplash.com/photo-1543365915-f8b34a5e6484?crop=entropy&cs=tinysrgb&fit=crop&fm=jpg&h=900&ixid=eyJhcHBfaWQiOjF9&ixlib=rb-1.2.1&q=80&w=1600",
+ "https://images.unsplash.com/photo-1574843213652-807792123391?crop=entropy&cs=tinysrgb&fit=crop&fm=jpg&h=900&ixid=eyJhcHBfaWQiOjF9&ixlib=rb-1.2.1&q=80&w=1600"
+ ]
+}
\ No newline at end of file
diff --git a/js/main.js b/js/main.js
index d6e6800..0e1c0cc 100644
--- a/js/main.js
+++ b/js/main.js
@@ -9,7 +9,7 @@ $(document).ready(function(){
$('[data-toggle="tooltip"]').tooltip()
})
load(false, true);
- chrome.storage.sync.get(["show_date", "date", "showed_survey_popup"], function(result){
+ chrome.storage.sync.get(["show_date", "date", "showed_survey_popup", "showed_new_feature_report"], function(result){
if(!result.hasOwnProperty("show_date") || result.show_date){
const date = new Date();
let currentDate = date.toLocaleDateString();
@@ -35,6 +35,19 @@ $(document).ready(function(){
}
})
}
+
+ if (!result.hasOwnProperty("showed_new_feature_report") || !result.showed_new_feature_report) {
+ Swal.fire({
+ icon: 'info',
+ title: 'You can now report images!',
+ html: "If there are any images that you don't like or find inappropriate, press the Report icon on the top left to report these images and never show them again!",
+ showConfirmButton: false,
+ showCloseButton: true,
+ onClose: function () {
+ chrome.storage.sync.set({showed_new_feature_report: true});
+ }
+ })
+ }
});
$(".reload").click(function(){
@@ -93,7 +106,42 @@ $(document).ready(function(){
} else {
window.open(chrome.runtime.getURL('options.html'));
}
- })
+ });
+
+ $(".report").click(function() {
+ Swal.fire({
+ title: 'Report Image',
+ html: "If you think the image is inappropriate or you don't like it, please report the image and you will not " +
+ "see it anymore.",
+ showConfirmButton: true,
+ showCloseButton: true,
+ confirmButtonText: 'Report Image',
+ showCancelButton: true,
+ showLoaderOnConfirm: true,
+ preConfirm: function () {
+ const imageElm = $(".background-image");
+ if (imageElm.length) {
+ return $.ajax({
+ url: 'http://quran-extension-api.alwaysdata.net/blacklistImage',
+ type: 'PUT',
+ data: {image: imageElm.attr('src')},
+ success: function (result) {
+ return result;
+ }
+ });
+ }
+ },
+ allowOutsideClick: () => !Swal.isLoading()
+ }).then (function () {
+ load(true, false);
+ })
+ });
+
+ $(".translation-container").hover(function () {
+ $(this).children(".body").show('fast');
+ }, function () {
+ $(this).children(".body").hide('fast');
+ });
function load(reload, withTopSites){
audio = null;
@@ -112,32 +160,7 @@ $(document).ready(function(){
setBackgroundImage(result.image.src);
}
else {
- let xhr = new XMLHttpRequest();
-
- $.ajax({
- method: 'GET',
- url: 'https://source.unsplash.com/1600x900/?nature,mountains,landscape,animal,gradient',
- headers: {
- 'Access-Control-Expose-Headers': 'ETag'
- },
- xhr: function() {
- return xhr;
- },
- success: function(data){
- setBackgroundImage(xhr.responseURL);
- let timeout = calculateTimeout();
- chrome.storage.local.set({image: {src: xhr.responseURL, timeout}});
- },
- error: function(){
- setBackgroundImage('/assets/offline-image.jpg');
- },
- complete: function(){
- if(reload){
- $(".reload img").show();
- $(".reload .loader").hide();
- }
- }
- });
+ setNewImage(reload);
}
if(result.hasOwnProperty('verse') && result.verse && now <= result.verse.timeout && !reload){
@@ -305,9 +328,40 @@ $(document).ready(function(){
}
}
- $(".translation-container").hover(function () {
- $(this).children(".body").show('fast');
- }, function () {
- $(this).children(".body").hide('fast');
- });
+ function setNewImage(reload) {
+ let xhr = new XMLHttpRequest();
+ $.ajax({
+ method: 'GET',
+ url: 'https://source.unsplash.com/1600x900/?nature,mountains,landscape,animal',
+ headers: {
+ 'Access-Control-Expose-Headers': 'ETag'
+ },
+ xhr: function() {
+ return xhr;
+ },
+ success: function(data){
+ $.getJSON('http://quran-extension-api.alwaysdata.net/isImageBlacklisted?image=' + encodeURI(xhr.responseURL),
+ function(json, textStatus) {
+ if (json.success) {
+ if (json.blacklisted) {
+ setNewImage(false);
+ } else {
+ setBackgroundImage(xhr.responseURL);
+ let timeout = calculateTimeout();
+ chrome.storage.local.set({image: {src: xhr.responseURL, timeout}});
+ }
+ }
+ });
+ },
+ error: function(){
+ setBackgroundImage('/assets/offline-image.jpg');
+ },
+ complete: function(){
+ if(reload){
+ $(".reload img").show();
+ $(".reload .loader").hide();
+ }
+ }
+ });
+ }
});
diff --git a/manifest.json b/manifest.json
index 9d7159f..6d66e5b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
{
"name": "Quran In New Tab",
- "version": "1.8",
+ "version": "1.8.1",
"description": "View Quran verses on the new tab page.",
"permissions": [
"storage",
diff --git a/newtab.html b/newtab.html
index 662b4ba..5e563c1 100644
--- a/newtab.html
+++ b/newtab.html
@@ -14,6 +14,10 @@
+
+
+
+