From ecf048c7ed75919fee0529539011654dfa785e2c Mon Sep 17 00:00:00 2001 From: Shubham Date: Mon, 18 Oct 2021 21:19:07 +0530 Subject: [PATCH 01/31] Changes in navbar UI and content --- components/NavBar/index.js | 60 ++++++++++--- components/NavBar/navbar.module.css | 134 ++++++++++++++++++---------- public/assets/github.png | Bin 0 -> 3062 bytes 3 files changed, 138 insertions(+), 56 deletions(-) create mode 100644 public/assets/github.png diff --git a/components/NavBar/index.js b/components/NavBar/index.js index 447807f..5356d8c 100644 --- a/components/NavBar/index.js +++ b/components/NavBar/index.js @@ -3,9 +3,11 @@ import React, { useState, useRef } from 'react'; import styles from './navbar.module.css'; import Image from 'next/image'; import GenericClosePopUp from '../Close-popup/GenericClosePopUp'; +import { LOGIN_URL } from 'constants.js'; const NavBar = ({ personData: { photo } }) => { const RDSLogo = '/assets/Real-Dev-Squad1x.png'; + const GITHUB_LOGO = '/assets/github.png'; const [toggle, setToggle] = useState(false); const navbarRef = useRef(); GenericClosePopUp(navbarRef, () => { @@ -16,22 +18,58 @@ const NavBar = ({ personData: { photo } }) => { +
+ + + + | + + +
- + ); }; diff --git a/components/NavBar/navbar.module.css b/components/NavBar/navbar.module.css index 86486f7..a4d7fe8 100644 --- a/components/NavBar/navbar.module.css +++ b/components/NavBar/navbar.module.css @@ -1,144 +1,192 @@ -.navBar { +.wrapper { font-family: 'Roboto', sans-serif; - width: 100%; - min-height: 85px; - background-color: #1d1283; + font-weight: 700; + font-size: 16px; + margin-bottom: 25px; } -.navBar ul { - list-style-type: none; - margin: 0; - padding: 0; - overflow: hidden; +.navBar li a { + margin: 10px; + display: block; + border-radius: 0.5rem; + color: #ffffff; + text-align: center; + padding: 19px 16px; + text-decoration: none; } -.navBar ul li:nth-last-child(-n+3){ - float: right; +.navBar li { + float: left; } -.navBar ul li { - float: left; +.navBar li a:hover { + color: #49a82e; } -.navBar li .active { - color: #88D870; - text-decoration: underline; - text-underline-offset: 0.75em; +.navBarMenu { + list-style-type: none; + margin: 0; + padding: 0; + overflow: hidden; + background-color: #1d1283; } -.navBar li .logo { - padding: 20px 20px 15px; +.navBarLogoLi { + padding: 14px 20px; } -.navBar li .btnLogin { - padding-top: 30px; +.navBarLogoLi a { + margin: 0px !important; + padding: 0px !important; } -.navBar li a { - display: block; - color: #ffffff; - font-weight: 700; - text-align: center; - padding: 35px 20px 10px; - text-decoration: none; +.navBarLoginLi { + float: right !important; } -.navBar li a:hover { - color: #87d870; +.navBarLoginLi a { + padding: 16px !important; } -.btnLogin { - font-size: 18px; - float: right; +.navBarLogin, +.homeTab { + display: none; } -.loginBtnText { - font-size: 16px; +.btnLoginText { border-radius: 6px; - padding: 0.3rem; - background-color: #041484; + padding: 5px; + background-color: #1d1283; color: white; cursor: pointer; border: 2px solid white; } -.githubLogo { - margin-left: 5px; - width: 15px; - height: 15px; -} - .userGreet { display: none; - font-size: 18px; color: #ffffff; - text-align: center; - padding: 30px 20px 10px; - text-decoration: none; + margin: 25px; } .userProfilePic { - width: 2em; - height: 2em; + width: 32px; + height: 32px; border-radius: 50%; display: inline; vertical-align: middle; } + .userGreetMsg { - font-size: 1em; display: inline; vertical-align: middle; margin-right: 10px; } -.profilePic { - display: none; - margin-right: 1em; - width: 4em; - height: 4em; +.activeTab { + color: #49a82e !important; + text-decoration: underline !important; + text-decoration-thickness: 3px !important; + text-underline-offset: 10px !important; } -.profilePic>img { - width: 100%; - height: 100%; - border-radius: 50%; - cursor: pointer; + +.hamburger { + display: none; } -.dropdownContent { - position: absolute; - right: 5px; + +.bar { + display: block; + width: 25px; + height: 3px; + margin: 5px auto; + background-color: #fff; } -.dropdownContentHide { - display: none; + +.githubLogo{ + margin-left: 4px; } -.dropdownContent { - position: absolute; - background-color: #f9f9f9; - min-width: 100px; - border: 1px solid rgba(0, 0, 0, 0.699); - z-index: 1; + +.header { + display: flex; + justify-content: center; + align-items: center; + flex-wrap: wrap; + padding-top: 5px; } -.dropdownContent a { - color: black; - padding: 5px 0; + +.link { + padding: 10px; + margin-top: 2px; text-decoration: none; - text-align: center; - font-size: 18px; - border-bottom: 1px solid rgba(0, 0, 0, 0.26); - display: block; + font-weight: bold; + color: #041484; + cursor: pointer; + background: none; + border: none; } -.dropdownContent a:hover { - background-color: #e4e2e2 + +.active { + color: #E30464; } -@media screen and (max-width: 500px) { - .navBar li .logo { - padding: 4px 4px 100%; +@media screen and (max-width: 970px) { + .navBar { + background: #1d1283; + } + + .hamburger { + margin: 20px; + display: inline-block; + cursor: pointer; + } + + .navBarMenu { + background: white; + display: none; + width: 100%; + padding: 10px 0px; + box-shadow: 0px 10px 15px rgba(0, 0, 0, 0.5); } - .navBar ul li:nth-last-child(-n+3){ - float: left; + + .navBarMenu.active, + .homeTab { + display: block; } .navBar li a { - padding: 18px 14px; + padding: 10px 40px; + text-align: left; + color: #1d1283; + text-decoration: none; + display: block; + } + + .navBarLogin { + display: block; + margin: 20px; + position: absolute; + top: 0; + right: 0px; + } + + .navBarLoginLi, + .navBarLogoLi { + display: none; + } + + .activeTab { + text-decoration: none; + } + + .navBar li { + float: none; + } + + .mainBanner, + .logoImg { + margin-top: 40px; + } + + .userGreet { + margin: 0px; } -} \ No newline at end of file +} \ No newline at end of file diff --git a/public/assets/github.png b/public/assets/github.png index 1a3571d26d6be2a4d34d39539f715192719b5a5f..6c3b3cd14aece03ce138e53c6e8ecc4954b17e8a 100644 GIT binary patch literal 13669 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 Ef`3KCnE(I) diff --git a/styles/Home.module.css b/styles/Home.module.css index 67b5735..3b18c5e 100644 --- a/styles/Home.module.css +++ b/styles/Home.module.css @@ -55,7 +55,7 @@ display: flex; flex-wrap: wrap; justify-content: space-around; - padding-top: 2.5em; + /* padding-top: 2.5em; */ width: 100%; padding-bottom: 100px; overflow: hidden; From 26a5f51d4b69390ec11108333039d05861c2a824 Mon Sep 17 00:00:00 2001 From: Shubham Date: Sun, 19 Dec 2021 15:40:28 +0530 Subject: [PATCH 04/31] Add login url from constants --- components/NavBar/index.js | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/components/NavBar/index.js b/components/NavBar/index.js index 9198e75..51e6db4 100644 --- a/components/NavBar/index.js +++ b/components/NavBar/index.js @@ -30,10 +30,7 @@ const NavBar = ({ personData: { photo } }) => {
- + -
-
Hello, User!
- +
+
+ {isLoggedIn + ? `Hello, ${userData.firstName} + ` + : `Hello, User!`} +
+
diff --git a/components/NavBar/navbar.module.css b/components/NavBar/navbar.module.css index a4d7fe8..46a16e0 100644 --- a/components/NavBar/navbar.module.css +++ b/components/NavBar/navbar.module.css @@ -63,7 +63,6 @@ } .userGreet { - display: none; color: #ffffff; margin: 25px; } @@ -174,7 +173,7 @@ } .activeTab { - text-decoration: none; + text-decoration: none !important; } .navBar li { diff --git a/constants.js b/constants.js index 394b6db..5ebb4ef 100644 --- a/constants.js +++ b/constants.js @@ -1,6 +1,7 @@ const BASE_IMAGE_URL = 'https://raw.githubusercontent.com/Real-Dev-Squad/website-static/main/members'; const BASE_API_URL = process.env.NEXT_PUBLIC_BASE_API_URL; +const USER_DATA_URL = `${BASE_API_URL}/users/self`; const WALLET_URL = `${BASE_API_URL}/wallet`; const CURRENCIES = { NEELAM: 'neelam', @@ -8,4 +9,11 @@ const CURRENCIES = { }; const LOGIN_URL = 'https://github.com/login/oauth/authorize?client_id=23c78f66ab7964e5ef97'; -export { BASE_IMAGE_URL, BASE_API_URL, WALLET_URL, CURRENCIES, LOGIN_URL }; +export { + BASE_IMAGE_URL, + BASE_API_URL, + USER_DATA_URL, + WALLET_URL, + CURRENCIES, + LOGIN_URL, +}; diff --git a/pages/index.js b/pages/index.js index 5bc012e..b0c7f1b 100644 --- a/pages/index.js +++ b/pages/index.js @@ -20,7 +20,7 @@ export default function Home() { Bank Dashboard - +
diff --git a/styles/globals.css b/styles/globals.css index a960f36..dac0aac 100644 --- a/styles/globals.css +++ b/styles/globals.css @@ -67,3 +67,9 @@ footer a { min-height: 92vh; padding-bottom: 50px; } +.d-none{ + display: none !important; +} +.d-block{ + display: block !important; +} \ No newline at end of file From 6f21386d5d69107d7421574a246de8264a287b1e Mon Sep 17 00:00:00 2001 From: Shubham Date: Sun, 19 Dec 2021 18:17:32 +0530 Subject: [PATCH 06/31] Fixed display data for signed-out users --- components/NavBar/index.js | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/components/NavBar/index.js b/components/NavBar/index.js index e7e4c61..2aa59dd 100644 --- a/components/NavBar/index.js +++ b/components/NavBar/index.js @@ -23,19 +23,17 @@ const NavBar = () => { useEffect(() => { const fetchData = async () => { await fetch(USER_DATA_URL, { credentials: 'include' }) - .then((response) => { - if (response.status === 401) { - setIsLoggedIn(false); - } - return response.json(); - }) + .then((response) => response.json()) .then((responseJson) => { if (responseJson.incompleteUserDetails) { return window.location.replace( 'https://my.realdevsquad.com/signup' ); } - setIsLoggedIn(true); + responseJson.statusCode === 401 + ? setIsLoggedIn(false) + : setIsLoggedIn(true); + setUserData({ userName: responseJson.username, firstName: responseJson.first_name, From 6a371bb4a0cfa63acdab9a12a4b6a1d68aadab19 Mon Sep 17 00:00:00 2001 From: Shubham Date: Sun, 19 Dec 2021 18:21:40 +0530 Subject: [PATCH 07/31] Added mobile UI change for currency exchange page --- pages/currency-exchange/currency-exchange.module.css | 3 --- 1 file changed, 3 deletions(-) diff --git a/pages/currency-exchange/currency-exchange.module.css b/pages/currency-exchange/currency-exchange.module.css index 0eebc6b..b50d1e4 100644 --- a/pages/currency-exchange/currency-exchange.module.css +++ b/pages/currency-exchange/currency-exchange.module.css @@ -4,9 +4,6 @@ @media only screen and (max-width: 600px) { /*Big smartphones [426px -> 600px]*/ - .exchange_rates { - margin-top: 50px; - } } @media only screen and (max-width: 425px) { /*Small smartphones [325px -> 425px]*/ From 229305d1b5589c0035fdd09502c7e658f12dda75 Mon Sep 17 00:00:00 2001 From: Shubham Date: Sun, 19 Dec 2021 18:42:37 +0530 Subject: [PATCH 08/31] Added changes to use Link component for anchor tags --- components/NavBar/index.js | 159 +++++++++++++++++++------------------ 1 file changed, 83 insertions(+), 76 deletions(-) diff --git a/components/NavBar/index.js b/components/NavBar/index.js index 2aa59dd..6a52cd5 100644 --- a/components/NavBar/index.js +++ b/components/NavBar/index.js @@ -1,7 +1,7 @@ -import Link from 'next/link'; import React, { useState, useRef, useEffect } from 'react'; import { useRouter } from 'next/router'; import styles from './navbar.module.css'; +import Link from 'next/link'; import Image from 'next/image'; import GenericClosePopUp from '../Close-popup/GenericClosePopUp'; import { USER_DATA_URL, LOGIN_URL } from 'constants.js'; @@ -67,23 +67,24 @@ const NavBar = () => { : `${styles.navBarLogin} d-none` } > - - - + + + + +
{ } >
  • - - home nav logo - + + + home nav logo + +
  • - Home + Home
  • - Welcome + Welcome
  • - Events + Events
  • - Members + Members
  • - - Crypto - + + Crypto +
  • - Status + Status
  • { : `${styles.navBarLoginLi} d-none` } > - - - + + + + + ); From fa950d0a42cf08635f4c84063f710c71f041c85d Mon Sep 17 00:00:00 2001 From: Shubham Date: Sun, 19 Dec 2021 19:43:10 +0530 Subject: [PATCH 09/31] Remove commented code --- styles/Home.module.css | 1 - 1 file changed, 1 deletion(-) diff --git a/styles/Home.module.css b/styles/Home.module.css index 3b18c5e..e05e993 100644 --- a/styles/Home.module.css +++ b/styles/Home.module.css @@ -55,7 +55,6 @@ display: flex; flex-wrap: wrap; justify-content: space-around; - /* padding-top: 2.5em; */ width: 100%; padding-bottom: 100px; overflow: hidden; From 6e23e6afb5a2762ffa0fdbaadfd9be67e17c9532 Mon Sep 17 00:00:00 2001 From: Shubham Date: Tue, 21 Dec 2021 02:05:22 +0530 Subject: [PATCH 10/31] css code refactor changes --- components/NavBar/navbar.module.css | 4 +--- styles/globals.css | 8 ++++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/components/NavBar/navbar.module.css b/components/NavBar/navbar.module.css index 46a16e0..334b0c1 100644 --- a/components/NavBar/navbar.module.css +++ b/components/NavBar/navbar.module.css @@ -1,7 +1,5 @@ .wrapper { - font-family: 'Roboto', sans-serif; - font-weight: 700; - font-size: 16px; + font: 700 16px 'Roboto', sans-serif; margin-bottom: 25px; } diff --git a/styles/globals.css b/styles/globals.css index dac0aac..b5febf6 100644 --- a/styles/globals.css +++ b/styles/globals.css @@ -4,7 +4,7 @@ body { margin: 0; font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; - background-color: #e9ebff;; + background-color: #e9ebff; min-height: 100%; } @media only screen and (min-width: 905px) { @@ -67,9 +67,9 @@ footer a { min-height: 92vh; padding-bottom: 50px; } -.d-none{ +.d-none { display: none !important; } -.d-block{ +.d-block { display: block !important; -} \ No newline at end of file +} From 49e06d5f6708dfd42c713a65c1bda061004c7c14 Mon Sep 17 00:00:00 2001 From: Shubham Date: Tue, 21 Dec 2021 02:06:45 +0530 Subject: [PATCH 11/31] Add and load paths from constants file --- components/NavBar/index.js | 16 ++++++++-------- constants.js | 9 +++++++++ 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/components/NavBar/index.js b/components/NavBar/index.js index 6a52cd5..81ca4ed 100644 --- a/components/NavBar/index.js +++ b/components/NavBar/index.js @@ -4,7 +4,7 @@ import styles from './navbar.module.css'; import Link from 'next/link'; import Image from 'next/image'; import GenericClosePopUp from '../Close-popup/GenericClosePopUp'; -import { USER_DATA_URL, LOGIN_URL } from 'constants.js'; +import { USER_DATA_URL, LOGIN_URL, PATHS } from 'constants.js'; const NavBar = () => { const router = useRouter(); @@ -112,7 +112,7 @@ const NavBar = () => { } >
  • - + {
  • - Home + Home
  • - Welcome + Welcome
  • - Events + Events
  • - Members + Members
  • - + Crypto
  • - Status + Status
  • Date: Tue, 21 Dec 2021 02:22:07 +0530 Subject: [PATCH 12/31] Remove !important property from navbar css --- components/NavBar/navbar.module.css | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/components/NavBar/navbar.module.css b/components/NavBar/navbar.module.css index 334b0c1..5651343 100644 --- a/components/NavBar/navbar.module.css +++ b/components/NavBar/navbar.module.css @@ -33,17 +33,17 @@ padding: 14px 20px; } -.navBarLogoLi a { - margin: 0px !important; - padding: 0px !important; +.navBar li.navBarLogoLi a { + margin: 0px; + padding: 0px; } -.navBarLoginLi { - float: right !important; +.navBar li.navBarLoginLi { + float: right; } -.navBarLoginLi a { - padding: 16px !important; +.navBar li.navBarLoginLi a { + padding: 16px; } .navBarLogin, @@ -79,11 +79,11 @@ margin-right: 10px; } -.activeTab { - color: #49a82e !important; - text-decoration: underline !important; - text-decoration-thickness: 3px !important; - text-underline-offset: 10px !important; +.navBar li a.activeTab { + color: #49a82e; + text-decoration: underline; + text-decoration-thickness: 3px; + text-underline-offset: 10px; } .hamburger { @@ -170,8 +170,8 @@ display: none; } - .activeTab { - text-decoration: none !important; + .navBar li a.activeTab { + text-decoration: none; } .navBar li { From 9f51ca9ebe724cc2f6f54d4a2b08eead67ba6095 Mon Sep 17 00:00:00 2001 From: Shubham Date: Tue, 21 Dec 2021 02:30:39 +0530 Subject: [PATCH 13/31] Refactor css code --- components/NavBar/navbar.module.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/NavBar/navbar.module.css b/components/NavBar/navbar.module.css index 5651343..e9cbf95 100644 --- a/components/NavBar/navbar.module.css +++ b/components/NavBar/navbar.module.css @@ -98,7 +98,7 @@ background-color: #fff; } -.githubLogo{ +.githubLogo { margin-left: 4px; } @@ -122,7 +122,7 @@ } .active { - color: #E30464; + color: #e30464; } @media screen and (max-width: 970px) { @@ -186,4 +186,4 @@ .userGreet { margin: 0px; } -} \ No newline at end of file +} From 69465650c749ad72f2a9b9f175ed6344e226a563 Mon Sep 17 00:00:00 2001 From: Shubham Date: Tue, 21 Dec 2021 23:27:48 +0530 Subject: [PATCH 14/31] Add UI changes in navbar --- components/NavBar/index.js | 10 ++-------- components/NavBar/navbar.module.css | 4 ++-- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/components/NavBar/index.js b/components/NavBar/index.js index 81ca4ed..7f551db 100644 --- a/components/NavBar/index.js +++ b/components/NavBar/index.js @@ -91,10 +91,7 @@ const NavBar = () => { } >
    - {isLoggedIn - ? `Hello, ${userData.firstName} - ` - : `Hello, User!`} + {isLoggedIn ? `Hello, ${userData.firstName}!` : `Hello, User!`}
    { } >
    - {isLoggedIn - ? `Hello, ${userData.firstName} - ` - : `Hello, User!`} + {isLoggedIn ? `Hello, ${userData.firstName}!` : `Hello, User!`}
    Date: Wed, 22 Dec 2021 22:56:20 +0530 Subject: [PATCH 15/31] Add default avatar for user profile picture --- components/NavBar/index.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/components/NavBar/index.js b/components/NavBar/index.js index 7f551db..a97ecda 100644 --- a/components/NavBar/index.js +++ b/components/NavBar/index.js @@ -11,6 +11,7 @@ const NavBar = () => { const RDS_LOGO = '/assets/Real-Dev-Squad1x.png'; const GITHUB_LOGO = '/assets/github.png'; + const DEFAULT_AVATAR = '/assets/default_avatar.jpg'; const [userData, setUserData] = useState({}); const [toggle, setToggle] = useState(false); const [isLoggedIn, setIsLoggedIn] = useState(false); @@ -98,8 +99,9 @@ const NavBar = () => { src={ isLoggedIn ? `https://raw.githubusercontent.com/Real-Dev-Squad/website-static/main/members/${userData.userName}/img.png` - : `` + : `${DEFAULT_AVATAR}` } + alt="Profile Picture" />
    • @@ -182,8 +184,9 @@ const NavBar = () => { src={ isLoggedIn ? `https://raw.githubusercontent.com/Real-Dev-Squad/website-static/main/members/${userData.userName}/img.png` - : `` + : `${DEFAULT_AVATAR}` } + alt="Profile Picture" />
    From c58540a9b0e22e82dec5e72d87ff38f40ab7ad22 Mon Sep 17 00:00:00 2001 From: Shubham Date: Wed, 22 Dec 2021 23:34:47 +0530 Subject: [PATCH 16/31] Add UI changes in navbar --- components/NavBar/navbar.module.css | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/components/NavBar/navbar.module.css b/components/NavBar/navbar.module.css index db1048b..ede23bc 100644 --- a/components/NavBar/navbar.module.css +++ b/components/NavBar/navbar.module.css @@ -62,7 +62,7 @@ .userGreet { color: #ffffff; - margin: 25px; + margin: 23px; } .userProfilePic { @@ -153,8 +153,6 @@ padding: 10px 40px; text-align: left; color: #1d1283; - text-decoration: none; - display: block; } .navBarLogin { From 9ccb6442e10b6eea99be607a5df58a11302e9911 Mon Sep 17 00:00:00 2001 From: Shubham Date: Thu, 23 Dec 2021 17:04:09 +0530 Subject: [PATCH 17/31] Add UI changes in navbar --- styles/globals.css | 3 --- 1 file changed, 3 deletions(-) diff --git a/styles/globals.css b/styles/globals.css index b5febf6..270cded 100644 --- a/styles/globals.css +++ b/styles/globals.css @@ -70,6 +70,3 @@ footer a { .d-none { display: none !important; } -.d-block { - display: block !important; -} From 9b5d2e188cf9a60c2e8dc09291930659a0422df3 Mon Sep 17 00:00:00 2001 From: Shubham Date: Mon, 27 Dec 2021 13:01:58 +0530 Subject: [PATCH 18/31] Add profile link on greet message & error handling in fetch user --- components/NavBar/index.js | 80 ++++++++++++++++++----------- components/NavBar/navbar.module.css | 9 +++- constants.js | 2 + 3 files changed, 59 insertions(+), 32 deletions(-) diff --git a/components/NavBar/index.js b/components/NavBar/index.js index a97ecda..367b5f1 100644 --- a/components/NavBar/index.js +++ b/components/NavBar/index.js @@ -4,7 +4,12 @@ import styles from './navbar.module.css'; import Link from 'next/link'; import Image from 'next/image'; import GenericClosePopUp from '../Close-popup/GenericClosePopUp'; -import { USER_DATA_URL, LOGIN_URL, PATHS } from 'constants.js'; +import { + USER_DATA_URL, + LOGIN_URL, + USER_PROFILE_URL, + PATHS, +} from 'constants.js'; const NavBar = () => { const router = useRouter(); @@ -24,17 +29,20 @@ const NavBar = () => { useEffect(() => { const fetchData = async () => { await fetch(USER_DATA_URL, { credentials: 'include' }) - .then((response) => response.json()) + .then((response) => { + if (!response.ok) { + setIsLoggedIn(false); + throw new Error(`${response.status} (${response.statusText})`); + } + return response.json(); + }) .then((responseJson) => { if (responseJson.incompleteUserDetails) { return window.location.replace( 'https://my.realdevsquad.com/signup' ); } - responseJson.statusCode === 401 - ? setIsLoggedIn(false) - : setIsLoggedIn(true); - + setIsLoggedIn(true); setUserData({ userName: responseJson.username, firstName: responseJson.first_name, @@ -91,18 +99,24 @@ const NavBar = () => { isLoggedIn ? `${styles.userGreet}` : `${styles.userGreet} d-none` } > -
    - {isLoggedIn ? `Hello, ${userData.firstName}!` : `Hello, User!`} -
    - Profile Picture + + +
    + {isLoggedIn + ? `Hello, ${userData.firstName}!` + : `Hello, User!`} +
    + Profile Picture +     +
    diff --git a/components/NavBar/navbar.module.css b/components/NavBar/navbar.module.css index ede23bc..2d5fce2 100644 --- a/components/NavBar/navbar.module.css +++ b/components/NavBar/navbar.module.css @@ -42,8 +42,9 @@ float: right; } -.navBar li.navBarLoginLi a { - padding: 12px; +.navBar li.navBarLoginLi .btnLogin { + padding: 0px; + margin: 22px; } .navBarLogin, @@ -65,6 +66,10 @@ margin: 23px; } +.navBarLoginLi .userGreet a{ + padding: 0px; +} + .userProfilePic { width: 32px; height: 32px; diff --git a/constants.js b/constants.js index fe6018d..083f9ea 100644 --- a/constants.js +++ b/constants.js @@ -17,6 +17,7 @@ const PATHS = { }; const LOGIN_URL = 'https://github.com/login/oauth/authorize?client_id=23c78f66ab7964e5ef97'; +const USER_PROFILE_URL = 'https://my.realdevsquad.com/profile'; export { BASE_IMAGE_URL, BASE_API_URL, @@ -24,5 +25,6 @@ export { WALLET_URL, CURRENCIES, LOGIN_URL, + USER_PROFILE_URL, PATHS, }; From c82d48eef4eb9adeaf7d9fa03764e477606e51f4 Mon Sep 17 00:00:00 2001 From: Shubham Date: Tue, 28 Dec 2021 15:51:41 +0530 Subject: [PATCH 19/31] Fix profile url --- components/NavBar/index.js | 11 +++-------- constants.js | 3 +-- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/components/NavBar/index.js b/components/NavBar/index.js index 367b5f1..3eab14c 100644 --- a/components/NavBar/index.js +++ b/components/NavBar/index.js @@ -4,12 +4,7 @@ import styles from './navbar.module.css'; import Link from 'next/link'; import Image from 'next/image'; import GenericClosePopUp from '../Close-popup/GenericClosePopUp'; -import { - USER_DATA_URL, - LOGIN_URL, - USER_PROFILE_URL, - PATHS, -} from 'constants.js'; +import { USER_DATA_URL, LOGIN_URL, PATHS } from 'constants.js'; const NavBar = () => { const router = useRouter(); @@ -99,7 +94,7 @@ const NavBar = () => { isLoggedIn ? `${styles.userGreet}` : `${styles.userGreet} d-none` } > - +
    {isLoggedIn @@ -190,7 +185,7 @@ const NavBar = () => { : `${styles.userGreet} d-none` } > - +
    {isLoggedIn diff --git a/constants.js b/constants.js index 083f9ea..964781f 100644 --- a/constants.js +++ b/constants.js @@ -14,10 +14,10 @@ const PATHS = { MEMBERS: 'https://members.realdevsquad.com/', CRYPTO: 'https://crypto.realdevsquad.com/', STATUS: 'https://status.realdevsquad.com/', + PROFILE: 'https://my.realdevsquad.com/', }; const LOGIN_URL = 'https://github.com/login/oauth/authorize?client_id=23c78f66ab7964e5ef97'; -const USER_PROFILE_URL = 'https://my.realdevsquad.com/profile'; export { BASE_IMAGE_URL, BASE_API_URL, @@ -25,6 +25,5 @@ export { WALLET_URL, CURRENCIES, LOGIN_URL, - USER_PROFILE_URL, PATHS, }; From 71e51c3cd9e6b5ca823555a7b4958fbd587dc355 Mon Sep 17 00:00:00 2001 From: Rohan Raj Gupta <78433013+rohan09-raj@users.noreply.github.com> Date: Sun, 2 Jan 2022 02:21:30 +0530 Subject: [PATCH 20/31] Added .env.development file (#245) Co-authored-by: user.name: "Rohan Raj Gupta --- .env.development | 1 + 1 file changed, 1 insertion(+) create mode 100644 .env.development diff --git a/.env.development b/.env.development new file mode 100644 index 0000000..03d683f --- /dev/null +++ b/.env.development @@ -0,0 +1 @@ +NEXT_PUBLIC_BASE_API_URL=https://api.realdevsquad.com From 204941f9947eff9fd8d86e8f8e17b7a252281c21 Mon Sep 17 00:00:00 2001 From: Shubham Date: Thu, 13 Jan 2022 20:22:29 +0530 Subject: [PATCH 21/31] Improvement in code and changes to use cloudinary images --- components/NavBar/index.js | 89 +++++++++++++------------------------- constants.js | 39 ++++++++++++++--- 2 files changed, 64 insertions(+), 64 deletions(-) diff --git a/components/NavBar/index.js b/components/NavBar/index.js index 3eab14c..1508487 100644 --- a/components/NavBar/index.js +++ b/components/NavBar/index.js @@ -4,7 +4,7 @@ import styles from './navbar.module.css'; import Link from 'next/link'; import Image from 'next/image'; import GenericClosePopUp from '../Close-popup/GenericClosePopUp'; -import { USER_DATA_URL, LOGIN_URL, PATHS } from 'constants.js'; +import { USER_DATA_URL, LOGIN_URL, PATHS, NAV_MENU } from 'constants.js'; const NavBar = () => { const router = useRouter(); @@ -33,14 +33,15 @@ const NavBar = () => { }) .then((responseJson) => { if (responseJson.incompleteUserDetails) { - return window.location.replace( - 'https://my.realdevsquad.com/signup' - ); + window.open('https://my.realdevsquad.com/signup', '_blank'); } setIsLoggedIn(true); setUserData({ userName: responseJson.username, firstName: responseJson.first_name, + profilePicture: responseJson.picture + ? responseJson.picture.url + : DEFAULT_AVATAR, }); }) .catch((err) => { @@ -72,11 +73,7 @@ const NavBar = () => { } > - + -
    +
    - {isLoggedIn - ? `Hello, ${userData.firstName}!` - : `Hello, User!`} + {`Hello ${isLoggedIn ? `${userData.firstName}` : 'User'}!`}
    Profile Picture {     -
  • - Home -
    • -
  • - Welcome -
    • -
  • - Events -
    • -
  • - Members -
    • -
  • - - Crypto - -
    • -
  • - Status -
    • + {NAV_MENU.map((navTab) => { + return ( +
  • + + + {navTab.name} + + +
    • + ); + })}
  • - +
    • - {NAV_MENU.map((navTab) => { + {NAV_MENU.map((navTab, index) => { return (
  • From fd64c8080b861340c60e30291199222f79b6fab7 Mon Sep 17 00:00:00 2001 From: Shubham Date: Sun, 16 Jan 2022 19:10:57 +0530 Subject: [PATCH 23/31] Replace useEffect by useLayoutEffect for login button --- components/NavBar/index.js | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/components/NavBar/index.js b/components/NavBar/index.js index 0bdb9aa..d0d16ed 100644 --- a/components/NavBar/index.js +++ b/components/NavBar/index.js @@ -1,4 +1,4 @@ -import React, { useState, useRef, useEffect } from 'react'; +import React, { useState, useRef, useEffect, useLayoutEffect } from 'react'; import { useRouter } from 'next/router'; import styles from './navbar.module.css'; import Link from 'next/link'; @@ -15,13 +15,12 @@ const NavBar = () => { const [userData, setUserData] = useState({}); const [toggle, setToggle] = useState(false); const [isLoggedIn, setIsLoggedIn] = useState(false); - const [mountedComponent, setMountedComponent] = useState(false); const navbarRef = useRef(); GenericClosePopUp(navbarRef, () => { setToggle(false); }); - useEffect(() => { + useLayoutEffect(() => { const fetchData = async () => { await fetch(USER_DATA_URL, { credentials: 'include' }) .then((response) => { @@ -47,7 +46,6 @@ const NavBar = () => { .catch((err) => { console.error(err); }); - setMountedComponent(true); }; fetchData(); @@ -65,13 +63,7 @@ const NavBar = () => {
    • -
    +
    -
    +