diff --git a/package-lock.json b/package-lock.json index eadb7c4..52a2fc8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,8 @@ "version": "0.0.0", "dependencies": { "react": "^18.2.0", - "react-dom": "^18.2.0" + "react-dom": "^18.2.0", + "react-router-dom": "^7.1.0" }, "devDependencies": { "@types/react": "^18.0.37", @@ -935,6 +936,12 @@ "@types/chai": "*" } }, + "node_modules/@types/cookie": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz", + "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==", + "license": "MIT" + }, "node_modules/@types/node": { "version": "20.2.5", "resolved": "https://registry.npmjs.org/@types/node/-/node-20.2.5.tgz", @@ -1505,6 +1512,15 @@ "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", "dev": true }, + "node_modules/cookie": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.0.2.tgz", + "integrity": "sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==", + "license": "MIT", + "engines": { + "node": ">=18" + } + }, "node_modules/cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", @@ -3555,6 +3571,46 @@ "node": ">=0.10.0" } }, + "node_modules/react-router": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.1.0.tgz", + "integrity": "sha512-VcFhWqkNIcojDRYaUO8qV0Jib52s9ULpCp3nkBbmrvtoCVFRp6tmk3tJ2w9BZauVctA1YRnJlFYDn9iJRuCpGA==", + "license": "MIT", + "dependencies": { + "@types/cookie": "^0.6.0", + "cookie": "^1.0.1", + "set-cookie-parser": "^2.6.0", + "turbo-stream": "2.4.0" + }, + "engines": { + "node": ">=20.0.0" + }, + "peerDependencies": { + "react": ">=18", + "react-dom": ">=18" + }, + "peerDependenciesMeta": { + "react-dom": { + "optional": true + } + } + }, + "node_modules/react-router-dom": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.1.0.tgz", + "integrity": "sha512-F4/nYBC9e4s0/ZjxM8GkZ9a68DpX76LN1a9W9mfPl2GfbDJ9/vzJro6MThNR5qGBH6KkgcK1BziyEzXhHV46Xw==", + "license": "MIT", + "dependencies": { + "react-router": "7.1.0" + }, + "engines": { + "node": ">=20.0.0" + }, + "peerDependencies": { + "react": ">=18", + "react-dom": ">=18" + } + }, "node_modules/regexp.prototype.flags": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz", @@ -3723,6 +3779,12 @@ "semver": "bin/semver.js" } }, + "node_modules/set-cookie-parser": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz", + "integrity": "sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ==", + "license": "MIT" + }, "node_modules/shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", @@ -3990,6 +4052,12 @@ "node": ">=14" } }, + "node_modules/turbo-stream": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/turbo-stream/-/turbo-stream-2.4.0.tgz", + "integrity": "sha512-FHncC10WpBd2eOmGwpmQsWLDoK4cqsA/UT/GqNoaKOQnT8uzhtCbg3EoUDMvqpOSAI0S26mr0rkjzbOO6S3v1g==", + "license": "ISC" + }, "node_modules/type-check": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", @@ -5038,6 +5106,11 @@ "@types/chai": "*" } }, + "@types/cookie": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz", + "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==" + }, "@types/node": { "version": "20.2.5", "resolved": "https://registry.npmjs.org/@types/node/-/node-20.2.5.tgz", @@ -5464,6 +5537,11 @@ "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", "dev": true }, + "cookie": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.0.2.tgz", + "integrity": "sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==" + }, "cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", @@ -6960,6 +7038,25 @@ "integrity": "sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==", "dev": true }, + "react-router": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.1.0.tgz", + "integrity": "sha512-VcFhWqkNIcojDRYaUO8qV0Jib52s9ULpCp3nkBbmrvtoCVFRp6tmk3tJ2w9BZauVctA1YRnJlFYDn9iJRuCpGA==", + "requires": { + "@types/cookie": "^0.6.0", + "cookie": "^1.0.1", + "set-cookie-parser": "^2.6.0", + "turbo-stream": "2.4.0" + } + }, + "react-router-dom": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.1.0.tgz", + "integrity": "sha512-F4/nYBC9e4s0/ZjxM8GkZ9a68DpX76LN1a9W9mfPl2GfbDJ9/vzJro6MThNR5qGBH6KkgcK1BziyEzXhHV46Xw==", + "requires": { + "react-router": "7.1.0" + } + }, "regexp.prototype.flags": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz", @@ -7073,6 +7170,11 @@ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", "dev": true }, + "set-cookie-parser": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz", + "integrity": "sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ==" + }, "shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", @@ -7274,6 +7376,11 @@ "punycode": "^2.3.0" } }, + "turbo-stream": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/turbo-stream/-/turbo-stream-2.4.0.tgz", + "integrity": "sha512-FHncC10WpBd2eOmGwpmQsWLDoK4cqsA/UT/GqNoaKOQnT8uzhtCbg3EoUDMvqpOSAI0S26mr0rkjzbOO6S3v1g==" + }, "type-check": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", diff --git a/package.json b/package.json index 727f1c1..b813694 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,8 @@ }, "dependencies": { "react": "^18.2.0", - "react-dom": "^18.2.0" + "react-dom": "^18.2.0", + "react-router-dom": "^7.1.0" }, "devDependencies": { "@types/react": "^18.0.37", diff --git a/src/App.css b/src/App.css index b9d355d..3bc861d 100644 --- a/src/App.css +++ b/src/App.css @@ -1,42 +1,171 @@ #root { max-width: 1280px; margin: 0 auto; - padding: 2rem; text-align: center; } -.logo { - height: 6em; - padding: 1.5em; - will-change: filter; - transition: filter 300ms; + +@media (prefers-reduced-motion: no-preference) { + a:nth-of-type(2) .logo { + animation: logo-spin infinite 20s linear; + } +} + + + +/* *** Nav Section *** */ +nav { + margin: 10px; + height: 75px; + padding: 0px 20px; + + background-color: #2563EB; + border-radius: 15px; + + display: flex; + align-items: center; +} + +nav p { + text-align: center; + font-weight: bold; + font-size: 17px; + color: #E2E8F0; + } -.logo:hover { - filter: drop-shadow(0 0 2em #646cffaa); + +/* *** Home Page Section *** */ +.page-container h1 { + font-size: 25px; } -.logo.react:hover { - filter: drop-shadow(0 0 2em #61dafbaa); + +.companies-container { + display: flex; + flex-wrap: wrap; + justify-content: space-evenly; } -@keyframes logo-spin { - from { - transform: rotate(0deg); - } - to { - transform: rotate(360deg); - } +.each-company { + margin: 25px; + padding: 10px; + + width: 350px; + height: 275px; + + box-shadow: 0px 5px 3px #dfdfdf; + + font-weight: bold; + font-size: 20px; + color: #000; + + display: flex; + flex-direction: column; + justify-content: space-evenly; + align-items: center; } -@media (prefers-reduced-motion: no-preference) { - a:nth-of-type(2) .logo { - animation: logo-spin infinite 20s linear; - } +.each-company img { + width: 100px; + margin-bottom: 55px; +} + +/* *** Company Page Section *** */ +.company-page { + padding: 20px; + + display: flex; + flex-direction: column; + justify-content: space-between; + align-items: center; + gap: 70px; +} + +.company-page h1 { + font-size: 27px; +} + +.image-container img { + width: 125px; +} + +.image-container { + margin: 25px; + padding: 10px; + + width: 250px; + height: 250px; + + box-shadow: 0px 5px 3px #dfdfdf; + + font-weight: bold; + font-size: 20px; + color: #000; + + display: flex; + flex-direction: column; + justify-content: space-evenly; + align-items: center; +} + +.company-info-container { + margin-bottom: 45px; + width: 75vw; + + display: flex; + flex-wrap: wrap; + justify-content: space-between; + align-items: center; + gap: 15px; } -.card { - padding: 2em; +.info-section { + width: 50%; + height: 275px; } -.read-the-docs { - color: #888; +.info-section h2 { + font-size: 35px; +} + +.info-section p { + text-align: center; +} + +/* *** Tech Stack List Section *** */ +.each-tech-stack img { + width: 70px; +} + +.tech-stack-list { + width: 95vw; + padding: 10px; + + overflow: hidden; + + display: flex; + gap: 20px; + overflow-x: auto; + scrollbar-width: thin; + white-space: nowrap; + justify-content: space-evenly; + align-items: center; +} + +.each-tech-stack { + margin: 25px; + padding: 10px; + + width: 150px; + height: 150px; + + box-shadow: 0px 5px 3px #dfdfdf; + + font-weight: bold; + font-size: 20px; + color: #000; + + display: flex; + flex-direction: column; + justify-content: space-evenly; + align-items: center; } diff --git a/src/App.jsx b/src/App.jsx index 1b51d87..da31992 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -1,9 +1,27 @@ +import { useState } from "react"; import "./App.css"; +import CompaniesData from "./companies.json"; +import TechnologiesData from "./technologies.json"; +import Navbar from "./components/Navbar"; +import HomePage from "./pages/HomePage"; +import CompanyPage from "./pages/CompanyPage"; +import TechnologyPage from "./pages/TechnologyPage"; +import { Route, Routes } from "react-router-dom"; function App() { + const [companies, setCompanies] = useState(CompaniesData); + // console.log(companies); + const [technologies, setTechnologies] = useState(TechnologiesData); + // console.log(technologies); + return (
-

LAB | React Stack Tracker

+ + + } /> + } /> + } /> +
); } diff --git a/src/components/Navbar.jsx b/src/components/Navbar.jsx index 09e2806..e261b54 100644 --- a/src/components/Navbar.jsx +++ b/src/components/Navbar.jsx @@ -1,5 +1,11 @@ +import { Link } from "react-router-dom"; + function Navbar() { - return ; + return ( + + ); } export default Navbar; diff --git a/src/index.css b/src/index.css index b121ef9..5f4efce 100644 --- a/src/index.css +++ b/src/index.css @@ -21,10 +21,12 @@ a:hover { body { margin: 0; - display: flex; + overflow-x: hidden; place-items: center; min-width: 320px; min-height: 100vh; + + background-color: #F5F7FA; } h1 { diff --git a/src/main.jsx b/src/main.jsx index 54b39dd..1c4773a 100644 --- a/src/main.jsx +++ b/src/main.jsx @@ -1,10 +1,14 @@ -import React from 'react' -import ReactDOM from 'react-dom/client' -import App from './App.jsx' -import './index.css' +import React from "react"; +import ReactDOM from "react-dom/client"; +import App from "./App.jsx"; +import "./index.css"; -ReactDOM.createRoot(document.getElementById('root')).render( +import { BrowserRouter as Router } from "react-router-dom"; + +ReactDOM.createRoot(document.getElementById("root")).render( - - , -) + + + + +); diff --git a/src/pages/CompanyPage.jsx b/src/pages/CompanyPage.jsx index cc5903c..2eb7406 100644 --- a/src/pages/CompanyPage.jsx +++ b/src/pages/CompanyPage.jsx @@ -1,7 +1,51 @@ -function CompanyPage() { +import { Link, useParams } from "react-router-dom"; + + +function CompanyPage(props) { + + // console.log(props); + const companies = props.companies; + // console.log(companies) + + const dynamicParams = useParams(); + // console.log(dynamicParams); + // console.log(dynamicParams.companySlug) + + const foundCompany = companies.find((eachCompany) => { + if(eachCompany.slug === dynamicParams.companySlug) { + return true; + } else { + return false; + } + }) + + // console.log(foundCompany) + return ( -
-

CompanyPage

+
+

Company Profile

+
+
+ +
+
+

{foundCompany.name}

+

About

+

{foundCompany.description}

+
+
+
+ {foundCompany.techStack.map((eachTech) => { + return( + +
+ +
+

{eachTech.name}

+ + ) + })} +
); } diff --git a/src/pages/HomePage.jsx b/src/pages/HomePage.jsx index e97e7de..77184b3 100644 --- a/src/pages/HomePage.jsx +++ b/src/pages/HomePage.jsx @@ -1,7 +1,25 @@ -function HomePage() { +import { Link } from "react-router-dom"; + +function HomePage(props) { + // console.log(props.companies); + const companies = props.companies; + // console.log(companies); + return ( -
-

HomePage

+
+

StackTracker: Discover Tech Stacks Used by Top Companies

+
+ {companies.map((eachCompany) => { + return ( + +
+

{eachCompany.name}

+ +
+ + ); + })} +
); } diff --git a/src/pages/TechnologyPage.jsx b/src/pages/TechnologyPage.jsx index 30f9414..4c633a1 100644 --- a/src/pages/TechnologyPage.jsx +++ b/src/pages/TechnologyPage.jsx @@ -1,7 +1,44 @@ -function TechnologyPage() { +import { useNavigate, useParams, useSearchParams } from "react-router-dom"; + +function TechnologyPage(props) { + // console.log(props); + const technologies = props.technologies; + + const dynamicParams = useParams(); + // console.log(dynamicParams) + // console.log(dynamicParams.slug); + + const foundTech = technologies.find((eachTech) => { + if (eachTech.slug === dynamicParams.slug) { + return true; + } else { + return false; + } + }); + + // console.log(foundTech); + + const [searchParams] = useSearchParams(); + const navigate = useNavigate(); + + const companySlug = searchParams.get("company"); + return ( -
-

TechnologyPage

+
+

Technology Details

+
+
+ +
+
+

{foundTech.name}

+

About

+

{foundTech.description}

+
+
+
); }