From ee1fb68536f4bb495aa628dc46a1df1b664a9c4a Mon Sep 17 00:00:00 2001 From: IshikaMeghaSaha Date: Sun, 26 Mar 2023 23:48:51 +0530 Subject: [PATCH 1/4] Navbar --- components/commons/Navbar/Navbar.tsx | 23 +++++-- .../commons/Navbar/styles/Navbar.module.scss | 60 +++++++++++++++++++ package-lock.json | 27 +++++---- package.json | 10 ++-- public/images/logo.svg | 3 + 5 files changed, 105 insertions(+), 18 deletions(-) create mode 100644 public/images/logo.svg diff --git a/components/commons/Navbar/Navbar.tsx b/components/commons/Navbar/Navbar.tsx index ab1fe8f..55798a4 100644 --- a/components/commons/Navbar/Navbar.tsx +++ b/components/commons/Navbar/Navbar.tsx @@ -1,9 +1,24 @@ -import { FC } from "react"; -import { NavbarProps as Props } from "./Navbar.types"; -import styles from "./styles/Navbar.module.scss"; +import { FC } from 'react' +import { NavbarProps as Props } from "./Navbar.types" +import styles from "./styles/Navbar.module.scss" const Navbar: FC = ({}) => { - return
Navbar here
; + return ( +
+
+ +
+
); }; export default Navbar; diff --git a/components/commons/Navbar/styles/Navbar.module.scss b/components/commons/Navbar/styles/Navbar.module.scss index e69de29..2ee9400 100644 --- a/components/commons/Navbar/styles/Navbar.module.scss +++ b/components/commons/Navbar/styles/Navbar.module.scss @@ -0,0 +1,60 @@ +@import url('https://fonts.googleapis.com/css?family=Inter'); +.navbar{ + background-color:black; + top:0; + left:0; + width:100%; + position:fixed; + font-family: 'Inter'; + font-style: normal; + font-weight: 500; + font-size: 14px; +} + +.navbar ul.left{ + color:white; + float:left; + margin-left: 40px; +} + +.navbar button{ + background-color: #EBAA15; + text-decoration: none; + float:right; + text-align: center; + border-radius: 25px; + padding-left:10px; + padding-right:10px; + padding-top: 5px; + padding-bottom: 5px; + margin-right: 100px; + margin-top: -3px; + color:#010200; + display: flex; + flex-direction: row; + align-items: flex-start; + border:none; +} + +.navbar a{ + padding-left: 30px; + text-decoration:none; + color:white; +} + +.navbar a:first-child{ + padding-left: 300px; +} + +.navbar a:nth-last-child(2){ + padding-left:300px; + padding-right: 30px; +} + +.logo{ + position: relative; + float:left; + position: absolute; + top:10px; + margin-left: 50px; +} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 7c82d5d..acb0364 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,15 +9,17 @@ "version": "0.1.0", "dependencies": { "@types/node": "18.15.0", - "@types/react": "18.0.28", - "@types/react-dom": "18.0.11", "eslint": "8.36.0", "eslint-config-next": "13.2.4", "next": "13.2.4", - "react": "18.2.0", - "react-dom": "18.2.0", + "react": "^18.2.0", + "react-dom": "^18.2.0", "sass": "^1.59.2", "typescript": "4.9.5" + }, + "devDependencies": { + "@types/react": "^18.0.29", + "@types/react-dom": "^18.0.11" } }, "node_modules/@babel/runtime": { @@ -398,12 +400,14 @@ "node_modules/@types/prop-types": { "version": "15.7.5", "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz", - "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==" + "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==", + "dev": true }, "node_modules/@types/react": { - "version": "18.0.28", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.28.tgz", - "integrity": "sha512-RD0ivG1kEztNBdoAK7lekI9M+azSnitIn85h4iOiaLjaTrMjzslhaqCGaI4IyCJ1RljWiLCEu4jyrLLgqxBTew==", + "version": "18.0.29", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.29.tgz", + "integrity": "sha512-wXHktgUABxplw1+UnljseDq4+uztQyp2tlWZRIxHlpchsCFqiYkvaDS8JR7eKOQm8wziTH/el5qL7D6gYNkYcw==", + "dev": true, "dependencies": { "@types/prop-types": "*", "@types/scheduler": "*", @@ -414,6 +418,7 @@ "version": "18.0.11", "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.11.tgz", "integrity": "sha512-O38bPbI2CWtgw/OoQoY+BRelw7uysmXbWvw3nLWO21H1HSh+GOlqPuXshJfjmpNlKiiSDG9cc1JZAaMmVdcTlw==", + "dev": true, "dependencies": { "@types/react": "*" } @@ -421,7 +426,8 @@ "node_modules/@types/scheduler": { "version": "0.16.2", "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz", - "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==" + "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==", + "dev": true }, "node_modules/@typescript-eslint/parser": { "version": "5.54.1", @@ -866,7 +872,8 @@ "node_modules/csstype": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz", - "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==" + "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==", + "dev": true }, "node_modules/damerau-levenshtein": { "version": "1.0.8", diff --git a/package.json b/package.json index d92b591..b1fe4ee 100644 --- a/package.json +++ b/package.json @@ -10,14 +10,16 @@ }, "dependencies": { "@types/node": "18.15.0", - "@types/react": "18.0.28", - "@types/react-dom": "18.0.11", "eslint": "8.36.0", "eslint-config-next": "13.2.4", "next": "13.2.4", - "react": "18.2.0", - "react-dom": "18.2.0", + "react": "^18.2.0", + "react-dom": "^18.2.0", "sass": "^1.59.2", "typescript": "4.9.5" + }, + "devDependencies": { + "@types/react": "^18.0.29", + "@types/react-dom": "^18.0.11" } } diff --git a/public/images/logo.svg b/public/images/logo.svg new file mode 100644 index 0000000..f5bd531 --- /dev/null +++ b/public/images/logo.svg @@ -0,0 +1,3 @@ + + + From 7b36ef2a0b9fb247e40bb367becfb80bd88cac26 Mon Sep 17 00:00:00 2001 From: IshikaMeghaSaha Date: Sun, 26 Mar 2023 23:50:23 +0530 Subject: [PATCH 2/4] Navbar --- pages/index.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pages/index.tsx b/pages/index.tsx index e422f83..999faaf 100644 --- a/pages/index.tsx +++ b/pages/index.tsx @@ -1,5 +1,8 @@ +import Navbar from "../components/commons/Navbar/Navbar" export default function Home() { return ( -
Squeryll
+
+ +
) } From 5f5c9dcd5e17acd340162b5c535613d22c02c124 Mon Sep 17 00:00:00 2001 From: IshikaMeghaSaha Date: Mon, 27 Mar 2023 00:59:41 +0530 Subject: [PATCH 3/4] previous versions of dependencies reinstalled --- package-lock.json | 27 ++++++++++----------------- package.json | 6 ++---- 2 files changed, 12 insertions(+), 21 deletions(-) diff --git a/package-lock.json b/package-lock.json index acb0364..e3b5ff0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,8 @@ "version": "0.1.0", "dependencies": { "@types/node": "18.15.0", + "@types/react": "^18.0.28", + "@types/react-dom": "^18.0.11", "eslint": "8.36.0", "eslint-config-next": "13.2.4", "next": "13.2.4", @@ -16,10 +18,6 @@ "react-dom": "^18.2.0", "sass": "^1.59.2", "typescript": "4.9.5" - }, - "devDependencies": { - "@types/react": "^18.0.29", - "@types/react-dom": "^18.0.11" } }, "node_modules/@babel/runtime": { @@ -400,14 +398,12 @@ "node_modules/@types/prop-types": { "version": "15.7.5", "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz", - "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==", - "dev": true + "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==" }, "node_modules/@types/react": { - "version": "18.0.29", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.29.tgz", - "integrity": "sha512-wXHktgUABxplw1+UnljseDq4+uztQyp2tlWZRIxHlpchsCFqiYkvaDS8JR7eKOQm8wziTH/el5qL7D6gYNkYcw==", - "dev": true, + "version": "18.0.28", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.28.tgz", + "integrity": "sha512-RD0ivG1kEztNBdoAK7lekI9M+azSnitIn85h4iOiaLjaTrMjzslhaqCGaI4IyCJ1RljWiLCEu4jyrLLgqxBTew==", "dependencies": { "@types/prop-types": "*", "@types/scheduler": "*", @@ -418,16 +414,14 @@ "version": "18.0.11", "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.11.tgz", "integrity": "sha512-O38bPbI2CWtgw/OoQoY+BRelw7uysmXbWvw3nLWO21H1HSh+GOlqPuXshJfjmpNlKiiSDG9cc1JZAaMmVdcTlw==", - "dev": true, "dependencies": { "@types/react": "*" } }, "node_modules/@types/scheduler": { - "version": "0.16.2", - "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz", - "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==", - "dev": true + "version": "0.16.3", + "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.3.tgz", + "integrity": "sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ==" }, "node_modules/@typescript-eslint/parser": { "version": "5.54.1", @@ -872,8 +866,7 @@ "node_modules/csstype": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz", - "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==", - "dev": true + "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==" }, "node_modules/damerau-levenshtein": { "version": "1.0.8", diff --git a/package.json b/package.json index b1fe4ee..80c4eea 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,8 @@ }, "dependencies": { "@types/node": "18.15.0", + "@types/react": "18.0.28", + "@types/react-dom": "18.0.11", "eslint": "8.36.0", "eslint-config-next": "13.2.4", "next": "13.2.4", @@ -17,9 +19,5 @@ "react-dom": "^18.2.0", "sass": "^1.59.2", "typescript": "4.9.5" - }, - "devDependencies": { - "@types/react": "^18.0.29", - "@types/react-dom": "^18.0.11" } } From 0ed24b4bb462958f75c681807300e81df6c7ef88 Mon Sep 17 00:00:00 2001 From: IshikaMeghaSaha Date: Sat, 1 Apr 2023 11:01:44 +0530 Subject: [PATCH 4/4] Modifications done in dependencies --- package-lock.json | 14 +++++++------- package.json | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index e3b5ff0..7c82d5d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,13 +9,13 @@ "version": "0.1.0", "dependencies": { "@types/node": "18.15.0", - "@types/react": "^18.0.28", - "@types/react-dom": "^18.0.11", + "@types/react": "18.0.28", + "@types/react-dom": "18.0.11", "eslint": "8.36.0", "eslint-config-next": "13.2.4", "next": "13.2.4", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "react": "18.2.0", + "react-dom": "18.2.0", "sass": "^1.59.2", "typescript": "4.9.5" } @@ -419,9 +419,9 @@ } }, "node_modules/@types/scheduler": { - "version": "0.16.3", - "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.3.tgz", - "integrity": "sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ==" + "version": "0.16.2", + "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz", + "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==" }, "node_modules/@typescript-eslint/parser": { "version": "5.54.1", diff --git a/package.json b/package.json index 80c4eea..ff4163e 100644 --- a/package.json +++ b/package.json @@ -15,9 +15,9 @@ "eslint": "8.36.0", "eslint-config-next": "13.2.4", "next": "13.2.4", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "react": "18.2.0", + "react-dom": "18.2.0", "sass": "^1.59.2", "typescript": "4.9.5" } -} +} \ No newline at end of file