diff --git a/Web/Models/Repositories/Applications.php b/Web/Models/Repositories/Applications.php index 3aa6e5be..0687856e 100644 --- a/Web/Models/Repositories/Applications.php +++ b/Web/Models/Repositories/Applications.php @@ -66,4 +66,12 @@ class Applications { return sizeof($this->appRels->where("user", $user->getId())); } + + function find(string $query, array $pars = [], string $sort = "id"): Util\EntityStream + { + $query = "%$query%"; + $result = $this->apps->where("CONCAT_WS(' ', name, description) LIKE ?", $query)->where("enabled", 1); + + return new Util\EntityStream("Application", $result->order("$sort")); + } } \ No newline at end of file diff --git a/Web/Models/Repositories/Clubs.php b/Web/Models/Repositories/Clubs.php index 8e97f3eb..04bb30ab 100644 --- a/Web/Models/Repositories/Clubs.php +++ b/Web/Models/Repositories/Clubs.php @@ -43,12 +43,12 @@ class Clubs return $this->toClub($this->clubs->get($id)); } - function find(string $query, int $page = 1, ?int $perPage = NULL): \Traversable + function find(string $query, array $pars = [], string $sort = "id DESC", int $page = 1, ?int $perPage = NULL): \Traversable { $query = "%$query%"; $result = $this->clubs->where("name LIKE ? OR about LIKE ?", $query, $query); - return new Util\EntityStream("Club", $result); + return new Util\EntityStream("Club", $result->order($sort)); } function getCount(): int diff --git a/Web/Models/Repositories/Comments.php b/Web/Models/Repositories/Comments.php index 4774cf35..4b4dfc57 100644 --- a/Web/Models/Repositories/Comments.php +++ b/Web/Models/Repositories/Comments.php @@ -59,4 +59,27 @@ class Comments "deleted" => false, ])); } + + function find(string $query = "", array $pars = [], string $sort = "id"): Util\EntityStream + { + $query = "%$query%"; + + $notNullParams = []; + + foreach($pars as $paramName => $paramValue) { + if($paramName != "before" && $paramName != "after") + $paramValue != NULL ? $notNullParams+=["$paramName" => "%$paramValue%"] : NULL; + else + $paramValue != NULL ? $notNullParams+=["$paramName" => "$paramValue"] : NULL; + } + + $result = $this->comments->where("content LIKE ?", $query)->where("deleted", 0); + $nnparamsCount = sizeof($notNullParams); + + if($nnparamsCount > 0) { + !is_null($notNullParams["before"]) ? $result->where("created < ?", $notNullParams["before"]) : NULL; + !is_null($notNullParams["after"]) ? $result->where("created > ?", $notNullParams["after"]) : NULL; + } + return new Util\EntityStream("Comment", $result->order("$sort")); + } } diff --git a/Web/Models/Repositories/Posts.php b/Web/Models/Repositories/Posts.php index 7aadc0bb..8056264a 100644 --- a/Web/Models/Repositories/Posts.php +++ b/Web/Models/Repositories/Posts.php @@ -99,7 +99,30 @@ class Posts return NULL; } - + + function find(string $query = "", array $pars = [], string $sort = "id"): Util\EntityStream + { + $query = "%$query%"; + + $notNullParams = []; + + foreach($pars as $paramName => $paramValue) { + if($paramName != "before" && $paramName != "after") + $paramValue != NULL ? $notNullParams+=["$paramName" => "%$paramValue%"] : NULL; + else + $paramValue != NULL ? $notNullParams+=["$paramName" => "$paramValue"] : NULL; + } + + $result = $this->posts->where("content LIKE ?", $query)->where("deleted", 0); + $nnparamsCount = sizeof($notNullParams); + + if($nnparamsCount > 0) { + !is_null($notNullParams["before"]) ? $result->where("created < ?", $notNullParams["before"]) : NULL; + !is_null($notNullParams["after"]) ? $result->where("created > ?", $notNullParams["after"]) : NULL; + } + return new Util\EntityStream("Post", $result->order("$sort")); + } + function getPostCountOnUserWall(int $user): int { return sizeof($this->posts->where(["wall" => $user, "deleted" => 0])); diff --git a/Web/Models/Repositories/Users.php b/Web/Models/Repositories/Users.php index 63e77df0..c98c5a47 100644 --- a/Web/Models/Repositories/Users.php +++ b/Web/Models/Repositories/Users.php @@ -49,12 +49,46 @@ class Users return $this->toUser($this->users->where("user", $user->getId())->fetch()); } - function find(string $query): Util\EntityStream + function find(string $query, array $pars = [], string $sort = "id DESC"): Util\EntityStream { $query = "%$query%"; $result = $this->users->where("CONCAT_WS(' ', first_name, last_name, pseudo, shortcode) LIKE ?", $query)->where("deleted", 0); - return new Util\EntityStream("User", $result); + $notNullParams = []; + $nnparamsCount = 0; + + foreach($pars as $paramName => $paramValue) { + if($paramName != "before" && $paramName != "after" && $paramName != "gender") + $paramValue != NULL ? $notNullParams += ["$paramName" => "%$paramValue%"] : NULL; + else + $paramValue != NULL ? $notNullParams += ["$paramName" => "$paramValue"] : NULL; + } + + $nnparamsCount = sizeof($notNullParams); + + if($nnparamsCount > 0) { + !is_null($notNullParams["hometown"]) ? $result->where("hometown LIKE ?", $notNullParams["hometown"]) : NULL; + !is_null($notNullParams["city"]) ? $result->where("city LIKE ?", $notNullParams["city"]) : NULL; + !is_null($notNullParams["maritalstatus"]) ? $result->where("marital_status LIKE ?", $notNullParams["maritalstatus"]) : NULL; + !is_null($notNullParams["status"]) ? $result->where("status LIKE ?", $notNullParams["status"]) : NULL; + !is_null($notNullParams["politViews"]) ? $result->where("polit_views LIKE ?", $notNullParams["politViews"]) : NULL; + !is_null($notNullParams["email"]) ? $result->where("email_contact LIKE ?", $notNullParams["email"]) : NULL; + !is_null($notNullParams["telegram"]) ? $result->where("telegram LIKE ?", $notNullParams["telegram"]) : NULL; + !is_null($notNullParams["site"]) ? $result->where("website LIKE ?", $notNullParams["site"]) : NULL; + !is_null($notNullParams["address"]) ? $result->where("address LIKE ?", $notNullParams["address"]) : NULL; + !is_null($notNullParams["is_online"]) ? $result->where("online >= ?", time() - 900) : NULL; + !is_null($notNullParams["interests"]) ? $result->where("interests LIKE ?", $notNullParams["interests"]) : NULL; + !is_null($notNullParams["fav_mus"]) ? $result->where("fav_music LIKE ?", $notNullParams["fav_mus"]) : NULL; + !is_null($notNullParams["fav_films"]) ? $result->where("fav_films LIKE ?", $notNullParams["fav_films"]) : NULL; + !is_null($notNullParams["fav_shows"]) ? $result->where("fav_shows LIKE ?", $notNullParams["fav_shows"]) : NULL; + !is_null($notNullParams["fav_books"]) ? $result->where("fav_books LIKE ?", $notNullParams["fav_books"]) : NULL; + !is_null($notNullParams["fav_quote"]) ? $result->where("fav_quote LIKE ?", $notNullParams["fav_quote"]) : NULL; + !is_null($notNullParams["before"]) ? $result->where("UNIX_TIMESTAMP(since) < ?", $notNullParams["before"]) : NULL; + !is_null($notNullParams["after"]) ? $result->where("UNIX_TIMESTAMP(since) > ?", $notNullParams["after"]) : NULL; + !is_null($notNullParams["gender"]) ? $result->where("sex ?", $notNullParams["gender"]) : NULL; + # !is_null($notNullParams["has_avatar"]) ? $result->related(): NULL; + } + return new Util\EntityStream("User", $result->order($sort)); } function getStatistics(): object diff --git a/Web/Models/Repositories/Videos.php b/Web/Models/Repositories/Videos.php index 5701b44e..92ebc11c 100644 --- a/Web/Models/Repositories/Videos.php +++ b/Web/Models/Repositories/Videos.php @@ -45,4 +45,27 @@ class Videos { return sizeof($this->videos->where("owner", $user->getId())->where(["deleted" => 0, "unlisted" => 0])); } + + function find(string $query = "", array $pars = [], string $sort = "id"): Util\EntityStream + { + $query = "%$query%"; + + $notNullParams = []; + + foreach($pars as $paramName => $paramValue) { + if($paramName != "before" && $paramName != "after") + $paramValue != NULL ? $notNullParams+=["$paramName" => "%$paramValue%"] : NULL; + else + $paramValue != NULL ? $notNullParams+=["$paramName" => "$paramValue"] : NULL; + } + + $result = $this->videos->where("name OR description LIKE ?", $query)->where("deleted", 0); + $nnparamsCount = sizeof($notNullParams); + + if($nnparamsCount > 0) { + !is_null($notNullParams["before"]) ? $result->where("created < ?", $notNullParams["before"]) : NULL; + !is_null($notNullParams["after"]) ? $result->where("created > ?", $notNullParams["after"]) : NULL; + } + return new Util\EntityStream("Video", $result->order("$sort")); + } } diff --git a/Web/Presenters/SearchPresenter.php b/Web/Presenters/SearchPresenter.php index 2171297c..f029edc8 100644 --- a/Web/Presenters/SearchPresenter.php +++ b/Web/Presenters/SearchPresenter.php @@ -1,18 +1,28 @@ users = $users; - $this->clubs = $clubs; + $this->users = $users; + $this->clubs = $clubs; + $this->posts = new Posts; + $this->comments = new Comments; + $this->videos = new Videos; + $this->apps = new Applications; + $this->notes = new Notes; parent::__construct(); } @@ -21,6 +31,8 @@ final class SearchPresenter extends OpenVKPresenter { $query = $this->queryParam("query") ?? ""; $type = $this->queryParam("type") ?? "users"; + $sorter = $this->queryParam("sort") ?? "id"; + $invert = $this->queryParam("invert") == 1 ? "ASC" : "DESC"; $page = (int) ($this->queryParam("p") ?? 1); $this->willExecuteWriteAction(); @@ -28,11 +40,61 @@ final class SearchPresenter extends OpenVKPresenter $this->assertUserLoggedIn(); # https://youtu.be/pSAWM5YuXx8 - - $repos = [ "groups" => "clubs", "users" => "users" ]; + + $repos = [ + "groups" => "clubs", + "users" => "users", + "posts" => "posts", + "comments" => "comments", + "videos" => "videos", + "audios" => "posts", + "apps" => "apps", + "notes" => "notes" + ]; + + switch($sorter) { + default: + case "id": + $sort = "id " . $invert; + break; + case "random": + $sort = "RAND()"; + break; + case "name": + $sort = "first_name " . $invert; + break; + case "rating": + $sort = "rating " . $invert; + break; + } + + $parameters = [ + "type" => $this->queryParam("type"), + "city" => $this->queryParam("city") != "" ? $this->queryParam("city") : NULL, + "maritalstatus" => $this->queryParam("maritalstatus") != 0 ? $this->queryParam("maritalstatus") : NULL, + "with_photo" => $this->queryParam("with_photo"), + "status" => $this->queryParam("status") != "" ? $this->queryParam("status") : NULL, + "politViews" => $this->queryParam("politViews") != 0 ? $this->queryParam("politViews") : NULL, + "email" => $this->queryParam("email"), + "telegram" => $this->queryParam("telegram"), + "site" => $this->queryParam("site") != "" ? "https://".$this->queryParam("site") : NULL, + "address" => $this->queryParam("address"), + "is_online" => $this->queryParam("is_online") == 1 ? 1 : NULL, + "interests" => $this->queryParam("interests") != "" ? $this->queryParam("interests") : NULL, + "fav_mus" => $this->queryParam("fav_mus") != "" ? $this->queryParam("fav_mus") : NULL, + "fav_films" => $this->queryParam("fav_films") != "" ? $this->queryParam("fav_films") : NULL, + "fav_shows" => $this->queryParam("fav_shows") != "" ? $this->queryParam("fav_shows") : NULL, + "fav_books" => $this->queryParam("fav_books") != "" ? $this->queryParam("fav_books") : NULL, + "fav_quote" => $this->queryParam("fav_quote") != "" ? $this->queryParam("fav_quote") : NULL, + "hometown" => $this->queryParam("hometown") != "" ? $this->queryParam("hometown") : NULL, + "before" => $this->queryParam("datebefore") != "" ? strtotime($this->queryParam("datebefore")) : NULL, + "after" => $this->queryParam("dateafter") != "" ? strtotime($this->queryParam("dateafter")) : NULL, + "gender" => $this->queryParam("gender") != "" && $this->queryParam("gender") != 2 ? $this->queryParam("gender") : NULL + ]; + $repo = $repos[$type] or $this->throwError(400, "Bad Request", "Invalid search entity $type."); - $results = $this->{$repo}->find($query); + $results = $this->{$repo}->find($query, $parameters, $sort); $iterator = $results->page($page); $count = $results->size(); diff --git a/Web/Presenters/templates/@layout.xml b/Web/Presenters/templates/@layout.xml index f211c2c1..ed593490 100644 --- a/Web/Presenters/templates/@layout.xml +++ b/Web/Presenters/templates/@layout.xml @@ -70,28 +70,60 @@ {_header_log_out} {else} -
+
{_header_home}
-
+
{_header_groups}
-
+
{_header_search}
-
+
{_header_invite}
-
+
{_header_help} ({$ticketAnsweredCount})
-
+
{_header_log_out}
-
- -
+ {var $atSearch = str_contains($_SERVER['REQUEST_URI'], "/search")} + + {if !$atSearch} +
+ + +
+ {else} +
+ + + +
+ + {/if}
{/if} {else} diff --git a/Web/Presenters/templates/Search/Index.xml b/Web/Presenters/templates/Search/Index.xml index fe39b4e3..7bae1c7f 100644 --- a/Web/Presenters/templates/Search/Index.xml +++ b/Web/Presenters/templates/Search/Index.xml @@ -1,11 +1,7 @@ -{extends "../@listView.xml"} +{extends "../@layout.xml"} {block title} - {if $type === "users"} - {tr("search_for_people")} - {else} - {tr("search_for_groups")} - {/if} + {tr("search_for_$type")} {if $_GET['query']} - {$_GET['query']} {/if} @@ -13,41 +9,17 @@ {block header} {=OPENVK_ROOT_CONF["openvk"]["appearance"]["name"]} » - {if $type === "users"} - {tr("search_for_people")} - {else} - {tr("search_for_groups")} - {/if} + {tr("search_for_$type")} {/block} {* BEGIN ELEMENTS DESCRIPTION *} -{block tabs} -
- - {_users} - -
-
- - {_groups} - -
-
-
- - - -
- -

- {tr("results", $count)} -

-
-{/block} - {block link|strip|stripHtml} - {$x->getURL()} + {if $type != "apps"} + {$x->getURL()} + {else} + /app{$x->getId()} + {/if} {/block} {block preview} @@ -55,17 +27,72 @@ {/block} {block name} -  {$x->getCanonicalName()} - + {if $type != "apps"} +  {$x->getCanonicalName()} + {if $_GET['sort'] == "rating"}({$x->getRating()}%) + {elseif $_GET['sort'] == "id" || $_GET['sort'] == "random"}(id{$x->getId()}){/if} + + {else} + {$x->getName()} + {/if} {/block} {block description} {if $type === "users"} + {if !is_null($_GET['status']) && $_GET['status'] != ""} + + + + + {/if} + {if !is_null($_GET['city']) && $_GET['city'] != "" && $x->getPrivacySetting("page.info.read") > 1} + + + + + {/if} + {if !is_null($_GET['city']) && $_GET['hometown'] != "" && $x->getPrivacySetting("page.info.read") > 1} + + + + + {/if} + {if !is_null($_GET['politViews']) && $_GET['politViews'] != 0 && $x->getPrivacySetting("page.info.read") > 1} + + + + + {/if} + {if !is_null($_GET['email']) && $_GET['email'] != "" && $x->getPrivacySetting("page.info.read") > 1} + + + + + {/if} + {if !is_null($_GET['telegram']) && $_GET['telegram'] != "" && $x->getPrivacySetting("page.info.read") > 1} + + + + + {/if} + {if !is_null($_GET['site']) && $_GET['site'] != "" && $x->getPrivacySetting("page.info.read") > 1} + + + + + {/if} + {if !is_null($_GET['address']) && $_GET['address'] != "" && $x->getPrivacySetting("page.info.read") > 1} + + + + + {/if} + {if $x->getPrivacySetting("page.info.read") > 1} @@ -78,11 +105,14 @@ + {/if} {/if} + {if $type != "apps"} + {/if} @@ -90,3 +120,220 @@
{_status}:{$x->getStatus()}
{_city}:{$x->getCity()}
{_hometown}:{$x->getHometown()}
{_politViews}:{tr("politViews_".$x->getPoliticalViews())}
{_email}:{$x->getContactEmail()}
{_telegram}:@{$x->getTelegram()}
{_personal_website}:{$x->getWebsite()}
{_address}:{$x->getPhysicalAddress()}
{_gender}: {$x->isFemale() ? tr("female") : tr("male")}{_registration_date}: {$x->getRegistrationTime()}
{_description}: {$x->getDescription() ?? '(' . tr("none") . ')'}
{/block} + +{block content} +
+ {include "../components/paginator.xml", conf => (object) [ + "page" => $page, + "count" => $count, + "amount" => sizeof($data), + "perPage" => $perPage ?? OPENVK_DEFAULT_PER_PAGE, + "atBottom" => false, + ]} +
+

+ {tr("results", $count)} +

+
+ {include searchOptions} + + {var $data = is_array($iterator) ? $iterator : iterator_to_array($iterator)} +
+ {if sizeof($data) > 0} + {if $type == "users" || $type == "groups" || $type == "apps"} +
+ + + + + + + + +
+ + {include preview, x => $dat} + + + {ifset infotable} + {include infotable, x => $dat} + {else} + + + {include name, x => $dat} + + +
+ {include description, x => $dat} + {/ifset} + 		+ {include actions, x => $dat} +
+
+ {elseif $type == "posts"} + {foreach $data as $dat} + {if $dat->getTargetWall() < 0 && $dat->getWallOwner()->isHideFromGlobalFeedEnabled()} + {php continue;} + {* костыль но я по-другому не придумал *} + {else} +
+ {include "../components/post.xml", post => $dat, commentSection => true, onWallOf => true} +
+ {/if} + {/foreach} + {elseif $type == "comments"} +
+ {include "../components/comment.xml", comment => $dat, linkW => true} +
+ {elseif $type == "videos"} + {foreach $data as $dat} + {if $dat->getOwner()->isDeleted()} + {php continue;} + {else} +
+ {include "../components/video.xml", video => $dat} +
+ {/if} + {/foreach} + {elseif $type == "audios"} + хуй + {/if} + {else} + {ifset customErrorMessage} + {include customErrorMessage} + {else} + {include "../components/nothing.xml"} + {/ifset} + {/if} +
+ +{/block} + +{block searchOptions} +
+ + +
+
{_s_order_by}
+
+ + {_s_order_invert} +
+
+ + {if $type !== "groups" && $type !== "apps"} {*В OpenVK не сохраняется дата создания группы*} +
+
{_s_by_date}
+
+

{_s_date_before}:
+

+

{_s_date_after}:
+

+
+
+ {/if} + + {if $type === "users"} +
+
{_main}
+
+ + + +
+
+ +
+
{_gender}
+
+

{_male}

+

{_female}

+

{_s_any}

+
+
+ +
+
{_relationship}
+
+ +
+
+ +
+
{_politViews}
+
+ +
+
+ +
+
{_contacts}
+
+ +
+
+ +
+
+ +
+
{_interests}
+
+ + + + + + +
+
+ + {_s_now_on_site} + + {/if} +
+ +{/block} \ No newline at end of file diff --git a/Web/Presenters/templates/User/View.xml b/Web/Presenters/templates/User/View.xml index e4d55e9e..73e269f9 100644 --- a/Web/Presenters/templates/User/View.xml +++ b/Web/Presenters/templates/User/View.xml @@ -420,11 +420,11 @@ {_hometown}: - {$user->getHometown()} + {$user->getHometown()} {_politViews}: - {var $pviews = $user->getPoliticalViews()}{_"politViews_$pviews"} + {var $pviews = $user->getPoliticalViews()}{_"politViews_$pviews"} {_birth_date}: @@ -470,7 +470,7 @@ {_city}: - {$user->getCity()} + {$user->getCity()} {_address}: @@ -484,23 +484,45 @@ {_interests}: - {$user->getInterests()} + + {var $interests = explode(", ", $user->getInterests())} + {foreach $interests as $interest} + {$interest}{if $interest != end($interests)},{/if} + {/foreach} + + {_favorite_music}: - {$user->getFavoriteMusic()} + + {var $musics = explode(", ", $user->getFavoriteMusic())} + {foreach $musics as $music} + {$music}{if $music != end($musics)},{/if} + {/foreach} {_favorite_films}: - {$user->getFavoriteFilms()} + + {var $films = explode(", ", $user->getFavoriteFilms())} + {foreach $films as $film} + {$film}{if $film != end($films)},{/if} + {/foreach} {_favorite_shows}: - {$user->getFavoriteShows()} + + {var $shows = explode(", ", $user->getFavoriteShows())} + {foreach $shows as $show} + {$show}{if $show != end($shows)},{/if} + {/foreach} {_favorite_books}: - {$user->getFavoriteBooks()} + + {var $books = explode(", ", $user->getFavoriteBooks())} + {foreach $books as $book} + {$book}{if $book != end($books)},{/if} + {/foreach} {_favorite_quotes}: @@ -710,4 +732,4 @@ {else} {* isBanned() *} {include "banned.xml"} {/if} -{/block} +{/block} \ No newline at end of file diff --git a/Web/Presenters/templates/components/comment.xml b/Web/Presenters/templates/components/comment.xml index 125c1cef..94813a5f 100644 --- a/Web/Presenters/templates/components/comment.xml +++ b/Web/Presenters/templates/components/comment.xml @@ -29,11 +29,12 @@
- {$comment->getPublicationTime()} | + {$comment->getPublicationTime()} | {if $comment->canBeDeletedBy($thisUser)} - {_delete} | + {_delete} {/if} - {_reply} + {if is_null($linkW)} | + {_reply}{/if}
diff --git a/Web/Presenters/templates/components/video.xml b/Web/Presenters/templates/components/video.xml new file mode 100644 index 00000000..0b408f70 --- /dev/null +++ b/Web/Presenters/templates/components/video.xml @@ -0,0 +1,35 @@ + + + + + + + +
+
+ + + +
+ 		+ {ifset infotable} + {include infotable, x => $dat} + {else} + + + {$video->getName()} + + +
+

+ {$video->getDescription() ?? ""} +

+ {_video_uploaded} {$video->getPublicationTime()}
+ +

+ {_view_video} + {if $video->getCommentsCount() > 0}| {_comments} ({$video->getCommentsCount()}){/if} +

+ {/ifset} +
\ No newline at end of file diff --git a/Web/static/css/main.css b/Web/static/css/main.css index d429fb1a..caa0e022 100644 --- a/Web/static/css/main.css +++ b/Web/static/css/main.css @@ -2300,3 +2300,153 @@ a.poll-retract-vote { background-image: url(/assets/packages/static/openvk/img/videoico.png); display: none; } + +.searchOptions +{ + overflow-y: hidden; + background:#F7F7F7; + overflow-x:hidden; + width:29.2%; + border-top:1px solid #E5E7E6; + float:right; + padding-left:9.6px; + scrollbar-width: none; + font-size:12px; + background-color:#f7f7f7; + margin-right: -7px; +} + +.searchBtn +{ + border: solid 1px #575757; + background-color: #696969; + color:white; + margin-left: -3px; + padding-bottom:2px; + width:80px; + cursor: pointer; + box-shadow: 0px 2px 0px 0px rgba(255, 255, 255, 0.18) inset; +} + +.searchBtn:active +{ + border: solid 1px #666666; + background-color: #696969; + color:white; + box-shadow: 0px -2px 0px 0px rgba(255, 255, 255, 0.18) inset; +} + +.searchList +{ + list-style: none; + padding-left:0px; +} + +.searchList #used +{ + margin-left:0px; + color: white; + padding:2px; + padding-top:5px; + padding-bottom:5px; + border: solid 0.125rem #696969; + background:linear-gradient(#888888,#858585); + margin-bottom:2px; + padding-left:5px; + width:90%; +} + +.searchList #used a +{ + color: white; +} + +.sr:focus +{ + outline:none; +} + +.searchHide +{ + padding-right: 5px; +} + +.searchList li +{ + margin-left:0px; + color: #2B587A !important; + cursor:pointer; + padding:2px; + padding-top:5px; + padding-bottom:5px; + margin-bottom:2px; + padding-left:5px; +} + +.searchList li a +{ + min-width:100%; +} + +.searchList li:hover +{ + margin-left:0px; + color: #2B587A !important; + background:#ebebeb; + padding:2px; + padding-top:5px; + padding-bottom:5px; + margin-bottom:2px; + padding-left:5px; + width:91%; +} + +.whatFind +{ + color:rgb(128, 128, 128); + background:none; + border:none; + position:absolute; + width:150px; + right:95px; + top:12px; + text-align:right; +} + +.searchOptionName +{ + cursor:pointer; + background-color: #EAEAEA; + padding-left:5px; + padding-top:5px; + padding-bottom:5px; + width: 90%; + font-weight: 600; + color: #585858; +} + +.searchOption +{ + user-select: none; +} + +.searchOptionBlock +{ + margin-top: -5px; + padding-top:10px; + max-width:92%; + padding-bottom:6px; +} + +.searchOptionBlock select +{ + padding-left:7px; + padding-top:3px; + padding-bottom:3px; + cursor:pointer; +} + +.searchOptionBlock input[type=text], input[type=date] +{ + margin-bottom:5px; +} diff --git a/Web/static/img/hide.png b/Web/static/img/hide.png new file mode 100644 index 00000000..afada122 Binary files /dev/null and b/Web/static/img/hide.png differ diff --git a/Web/static/img/show.png b/Web/static/img/show.png new file mode 100644 index 00000000..5c3763c8 Binary files /dev/null and b/Web/static/img/show.png differ diff --git a/Web/static/js/openvk.cls.js b/Web/static/js/openvk.cls.js index ded00fbb..5eb4318d 100644 --- a/Web/static/js/openvk.cls.js +++ b/Web/static/js/openvk.cls.js @@ -568,6 +568,50 @@ function deleteAvatar(avatar) ]); } +function expandSearch() +{ + // console.log("search expanded") + let els = document.querySelectorAll("div.dec") + for(const element of els) + { + element.style.display = "none" + } + + document.querySelector(".whatFind").style.display = "block"; + document.querySelector(".whatFind").style.marginRight = "-80px"; + document.getElementById("searchInput").style.width = "650px"; +} + +async function decreaseSearch() +{ + // чтобы люди успели выбрать что искать и поиск не скрывался сразу + await new Promise(r => setTimeout(r, 4000)); + // console.log("search decreased") + if(document.activeElement !== searchInput) + { + let els = document.querySelectorAll("div.dec") + for(const element of els) + { + element.style.display = "inline-block" + } + + document.querySelector(".whatFind").style.display = "none"; + document.getElementById("searchInput").style.width = "120px"; + } +} + +function hideParams(name) +{ + $("#s_"+name).slideToggle(250, "swing"); + + if($(`#n_${name} img`).attr("src") == "/assets/packages/static/openvk/img/hide.png") + { + $("#n_"+name+" img").attr("src", "/assets/packages/static/openvk/img/show.png"); + } else { + $("#n_"+name+" img").attr("src", "/assets/packages/static/openvk/img/hide.png"); + } +} + $(document).on("scroll", () => { if($(document).scrollTop() > $(".sidebar").height() + 50) { $(".floating_sidebar")[0].classList.add("show"); diff --git a/locales/en.strings b/locales/en.strings index c70bc259..a2b3e1aa 100644 --- a/locales/en.strings +++ b/locales/en.strings @@ -91,6 +91,7 @@ "no_information_provided" = "No information provided."; "deceased_person" = "Deceased person"; "none" = "none"; +"desc_none" = "no description"; "send" = "Send"; "years_zero" = "0 year old"; @@ -478,7 +479,12 @@ "apply_style_for_this_device" = "Apply style only for this device"; "search_for_groups" = "Search for groups"; -"search_for_people" = "Search for people"; +"search_for_users" = "Search for people"; +"search_for_posts" = "Search for posts"; +"search_for_comments" = "Search for comments"; +"search_for_videos" = "Search for videos"; +"search_for_apps" = "Search for apps"; +"search_for_notes" = "Search for notes"; "search_button" = "Find"; "search_placeholder" = "Start typing any name, title or word"; "results_zero" = "No results"; @@ -1450,3 +1456,53 @@ "tour_section_14_bottom_text_1" = "Screenshots"; "tour_section_14_bottom_text_2" = "This concludes the tour of the site. If you want to try our mobile app, create your own group here, invite your friends or find new ones, or just have some fun in general, you can do it right now with a small registration"; "tour_section_14_bottom_text_3" = "This concludes the tour of the site"; + +/* Search */ + +"s_people" = "People"; +"s_groups" = "Clubs"; +"s_events" = "Events"; +"s_apps" = "Applications"; +"s_questions" = "Questions"; +"s_notes" = "Notes"; +"s_themes" = "Themes"; +"s_posts" = "Posts"; +"s_comments" = "Comments"; +"s_videos" = "Videos"; +"s_audios" = "Music"; +"s_by_people" = "for people"; +"s_by_groups" = "for groups"; +"s_by_posts" = "for posts"; +"s_by_comments" = "for comments"; +"s_by_videos" = "for videos"; +"s_by_apps" = "for apps"; +"s_by_audios" = "for musics"; + +"s_order_by" = "Order by..."; + +"s_order_by_id" = "By id"; +"s_order_by_name" = "By name"; +"s_order_by_random" = "By random"; +"s_order_by_rating" = "By rating"; +"s_order_invert" = "Invert"; + +"s_by_date" = "By date"; +"s_date_before" = "Before"; +"s_date_after" = "After"; + +"s_region" = "Region"; +"s_city" = "City"; +"s_native_city" = "Hometown"; + +"s_main" = "Main"; +"s_age" = "Age"; +"s_sex" = "Sex"; +"s_wemen" = "Woman"; +"s_man" = "Man"; + +"s_relationship" = "Relationship"; +"s_now_on_site" = "now on site"; +"s_with_photo" = "with photo"; +"s_only_in_names" = "only in names"; + +"s_any" = "any"; \ No newline at end of file diff --git a/locales/ru.strings b/locales/ru.strings index 6c62de66..f6f1bef8 100644 --- a/locales/ru.strings +++ b/locales/ru.strings @@ -80,6 +80,7 @@ "no_information_provided" = "Информация отсутствует."; "deceased_person" = "Страница покойного человека"; "none" = "отсутствует"; +"desc_none" = "описание отсутствует"; "send" = "Отправить"; "years_zero" = "0 лет"; "years_one" = "1 год"; @@ -452,7 +453,12 @@ "round_avatars" = "Круглые"; "apply_style_for_this_device" = "Применить стиль только для этого устройства"; "search_for_groups" = "Поиск групп"; -"search_for_people" = "Поиск людей"; +"search_for_users" = "Поиск людей"; +"search_for_posts" = "Поиск записей"; +"search_for_comments" = "Поиск комментариев"; +"search_for_videos" = "Поиск видео"; +"search_for_apps" = "Поиск приложений"; +"search_for_notes" = "Поиск записок"; "search_button" = "Найти"; "search_placeholder" = "Начните вводить любое имя, название или слово"; "results_zero" = "Ни одного результата"; @@ -1343,4 +1349,54 @@ "tour_section_14_bottom_text_1" = "Скриншоты приложения"; "tour_section_14_bottom_text_2" = "На этом экскурсия по сайту завершена. Если вы хотите попробовать наше мобильное приложение, создать здесь свою группу, позвать своих друзей или найти новых, или вообще просто как-нибудь поразвлекаться, то это можно сделать прямо сейчас, пройдя небольшую регистрацию"; -"tour_section_14_bottom_text_3" = "На этом экскурсия по сайту завершена." +"tour_section_14_bottom_text_3" = "На этом экскурсия по сайту завершена."; + +/* Search */ + +"s_people" = "Люди"; +"s_groups" = "Группы"; +"s_events" = "События"; +"s_apps" = "Приложения"; +"s_questions" = "Вопросы"; +"s_notes" = "Заметки"; +"s_themes" = "Темы"; +"s_posts" = "Записи"; +"s_comments" = "Комментарии"; +"s_videos" = "Видео"; +"s_audios" = "Аудио"; +"s_by_people" = "по людям"; +"s_by_groups" = "по группам"; +"s_by_posts" = "по записям"; +"s_by_comments" = "по комментариям"; +"s_by_videos" = "по видео"; +"s_by_apps" = "по приложениям"; +"s_by_audios" = "по музыке"; + +"s_order_by" = "Порядок"; + +"s_order_by_id" = "По id"; +"s_order_by_name" = "По имени"; +"s_order_by_random" = "По случайности"; +"s_order_by_rating" = "По рейтингу"; +"s_order_invert" = "Инвертировать"; + +"s_by_date" = "По дате"; +"s_date_before" = "До"; +"s_date_after" = "После"; + +"s_region" = "Регион"; +"s_city" = "Город"; +"s_native_city" = "Родной город"; + +"s_main" = "Основное"; +"s_age" = "Возраст"; +"s_sex" = "Пол"; +"s_wemen" = "Женский"; +"s_man" = "Мужской"; + +"s_relationship" = "Семейное положение"; +"s_now_on_site" = "cейчас на сайте"; +"s_with_photo" = "с фото"; +"s_only_in_names" = "только в именах"; + +"s_any" = "любой"; \ No newline at end of file