From 7d2d212dd044fc32261e1f0321f1129a58ce4797 Mon Sep 17 00:00:00 2001 From: Jenan Date: Mon, 1 Aug 2022 11:19:12 +0100 Subject: [PATCH 1/9] adding about page 2 --- project-app/components/Navbar/Navbar.jsx | 2 +- project-app/components/Weather/Weather.jsx | 2 +- project-app/pages/about.js | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 project-app/pages/about.js diff --git a/project-app/components/Navbar/Navbar.jsx b/project-app/components/Navbar/Navbar.jsx index dc42bd5..9693b53 100644 --- a/project-app/components/Navbar/Navbar.jsx +++ b/project-app/components/Navbar/Navbar.jsx @@ -27,7 +27,7 @@ const Navbar = () => { About Us diff --git a/project-app/components/Weather/Weather.jsx b/project-app/components/Weather/Weather.jsx index 30f0407..4323bd8 100644 --- a/project-app/components/Weather/Weather.jsx +++ b/project-app/components/Weather/Weather.jsx @@ -26,7 +26,7 @@ const Weather = () => { console.log(data); setWeatherObject(data); //uncomment the below city State after development stage - means each time you make a change, props cant be found - setCity(""); + //setCity(""); } useEffect(() => { diff --git a/project-app/pages/about.js b/project-app/pages/about.js new file mode 100644 index 0000000..2b97b4c --- /dev/null +++ b/project-app/pages/about.js @@ -0,0 +1,5 @@ +export default function AboutUs(){ + return ( +

Hello

+ ) +} \ No newline at end of file From 628d95d2b48689891d3d0c6e15ce9e615b034971 Mon Sep 17 00:00:00 2001 From: amiragucher Date: Mon, 1 Aug 2022 11:45:18 +0100 Subject: [PATCH 2/9] Carousel displaying and working, images added --- .../components/ImageGallery/ImageGallery.jsx | 28 +++++++++++++++++++ project-app/package-lock.json | 18 ++++++++++++ project-app/package.json | 1 + project-app/pages/index.js | 2 ++ 4 files changed, 49 insertions(+) diff --git a/project-app/components/ImageGallery/ImageGallery.jsx b/project-app/components/ImageGallery/ImageGallery.jsx index e69de29..a9ac564 100644 --- a/project-app/components/ImageGallery/ImageGallery.jsx +++ b/project-app/components/ImageGallery/ImageGallery.jsx @@ -0,0 +1,28 @@ +import { Carousel } from 'antd'; +import React from 'react'; +const contentStyle = { + height: '160px', + color: '#fff', + lineHeight: '160px', + textAlign: 'center', + background: '#364d79', +}; + +const ImageGallery = () => ( + +
+ +
+
+ +
+
+ +
+
+ +
+ +); + +export default ImageGallery; \ No newline at end of file diff --git a/project-app/package-lock.json b/project-app/package-lock.json index d16e39d..4fe73ee 100644 --- a/project-app/package-lock.json +++ b/project-app/package-lock.json @@ -9,6 +9,7 @@ "version": "0.1.0", "dependencies": { "@fontsource/montserrat": "^4.5.11", + "@sefailyasoz/react-carousel": "^1.1.1", "antd": "^4.22.1", "esri-leaflet-geocoder": "^3.1.3", "leaflet": "^1.8.0", @@ -490,6 +491,17 @@ "integrity": "sha512-LwzQKA4vzIct1zNZzBmRKI9QuNpLgTQMEjsQLf3BXuGYb3QPTP4Yjf6mkdX+X1mYttZ808QpOwAzZjv28kq7DA==", "dev": true }, + "node_modules/@sefailyasoz/react-carousel": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@sefailyasoz/react-carousel/-/react-carousel-1.1.1.tgz", + "integrity": "sha512-cpwubrSfXReAPZjTBYDa1G2kDBql5HpksPq3hN+VnPAdlhIk+WDKdrPKktAhRQ4fsFKJIsqBgm+/nbKI+tLotw==", + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "react": ">=16" + } + }, "node_modules/@swc/helpers": { "version": "0.4.3", "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.4.3.tgz", @@ -6010,6 +6022,12 @@ "integrity": "sha512-LwzQKA4vzIct1zNZzBmRKI9QuNpLgTQMEjsQLf3BXuGYb3QPTP4Yjf6mkdX+X1mYttZ808QpOwAzZjv28kq7DA==", "dev": true }, + "@sefailyasoz/react-carousel": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@sefailyasoz/react-carousel/-/react-carousel-1.1.1.tgz", + "integrity": "sha512-cpwubrSfXReAPZjTBYDa1G2kDBql5HpksPq3hN+VnPAdlhIk+WDKdrPKktAhRQ4fsFKJIsqBgm+/nbKI+tLotw==", + "requires": {} + }, "@swc/helpers": { "version": "0.4.3", "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.4.3.tgz", diff --git a/project-app/package.json b/project-app/package.json index 51576c8..c297a1a 100644 --- a/project-app/package.json +++ b/project-app/package.json @@ -10,6 +10,7 @@ }, "dependencies": { "@fontsource/montserrat": "^4.5.11", + "@sefailyasoz/react-carousel": "^1.1.1", "antd": "^4.22.1", "esri-leaflet-geocoder": "^3.1.3", "leaflet": "^1.8.0", diff --git a/project-app/pages/index.js b/project-app/pages/index.js index 218599f..5723485 100644 --- a/project-app/pages/index.js +++ b/project-app/pages/index.js @@ -5,6 +5,7 @@ import Navbar from "../components/Navbar/Navbar"; import dynamic from "next/dynamic"; import LandingBanner from "../components/Landing/Landing"; import Weather from "../components/Weather/Weather"; +import ImageGallery from "../components/ImageGallery/ImageGallery"; import Footer from "../components/Footer/Footer"; @@ -24,6 +25,7 @@ export default function Home() { +