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

better loading indicators, handle invalid config

main
familyfriendlymikey 2 years ago
parent
9f7853fc81
commit
b8121bcc46
2 changed files with 85 additions and 50 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. 115
      app/client.imba
  2. 2
      package.json

115
app/client.imba
View File

@ -29,7 +29,7 @@ tag app
selection_index = 0 selection_index = 0
settings_active = no settings_active = no
loading_add = no loading = no
fatal_error = no fatal_error = no
get render? do mounted? get render? do mounted?
@ -37,32 +37,44 @@ tag app
def mount def mount
try try
await reload_db! await reload_db!
p "load db success"
p state.links
catch e catch e
err "loading database", e err "loading database", e
fatal_error = yes fatal_error = yes
return return
unless global.localStorage.fuzzyhome_visited unless global.localStorage.fuzzyhome_visited
await add_initial_links!
global.localStorage.fuzzyhome_visited = yes
load_config!
def add_initial_links
await add_link { name: "help", url: "github.com/familyfriendlymikey/fuzzyhome" } await add_link { name: "help", url: "github.com/familyfriendlymikey/fuzzyhome" }
await add_link { name: "google", url: "google.com" } await add_link { name: "google", url: "google.com" }
await add_link { name: "youtube", url: "youtube.com" } await add_link { name: "youtube", url: "youtube.com" }
await add_link { name: "3000", url: "localhost:3000" } await add_link { name: "3000", url: "localhost:3000" }
global.localStorage.fuzzyhome_visited = yes
if not global.localStorage.fuzzyhome_config def validate_config
throw 'config error' unless config..search_engine..url
throw 'config error' unless config..search_engine..frequency
throw 'config error' unless config..search_engine..icon
def reset_config
let url = 'www.google.com/search?q=' let url = 'www.google.com/search?q='
let hostname = 'www.google.com'
let frequency = 0 let frequency = 0
let icon = await fetch_image_as_base_64 'google.com' let icon = await fetch_image_as_base_64 'google.com'
config.search_engine = { url, hostname, icon, frequency } config.search_engine = { url, icon, frequency }
save_config! save_config!
else
load_config!
def save_config def save_config
global.localStorage.fuzzyhome_config = JSON.stringify(config) global.localStorage.fuzzyhome_config = JSON.stringify(config)
def load_config def load_config
try
config = JSON.parse(global.localStorage.fuzzyhome_config) config = JSON.parse(global.localStorage.fuzzyhome_config)
validate_config!
catch
reset_config!
def err s, e def err s, e
p e p e
@ -73,7 +85,7 @@ tag app
sort_links! sort_links!
def can_add def can_add
return no if loading_add return no if loading
return no if settings_active return no if settings_active
await get_valid_link(state.query) await get_valid_link(state.query)
@ -170,7 +182,7 @@ tag app
window.location.href = "//{link.url}" window.location.href = "//{link.url}"
def handle_click_add def handle_click_add
loading_add = yes loading = yes
let link = await get_valid_link(state.query) let link = await get_valid_link(state.query)
unless link unless link
err "adding link", "Invalid link." err "adding link", "Invalid link."
@ -178,13 +190,14 @@ tag app
await add_link(link) await add_link(link)
state.query = '' state.query = ''
sort_links! sort_links!
loading_add = no loading = no
def handle_input def handle_input
selection_index = 0 selection_index = 0
sort_links! sort_links!
def handle_click_delete link def handle_click_delete link
loading = yes
return unless window.confirm "Do you really want to delete {link..name}?" return unless window.confirm "Do you really want to delete {link..name}?"
try try
await db.links.delete(link.id) await db.links.delete(link.id)
@ -195,9 +208,10 @@ tag app
await reload_db! await reload_db!
catch e catch e
err "reloading db after successful delete", e err "reloading db after successful delete", e
loading = no
def handle_click_import e def handle_click_import e
loading_import = yes loading = yes
let id_exists = do |newid| let id_exists = do |newid|
state.links.some! do |{id}| newid === id state.links.some! do |{id}| newid === id
let filter = do |table, value, key| let filter = do |table, value, key|
@ -208,16 +222,11 @@ tag app
await reload_db! await reload_db!
catch e catch e
err "importing db", e err "importing db", e
loading_import = no
settings_active = no settings_active = no
loading = no
def set_search_engine url
let hostname = new URL("https://{url}").hostname
let icon = await fetch_image_as_base_64 hostname
config.search_engine = { url, hostname, icon }
save_config!
def handle_click_export def handle_click_export
loading = yes
let datetime = new Date!.toString!.split(" ") let datetime = new Date!.toString!.split(" ")
let date = datetime.slice(1, 4).join("-").toLowerCase! let date = datetime.slice(1, 4).join("-").toLowerCase!
let time = datetime[4].split(":").join("-") let time = datetime[4].split(":").join("-")
@ -225,15 +234,24 @@ tag app
const blob = await db.export({ prettyJson: yes }) const blob = await db.export({ prettyJson: yes })
download(blob, filename, "application/json") download(blob, filename, "application/json")
settings_active = no settings_active = no
loading = no
def set_search_engine url
let icon = await fetch_image_as_base_64 url
config.search_engine = { url, icon }
save_config!
def handle_click_config def handle_click_config
loading = yes
let input = window.prompt("Please enter the URL of your search engine.") let input = window.prompt("Please enter the URL of your search engine.")
return unless input
let url = input.trim!.replace(/(^\w+:|^)\/\//, '') let url = input.trim!.replace(/(^\w+:|^)\/\//, '')
unless url unless url
err "changing search engine", "Invalid URL." err "changing search engine", "Invalid URL."
return return
set_search_engine url await set_search_engine url
settings_active = no settings_active = no
loading = no
def handle_click_github def handle_click_github
global.location.href = "https://github.com/familyfriendlymikey/fuzzyhome" global.location.href = "https://github.com/familyfriendlymikey/fuzzyhome"
@ -268,11 +286,15 @@ tag app
w:100% h:50px px:20px w:100% h:50px px:20px
fs:20px ta:center fs:20px ta:center
bd:1px solid purple4 bd:1px solid purple4
bg:none c:blue3 caret-color:blue3 bg:purple4/10 c:blue3 caret-color:blue3
outline:none rd:5px outline:none rd:5px
@focus bg:purple4/10
@placeholder fs:10px c:blue3 @placeholder fs:10px c:blue3
css .loading-container
d:flex fld:row jc:space-around ai:center
w:100% h:50px
bg:purple4/10 rd:5px c:gray4
css .settings-container css .settings-container
d:flex fld:row jc:space-around ai:center d:flex fld:row jc:space-around ai:center
w:100% h:50px w:100% h:50px
@ -288,10 +310,10 @@ tag app
fs:20px fs:20px
css .disabled css .disabled
@important c:gray4 cursor:default c:gray4 cursor:default user-select:none
css .links css .links
d:flex fld:column jc:flex-start d:flex fld:column jc:flex-start fl:1
w:100% ofy:auto w:100% ofy:auto
css .link css .link
@ -337,7 +359,29 @@ tag app
Check developer console for more information. Check developer console for more information.
""" """
else else
unless settings_active if settings_active
<.settings-container>
<label.settings-button .disabled=loading>
"IMPORT"
<input[d:none]
disabled=loading
@change=handle_click_import
@click=(this.value = '')
type="file"
>
<.settings-button
.disabled=loading
@click.if(!loading)=handle_click_export
> "EXPORT"
<.settings-button
.disabled=loading
@click.if(!loading)=handle_click_config
> "CONFIG"
<.settings-button
.disabled=loading
@click.if(!loading)=handle_click_github
> "GITHUB"
else
<input$main-input <input$main-input
bind=state.query bind=state.query
placeholder=pretty_date placeholder=pretty_date
@ -347,25 +391,16 @@ tag app
@input=handle_input @input=handle_input
@paste=handle_paste @paste=handle_paste
@blur=this.focus @blur=this.focus
.disabled=loading
disabled=loading
> >
else
<.settings-container>
unless loading_import
<label.settings-button>
"IMPORT"
<input[d:none]
@change=handle_click_import
@click=(this.value = '')
type="file"
>
else
<.settings-button.disabled> "IMPORT"
<.settings-button@click=handle_click_export> "EXPORT"
<.settings-button@click=handle_click_config> "CONFIG"
<.settings-button@click=handle_click_github> "GITHUB"
if state.query.trim!.split(/\s+/).length < 2 if state.query.trim!.split(/\s+/).length < 2
<.middle-button[mt:-10px py:5px fs:25px]@click=toggle_settings> "..." <.middle-button
[mt:-10px py:5px fs:25px]
.disabled=loading
@click.if(!loading)=toggle_settings
> "..."
elif await can_add! elif await can_add!
<.middle-button@click=handle_click_add> "+" <.middle-button@click=handle_click_add> "+"
else else

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "fuzzyhome", "name": "fuzzyhome",
"version": "0.1.4", "version": "0.1.8",
"scripts": { "scripts": {
"start": "imba run -SMH --baseurl . -w server.imba", "start": "imba run -SMH --baseurl . -w server.imba",
"build-app": "rm -rf dist && imba build -SMH --baseurl . server.imba", "build-app": "rm -rf dist && imba build -SMH --baseurl . server.imba",

Write Preview
Loading…
Cancel
Save