From 0400745d4c229ea5e3bc8e0e701c46d68fe56a8b Mon Sep 17 00:00:00 2001 From: rokaf6444 Date: Thu, 21 Nov 2024 15:47:25 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=ED=91=9C?= =?UTF-8?q?=EC=8B=9C=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- react-app/src/App.jsx | 4 +++- react-app/src/data/articles.js | 13 +++++++++---- react-app/src/index.css | 6 +++--- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/react-app/src/App.jsx b/react-app/src/App.jsx index 14ce444..8cab92e 100644 --- a/react-app/src/App.jsx +++ b/react-app/src/App.jsx @@ -1,12 +1,14 @@ import React from 'react'; import { BrowserRouter as Router, Routes, Route } from 'react-router-dom'; import OnboardingPage from './pages/OnboardingPage'; +import IdentifiedArticlesPage from './pages/IdentifiedArticlesPage'; export default function App() { return ( - } /> + } /> + } /> ); diff --git a/react-app/src/data/articles.js b/react-app/src/data/articles.js index d39865c..c4d316c 100644 --- a/react-app/src/data/articles.js +++ b/react-app/src/data/articles.js @@ -1,8 +1,13 @@ +import IdentifiedArticlesPage1 from '../assets/images/IdentifiedArticlesPage1.png' +import IdentifiedArticlesPage2 from '../assets/images/IdentifiedArticlesPage2.png' +import IdentifiedArticlesPage3 from '../assets/images/IdentifiedArticlesPage3.png' +import IdentifiedArticlesPage4 from '../assets/images/IdentifiedArticlesPage4.png' + export const articles = [ { id: 1, title: "Gisèle Pelicot takes stand in French mass rape trial", - image: "../assets/images/IdentifiedArticlesPage1.png", + image: IdentifiedArticlesPage1, content: "Gisèle Pelicot, the French woman whose former husband is on trial for drugging and raping her when they were married, and inviting dozens of other men to rape her, took the stand in court on Wednesday.", trustScore: 52, author: "Laura Gozzi", @@ -12,7 +17,7 @@ export const articles = [ { id: 2, title: "What are Israel's Iron Dome, David's Sling and Arrow missile defences?", - image: "../assets/images/IdentifiedArticlesPage2.png", + image: IdentifiedArticlesPage2, content: "Details about Israel's missile defense systems...", trustScore: 78, author: "John Doe", @@ -22,7 +27,7 @@ export const articles = [ { id: 3, title: "New environmental policies announced by UN", - image: "../assets/images/IdentifiedArticlesPage3.png", + image: IdentifiedArticlesPage3, content: "The United Nations has announced new environmental policies...", trustScore: 85, author: "Jane Smith", @@ -32,7 +37,7 @@ export const articles = [ { id: 4, title: "Global markets react to tech innovations", - image: "../assets/images/IdentifiedArticlesPage4.png", + image: IdentifiedArticlesPage4, content: "Global financial markets are showing significant movement in response to recent technological breakthroughs...", trustScore: 67, author: "Alex Johnson", diff --git a/react-app/src/index.css b/react-app/src/index.css index afd371f..f37a913 100644 --- a/react-app/src/index.css +++ b/react-app/src/index.css @@ -1,9 +1,9 @@ +@import url('https://fonts.googleapis.com/css2?family=Amethysta&display=swap'); + @tailwind base; @tailwind components; @tailwind utilities; -@import url('https://fonts.googleapis.com/css2?family=Amethysta&display=swap'); - :root { font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif; line-height: 1.5; @@ -15,5 +15,5 @@ body { min-width: 320px; min-height: 100vh; background-color: #f0f4f8; - font-family: 'Amethysta', serif; + /* font-family: 'Amethysta', serif; */ }