From 5306d9c7366e7f7cdfb98b81a6dff4ff8636cfa8 Mon Sep 17 00:00:00 2001 From: Yizheng Yu Date: Wed, 15 Nov 2023 20:41:18 -0800 Subject: [PATCH 1/7] Website Redesign: Release 1 navigation bars #127 * Replaced the app bar icon * Reordered and added new nav menu items * Changed the notification and support buttons color styles --- public/images/orcasoundlogo_2.png | Bin 0 -> 3769 bytes src/components/Nav.jsx | 96 +++++++++++++++++++++--------- 2 files changed, 67 insertions(+), 29 deletions(-) create mode 100644 public/images/orcasoundlogo_2.png diff --git a/public/images/orcasoundlogo_2.png b/public/images/orcasoundlogo_2.png new file mode 100644 index 0000000000000000000000000000000000000000..197745ecfe05ec02d3bd72e88266673aa7e57149 GIT binary patch literal 3769 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 jz84>^#TjncVAH< { { position: 'absolute', }} > - Orcasound + Orcasound @@ -188,23 +194,55 @@ function Desktop() { ))} - + + + + + + ) } From 9a6d4d6c59eadb892043d83263f4821ea56464a2 Mon Sep 17 00:00:00 2001 From: Yizheng Yu Date: Thu, 16 Nov 2023 02:13:00 -0800 Subject: [PATCH 2/7] Website Redesign: Release 1 navigation bars #127 * Hovering over the support button will invert the color of the volunteer icon * Increased the notification and support button width * Increased the spacing between the nav items --- src/components/Nav.jsx | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/components/Nav.jsx b/src/components/Nav.jsx index 7c7aaf8..d6e3e5d 100644 --- a/src/components/Nav.jsx +++ b/src/components/Nav.jsx @@ -165,12 +165,12 @@ function Desktop() { return ( - + {navLinks.map((navLink) => ( + textDecoration: 'none', + }} + > + {navLink.name} + + + + + + + ))} From 57b60b0c9a51717bd3a17e602e4efb08fd98ac87 Mon Sep 17 00:00:00 2001 From: Yizheng Yu Date: Fri, 17 Nov 2023 09:31:16 -0800 Subject: [PATCH 4/7] Website Redesign: Release 1 navigation bars #127 * Added footer orca logo, third party platform icons * Added two columns of navigation items * Added license logo --- public/images/facebook.png | Bin 0 -> 1139 bytes public/images/github.png | Bin 0 -> 1292 bytes public/images/instagram.png | Bin 0 -> 3755 bytes public/images/linkedin.png | Bin 0 -> 1167 bytes .../orcasound-all-rights-reserved-2023.png | Bin 0 -> 2390 bytes public/images/orcasoundlogo_3.png | Bin 0 -> 34470 bytes public/images/x.png | Bin 0 -> 1389 bytes public/images/youtube.png | Bin 0 -> 805 bytes src/components/Footer.jsx | 242 ++++++++++++++++-- 9 files changed, 218 insertions(+), 24 deletions(-) create mode 100644 public/images/facebook.png create mode 100644 public/images/github.png create mode 100644 public/images/instagram.png create mode 100644 public/images/linkedin.png create mode 100644 public/images/orcasound-all-rights-reserved-2023.png create mode 100644 public/images/orcasoundlogo_3.png create mode 100644 public/images/x.png create mode 100644 public/images/youtube.png diff --git a/public/images/facebook.png b/public/images/facebook.png new file mode 100644 index 0000000000000000000000000000000000000000..531f1fa362bf092022ed2c812fc90b6fd73fc98a GIT binary patch literal 1139 zcmV-(1dRKMP)?g)>5ki8lJ=^@{q3C4iR@17fN$ z^P{sk6WM{b;Y7UJGs0)YD1$N^Q5}ioKw<6Z%j6C3fyu0IU)c!TJ(L55hs`3n_AV1{ zU_4l$?CmhoFh+GKti8TVZ2vY!ewCnAIhEvQFgI6v1j^w+E0@*UJU>I)&<r zlsHg*8SBn$8SG*o6Q){=dvhbpP%*GDVdCE42=2Z?E>$pLet#J+0%}@anQ7V1Zth~{ z8$`sL)AU#2pvrXE8a&$1YjJ0$&Yr$nVg2Z7+$YSv1kFZe3jN8~CrAPURcc#T7QG>4 z_Zg-PwZMNQpW1=ef9_6N?g!y<_T*hV(Add0^hU$h3002ovPDHLk FV1ii;BNG4s literal 0 HcmV?d00001 diff --git a/public/images/github.png b/public/images/github.png new file mode 100644 index 0000000000000000000000000000000000000000..b137d2451aade360703812b72139bf983405a481 GIT binary patch literal 1292 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 literal 0 HcmV?d00001 diff --git a/public/images/orcasound-all-rights-reserved-2023.png b/public/images/orcasound-all-rights-reserved-2023.png new file mode 100644 index 0000000000000000000000000000000000000000..f27246fcd960f6ffe5c2337194df845d05f46e51 GIT binary patch literal 2390 zcmV-c390spP)>;zONkUIh03FJ&bc>*gFTyf&TJRT1qDLZbO z@OuwWCULw!91g#UF$)&_BmjUF7PH{T1vT>8m&_MC^IQC;@}>4=?~9AjaZ1at* zd&h_{h)Vxw;Y;R=^(CjokWCQc{7+5a{o~75Un&`B{`uDb+|uLGmruSNFllmy@trTo z^9%7qx|##>m%ZJ}?gkT^*XM|L!@%*JNH`)h}OGc!T42h`qmgr=7eZbUg)={B#OF~g1!`fa|+*#>X7C@$FQ>m=Qv^ylxmjCuoAM zYekn*$SlckPUz?&{u$^8mnX0gBPEXkK?5)&fhp}(F! z{=Q}PH)H-CvE!1s+fJa7?Os8D@(}FWFn*SF%N2fMLX=IFk)U&sN?=qO8n_XGlF^45 zm09}^FicE$pp3Fi&U%C&q;!BT0hbAy!R$_0h{%e1%M7_QGZ2Kc=Nj~xm6eWF zXq=`W)m6|2+_@o4TBjPumzZI>8iH@fpBdc_l;tLLffxMNMCih-qY{4D2wj@s8|VVg z3SJqvA1+H^R-w~6aZL8C1O{Scg*K6CGxTS>v}c8W$N94Nghnto*4 zL3y{IV8_(B>*)eCI0%{=Xn=?KHjD)}n6P#_MEsPA_YDkVTJD910jm^rh2n==(=${$ zU>E!I z*^e5N$zmbQ#Ghf>6LpT?eEHk7w*e6HY7^?b0tNp4wHex^*^m4)=#sMY<$?8kOL}WE zZkP;=>yyYA0kL>LC$M{8KG28vWUM8jxIr1FjhSJ=76W~QGo{beXdFkQcd(VFC`(?L z_~bMiou&mk>c|}`fil*R9t9nvjbT#Ynl3@vNPX`;wu3Jp{hyeOG2pRb4=ixQfTLk$ zI=xaIc+w0&K}z;7W(J_0Wm#X|Q<6Rxl5uU`1}775ms$2q0rm$PWU+lQL88rtnTOD> z7#r^+<&NZGLU6uZkxcDs(=oy4qZ!AJejW8GY`Z^&zNdtY_e6(%Eq2k^nh4&}sQ(4p zDe&*6b!8b?-w-J5n6A$e?}+oL#|NT;NkDu2$XBd;it?Mxd)$R{H* z9PzGUxc^~Em%r%Mk$y9UZf!2ZLqc|D=E0d($9vPpTqtPY3T9qNz7VfzPZH2BmmL0$ zGfhk^rtRpnk~NFF4-_NM#kB2;aUJ%+sxZhinP_uH>~^N@FIMnD8Q7OcXTqcpu6jNZ zJwD$tl6%s}D*B>~&pWlLEARFVDBwf!&Ozzju&0A%y<%@wuTy;rjz&X(Ufi z9HY6Rca6ep!(=wl9c^P`+`zOwE}VgdQ>qO;uPN~i?ju3uiU4%${R+CJcHmJmx;#SH z0NaOwZV#+xbYZEG5shWK2fH2Ur#dy!I_U29Jp^3@owhfL-$BH0(&tam-!npk(fz6L@C4edry2d!V{ClO5W^QXSIO7ucc2orB?tb}eiR zGBp~mR}Jj221f2-F@1Wxr5#L$CEWq~xgq3&Ep+jE3*7;oBRWU#R#H$-j7xGj{%W%v z`Q4f~x>9mRYoR;M0$DGds+C&ss-Z(TZXR7CDS8B53KMC72%pe_xegkST+r3bZN6-x}>IoZkC(7$cedz3ACIRpb5?I0>2g9oX za}pSj33)*~*=AGhU~;A2CG<~2LyU9m1Sf^t z3l=Q+t^mV5On}7Y&jsHXuFQf33(lM3rn}I6yzsx=S@6dA7daFd(m{j2ssI2007*qo IM6N<$g7S`v1ONa4 literal 0 HcmV?d00001 diff --git a/public/images/orcasoundlogo_3.png b/public/images/orcasoundlogo_3.png new file mode 100644 index 0000000000000000000000000000000000000000..2ab8bcae28ea6aedb7b1e65485c8710225f8146f GIT binary patch literal 34470 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 literal 0 HcmV?d00001 diff --git a/public/images/youtube.png b/public/images/youtube.png new file mode 100644 index 0000000000000000000000000000000000000000..b446edf80d37d6c9b37c4e12003d0bde98b87f14 GIT binary patch literal 805 zcmV+=1KRwFP)COb4L?LInvGa2+I90u>NCNC)96z^TAa1u+%q^dc!|7$Cd0WINx? zLj+`HS6WFcIiUb(qSO>qqs(aJ%GAkII&F<|qu0cK?gtocv@qHj>4thUnj0zVikjj3 z7KVSN=je_^GW@d^6dLr5Q6Aawx{6?TisL{rK;ymMP8q)#u<>5Yy3I*FbWBmu@TrW(i7n}(_Kzi<2S^Zq z`wxc^IHTV897o}o`@@7Jq^1+5W|LIP{(gCB%QWRZUsYD`@3zcytFj~}eiW96Puixn zyh${hX}#a;D4=crWZrn=75gEj;u#OncA83@NHK{g#3jr4VbTO2ntY~kAY)h0_*EN& zdBrD#1J~^8+{UYl8Z#P6YAZOP*wwj>uh&Em50X{oKUY_h+Sf7%B&=3Mx3@$uFC+p> zGN1HdVKp+nLm-qJ7xUg1qrSzT3&Z_sb_C@{aQsn3jJ~H{bMfV z?peYoE8+R`L zCw9@H@pz@HC^Q{})LzHF=69p9ieb3!G7E5yV7YCx@om}~o=^Z>yiUm8v*M~!(Z?9B joN!v%xpJKZxKQ{9EV!O^(X8%100000NkvXXu0mjfIJ0f0 literal 0 HcmV?d00001 diff --git a/src/components/Footer.jsx b/src/components/Footer.jsx index a708d7f..a7ae533 100644 --- a/src/components/Footer.jsx +++ b/src/components/Footer.jsx @@ -5,8 +5,17 @@ import NotificationsIcon from '@mui/icons-material/Notifications' import TwitterIcon from '@mui/icons-material/Twitter' import YouTubeIcon from '@mui/icons-material/YouTube' import { AppBar, Box, Button, styled, Toolbar, Typography } from '@mui/material' +import Image from 'next/image' import Link from 'next/link' +import facebooklogo from '../../public/images/facebook.png' +import githublogo from '../../public/images/github.png' +import instagramlogo from '../../public/images/instagram.png' +import linkedinlogo from '../../public/images/linkedin.png' +import licenselogo from '../../public/images/orcasound-all-rights-reserved-2023.png' +import orcasoundlogo from '../../public/images/orcasoundlogo_3.png' +import xlogo from '../../public/images/x.png' +import youtubelogo from '../../public/images/youtube.png' import useIsMobile from '../utils/useIsMobile' const StyledTypography = styled(Typography)({ @@ -64,6 +73,96 @@ const blogLink = ( ) +const supportUsLink = ( + + + Support Us + + +) + +const learnMoreLink = ( + + + Learn More + + +) + +const navLinksLeftCol = [ + { + name: 'Get Involved', + url: '/getinvolved', + icon: '', + }, + { + name: 'Send Feedback', + url: '/', + icon: '', + }, + { + name: 'Donate', + url: '/donate', + icon: '', + }, +] + +const navLinksRightCol = [ + { + name: 'About Us', + url: '/about', + icon: '', + }, + { + name: 'Learn', + url: '/learn', + icon: '', + }, + { + name: 'Listen', + url: '/listen', + icon: '', + }, + { + name: 'Blog', + url: '/blog', + icon: '', + }, +] + +const iconLinks = [ + { + name: 'Instagram', + url: 'https://www.instagram.com/orcasoundapp/', + icon: instagramlogo, + }, + { + name: 'X', + url: 'https://twitter.com/OrcasoundApp', + icon: xlogo, + }, + { + name: 'Facebook', + url: 'https://www.facebook.com/OrcasoundApp/', + icon: facebooklogo, + }, + { + name: 'Youtube', + url: 'https://www.youtube.com/channel/UC7b3tOVQg8_fzaZBj4NoAEg', + icon: youtubelogo, + }, + { + name: 'Github', + url: '', + icon: githublogo, + }, + { + name: 'Linkedin', + url: 'https://www.linkedin.com/company/75491849/admin/', + icon: linkedinlogo, + }, +] + export default function Footer() { const isMobile = useIsMobile() @@ -73,7 +172,7 @@ export default function Footer() { function Mobile() { return ( - +
{sendFeedbackLink}
{blogLink}
@@ -93,32 +192,127 @@ function Desktop() { return ( - - - {sendFeedbackLink} - {blogLink} - {iconContainer} - - - - + {supportUsLink} + + + {navLinksLeftCol.map((navLink) => ( + + + + {navLink.name} + + + + ))} + + + + + {learnMoreLink} + + + {navLinksRightCol.map((navLink) => ( + + + + {navLink.name} + + + + ))} + + + + + + {iconLinks.map((iconLink) => ( + + + {iconLink.name} + + + ))} + + + License + + ) From 4e58efba5cd37c0454bce87ebefc61666a747520 Mon Sep 17 00:00:00 2001 From: Yizheng Yu Date: Sat, 18 Nov 2023 04:01:02 -0800 Subject: [PATCH 5/7] Website Redesign: Release 1 navigation bars #127 * Updated blue wavy line implementation --- public/images/blue-wave.png | Bin 534 -> 0 bytes src/components/Nav.jsx | 16 ++++------------ 2 files changed, 4 insertions(+), 12 deletions(-) delete mode 100644 public/images/blue-wave.png diff --git a/public/images/blue-wave.png b/public/images/blue-wave.png deleted file mode 100644 index c33f314237d8d610eaf11654dbc4a7836acaafbb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 534 zcmV+x0_pvUP)ExnEg4I23x|Dth}*j6kX-IXfUNW7+Hm*l42XwaaMqtUU;v!}vVzx~md!%IZp zap8Fb_}Yb5XMk@eOl{%DXwIFzw@+lAppumqj-o+>#_kNIE2te0!l|c;F8-=a5^W!X zs!_lT;y&bb)8R*+b+8NRm*={^wi*-YT291pw Yzn|MuETkxZkN^Mx07*qoM6N<$g0E2LYybcN diff --git a/src/components/Nav.jsx b/src/components/Nav.jsx index b2e40a1..0050c1b 100644 --- a/src/components/Nav.jsx +++ b/src/components/Nav.jsx @@ -21,7 +21,6 @@ import Image from 'next/image' import Link from 'next/link' import React, { useState } from 'react' -import blueWaveLine from '../../public/images/blue-wave.png' import orcasoundlogo from '../../public/images/orcasoundlogo_2.png' import useIsMobile from '../utils/useIsMobile' @@ -187,6 +186,10 @@ function Desktop() { color: 'white', display: 'block', textTransform: 'none', + '&:hover': { + textDecoration: '3px rgba(0, 139, 223, 1) wavy underline', + textUnderlineOffset: '7px', + }, }} > @@ -201,17 +204,6 @@ function Desktop() { - - - ))} From 8db193c0564316ac8c1a40b3555f851b9ab7da6f Mon Sep 17 00:00:00 2001 From: Yizheng Yu Date: Mon, 15 Jan 2024 12:56:28 +0000 Subject: [PATCH 6/7] Website Redesign: Release 1 navigation bars #127 * Disabled hover effect over 'Notify Me' and 'Support' buttons * Updated useIsMobile breakpoint from 'sm' to 'lg' because the 'Notify Me'and 'Support' buttons will cause overflow when breakpoint is 'sm' * Inverted the X and github icons color --- public/images/github_invert.png | Bin 0 -> 1168 bytes public/images/x_invert.png | Bin 0 -> 1158 bytes src/components/Footer.jsx | 4 ++-- src/components/Nav.jsx | 20 ++++---------------- src/utils/useIsMobile.ts | 2 +- 5 files changed, 7 insertions(+), 19 deletions(-) create mode 100644 public/images/github_invert.png create mode 100644 public/images/x_invert.png diff --git a/public/images/github_invert.png b/public/images/github_invert.png new file mode 100644 index 0000000000000000000000000000000000000000..a960e93eaeeedd8cea7c2a8bd428d0edf62c81ac GIT binary patch literal 1168 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}tmUKs7M+SzC{oH>NS%G|oWRD45dJguM!v-tY$DUh!@P+6=(yLU`q0KcVYP7-hXC4kjGiz z5n0T@z%2~Ij105pNB{-dOFVsD*bnfBH)FfccJx;TbJ9NrocTXf4q;9ph3 z{70*L?ys1%NzO0fC(A+gh#IEJ!VZ26a}pl198=#=%ydIo!S6thj#ky_9MN^P9XD>W ztLU8dc%i=gzOc!w_p{$!{8Hj9l^XD8>w4RmiOVf57$#g1lKvFEx=-h`TJ5wddl&w_ z#_#N&Jx}Fg6}iuEXti!f$<*#^TRfIHC`g2>+9y8p)8=Y<^kL2V?1}O#Q(j-|Yo6J* z{`0WU+l=QYXtrTa@%iiD1e#;59jNq=_X)87t%2DTQb`_lK` zdmGPZu1%F_>tg1y__8K_uNsre8HMl44UAP8wyQ+ed+UF;v19sj_D%vr$>Seil{u;+ zW^L>CPE+p?^L@cs?%KcX?bh>K(xtv8tL~F|(VF^E;>@KrcS3_1%a=|~6gqS3x7$n4 zglS^C(xOZhwORxlpREz}E&cPJDdE|+i0UBjZRW{s4PsyY3z<%yl~q0Y!b8mc%E~$Koz%v;{mc_rA1TH@|-S+4p&8rPs*pUR%5DR;-#x z*s{p#_4}_Yhu3^hxIFp(M4kik+nVLxY+I=Dv{&#;TzJ)l&xd6a98A2=G3mYt4l3H( zv2Azzr@I_g2Zc`m$=kNIYj;<0_M`3Ztc*n3Q?+7P<)wf3O^B;*$gVj0R#JD4|Hg(V zYu|2MuGndPod0Nl>8|67FH3yOPu54y*Prq>&;8ikxdA5rLe1(&ttX|nch0%!q;cl_ zGrf70kCLAIO{#Y2{>xF2rWrJ~-hIow?wg)+zjyh3uJ-c2Gr9Fq`*D^lyPq#I78K#D z$UmFEs`ftb7w4Qgmh%G{U73EpJFL0uO6>!kNn2h_v|N7W(3jqOQcRP@#S}Vse)G)q zI}~}PBVksGeKd*ADn9RGGc zXJ8IhEpd$~Nl7e8wMs5Z1yT$~21drZhK9O^<{^gWRz?<9MrPUu237_JNS%G|oWRD45dJguM!v-tY$DUh!@P+6=(yLU`q0KcVYP7-hXC4kjGiz z5n0T@z%2~Ij105pNB{-dOFVsD*t> zP^Qnw<@PJl#`ue8r(8U;EBf?9_mI3vOS2STvu)kq5I;?7_j$H}*mbjYg4W5c*C@&{ zp7`K(=)Y5J3>R7p&puba67Lu9cd>u}?Ae7WuO9r>`>nxa^8Eut#GfCw^K<7X{JWfz z@L_pP%7Fz{f6krL{#JVQ=aScQ8%`f6NM|drNpxqdS3UH5-W$hn;<}z!!)&6|Ap z*%hv2AC%(PY|FYUM?y+k6+3VNZCpwgA^~!H) zJ|Xguak2VD-K8IynQeGoDr9`NnKj&ZRkq#59J4#(i1XGBs}EgZnK0St*P^P7kY|5I zibGShJ@@T5XghRZ>s!_QvROGn=T~v9D$)JQoszP(LFd4Q)Q=zEY|3j?jtb=1GV%7~ z9~<6C-rUNnc5EVNgstsOH?f*s@i+EIN(K0rxi##mb7Wg`ai4v9-iv1i56WHNPS|Wx z+CD+|t;006%yiAgyHxf}lH7Y?;!Z)Se}|)P{uSP_Cv@L$$D{x5%zyXSOO9XEY6ge? zt?l;CnNw%qe_yz-_IdbnBPO}L9{&|g3@;W({@nHTF=N=2TF-wS%G=ABql6jd_dP!G zzm0Xkxq!^40jEr>+4RsC8Lk!KWj4Z5-%(M**tPBjwdGe2;Xvob^$xN%n Vt${7@dKFLugQu&X%Q~loCIHM%^}_%F literal 0 HcmV?d00001 diff --git a/src/components/Footer.jsx b/src/components/Footer.jsx index a7ae533..8ab8613 100644 --- a/src/components/Footer.jsx +++ b/src/components/Footer.jsx @@ -9,12 +9,12 @@ import Image from 'next/image' import Link from 'next/link' import facebooklogo from '../../public/images/facebook.png' -import githublogo from '../../public/images/github.png' +import githublogo from '../../public/images/github_invert.png' import instagramlogo from '../../public/images/instagram.png' import linkedinlogo from '../../public/images/linkedin.png' import licenselogo from '../../public/images/orcasound-all-rights-reserved-2023.png' import orcasoundlogo from '../../public/images/orcasoundlogo_3.png' -import xlogo from '../../public/images/x.png' +import xlogo from '../../public/images/x_invert.png' import youtubelogo from '../../public/images/youtube.png' import useIsMobile from '../utils/useIsMobile' diff --git a/src/components/Nav.jsx b/src/components/Nav.jsx index 0050c1b..dc60966 100644 --- a/src/components/Nav.jsx +++ b/src/components/Nav.jsx @@ -136,7 +136,7 @@ function Mobile() { ) return ( - + {list} @@ -172,12 +172,6 @@ function Desktop() { sx={{ position: 'relative', margin: 3, - '&:hover .MuiButtonBase-root .MuiTypography-root': { - //color: 'grey', - }, - '&:hover .MuiBox-root': { - opacity: 1, - }, }} >