Skip to content

Server webui: Upgrade daisyui, tailwindcss. #12735

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

Merged
merged 8 commits into from
Apr 4, 2025

Conversation

nauful
Copy link
Contributor

@nauful nauful commented Apr 3, 2025

This PR upgrades packages for daisyui and tailwindcss with code fixes as needed.

image
image

@tailwind components;
@tailwind utilities;
@plugin 'daisyui' {
themes: 'light', 'dark', 'cupcake', 'bumblebee', 'emerald', 'corporate', 'synthwave', 'retro', 'cyberpunk', 'valentine', 'halloween', 'garden', 'forest', 'aqua', 'lofi', 'pastel', 'fantasy', 'wireframe', 'black', 'luxury', 'dracula', 'cmyk', 'autumn', 'business', 'acid', 'lemonade', 'night', 'coffee', 'winter', 'dim', 'nord', 'sunset',
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@@ -194,7 +194,12 @@ const StorageUtils = {
localStorage.setItem('config', JSON.stringify(config));
},
getTheme(): string {
return localStorage.getItem('theme') || 'auto';
const theme = localStorage.getItem('theme') || 'auto';
const activeTheme = (theme === 'auto') ?
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why do we need this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The themes list didn't include auto on the website. Switching to themes: all added auto back, removed this.

@github-actions github-actions bot added the devops improvements to build systems and github actions label Apr 3, 2025
@@ -111,6 +111,7 @@ jobs:
cd examples/server/webui
git status

npm install
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
npm install
image

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am able to build and run locally. The server had a compile error where it was looking for objects in the previous version of daisyui. Didn't realize index.html.gz is part of the git repo, reverting and adding the new index.html.gz.

@ngxson
Copy link
Collaborator

ngxson commented Apr 4, 2025

Seems like the gzip on windows produces different result than on linux and mac, this will need to be fixed

@ngxson ngxson merged commit b772394 into ggml-org:master Apr 4, 2025
6 checks passed
@nauful nauful deleted the webui-upgrade-style-deps branch April 4, 2025 14:15
timwu pushed a commit to timwu/llama.cpp that referenced this pull request May 5, 2025
* Upgrade daisyui, tailwindcss.

* Switch to all themes.

* Revert a change.

* Update formatting.

* Install packages before npm build.

* Revert "Install packages before npm build."

This reverts commit 336c514.

* Add index.html.gz

* run build

---------

Co-authored-by: Xuan Son Nguyen <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
devops improvements to build systems and github actions examples server
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants