Fixed toggle button, Fixed build

SujithThirumalaisamy · Jun 20, 2024 · 395da14 · 395da14
1 parent f21b009
commit 395da14
Show file tree

Hide file tree

Showing 9 changed files with 549 additions and 21 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -7,15 +7,15 @@ WORKDIR /usr/src/app
 COPY . .
 
 # Install dependencies
-RUN yarn install
+RUN pnpm install
 
 # Generate Prisma client
-RUN cd packages/db && npx prisma generate
+RUN cd packages/db && pnpm dlx prisma generate
 
 # Expose ports for both applications
 EXPOSE 3000
 
 WORKDIR /usr/src/app
 
 # Command to start both services
-CMD ["yarn", "run", "dev:docker"]
+CMD ["pnpm", "run", "dev:docker"]
diff --git a/apps/boilerplate-generator/package.json b/apps/boilerplate-generator/package.json
@@ -13,6 +13,7 @@
   "license": "ISC",
   "dependencies": {
     "@types/node": "^20.12.12",
-    "antlr4": "^4.13.1-patch-1"
+    "antlr4": "^4.13.1-patch-1",
+    "esbuild": "^0.21.5"
   }
 }
diff --git a/apps/web/components/ModeToggle.tsx b/apps/web/components/ModeToggle.tsx
@@ -13,11 +13,11 @@ import {
 } from "../../../packages/ui/src/@/components/ui/dropdown-menu"
 
 export function ModeToggle() {
-  const { resolvedTheme,setTheme } = useTheme()
+  const { resolvedTheme, setTheme } = useTheme()
   return (
     <DropdownMenu>
       <DropdownMenuTrigger asChild>
-        <Button style={{color:resolvedTheme=='dark'?'white':'black'}} variant="outline" size="icon">
+        <Button style={{ color: resolvedTheme == 'dark' ? 'black' : 'white' }} >
           <Sun className="h-[1.2rem] w-[1.2rem] rotate-0 scale-100 transition-all dark:-rotate-90 dark:scale-0" />
           <Moon className="absolute h-[1.2rem] w-[1.2rem] rotate-90 scale-0 transition-all dark:rotate-0 dark:scale-100" />
           <span className="sr-only">Toggle theme</span>

diff --git a/apps/web/package.json b/apps/web/package.json
@@ -11,16 +11,16 @@
   "dependencies": {
     "@marsidev/react-turnstile": "^0.7.1",
     "@monaco-editor/react": "^4.6.0",
-    "@radix-ui/react-avatar": "^1.0.4",
     "@radix-ui/react-slot": "^1.0.2",
-    "@repo/ui": "workspace:*",
     "@repo/common": "workspace:*",
+    "@repo/ui": "workspace:*",
     "@types/bcrypt": "^5.0.2",
     "axios": "^1.7.2",
     "bcrypt": "^5.1.1",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.1",
     "ioredis": "^5.4.1",
+    "jose": "^5.4.1",
     "lucide-react": "^0.383.0",
     "next": "^14.1.1",
     "next-auth": "^4.24.7",

diff --git a/docker/problems/Dockerfile b/docker/problems/Dockerfile
@@ -5,10 +5,10 @@ WORKDIR /usr/src/app
 COPY ./apps/problems /usr/src/app/apps/problems
 
 # Install dependencies
-RUN npm install
+RUN pnpm install
 
 # Generate Prisma client
-RUN cd packages/db && npx prisma generate
+RUN cd packages/db && pnpm dlx prisma generate
 
 # Expose ports for both applications
-EXPOSE 3000
+EXPOSE 3000
diff --git a/docker/sweeper/Dockerfile b/docker/sweeper/Dockerfile
@@ -13,13 +13,13 @@ COPY turbo.json /usr/src/app/
 COPY tsconfig.json /usr/src/app/
 
 # Install dependencies
-RUN npm install
+RUN pnpm install
 
 # Generate Prisma client
-RUN cd packages/db && DATABASE_URL=$DATABASE_URL npx prisma generate
+RUN cd packages/db && DATABASE_URL=$DATABASE_URL pnpm dlx prisma generate
 
 WORKDIR /usr/src/app
 
 # Command to start both services
-RUN npm run build --prefix apps/sweeper
-CMD ["npm", "run", "start:sweeper"]
+RUN pnpm run build --prefix apps/sweeper
+CMD ["pnpm", "run", "start:sweeper"]
diff --git a/docker/web/Dockerfile b/docker/web/Dockerfile
@@ -13,16 +13,16 @@ COPY turbo.json /usr/src/app/
 COPY tsconfig.json /usr/src/app/
 
 # Install dependencies
-RUN npm install
+RUN pnpm install
 
 # Generate Prisma client
-RUN cd packages/db && DATABASE_URL=$DATABASE_URL npx prisma generate
+RUN cd packages/db && DATABASE_URL=$DATABASE_URL pnpm dlx prisma generate
 
 # Expose ports for both applications
 EXPOSE 3000
 
 WORKDIR /usr/src/app
 
 # Command to start both services
-RUN npm run build --prefix apps/web
-CMD ["npm", "run", "start:web"]
+RUN pnpm run build --prefix apps/web
+CMD ["pnpm", "run", "start:web"]
diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -29,9 +29,16 @@
     "typescript": "^5.3.3"
   },
   "dependencies": {
+    "@radix-ui/react-avatar": "^1.1.0",
     "@radix-ui/react-dropdown-menu": "^2.0.6",
     "@radix-ui/react-label": "^2.0.2",
     "@radix-ui/react-select": "^2.0.0",
-    "@radix-ui/react-tabs": "^1.0.4"
+    "@radix-ui/react-slot": "^1.0.2",
+    "@radix-ui/react-tabs": "^1.0.4",
+    "class-variance-authority": "^0.7.0",
+    "clsx": "^2.1.1",
+    "lucide-react": "^0.383.0",
+    "shadcn-ui": "^0.8.0",
+    "tailwind-merge": "^2.3.0"
   }
 }