From 07717bf6e0bb9c5dbe8773489ab54cbd8d6099b7 Mon Sep 17 00:00:00 2001 From: christhomas1190 <111439861+christhomas1190@users.noreply.github.com> Date: Fri, 9 May 2025 11:02:02 -0400 Subject: [PATCH 01/29] trudging through the mud to have something presentable --- frontend/package-lock.json | 54 +++++++++++++++++++++++++ frontend/package.json | 1 + frontend/src/Components/App.js | 36 +++++++---------- frontend/src/Components/NewsArticle.css | 44 ++++++++++++++++++++ frontend/src/Components/NewsArticle.js | 32 +++++++++++++++ frontend/src/Components/NewsCard.js | 10 ++--- frontend/src/Components/NewsGrid.js | 21 +++++----- 7 files changed, 160 insertions(+), 38 deletions(-) create mode 100644 frontend/src/Components/NewsArticle.css create mode 100644 frontend/src/Components/NewsArticle.js diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 18eb0d0..491647b 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -14,6 +14,7 @@ "@testing-library/user-event": "^13.5.0", "react": "^19.1.0", "react-dom": "^19.1.0", + "react-router-dom": "^7.6.0", "react-scripts": "5.0.1", "web-vitals": "^2.1.4" } @@ -13916,6 +13917,53 @@ "node": ">=0.10.0" } }, + "node_modules/react-router": { + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.6.0.tgz", + "integrity": "sha512-GGufuHIVCJDbnIAXP3P9Sxzq3UUsddG3rrI3ut1q6m0FI6vxVBF3JoPQ38+W/blslLH4a5Yutp8drkEpXoddGQ==", + "license": "MIT", + "dependencies": { + "cookie": "^1.0.1", + "set-cookie-parser": "^2.6.0" + }, + "engines": { + "node": ">=20.0.0" + }, + "peerDependencies": { + "react": ">=18", + "react-dom": ">=18" + }, + "peerDependenciesMeta": { + "react-dom": { + "optional": true + } + } + }, + "node_modules/react-router-dom": { + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.6.0.tgz", + "integrity": "sha512-DYgm6RDEuKdopSyGOWZGtDfSm7Aofb8CCzgkliTjtu/eDuB0gcsv6qdFhhi8HdtmA+KHkt5MfZ5K2PdzjugYsA==", + "license": "MIT", + "dependencies": { + "react-router": "7.6.0" + }, + "engines": { + "node": ">=20.0.0" + }, + "peerDependencies": { + "react": ">=18", + "react-dom": ">=18" + } + }, + "node_modules/react-router/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/react-scripts": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-5.0.1.tgz", @@ -14822,6 +14870,12 @@ "node": ">= 0.8.0" } }, + "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/set-function-length": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", diff --git a/frontend/package.json b/frontend/package.json index bfb0044..c7f70f9 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -9,6 +9,7 @@ "@testing-library/user-event": "^13.5.0", "react": "^19.1.0", "react-dom": "^19.1.0", + "react-router-dom": "^7.6.0", "react-scripts": "5.0.1", "web-vitals": "^2.1.4" }, diff --git a/frontend/src/Components/App.js b/frontend/src/Components/App.js index e05f747..7559ead 100644 --- a/frontend/src/Components/App.js +++ b/frontend/src/Components/App.js @@ -1,29 +1,21 @@ -import React, { useState } from 'react'; -import './App.css'; +import React from 'react'; +import { BrowserRouter as Router, Routes, Route } from 'react-router-dom'; import NewsGrid from './NewsGrid'; +import NewsArticle from './NewsArticle'; +import './App.css'; function App() { - const [selectedArticle, setSelectedArticle] = useState(null); - return ( -
-

CrossKey Communication

- {selectedArticle ? ( -
- -