Merge branch 'HimanshuNarware:main' into main

HimanshuNarware · Jun 16, 2024 · 9081f2b · 9081f2b
2 parents 830e0b8 + a8f411a
commit 9081f2b
Show file tree

Hide file tree

Showing 29 changed files with 711 additions and 298 deletions.
diff --git a/backend/.dockerignore b/backend/.dockerignore
@@ -0,0 +1,6 @@
+node_modules
+build
+.DS_Store
+.env
+.git
+.gitignore
diff --git a/backend/Dockerfile b/backend/Dockerfile
@@ -0,0 +1,12 @@
+FROM node:alpine AS builder
+WORKDIR /app
+COPY package.json package-lock.json ./
+RUN npm install
+COPY . .
+
+FROM node:alpine
+WORKDIR /app
+COPY --from=builder /app /app
+RUN npm install
+EXPOSE 8000
+CMD ["npm","start"]
diff --git a/compose.yaml b/compose.yaml
@@ -0,0 +1,18 @@
+version: '3.8'
+
+services:
+  devlab-frontend:
+    build:
+      context: ./frontend
+    ports:
+      - "3000:3000"
+    env_file:
+      - ./frontend/.env
+
+  devlab-backend:
+    build:
+      context: ./backend
+    ports:
+      - "8000:8000"
+    env_file:
+      - ./backend/.env
diff --git a/frontend/.dockerignore b/frontend/.dockerignore
@@ -0,0 +1,6 @@
+node_modules
+build
+.DS_Store
+.env
+.git
+.gitignore
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
@@ -0,0 +1,13 @@
+FROM node:alpine AS builder
+WORKDIR /app
+COPY package.json package-lock.json ./
+RUN npm install
+COPY . .
+RUN npm run build
+
+FROM node:alpine
+WORKDIR /app
+COPY --from=builder /app /app
+RUN npm install
+EXPOSE 3000
+CMD ["npm","start"]
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/public/index.html b/frontend/public/index.html
@@ -30,7 +30,7 @@
 
   gtag('config', 'G-6WS166VH7E');
 </script>
-    <title>DEVLAPS</title>
+    <title>DEVLABS</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

diff --git a/frontend/src/App.js b/frontend/src/App.js
@@ -1,13 +1,5 @@
-
-// App.js
-import React, { useState } from "react";
-import { Route, Routes } from "react-router-dom";
 import React, { useState, useEffect } from "react";
-import { Route, Routes, BrowserRouter } from "react-router-dom";
-
-
-// Components
-
+import { Route, Routes } from "react-router-dom"; // Correct import
 import "./App.css";
 import About from "./Component/About";
 import Footer from "./Component/Footer";
@@ -19,72 +11,28 @@ import ChatAssistant from "./ChatAssistant/ChatAssistant";
 import NotFound from "./Component/NotFound";
 import BackToTopButton from "./Component/BackToTopButton";
 import OpenSource from "./Component/OpenSource";
-import Review from "./Component/Review";
-
-import Review from "./Component/Review.js";
-import AOS from "aos";
-import "aos/dist/aos.css";
-
-import { Toaster } from "react-hot-toast";
-
-
 import Review from "./Component/Review";
 import AOS from "aos";
 import "aos/dist/aos.css";
 import { Toaster } from "react-hot-toast";
-
 import ScrollToTop from "./Component/ScrollToTop";
-import Faq from "./Component/Faq";
-
-// Pages
-
-
+//cards
 import RemoteJobs from "./pages/RemoteJobs";
 import AI from "./pages/AI";
 import Movie from "./pages/Movie";
 import Extension from "./pages/Extension";
 import UI from "./pages/UI";
 import FrontendTools from "./pages/FrontendTools";
 import EthicalHacking from "./pages/EthicalHacking";
-import CodingPlatform from "./pages/CodingPlatform";
+import Faq from "./Component/Faq";
+import CodingPlatform from "./pages/CodingPlateform"; // Corrected import
 import CoursesPlatform from "./pages/CoursesPlatform";
-
-import AOS from "aos";
-import "aos/dist/aos.css";
-import { Toaster } from "react-hot-toast";
-
 function App() {
   const [searchQuery, setSearchQuery] = useState("");
-
   useEffect(() => {
     AOS.init();
   }, []);
-
-  return (
-    <div>
-
-import CodingPlateform from "./pages/CodingPlateform";
-import CourcesPlatform from "./pages/CourcesPlatform";
-
-import ScrollToTop from "./Component/ScrollToTop";
-import Faq from "./Component/Faq";
-
-function App() {
-  const [searchQuery, setSearchQuery] = useState("");
-  AOS.init();
-
   return (
-import CodingPlateform from "./pages/CodingPlatform.jsx";
-import CourcesPlatform from "./pages/CoursesPlatform";
-import Faq from "./Component/Faq";
-import Productivity from "./pages/Productivity";
-import Collaboration from "./pages/Collaboration";
-import CodingPlatform from "./pages/CodingPlatform.jsx";
-import CoursesPlatform from "./pages/CoursesPlatform";
-
-function App() {
-  const [searchQuery, setSearchQuery] = useState("");
-  AOS.init();  return (
     <>
       <ScrollToTop />
       <Navbar setSearchQuery={setSearchQuery} />
@@ -96,31 +44,23 @@ function App() {
         <Route path="/review" element={<Review />} />
         <Route path="/faq" element={<Faq />} />
         <Route path="/rateus" element={<Rateus />} />
-
         <Route path="/remote-jobs" element={<RemoteJobs />} />
         <Route path="/ai" element={<AI />} />
         <Route path="/movies-series" element={<Movie />} />
         <Route path="/extension" element={<Extension />} />
         <Route path="/ui-design" element={<UI />} />
         <Route path="/front-end-tools" element={<FrontendTools />} />
         <Route path="/ethical-hacking" element={<EthicalHacking />} />
-        <Route path="/coding-platform" element={<CodingPlateform />} />
-        <Route path="/cources-platform" element={<CourcesPlatform />} />
-        <Route path="/productivity-tools" element={<Productivity />} />
-        <Route path="/collaboration-tools" element={<Collaboration />} />
         <Route path="/coding-platform" element={<CodingPlatform />} />
-        <Route path="/courses-platform" element={<CoursesPlatform />} />
-        <Route path="*" element={<NotFound />} /> {/* 404 route */}
+
+        <Route path="/courses-platform" element={<CoursesPlatform />}/>
+        {/* Define other routes as needed */}
+<Route path="*" element={<NotFound />} /> {/* 404 route */}
       </Routes>
       <BackToTopButton />
-      <Toaster />
       <Footer />
       <ChatAssistant />
-
       <Toaster />
-
-    </div>
-
     </>
   );
 }

diff --git a/frontend/src/ChatAssistant/Avatar.jsx b/frontend/src/ChatAssistant/Avatar.jsx
@@ -5,7 +5,11 @@ import "../ChatAssistant/ChatAssistant.css"
 export default function Avatar() {
   return (
     <div>
-      <img className="Avatar" src={chatbotLogo}/>
+      <img
+        className="Avatar"
+        src={chatbotLogo}
+        alt="chatbot_avatar"
+      />
     </div>
   )
 }