From 51675734c453630ce1333fe0e457e3a13374b0ac Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Fri, 4 Mar 2022 01:27:35 +0100 Subject: [PATCH 01/14] positioning elements from connect wallet -NavBar --- components/Account.jsx | 2 +- components/homepage/HomepageNav.js | 23 ++++++++++++----------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/components/Account.jsx b/components/Account.jsx index e18c3ec..9d2b5af 100644 --- a/components/Account.jsx +++ b/components/Account.jsx @@ -212,7 +212,7 @@ const Account = () => {
-
+
logo

diff --git a/components/homepage/HomepageNav.js b/components/homepage/HomepageNav.js index fb99a7b..6450070 100644 --- a/components/homepage/HomepageNav.js +++ b/components/homepage/HomepageNav.js @@ -335,7 +335,7 @@ const HomepageNav = ({ }`} > {isLogin === true && ( -
setOpen(!open)} > @@ -484,13 +484,13 @@ const HomepageNav = ({ -
    -
  • -
    +
      +
    • +
      • -
    • -
      +
    • +
      • {userData !== null && userData !== undefined ? ( -
      -
    • +
      +
    • {userData.profilePicture ? ( ) : ( )} From 5371d592a93549e6da94837a229d3f31e6f264fd Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Sun, 6 Mar 2022 00:56:11 +0100 Subject: [PATCH 02/14] changing the margin in user not signed-in --- components/homepage/HomepageNav.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/components/homepage/HomepageNav.js b/components/homepage/HomepageNav.js index 439cd48..922b215 100644 --- a/components/homepage/HomepageNav.js +++ b/components/homepage/HomepageNav.js @@ -215,8 +215,8 @@ const HomepageNav = ({ ref={dropdownMobileRef} > {userData !== null && userData !== undefined ? ( -
      -
      +
      +
    {userData !== null && userData !== undefined ? ( -
    • {userData !== null && userData !== undefined ? ( -
    -
  • +
    +
  • {userData.profilePicture ? ( ) : ( )} @@ -540,10 +540,10 @@ const HomepageNav = ({
    • ) : ( -
  • - + {isActive ? ( From 60f7ccadd1e1a5c46244a59bca97f5165b01d641 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Tue, 8 Mar 2022 23:08:15 +0100 Subject: [PATCH 03/14] adding functionallity onKeyDown, when user hits enter the function will be called...same functionallity will be called when user clicks with cursor on search icon...(functionallity is added for mobile size screens too) --- components/homepage/HomepageNav.js | 38 ++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/components/homepage/HomepageNav.js b/components/homepage/HomepageNav.js index 922b215..64f51bf 100644 --- a/components/homepage/HomepageNav.js +++ b/components/homepage/HomepageNav.js @@ -52,19 +52,39 @@ const HomepageNav = ({ const regex = /\b\w+/; if (!regex.test(e.target.value) && e.target.value !== '') return; setSearch(e.target.value); - router.push({ + /*router.push({ pathname: router.pathname, query: { _q: encodeURI(e.target.value) }, - }); + });*/ }; + const handleKeyDown = (e) => { + if (e.key === 'Enter') { + console.log('Enter is pressed !'); + router.push({ + pathname: router.pathname, + query: { _q: encodeURI(searchValue) }, + }); + } + } + + const handleSearchIconSubmit = () => { + console.log(router.pathname) + console.log(searchValue) + router.push({ + pathname: router.pathname, + query: { _q: encodeURI(searchValue) }, + }); + } + + const handleSubmit = () => { const regex = /\b\w+/; if (!regex.test(searchValue)) return; setSearch(''); router.push({ - pathname: '/search', - query: { _q: searchValue }, + pathname: router.pathname, + query: { _q: encodeURI(searchValue) }, }); }; @@ -191,6 +211,7 @@ const HomepageNav = ({
    @@ -321,6 +342,8 @@ const HomepageNav = ({
    ); + + return (
    -
From 9076069fed59063c23d867f9cbc6297971b8cd2d Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Fri, 11 Mar 2022 00:58:49 +0100 Subject: [PATCH 04/14] removing orientation borders --- components/homepage/HomepageNav.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/homepage/HomepageNav.js b/components/homepage/HomepageNav.js index 64f51bf..6e9b94d 100644 --- a/components/homepage/HomepageNav.js +++ b/components/homepage/HomepageNav.js @@ -236,8 +236,8 @@ const HomepageNav = ({ ref={dropdownMobileRef} > {userData !== null && userData !== undefined ? ( -
-
+
+
Date: Sun, 13 Mar 2022 00:30:51 +0100 Subject: [PATCH 05/14] changing the style of the text --- components/homepage/HomepageNav.js | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/components/homepage/HomepageNav.js b/components/homepage/HomepageNav.js index 6e9b94d..0ee200f 100644 --- a/components/homepage/HomepageNav.js +++ b/components/homepage/HomepageNav.js @@ -52,10 +52,6 @@ const HomepageNav = ({ const regex = /\b\w+/; if (!regex.test(e.target.value) && e.target.value !== '') return; setSearch(e.target.value); - /*router.push({ - pathname: router.pathname, - query: { _q: encodeURI(e.target.value) }, - });*/ }; const handleKeyDown = (e) => { @@ -511,20 +507,18 @@ const HomepageNav = ({
    -
  • -
    +
  • +
    + From da9348844af255b5e4343621c7a994344db4ba46 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Sun, 13 Mar 2022 00:45:02 +0100 Subject: [PATCH 06/14] changing the size of the text --- components/Account.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/Account.jsx b/components/Account.jsx index 9d2b5af..ffac6ca 100644 --- a/components/Account.jsx +++ b/components/Account.jsx @@ -189,7 +189,7 @@ const Account = () => { openAuthModal(); }} > -

    Connect Wallet

    +

    Connect Wallet

    Date: Sun, 13 Mar 2022 00:45:24 +0100 Subject: [PATCH 07/14] changing the size of the text --- components/homepage/HomepageNav.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/homepage/HomepageNav.js b/components/homepage/HomepageNav.js index 0ee200f..d7a12d2 100644 --- a/components/homepage/HomepageNav.js +++ b/components/homepage/HomepageNav.js @@ -507,8 +507,8 @@ const HomepageNav = ({
    -
  • -
    +
  • +
    • -
  • +
  • From 20789c9556501462ab6503139d41a9db858875d3 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Sun, 13 Mar 2022 01:21:41 +0100 Subject: [PATCH 08/14] changing the style of the connect button --- components/Account.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/Account.jsx b/components/Account.jsx index ffac6ca..ab3f2e1 100644 --- a/components/Account.jsx +++ b/components/Account.jsx @@ -184,7 +184,7 @@ const Account = () => { return ( <>
    { openAuthModal(); }} From f58f0e9a3f1af89cc979f88718ee0a3c9a2ab421 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Sun, 13 Mar 2022 01:22:44 +0100 Subject: [PATCH 09/14] changing teh scale of the nav-bar input, connect-wallet and img. --- components/homepage/HomepageNav.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/components/homepage/HomepageNav.js b/components/homepage/HomepageNav.js index d7a12d2..ccf1cff 100644 --- a/components/homepage/HomepageNav.js +++ b/components/homepage/HomepageNav.js @@ -508,12 +508,12 @@ const HomepageNav = ({
  • -
    +
    • -
  • -
    +
  • +
    • {userData !== null && userData !== undefined ? ( -
    +
  • {userData.profilePicture ? ( profile Date: Sun, 13 Mar 2022 02:01:16 +0100 Subject: [PATCH 10/14] deleting the orientation-borders --- components/homepage/HomepageNav.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/homepage/HomepageNav.js b/components/homepage/HomepageNav.js index ccf1cff..d8807f5 100644 --- a/components/homepage/HomepageNav.js +++ b/components/homepage/HomepageNav.js @@ -326,7 +326,7 @@ const HomepageNav = ({ }`} onClick={closeMobileMenu} > -
  • +
  • Profile
    • @@ -530,7 +530,7 @@ const HomepageNav = ({
    {userData !== null && userData !== undefined ? ( -
    +
  • {userData.profilePicture ? ( {isActive ? ( From a11780ce4205b1e2a07e445f922b11db618c9ac6 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Mon, 14 Mar 2022 15:09:42 +0100 Subject: [PATCH 11/14] bringing back the old code for search-logic --- components/homepage/HomepageNav.js | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/components/homepage/HomepageNav.js b/components/homepage/HomepageNav.js index d8807f5..202bc4e 100644 --- a/components/homepage/HomepageNav.js +++ b/components/homepage/HomepageNav.js @@ -52,27 +52,11 @@ const HomepageNav = ({ const regex = /\b\w+/; if (!regex.test(e.target.value) && e.target.value !== '') return; setSearch(e.target.value); - }; - - const handleKeyDown = (e) => { - if (e.key === 'Enter') { - console.log('Enter is pressed !'); - router.push({ - pathname: router.pathname, - query: { _q: encodeURI(searchValue) }, - }); - } - } - - const handleSearchIconSubmit = () => { - console.log(router.pathname) - console.log(searchValue) router.push({ pathname: router.pathname, - query: { _q: encodeURI(searchValue) }, + query: { _q: encodeURI(e.target.value) }, }); - } - + }; const handleSubmit = () => { const regex = /\b\w+/; @@ -207,7 +191,6 @@ const HomepageNav = ({
    @@ -511,7 +492,6 @@ const HomepageNav = ({
    -
    From b1a2857a6975da7b94d5b00d6d5830f0f5b05874 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Mon, 14 Mar 2022 15:46:09 +0100 Subject: [PATCH 12/14] connect button styling with small changesin text size between mobile screen users and desktop users --- components/Account.jsx | 4 ++-- components/homepage/HomepageNav.js | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/components/Account.jsx b/components/Account.jsx index ab3f2e1..9327718 100644 --- a/components/Account.jsx +++ b/components/Account.jsx @@ -184,12 +184,12 @@ const Account = () => { return ( <>
    { openAuthModal(); }} > -

    Connect Wallet

    +

    Connect Wallet

    +
    + +
    ); @@ -504,8 +506,8 @@ const HomepageNav = ({
    • -
  • -
    +
  • +
    • From 1761cbb4d562662904322b8d3994ce793e2908b2 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Mon, 14 Mar 2022 20:44:05 +0100 Subject: [PATCH 13/14] commented searchbox input --- components/homepage/HomepageNav.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/components/homepage/HomepageNav.js b/components/homepage/HomepageNav.js index ba4aff8..ae0913d 100644 --- a/components/homepage/HomepageNav.js +++ b/components/homepage/HomepageNav.js @@ -489,9 +489,11 @@ const HomepageNav = ({
-
    +
    • -
      + {/* SearchBox + +
      -
      +
      */}
    • From a625009f655e78fc7607cd6f4a53ace41c3c1bd8 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Thu, 17 Mar 2022 02:15:09 +0100 Subject: [PATCH 14/14] commented the search box on mobile sreens --- components/homepage/HomepageNav.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/homepage/HomepageNav.js b/components/homepage/HomepageNav.js index ae0913d..af36fe3 100644 --- a/components/homepage/HomepageNav.js +++ b/components/homepage/HomepageNav.js @@ -203,7 +203,7 @@ const HomepageNav = ({ > -
      +
); @@ -391,7 +391,7 @@ const HomepageNav = ({
{isActiveMobile ? menuMobile() : ''} - {isActiveSearch ? showSearchIconMobile() : ''} + {/*isActiveSearch ? showSearchIconMobile() : ''*/}
    {userData !== null && userData !== undefined ? (