-
Notifications
You must be signed in to change notification settings - Fork 97
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4 from alexpinel/tailwind-integration
Tailwind integration
- Loading branch information
Showing
32 changed files
with
3,927 additions
and
1,213 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
{ | ||
"trailingComma": "es5", | ||
"tabWidth": 4, | ||
"semi": false, | ||
"singleQuote": true, | ||
"plugins": ["prettier-plugin-tailwindcss"] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
import { clsx, type ClassValue } from "clsx" | ||
import { twMerge } from "tailwind-merge" | ||
|
||
export function cn(...inputs: ClassValue[]) { | ||
return twMerge(clsx(inputs)) | ||
} |
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,81 +1,91 @@ | ||
{ | ||
"name": "dot", | ||
"productName": "dot", | ||
"version": "1.0.0", | ||
"description": "dot, a surprisingly useful tool?", | ||
"main": "src/index.js", | ||
"scripts": { | ||
"start": "electron-forge start", | ||
"package": "electron-forge package", | ||
"make": "electron-forge make", | ||
"publish": "electron-forge publish", | ||
"lint": "echo \"No linting configured\"", | ||
"pack": "electron-builder --dir", | ||
"dist": "electron-builder" | ||
}, | ||
"keywords": [], | ||
"author": { | ||
"name": "Alex Piñel Neparidze", | ||
"email": "[email protected]" | ||
}, | ||
"license": "MIT", | ||
"dependencies": { | ||
"@craco/craco": "^5.9.0", | ||
"dompurify": "^3.0.6", | ||
"electron-squirrel-startup": "^1.0.0", | ||
"fs-extra": "^10.0.1", | ||
"jquery": "^3.7.1", | ||
"markdown-it": "^13.0.2", | ||
"marked": "^11.0.0", | ||
"python3": "^0.0.1", | ||
"requirejs": "^2.3.6", | ||
"virtualenv": "^0.3.1" | ||
}, | ||
"devDependencies": { | ||
"@electron-forge/cli": "^6.4.2", | ||
"@electron-forge/maker-deb": "^6.4.2", | ||
"@electron-forge/maker-dmg": "^7.2.0", | ||
"@electron-forge/maker-rpm": "^6.4.2", | ||
"@electron-forge/maker-squirrel": "^6.4.2", | ||
"@electron-forge/maker-zip": "^6.4.2", | ||
"@electron-forge/plugin-auto-unpack-natives": "^6.4.2", | ||
"autoprefixer": "^10.4.16", | ||
"electron": "26.2.4", | ||
"electron-builder": "^24.6.4", | ||
"ncp": "^2.0.0" | ||
}, | ||
"build": { | ||
"appId": "dot", | ||
"name": "dot", | ||
"productName": "dot", | ||
"mac": { | ||
"category": "Productivity", | ||
"target": "dmg", | ||
"icon": "./src/Assets/icon2.icns", | ||
"identity": "Apple Development: [email protected] (863FT89FMU)" | ||
"version": "1.0.0", | ||
"description": "DOOOOOOOOOOOOOOOT BAREBONES VERSION", | ||
"main": "src/index.js", | ||
"scripts": { | ||
"tail": "tailwindcss -i ./src/index.css -o ./src/dist/output.css --watch", | ||
"build": "webpack", | ||
"start": "electron-forge start", | ||
"package": "electron-forge package", | ||
"make": "electron-forge make", | ||
"publish": "electron-forge publish", | ||
"lint": "echo \"No linting configured\"" | ||
}, | ||
"extraResources": { | ||
"from": "/Users/alexpinel/Desktop/llm", | ||
"to": "llm", | ||
"filter": [ | ||
"**/*" | ||
] | ||
} | ||
}, | ||
"config": { | ||
"forge": { | ||
"packagerConfig": { | ||
"icon": "./src/Assets/icon2.icns", | ||
"extraResources": { | ||
"from": "./llm", | ||
"to": "llm" | ||
"keywords": [], | ||
"author": { | ||
"name": "Bluepoint", | ||
"email": "[email protected]" | ||
}, | ||
"license": "MIT", | ||
"dependencies": { | ||
"@craco/craco": "^5.9.0", | ||
"@headlessui/react": "^1.7.17", | ||
"@heroicons/react": "^2.1.1", | ||
"@radix-ui/react-icons": "^1.3.0", | ||
"class-variance-authority": "^0.7.0", | ||
"clsx": "^2.0.0", | ||
"dompurify": "^3.0.6", | ||
"electron-squirrel-startup": "^1.0.0", | ||
"flowbite": "^2.2.1", | ||
"fs-extra": "^10.0.1", | ||
"jquery": "^3.7.1", | ||
"lucide-react": "^0.302.0", | ||
"markdown-it": "^13.0.2", | ||
"marked": "^11.0.0", | ||
"python3": "^0.0.1", | ||
"requirejs": "^2.3.6", | ||
"tailwind-merge": "^2.2.0", | ||
"tailwindcss-animate": "^1.0.7", | ||
"virtualenv": "^0.3.1" | ||
}, | ||
"devDependencies": { | ||
"@electron-forge/cli": "^6.4.2", | ||
"@electron-forge/maker-deb": "^6.4.2", | ||
"@electron-forge/maker-dmg": "^7.2.0", | ||
"@electron-forge/maker-rpm": "^6.4.2", | ||
"@electron-forge/maker-squirrel": "^6.4.2", | ||
"@electron-forge/maker-zip": "^6.4.2", | ||
"@electron-forge/plugin-auto-unpack-natives": "^6.4.2", | ||
"autoprefixer": "^10.4.16", | ||
"electron": "26.2.4", | ||
"electron-builder": "^24.6.4", | ||
"ncp": "^2.0.0", | ||
"postcss": "^8.4.32", | ||
"postcss-cli": "^11.0.0", | ||
"postcss-loader": "^7.3.4", | ||
"prettier": "^3.1.1", | ||
"prettier-plugin-tailwindcss": "^0.5.10", | ||
"tailwindcss": "^3.4.0", | ||
"webpack": "^5.89.0", | ||
"webpack-cli": "^5.1.4" | ||
}, | ||
"build": { | ||
"appId": "dot", | ||
"productName": "dot", | ||
"mac": { | ||
"category": "Productivity", | ||
"target": "dmg", | ||
"icon": "./src/Assets/icon2.icns", | ||
"identity": "Apple Development: [email protected] (863FT89FMU)" | ||
} | ||
}, | ||
"makers": [ | ||
{ | ||
"name": "@electron-forge/maker-dmg", | ||
"config": {} | ||
}, | ||
"config": { | ||
"forge": { | ||
"packagerConfig": { | ||
"icon": "./src/Assets/icon2.icns", | ||
"extraResources": { | ||
"from": "./llm", | ||
"to": "llm" | ||
} | ||
}, | ||
"makers": [ | ||
{ | ||
"name": "@electron-forge/maker-dmg", | ||
"config": {} | ||
} | ||
] | ||
} | ||
] | ||
} | ||
} | ||
} |
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file.
Oops, something went wrong.