From f2791432e1d50d031b8205716958ebfcf3d50a27 Mon Sep 17 00:00:00 2001 From: Sophia Atkinson Date: Mon, 2 Jan 2023 11:50:23 -0800 Subject: [PATCH] updated to reflect the live site --- frontend/assets/svg/wordmark-black.svg | 10 +++++ frontend/assets/svg/wordmark-white.svg | 10 +++++ frontend/assets/svg/x.svg | 39 ++----------------- frontend/config.php | 12 ++++-- frontend/dist/styles.css | 33 +++++++++------- frontend/package-lock.json | 18 +++++++++ user/plugins/BlackListIP/plugin.php | 2 +- .../YourlsBlacklistDomains-master/plugin.php | 16 +++++--- user/plugins/backend/assets/css/dark.css | 28 +++++++++++-- .../backend/assets/css/themes/dark.scss | 2 +- 10 files changed, 104 insertions(+), 66 deletions(-) create mode 100644 frontend/assets/svg/wordmark-black.svg create mode 100644 frontend/assets/svg/wordmark-white.svg create mode 100644 frontend/package-lock.json diff --git a/frontend/assets/svg/wordmark-black.svg b/frontend/assets/svg/wordmark-black.svg new file mode 100644 index 0000000..3b1bd24 --- /dev/null +++ b/frontend/assets/svg/wordmark-black.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/frontend/assets/svg/wordmark-white.svg b/frontend/assets/svg/wordmark-white.svg new file mode 100644 index 0000000..98fa808 --- /dev/null +++ b/frontend/assets/svg/wordmark-white.svg @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/frontend/assets/svg/x.svg b/frontend/assets/svg/x.svg index 07395c0..4660705 100644 --- a/frontend/assets/svg/x.svg +++ b/frontend/assets/svg/x.svg @@ -1,37 +1,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/frontend/config.php b/frontend/config.php index 0400ba8..09cac69 100644 --- a/frontend/config.php +++ b/frontend/config.php @@ -13,10 +13,16 @@ define('shortTitle', ''); define('description', ''); // The favicon for your site -define('favicon', '/images/favicon.ico?v1'); +define('favicon', '/a/image.png'); -// Logo for your site, displayed on home page -define('logo', '/frontend/assets/img/logo_white.png'); +// Keywords for site +define('keywords', 'Blank, Blank, Blank'); + +// OG Image for site +define('ogimg', '/a/image.png'); + +// Wordmark for homepage +define('wordmark', '/a/image.png'); // Enable reCAPTCHA V3 // It is highly recommended you use reCAPTCHA V3. It will stop spam. You can get a site and secret key from here: https://www.google.com/recaptcha/admin/create diff --git a/frontend/dist/styles.css b/frontend/dist/styles.css index 1ad18c7..59ff195 100644 --- a/frontend/dist/styles.css +++ b/frontend/dist/styles.css @@ -260,10 +260,12 @@ img,svg { vertical-align: middle; } -img.center{ +img.wordmark{ display: block; margin-left: auto; margin-right: auto; + width: 250px; + max-width: 100%; } table { @@ -2117,7 +2119,7 @@ progress { background-color: #2A2A2A; border-color: #86b7fe; outline: 0; - box-shadow: 0 0 0 .25rem rgba(13,110,253,.25); + box-shadow: 0 0 0 .25rem #212121; } .form-control::-webkit-date-and-time-value { @@ -2301,7 +2303,7 @@ textarea.form-control-lg { .form-select:focus { border-color: #86b7fe; outline: 0; - box-shadow: 0 0 0 .25rem rgba(13,110,253,.25); + box-shadow: 0 0 0 .25rem #7289DA; } .form-select[multiple],.form-select[size]:not([size="1"]) { @@ -2373,7 +2375,7 @@ textarea.form-control-lg { .form-check-input:focus { border-color: #86b7fe; outline: 0; - box-shadow: 0 0 0 .25rem rgba(13,110,253,.25); + box-shadow: 0 0 0 .25rem #7289DA; } .form-check-input:checked { @@ -2463,11 +2465,11 @@ textarea.form-control-lg { } .form-range:focus::-webkit-slider-thumb { - box-shadow: 0 0 0 1px #fff,0 0 0 .25rem rgba(13,110,253,.25); + box-shadow: 0 0 0 1px #fff,0 0 0 .25rem #7289DA; } .form-range:focus::-moz-range-thumb { - box-shadow: 0 0 0 1px #fff,0 0 0 .25rem rgba(13,110,253,.25); + box-shadow: 0 0 0 1px #fff,0 0 0 .25rem #7289DA; } .form-range::-moz-focus-outer { @@ -2891,7 +2893,7 @@ textarea.form-control-lg { .btn-check:focus+.btn,.btn:focus { outline: 0; - box-shadow: 0 0 0 .25rem rgba(13,110,253,.25); + box-shadow: 0 0 0 .25rem #7289DA; } .btn:disabled,.btn.disabled,fieldset:disabled .btn { @@ -2915,7 +2917,7 @@ textarea.form-control-lg { color: #fff; background-color: #0b5ed7; border-color: #0a58ca; - box-shadow: 0 0 0 .25rem rgba(49,132,253,.5); + box-shadow: 0 0 0 .25rem #7289DA; } .btn-check:checked+.btn-primary,.btn-check:active+.btn-primary,.btn-primary:active,.btn-primary.active,.show>.btn-primary.dropdown-toggle { @@ -2925,7 +2927,7 @@ textarea.form-control-lg { } .btn-check:checked+.btn-primary:focus,.btn-check:active+.btn-primary:focus,.btn-primary:active:focus,.btn-primary.active:focus,.show>.btn-primary.dropdown-toggle:focus { - box-shadow: 0 0 0 .25rem rgba(49,132,253,.5); + box-shadow: 0 0 0 .25rem #7289DA; } .btn-primary:disabled,.btn-primary.disabled { @@ -3191,7 +3193,7 @@ textarea.form-control-lg { } .btn-check:focus+.btn-outline-primary,.btn-outline-primary:focus { - box-shadow: 0 0 0 .25rem rgba(13,110,253,.5); + box-shadow: 0 0 0 .25rem #7289DA; } .btn-check:checked+.btn-outline-primary,.btn-check:active+.btn-outline-primary,.btn-outline-primary:active,.btn-outline-primary.active,.btn-outline-primary.dropdown-toggle.show { @@ -3201,7 +3203,7 @@ textarea.form-control-lg { } .btn-check:checked+.btn-outline-primary:focus,.btn-check:active+.btn-outline-primary:focus,.btn-outline-primary:active:focus,.btn-outline-primary.active:focus,.btn-outline-primary.dropdown-toggle.show:focus { - box-shadow: 0 0 0 .25rem rgba(13,110,253,.5); + box-shadow: 0 0 0 .25rem #7289DA; } .btn-outline-primary:disabled,.btn-outline-primary.disabled { @@ -4617,7 +4619,7 @@ textarea.form-control-lg { z-index: 3; border-color: #86b7fe; outline: 0; - box-shadow: 0 0 0 .25rem rgba(13,110,253,.25); + box-shadow: 0 0 0 .25rem #7289DA; } .accordion-header { @@ -4741,7 +4743,7 @@ textarea.form-control-lg { color: #0a58ca; background-color: #e9ecef; outline: 0; - box-shadow: 0 0 0 .25rem rgba(13,110,253,.25); + box-shadow: 0 0 0 .25rem #7289DA; } .page-item:not(:first-child) .page-link { @@ -5400,7 +5402,7 @@ textarea.form-control-lg { .btn-close:focus { outline: 0; - box-shadow: 0 0 0 .25rem rgba(13,110,253,.25); + box-shadow: 0 0 0 .25rem #7289DA; opacity: 1; } @@ -12063,4 +12065,5 @@ input.form-control.form-control-sm.text-uppercase { div.mt-2.card.card-body { border-color: #2A2A2A; -} \ No newline at end of file +} + diff --git a/frontend/package-lock.json b/frontend/package-lock.json new file mode 100644 index 0000000..9c6d6f9 --- /dev/null +++ b/frontend/package-lock.json @@ -0,0 +1,18 @@ +{ + "name": "sleeky-frontend", + "version": "2.5.0", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "bootstrap": { + "version": "5.2.3", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.3.tgz", + "integrity": "sha512-cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ==" + }, + "popper.js": { + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz", + "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==" + } + } +} diff --git a/user/plugins/BlackListIP/plugin.php b/user/plugins/BlackListIP/plugin.php index 0d2e998..151dab2 100644 --- a/user/plugins/BlackListIP/plugin.php +++ b/user/plugins/BlackListIP/plugin.php @@ -65,7 +65,7 @@ function ludo_blacklist_ip_form () {

Blacklist following IPs (one range or IP per line, no wildcards allowed) :

-

+

I suggest to add here IPs that you saw adding bulk URL. It is your own responsibility to check the use of the IPs you block. WARNING : erroneous entries may create unexpected behaviours, please double-check before validation.

diff --git a/user/plugins/YourlsBlacklistDomains-master/plugin.php b/user/plugins/YourlsBlacklistDomains-master/plugin.php index 09f27db..5bbe257 100644 --- a/user/plugins/YourlsBlacklistDomains-master/plugin.php +++ b/user/plugins/YourlsBlacklistDomains-master/plugin.php @@ -65,8 +65,12 @@ function apelly_blacklist_domain_root ( $bol, $url ) { // stop //yourls_die( 'Blacklisted domain', 'Forbidden', 403 ); - "
Blacklisted domain.
"; - die(); + return array( + 'status' => 'fail', + 'code' => 'error:url', + 'message' => 'Blacklisted domain', + 'errorCode' => '403', + ); } } } @@ -99,13 +103,13 @@ function apelly_blacklist_domain_form () { echo <<BlackList domains
- + - +

Blacklist following domains

-

- +

+

HTML; diff --git a/user/plugins/backend/assets/css/dark.css b/user/plugins/backend/assets/css/dark.css index 2b40571..20db195 100644 --- a/user/plugins/backend/assets/css/dark.css +++ b/user/plugins/backend/assets/css/dark.css @@ -69,7 +69,7 @@ input[type="submit"]:disabled { input.text, input[type="text"] { - border: 1px solid rgba(255, 255, 255, 0.25) !important; + border: 1px solid #ffffff40 !important; transition: 0.4s all } @@ -585,7 +585,27 @@ div.share { padding: 0px 20px 10px; margin-top: 10px } - +textarea.blacklist-domains{ + background-color:#313131; + color: #fff; + border: none; + height: 400px; + max-width: 100%; +} +textarea.blacklist-ips{ + background-color:#313131; + color: #fff; + border: none; + width: 320px; + max-width: 100%; + height: 125px; +} +textarea.blacklist-domains::-webkit-scrollbar{ + display: none; +} +textarea.blacklist-ips::-webkit-scrollbar{ + display: none; +} div.share textarea { background: #313131; color: #dcdcdc; @@ -618,7 +638,7 @@ code { .plugins main span, .plugin_page_sleeky_settings main span, code span { - background: rgba(255, 255, 255, 0.2) + background: #ffffff33 } .sub_wrap code, @@ -629,7 +649,7 @@ code span { .plugin_page_sleeky_settings main tt, code code, code tt { - background: rgba(0, 123, 255, 0.7) + background: #7289DA } .sub_wrap a.bookmarklet, diff --git a/user/plugins/backend/assets/css/themes/dark.scss b/user/plugins/backend/assets/css/themes/dark.scss index daa486f..d93b05f 100644 --- a/user/plugins/backend/assets/css/themes/dark.scss +++ b/user/plugins/backend/assets/css/themes/dark.scss @@ -7,7 +7,7 @@ $theme: "dark"; $lightest: #464646; $light: #313131; $default: #232323; -$darker: #1d1d1d; +$darker: #121212; $darkest: #161616; // Accents