Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add settings UI #132

Merged
merged 98 commits into from
Oct 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
8adf8c7
feat: init package
lars-berger Oct 5, 2024
cd1e486
feat: run `npx shadcn-solid@latest init`
lars-berger Oct 6, 2024
299a301
feat: copy over widget settings component
lars-berger Oct 7, 2024
9687c0e
feat: init all shadcn components
lars-berger Oct 7, 2024
835f921
chore: add smorf
lars-berger Oct 8, 2024
d753f94
feat: add button to open settings window
lars-berger Oct 8, 2024
0c099ac
chore: bump solid-js
lars-berger Oct 8, 2024
e6f9bc6
refactor: remove shadcn components
lars-berger Oct 8, 2024
cca37ad
chore: cleanup deps
lars-berger Oct 8, 2024
8b0846f
feat: partially working tailwind
lars-berger Oct 9, 2024
c3b3bcc
chore: import tailwind config from component library
lars-berger Oct 11, 2024
fa768cc
feat: add working switch and select inputs
lars-berger Oct 11, 2024
fedac9b
feat: add form field components
lars-berger Oct 12, 2024
e5f1b41
feat: use field components for preset form
lars-berger Oct 12, 2024
bb11d63
feat: add preset name field
lars-berger Oct 12, 2024
0d2967a
feat: add dropdown button for selecting preset to open
lars-berger Oct 12, 2024
9351343
feat: add title to settings window
lars-berger Oct 12, 2024
1cc8ef9
feat: add `FileTree` component
lars-berger Oct 12, 2024
679b594
feat: add routing
lars-berger Oct 13, 2024
c0ec8e9
feat: show the settings window on left click of tray icon
lars-berger Oct 13, 2024
08c668d
feat: add command for getting widget configs
lars-berger Oct 13, 2024
ac56996
feat: fetch widget configs
lars-berger Oct 13, 2024
1c17dec
feat: show widget config directory tree in sidebar
lars-berger Oct 13, 2024
d16f02b
fix: working startup on macos
lars-berger Oct 15, 2024
fa785f4
feat: show settings window on left click for windows only
lars-berger Oct 15, 2024
17a8039
feat: focus the existing settings window if option is re-selected
lars-berger Oct 16, 2024
326c8af
feat: add default size to settings window
lars-berger Oct 16, 2024
60a99dc
feat: wip allow form selection
lars-berger Oct 16, 2024
45b0bcd
feat: update selected form from config tree
lars-berger Oct 16, 2024
ceb79a2
feat: rename `default_placements` -> `presets`
lars-berger Oct 16, 2024
07f8f09
feat: deserialize/serialize length values to strings
lars-berger Oct 16, 2024
a3e45bd
feat: emit changes to the form value
lars-berger Oct 16, 2024
dcf2506
feat: add command for updating a given widget config
lars-berger Oct 17, 2024
4a9a87f
feat: set above menu bar if z-order is top-most
lars-berger Oct 17, 2024
37a3563
feat: hold `widget_states` lock for no longer than necessary
lars-berger Oct 17, 2024
839cebb
feat: update widget config on form value change
lars-berger Oct 17, 2024
6f95381
feat: rename `defaultPlacements` -> `presets` in example configs
lars-berger Oct 17, 2024
efeb055
feat: add newlines when writing to configs
lars-berger Oct 17, 2024
58c2f37
chore: use public version of `smorf` and `@glzr/components`
lars-berger Oct 18, 2024
d428434
chore: update `smorf` to latest
lars-berger Oct 18, 2024
b5794eb
chore: update to latest v2
lars-berger Oct 18, 2024
5b54b86
feat: update state with the new config values
lars-berger Oct 18, 2024
bc5a7a3
feat: show widget name and path at top of config form
lars-berger Oct 18, 2024
6403fb4
feat: overflow settings form and show action bar at bottom
lars-berger Oct 18, 2024
d47fa91
fix: correct scroll overflow in form
lars-berger Oct 18, 2024
32941c2
feat: add action bar scaling
lars-berger Oct 18, 2024
f97234f
feat: add responsive width to sidebar
lars-berger Oct 19, 2024
407ec48
feat: fully functioning layout
lars-berger Oct 19, 2024
2e161d3
feat: widget settings button styling
lars-berger Oct 19, 2024
c765a45
chore: use local version of `@glzr/components` and `smorf`
lars-berger Oct 19, 2024
ff9fe9b
feat: wip separate start widget/preset commands
lars-berger Oct 22, 2024
b8ae054
feat: wip handle starting widgets from cli command
lars-berger Oct 22, 2024
f8b86b1
feat: change start preset/widget fns to take a path instead of `Widge…
lars-berger Oct 22, 2024
6f426b0
feat: wip create systray menu for each preset
lars-berger Oct 22, 2024
3d98485
feat: add config types to client api; update widget opening commands
lars-berger Oct 22, 2024
86981e5
feat: working `start_widget` and `start_preset`
lars-berger Oct 22, 2024
e7c334a
feat: add width and height inputs
lars-berger Oct 22, 2024
c7df875
feat: add prefix to widget ids
lars-berger Oct 22, 2024
85cf9c2
feat: invoke `start_preset` on button click
lars-berger Oct 22, 2024
ec0fce4
feat: wip use an object for configs in settings ui
lars-berger Oct 22, 2024
18c3051
feat: correctly display config tree sidebar with object change
lars-berger Oct 22, 2024
6a44399
feat: change config tree state to be a map of maps
lars-berger Oct 22, 2024
9725040
feat: remove `WidgetConfigEntry` struct; store found configs as a has…
lars-berger Oct 22, 2024
46b7564
refactor: simplify reading of config files
lars-berger Oct 22, 2024
2d1f953
feat: add open configs to systray menu
lars-berger Oct 22, 2024
0fb124c
refactor: remove `settings_window` from systray state
lars-berger Oct 22, 2024
1d83fd8
feat: remove `WidgetFactory::start_preset`; add `open_options` to wid…
lars-berger Oct 22, 2024
e3f8858
feat: display whether config is enabled/ launched on startup in systray
lars-berger Oct 22, 2024
cbcc251
feat: show count for each preset in systray
lars-berger Oct 23, 2024
5bf5ac9
feat: implement `stop_by_preset`
lars-berger Oct 23, 2024
7d371a5
feat: no-op if preset is open; implement `relaunch_all`
lars-berger Oct 23, 2024
dccdc85
feat: add button to delete a preset
lars-berger Oct 23, 2024
2399ba7
refactor: rename component files
lars-berger Oct 23, 2024
a75baee
feat: truncate sidebar text; change icon
lars-berger Oct 23, 2024
fd2722c
feat: add css normalize; hide overflow on html/body
lars-berger Oct 23, 2024
2030218
feat: wip change startup configs to obj with path and preset
lars-berger Oct 23, 2024
783fa4a
feat: update json schemas
lars-berger Oct 23, 2024
a302f99
feat: add `widget_states` command
lars-berger Oct 24, 2024
2914bd7
fix: handle empty cli command
lars-berger Oct 24, 2024
7124d28
fix: prevent stack overflow when serializing `StartupConfig`
lars-berger Oct 25, 2024
1df6d79
feat: scroll to top on config selection
lars-berger Oct 25, 2024
4e07bab
feat: change fns to allow either relative/absolute config paths
lars-berger Oct 25, 2024
15ba238
feat: wip relaunch only changed widget configs
lars-berger Oct 25, 2024
ce4be9b
feat: wip restart by ids and config paths
lars-berger Oct 26, 2024
d67c0e9
feat: working relaunch by id/path
lars-berger Oct 26, 2024
aa9584e
feat: emit events to frontend on widget open/close
lars-berger Oct 26, 2024
6f2ba5f
feat: add capabilities config for settings ui
lars-berger Oct 26, 2024
3e7bf54
feat: listen to widget open/close in configs form
lars-berger Oct 26, 2024
49595df
feat: show count of currently open presets
lars-berger Oct 26, 2024
08883b8
feat: implement toggling selected preset via dropdown button
lars-berger Oct 26, 2024
93b13e2
feat: handle selection of initial config and preset
lars-berger Oct 26, 2024
e1667a6
style: run prettier
lars-berger Oct 26, 2024
d76ed77
chore: point to npm-published `smorf` and `@glzr/components`
lars-berger Oct 26, 2024
9476d63
ci: add build step for settings ui
lars-berger Oct 26, 2024
0b57ac2
ci: fix broken pipe
lars-berger Oct 26, 2024
472780d
fix: declare `tray_icon` as mut for windows builds
lars-berger Oct 26, 2024
1a9dac5
fix: incorrect variable name in windows-only block
lars-berger Oct 26, 2024
4cb9032
chore: update settings-ui deps
lars-berger Oct 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,14 @@ jobs:
dotnet tool install --global AzureSignTool --version 5.0.0

- run: pnpm i
- run: pnpm run --filter zebar --filter @zebar/settings-ui build

- name: Set version number
shell: bash
run: |
TMP_PATH=$(mktemp)
CONF_PATH=packages/desktop/tauri.conf.json
jq '.version="${{ inputs.version-number || '0.0.0' }}"' "$CONF_PATH" > "$TMP_PATH"
mv "$TMP_PATH" "$CONF_PATH"
CONF_PATH="packages/desktop/tauri.conf.json"
cat "$CONF_PATH" | jq '.version="${{ inputs.version-number || '0.0.0' }}"' > "$CONF_PATH.tmp" && \
mv "$CONF_PATH.tmp" "$CONF_PATH"

- name: Tauri build
uses: tauri-apps/tauri-action@v0
Expand Down
5 changes: 5 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"files.associations": {
"**/packages/settings-ui/**/*.css": "tailwindcss"
}
}
Loading