From ec30073c14e70d0f82e55c55c43986d1349356f4 Mon Sep 17 00:00:00 2001 From: Araozu Date: Mon, 27 May 2024 15:42:30 -0500 Subject: [PATCH] Add daisyui. Cleanup --- frontend/index.html | 29 ++++++++++++++----------- frontend/package.json | 5 +++-- frontend/package.json.md5 | 2 +- frontend/pnpm-lock.yaml | 35 ++++++++++++++++++++++++++++++ frontend/src/App.module.css | 33 ---------------------------- frontend/src/App.tsx | 42 ++++++++++++++++-------------------- frontend/src/index.css | 16 +++----------- frontend/src/index.tsx | 8 +++---- frontend/src/logo.svg | 1 - frontend/tailwind.config.mjs | 9 +++++++- 10 files changed, 89 insertions(+), 91 deletions(-) delete mode 100644 frontend/src/App.module.css delete mode 100644 frontend/src/logo.svg diff --git a/frontend/index.html b/frontend/index.html index 48c59fc..83590ba 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -1,16 +1,19 @@ - - - - - - Solid App - - - -
- - - + + + + + + Solid App + + + + +
+ + + + + \ No newline at end of file diff --git a/frontend/package.json b/frontend/package.json index 5e6bb73..1d9fb60 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { - "name": "my-wails-solid", - "version": "0.0.0", + "name": "wails-player", + "version": "0.0.1", "description": "", "scripts": { "start": "vite", @@ -24,6 +24,7 @@ }, "dependencies": { "@solidjs/router": "^0.13.3", + "daisyui": "^4.11.1", "solid-js": "^1.8.11" }, "author": "Araozu" diff --git a/frontend/package.json.md5 b/frontend/package.json.md5 index f614a61..d32035c 100755 --- a/frontend/package.json.md5 +++ b/frontend/package.json.md5 @@ -1 +1 @@ -edbbff06a97ba556092f9291e70c91b0 \ No newline at end of file +600c4372f492dac63eecb30fb687b8cc \ No newline at end of file diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml index 7f47fab..dfbd2fd 100644 --- a/frontend/pnpm-lock.yaml +++ b/frontend/pnpm-lock.yaml @@ -11,6 +11,9 @@ importers: '@solidjs/router': specifier: ^0.13.3 version: 0.13.3(solid-js@1.8.17) + daisyui: + specifier: ^4.11.1 + version: 4.11.1(postcss@8.4.38) solid-js: specifier: ^1.8.11 version: 1.8.17 @@ -803,6 +806,9 @@ packages: resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==} engines: {node: '>= 8'} + css-selector-tokenizer@0.8.0: + resolution: {integrity: sha512-Jd6Ig3/pe62/qe5SBPTN8h8LeUg/pT4lLgtavPf7updwwHpvFzxvOQBHYj2LZDMjUnBzgvIUSjRcf6oT5HzHFg==} + cssesc@3.0.0: resolution: {integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==} engines: {node: '>=4'} @@ -811,6 +817,14 @@ packages: csstype@3.1.3: resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==} + culori@3.3.0: + resolution: {integrity: sha512-pHJg+jbuFsCjz9iclQBqyL3B2HLCBF71BwVNujUYEvCeQMvV97R59MNK3R2+jgJ3a1fcZgI9B3vYgz8lzr/BFQ==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + + daisyui@4.11.1: + resolution: {integrity: sha512-obT9CUbQdW6eoHwSeT5VwaRrWlwrM4OT5qlfdJ0oQlSIEYhwnEl2+L2fwu5PioLbitwuMdYC2X8I1cyy8Pf6LQ==} + engines: {node: '>=16.9.0'} + data-view-buffer@1.0.1: resolution: {integrity: sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==} engines: {node: '>= 0.4'} @@ -973,6 +987,9 @@ packages: fast-levenshtein@2.0.6: resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==} + fastparse@1.1.2: + resolution: {integrity: sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==} + fastq@1.17.1: resolution: {integrity: sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==} @@ -2669,10 +2686,26 @@ snapshots: shebang-command: 2.0.0 which: 2.0.2 + css-selector-tokenizer@0.8.0: + dependencies: + cssesc: 3.0.0 + fastparse: 1.1.2 + cssesc@3.0.0: {} csstype@3.1.3: {} + culori@3.3.0: {} + + daisyui@4.11.1(postcss@8.4.38): + dependencies: + css-selector-tokenizer: 0.8.0 + culori: 3.3.0 + picocolors: 1.0.1 + postcss-js: 4.0.1(postcss@8.4.38) + transitivePeerDependencies: + - postcss + data-view-buffer@1.0.1: dependencies: call-bind: 1.0.7 @@ -2961,6 +2994,8 @@ snapshots: fast-levenshtein@2.0.6: {} + fastparse@1.1.2: {} + fastq@1.17.1: dependencies: reusify: 1.0.4 diff --git a/frontend/src/App.module.css b/frontend/src/App.module.css deleted file mode 100644 index 48308b2..0000000 --- a/frontend/src/App.module.css +++ /dev/null @@ -1,33 +0,0 @@ -.App { - text-align: center; -} - -.logo { - animation: logo-spin infinite 20s linear; - height: 40vmin; - pointer-events: none; -} - -.header { - background-color: #282c34; - min-height: 100vh; - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - font-size: calc(10px + 2vmin); - color: white; -} - -.link { - color: #b318f0; -} - -@keyframes logo-spin { - from { - transform: rotate(0deg); - } - to { - transform: rotate(360deg); - } -} diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index a41d209..81a8cbd 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -1,27 +1,23 @@ -import type { Component } from 'solid-js'; +import type { Component } from "solid-js"; -import logo from './logo.svg'; -import styles from './App.module.css'; - -const App: Component = () => { - return ( -
-
- logo -

- Edit src/App.tsx and save to reload. -

- - Learn Solid - -
+const App: Component = () => ( +
+
+

+ Edit src/App.tsx and save to reload. +

+ + Learn Solid + + +
- ); -}; +); export default App; diff --git a/frontend/src/index.css b/frontend/src/index.css index ec2585e..b5c61c9 100644 --- a/frontend/src/index.css +++ b/frontend/src/index.css @@ -1,13 +1,3 @@ -body { - margin: 0; - font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', - 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', - sans-serif; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -code { - font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', - monospace; -} +@tailwind base; +@tailwind components; +@tailwind utilities; diff --git a/frontend/src/index.tsx b/frontend/src/index.tsx index 6362c7b..d916449 100644 --- a/frontend/src/index.tsx +++ b/frontend/src/index.tsx @@ -1,7 +1,7 @@ /* @refresh reload */ -import { render } from 'solid-js/web'; +import { render } from "solid-js/web"; -import './index.css'; -import App from './App'; +import "./index.css"; +import App from "./App"; -render(() => , document.getElementById('root') as HTMLElement); +render(() => , document.getElementById("root") as HTMLElement); diff --git a/frontend/src/logo.svg b/frontend/src/logo.svg deleted file mode 100644 index 025aa30..0000000 --- a/frontend/src/logo.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/frontend/tailwind.config.mjs b/frontend/tailwind.config.mjs index b81a677..c35f2d1 100644 --- a/frontend/tailwind.config.mjs +++ b/frontend/tailwind.config.mjs @@ -1,7 +1,14 @@ +import daisyui from "daisyui"; + /** @type {import('tailwindcss').Config} */ export default { content: [ "./src/**/*.{js,jsx,ts,tsx}", ], - plugins: [], + plugins: [ + daisyui, + ], + daisyui: { + themes: ["black"], + }, };