From 43063dcf4e385f69a3f9b67cb41693c7e82dafc3 Mon Sep 17 00:00:00 2001 From: Thastertyn Date: Thu, 20 Feb 2025 21:06:04 +0100 Subject: [PATCH] [rewrite] Added missing lib file, updated debug launch.json for frontend and updated .gitignore --- .gitignore | 1 + .vscode/launch.json | 16 +++++++++++++++- frontend/src/lib/utils.ts | 6 ++++++ 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 frontend/src/lib/utils.ts diff --git a/.gitignore b/.gitignore index 612f1fb..9fac0bb 100644 --- a/.gitignore +++ b/.gitignore @@ -292,3 +292,4 @@ cython_debug/ # option (not recommended) you can uncomment the following to ignore the entire idea folder. #.idea/ +!frontend/src/lib \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json index 3cea107..f777ab6 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -10,7 +10,7 @@ "request": "launch", "program": "${workspaceFolder}/main.py", "args": [], - "cwd": "${workspaceFolder}", + "cwd": "${workspaceFolder}/backend", "env": { "FLASK_APP": "main.py", "FLASK_ENV": "development" @@ -18,6 +18,20 @@ "console": "internalConsole", "autoReload": {"enable": true}, "justMyCode": true + }, + { + "name": "Frontend", + "type": "node", + "request": "launch", + "cwd": "${workspaceFolder}/frontend", + "runtimeArgs": [ + "run", + "dev" + ], + "runtimeExecutable": "npm", + "skipFiles": [ + "/**" + ], } ] } \ No newline at end of file diff --git a/frontend/src/lib/utils.ts b/frontend/src/lib/utils.ts new file mode 100644 index 0000000..d32b0fe --- /dev/null +++ b/frontend/src/lib/utils.ts @@ -0,0 +1,6 @@ +import { type ClassValue, clsx } from 'clsx' +import { twMerge } from 'tailwind-merge' + +export function cn(...inputs: ClassValue[]) { + return twMerge(clsx(inputs)) +}