refactor

app/api.imba

@@ -5,7 +5,6 @@ import db from './db'
 import state from './state'
 
 import config from './config'
-p config
 import { omit, orderBy } from 'lodash'
 import { nanoid } from 'nanoid'
 import fzi from 'fzi'

app/client.imba

@@ -1,15 +1,14 @@
 let p = console.log
+import pkg from '../package.json'
+let version = pkg.version
+p "fuzzyhome version {version}"
 
 # import sw from './sw.imba?serviceworker'
 # navigator..serviceWorker..register(sw).then! do |reg| reg.update!
 
-import download from 'downloadjs'
 import { nanoid } from 'nanoid'
 import { err } from './utils'
 
-import pkg from '../package.json'
-let version = pkg.version
-p "fuzzyhome version {version}"
 import db from './db'
 import state from './state'
 let refs = {}
@@ -33,12 +32,14 @@ extend tag element
 		api
 	get config
 		config
-	get p
-		console.log
 	get refs
 		refs
 	get err
 		err
+	get version
+		version
+	get p
+		console.log
 
 tag app
 

app/components/app-bang.imba

@@ -1,20 +1,35 @@
 tag app-bang
 
 	get encoded_bang_query
-		"{active_bang.url}{window.encodeURIComponent(state.query)}"
+		"{bang.url}{window.encodeURIComponent(state.query)}"
 
 	def handle_bang
-		await api.increment_link_frequency state.active_bang
+		await api.increment_link_frequency bang
 		window.location.href = encoded_bang_query
 
 	def render
 
-		<self>
+		<self
+			.selected
+			@click=handle_bang
+		>
+			css d:flex fld:row jc:space-between ai:center
+				px:16px py:11px rd:5px cursor:pointer c:#FAD4AB
+
+			<.link-left>
+				css d:flex fl:1
+
+				<img.link-icon src=bang.icon>
+					css w:20px h:20px mr:10px rd:3px
 
-			css .bang-text
-				tt:none word-break:break-all
+				<.display-name> encoded_bang_query
+					css tt:capitalize fs:20px overflow-wrap:anywhere
+					css tt:none word-break:break-all
 
-			<.bang @click=handle_bang>
+			<.link-right>
 				css d:flex fld:row jc:space-between ai:center
-					px:16px py:11px rd:5px cursor:pointer c:blue3
+				css .buttons-disabled .link-button visibility:hidden
+				css .selected .link-button visibility:visible
 
+				<.frequency> bang.frequency
+					css fs:15px ml:7px

app/components/app-edit.imba

@@ -18,7 +18,7 @@ tag app-edit
 	def handle_click_set_default_bang
 		if link.is_bang isnt true
 			return err "setting default bang", "Link is not a bang."
-		config.default_bang = link
+		config.data.default_bang = link
 		save_config!
 		state.query = prior_query
 		prior_query = ''
@@ -56,7 +56,9 @@ tag app-edit
 		<self>
 			css d:flex fld:column gap:20px w:100%
 
-			<.tips>
+			<app-tips>
+
+				<.tip-row>
 
 					<.tip
 						@click=close

app/components/app-links.imba

@@ -3,7 +3,6 @@ import { evaluate as eval_math } from 'mathjs'
 tag app-links
 
 	def mount
-		p document
 		$links-input.focus!
 
 	def handle_paste e
@@ -93,7 +92,8 @@ tag app-links
 
 	def render
 
-		<self[w:100%]>
+		<self>
+			css w:100% d:flex fld:column gap:10px
 
 			if $as.active
 				<app-settings$as>
@@ -132,11 +132,12 @@ tag app-links
 						<.side.right @click.if(!state.loading)=toggle_settings>
 							<svg src="../assets/settings.svg">
 
-				if config.data.enable_tips
-					if state.active_bang
+				if state.active_bang or state.sorted_links.length < 1
 
 					<app-tips>
 
+						<.tip-row>
+
 							<.tip
 								@click=(state.active_bang = no)
 								@hotkey('esc').capture.if(!state.loading)=(state.active_bang = no)
@@ -144,6 +145,30 @@ tag app-links
 								<.tip-hotkey> "Esc"
 								<.tip-content> "Back"
 
+							<.tip
+								@click=handle_shift_return
+								@hotkey('shift+return').capture.if(!state.loading)=handle_shift_return
+							>
+								<.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 " "}\""
+
+							<.tip
+								@click=(state.active_bang = no)
+								@hotkey('esc').capture.if(!state.loading)=(state.active_bang = no)
+							>
+								<.tip-hotkey> "Return"
+								<.tip-content> "Search"
+
 				else
 
 					<app-tips>
@@ -229,8 +254,10 @@ tag app-links
 						css d:flex fld:column jc:flex-start
 							fl:1 w:100% ofy:auto
 
-						if not viewing_community_links and (state.active_bang or state.sorted_links.length < 1)
-							<app-bang data=state.active_bang>
+						if state.active_bang
+							<app-bang bang=state.active_bang>
+						elif state.sorted_links.length < 1
+							<app-bang bang=config.data.default_bang>
 						else
 							for link, index in state.sorted_links
 								<app-link link=link index=index>

app/components/app-settings.imba

@@ -1,3 +1,5 @@
+import download from 'downloadjs'
+
 tag app-settings
 
 	active = no
@@ -12,24 +14,24 @@ tag app-settings
 		global.location.href = "https://github.com/familyfriendlymikey/fuzzyhome"
 
 	def handle_click_toggle_tips
-		config.enable_tips = not config.enable_tips
-		save_config!
-		settings_active = no
+		config.data.enable_tips = not config.data.enable_tips
+		config.save!
+		active = no
 
 	def handle_click_toggle_buttons
-		config.enable_buttons = not config.enable_buttons
-		save_config!
-		settings_active = no
+		config.data.enable_buttons = not config.data.enable_buttons
+		config.save!
+		active = no
 
 	def handle_click_toggle_search_on_paste
-		config.enable_search_on_paste = not config.enable_search_on_paste
-		save_config!
-		settings_active = no
+		config.data.enable_search_on_paste = not config.data.enable_search_on_paste
+		config.save!
+		active = no
 
 	def handle_toggle_light_theme
-		config.enable_dark_theme = not config.enable_dark_theme
-		save_config!
-		settings_active = no
+		config.data.enable_dark_theme = not config.data.enable_dark_theme
+		config.save!
+		active = no
 
 	def handle_click_import e
 
@@ -56,7 +58,7 @@ tag app-settings
 
 		loading = yes
 		await handle_import!
-		settings_active = no
+		active = no
 		loading = no
 
 	def handle_click_export
@@ -69,7 +71,7 @@ tag app-settings
 		let time = datetime[4].split(":").join("-")
 		let filename = "fuzzyhome_v{version}_{date}_{time}.txt"
 		download(links.join("\n"), filename, "text/plain")
-		settings_active = no
+		active = no
 		loading = no
 
 	def render
@@ -87,6 +89,7 @@ tag app-settings
 				bg:none c:purple4 bd:none cursor:pointer fs:14px
 				bg:purple4/10 rd:5px
 				h:100%
+				@hover bg:blue
 
 			if refs.community-links.active
 				<app-community-links>
@@ -124,18 +127,18 @@ tag app-settings
 					<.settings-button
 						@click=handle_click_toggle_tips
 					>
-						config.enable_tips ? "DISABLE TIPS" : "ENABLE TIPS"
+						config.data.enable_tips ? "DISABLE TIPS" : "ENABLE TIPS"
 					<.settings-button
 						@click=handle_click_toggle_buttons
 					>
-						config.enable_buttons ? "DISABLE BUTTONS" : "ENABLE BUTTONS"
+						config.data.enable_buttons ? "DISABLE BUTTONS" : "ENABLE BUTTONS"
 
 				<.settings-container>
 					<.settings-button
 						@click=handle_click_toggle_search_on_paste
 					>
-						config.enable_search_on_paste ? "DISABLE SEARCH ON PASTE" : "ENABLE SEARCH ON PASTE"
+						config.data.enable_search_on_paste ? "DISABLE SEARCH ON PASTE" : "ENABLE SEARCH ON PASTE"
 					<.settings-button
 						@click.if(!loading)=handle_toggle_light_theme
 					>
-						config.enable_dark_theme ? "DISABLE DARK THEME" : "ENABLE DARK THEME"
+						config.data.enable_dark_theme ? "DISABLE DARK THEME" : "ENABLE DARK THEME"

app/components/app-tips.imba

@@ -3,7 +3,7 @@ tag app-tips
 	css >>> .tip-row
 		d:flex fld:row w:100% fl:1
 		fs:20px
-		fs:14px pt:15px
+		fs:14px
 		jc:end ta:center
 		bg:#20222f c:purple4
 
@@ -28,7 +28,7 @@ tag app-tips
 	css >>> .tip-content
 		pt:2px fs:14px c:purple3
 
-	<self>
+	<self[d:none]=config.data.enable_tips>
 		<slot>
 
 tag app-tips-more < app-tips
@@ -38,11 +38,12 @@ tag app-tips-more < app-tips
 	def toggle
 		active = !active
 
-	<self>
+	<self[d:none]=config.data.enable_tips>
+		css d:flex fld:column gap:10px
 
 		<@click=toggle>
 			css w:100% d:flex ja:center c:purple3 rdb:4px cursor:pointer
-				my:7px py:2px transition:background 100ms
+				transition:background 100ms
 				@hover bg:purple3/3
 			if active
 				css rd:0
@@ -53,7 +54,8 @@ tag app-tips-more < app-tips
 			else
 				<svg src="../assets/chevron-up.svg">
 
-		css >>> .hide .tip-row d:none
-		css >>> .more .tip-row @first pt:0
-		<.more .hide=hide>
+		<.more>
+			css d:flex fld:column gap:10px
+			if hide
+				css d:none
 			<slot>

scripts/config_move.sh

@@ -0,0 +1 @@
+printf "\033c" && rg --pcre2 -g '!config.imba' 'config\.(?!data.)'"$1"