From 17cd90fe03b1ff0eceee41d4ef2c6ffd485e2b68 Mon Sep 17 00:00:00 2001 From: Bhavesh Agone Date: Fri, 12 Jan 2024 18:08:29 +0530 Subject: [PATCH 1/2] styled blog page --- package-lock.json | 90 ++++++++-------- package.json | 2 +- src/app/blogs/align-center.svg | 10 ++ src/app/blogs/edit-2.svg | 5 + src/app/blogs/link-2.svg | 8 ++ src/app/blogs/tag.svg | 5 + src/app/blogs/trash.svg | 6 ++ src/app/blogs/user.svg | 6 ++ src/app/home/AddBlogPage.jsx | 171 +++++++++++++++++++++++++------ src/app/home/MotherBoardCity.jsx | 3 +- yarn.lock | 47 ++++----- 11 files changed, 252 insertions(+), 101 deletions(-) create mode 100644 src/app/blogs/align-center.svg create mode 100644 src/app/blogs/edit-2.svg create mode 100644 src/app/blogs/link-2.svg create mode 100644 src/app/blogs/tag.svg create mode 100644 src/app/blogs/trash.svg create mode 100644 src/app/blogs/user.svg diff --git a/package-lock.json b/package-lock.json index bca4c70..9c57f14 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,6 +7,7 @@ "": { "name": "mlsc-website", "version": "0.1.0", + "hasInstallScript": true, "dependencies": { "@prisma/client": "^5.7.1", "@react-three/drei": "^9.88.13", @@ -15,7 +16,7 @@ "axios": "^1.6.2", "eslint-config-next": "^14.0.1", "leva": "^0.9.35", - "next": "^14.0.1", + "next": "^14.0.4", "react": "^18", "react-dom": "^18", "react-icons": "^4.12.0", @@ -262,9 +263,9 @@ "integrity": "sha512-d8Q9uRK89ZRWmED2JLI9/blpJcfdbh0iEUuMo8TgkMzNfQBY1/GC0FEJWrairTwHkxIf6Oud1vFBP+aHicWqJA==" }, "node_modules/@next/env": { - "version": "14.0.1", - "resolved": "https://registry.npmjs.org/@next/env/-/env-14.0.1.tgz", - "integrity": "sha512-Ms8ZswqY65/YfcjrlcIwMPD7Rg/dVjdLapMcSHG26W6O67EJDF435ShW4H4LXi1xKO1oRc97tLXUpx8jpLe86A==" + "version": "14.0.4", + "resolved": "https://registry.npmjs.org/@next/env/-/env-14.0.4.tgz", + "integrity": "sha512-irQnbMLbUNQpP1wcE5NstJtbuA/69kRfzBrpAD7Gsn8zm/CY6YQYc3HQBz8QPxwISG26tIm5afvvVbu508oBeQ==" }, "node_modules/@next/eslint-plugin-next": { "version": "14.0.3", @@ -294,9 +295,9 @@ } }, "node_modules/@next/swc-darwin-arm64": { - "version": "14.0.1", - "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.0.1.tgz", - "integrity": "sha512-JyxnGCS4qT67hdOKQ0CkgFTp+PXub5W1wsGvIq98TNbF3YEIN7iDekYhYsZzc8Ov0pWEsghQt+tANdidITCLaw==", + "version": "14.0.4", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.0.4.tgz", + "integrity": "sha512-mF05E/5uPthWzyYDyptcwHptucf/jj09i2SXBPwNzbgBNc+XnwzrL0U6BmPjQeOL+FiB+iG1gwBeq7mlDjSRPg==", "cpu": [ "arm64" ], @@ -309,9 +310,9 @@ } }, "node_modules/@next/swc-darwin-x64": { - "version": "14.0.1", - "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.0.1.tgz", - "integrity": "sha512-625Z7bb5AyIzswF9hvfZWa+HTwFZw+Jn3lOBNZB87lUS0iuCYDHqk3ujuHCkiyPtSC0xFBtYDLcrZ11mF/ap3w==", + "version": "14.0.4", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.0.4.tgz", + "integrity": "sha512-IZQ3C7Bx0k2rYtrZZxKKiusMTM9WWcK5ajyhOZkYYTCc8xytmwSzR1skU7qLgVT/EY9xtXDG0WhY6fyujnI3rw==", "cpu": [ "x64" ], @@ -324,9 +325,9 @@ } }, "node_modules/@next/swc-linux-arm64-gnu": { - "version": "14.0.1", - "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.0.1.tgz", - "integrity": "sha512-iVpn3KG3DprFXzVHM09kvb//4CNNXBQ9NB/pTm8LO+vnnnaObnzFdS5KM+w1okwa32xH0g8EvZIhoB3fI3mS1g==", + "version": "14.0.4", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.0.4.tgz", + "integrity": "sha512-VwwZKrBQo/MGb1VOrxJ6LrKvbpo7UbROuyMRvQKTFKhNaXjUmKTu7wxVkIuCARAfiI8JpaWAnKR+D6tzpCcM4w==", "cpu": [ "arm64" ], @@ -339,9 +340,9 @@ } }, "node_modules/@next/swc-linux-arm64-musl": { - "version": "14.0.1", - "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.0.1.tgz", - "integrity": "sha512-mVsGyMxTLWZXyD5sen6kGOTYVOO67lZjLApIj/JsTEEohDDt1im2nkspzfV5MvhfS7diDw6Rp/xvAQaWZTv1Ww==", + "version": "14.0.4", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.0.4.tgz", + "integrity": "sha512-8QftwPEW37XxXoAwsn+nXlodKWHfpMaSvt81W43Wh8dv0gkheD+30ezWMcFGHLI71KiWmHK5PSQbTQGUiidvLQ==", "cpu": [ "arm64" ], @@ -354,9 +355,9 @@ } }, "node_modules/@next/swc-linux-x64-gnu": { - "version": "14.0.1", - "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.0.1.tgz", - "integrity": "sha512-wMqf90uDWN001NqCM/auRl3+qVVeKfjJdT9XW+RMIOf+rhUzadmYJu++tp2y+hUbb6GTRhT+VjQzcgg/QTD9NQ==", + "version": "14.0.4", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.0.4.tgz", + "integrity": "sha512-/s/Pme3VKfZAfISlYVq2hzFS8AcAIOTnoKupc/j4WlvF6GQ0VouS2Q2KEgPuO1eMBwakWPB1aYFIA4VNVh667A==", "cpu": [ "x64" ], @@ -369,9 +370,9 @@ } }, "node_modules/@next/swc-linux-x64-musl": { - "version": "14.0.1", - "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.0.1.tgz", - "integrity": "sha512-ol1X1e24w4j4QwdeNjfX0f+Nza25n+ymY0T2frTyalVczUmzkVD7QGgPTZMHfR1aLrO69hBs0G3QBYaj22J5GQ==", + "version": "14.0.4", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.0.4.tgz", + "integrity": "sha512-m8z/6Fyal4L9Bnlxde5g2Mfa1Z7dasMQyhEhskDATpqr+Y0mjOBZcXQ7G5U+vgL22cI4T7MfvgtrM2jdopqWaw==", "cpu": [ "x64" ], @@ -384,9 +385,9 @@ } }, "node_modules/@next/swc-win32-arm64-msvc": { - "version": "14.0.1", - "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.0.1.tgz", - "integrity": "sha512-WEmTEeWs6yRUEnUlahTgvZteh5RJc4sEjCQIodJlZZ5/VJwVP8p2L7l6VhzQhT4h7KvLx/Ed4UViBdne6zpIsw==", + "version": "14.0.4", + "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.0.4.tgz", + "integrity": "sha512-7Wv4PRiWIAWbm5XrGz3D8HUkCVDMMz9igffZG4NB1p4u1KoItwx9qjATHz88kwCEal/HXmbShucaslXCQXUM5w==", "cpu": [ "arm64" ], @@ -399,9 +400,9 @@ } }, "node_modules/@next/swc-win32-ia32-msvc": { - "version": "14.0.1", - "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.0.1.tgz", - "integrity": "sha512-oFpHphN4ygAgZUKjzga7SoH2VGbEJXZa/KL8bHCAwCjDWle6R1SpiGOdUdA8EJ9YsG1TYWpzY6FTbUA+iAJeww==", + "version": "14.0.4", + "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.0.4.tgz", + "integrity": "sha512-zLeNEAPULsl0phfGb4kdzF/cAVIfaC7hY+kt0/d+y9mzcZHsMS3hAS829WbJ31DkSlVKQeHEjZHIdhN+Pg7Gyg==", "cpu": [ "ia32" ], @@ -414,9 +415,9 @@ } }, "node_modules/@next/swc-win32-x64-msvc": { - "version": "14.0.1", - "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.0.1.tgz", - "integrity": "sha512-FFp3nOJ/5qSpeWT0BZQ+YE1pSMk4IMpkME/1DwKBwhg4mJLB9L+6EXuJi4JEwaJdl5iN+UUlmUD3IsR1kx5fAg==", + "version": "14.0.4", + "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.0.4.tgz", + "integrity": "sha512-yEh2+R8qDlDCjxVpzOTEpBLQTEFAcP2A8fUFLaWNap9GitYKkKv1//y2S6XY6zsR4rCOPRpU7plYDR+az2n30A==", "cpu": [ "x64" ], @@ -3973,14 +3974,15 @@ "peer": true }, "node_modules/next": { - "version": "14.0.1", - "resolved": "https://registry.npmjs.org/next/-/next-14.0.1.tgz", - "integrity": "sha512-s4YaLpE4b0gmb3ggtmpmV+wt+lPRuGtANzojMQ2+gmBpgX9w5fTbjsy6dXByBuENsdCX5pukZH/GxdFgO62+pA==", + "version": "14.0.4", + "resolved": "https://registry.npmjs.org/next/-/next-14.0.4.tgz", + "integrity": "sha512-qbwypnM7327SadwFtxXnQdGiKpkuhaRLE2uq62/nRul9cj9KhQ5LhHmlziTNqUidZotw/Q1I9OjirBROdUJNgA==", "dependencies": { - "@next/env": "14.0.1", + "@next/env": "14.0.4", "@swc/helpers": "0.5.2", "busboy": "1.6.0", "caniuse-lite": "^1.0.30001406", + "graceful-fs": "^4.2.11", "postcss": "8.4.31", "styled-jsx": "5.1.1", "watchpack": "2.4.0" @@ -3992,15 +3994,15 @@ "node": ">=18.17.0" }, "optionalDependencies": { - "@next/swc-darwin-arm64": "14.0.1", - "@next/swc-darwin-x64": "14.0.1", - "@next/swc-linux-arm64-gnu": "14.0.1", - "@next/swc-linux-arm64-musl": "14.0.1", - "@next/swc-linux-x64-gnu": "14.0.1", - "@next/swc-linux-x64-musl": "14.0.1", - "@next/swc-win32-arm64-msvc": "14.0.1", - "@next/swc-win32-ia32-msvc": "14.0.1", - "@next/swc-win32-x64-msvc": "14.0.1" + "@next/swc-darwin-arm64": "14.0.4", + "@next/swc-darwin-x64": "14.0.4", + "@next/swc-linux-arm64-gnu": "14.0.4", + "@next/swc-linux-arm64-musl": "14.0.4", + "@next/swc-linux-x64-gnu": "14.0.4", + "@next/swc-linux-x64-musl": "14.0.4", + "@next/swc-win32-arm64-msvc": "14.0.4", + "@next/swc-win32-ia32-msvc": "14.0.4", + "@next/swc-win32-x64-msvc": "14.0.4" }, "peerDependencies": { "@opentelemetry/api": "^1.1.0", diff --git a/package.json b/package.json index bef69f9..c2ca92b 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "axios": "^1.6.2", "eslint-config-next": "^14.0.1", "leva": "^0.9.35", - "next": "^14.0.1", + "next": "^14.0.4", "react": "^18", "react-dom": "^18", "react-icons": "^4.12.0", diff --git a/src/app/blogs/align-center.svg b/src/app/blogs/align-center.svg new file mode 100644 index 0000000..31d5bd9 --- /dev/null +++ b/src/app/blogs/align-center.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/app/blogs/edit-2.svg b/src/app/blogs/edit-2.svg new file mode 100644 index 0000000..4b97c72 --- /dev/null +++ b/src/app/blogs/edit-2.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/app/blogs/link-2.svg b/src/app/blogs/link-2.svg new file mode 100644 index 0000000..eeb0676 --- /dev/null +++ b/src/app/blogs/link-2.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/app/blogs/tag.svg b/src/app/blogs/tag.svg new file mode 100644 index 0000000..50bec01 --- /dev/null +++ b/src/app/blogs/tag.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/app/blogs/trash.svg b/src/app/blogs/trash.svg new file mode 100644 index 0000000..577b825 --- /dev/null +++ b/src/app/blogs/trash.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/app/blogs/user.svg b/src/app/blogs/user.svg new file mode 100644 index 0000000..6bd051d --- /dev/null +++ b/src/app/blogs/user.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/app/home/AddBlogPage.jsx b/src/app/home/AddBlogPage.jsx index fc847cb..b505f78 100644 --- a/src/app/home/AddBlogPage.jsx +++ b/src/app/home/AddBlogPage.jsx @@ -1,7 +1,8 @@ import React, { useState } from 'react'; +//import imagevar from "./edit-2.svg"; +//import './AddBlogPage.css'; const AddBlogPage = () => { - const [blogTitle, setBlogTitle] = useState(''); const [photoURL, setPhotoURL] = useState(''); const [blogDescription, setBlogDescription] = useState(''); @@ -10,7 +11,6 @@ const AddBlogPage = () => { const [domain, setDomain] = useState(''); const handleSubmit = () => { - console.log('Blog Title:', blogTitle); console.log('Photo URL:', photoURL); console.log('Blog Description:', blogDescription); @@ -20,43 +20,150 @@ const AddBlogPage = () => { }; return ( -
-

Add Blog

-
-
- - setBlogTitle(e.target.value)} /> -
+
+ {/* Header Section */} +
+ Logo +
-
- - setPhotoURL(e.target.value)} /> -
+
+
+
+

Blog

+
+
-
- - +
+ + + +
- - + {/* Display Blog Information Section */} +
+
+

All Blogs

+
+

+ Blog Title: {blogTitle} +

+
+ first-favicon + second-favicon +
+
+

+ Photo URL: {photoURL} +

+
+ first-favicon + second-favicon +
+
+ +
+
+
+
); }; diff --git a/src/app/home/MotherBoardCity.jsx b/src/app/home/MotherBoardCity.jsx index 1deb436..0152e06 100644 --- a/src/app/home/MotherBoardCity.jsx +++ b/src/app/home/MotherBoardCity.jsx @@ -8,6 +8,7 @@ import { MotherBoard } from '../components/Motherboard' import { MeshStandardMaterial } from 'three' import ExploreCamera from './ExploreCamera' import BeforeMotherBoard from './BeforeMotherBoard' +import Blog from './Blog' const page = () => { @@ -26,7 +27,7 @@ useEffect(() => { }, []); return ( - <> + <> {/* */} diff --git a/yarn.lock b/yarn.lock index 73da76d..bc6657b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -149,10 +149,10 @@ resolved "https://registry.npmjs.org/@mediapipe/tasks-vision/-/tasks-vision-0.10.2.tgz" integrity sha512-d8Q9uRK89ZRWmED2JLI9/blpJcfdbh0iEUuMo8TgkMzNfQBY1/GC0FEJWrairTwHkxIf6Oud1vFBP+aHicWqJA== -"@next/env@14.0.1": - version "14.0.1" - resolved "https://registry.npmjs.org/@next/env/-/env-14.0.1.tgz" - integrity sha512-Ms8ZswqY65/YfcjrlcIwMPD7Rg/dVjdLapMcSHG26W6O67EJDF435ShW4H4LXi1xKO1oRc97tLXUpx8jpLe86A== +"@next/env@14.0.4": + version "14.0.4" + resolved "https://registry.npmjs.org/@next/env/-/env-14.0.4.tgz" + integrity sha512-irQnbMLbUNQpP1wcE5NstJtbuA/69kRfzBrpAD7Gsn8zm/CY6YQYc3HQBz8QPxwISG26tIm5afvvVbu508oBeQ== "@next/eslint-plugin-next@14.0.3": version "14.0.3" @@ -161,10 +161,10 @@ dependencies: glob "7.1.7" -"@next/swc-win32-x64-msvc@14.0.1": - version "14.0.1" - resolved "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.0.1.tgz" - integrity sha512-FFp3nOJ/5qSpeWT0BZQ+YE1pSMk4IMpkME/1DwKBwhg4mJLB9L+6EXuJi4JEwaJdl5iN+UUlmUD3IsR1kx5fAg== +"@next/swc-win32-x64-msvc@14.0.4": + version "14.0.4" + resolved "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.0.4.tgz" + integrity sha512-yEh2+R8qDlDCjxVpzOTEpBLQTEFAcP2A8fUFLaWNap9GitYKkKv1//y2S6XY6zsR4rCOPRpU7plYDR+az2n30A== "@nodelib/fs.scandir@2.1.5": version "2.1.5" @@ -1773,7 +1773,7 @@ gopd@^1.0.1: dependencies: get-intrinsic "^1.1.3" -graceful-fs@^4.1.2, graceful-fs@^4.2.4: +graceful-fs@^4.1.2, graceful-fs@^4.2.11, graceful-fs@^4.2.4: version "4.2.11" resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz" integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== @@ -2340,28 +2340,29 @@ natural-compare@^1.4.0: resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz" integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw== -next@^14.0.1: - version "14.0.1" - resolved "https://registry.npmjs.org/next/-/next-14.0.1.tgz" - integrity sha512-s4YaLpE4b0gmb3ggtmpmV+wt+lPRuGtANzojMQ2+gmBpgX9w5fTbjsy6dXByBuENsdCX5pukZH/GxdFgO62+pA== +next@^14.0.4: + version "14.0.4" + resolved "https://registry.npmjs.org/next/-/next-14.0.4.tgz" + integrity sha512-qbwypnM7327SadwFtxXnQdGiKpkuhaRLE2uq62/nRul9cj9KhQ5LhHmlziTNqUidZotw/Q1I9OjirBROdUJNgA== dependencies: - "@next/env" "14.0.1" + "@next/env" "14.0.4" "@swc/helpers" "0.5.2" busboy "1.6.0" caniuse-lite "^1.0.30001406" + graceful-fs "^4.2.11" postcss "8.4.31" styled-jsx "5.1.1" watchpack "2.4.0" optionalDependencies: - "@next/swc-darwin-arm64" "14.0.1" - "@next/swc-darwin-x64" "14.0.1" - "@next/swc-linux-arm64-gnu" "14.0.1" - "@next/swc-linux-arm64-musl" "14.0.1" - "@next/swc-linux-x64-gnu" "14.0.1" - "@next/swc-linux-x64-musl" "14.0.1" - "@next/swc-win32-arm64-msvc" "14.0.1" - "@next/swc-win32-ia32-msvc" "14.0.1" - "@next/swc-win32-x64-msvc" "14.0.1" + "@next/swc-darwin-arm64" "14.0.4" + "@next/swc-darwin-x64" "14.0.4" + "@next/swc-linux-arm64-gnu" "14.0.4" + "@next/swc-linux-arm64-musl" "14.0.4" + "@next/swc-linux-x64-gnu" "14.0.4" + "@next/swc-linux-x64-musl" "14.0.4" + "@next/swc-win32-arm64-msvc" "14.0.4" + "@next/swc-win32-ia32-msvc" "14.0.4" + "@next/swc-win32-x64-msvc" "14.0.4" node-releases@^2.0.13: version "2.0.13" From 09bf7a922d1bbe055bfc70d1ad218b25f5ccd65f Mon Sep 17 00:00:00 2001 From: Bhavesh Agone Date: Fri, 12 Jan 2024 18:18:18 +0530 Subject: [PATCH 2/2] edited MotherBoardCity.jsx --- src/app/home/MotherBoardCity.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/home/MotherBoardCity.jsx b/src/app/home/MotherBoardCity.jsx index 0152e06..ac590d5 100644 --- a/src/app/home/MotherBoardCity.jsx +++ b/src/app/home/MotherBoardCity.jsx @@ -27,7 +27,7 @@ useEffect(() => { }, []); return ( - <> + <> {/* */}