From d8e22509aac8858e1af5c1418b7f9b1b2991a4f8 Mon Sep 17 00:00:00 2001 From: familyfriendlymikey Date: Thu, 1 Sep 2022 16:22:41 -0400 Subject: [PATCH] refactor --- app/api.imba | 14 +- app/client.imba | 101 +--------- app/components/app-links.imba | 308 ++++++++++++++++++++----------- app/components/app-settings.imba | 17 +- app/config.imba | 7 +- 5 files changed, 232 insertions(+), 215 deletions(-) diff --git a/app/api.imba b/app/api.imba index 2c0ae0f..c91735d 100644 --- a/app/api.imba +++ b/app/api.imba @@ -1,9 +1,14 @@ +let p = console.log + import db from './db' import state from './state' -import { config, save_config } from './config' + +import config from './config' +p config import { omit, orderBy } from 'lodash' import { parse_url } from './utils' import { nanoid } from 'nanoid' +import fzi from 'fzi' export default new class api @@ -69,7 +74,7 @@ export default new class api def sort_links if state.query.trim!.length <= 0 return state.sorted_links = orderBy(state.links, ['is_pinned', 'frequency'], ['desc', 'desc']) - if config.enable_effective_names + if config.data.enable_effective_names return state.sorted_links = fzi state.links, state.query state.sorted_links = fzi state.links, state.query, "display_name" @@ -115,6 +120,7 @@ export default new class api reader.readAsDataURL(blob) def toggle_effective_names - config.enable_effective_names = !config.enable_effective_names - save_config! + config.data.enable_effective_names = !config.data.enable_effective_names + config.save! + sort_links! diff --git a/app/client.imba b/app/client.imba index 8f13926..f56a668 100644 --- a/app/client.imba +++ b/app/client.imba @@ -8,7 +8,6 @@ let p = console.log # import sw from './sw.imba?serviceworker' # navigator..serviceWorker..register(sw).then! do |reg| reg.update! -import fzi from 'fzi' import download from 'downloadjs' import { nanoid } from 'nanoid' import { evaluate as eval_math } from 'mathjs' @@ -18,7 +17,7 @@ let version = pkg.version import db from './db' import state from './state' import api from './api' -import { config, save_config } from './config' +import config from './config' import app-community-links from './components/app-community-links' import app-settings from './components/app-settings' @@ -36,6 +35,8 @@ global._fuzzyhome_delete_everything = do |prompt=yes| delete localStorage.fuzzyhome_visited location.reload! +let refs = {} + extend tag element get state state @@ -45,6 +46,8 @@ extend tag element config get p console.log + get refs + refs tag app @@ -53,6 +56,9 @@ tag app get render? do mounted? def mount + refs.settings = $as + refs.edit = $ae + refs.community-links = $acl unless global.localStorage.fuzzyhome_visited await add_initial_links! global.localStorage.fuzzyhome_visited = yes @@ -135,93 +141,6 @@ tag app link_text += " {link.url}" link_text - def handle_edit link - prior_query = state.query - editing_link = link - state.query = construct_link_text(link) - - def make_edit link, new_link_text - def edit_link - try - await update_link link, new_link_text - catch e - return err "editing link", e - state.loading = yes - await edit_link! - state.loading = no - - def handle_click_link link - if link.is_bang - state.query = '' - bang = link - else - navigate link - - def handle_bang - await increment_link_frequency active_bang - window.location.href = encoded_bang_query - - def handle_click_bang - handle_bang! - - def navigate link - await increment_link_frequency link - window.location.href = link.url - - def handle_return - return if editing_link - if bang or state.sorted_links.length < 1 - return handle_bang! - let link = selected_link - if link.is_bang - state.query = '' - bang = link - else - navigate link - - def handle_del - if state.query.length < 1 - bang = no - sort_links! - - def handle_click_delete link - return unless window.confirm "Do you really want to delete {link..display_name}?" - handle_delete link - - def handle_click_edit link - handle_edit link - - def handle_click_pin link - api.pin_link link - - def handle_shift_backspace - if editing_link - await handle_delete editing_link - else - return unless state.sorted_links.length > 0 - handle_edit selected_link - - def handle_shift_return - def go - if viewing_community_links - try - await add_community_link selected_link - catch e - err "adding community link", e - elif editing_link - try - await update_link editing_link, state.query - catch e - err "updating link", e - else - handle_add! - state.loading = yes - await go! - editing_link = no - state.query = '' - sort_links! - state.loading = no - def handle_esc if editing_link editing_link = no @@ -235,11 +154,11 @@ tag app state.links.some! do |{name}| new_name is name def handle_paste e - return unless config.enable_search_on_paste + return unless config.data.enable_search_on_paste return if state.query.length > 0 global.setTimeout(&, 0) do return if math_result isnt no - bang ||= config.default_bang + bang ||= config.data.default_bang handle_bang! def handle_click_copy s diff --git a/app/components/app-links.imba b/app/components/app-links.imba index 189b211..bd3d6a1 100644 --- a/app/components/app-links.imba +++ b/app/components/app-links.imba @@ -3,6 +3,10 @@ tag app-links selection_index = 0 bang = no + def mount + p document + $links-input.focus! + def increment_selection_index selection_index = Math.min(state.sorted_links.length - 1, selection_index + 1) @@ -10,14 +14,11 @@ tag app-links selection_index = Math.max(0, selection_index - 1) get active_bang - return bang or config.default_bang + return bang or config.data.default_bang get encoded_bang_query "{active_bang.url}{window.encodeURIComponent(state.query)}" - def mount - $links-input.focus! - get math_result try let result = Number(eval_math state.query) @@ -29,11 +30,101 @@ tag app-links def handle_input selection_index = 0 - sort_links! + api.sort_links! + + def handle_edit link + prior_query = state.query + editing_link = link + state.query = construct_link_text(link) + + def make_edit link, new_link_text + def edit_link + try + await update_link link, new_link_text + catch e + return err "editing link", e + state.loading = yes + await edit_link! + state.loading = no + + def handle_click_link link + if link.is_bang + state.query = '' + bang = link + else + navigate link + + def handle_bang + await increment_link_frequency active_bang + window.location.href = encoded_bang_query + + def handle_click_bang + handle_bang! + + def navigate link + await increment_link_frequency link + window.location.href = link.url + + def handle_return + return if editing_link + if bang or state.sorted_links.length < 1 + return handle_bang! + let link = selected_link + if link.is_bang + state.query = '' + bang = link + else + navigate link + + def handle_del + if state.query.length < 1 + bang = no + api.sort_links! + + def handle_click_delete link + return unless window.confirm "Do you really want to delete {link..display_name}?" + handle_delete link + + def handle_click_edit link + handle_edit link + + def handle_click_pin link + api.pin_link link + + def handle_shift_backspace + if editing_link + await handle_delete editing_link + else + return unless state.sorted_links.length > 0 + handle_edit selected_link + + def handle_shift_return + def go + if viewing_community_links + try + await add_community_link selected_link + catch e + err "adding community link", e + elif editing_link + try + await update_link editing_link, state.query + catch e + err "updating link", e + else + handle_add! + state.loading = yes + await go! + editing_link = no + state.query = '' + api.sort_links! + state.loading = no + + def toggle_settings + refs.settings.open! def render - + css .link d:flex fld:row jc:space-between ai:center @@ -99,109 +190,114 @@ tag app-links css .right d:flex jc:right - <.header> + if $as.active + + + else + <.header> + + <.side.left@click=api.toggle_effective_names> + if config.data.enable_effective_names + + else + + + - <.side.left@click=api.toggle_effective_names> - if config.enable_effective_names - + if (let m = math_result) isnt no + <.side.right[c:blue3 fs:20px ml:10px w:unset] + @click=handle_click_copy(m) + > "= {Math.round(m * 100)/100}" else - - - - - if (let m = math_result) isnt no - <.side.right[c:blue3 fs:20px ml:10px w:unset] - @click=handle_click_copy(m) - > "= {Math.round(m * 100)/100}" - else - <.side.right @click.if(!state.loading)=toggle_settings> - - - if config.enable_tips and not config.enable_simplify_ui - <.middle-button> - <.tip[jc:start ta:left fl:1] @click=handle_return> - <.tip-hotkey> "Return" - <.tip-content> "Navigate To Link" - <.tip[jc:center ta:center fl:2 px:15px] - @click=handle_shift_return - > - <.tip-hotkey> "Shift + Return" - <.tip-content[of:hidden text-overflow:ellipsis white-space:nowrap]> - "Add New Link" - " " - let sq = state.query.trim!.split /\s+/ - if sq.length >= 2 - let url = sq.pop! - '"' - sq.join ' ' - ' ' - url - '"' - else - '"' - sq.join ' ' - '"' - <.tip[jc:end ta:right fl:1] - @click=handle_shift_backspace - > - <.tip-hotkey> "Shift + Backspace" - <.tip-content> "Edit Link" + <.side.right @click.if(!state.loading)=toggle_settings> + + + if config.data.enable_tips + <.middle-button> + <.tip[jc:start ta:left fl:1] @click=handle_return> + <.tip-hotkey> "Return" + <.tip-content> "Navigate To Link" + <.tip[jc:center ta:center fl:2 px:15px] + @click=handle_shift_return + > + <.tip-hotkey> "Shift + Return" + <.tip-content[of:hidden text-overflow:ellipsis white-space:nowrap]> + "Add New Link" + " " + let sq = state.query.trim!.split /\s+/ + if sq.length >= 2 + let url = sq.pop! + '"' + sq.join ' ' + ' ' + url + '"' + else + '"' + sq.join ' ' + '"' + <.tip[jc:end ta:right fl:1] + @click=handle_shift_backspace + > + <.tip-hotkey> "Shift + Backspace" + <.tip-content> "Edit Link" -
- css d:flex fld:column jc:flex-start fl:1 w:100% ofy:auto pt:15px +
+ css d:flex fld:column jc:flex-start fl:1 w:100% ofy:auto pt:15px - if not viewing_community_links and (bang or state.sorted_links.length < 1) - - <.link-left> - - <.display-name.bang-text> encoded_bang_query - <.link-right[jc:flex-end]> - <.frequency> active_bang.frequency - else - for link, index in state.sorted_links - <.link-left> - - <.display-name - [c:#FAD4AB]=link.is_bang - > link.display_name - if link.display_name isnt link.name and config.enable_effective_names - <.name> - "(" - link.name - ")" - <.link-right> - <.link-buttons .buttons-disabled=(not config.enable_buttons or config.enable_simplify_ui)> - <.link-button@click.prevent.stop=handle_click_edit(link)> - - <.link-button@click.prevent.stop=handle_click_delete(link)> - - <.link-button - @click.prevent.stop=handle_click_pin(link) - [visibility:visible c:purple3/50]=(link.is_pinned and (index isnt selection_index or not config.enable_buttons or config.enable_simplify_ui)) - > - - <.frequency> link.frequency + + <.display-name.bang-text> encoded_bang_query + <.link-right[jc:flex-end]> + <.frequency> active_bang.frequency + else + for link, index in state.sorted_links + + <.link-left> + + <.display-name + [c:#FAD4AB]=link.is_bang + > link.display_name + if link.display_name isnt link.name and config.data.enable_effective_names + <.name> + "(" + link.name + ")" + <.link-right> + <.link-buttons .buttons-disabled=!config.data.enable_buttons> + <.link-button@click.prevent.stop=handle_click_edit(link)> + + <.link-button@click.prevent.stop=handle_click_delete(link)> + + <.link-button + @click.prevent.stop=handle_click_pin(link) + [visibility:visible c:purple3/50]=(link.is_pinned and (index isnt selection_index or not config.data.enable_buttons)) + > + + <.frequency> link.frequency diff --git a/app/components/app-settings.imba b/app/components/app-settings.imba index 82bda1f..d965fb2 100644 --- a/app/components/app-settings.imba +++ b/app/components/app-settings.imba @@ -2,9 +2,12 @@ tag app-settings active = no - def end + def close active = no + def open + active = yes + def handle_click_github global.location.href = "https://github.com/familyfriendlymikey/fuzzyhome" @@ -66,7 +69,7 @@ tag app-settings def render - + css .settings-container d:flex fld:row jc:space-around ai:center @@ -80,13 +83,13 @@ tag app-settings bg:purple4/10 rd:5px h:100% - if $community-links.active - + if refs.community-links.active + else <.settings-container> <.settings-button - @click=end - @hotkey("esc")=end + @click=close + @hotkey("esc")=close > "BACK" <.settings-container> <.settings-button @@ -127,8 +130,6 @@ tag app-settings @click=handle_click_toggle_search_on_paste > config.enable_search_on_paste ? "DISABLE SEARCH ON PASTE" : "ENABLE SEARCH ON PASTE" - - <.settings-container> <.settings-button @click.if(!loading)=handle_toggle_light_theme > diff --git a/app/config.imba b/app/config.imba index 393ca1c..3c4a078 100644 --- a/app/config.imba +++ b/app/config.imba @@ -1,4 +1,4 @@ -let { data, save } = new class config +export default new class config def constructor this.data = {} @@ -21,8 +21,3 @@ let { data, save } = new class config def save global.localStorage.fuzzyhome_config = JSON.stringify(this.data) - -export { - data as config - save as save_config -}