Merge branch 'develop'

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "buzzword-bingo",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "buzzword-bingo",
-      "version": "0.1.0",
+      "version": "0.2.0",
       "dependencies": {
         "next": "14.0.1",
         "react": "^18",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "buzzword-bingo",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "private": true,
   "scripts": {
     "dev": "next dev",

src/app/components/bingocontroller.tsx

@@ -20,16 +20,16 @@ export default function BingoController(){
 	const sizeError = (items.length < size);
 	return(
 		<>
-		<div className="w-3/4 flex flex-row m-auto">
+		<div className="w-3/4 flex flex-col m-auto gap-4">
 		<Bingo size={size} items={items}/>
-		<form className="w-1/3">
-		<input type="range" min={3} max={5} value={size} className="range range-primary" step={1} onChange={({target:{value:s}}) => setSize(+s)}/>
+		<form className="w-1/3 m-auto">
+		<input type="range" min={3} max={5} value={size} className="range range-secondary" step={1} onChange={({target:{value:s}}) => setSize(+s)}/>
 		<div className="w-full flex justify-between text-xs px-2">
 			<span>3x3</span>
 			<span>4x4</span>
 			<span>5x5</span>
 		</div>
-		<a className="btn btn-primary" onClick={() => setItems(FisherYatesShuffle(buzzwords))}>Regenerate</a>
+		<a className="btn btn-secondary" onClick={() => setItems(FisherYatesShuffle(buzzwords))}>Regenerate</a>
 		</form>
 		</div>
 		{sizeError && <div className="alert alert-warning"><svg xmlns="http://www.w3.org/2000/svg" className="stroke-current shrink-0 h-6 w-6" fill="none" viewBox="0 0 24 24"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z" /></svg><span>Warning: Mismatch between item count and size</span></div>}

src/app/components/bingoitem.tsx

@@ -9,6 +9,6 @@ export default function BingoItem({text}: Props){
 	const [clicked, setClicked] = React.useState(false);
 
 	return(
-		<td className={clsx("cursor-pointer", {"bg-primary-focus":clicked})} onClick={() => setClicked(!clicked)}>{text}</td>
+		<td><a className={clsx("btn btn-ghost w-full", {"bg-primary-focus":clicked})} onClick={() => setClicked(!clicked)}>{text}</a></td>
 	);
 }

src/app/components/themeswitcher.tsx

@@ -8,12 +8,14 @@ export default function ThemeSwitcher(){
 	React.useEffect(() => {document.body.setAttribute("data-theme", theme)});
 
 	return(
-		<ul className="p-2 right-0 text-base-content">
+		<ul className="p-2 right-0 text-base-content z-10">
 			<li><a onClick={() => setTheme("light")}>Light</a></li>
 			<li><a onClick={() => setTheme("dark")}>Dark</a></li>
 			<li><a onClick={() => setTheme("synthwave")}>Synthwave</a></li>
 			<li><a onClick={() => setTheme("cyberpunk")}>Cyberpunk</a></li>
 			<li><a onClick={() => setTheme("valentine")}>Valentine</a></li>
+			<li><a onClick={() => setTheme("pastel")}>Pastel</a></li>
+			<li><a onClick={() => setTheme("aqua")}>Aqua</a></li>
 		</ul>
 	);
 }

tailwind.config.ts

@@ -7,7 +7,7 @@ const config: Config = {
 	},
 	plugins: [require("daisyui")],
 	daisyui: {
-		themes: ["light", "dark", "synthwave", "cyberpunk", "valentine"]
+		themes: ["light", "dark", "synthwave", "cyberpunk", "valentine", "pastel", "aqua"]
 	}
 };