madmaniak
/
fuzzyhome-site
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

automate tips

main
familyfriendlymikey 3 years ago
parent
ee37135643
commit
b3f82e7db4
5 changed files with 194 additions and 209 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      app/api.imba
  2. 157
      app/components/app-bang.imba
  3. 92
      app/components/app-edit.imba
  4. 26
      app/components/app-links.imba
  5. 114
      app/components/app-tips.imba

14
app/api.imba
View File

@ -224,3 +224,17 @@ export default new class api
state.active_bang = link state.active_bang = link
else else
navigate link navigate link
get bang
state.active_bang or config.data.default_bang
get encoded_bang_query
"{bang.url}{window.encodeURIComponent(state.query)}"
def handle_bang
await increment_link_frequency bang
window.location.href = encoded_bang_query
def unset_active_bang
state.active_bang = no
api.sort_links!

157
app/components/app-bang.imba
View File

@ -1,108 +1,95 @@
tag app-bang tag app-bang
def unset_active_bang get tips
state.active_bang = no let tips = []
api.sort_links!
tips.push <>
get bang <.tip
state.active_bang or config.data.default_bang @click=api.handle_bang
@hotkey('return').capture.if(!state.loading)=api.handle_bang
get encoded_bang_query >
"{bang.url}{window.encodeURIComponent(state.query)}" <.tip-hotkey> "Return"
<.tip-content> "Search"
def handle_bang
await api.increment_link_frequency bang tips.push <>
window.location.href = encoded_bang_query <.tip
@click=api.handle_add_link
@hotkey('shift+return').capture.if(!state.loading)=api.handle_add_link
>
<.tip-hotkey> "Shift + Return"
<.tip-content.ellipsis>
<span[ws:pre]> "Create Link "
let sq = state.query.trim!.split /\s+/
if sq.length >= 2
let url = sq.pop!
<span> '"'
<span> sq.join " "
<span[c:blue3 ws:pre]> " {url}"
<span> '"'
else
<span> "\"{sq.join " "}\""
tips.push <>
if state.active_bang
<.tip
@click=api.unset_active_bang
@hotkey('esc').capture.if(!state.loading)=unset_active_bang
>
<.tip-hotkey> "Esc"
<.tip-content> "Back"
else
<.tip.noclick>
<.tip-hotkey> "Paste (If Input Empty)"
<.tip-content> "Instant Search"
tips.push <>
<.tip
@click.if(!state.loading)=api.toggle_effective_names
@hotkey('tab').capture.if(!state.loading)=api.toggle_effective_names
>
<.tip-hotkey> "Tab"
<.tip-content> "Toggle Effective Names"
tips.push <>
<.tip @click.if(!loading)=api.handle_cut>
if api.math_result
<.tip-hotkey> "Cut (Math, If No Selection)"
<.tip-content> "Cut Math Result"
else
<.tip-hotkey> "Cut (If No Selection)"
<.tip-content> "Cut All Text"
if state.active_bang
tips.push <>
<.tip.noclick>
<.tip-hotkey> "Paste (If Input Empty)"
<.tip-content> "Instant Search"
tips
def render def render
<self> <self>
css w:100% d:flex fld:column gap:15px css w:100% d:flex fld:column gap:15px
<app-tips> <app-tips$tips tips=tips>
<.tip-row>
<.tip
@click=handle_bang
@hotkey('return').capture.if(!state.loading)=handle_bang
>
<.tip-hotkey> "Return"
<.tip-content> "Search"
<.tip
@click=api.handle_add_link
@hotkey('shift+return').capture.if(!state.loading)=api.handle_add_link
>
<.tip-hotkey> "Shift + Return"
<.tip-content.ellipsis>
<span[ws:pre]> "Create Link "
let sq = state.query.trim!.split /\s+/
if sq.length >= 2
let url = sq.pop!
<span> '"'
<span> sq.join " "
<span[c:blue3 ws:pre]> " {url}"
<span> '"'
else
<span> "\"{sq.join " "}\""
if state.active_bang
<.tip
@click=unset_active_bang
@hotkey('esc').capture.if(!state.loading)=unset_active_bang
>
<.tip-hotkey> "Esc"
<.tip-content> "Back"
else
<.tip.noclick>
<.tip-hotkey> "Paste (If Input Empty)"
<.tip-content> "Instant Search"
<app-tips-more$tips-more>
<.tip-row>
<.tip
@click.if(!state.loading)=api.toggle_effective_names
@hotkey('tab').capture.if(!state.loading)=api.toggle_effective_names
>
<.tip-hotkey> "Tab"
<.tip-content> "Toggle Effective Names"
<.tip
@click.if(!loading)=api.handle_cut
>
if math_result
<.tip-hotkey> "Cut (Math, If No Selection)"
<.tip-content> "Cut Math Result"
else
<.tip-hotkey> "Cut (If No Selection)"
<.tip-content> "Cut All Text"
if state.active_bang
<.tip.noclick>
<.tip-hotkey> "Paste (If Input Empty)"
<.tip-content> "Instant Search"
else
<.tip.placeholder>
unless $tips-more.active unless $tips.show_more
<.bang.selected@click=handle_bang> <.bang.selected@click=api.handle_bang>
css d:flex fld:row jc:space-between ai:center css d:flex fld:row jc:space-between ai:center
px:16px py:11px rd:5px cursor:pointer c:#FAD4AB px:16px py:11px rd:5px cursor:pointer c:#FAD4AB
<.link-left> <.link-left>
css d:flex fl:1 css d:flex fl:1
<img.link-icon src=bang.icon> <img.link-icon src=api.bang.icon>
css w:20px h:20px mr:10px rd:3px css w:20px h:20px mr:10px rd:3px
<.display-name> encoded_bang_query <.display-name> api.encoded_bang_query
css fs:20px word-break:break-all css fs:20px word-break:break-all
<.link-right> <.link-right>
css d:flex fld:row jc:space-between ai:center css d:flex fld:row jc:space-between ai:center
<.frequency> bang.frequency <.frequency> api.bang.frequency
css fs:15px ml:7px css fs:15px ml:7px

92
app/components/app-edit.imba
View File

@ -34,6 +34,51 @@ tag app-edit
catch e catch e
err "saving link", e err "saving link", e
get tips
let tips = []
tips.push <>
<.tip
@click=handle_delete
@hotkey('shift+backspace').capture.if(!state.loading)=handle_delete
>
<.tip-hotkey> "Shift + Backspace"
<.tip-content> "Delete Link"
tips.push <>
<.tip
@click=save
@hotkey('return').capture.if(!state.loading)=save
>
<.tip-hotkey> "Return"
<.tip-content> "Update Link"
if link.is_bang
tips.push <>
<.tip @click=handle_click_set_default_bang>
<.tip-hotkey> "Click"
<.tip-content> "Set Default Bang"
else
tips.push <>
<.tip
@click=close
@hotkey('esc').capture.if(!state.loading)=close
>
<.tip-hotkey> "Esc"
<.tip-content> "Cancel"
if link.is_bang
tips.push <>
<.tip
@click=close
@hotkey('esc').capture.if(!state.loading)=close
>
<.tip-hotkey> "Esc"
<.tip-content> "Cancel"
tips
def render def render
<self> <self>
@ -42,49 +87,4 @@ tag app-edit
<div> <div>
<input$dn bind=new_link_text> <input$dn bind=new_link_text>
<app-tips> <app-tips tips=tips>
<.tip-row>
<.tip
@click=handle_delete
@hotkey('shift+backspace').capture.if(!state.loading)=handle_delete
>
<.tip-hotkey> "Shift + Backspace"
<.tip-content> "Delete Link"
<.tip
@click=save
@hotkey('return').capture.if(!state.loading)=save
>
<.tip-hotkey> "Return"
<.tip-content> "Update Link"
if link.is_bang
<.tip @click=handle_click_set_default_bang>
<.tip-hotkey> "Click"
<.tip-content> "Set Default Bang"
else
<.tip
@click=close
@hotkey('esc').capture.if(!state.loading)=close
>
<.tip-hotkey> "Esc"
<.tip-content> "Cancel"
if link.is_bang
<app-tips-more>
<.tip-row>
<.tip
@click=close
@hotkey('esc').capture.if(!state.loading)=close
>
<.tip-hotkey> "Esc"
<.tip-content> "Cancel"
<.tip.placeholder>
<.tip.placeholder>

26
app/components/app-links.imba
View File

@ -24,8 +24,8 @@ tag app-links
tips.push <> tips.push <>
<.tip <.tip
@click=handle_shift_return @click=api.handle_add_link
@hotkey('shift+return').capture.if(!state.loading)=handle_shift_return @hotkey('shift+return').capture.if(!state.loading)=api.handle_add_link
> >
<.tip-hotkey> "Shift + Return" <.tip-hotkey> "Shift + Return"
<.tip-content.ellipsis> <.tip-content.ellipsis>
@ -48,12 +48,7 @@ tag app-links
<.tip-hotkey> "Shift + Backspace" <.tip-hotkey> "Shift + Backspace"
<.tip-content> "Edit Link" <.tip-content> "Edit Link"
tips tips.push <>
get tips_more
let tips_more = []
tips_more.push <>
<.tip <.tip
@click.if(!state.loading)=api.toggle_effective_names @click.if(!state.loading)=api.toggle_effective_names
@hotkey('tab').capture.if(!state.loading)=api.toggle_effective_names @hotkey('tab').capture.if(!state.loading)=api.toggle_effective_names
@ -61,7 +56,7 @@ tag app-links
<.tip-hotkey> "Tab" <.tip-hotkey> "Tab"
<.tip-content> "Toggle Effective Names" <.tip-content> "Toggle Effective Names"
tips_more.push <> tips.push <>
<.tip <.tip
@click.if(!state.loading)=refs.settings.open @click.if(!state.loading)=refs.settings.open
@hotkey('shift+tab').capture.if(!state.loading)=refs.settings.open @hotkey('shift+tab').capture.if(!state.loading)=refs.settings.open
@ -69,7 +64,7 @@ tag app-links
<.tip-hotkey> "Shift + Tab" <.tip-hotkey> "Shift + Tab"
<.tip-content> "Toggle Settings" <.tip-content> "Toggle Settings"
tips_more.push <> tips.push <>
<.tip @click.if(!loading)=api.handle_cut> <.tip @click.if(!loading)=api.handle_cut>
if api.math_result if api.math_result
<.tip-hotkey> "Cut (Math, If No Selection)" <.tip-hotkey> "Cut (Math, If No Selection)"
@ -78,7 +73,7 @@ tag app-links
<.tip-hotkey> "Cut (If No Selection)" <.tip-hotkey> "Cut (If No Selection)"
<.tip-content> "Cut All Text" <.tip-content> "Cut All Text"
tips_more.push <> tips.push <>
<.tip.noclick <.tip.noclick
@hotkey('down').capture.if(!state.loading)=api.increment_link_selection_index @hotkey('down').capture.if(!state.loading)=api.increment_link_selection_index
@hotkey('up').capture.if(!state.loading)=api.decrement_link_selection_index @hotkey('up').capture.if(!state.loading)=api.decrement_link_selection_index
@ -86,22 +81,21 @@ tag app-links
<.tip-hotkey> "Up/Down Arrow" <.tip-hotkey> "Up/Down Arrow"
<.tip-content> "Move Selection" <.tip-content> "Move Selection"
tips_more.push <> tips.push <>
<.tip.noclick> <.tip.noclick>
<.tip-hotkey> "Paste (If Input Empty)" <.tip-hotkey> "Paste (If Input Empty)"
<.tip-content> "Instant Search" <.tip-content> "Instant Search"
tips_more tips
def render def render
<self> <self>
css w:100% d:flex fld:column gap:15px ofy:hidden css w:100% d:flex fld:column gap:15px ofy:hidden
<app-tips tips=tips> <app-tips$tips tips=tips>
<app-tips-more$tips-more tips=tips_more>
unless $tips-more.active unless $tips.show_more
<.links> <.links>
css ofy:scroll css ofy:scroll
for link, index in state.sorted_links for link, index in state.sorted_links

114
app/components/app-tips.imba
View File

@ -2,10 +2,28 @@ import { chunk, fill } from 'lodash'
tag app-tips tag app-tips
show_more = no
def toggle
show_more = not show_more
get placeholder
<.tip.placeholder>
def pad arr
let i = arr.length
while i < 3
arr.push placeholder
i += 1
def get_chunks
let chunks = chunk(tips, 3)
pad(chunks[-1])
chunks
css >>> .tip-row css >>> .tip-row
d:flex fld:row w:100% fl:1 d:flex fld:row w:100% fl:1
fs:20px fs:20px fs:14px
fs:14px
jc:end ta:center jc:end ta:center
bg:#20222f c:purple4 bg:#20222f c:purple4
@ -18,10 +36,7 @@ tag app-tips
@last ta:right bd:none rdr:3px @last ta:right bd:none rdr:3px
@hover bg:purple3/3 @hover bg:purple3/3
css >>> .tip.placeholder css >>> .tip.noclick, .tip.placeholder
visibility:hidden
css >>> .tip.noclick
@hover bg:none cursor:auto @hover bg:none cursor:auto
css >>> .tip-hotkey css >>> .tip-hotkey
@ -30,62 +45,37 @@ tag app-tips
css >>> .tip-content css >>> .tip-content
pt:2px fs:14px c:purple3 pt:2px fs:14px c:purple3
<self[d:none]=!config.data.enable_tips> def render
<.tip-row> let chunks = get_chunks!
for tip in tips
<> tip
tag app-tips-more < app-tips
get render? do mounted?
def mount
active = no
imba.commit!
get hidden do !active
toggle = do active = !active
open = do active = yes
close = do active = no
get placeholder
<.tip.placeholder>
def pad arr
p arr
let i = arr.length
while i < 3
arr.push placeholder
i += 1
p arr
get chunks
let chunks = chunk(tips, 3)
pad(chunks[-1])
chunks
<self[d:none]=!config.data.enable_tips>
css d:flex fld:column gap:15px
<@click=toggle>
css w:100% d:flex ja:center c:purple3 rdb:4px cursor:pointer
transition:background 100ms
@hover bg:purple3/3
if active
css rd:0
css svg w:15px
if active
<svg src="../assets/chevron-down.svg">
else
<svg src="../assets/chevron-up.svg">
<.more> <self[d:none]=!config.data.enable_tips>
css d:flex fld:column gap:15px css d:flex fld:column gap:15px
if hidden
css d:none
for row in chunks <.tip-row>
<.tip-row> for tip in chunks[0]
for tip in row <> tip
<> tip
if chunks.length > 1
<@click=toggle>
css w:100% d:flex ja:center c:purple3 rdb:4px cursor:pointer
transition:background 100ms
@hover bg:purple3/3
if show_more
css rd:0
css svg w:15px
if show_more
<svg src="../assets/chevron-down.svg">
else
<svg src="../assets/chevron-up.svg">
<.more>
css d:flex fld:column gap:15px
unless show_more
css d:none
for row in chunks.slice(1)
<.tip-row>
for tip in row
<> tip

Write Preview
Loading…
Cancel
Save