From d0f3fe6771fc23a95296cad611ba61605650006e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= Date: Fri, 30 Jul 2021 17:51:43 +0200 Subject: [PATCH 1/5] Tabbed, paginated search results MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: marcin mikołajczak --- app/soapbox/actions/search.js | Bin 1811 -> 3073 bytes .../compose/components/search_results.js | Bin 2808 -> 3449 bytes .../containers/search_results_container.js | Bin 634 -> 764 bytes .../features/search/components/filter_bar.js | Bin 0 -> 1369 bytes app/soapbox/reducers/search.js | Bin 1526 -> 2050 bytes app/soapbox/reducers/settings.js | Bin 1357 -> 1438 bytes app/styles/components/search.scss | 6 ++---- app/styles/ui.scss | 1 + 8 files changed, 3 insertions(+), 4 deletions(-) create mode 100644 app/soapbox/features/search/components/filter_bar.js diff --git a/app/soapbox/actions/search.js b/app/soapbox/actions/search.js index ee7bc16579074f13b087ebc6b40d102b9597c71a..c974819fc9f1b1d8dfd9c5792c2e48feb64b82b2 100644 GIT binary patch literal 3073 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 ibKEUXuFZeARx|2X!-BjP9$VEgeUyf4M~f diff --git a/app/soapbox/features/compose/containers/search_results_container.js b/app/soapbox/features/compose/containers/search_results_container.js index 046e374ac2df230a2ebc9914d70694d77cc03abe..734612dcee4276e928e35d02b0013375d59c9352 100644 GIT binary patch delta 131 zcmeyx@`rW8R?*Ddg8ZTqg=&S=ih{(vl;G6FqU4N;z0#}@#wJz%YAywZqSTVoqC5o< zbK)(-$()Q9lkFLe*%TCNt+{F^moTOqAZxc$D5)$+Rj{>FNXaZNNGwUt&_I^f0Lf0i H%D5B&Fv2eu delta 36 scmeyv`io`4)`@SGm^G@oCd)AzP7Y)=o7~B0$W*I2`2b`32oXRB@cxebA$&U4w@P3uSleK zcn#M5K*L`gH_+#umsUzbE%0?5UE@}F4a3KoP?$y&!GmoW!zUd8Um0CZQD(X60^WO3 z=g=`6ivoaHvo$bii&`tGgFJ+dsED0zAbBaboinASNBq^%4xUKtshzjF^fTX(Sz}h#OLJY zBu`SUvaX|+ff{FyegM|BeStB}Z~B0hiXxw$wqvx*XC2ht1Qqae$Lw7?L&iKt(P?;9 zRiLynzH>|pJ`4x8FR0)KlK~!3S8~hZ&Mc-o+!ucU#f+I$ literal 0 HcmV?d00001 diff --git a/app/soapbox/reducers/search.js b/app/soapbox/reducers/search.js index 4a0a729a1e51fbc5948b688e6a30b1f86452b0d1..7a44956c252caab732d205ed7d5b46cdf981d3aa 100644 GIT binary patch delta 503 zcmeyy-6Sv}Q(QqI*wrz}*(2UHBEZqlB|bRR+1WKXcw@RhYrTR(VsdhRX(u@ delta 18 ZcmZn?_{KdUb7PY)>*NMDxycXMl>kP62IT+% diff --git a/app/soapbox/reducers/settings.js b/app/soapbox/reducers/settings.js index a409f5905c87b0ba5dea9d0ed779af5c5abe2acd..343a3f9d90bc8c10c1185361897943a01d4c90c5 100644 GIT binary patch delta 46 zcmX@hHIIA3Y{6hx#~^2qcsEa<5Z9piVAqg|dSWbzMadZ(`?oT)faEsovB)z50BJQ2 Ac>n+a delta 15 XcmbQoeU@v&?2VUJGH;&B!pR5#ICcgx diff --git a/app/styles/components/search.scss b/app/styles/components/search.scss index 6933c60067..ffc46b2b0e 100644 --- a/app/styles/components/search.scss +++ b/app/styles/components/search.scss @@ -68,8 +68,6 @@ } .search-results__section { - margin-bottom: 5px; - h5 { background: var(--accent-color--faint); border-bottom: 1px solid var(--brand-color--faint); @@ -86,8 +84,8 @@ } } - .account:last-child, - & > div:last-child .status { + &:not(.has-more) .account:last-child, + &:not(.has-more) > div:last-child .status { border-bottom: 0; } } diff --git a/app/styles/ui.scss b/app/styles/ui.scss index 5a6b3e5543..86cf3361da 100644 --- a/app/styles/ui.scss +++ b/app/styles/ui.scss @@ -608,6 +608,7 @@ } .notification__filter-bar, +.search__filter-bar, .account__section-headline { border-bottom: 1px solid var(--brand-color--faint); cursor: default; From e7d122dc95868dac32ca0f13031f4c3a87a3472f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= Date: Fri, 30 Jul 2021 21:49:28 +0200 Subject: [PATCH 2/5] No more items if there are less than 20 results MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: marcin mikołajczak --- app/soapbox/reducers/search.js | Bin 2050 -> 2058 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/reducers/search.js b/app/soapbox/reducers/search.js index 7a44956c252caab732d205ed7d5b46cdf981d3aa..c9ad6bfa8a6229eb9ffb2e89e83fb9b636dbab67 100644 GIT binary patch delta 39 icmZn?=n~k##Kvr^U^JPT%?eE0LFr1it6;uA`(^;K#tD}I delta 31 gcmeAYXcE}K#Kx#FnU&27NIHSZdbX=Tb~yWH0CY45=Kufz From 29d68dac06f9b3bd8590a27d00142235b1a58561 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= Date: Fri, 30 Jul 2021 21:54:56 +0200 Subject: [PATCH 3/5] Show 'Over X results' if more results are available MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: marcin mikołajczak --- .../compose/components/search_results.js | Bin 3449 -> 3674 bytes app/soapbox/locales/pl.json | 1 + 2 files changed, 1 insertion(+) diff --git a/app/soapbox/features/compose/components/search_results.js b/app/soapbox/features/compose/components/search_results.js index c6d990734692ca3715c8882dc900f0cfe7820ffe..45de8036da6e00e741808d7fca2c4fbb7bec3c16 100644 GIT binary patch delta 106 zcmewrl4Ry`7gJ&f*w#ZJ{Ksfu8@+NmROoo;+tAr ioS2?!tL|TxTBI=9iYJyGVwM$9!z^Y6h1$t|Jg)&!WgmP1 delta 19 bcmca5^HXZWKkmsYJX(|g^5jph;C%!DS}h2* diff --git a/app/soapbox/locales/pl.json b/app/soapbox/locales/pl.json index b968895d73..12611d8b4e 100644 --- a/app/soapbox/locales/pl.json +++ b/app/soapbox/locales/pl.json @@ -616,6 +616,7 @@ "search_results.statuses": "Wpisy", "search_results.top": "Góra", "search_results.total": "{count, number} {count, plural, one {wynik} few {wyniki} many {wyników} more {wyników}}", + "search_results.total.has_more": "{count, number} Ponad {count, plural, one {wynik} few {wyniki} many {wyników} more {wyników}}", "security.codes.fail": "Nie udało się uzyskać zapasowych kodów", "security.confirm.fail": "Nieprawidłowy kod lub hasło. Spróbuj ponownie.", "security.delete_account.fail": "Nie udało się usunąć konta.", From 055b001f74d8ecf93c2adcc34be118fd7ffb449b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= Date: Fri, 30 Jul 2021 23:05:54 +0200 Subject: [PATCH 4/5] Works fine, I think MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: marcin mikołajczak --- .../compose/components/search_results.js | Bin 3674 -> 2834 bytes app/soapbox/features/search/index.js | Bin 474 -> 891 bytes app/styles/components/search.scss | 15 +++++++++++++++ 3 files changed, 15 insertions(+) diff --git a/app/soapbox/features/compose/components/search_results.js b/app/soapbox/features/compose/components/search_results.js index 45de8036da6e00e741808d7fca2c4fbb7bec3c16..5e8b31b8bdd184c08484738d27f2c429f77d1938 100644 GIT binary patch delta 118 zcmca5Gf8Yh)5g6_jFVq8KAn7r>Gb4t%v&}uVM%11EWy^W`3T!&#>q$6#3##haBN=0 zQ2^#_4&_o|WVD-H&#S6Xnv|PaQj(gYV6RY|nvbW3Nrp`U46*6g?;&!({iRJ2Jbo%*>{-%MkGB zNgU|Ge?YI2e?au;#dEKE_g`=}iD?@_aW2FA-h1Es-jBC8PH(+=wN=8NkSWy~;{#NR z9%2(%_5vflpJ@&T22!LzB+^LVWe)l{TJ>)4MVJ@$UC z-algsEW7k|9UQmj+weq+{OQXaRVeyZExWn$Wy57D!7=3G@J@zD4=@gV&$V}+Kaa9o{)X3{Jo8V^pilJ*`cZ%A z*$@6TdwTh%eebWie{J0BB}ikGWG8^d>r6XkahE8hGD-*x*a+k2EY=CM&PSH#vH%jQ z4ur%D7{D%cmZuHBxyMn`lc)-=Rj7rgJainr)R7Q~aX_78zMw97JVXiQw9O`DMcPMc z7Iw}HNqH08GN7C>8W1|EQsxDWAuy!8K-Dcvn2l>}%*BSP8EpSW@Uq@NW&W4KNB@?% ptk5jR+iAsYxD!|sY+gm~4hrMh;aDD=T%Y=?b{cJ$VS>N}zW}P6{u2NI diff --git a/app/soapbox/features/search/index.js b/app/soapbox/features/search/index.js index 63ea292a3742c0fd5c8d42dbe02cc31011fe036b..22a898d7831c835312838db12e678d90b0d0a244 100644 GIT binary patch literal 891 zcmbtT&2oY;5We#idjn?_?pnNfX%FpmZ0}5jMbkn;lhE2>c=v8d5XECp#^w9l-GtYT zR0j6Qas#E3HH6BZ!%e{5rw$4%xxi=CnjKLufr}5!&66+{^w*pfr_w}xRkC^iZBTnm zL;qLC7ADM2R&6aFkrk*sOiR`ruZ^%@B+DTy;<(umg&T{2{Ir4E4-(SZWTP$suuXDtTtf%ESVQP~ zk6q$$X(^19{Wb{TrVv8E4En_;@FuQG77^(Tn_57+g@_y;3jPgw#k785HKyJHoWrW2 z9fw1PHm;3qlaL)sW9!VXIx5EvoUHk_8t2c7d?>RU^GiqDE5OY z%WM|q!`$Z{QC!&N7fgL#fiLOrR_Q$nkdUnpFdlu)&e1g=+gs~yaSC=nwy`x_?shB> e_A$g<@A0eU3JY2TvGF{-E5EI)Clfhca`*$bnlpd^ delta 52 zcmey(c8hs}(!@R6xq?#@i;^=GY!x&nzhd;6+{QFTJhh@Azo Date: Fri, 30 Jul 2021 23:22:55 +0200 Subject: [PATCH 5/5] Lint styles MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: marcin mikołajczak --- app/styles/components/search.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/styles/components/search.scss b/app/styles/components/search.scss index a3416438b8..84d611fd8e 100644 --- a/app/styles/components/search.scss +++ b/app/styles/components/search.scss @@ -169,7 +169,6 @@ @include search-popout; } - .search__filter-bar:last-child { border-bottom: none; -} \ No newline at end of file +}