Skip to content

Commit

Permalink
Merge branch 'main' into hoveritems
Browse files Browse the repository at this point in the history
  • Loading branch information
@sailaja-adapa
sailaja-adapa committed Jun 19, 2024
2 parents f5ba20d + 33a4ccf commit 31d888b
Show file tree
Hide file tree
Showing 196 changed files with 355,698 additions and 3,052 deletions.
8 changes: 4 additions & 4 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div align="center">
<h1><img src="https://raw.githubusercontent.com/Tarikul-Islam-Anik/Animated-Fluent-Emojis/master/Emojis/Objects/Laptop.png" alt="Laptop" width="50" height="50" /> DevLaps</h1>
<p>Welcome to DevLaps, a website where you can search for free tools that are useful for your daily needs. This application is created by the incredible open-source community. On DevLaps, you can discover a collection of free tools that can assist you in various aspects of your life. Moreover, you have the opportunity to contribute to this project by adding more tools to the database.</p>
<p>Check out the live project at <a href="https://DevLabs-one.vercel.app">DevLaps</a></p>
<h1><img src="https://raw.githubusercontent.com/Tarikul-Islam-Anik/Animated-Fluent-Emojis/master/Emojis/Objects/Laptop.png" alt="Laptop" width="50" height="50" /> DevLabs</h1>
<p>Welcome to DevLabs, a website where you can search for free tools that are useful for your daily needs. This application is created by the incredible open-source community. On DevLaps, you can discover a collection of free tools that can assist you in various aspects of your life. Moreover, you have the opportunity to contribute to this project by adding more tools to the database.</p>
<p>Check out the live project at <a href="https://DevLabs-one.vercel.app">DevLabs</a></p>
<img src="https://github.com/HimanshuNarware/Devlabs/assets/83147410/a508cf73-6724-46d3-a66d-6b9a7811bfdd" alt="DevLaps" />
</div>

Expand Down Expand Up @@ -118,7 +118,7 @@ git push origin YourBranchName
Create a [Pull Request](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request)!

<div align="center">
<h2>Let's Collaborate and Make DevLaps Even Better! 💻🌟</h2>
<h2>Let's Collaborate and Make DevLabs Even Better! 💻🌟</h2>
</div>


12 changes: 6 additions & 6 deletions frontend/src/App.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,16 @@ import UI from "./pages/UI";
import Movie from "./pages/Movie";
import Extension from "./pages/Extension";
import EthicalHacking from "./pages/EthicalHacking";
import CodingPlatform from "./pages/CodingPlateform";
import CoursesPlatform from "./pages/CoursesPlatform";
import FrontendTools from "./pages/FrontendTools";
import Faq from "./Component/Faq";
import CodingPlatform from "./pages/CodingPlatform"; // Corrected import
import CoursesPlatform from "./pages/CoursesPlatform";

function App() {
const [searchQuery, setSearchQuery] = useState("");

useEffect(() => {
AOS.init();
}, []);

return (
<>
<ScrollToTop />
Expand All @@ -55,8 +53,10 @@ function App() {
<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="*" element={<NotFound />} /> {/* 404 route */}

<Route path="/courses-platform" element={<CoursesPlatform />}/>
{/* Define other routes as needed */}
<Route path="*" element={<NotFound />} /> {/* 404 route */}
</Routes>
<BackToTopButton />
<Footer />
Expand Down
92 changes: 7 additions & 85 deletions frontend/src/Component/Footer.js
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import React from "react";
import logo from "../image/logo.png";
import logo from "../image/logo1.png";
import "../style/Footer.css";


import { BsLinkedin } from "react-icons/bs";

import { FaGithubSquare, FaLinkedin, FaTwitter } from "react-icons/fa";
import { FaGithubSquare, FaLinkedin } from "react-icons/fa";
import { FaSquareXTwitter } from "react-icons/fa6";
import { SiGmail } from "react-icons/si";
import { Link } from "react-router-dom";

Expand All @@ -17,7 +17,7 @@ function Footer() {
<div className='row'>
<div className='col-md-6 col-lg-4 col-12 ft-1'>
<a href='https://www.devlabsstore.tech/'>
<img width={209} src={logo} alt='devlaps' />
<img width={209} src={logo} alt='devlabs' />
</a>
<h5>
Facing an issue or just <br />
Expand All @@ -30,43 +30,9 @@ function Footer() {
<div className="col-md-6 col-lg-3 col-12 ft-2">
<h5>Company</h5>
<ul>

<li className="nav-item">
<a href="https://www.devlabsstore.tech/">Home</a>
</li>
<li className="nav-item">
<a href="https://www.devlabsstore.tech/about">About Us</a>
</li>
<li className="nav-item">
<a href="https://www.devlabsstore.tech/bookmark">Bookmark</a>
</li>
<li className="nav-item">
<a href="https://www.linkedin.com/in/himanshunarware/">Contact</a>
</li>
<li className="nav-item">

<a href="https://www.devlabsstore.tech/open-source">Open Source</a>

<a className="" href="https://www.devlabsstore.tech/open-source">
Open Source
</a>
</li>
<li className='nav-item'>
<a href='https://www.devlabsstore.tech/'>Home</a>
</li>
<li className='nav-item'>
<a href='https://www.devlabsstore.tech/about'>About Us</a>
</li>
<li className='nav-item'>
<a href='https://www.devlabsstore.tech/bookmark'>Bookmark</a>
</li>
<li className='nav-item'>
<a href='https://www.linkedin.com/in/himanshunarware/'>Contact</a>
</li>
<li className='nav-item'>
<a href='https://www.devlabsstore.tech/open-source'>Open Source</a>


</li>
</ul>
</div>
<div className="col-md-6 col-lg-3 col-12 ft-2">
Expand All @@ -86,29 +52,6 @@ function Footer() {
</li>
<li className="nav-item">
<a href="/ui-design">UI Design</a>
<Link className="" to="/ui-design">
UI Design
</Link>
<a className="" href="/ui-design">
UI Design
</a>
</li>

<li className='nav-item'>
<a href='/remote-jobs'>Remote Jobs</a>
</li>
<li className='nav-item'>
<a href='/ai'>AI</a>
</li>
<li className='nav-item'>
<a href='/movies-series'>Movie/Series</a>
</li>
<li className='nav-item'>
<a href='/extension'>Extension</a>
</li>
<li className='nav-item'>
<a href='/ui-design'>UI Design</a>

</li>
</ul>
</div>
Expand All @@ -125,28 +68,7 @@ function Footer() {
<a href="/coding-platform">Coding Platforms</a>
</li>
<li className="nav-item">

<a href="/courses-platform">Course Platforms</a>
<Link className="" to="/courses-platform">

<a className="" href="/course-platform">

Course Platforms
</a>
</Link>
</li>
<li className='nav-item'>
<a href='/front-end-tools'>Frontend Tools</a>
</li>
<li className='nav-item'>
<a href='/ethical-hacking'>Ethical Hacking</a>
</li>
<li className='nav-item'>
<a href='/coding-platform'>Coding Platforms</a>
</li>
<li className='nav-item'>
<a href='/courses-platform'>Course Platforms</a>

</li>
</ul>
</div>
Expand Down Expand Up @@ -174,7 +96,7 @@ function Footer() {
rel="noreferrer"
target="_blank"
>
<FaTwitter className="text-white mx-1 fs-4" />
<FaSquareXTwitter className="text-white mx-1 fs-4" />
</a>
<a
href="mailto:himanshunarware77@gmail.com"
Expand All @@ -198,4 +120,4 @@ function Footer() {
);
}

export default Footer;
export default Footer;
14 changes: 6 additions & 8 deletions frontend/src/Component/Navbar/Navbar.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useState } from "react";
import "../../style/Navbar.css"
import "../../style/Navbar.css";
import Sidebar from "../Sidebar/Sidebar";
import NavbarLeft from "./NavbarLeft";
import NavbarCenter from "./NavbarCenter";
Expand All @@ -9,16 +9,14 @@ function Navbar(props) {
const [showSideNav, setShowSideNav] = useState(false);

return (
<header >
<header>
<div className="navbar">
<NavbarLeft showSideNav={showSideNav} setShowSideNav={setShowSideNav}/>
<NavbarLeft showSideNav={showSideNav} setShowSideNav={setShowSideNav} />
<NavbarCenter />
<NavbarRight setSearchQuery={props.setSearchQuery} /> {/* Pass setSearchQuery directly */}
<NavbarRight setSearchQuery={props.setSearchQuery} />
{/* Pass setSearchQuery directly */}
</div>


<Sidebar showSideNav={showSideNav} />

<Sidebar showSideNav={showSideNav} />
</header>
);
}
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/Component/Navbar/NavbarLeft.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useEffect } from "react";
import { IoReorderThree, IoClose } from "react-icons/io5";
import "../../style/Navbar.css"
import logo from "../../image/logo.png";
import logo from "../../image/logo1.png";

function NavbarLeft(props) {
useEffect(() => {
Expand Down
Loading

0 comments on commit 31d888b

Please sign in to comment.