From 66d5b90ea1a9058c5335935e56b06e8f52574f44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Cocchi?= Date: Thu, 17 Dec 2020 01:00:22 +0100 Subject: [PATCH 1/3] Re-format CSS for readability in PR --- web/style/index.css | 182 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 181 insertions(+), 1 deletion(-) diff --git a/web/style/index.css b/web/style/index.css index b7b2aec..10312b1 100644 --- a/web/style/index.css +++ b/web/style/index.css @@ -1 +1,181 @@ -*{font-family:sans-serif}body{margin:0}h1{font-size:1rem}:root{--stickers-per-row: 4;--sticker-size: calc(100vw / var(--stickers-per-row))}main{color:var(--text-color)}main.spinner{margin-top:5rem}main.error,main.empty{margin:2rem}main.empty{text-align:center}main.has-content{position:fixed;top:0;left:0;right:0;bottom:0;display:grid;grid-template-rows:calc(12vw + 2px) auto}main.theme-light{--highlight-color: #eee;--text-color: black;background-color:white}main.theme-dark{--highlight-color: #444;--text-color: white;background-color:#22262e}main.theme-black{--highlight-color: #222;--text-color: white;background-color:black}.icon{width:100%;height:100%;background-color:var(--text-color);mask-size:contain;-webkit-mask-size:contain;mask-image:var(--icon-image);-webkit-mask-image:var(--icon-image)}.icon.icon-settings{--icon-image: url(../res/settings.svg)}.icon.icon-recent{--icon-image: url(../res/recent.svg)}nav{display:flex;overflow-x:auto}nav>a{border-bottom:2px solid transparent}nav>a.visible{border-bottom-color:green}nav>a>div.sticker{width:12vw;height:12vw}div.pack-list,nav{scrollbar-width:none}div.pack-list::-webkit-scrollbar,nav::-webkit-scrollbar{display:none}div.pack-list{overflow-y:auto}div.pack-list.ios-safari-hack{position:fixed;top:calc(12vw + 2px);bottom:0;left:0;right:0;-webkit-overflow-scrolling:touch}section.stickerpack{margin-top:.75rem}section.stickerpack>div.sticker-list{display:flex;flex-wrap:wrap}section.stickerpack>h1{margin:0 0 0 .75rem}div.sticker{display:flex;padding:4px;cursor:pointer;position:relative;width:var(--sticker-size);height:var(--sticker-size);box-sizing:border-box}div.sticker:hover{background-color:var(--highlight-color)}div.sticker>img{display:none;width:100%;object-fit:contain}div.sticker>img.visible{display:initial}div.sticker>.icon{width:70%;height:70%;margin:15%}div.settings-list{display:flex;flex-direction:column}div.settings-list>*{margin:.5rem}div.settings-list button{padding:.5rem;border-radius:.25rem}div.settings-list input{width:100%} +* { + font-family: sans-serif +} + +body { + margin: 0 +} + +h1 { + font-size: 1rem +} + +:root { + --stickers-per-row: 4; + --sticker-size: calc(100vw / var(--stickers-per-row)) +} + +main { + color: var(--text-color) +} + +main.spinner { + margin-top: 5rem +} + +main.error, +main.empty { + margin: 2rem +} + +main.empty { + text-align: center +} + +main.has-content { + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; + display: grid; + grid-template-rows: calc(12vw + 2px) auto +} + +main.theme-light { + --highlight-color: #eee; + --text-color: black; + background-color: white +} + +main.theme-dark { + --highlight-color: #444; + --text-color: white; + background-color: #22262e +} + +main.theme-black { + --highlight-color: #222; + --text-color: white; + background-color: black +} + +.icon { + width: 100%; + height: 100%; + background-color: var(--text-color); + mask-size: contain; + -webkit-mask-size: contain; + mask-image: var(--icon-image); + -webkit-mask-image: var(--icon-image) +} + +.icon.icon-settings { + --icon-image: url(../res/settings.svg) +} + +.icon.icon-recent { + --icon-image: url(../res/recent.svg) +} + +nav { + display: flex; + overflow-x: auto +} + +nav>a { + border-bottom: 2px solid transparent +} + +nav>a.visible { + border-bottom-color: green +} + +nav>a>div.sticker { + width: 12vw; + height: 12vw +} + +div.pack-list, +nav { + scrollbar-width: none +} + +div.pack-list::-webkit-scrollbar, +nav::-webkit-scrollbar { + display: none +} + +div.pack-list { + overflow-y: auto +} + +div.pack-list.ios-safari-hack { + position: fixed; + top: calc(12vw + 2px); + bottom: 0; + left: 0; + right: 0; + -webkit-overflow-scrolling: touch +} + +section.stickerpack { + margin-top: .75rem +} + +section.stickerpack>div.sticker-list { + display: flex; + flex-wrap: wrap +} + +section.stickerpack>h1 { + margin: 0 0 0 .75rem +} + +div.sticker { + display: flex; + padding: 4px; + cursor: pointer; + position: relative; + width: var(--sticker-size); + height: var(--sticker-size); + box-sizing: border-box +} + +div.sticker:hover { + background-color: var(--highlight-color) +} + +div.sticker>img { + display: none; + width: 100%; + object-fit: contain +} + +div.sticker>img.visible { + display: initial +} + +div.sticker>.icon { + width: 70%; + height: 70%; + margin: 15% +} + +div.settings-list { + display: flex; + flex-direction: column +} + +div.settings-list>* { + margin: .5rem +} + +div.settings-list button { + padding: .5rem; + border-radius: .25rem +} + +div.settings-list input { + width: 100% +} From add27513fe3e5383bbc98cd64d694e05ff38ce40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Cocchi?= Date: Thu, 17 Dec 2020 01:01:32 +0100 Subject: [PATCH 2/3] Implement stickers search --- web/res/search.svg | 1 + web/src/index.js | 49 +++++++++++++++++++++++++++++++++++++++---- web/src/search-box.js | 26 +++++++++++++++++++++++ web/style/index.css | 43 +++++++++++++++++++++++++++++++++++-- 4 files changed, 113 insertions(+), 6 deletions(-) create mode 100644 web/res/search.svg create mode 100644 web/src/search-box.js diff --git a/web/res/search.svg b/web/res/search.svg new file mode 100644 index 0000000..7be3396 --- /dev/null +++ b/web/res/search.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/web/src/index.js b/web/src/index.js index 5de4bd5..82a3e25 100644 --- a/web/src/index.js +++ b/web/src/index.js @@ -15,6 +15,7 @@ // along with this program. If not, see . import { html, render, Component } from "../lib/htm/preact.js" import { Spinner } from "./spinner.js" +import { SearchBox } from "./search-box.js" import * as widgetAPI from "./widget-api.js" import * as frequent from "./frequently-used.js" @@ -37,12 +38,20 @@ export const parseQuery = str => Object.fromEntries( const supportedThemes = ["light", "dark", "black"] +const defaultState = { + packs: [], + filtering: { + searchTerm: "", + packs: [], + }, +} + class App extends Component { constructor(props) { super(props) this.defaultTheme = parseQuery(location.search.substr(1)).theme this.state = { - packs: [], + packs: defaultState.packs, loading: true, error: null, stickersPerRow: parseInt(localStorage.mauStickersPerRow || "4"), @@ -53,6 +62,7 @@ class App extends Component { stickerIDs: frequent.get(), stickers: [], }, + filtering: defaultState.filtering, } if (!supportedThemes.includes(this.state.theme)) { this.state.theme = "light" @@ -65,6 +75,7 @@ class App extends Component { this.imageObserver = null this.packListRef = null this.navRef = null + this.searchStickers = this.searchStickers.bind(this) this.sendSticker = this.sendSticker.bind(this) this.navScroll = this.navScroll.bind(this) this.reloadPacks = this.reloadPacks.bind(this) @@ -89,6 +100,28 @@ class App extends Component { localStorage.mauFrequentlyUsedStickerCache = JSON.stringify(stickers.map(sticker => [sticker.id, sticker])) } + searchStickers(e) { + const sanitizeString = s => s.toLowerCase().trim() + const searchTerm = sanitizeString(e.target.value) + + const allPacks = [this.state.frequentlyUsed, ...this.state.packs] + const packsWithFilteredStickers = allPacks.map(pack => ({ + ...pack, + stickers: pack.stickers.filter(sticker => + sanitizeString(sticker.body).includes(searchTerm) || + sanitizeString(sticker.id).includes(searchTerm) + ), + })) + + this.setState({ + filtering: { + ...this.state.filtering, + searchTerm, + packs: packsWithFilteredStickers.filter(({ stickers }) => !!stickers.length), + }, + }) + } + setStickersPerRow(val) { localStorage.mauStickersPerRow = val document.documentElement.style.setProperty("--stickers-per-row", localStorage.mauStickersPerRow) @@ -111,7 +144,10 @@ class App extends Component { reloadPacks() { this.imageObserver.disconnect() this.sectionObserver.disconnect() - this.setState({ packs: [] }) + this.setState({ + packs: defaultState.packs, + filtering: defaultState.filtering, + }) this._loadPacks(true) } @@ -225,6 +261,9 @@ class App extends Component { render() { const theme = `theme-${this.state.theme}` + const filterActive = !!this.state.filtering.searchTerm + const packs = filterActive ? this.state.filtering.packs : [this.state.frequentlyUsed, ...this.state.packs] + if (this.state.loading) { return html`
<${Spinner} size=${80} green />
` } else if (this.state.error) { @@ -235,15 +274,17 @@ class App extends Component { } else if (this.state.packs.length === 0) { return html`

No packs found 😿

` } + return html`
+ <${SearchBox} onKeyUp=${this.searchStickers} />
this.packListRef = elem}> - <${Pack} pack=${this.state.frequentlyUsed} send=${this.sendSticker} /> - ${this.state.packs.map(pack => html`<${Pack} id=${pack.id} pack=${pack} send=${this.sendSticker} />`)} + ${filterActive && packs.length === 0 ? html`

No stickers match your search

` : null} + ${packs.map(pack => html`<${Pack} id=${pack.id} pack=${pack} send=${this.sendSticker} />`)} <${Settings} app=${this}/>
` diff --git a/web/src/search-box.js b/web/src/search-box.js new file mode 100644 index 0000000..ba2ed5d --- /dev/null +++ b/web/src/search-box.js @@ -0,0 +1,26 @@ +// maunium-stickerpicker - A fast and simple Matrix sticker picker widget. +// Copyright (C) 2020 Tulir Asokan +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . +import { html } from "../lib/htm/preact.js" + +export const SearchBox = ({ onKeyUp, placeholder = 'Find stickers' }) => { + const component = html` +
+ + +
+ ` + return component +} diff --git a/web/style/index.css b/web/style/index.css index 10312b1..9724105 100644 --- a/web/style/index.css +++ b/web/style/index.css @@ -32,6 +32,11 @@ main.empty { text-align: center } +div.search-empty { + margin: 1rem; + text-align: center +} + main.has-content { position: fixed; top: 0; @@ -39,23 +44,26 @@ main.has-content { right: 0; bottom: 0; display: grid; - grid-template-rows: calc(12vw + 2px) auto + grid-template-rows: calc(12vw + 2px) min-content auto } main.theme-light { --highlight-color: #eee; + --search-box-color: var(--highlight-color); --text-color: black; background-color: white } main.theme-dark { --highlight-color: #444; + --search-box-color: #383e4b; --text-color: white; background-color: #22262e } main.theme-black { --highlight-color: #222; + --search-box-color: var(--highlight-color); --text-color: white; background-color: black } @@ -78,6 +86,10 @@ main.theme-black { --icon-image: url(../res/recent.svg) } +.icon.icon-search { + --icon-image: url(../res/search.svg) +} + nav { display: flex; overflow-x: auto @@ -112,7 +124,7 @@ div.pack-list { div.pack-list.ios-safari-hack { position: fixed; - top: calc(12vw + 2px); + top: calc(12vw + 2 * .7rem + 2 * 1rem + 2px); bottom: 0; left: 0; right: 0; @@ -162,6 +174,33 @@ div.sticker>.icon { margin: 15% } +div.search-box { + position: relative; + display: flex; +} + +div.search-box>input[type="text"] { + flex-grow: 1; + background-color: var(--search-box-color); + outline: none; + border: none; + border-radius: .25rem; + padding: .7rem 1.8rem .7rem .7rem; + margin: .5rem; + font-size: 1rem; + color: var(--text-color); +} + +div.search-box>span.icon { + display: flex; + position: absolute; + right: 1rem; + top: calc(50% - .5rem); + width: 1rem; + height: 1rem; + box-sizing: border-box; +} + div.settings-list { display: flex; flex-direction: column From 9350d5f27b93f0097510ec7a7fc20bf812103400 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Cocchi?= Date: Thu, 17 Dec 2020 09:22:40 +0100 Subject: [PATCH 3/3] Update sass style file --- web/style/index.css | 221 +------------------------------------------ web/style/index.sass | 47 ++++++++- 2 files changed, 45 insertions(+), 223 deletions(-) diff --git a/web/style/index.css b/web/style/index.css index 9724105..635a569 100644 --- a/web/style/index.css +++ b/web/style/index.css @@ -1,220 +1 @@ -* { - font-family: sans-serif -} - -body { - margin: 0 -} - -h1 { - font-size: 1rem -} - -:root { - --stickers-per-row: 4; - --sticker-size: calc(100vw / var(--stickers-per-row)) -} - -main { - color: var(--text-color) -} - -main.spinner { - margin-top: 5rem -} - -main.error, -main.empty { - margin: 2rem -} - -main.empty { - text-align: center -} - -div.search-empty { - margin: 1rem; - text-align: center -} - -main.has-content { - position: fixed; - top: 0; - left: 0; - right: 0; - bottom: 0; - display: grid; - grid-template-rows: calc(12vw + 2px) min-content auto -} - -main.theme-light { - --highlight-color: #eee; - --search-box-color: var(--highlight-color); - --text-color: black; - background-color: white -} - -main.theme-dark { - --highlight-color: #444; - --search-box-color: #383e4b; - --text-color: white; - background-color: #22262e -} - -main.theme-black { - --highlight-color: #222; - --search-box-color: var(--highlight-color); - --text-color: white; - background-color: black -} - -.icon { - width: 100%; - height: 100%; - background-color: var(--text-color); - mask-size: contain; - -webkit-mask-size: contain; - mask-image: var(--icon-image); - -webkit-mask-image: var(--icon-image) -} - -.icon.icon-settings { - --icon-image: url(../res/settings.svg) -} - -.icon.icon-recent { - --icon-image: url(../res/recent.svg) -} - -.icon.icon-search { - --icon-image: url(../res/search.svg) -} - -nav { - display: flex; - overflow-x: auto -} - -nav>a { - border-bottom: 2px solid transparent -} - -nav>a.visible { - border-bottom-color: green -} - -nav>a>div.sticker { - width: 12vw; - height: 12vw -} - -div.pack-list, -nav { - scrollbar-width: none -} - -div.pack-list::-webkit-scrollbar, -nav::-webkit-scrollbar { - display: none -} - -div.pack-list { - overflow-y: auto -} - -div.pack-list.ios-safari-hack { - position: fixed; - top: calc(12vw + 2 * .7rem + 2 * 1rem + 2px); - bottom: 0; - left: 0; - right: 0; - -webkit-overflow-scrolling: touch -} - -section.stickerpack { - margin-top: .75rem -} - -section.stickerpack>div.sticker-list { - display: flex; - flex-wrap: wrap -} - -section.stickerpack>h1 { - margin: 0 0 0 .75rem -} - -div.sticker { - display: flex; - padding: 4px; - cursor: pointer; - position: relative; - width: var(--sticker-size); - height: var(--sticker-size); - box-sizing: border-box -} - -div.sticker:hover { - background-color: var(--highlight-color) -} - -div.sticker>img { - display: none; - width: 100%; - object-fit: contain -} - -div.sticker>img.visible { - display: initial -} - -div.sticker>.icon { - width: 70%; - height: 70%; - margin: 15% -} - -div.search-box { - position: relative; - display: flex; -} - -div.search-box>input[type="text"] { - flex-grow: 1; - background-color: var(--search-box-color); - outline: none; - border: none; - border-radius: .25rem; - padding: .7rem 1.8rem .7rem .7rem; - margin: .5rem; - font-size: 1rem; - color: var(--text-color); -} - -div.search-box>span.icon { - display: flex; - position: absolute; - right: 1rem; - top: calc(50% - .5rem); - width: 1rem; - height: 1rem; - box-sizing: border-box; -} - -div.settings-list { - display: flex; - flex-direction: column -} - -div.settings-list>* { - margin: .5rem -} - -div.settings-list button { - padding: .5rem; - border-radius: .25rem -} - -div.settings-list input { - width: 100% -} +*{font-family:sans-serif}body{margin:0}h1{font-size:1rem}:root{--stickers-per-row: 4;--sticker-size: calc(100vw / var(--stickers-per-row))}main{color:var(--text-color)}main.spinner{margin-top:5rem}main.error,main.empty{margin:2rem}main.empty{text-align:center}main.has-content{position:fixed;top:0;left:0;right:0;bottom:0;display:grid;grid-template-rows:calc(12vw + 2px) min-content auto}main.theme-light{--highlight-color: #eee;--search-box-color: var(--highlight-color);--text-color: black;background-color:white}main.theme-dark{--highlight-color: #444;--search-box-color: #383e4b;--text-color: white;background-color:#22262e}main.theme-black{--highlight-color: #222;--search-box-color: var(--highlight-color);--text-color: white;background-color:black}.icon{width:100%;height:100%;background-color:var(--text-color);mask-size:contain;-webkit-mask-size:contain;mask-image:var(--icon-image);-webkit-mask-image:var(--icon-image)}.icon.icon-settings{--icon-image: url(../res/settings.svg)}.icon.icon-recent{--icon-image: url(../res/recent.svg)}.icon.icon.icon-search{--icon-image: url(../res/search.svg)}nav{display:flex;overflow-x:auto}nav>a{border-bottom:2px solid transparent}nav>a.visible{border-bottom-color:green}nav>a>div.sticker{width:12vw;height:12vw}div.pack-list,nav{scrollbar-width:none}div.pack-list::-webkit-scrollbar,nav::-webkit-scrollbar{display:none}div.pack-list{overflow-y:auto}div.pack-list.ios-safari-hack{position:fixed;top:calc(calc(12vw + 2px) + calc(2 * .7rem + 2 * .5rem + 1rem));bottom:0;left:0;right:0;-webkit-overflow-scrolling:touch}div.search-empty{margin:1.2rem;text-align:center}section.stickerpack{margin-top:.75rem}section.stickerpack>div.sticker-list{display:flex;flex-wrap:wrap}section.stickerpack>h1{margin:0 0 0 .75rem}div.sticker{display:flex;padding:4px;cursor:pointer;position:relative;width:var(--sticker-size);height:var(--sticker-size);box-sizing:border-box}div.sticker:hover{background-color:var(--highlight-color)}div.sticker>img{display:none;width:100%;object-fit:contain}div.sticker>img.visible{display:initial}div.sticker>.icon{width:70%;height:70%;margin:15%}div.search-box{position:relative;display:flex}div.search-box>input[type="text"]{flex-grow:1;background-color:var(--search-box-color);outline:none;border:none;border-radius:.25rem;height:1rem;padding:.7rem;padding-right:calc(1rem + .7rem);margin:.5rem;font-size:1rem;color:var(--text-color)}div.search-box>span.icon{display:flex;position:absolute;top:calc(50% - 1rem / 2);right:1rem;width:1rem;height:1rem;box-sizing:border-box}div.settings-list{display:flex;flex-direction:column}div.settings-list>*{margin:.5rem}div.settings-list button{padding:.5rem;border-radius:.25rem}div.settings-list input{width:100%} diff --git a/web/style/index.sass b/web/style/index.sass index 2b61292..c079f65 100644 --- a/web/style/index.sass +++ b/web/style/index.sass @@ -32,6 +32,12 @@ $nav-bottom-highlight: 2px $nav-height: calc(#{$nav-sticker-size} + #{$nav-bottom-highlight}) $nav-height-inverse: calc(-#{$nav-sticker-size} - #{$nav-bottom-highlight}) +$search-box-icon-size: 1rem +$search-box-input-height: 1rem +$search-box-input-padding: .7rem +$search-box-input-margin: .5rem +$search-box-height: calc(2 * #{$search-box-input-padding} + 2 * #{$search-box-input-margin} + #{$search-box-input-height}) + main color: var(--text-color) @@ -50,22 +56,24 @@ main left: 0 right: 0 bottom: 0 - display: grid - grid-template-rows: $nav-height auto + grid-template-rows: $nav-height min-content auto main.theme-light --highlight-color: #eee + --search-box-color: var(--highlight-color) --text-color: black background-color: white main.theme-dark --highlight-color: #444 + --search-box-color: #383e4b --text-color: white background-color: #22262e main.theme-black --highlight-color: #222 + --search-box-color: var(--highlight-color) --text-color: white background-color: black @@ -84,6 +92,9 @@ main.theme-black &.icon-recent --icon-image: url(../res/recent.svg) + &.icon.icon-search + --icon-image: url(../res/search.svg) + nav display: flex overflow-x: auto @@ -109,12 +120,16 @@ div.pack-list div.pack-list.ios-safari-hack position: fixed - top: $nav-height + top: calc(#{$nav-height} + #{$search-box-height}) bottom: 0 left: 0 right: 0 -webkit-overflow-scrolling: touch +div.search-empty + margin: 1.2rem + text-align: center + section.stickerpack margin-top: .75rem @@ -150,6 +165,32 @@ div.sticker height: 70% margin: 15% +div.search-box + position: relative + display: flex + + >input[type="text"] + flex-grow: 1 + background-color: var(--search-box-color) + outline: none + border: none + border-radius: .25rem + height: $search-box-input-height + padding: $search-box-input-padding + padding-right: calc(#{$search-box-icon-size} + #{$search-box-input-padding}) + margin: $search-box-input-margin + font-size: 1rem + color: var(--text-color) + + >span.icon + display: flex + position: absolute + top: calc(50% - #{$search-box-icon-size} / 2) + right: $search-box-icon-size + width: $search-box-icon-size + height: $search-box-icon-size + box-sizing: border-box + div.settings-list display: flex flex-direction: column