⚠️ = risk of conflicts from previous merge (the 1st merged should stay)
2/ Redo the App Component to build the skeleton, should be along those lines :
import React from "react";
import "./App.css";
import Search from "@components/search/search";
import CurrentWeather from "@components/CurrentWeather/CurrentWeather";
import MainContainer from "./components/main-container/main-container";
import SavedLocations from "./components/SavedLocations/SavedLocations";
import SubscribeBtn from "@components/subscribe/SubscribeBtn";
import logo from "./assets/logo/suni_logo.png";
1/ Branches to be pushed, and their associated changed files :
⚠️ = risk of conflicts from previous merge (the 1st merged should stay)
2/ Redo the App Component to build the skeleton, should be along those lines :
import React from "react"; import "./App.css"; import Search from "@components/search/search"; import CurrentWeather from "@components/CurrentWeather/CurrentWeather"; import MainContainer from "./components/main-container/main-container"; import SavedLocations from "./components/SavedLocations/SavedLocations"; import SubscribeBtn from "@components/subscribe/SubscribeBtn"; import logo from "./assets/logo/suni_logo.png";
function App() {const handleOnSearchChange = (searchData) => {const [lat, lon] = searchData.value.split(" ");console.warn(lat);console.warn(lon);};return (<div><Search onSearchChange={handleOnSearchChange} /><div className="weatherMain"><p className="myCity">Hamburg</p><p className="myDate">26 October, <span className="weekDay">Wednesday</span></p></div><CurrentWeather /><MainContainer /><SavedLocations /><SubcribeBtn /><div className="weatherMain"><div className="myFooter"><img className="sunnyLogo" src={logo} alt="" /></div></div></div> ) }export default App;