From 160701a262faa048622132631314f583a1f075a6 Mon Sep 17 00:00:00 2001
From: MTG2000 <mtg0987654321@gmail.com>
Date: Mon, 19 Sep 2022 14:13:59 +0300
Subject: [PATCH] update: discord card on feed page, events page title

---
 public/assets/icons/join-discord.svg          |  4 ++
 .../pages/HackathonsPage/HackathonsPage.tsx   |  2 +-
 .../Posts/pages/FeedPage/FeedPage.tsx         | 40 +++++++++----------
 3 files changed, 23 insertions(+), 23 deletions(-)
 create mode 100644 public/assets/icons/join-discord.svg

diff --git a/public/assets/icons/join-discord.svg b/public/assets/icons/join-discord.svg
new file mode 100644
index 0000000..da52ce2
--- /dev/null
+++ b/public/assets/icons/join-discord.svg
@@ -0,0 +1,4 @@
+<svg width="175" height="48" viewBox="0 0 175 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M25.5464 20.1655C24.176 20.1655 23.0942 21.3435 23.0942 22.81C23.0942 24.2765 24.2001 25.4545 25.5464 25.4545C26.9167 25.4545 27.9985 24.2765 27.9985 22.81C27.9985 21.3435 26.8927 20.1655 25.5464 20.1655ZM16.7715 20.1655C15.4012 20.1655 14.3193 21.3435 14.3193 22.81C14.3193 24.2765 15.4252 25.4545 16.7715 25.4545C18.1418 25.4545 19.2236 24.2765 19.2236 22.81C19.2477 21.3435 18.1418 20.1655 16.7715 20.1655Z" fill="white"/>
+<path d="M37.2302 0.163574H5.01558C2.29897 0.163574 0.0872192 2.37532 0.0872192 5.09193V37.3065C0.0872192 40.0231 2.29897 42.2349 5.01558 42.2349H32.2778L31.0036 37.8354L34.0809 40.6722L36.9898 43.3408L42.1826 47.8364V5.09193C42.1586 2.37532 39.9468 0.163574 37.2302 0.163574ZM27.9505 31.2964C27.9505 31.2964 27.085 30.2626 26.3638 29.3731C29.5131 28.4836 30.7152 26.5363 30.7152 26.5363C29.7295 27.1854 28.7919 27.6422 27.9505 27.9547C26.7484 28.4595 25.5945 28.7721 24.4646 28.9884C22.1566 29.4212 20.0411 29.301 18.238 28.9644C16.8677 28.7 15.6897 28.3393 14.704 27.9306C14.1511 27.7143 13.55 27.4498 12.949 27.1133C12.8769 27.0652 12.8048 27.0411 12.7327 26.9931C12.6846 26.969 12.6605 26.945 12.6365 26.945C12.2038 26.7046 11.9634 26.5363 11.9634 26.5363C11.9634 26.5363 13.1173 28.4355 16.1705 29.3491C15.4493 30.2626 14.5598 31.3204 14.5598 31.3204C9.24675 31.1521 7.22733 27.6902 7.22733 27.6902C7.22733 20.0212 10.6892 13.7947 10.6892 13.7947C14.1511 11.2223 17.4206 11.2944 17.4206 11.2944L17.661 11.5829C13.3337 12.809 11.3623 14.7082 11.3623 14.7082C11.3623 14.7082 11.8912 14.4197 12.7807 14.0351C15.3531 12.9052 17.3966 12.6167 18.238 12.5205C18.3822 12.4965 18.5024 12.4724 18.6467 12.4724C20.1132 12.2801 21.772 12.232 23.5029 12.4244C25.7868 12.6888 28.239 13.3619 30.7392 14.7082C30.7392 14.7082 28.84 12.9052 24.753 11.6791L25.0896 11.2944C25.0896 11.2944 28.3832 11.2223 31.821 13.7947C31.821 13.7947 35.2829 20.0212 35.2829 27.6902C35.2829 27.6662 33.2635 31.1281 27.9505 31.2964ZM64.252 10.453H56.2705V19.4202L61.5835 24.2043V15.5016H64.4203C66.2234 15.5016 67.1129 16.367 67.1129 17.7614V24.4207C67.1129 25.8151 66.2714 26.7526 64.4203 26.7526H56.2465V31.8252H64.228C68.5072 31.8493 72.522 29.7097 72.522 24.8053V17.6412C72.5461 12.6407 68.5313 10.453 64.252 10.453V10.453ZM106.083 24.8053V17.4489C106.083 14.8044 110.843 14.2034 112.285 16.8479L116.685 15.0688C114.954 11.2704 111.805 10.1645 109.184 10.1645C104.905 10.1645 100.674 12.6407 100.674 17.4489V24.8053C100.674 29.6616 104.905 32.0897 109.088 32.0897C111.781 32.0897 115.002 30.7675 116.781 27.3056L112.069 25.1419C110.915 28.0989 106.083 27.3777 106.083 24.8053V24.8053ZM91.5383 18.4586C89.8795 18.098 88.7736 17.497 88.7015 16.4632C88.7976 13.987 92.6201 13.8908 94.8559 16.2709L98.3899 13.5543C96.1782 10.8617 93.6779 10.1405 91.1056 10.1405C87.1869 10.1405 83.3885 12.3522 83.3885 16.5353C83.3885 20.5982 86.5138 22.7859 89.9516 23.3148C91.7066 23.5552 93.6539 24.2524 93.6058 25.4544C93.4616 27.7383 88.7496 27.6181 86.6099 25.0217L83.1962 28.2191C85.1915 30.7915 87.9081 32.0897 90.4565 32.0897C94.3751 32.0897 98.7265 29.8299 98.8948 25.6949C99.1352 20.478 95.3367 19.1558 91.5383 18.4586V18.4586ZM75.431 31.8012H80.8161V10.453H75.431V31.8012ZM166.233 10.453H158.251V19.4202L163.564 24.2043V15.5016H166.401C168.204 15.5016 169.094 16.367 169.094 17.7614V24.4207C169.094 25.8151 168.252 26.7526 166.401 26.7526H158.227V31.8252H166.233C170.512 31.8493 174.527 29.7097 174.527 24.8053V17.6412C174.527 12.6407 170.512 10.453 166.233 10.453V10.453ZM127.071 10.1645C122.647 10.1645 118.248 12.5686 118.248 17.497V24.7813C118.248 29.6616 122.671 32.1137 127.119 32.1137C131.542 32.1137 135.942 29.6616 135.942 24.7813V17.497C135.942 12.5926 131.494 10.1645 127.071 10.1645V10.1645ZM130.532 24.7813C130.532 26.3199 128.801 27.1133 127.095 27.1133C125.364 27.1133 123.633 26.368 123.633 24.7813V17.497C123.633 15.9343 125.316 15.0929 126.998 15.0929C128.753 15.0929 130.532 15.8381 130.532 17.497V24.7813ZM155.27 17.497C155.15 12.4965 151.736 10.4771 147.337 10.4771H138.802V31.8252H144.26V25.0458H145.221L150.174 31.8252H156.905L151.087 24.4928C153.66 23.6754 155.27 21.4396 155.27 17.497V17.497ZM147.433 20.3818H144.26V15.5016H147.433C150.823 15.5016 150.823 20.3818 147.433 20.3818Z" fill="white"/>
+</svg>
diff --git a/src/features/Hackathons/pages/HackathonsPage/HackathonsPage.tsx b/src/features/Hackathons/pages/HackathonsPage/HackathonsPage.tsx
index d5aa06d..62760cf 100644
--- a/src/features/Hackathons/pages/HackathonsPage/HackathonsPage.tsx
+++ b/src/features/Hackathons/pages/HackathonsPage/HackathonsPage.tsx
@@ -49,7 +49,7 @@ export default function HackathonsPage() {
                         </div>
                     </Link>
                     <div className="flex gap-16 flex-wrap my-24 justify-between">
-                        <h1 id='title' className="text-body1 lg:text-h2 font-bolder">Hackathons 🏆</h1>
+                        <h1 id='title' className="text-body1 lg:text-h2 font-bolder">{sortByFilter ? sortByFilter : "All"} Events</h1>
                         <div className="self-center">
                             <SortByFilter
                                 filterChanged={setSortByFilter}
diff --git a/src/features/Posts/pages/FeedPage/FeedPage.tsx b/src/features/Posts/pages/FeedPage/FeedPage.tsx
index 3a7ced6..921ee8b 100644
--- a/src/features/Posts/pages/FeedPage/FeedPage.tsx
+++ b/src/features/Posts/pages/FeedPage/FeedPage.tsx
@@ -43,8 +43,8 @@ export default function FeedPage() {
     return (
         <>
             <Helmet>
-                <title>{`Bolt.Fun Stories`}</title>
-                <meta property="og:title" content={`Bolt.Fun Stories`} />
+                <title>{`Bolt.Fun`}</title>
+                <meta property="og:title" content={`Bolt.Fun`} />
             </Helmet>
             <div
                 className={`page-container`}
@@ -109,28 +109,24 @@ export default function FeedPage() {
                     <aside id='side' className='no-scrollbar'>
                         <div className="pb-16 flex flex-col gap-24 overflow-y-auto sticky-side-element" >
                             <TrendingCard />
-                            <div className='min-h-[300px] text-white flex flex-col justify-end p-24 rounded-12 relative overflow-hidden'
-                                style={{
-                                    backgroundImage: `url("assets/images/join-discord-card.jpg")`,
-                                    backgroundSize: 'cover',
-                                    backgroundPosition: "center"
-                                }}
-                            >
-                                <div className="absolute bg-black inset-0 opacity-10"></div>
-                                <div className="relative flex flex-col gap-24">
-                                    <div className="flex flex-col gap-8">
-                                        {bannerData.title}
+                            <a href='https://discord.gg/HFqtxavb7x' target='_blank' rel="noreferrer">
+                                <div className='min-h-[248px] text-white flex flex-col justify-end p-24 rounded-12 relative overflow-hidden'
+                                    style={{
+                                        backgroundImage: `url("/assets/images/join-discord-card.jpg")`,
+                                        backgroundSize: 'cover',
+                                        backgroundPosition: "center"
+                                    }}
+                                >
+                                    <div className="absolute bg-black inset-0 opacity-10"></div>
+                                    <div className="relative flex flex-col gap-24">
+                                        <div className="flex flex-col gap-8 text-white">
+                                            <img src={'assets/icons/join-discord.svg'} className='h-48 max-w-full self-start' alt="" />
+                                            <p className="text-body2 font-bold">BOLT🔩FUN Discord</p>
+                                            <p className="text-body4 font-medium">Join the Bolt.Fun Community Discord server and connect with other like minded developers!</p>
+                                        </div>
                                     </div>
-                                    <Button
-                                        color='white'
-                                        fullWidth
-                                        href='https://discord.gg/HFqtxavb7x'
-                                        newTab
-                                    >
-                                        <FaDiscord className='scale-125 mr-8' /> <span className="align-middle">Join in Discord</span>
-                                    </Button>
                                 </div>
-                            </div>
+                            </a>
                         </div>
                     </aside>
                 </div>