From 94e7daa02a9a51d64b461f400b8aeea3594471db Mon Sep 17 00:00:00 2001 From: abhikumar63 <63abhikumar@gmail.com> Date: Sun, 16 Apr 2023 15:17:15 +0530 Subject: [PATCH 01/25] Added .gitignore file in server --- server/.gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 server/.gitignore diff --git a/server/.gitignore b/server/.gitignore new file mode 100644 index 0000000..7af7f04 --- /dev/null +++ b/server/.gitignore @@ -0,0 +1,2 @@ +/node_modules +.env \ No newline at end of file From 1e91d72746d0e9afe0049186313360aab9d8d0e3 Mon Sep 17 00:00:00 2001 From: abhikumar63 <63abhikumar@gmail.com> Date: Sun, 16 Apr 2023 15:19:52 +0530 Subject: [PATCH 02/25] .gitignore file --- server/.gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/server/.gitignore b/server/.gitignore index 7af7f04..07e6e47 100644 --- a/server/.gitignore +++ b/server/.gitignore @@ -1,2 +1 @@ /node_modules -.env \ No newline at end of file From b0741749a93bc95e0141a481fda82613332b3eb0 Mon Sep 17 00:00:00 2001 From: devansh dwivedi Date: Mon, 17 Apr 2023 01:50:56 +0530 Subject: [PATCH 03/25] added loggedin state with navbar --- README.md | Bin 5248 -> 5216 bytes client/.env | 2 +- client/src/App.js | 2 +- client/src/components/home/Home.jsx | 3 ++- client/src/components/home/home.module.css | 3 +++ client/src/ui/Form.jsx | 2 +- 6 files changed, 8 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 48f3f83a3e3b5ba8bb9c54955a3d4998d999dba7..9d3c4db7ed2a9b2bf3b19c1a246e3b7f85814200 100644 GIT binary patch delta 222 zcmZqBe4ruw|DQ600)q=fDnl8AJ3|peB10|%F9R1uWTN72epD%)$rl+VCrj~lY+lEB zjENO2Ir%=T_2fIuQj;&R_&`OJS+~OFdZDahw%Kqo>&XG^AyD3G_POj(OC|?$v_eET n-{sI}gffM>6rs$?*4)WZT}!zaLZy9qZnN;BxN@_(peHi`Mcq3~ delta 239 zcmaE$(V(gL|DQ600z&{p5Q9I1E`vLec4Y8n;AP+fiWM>BGw4o~z0D3~Zv0!w%vk^t zW=NlG%V9Zr9ZMQacCsYvRyf<5!+J6wTM(R|$~GHKrvrNkTy`e=Tol<>n9Szm9QurK k&TmddIA^jVcQQ<3awqpf7<;om&utcdH2-WC7xZKX0NJNFA^-pY diff --git a/client/.env b/client/.env index 736aa4b..ca156a2 100644 --- a/client/.env +++ b/client/.env @@ -1 +1 @@ -LOCALSTORAGE_KEY = "Pro-Gram" \ No newline at end of file +LOCALSTORAGE_KEY = "DevGram" \ No newline at end of file diff --git a/client/src/App.js b/client/src/App.js index d197f9c..7a29a6a 100644 --- a/client/src/App.js +++ b/client/src/App.js @@ -29,7 +29,7 @@ function App() { return (
- + {isLogged && } {!isLogged && ( diff --git a/client/src/components/home/Home.jsx b/client/src/components/home/Home.jsx index a2cff22..383701a 100644 --- a/client/src/components/home/Home.jsx +++ b/client/src/components/home/Home.jsx @@ -1,9 +1,10 @@ import React from 'react' +import classes from "./home.module.css" const Home = () => { return (
- +

Built for developers by developers

) } diff --git a/client/src/components/home/home.module.css b/client/src/components/home/home.module.css index e69de29..59566e4 100644 --- a/client/src/components/home/home.module.css +++ b/client/src/components/home/home.module.css @@ -0,0 +1,3 @@ +.display_text{ + font-size: 24px;; +} \ No newline at end of file diff --git a/client/src/ui/Form.jsx b/client/src/ui/Form.jsx index 6b388b4..909862e 100644 --- a/client/src/ui/Form.jsx +++ b/client/src/ui/Form.jsx @@ -4,7 +4,7 @@ const Form = (props) => { className="border-[1px] border-black w-[350px] p-6 rounded-lg" onSubmit={props.onSubmit} > -

Pro-Gram

+

DevGram

{props.children} ); From 23e7a53df1bdda750814d9e472b563298b1b4180 Mon Sep 17 00:00:00 2001 From: devansh dwivedi Date: Mon, 17 Apr 2023 05:00:58 +0530 Subject: [PATCH 04/25] designed homepage --- client/src/App.js | 6 +- client/src/components/home/Home.jsx | 45 ++++++-- client/src/components/home/home.module.css | 118 ++++++++++++++++++++- 3 files changed, 157 insertions(+), 12 deletions(-) diff --git a/client/src/App.js b/client/src/App.js index 7a29a6a..d8988b0 100644 --- a/client/src/App.js +++ b/client/src/App.js @@ -29,7 +29,7 @@ function App() { return (
- {isLogged && } + {isLogged && window.location.pathname !== "/" && } {!isLogged && ( @@ -42,11 +42,11 @@ function App() { )} - {isLogged && ( + - )} + {isLogged && ( { return ( -
-

Built for developers by developers

+
+
+

+ DEV + GRAM. +

+ +

+ Built for developers by developers /> +

+
+ + +
+
+ Log in + Sign up +
+ +

+ Developer + + noun + +
+ + -a person or thing that develops something + +

+ +

+ DevGram is a web application designed for developers to connect with each other. + +

+
- ) + ); } -export default Home \ No newline at end of file +export default Home; diff --git a/client/src/components/home/home.module.css b/client/src/components/home/home.module.css index 59566e4..2b0f023 100644 --- a/client/src/components/home/home.module.css +++ b/client/src/components/home/home.module.css @@ -1,3 +1,115 @@ -.display_text{ - font-size: 24px;; -} \ No newline at end of file +.home { + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + padding: 20px; + position: relative; + } + + + .left { + display: flex; + flex-direction: column; + position: fixed; + left: 20px; + top: 20px; + } + + .brandName { + position: fixed; + width: 120px; + height: 12px; + font-size: 35px; + font-weight: bold; + } + + .devText { + color: rgba(0, 0, 0, 0.9); + } + + .gramText { + color: #999999; + } + + .displayText { + font-size: 50px; + margin-top: 16%; + margin-left: 40px; + width: 40%; + word-wrap: break-word; + white-space: pre-wrap; + background-repeat: repeat; + background-color: #fff; + + } + + .right { + display: flex; + flex-direction: column; + align-items: center; + position: fixed; + right: 20px; + top: 25px; + } + + + .loginSignup { + display: flex; + align-items: center; + justify-content: flex-end; + margin-right: 40px; + } + + .loginLink { + margin-right: 50px; + color: #808080; + font-size: 20px; + display: inline-block; + } + + .signupLink { + color: #808080; + font-size: 20px; + display: inline-block; + } + + + .descText{ + font-size: 15px; + position: fixed; + bottom: 70px; + right: 0; + left: auto; + width: 50%; + width: 40%; + word-wrap: break-word; + white-space: pre-wrap; + } + + .devMeaning{ + position: absolute; + font-size: 40px; + margin-top: 160px; + margin-right: 450px; + width: 40%; + } + + .devMeaningNoun{ + position: absolute; + font-size: 20px; + margin-top: 20px; + color: grey; + } + + .devMeaningSentence{ + position: absolute; + font-size: 20px; + margin-top: -5px; + margin-left: -10px; + font-weight:200; + width: 450%; + word-wrap: break-word; + white-space: pre-wrap; + color: grey; + } \ No newline at end of file From d5819d212e94626c287a1f42d9639586d4dc1472 Mon Sep 17 00:00:00 2001 From: devansh dwivedi Date: Mon, 17 Apr 2023 13:56:19 +0530 Subject: [PATCH 05/25] route changed --- client/src/App.js | 10 ++++++++-- client/src/components/Login/Login.jsx | 2 +- client/src/components/Register/Register.jsx | 2 +- client/src/components/home/home.module.css | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/client/src/App.js b/client/src/App.js index d8988b0..cbe0c15 100644 --- a/client/src/App.js +++ b/client/src/App.js @@ -29,9 +29,15 @@ function App() { return (
- {isLogged && window.location.pathname !== "/" && } + + {isLogged &&( + + + + )} + {!isLogged && ( @@ -57,7 +63,7 @@ function App() { )} - {isLogged ? : } + {isLogged ? : } diff --git a/client/src/components/Login/Login.jsx b/client/src/components/Login/Login.jsx index 6a38104..afb92e8 100644 --- a/client/src/components/Login/Login.jsx +++ b/client/src/components/Login/Login.jsx @@ -47,7 +47,7 @@ const Login = () => { } if (data.status === true) { localStorage.setItem(localstorage_key, JSON.stringify(data.user)); - history.push("/"); + history.push("/home"); } } }; diff --git a/client/src/components/Register/Register.jsx b/client/src/components/Register/Register.jsx index 6fc5cb4..1d4001b 100644 --- a/client/src/components/Register/Register.jsx +++ b/client/src/components/Register/Register.jsx @@ -78,7 +78,7 @@ const Register = (props) => { if (data.status === true) { localStorage.setItem(localStorage_key, JSON.stringify(data.user)); props.onsetislogged(); - history.push("/"); + history.push("/home"); } } }; diff --git a/client/src/components/home/home.module.css b/client/src/components/home/home.module.css index 2b0f023..d9a8719 100644 --- a/client/src/components/home/home.module.css +++ b/client/src/components/home/home.module.css @@ -79,7 +79,7 @@ font-size: 15px; position: fixed; bottom: 70px; - right: 0; + margin-right: 300px; left: auto; width: 50%; width: 40%; From 20bd98846c9ad9889839a34160f58238a429b4d0 Mon Sep 17 00:00:00 2001 From: devansh dwivedi Date: Mon, 17 Apr 2023 14:25:43 +0530 Subject: [PATCH 06/25] path issue resolved --- client/src/App.js | 14 ++++++++------ client/src/components/home/Home.jsx | 3 +-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/client/src/App.js b/client/src/App.js index cbe0c15..d5e6089 100644 --- a/client/src/App.js +++ b/client/src/App.js @@ -10,11 +10,12 @@ import { localStorage_key } from "./components/Register/Register"; import { useEffect, useState } from "react"; function App() { - const [isLogged, setisLogged] = useState(true); + const [isLogged, setisLogged] = useState(false); const onSetisLoggedState = () => { setisLogged(true); }; + useEffect(() => { const data = localStorage.getItem(localStorage_key); console.log(data); @@ -39,16 +40,17 @@ function App() { )} {!isLogged && ( - - + + )} + {!isLogged && ( - - + + )} - + diff --git a/client/src/components/home/Home.jsx b/client/src/components/home/Home.jsx index 4eb5ad9..3388f27 100644 --- a/client/src/components/home/Home.jsx +++ b/client/src/components/home/Home.jsx @@ -34,8 +34,7 @@ const Home = () => {

- DevGram is a web application designed for developers to connect with each other. - + DevGram is a web application designed for developers to connect with each other.

From 6a50a7852eb53338134306e03e2e562019578a9b Mon Sep 17 00:00:00 2001 From: devansh dwivedi Date: Tue, 18 Apr 2023 23:42:42 +0530 Subject: [PATCH 07/25] changes in navbar --- client/src/components/Nav/navbar.jsx | 2 +- client/src/components/Nav/navbar.module.css | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/client/src/components/Nav/navbar.jsx b/client/src/components/Nav/navbar.jsx index 6cab024..aaddef4 100644 --- a/client/src/components/Nav/navbar.jsx +++ b/client/src/components/Nav/navbar.jsx @@ -5,7 +5,7 @@ function Navbar() { return (
-

Pro-Gram.

+

DevGram