Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 48 additions & 4 deletions my-app/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions my-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,8 @@
"last 1 firefox version",
"last 1 safari version"
]
},
"devDependencies": {
"react-router-dom": "^6.16.0"
}
}
8 changes: 7 additions & 1 deletion my-app/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,17 @@ import logo from "./logo.svg";
import "./App.css";
import Home from "./components/home/home";
import Main from "./components/about/main";
import { BrowserRouter as Router, Routes, Route, Link } from "react-router-dom";

function App() {
return (
<div className="App">
<Main />
<Router>
<Routes>
<Route path="/main" element={<Main />} />
<Route path="/" element={<Home />} />
</Routes>
</Router>
</div>
);
}
Expand Down
2 changes: 2 additions & 0 deletions my-app/src/components/about/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,13 @@

.buttonText {
color: white;
background-color: rgba(255, 255, 255, 0);
font-size: 18px;
font-family: "Inter";
font-weight: 600;
line-height: 28px;
word-wrap: break-word;
border: none;
}

.mainTitle {
Expand Down
12 changes: 11 additions & 1 deletion my-app/src/components/about/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,23 @@ import nytImage from "../../assets/nyt.png";
import foxImage from "../../assets/fox.webp";
import washingtonImage from "../../assets/washington.png";
import cnnImage from "../../assets/CNN_International_logo.svg.png";
import { inputValue } from "../home/home";
import { Routes, Route, useNavigate, BrowserRouter } from "react-router-dom";

const Main = () => {
const navigate = useNavigate();

const goHome = () => {
navigate("/");
};

return (
<>
<div className="main">
<div className="buttonContainer">
<div className="buttonText">Back</div>
<button className="buttonText" onClick={goHome}>
Back
</button>
</div>
<div className="mainTitle">Israel and Palestine Conflict</div>
<div className="timelineContainer">
Expand Down
7 changes: 6 additions & 1 deletion my-app/src/components/home/home.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@

.title {
text-align: center;
margin-top: 30vh;
font-family: Merriweather Sans;
font-size: 70px;
font-weight: 700;
margin: 0 auto;
margin-top: 30vh;
}

.subtitle {
Expand Down Expand Up @@ -63,3 +63,8 @@
height: 20px;
width: 20px;
}

.p {
text-align: center;
color: rgb(40, 39, 39);
}
45 changes: 27 additions & 18 deletions my-app/src/components/home/home.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,43 @@ import React from "react";
import "./home.css";
import { useState } from "react";
import btn from "../../assets/Vectorinputicon.png";
import { Routes, Route, useNavigate, BrowserRouter } from "react-router-dom";
import Main from "../about/main";

const Home = () => {
const [inputValue, setInputValue] = useState("");
const navigate = useNavigate();

const handleInputChange = (e) => {
setInputValue(e.target.value);
};

const goMain = () => {
navigate("/main");
};

return (
<section>
<div className="title">SpectrumAI</div>
<div className="subtitle"> Experience multiple perspectives </div>
<div className="input">
<div className="inputBoxContainer">
<input
className="inputBox"
type="text"
value={inputValue}
onChange={handleInputChange}
placeholder="What do you want to know?"
/>
<button className="inputBtn">
<img className="inputImg" alt="go" src={btn}></img>
</button>
<>
<section>
<div className="title">SpectrumAI</div>
<div className="subtitle"> Experience multiple perspectives </div>
<div className="input">
<div className="inputBoxContainer">
<input
className="inputBox"
type="text"
value={inputValue}
onChange={handleInputChange}
placeholder="What do you want to know?"
/>
<button className="inputBtn" onClick={goMain}>
<img className="inputImg" alt="go" src={btn}></img>
</button>
<p className="p">Learn more about: {inputValue}</p>
</div>
</div>
{/* <p>You typed: {inputValue}</p>*/} .
</div>
</section>
</section>
</>
);
};

Expand Down
14 changes: 6 additions & 8 deletions my-app/src/index.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import React from 'react';
import ReactDOM from 'react-dom/client';
import './index.css';
import App from './App';
import reportWebVitals from './reportWebVitals';
import React from "react";
import ReactDOM from "react-dom/client";
import "./index.css";
import App from "./App";
import reportWebVitals from "./reportWebVitals";

const root = ReactDOM.createRoot(document.getElementById('root'));
const root = ReactDOM.createRoot(document.getElementById("root"));
root.render(
<React.StrictMode>
<App />
Expand All @@ -15,5 +15,3 @@ root.render(
// to log results (for example: reportWebVitals(console.log))
// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
reportWebVitals();