From 299c58692ea7b3247b74e74786a3c8229793e2a3 Mon Sep 17 00:00:00 2001 From: Daisuke Date: Mon, 13 Apr 2020 11:30:51 -0500 Subject: [PATCH] Emoji picker, Search and Themes updates --- {themes/default/css => css}/color.css | 17 +- {themes/default/css => css}/mobile.css | 7 +- {themes/default/css => css}/style.css | 4 + include/functions.php | 40 +- include/init.php | 2 +- js/scripts.js | 19 +- layout/footer.php | 14 +- layout/header.php | 52 +- layout/sidebar.php | 6 + login/bg/13056466555_9d2f308c39_b.jpg | Bin 104758 -> 0 bytes login/bg/13056847944_20bde73900_b.jpg | Bin 87599 -> 0 bytes login/bg/13057062975_e1db98baab_b.jpg | Bin 172843 -> 0 bytes login/bg/185.jpg | Bin 0 -> 134695 bytes login/bg/29a.jpg | Bin 0 -> 118396 bytes login/bg/33993885812_9524a46bc3_b.jpg | Bin 199290 -> 0 bytes login/bg/34283627225_d734c152a1_b.jpg | Bin 611683 -> 0 bytes login/bg/39107967634_743cc84ee8_b.jpg | Bin 233407 -> 0 bytes login/bg/4697225264_15edb40a60_b.jpg | Bin 107006 -> 0 bytes login/bg/48348030457_68de5d53ed_b.jpg | Bin 288060 -> 0 bytes login/bg/a4f.jpg | Bin 0 -> 282066 bytes login/bg/a8e.jpg | Bin 0 -> 149364 bytes login/bg/af10e.jpg | Bin 0 -> 107750 bytes login/bg/e3f.jpg | Bin 0 -> 228098 bytes login/bg/h5s.jpg | Bin 0 -> 234598 bytes login/bg/i5e.jpg | Bin 0 -> 284363 bytes login/bg/o3a.jpg | Bin 0 -> 327404 bytes login/bg/t65.jpg | Bin 0 -> 139977 bytes login/bg/u6r.jpg | Bin 0 -> 131326 bytes login/bg/u9w.jpg | Bin 0 -> 166489 bytes login/index.php | 20 +- modules/search.php | 9 + modules/settings.php | 1 + modules/timeline.php | 14 + {themes/1994/templates => templates}/post.txt | 2 +- .../templates => templates}/profileheader.txt | 0 .../1994/templates => templates}/reblog.txt | 0 .../1994/templates => templates}/reply.txt | 0 .../templates => templates}/replyform.txt | 4 +- .../templates => templates}/textpost.txt | 2 +- themes/1994/css/color.css | 4 +- themes/1994/css/mobile.css | 5 +- themes/1994/css/style.css | 4 + themes/1994/templates/textpost.txt | 23 - themes/amplifier/css/color.css | 18 +- themes/amplifier/css/mobile.css | 656 ----------------- themes/amplifier/css/style.css | 631 ----------------- themes/amplifier/templates/post.txt | 21 - themes/amplifier/templates/profileheader.txt | 26 - themes/amplifier/templates/reblog.txt | 16 - themes/amplifier/templates/reply.txt | 25 - themes/amplifier/templates/replyform.txt | 45 -- themes/amplifier/templates/textpost.txt | 23 - themes/ancientbird/css/color.css | 2 +- themes/ancientbird/css/mobile.css | 5 +- themes/ancientbird/css/style.css | 4 + themes/ancientbird/templates/post.txt | 21 - .../ancientbird/templates/profileheader.txt | 26 - themes/ancientbird/templates/reblog.txt | 16 - themes/ancientbird/templates/reply.txt | 25 - themes/ancientbird/templates/replyform.txt | 45 -- themes/ancientbird/templates/textpost.txt | 23 - themes/bythebook/css/color.css | 10 +- themes/bythebook/css/mobile.css | 656 ----------------- themes/bythebook/css/style.css | 631 ----------------- themes/bythebook/templates/post.txt | 21 - themes/bythebook/templates/profileheader.txt | 26 - themes/bythebook/templates/reblog.txt | 16 - themes/bythebook/templates/reply.txt | 25 - themes/bythebook/templates/replyform.txt | 45 -- themes/bythebook/templates/textpost.txt | 23 - themes/chicago/css/color.css | 12 +- themes/chicago/css/mobile.css | 656 ----------------- themes/chicago/css/style.css | 631 ----------------- themes/chicago/templates/post.txt | 21 - themes/chicago/templates/profileheader.txt | 26 - themes/chicago/templates/reblog.txt | 16 - themes/chicago/templates/reply.txt | 25 - themes/chicago/templates/replyform.txt | 45 -- themes/cuatro/css/color.css | 2 +- themes/cuatro/css/mobile.css | 656 ----------------- themes/cuatro/css/style.css | 631 ----------------- themes/cuatro/templates/post.txt | 21 - themes/cuatro/templates/profileheader.txt | 26 - themes/cuatro/templates/reblog.txt | 16 - themes/cuatro/templates/reply.txt | 25 - themes/cuatro/templates/replyform.txt | 45 -- themes/cuatro/templates/textpost.txt | 23 - themes/custom/css/color.php | 3 +- themes/custom/css/mobile.css | 657 ------------------ themes/custom/css/style.css | 627 ----------------- themes/custom/templates/post.txt | 21 - themes/custom/templates/profileheader.txt | 26 - themes/custom/templates/reblog.txt | 16 - themes/custom/templates/reply.txt | 25 - themes/custom/templates/replyform.txt | 45 -- themes/custom/templates/textpost.txt | 23 - themes/default/templates/post.txt | 21 - themes/default/templates/profileheader.txt | 26 - themes/default/templates/reblog.txt | 16 - themes/default/templates/reply.txt | 25 - themes/default/templates/replyform.txt | 45 -- themes/default/templates/textpost.txt | 23 - themes/monad/css/color.css | 6 +- themes/monad/css/mobile.css | 5 +- themes/monad/css/style.css | 4 + themes/monad/templates/post.txt | 21 - themes/monad/templates/profileheader.txt | 26 - themes/monad/templates/reblog.txt | 16 - themes/monad/templates/reply.txt | 25 - themes/monad/templates/replyform.txt | 45 -- themes/monad/templates/textpost.txt | 23 - themes/phubbub/css/color.css | 9 +- themes/phubbub/css/mobile.css | 657 ------------------ themes/phubbub/css/style.css | 631 ----------------- themes/phubbub/templates/post.txt | 21 - themes/phubbub/templates/profileheader.txt | 26 - themes/phubbub/templates/reblog.txt | 16 - themes/phubbub/templates/reply.txt | 25 - themes/phubbub/templates/replyform.txt | 45 -- themes/phubbub/templates/textpost.txt | 23 - 120 files changed, 224 insertions(+), 9206 deletions(-) rename {themes/default/css => css}/color.css (91%) rename {themes/default/css => css}/mobile.css (99%) rename {themes/default/css => css}/style.css (99%) delete mode 100644 login/bg/13056466555_9d2f308c39_b.jpg delete mode 100644 login/bg/13056847944_20bde73900_b.jpg delete mode 100644 login/bg/13057062975_e1db98baab_b.jpg create mode 100644 login/bg/185.jpg create mode 100644 login/bg/29a.jpg delete mode 100644 login/bg/33993885812_9524a46bc3_b.jpg delete mode 100644 login/bg/34283627225_d734c152a1_b.jpg delete mode 100644 login/bg/39107967634_743cc84ee8_b.jpg delete mode 100644 login/bg/4697225264_15edb40a60_b.jpg delete mode 100644 login/bg/48348030457_68de5d53ed_b.jpg create mode 100644 login/bg/a4f.jpg create mode 100644 login/bg/a8e.jpg create mode 100644 login/bg/af10e.jpg create mode 100644 login/bg/e3f.jpg create mode 100644 login/bg/h5s.jpg create mode 100644 login/bg/i5e.jpg create mode 100644 login/bg/o3a.jpg create mode 100644 login/bg/t65.jpg create mode 100644 login/bg/u6r.jpg create mode 100644 login/bg/u9w.jpg create mode 100644 modules/search.php rename {themes/1994/templates => templates}/post.txt (92%) rename {themes/1994/templates => templates}/profileheader.txt (100%) rename {themes/1994/templates => templates}/reblog.txt (100%) rename {themes/1994/templates => templates}/reply.txt (100%) rename {themes/1994/templates => templates}/replyform.txt (88%) rename {themes/chicago/templates => templates}/textpost.txt (91%) delete mode 100644 themes/1994/templates/textpost.txt delete mode 100644 themes/amplifier/css/mobile.css delete mode 100644 themes/amplifier/css/style.css delete mode 100644 themes/amplifier/templates/post.txt delete mode 100644 themes/amplifier/templates/profileheader.txt delete mode 100644 themes/amplifier/templates/reblog.txt delete mode 100644 themes/amplifier/templates/reply.txt delete mode 100644 themes/amplifier/templates/replyform.txt delete mode 100644 themes/amplifier/templates/textpost.txt delete mode 100644 themes/ancientbird/templates/post.txt delete mode 100644 themes/ancientbird/templates/profileheader.txt delete mode 100644 themes/ancientbird/templates/reblog.txt delete mode 100644 themes/ancientbird/templates/reply.txt delete mode 100644 themes/ancientbird/templates/replyform.txt delete mode 100644 themes/ancientbird/templates/textpost.txt delete mode 100644 themes/bythebook/css/mobile.css delete mode 100644 themes/bythebook/css/style.css delete mode 100644 themes/bythebook/templates/post.txt delete mode 100644 themes/bythebook/templates/profileheader.txt delete mode 100644 themes/bythebook/templates/reblog.txt delete mode 100644 themes/bythebook/templates/reply.txt delete mode 100644 themes/bythebook/templates/replyform.txt delete mode 100644 themes/bythebook/templates/textpost.txt delete mode 100644 themes/chicago/css/mobile.css delete mode 100644 themes/chicago/css/style.css delete mode 100644 themes/chicago/templates/post.txt delete mode 100644 themes/chicago/templates/profileheader.txt delete mode 100644 themes/chicago/templates/reblog.txt delete mode 100644 themes/chicago/templates/reply.txt delete mode 100644 themes/chicago/templates/replyform.txt delete mode 100644 themes/cuatro/css/mobile.css delete mode 100644 themes/cuatro/css/style.css delete mode 100644 themes/cuatro/templates/post.txt delete mode 100644 themes/cuatro/templates/profileheader.txt delete mode 100644 themes/cuatro/templates/reblog.txt delete mode 100644 themes/cuatro/templates/reply.txt delete mode 100644 themes/cuatro/templates/replyform.txt delete mode 100644 themes/cuatro/templates/textpost.txt delete mode 100644 themes/custom/css/mobile.css delete mode 100644 themes/custom/css/style.css delete mode 100644 themes/custom/templates/post.txt delete mode 100644 themes/custom/templates/profileheader.txt delete mode 100644 themes/custom/templates/reblog.txt delete mode 100644 themes/custom/templates/reply.txt delete mode 100644 themes/custom/templates/replyform.txt delete mode 100644 themes/custom/templates/textpost.txt delete mode 100644 themes/default/templates/post.txt delete mode 100644 themes/default/templates/profileheader.txt delete mode 100644 themes/default/templates/reblog.txt delete mode 100644 themes/default/templates/reply.txt delete mode 100644 themes/default/templates/replyform.txt delete mode 100644 themes/default/templates/textpost.txt delete mode 100644 themes/monad/templates/post.txt delete mode 100644 themes/monad/templates/profileheader.txt delete mode 100644 themes/monad/templates/reblog.txt delete mode 100644 themes/monad/templates/reply.txt delete mode 100644 themes/monad/templates/replyform.txt delete mode 100644 themes/monad/templates/textpost.txt delete mode 100644 themes/phubbub/css/mobile.css delete mode 100644 themes/phubbub/css/style.css delete mode 100644 themes/phubbub/templates/post.txt delete mode 100644 themes/phubbub/templates/profileheader.txt delete mode 100644 themes/phubbub/templates/reblog.txt delete mode 100644 themes/phubbub/templates/reply.txt delete mode 100644 themes/phubbub/templates/replyform.txt delete mode 100644 themes/phubbub/templates/textpost.txt diff --git a/themes/default/css/color.css b/css/color.css similarity index 91% rename from themes/default/css/color.css rename to css/color.css index 0e1a369..bae9fef 100644 --- a/themes/default/css/color.css +++ b/css/color.css @@ -20,6 +20,21 @@ textarea,input[type="text"]{ border-radius: 5px; } +.polloption{ + box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), 0 1px rgba(255, 255, 255, 0.1); + border-radius: 5px; + display:block; + margin:5px; + padding:5px; + background-color: #ddd; +} + +.polloption:hover{ + background-color: #305792; + box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); + color: white; +} + input[type="radio"]:checked+label,select { color: black; } @@ -202,7 +217,7 @@ input[type="checkbox"]:checked+label { box-shadow: 1px 1px 2px black; } -.postform { +.postform,.searchmobile { background-color: white; box-shadow: 1px 1px 2px black; } diff --git a/themes/default/css/mobile.css b/css/mobile.css similarity index 99% rename from themes/default/css/mobile.css rename to css/mobile.css index f2e5705..cd51a7b 100644 --- a/themes/default/css/mobile.css +++ b/css/mobile.css @@ -148,7 +148,7 @@ aside { display: table-cell; line-height: 45px; height: 100%; - width: 50px; + width: 40px; position: relative; } @@ -382,8 +382,7 @@ aside { border-radius: 3px; } -.postform { - display:none; +.postform,.searchmobile { position:fixed; width: 100vw !important; left:0px; @@ -393,7 +392,7 @@ aside { z-index: 99; } -#postform { +#postform,#searchmobile { display:none; } diff --git a/themes/default/css/style.css b/css/style.css similarity index 99% rename from themes/default/css/style.css rename to css/style.css index 359ae7b..13722d6 100644 --- a/themes/default/css/style.css +++ b/css/style.css @@ -378,6 +378,10 @@ aside { border-radius: 5px; } +#searchmobile{ + display:none; +} + .postform { width:650px; float: left; diff --git a/include/functions.php b/include/functions.php index 281a560..987a4e4 100644 --- a/include/functions.php +++ b/include/functions.php @@ -86,14 +86,14 @@ function emoji_list($val){ } function starts_with($string,$search){ - if (substr($string,0,strlen($search)) == $search){ + if (substr(strtolower($string),0,strlen($search)) == strtolower($search)){ return true; } return false; } function contains($string,$search){ - if (is_numeric(strpos($string,$search))){ + if (is_numeric(strpos(strtolower($string),strtolower($search)))){ return true; } return false; @@ -147,6 +147,24 @@ function user_info($user) { ); } +function api_getv2($url) { + global $srv; + global $token; + + $curl = curl_init(); + curl_setopt($curl, CURLOPT_URL, "https://$srv/api/v2/" . $url); + if (!is_null($token)) { + curl_setopt($curl, CURLOPT_HTTPHEADER, array( + 'Authorization: Bearer ' . $token + )); + } + curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); + $result = curl_exec($curl); + curl_close($curl); + + return json_decode($result, true); +} + /* a function to make an authenticated general GET api call to the logged-in instance */ function api_get($url) { @@ -742,6 +760,10 @@ function timeline($query) { case "bookmarks": $array = api_get("bookmarks?limit=25{$next}"); break; + + case "search": + $array = api_getv2("search?limit=40&q=".$query['search']."{$next}")['statuses']; + break; case "account": $info = api_get("accounts/verify_credentials"); @@ -859,14 +881,18 @@ function themes($mode,$name = false){ case "file": $theme = sanitize($user_settings['theme']); - //if (file_exists("themes/$theme/$name")){ + if (file_exists("themes/$theme/$name")){ return "themes/$theme/$name"; - //} + } else { + return "$name"; + } case "get": $theme = sanitize($user_settings['theme']); - //if (file_exists("themes/$theme/$name")){ + if (file_exists("themes/$theme/$name")){ return file_get_contents("themes/$theme/$name"); - //} + } else { + return file_get_contents("$name"); + } } -} \ No newline at end of file +} diff --git a/include/init.php b/include/init.php index f91999f..0a8182d 100644 --- a/include/init.php +++ b/include/init.php @@ -43,7 +43,7 @@ $tl['mode'] = $_GET['mode']; } else { foreach ($_GET as $key => $value){ - if(in_array($key,array("user","thread","local","tag","list","federated"))){ + if(in_array($key,array("user","thread","local","tag","list","federated","search"))){ $tl['mode'] = $key; $tl[$key] = $value; } diff --git a/js/scripts.js b/js/scripts.js index 7b4cbdd..04d6fc9 100644 --- a/js/scripts.js +++ b/js/scripts.js @@ -98,17 +98,19 @@ $('body').on('click', '.replies', function(e) { }); }); -$('body').on('click', '.ldr:not(.topicon)', function(e) { - $('.topicon').each(function(a){ +$('body').on('click', '.ldr:not(.tlicon)', function(e) { + $('.tlicon').each(function(a){ $( this ).removeClass('tiselected') }); }); $('body').on('click', '.ldr', function(e) { e.preventDefault(); + location.hash = "#top"; $('#loader').html(''); $('#loaded').remove(); var url = $(this).attr('href'); + var id = $(this).attr('id'); localStorage.setItem("content", $('#content .element').detach()); $('#content').html('
'); $.get(url + "&ajax=1", function(data) { @@ -336,6 +338,10 @@ function getMode() { console.log('tag'); return "&tag=" + getUrlParameter('tag'); } + if (typeof getUrlParameter('search') !== 'undefined') { + console.log('tag'); + return "&search=" + getUrlParameter('search'); + } return "&mode=federated"; }; @@ -344,6 +350,9 @@ function loadmore(){ if (typeof thread !== 'undefined') { return false; } + if (typeof getUrlParameter('search') !== 'undefined') { + return false; + } var thread = getUrlParameter('thread'); if (typeof thread === 'undefined') { var error = $(".error").length; @@ -379,6 +388,10 @@ function newPosts() { if (typeof thread !== 'undefined') { return false; } + var search = getUrlParameter('search'); + if (typeof search !== 'undefined') { + return false; + } var error = $(".error").length; if (error >= 1) { return false; @@ -463,4 +476,4 @@ function themecheck(name){ else{ $('#customtheme').css("display","none"); } -}; \ No newline at end of file +}; diff --git a/layout/footer.php b/layout/footer.php index f7a55e3..bb97871 100644 --- a/layout/footer.php +++ b/layout/footer.php @@ -64,6 +64,16 @@ $query = http_build_query(array_filter(array( $('body').on('click', '.compose', function(e) { $('#postform').toggle(); }); + + $('body').on('click', '.searchform', function(e) { + $(this).prev().toggle(); + }); + + $('body').on('click', '.searchmobiletoggle', function(e) { + $('#usermenu').off('hover'); + $('#usermenu').off('active'); + $('#searchmobile').toggle(); + }); $("body").on("keydown", "form", function (e) { if (e.ctrlKey && e.keyCode === 13) { @@ -71,8 +81,8 @@ $query = http_build_query(array_filter(array( } }); - $('.topicon').click(function(){ - $('.topicon').each(function(a){ + $('.tlicon').click(function(){ + $('.tlicon').each(function(a){ $( this ).removeClass('tiselected') }); $( this ).addClass('tiselected'); diff --git a/layout/header.php b/layout/header.php index f904664..efdfe28 100644 --- a/layout/header.php +++ b/layout/header.php @@ -1,6 +1,6 @@ - Dashboard FE + <?php echo $setting['appname']; ?> @@ -75,41 +75,42 @@ if ($logedin) {
- " style="font-family: 'patua', serif; font-weight:bold; color:white; font-size:20px; text-decoration:none">Dashboard FE + " style="font-family: 'patua', serif; font-weight:bold; color:white; font-size:20px; text-decoration:none"> - '> + '> - '> + '> - '> + '> - '> + '> - '> + '> - '> + '> - + - + - - + + + + + @@ -133,11 +134,10 @@ endif; ?>
  •  Direct
  •  Bookmarks
    • - + +
  •  Search
  • - +
  •  Settings
  •  Log Out
    • @@ -177,9 +177,19 @@ endif; ?>
    - + +
    +
    +
    +
    + X + + +
    +
    +
    + +
    )'>
    diff --git a/layout/sidebar.php b/layout/sidebar.php index 10cb7fc..ecc5492 100644 --- a/layout/sidebar.php +++ b/layout/sidebar.php @@ -12,6 +12,10 @@ if ($logedin || $tl['mode'] == 'user') {
    (@" . $info['acct'] . ")
    + +
    +
    +