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

refactor: get client.imba rendering

main
familyfriendlymikey 3 years ago
parent
843639c218
commit
6082a33643
3 changed files with 143 additions and 147 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. 44
      app/api.imba
  2. 134
      app/client.imba
  3. 88
      app/components/app-links.imba

44
app/api.imba
View File

@ -1,6 +1,8 @@
import db from './db' import db from './db'
import state from './state' import state from './state'
import { omit, orderBy } from 'lodash' import { omit, orderBy } from 'lodash'
import { parse_url } from './utils'
import { nanoid } from 'nanoid'
export default new class api export default new class api
@ -69,3 +71,45 @@ export default new class api
if config.enable_effective_names if config.enable_effective_names
return state.sorted_links = fzi state.links, state.query return state.sorted_links = fzi state.links, state.query
state.sorted_links = fzi state.links, state.query, "display_name" state.sorted_links = fzi state.links, state.query, "display_name"
def create_link_from_text text
text = text.trim!
throw "Text is empty." if text is ''
let split_text = text.split(/\s+/)
throw "No url provided." if split_text.length < 2
let url = split_text.pop!
let host
{ href:url, host } = parse_url url
let icon = await fetch_image_as_base_64 host
let name
if split_text[-1].startsWith "`"
name = split_text.pop!.slice(1)
let display_name = split_text.join(" ")
let is_bang = no
let is_pinned = no
if display_name.startsWith "!"
is_bang = yes
display_name = display_name.slice(1)
name ||= display_name
{ name, display_name, is_bang, is_pinned, url, frequency:0, icon }
def fetch_image_as_base_64 host
let fallback = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAH0lEQVR42mO8seXffwYqAsZRA0cNHDVw1MBRA0eqgQCDRkbJSQHxEQAAAABJRU5ErkJggg=='
return new Promise! do |resolve|
let res
try
res = await global.fetch("https://icon.horse/icon/{host}")
catch
p "Failed to get icon from icon horse."
return resolve fallback
# todo: can i use .text() on this or something
let blob = await res.blob!
let reader = new FileReader!
reader.onload = do
resolve this.result
reader.onerror = do
p "Failed to get data from reader."
resolve fallback
return
reader.readAsDataURL(blob)

134
app/client.imba
View File

@ -3,7 +3,6 @@
# prior_query = '' # prior_query = ''
# viewing_community_links = yes # viewing_community_links = yes
let p = console.log let p = console.log
# import sw from './sw.imba?serviceworker' # import sw from './sw.imba?serviceworker'
@ -16,7 +15,6 @@ import { evaluate as eval_math } from 'mathjs'
import pkg from '../package.json' import pkg from '../package.json'
let version = pkg.version let version = pkg.version
import { parse_url } from './utils'
import db from './db' import db from './db'
import state from './state' import state from './state'
import api from './api' import api from './api'
@ -26,6 +24,7 @@ import app-community-links from './components/app-community-links'
import app-settings from './components/app-settings' import app-settings from './components/app-settings'
import app-prompt from './components/app-prompt' import app-prompt from './components/app-prompt'
import app-edit from './components/app-edit' import app-edit from './components/app-edit'
import app-links from './components/app-links'
import './styles' import './styles'
p "fuzzyhome version {version}" p "fuzzyhome version {version}"
@ -42,6 +41,10 @@ extend tag element
state state
get api get api
api api
get config
config
get p
console.log
tag app tag app
@ -105,41 +108,6 @@ tag app
name = name.slice(1) name = name.slice(1)
name name
def toggle_settings
settings_active = !settings_active
def increment_selection_index
selection_index = Math.min(state.sorted_links.length - 1, selection_index + 1)
def decrement_selection_index
selection_index = Math.max(0, selection_index - 1)
get active_bang
return bang or config.default_bang
get encoded_bang_query
"{active_bang.url}{window.encodeURIComponent(state.query)}"
def fetch_image_as_base_64 host
let fallback = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAH0lEQVR42mO8seXffwYqAsZRA0cNHDVw1MBRA0eqgQCDRkbJSQHxEQAAAABJRU5ErkJggg=='
return new Promise! do |resolve|
let res
try
res = await global.fetch("https://icon.horse/icon/{host}")
catch
p "Failed to get icon from icon horse."
resolve fallback
return
let blob = await res.blob!
let reader = new FileReader!
reader.onload = do
resolve this.result
reader.onerror = do
p "Failed to get data from reader."
resolve fallback
return
reader.readAsDataURL(blob)
get can_add get can_add
return no if state.loading return no if state.loading
return no if settings_active return no if settings_active
@ -149,27 +117,6 @@ tag app
return no if split_query.length < 2 return no if split_query.length < 2
yes yes
def create_link_from_text text
text = text.trim!
throw "Text is empty." if text is ''
let split_text = text.split(/\s+/)
throw "No url provided." if split_text.length < 2
let url = split_text.pop!
let host
{ href:url, host } = parse_url url
let icon = await fetch_image_as_base_64 host
let name
if split_text[-1].startsWith "`"
name = split_text.pop!.slice(1)
let display_name = split_text.join(" ")
let is_bang = no
let is_pinned = no
if display_name.startsWith "!"
is_bang = yes
display_name = display_name.slice(1)
name ||= display_name
{ name, display_name, is_bang, is_pinned, url, frequency:0, icon }
def handle_add def handle_add
state.loading = yes state.loading = yes
try try
@ -294,14 +241,6 @@ tag app
def name_exists new_name def name_exists new_name
state.links.some! do |{name}| new_name is name state.links.some! do |{name}| new_name is name
get math_result
try
let result = Number(eval_math state.query)
throw _ if isNaN result
result
catch
no
def handle_paste e def handle_paste e
return unless config.enable_search_on_paste return unless config.enable_search_on_paste
return if state.query.length > 0 return if state.query.length > 0
@ -338,67 +277,8 @@ tag app
bxs:0px 0px 10px rgba(0,0,0,0.35) bxs:0px 0px 10px rgba(0,0,0,0.35)
box-sizing:border-box p:30px rd:10px mt:10vh box-sizing:border-box p:30px rd:10px mt:10vh
css .fatal
c:blue2
css .loading-container
d:flex fld:row jc:space-around ai:center
w:100% h:50px
bg:purple4/10 rd:5px c:gray4
css .links
d:flex fld:column jc:flex-start fl:1
w:100% ofy:auto pt:15px
css .link
d:flex fld:row jc:space-between ai:center
px:16px py:11px rd:5px cursor:pointer c:blue3
css .link-left
d:flex fl:1
css .link-icon
w:20px h:20px mr:10px rd:3px
css .display-name
tt:capitalize fs:20px
overflow-wrap:anywhere
css .name
d:flex ja:center
c:gray4 ml:10px fs:14px
css .parens
fs:10px c:gray4/80
css .bang-text
tt:none word-break:break-all
css .link-right
d:flex fld:row jc:space-between ai:center
css .link-buttons
d:flex fld:row jc:flex-start ai:center pr:25px gap:5px
css .link-button
visibility:hidden
rd:3px c:purple4 fs:15px cursor:pointer
px:3px
css .link-button svg
w:15px
css .selected .link-button
visibility:visible
css .buttons-disabled .link-button
visibility:hidden
css .frequency
fs:15px ml:7px
if fatal_error if fatal_error
<.fatal> <[c:blue2]>
""" """
There was an error state.loading the database. There was an error state.loading the database.
This could be due to a user setting This could be due to a user setting
@ -417,6 +297,6 @@ tag app
<app-edit$ae> <app-edit$ae>
else else
<links> <app-links>
imba.mount <app> imba.mount <app>

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

@ -3,15 +3,85 @@ tag app-links
selection_index = 0 selection_index = 0
bang = no bang = no
def increment_selection_index
selection_index = Math.min(state.sorted_links.length - 1, selection_index + 1)
def decrement_selection_index
selection_index = Math.max(0, selection_index - 1)
get active_bang
return bang or config.default_bang
get encoded_bang_query
"{active_bang.url}{window.encodeURIComponent(state.query)}"
def mount def mount
$links-input.focus! $links-input.focus!
get math_result
try
let result = Number(eval_math state.query)
throw _ if isNaN result
result
catch
no
def render def render
<self> <self>
<.header> css .links
css d:flex fld:column jc:flex-start fl:1
w:100% ofy:auto pt:15px
css .link
d:flex fld:row jc:space-between ai:center
px:16px py:11px rd:5px cursor:pointer c:blue3
css .link-left
d:flex fl:1
css .link-icon
w:20px h:20px mr:10px rd:3px
css .display-name
tt:capitalize fs:20px
overflow-wrap:anywhere
css .name
d:flex ja:center
c:gray4 ml:10px fs:14px
css .parens
fs:10px c:gray4/80
css .bang-text
tt:none word-break:break-all
css .link-right
d:flex fld:row jc:space-between ai:center
css .link-buttons
d:flex fld:row jc:flex-start ai:center pr:25px gap:5px
css .link-button
visibility:hidden
rd:3px c:purple4 fs:15px cursor:pointer
px:3px
css .link-button svg
w:15px
css .selected .link-button
visibility:visible
css .buttons-disabled .link-button
visibility:hidden
css .frequency
fs:15px ml:7px
css .header
d:flex fld:row w:100% d:flex fld:row w:100%
css .side css .side
@ -28,13 +98,15 @@ tag app-links
css .right css .right
d:flex jc:right d:flex jc:right
<.header>
<.side.left <.side.left
@click=handle_click_toggle_simplify_ui @click=handle_click_toggle_simplify_ui
> >
if config.enable_simplify_ui if config.enable_simplify_ui
<svg src="./assets/eye-off.svg"> <svg src="../assets/eye-off.svg">
else else
<svg src="./assets/eye.svg"> <svg src="../assets/eye.svg">
<input$links-input <input$links-input
bind=state.query bind=state.query
@ -59,7 +131,7 @@ tag app-links
> "= {Math.round(m * 100)/100}" > "= {Math.round(m * 100)/100}"
else else
<.side.right @click.if(!state.loading)=toggle_settings> <.side.right @click.if(!state.loading)=toggle_settings>
<svg src="./assets/settings.svg"> <svg src="../assets/settings.svg">
if config.enable_tips and not config.enable_simplify_ui if config.enable_tips and not config.enable_simplify_ui
<.middle-button> <.middle-button>
@ -123,12 +195,12 @@ tag app-links
<.link-right> <.link-right>
<.link-buttons .buttons-disabled=(not config.enable_buttons or config.enable_simplify_ui)> <.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_edit(link)>
<svg src='./assets/edit-2.svg'> <svg src='../assets/edit-2.svg'>
<.link-button@click.prevent.stop=handle_click_delete(link)> <.link-button@click.prevent.stop=handle_click_delete(link)>
<svg src='./assets/trash.svg'> <svg src='../assets/trash.svg'>
<.link-button <.link-button
@click.prevent.stop=handle_click_pin(link) @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)) [visibility:visible c:purple3/50]=(link.is_pinned and (index isnt selection_index or not config.enable_buttons or config.enable_simplify_ui))
> >
<svg src='./assets/star.svg'> <svg src='../assets/star.svg'>
<.frequency> link.frequency <.frequency> link.frequency

Write Preview
Loading…
Cancel
Save