Skip to content

Commit

Permalink
Merge branch 'main' into Fill-remote-jobs-734
Browse files Browse the repository at this point in the history
  • Loading branch information
panwar8279 authored Jun 15, 2024
2 parents 6da11b0 + e8f1eab commit 9396dc4
Show file tree
Hide file tree
Showing 12 changed files with 101 additions and 7 deletions.
6 changes: 6 additions & 0 deletions backend/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
node_modules
build
.DS_Store
.env
.git
.gitignore
12 changes: 12 additions & 0 deletions backend/Dockerfile
Original file line number Diff line number Diff line change
@@ -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"]
18 changes: 18 additions & 0 deletions compose.yaml
Original file line number Diff line number Diff line change
@@ -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
6 changes: 6 additions & 0 deletions frontend/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
node_modules
build
.DS_Store
.env
.git
.gitignore
13 changes: 13 additions & 0 deletions frontend/Dockerfile
Original file line number Diff line number Diff line change
@@ -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"]
31 changes: 28 additions & 3 deletions frontend/src/App.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// App.js
import React, { useState, useEffect } from "react";
import { Route, Routes, BrowserRouter } from "react-router-dom";
import React, { useState } from "react";
import { Route, Routes } from "react-router-dom";

// Components
import "./App.css";
Expand Down Expand Up @@ -32,11 +32,19 @@ import Extension from "./pages/Extension";
import UI from "./pages/UI";
import FrontendTools from "./pages/FrontendTools";
import EthicalHacking from "./pages/EthicalHacking";

import CodingPlateform from "./pages/CodingPlateform.jsx";
import CourcesPlatform from "./pages/CoursesPlatform.jsx";

import Faq from "./Component/Faq";

import CoursesPlatform from "./pages/CoursesPlatform";
import Productivity from "./pages/Productivity";
import Collaboration from "./pages/Collaboration";
import CodingPlatform from "./pages/CodingPlateform";



function App() {
const [searchQuery, setSearchQuery] = useState("");
AOS.init();
Expand All @@ -51,6 +59,7 @@ function App() {
<Route path="/about" element={<About />}></Route>
<Route path="/open-source" element={<OpenSource />}></Route>
<Route path="/review" element={<Review />} />

<Route path="*" element={<NotFound />} /> {/* 404 route */}
<Route path="/faq" element={<Faq />}></Route>
<Route path="/remote-jobs" element={<RemoteJobs />}></Route>
Expand All @@ -62,6 +71,22 @@ function App() {
<Route path="/ethical-hacking" element={<EthicalHacking />}></Route>
<Route path="/coding-platform" element={<CodingPlateform />}></Route>
<Route path="/cources-platform" element={<CourcesPlatform />}></Route>

<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={<CodingPlatform />} />
<Route path="/courses-platform" element={<CoursesPlatform />} />
<Route path="/productivity-tools" element={<Productivity />} />
<Route path="/collaboration-tools" element={<Collaboration />} />
<Route path="" element={<NotFound />} /> {/ 404 route */}

</Routes>
<BackToTopButton />
<Toaster />
Expand All @@ -70,4 +95,4 @@ function App() {
);
}

export default App;
export default App;
6 changes: 5 additions & 1 deletion frontend/src/ChatAssistant/Avatar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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>
)
}
2 changes: 1 addition & 1 deletion frontend/src/ChatAssistant/ChatAssistant.css
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

.react-chatbot-kit-chat-container {
width: 350px;
height: 450px;
height: 415px;
}

.react-chatbot-kit-chat-bot-message {
Expand Down
6 changes: 5 additions & 1 deletion frontend/src/ChatAssistant/UserAvatar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ import "../ChatAssistant/ChatAssistant.css"
export default function Avatar() {
return (
<div>
<img className="userAvatar" src={userAvatar}/>
<img
className="userAvatar"
src={userAvatar}
alt="useravatar_pic"
/>
</div>
)
}
1 change: 1 addition & 0 deletions frontend/src/Component/About.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ function About() {
<img
className="img"
src="https://media.istockphoto.com/id/1276643671/vector/tiny-programmers-programming-website-for-internet-platform.jpg?s=612x612&w=0&k=20&c=7k24K8DYdSRxVHj3roqR_f4wkk-a_fG3WlT4hN-VJUg="
alt="img"
/>
</div>
<div className="bx-1">
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/Component/Footer.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React from "react";
import logo from "../image/logo.png";
import "../style/Footer.css";

import { FaGithubSquare, FaLinkedin, FaTwitter } from "react-icons/fa";
import { SiGmail } from "react-icons/si";
import { Link } from "react-router-dom";
Expand Down Expand Up @@ -194,4 +195,4 @@ function Footer() {
);
}

export default Footer;
export default Footer;
4 changes: 4 additions & 0 deletions frontend/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,12 @@ root.render(
<BrowserRouter> {/* Ensure BrowserRouter is only here */}
<App />



<ToastContainer />

<ToastContainer/>

</BrowserRouter>
</Provider>
);

0 comments on commit 9396dc4

Please sign in to comment.