Skip to content

Commit

Permalink
added svg logo in navbar and updated padding and gap in navbar and fo…
Browse files Browse the repository at this point in the history 
…oter styles
  • Loading branch information
@shlok-007
shlok-007 committed Jun 4, 2024
1 parent fbf279c commit 89ecea0
Show file tree
Hide file tree
Showing 8 changed files with 209 additions and 7 deletions.
2 changes: 1 addition & 1 deletion client/public/index_style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
--secondary: var(--secondary-400);
--accent: var(--accent-600);

--line: var(--text-100);
--line: var(--accent-200);
/* alt-bg is secondary-300 with 0.35 opacity */
--alt-bg: var(--secondary-200);
--info-card-bg: var(--secondary-100);
Expand Down
Binary file removed client/public/logo192.png
View file
Binary file not shown.
Binary file removed client/public/logo512.png
View file
Binary file not shown.
10 changes: 8 additions & 2 deletions client/src/components/Navbar.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ import { useLocation } from "react-router-dom"
import { useEffect } from "react"
import { useToast } from "../utils/ToastContext"

import logo from "../logo.png"
// import logo from "../logo.png"
// import svgLogo from "../logo.svg"

import { SVGLogo } from "./SVGIcons"

const Navbar: React.FC<navbarProps> = ({isLogged, profile, siteName, onLogout}) => {
const navigate = useNavigate();
Expand Down Expand Up @@ -145,7 +148,10 @@ const Navbar: React.FC<navbarProps> = ({isLogged, profile, siteName, onLogout})

<div className="navbar__left" onClick={()=> navigate("/home")}>

<img src={logo} alt="GoTogether" className="navbar__logo"/>
{/* <img src={logo} alt="GoTogether" className="navbar__logo"/> */}
{/* <img src={svgLogo} alt="GoTogether" className="navbar__logo"/> */}

<SVGLogo width="28" height="48" fill="var(--accent)"/>

<div className="navbar__site-name">
{window.screen.width>window.screen.height || !isLogged?"GoTogether":"GoTo"}
Expand Down
188 changes: 188 additions & 0 deletions client/src/components/SVGIcons.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,192 @@ export function SVGTime({ width = "32", height = "32", fill = "currentColor", cs
<path d="M256 0a256 256 0 1 1 0 512A256 256 0 1 1 256 0zM232 120V256c0 8 4 15.5 10.7 20l96 64c11 7.4 25.9 4.4 33.3-6.7s4.4-25.9-6.7-33.3L280 243.2V120c0-13.3-10.7-24-24-24s-24 10.7-24 24z" />
</svg>
)
}

export function SVGLogo({ width = "32", height = "32", fill = "currentColor", cssClass = ""}: SVGIconProps){
return(
<svg
className={cssClass}
xmlns="http://www.w3.org/2000/svg"
width={width}
height={height}
fill={fill}
viewBox="100 90 300 330"
>
<path d="
M292.766907,295.811035
C288.325104,299.164520 287.759216,302.958466 289.271576,307.904724
C295.594788,328.584595 301.629883,349.352936 307.695374,370.110840
C308.388123,372.481567 309.828247,373.594879 312.063538,374.340271
C319.421173,376.793762 323.522003,381.874939 324.339783,389.697021
C325.234863,398.258484 321.518646,404.222290 314.150543,407.986572
C311.226257,409.480560 310.037415,411.314911 310.083527,414.590912
C310.238129,425.582092 310.023071,436.566803 309.451080,447.555847
C308.967072,456.854919 304.033508,462.226562 294.545288,462.291962
C277.218994,462.411377 259.891266,462.321503 242.564148,462.323975
C230.568436,462.325684 218.572601,462.363525 206.577103,462.316650
C204.428299,462.308258 202.222824,462.216064 200.142731,461.734161
C190.852966,459.582153 189.697968,458.030090 189.728775,448.438873
C189.765167,437.109833 189.732498,425.779846 189.887161,414.452423
C189.930222,411.299072 189.149719,409.302277 186.018661,407.801392
C179.091187,404.480591 175.387878,398.652191 175.818390,390.926727
C176.243561,383.297394 180.348846,377.755280 187.458237,374.907166
C190.289627,373.772858 191.708511,371.998108 192.513550,369.290161
C198.963181,347.595642 205.380554,325.891144 211.981888,304.242737
C212.835678,301.442871 211.239182,300.211578 209.789612,298.714142
C196.120300,284.593262 182.301361,270.615112 168.763412,256.369781
C156.162354,243.110336 142.763153,230.479950 134.070923,213.986649
C123.867332,194.625641 119.789429,174.112015 121.435303,152.273880
C124.027748,117.876022 139.460251,89.933571 164.437668,67.057655
C185.312332,47.939289 210.099442,37.240082 238.468109,34.552216
C270.937286,31.475832 300.303833,39.425808 326.286407,58.827473
C355.282593,80.479492 373.793549,108.860855 378.333344,145.326096
C383.049408,183.207306 371.495331,215.450928 344.490845,242.460968
C327.064911,259.890472 310.161285,277.842255 292.766907,295.811035
M242.737350,85.500023
C242.732407,80.166740 242.742767,74.833382 242.718628,69.500183
C242.688950,62.946236 241.835556,62.344982 235.389145,63.834858
C188.258026,74.727669 162.922653,126.192314 176.593552,170.587509
C180.520401,183.339691 188.377899,194.048645 194.835495,205.460922
C207.058121,227.061523 219.648758,248.454147 232.123749,269.911530
C235.922043,276.444733 238.841599,283.416840 242.301682,290.216949
C242.771744,280.622406 242.770966,271.164673 242.771927,261.706970
C242.773483,246.374039 242.809204,231.041016 242.763641,215.708221
C242.742661,208.648743 240.871765,207.081604 233.645859,207.320694
C232.429733,207.360916 231.063843,206.643723 229.969330,205.955109
C224.458954,202.488251 219.308640,198.574951 214.878403,193.741501
C187.216843,163.562271 203.187668,117.631271 238.618408,110.573212
C241.904068,109.918678 242.887390,108.186890 242.788345,104.997879
C242.596985,98.837296 242.733688,92.666527 242.737350,85.500023
M312.635437,193.154770
C317.012115,185.669922 321.507660,178.135941 323.597626,169.697128
C331.936096,136.028214 325.057465,106.398338 299.435608,82.012733
C289.518829,72.574463 277.584625,66.945518 264.450165,63.681046
C261.288513,62.895241 257.984528,62.248001 258.044739,67.517174
C258.189423,80.175186 258.188721,92.835716 258.123627,105.494598
C258.109100,108.319771 259.235809,109.483467 261.939941,110.298508
C293.485687,119.806725 307.658295,150.002167 294.146057,179.845963
C287.880951,193.683411 278.507629,205.156937 263.233215,209.892776
C259.056641,211.187729 257.713989,213.129593 257.853485,217.277893
C258.272980,229.751633 257.859283,242.224197 257.499268,254.700821
C257.170563,266.092926 257.429565,277.502014 257.429565,288.903595
C257.869171,288.947266 258.308777,288.990936 258.748383,289.034607
C259.114136,288.345367 259.537079,287.680023 259.837158,286.963318
C265.585144,273.233856 273.900238,260.912140 281.102356,247.977264
C287.333038,236.787125 294.654114,226.177719 299.757172,214.399261
C301.935181,209.372147 303.633575,204.273697 307.650940,200.261688
C309.500549,198.414566 310.739227,195.955704 312.635437,193.154770
M189.766449,70.329872
C191.152069,69.043457 192.537674,67.757042 193.923294,66.470627
C184.570160,71.174156 176.466827,77.408852 169.185257,84.802536
C159.340820,94.798538 152.737183,106.908562 146.433167,119.206085
C145.680695,120.673973 142.807953,122.783051 146.485962,124.746445
C147.126419,125.088348 146.344147,127.860718 145.136276,127.998772
C141.189484,128.449860 141.179077,131.794388 140.515198,134.197922
C139.236710,138.826675 138.311844,143.608414 137.808105,148.386566
C135.141571,173.680344 139.774780,197.369858 155.678925,217.673370
C174.296570,241.441025 196.842636,261.637726 217.463684,283.591125
C217.804459,283.953918 218.193954,284.274506 218.581772,284.588837
C219.515778,285.345886 220.538605,286.087646 221.703598,285.178680
C222.920624,284.229095 222.239731,283.069519 221.757004,282.017700
C221.340622,281.110443 220.890854,280.213348 220.386719,279.352264
C204.406448,252.055878 188.396225,224.776993 172.443024,197.464798
C167.485855,188.977997 162.363907,180.474319 160.092346,170.817093
C150.970444,132.036728 161.225281,98.804344 189.766449,70.329872
M356.405457,124.268288
C350.731903,111.672798 344.671783,99.357124 335.231354,88.967087
C327.641449,80.613724 314.262329,69.803009 307.483856,67.309921
C307.686279,67.564613 307.858917,67.851707 308.095367,68.069435
C340.260223,97.686966 349.598236,133.789566 338.812134,175.690872
C337.744141,179.839783 334.616730,183.968384 334.669464,187.393402
C334.736633,191.759277 334.066467,193.273758 329.304901,193.816483
C332.184937,198.030380 332.130890,200.962540 326.429749,201.096344
C325.788818,201.111389 325.081360,202.479248 324.572632,203.321213
C315.533630,218.281815 306.885468,233.495041 297.371216,248.146072
C291.243317,257.582428 288.123108,268.611389 280.850739,277.425812
C278.870087,279.826477 276.926025,283.172546 277.683472,287.032501
C279.985535,287.268311 280.737000,285.722656 281.757874,284.421021
C284.403595,281.047668 286.559235,276.850067 289.978699,274.617676
C296.536407,270.336426 300.187073,263.468658 306.350525,258.597229
C317.732941,249.600815 327.099548,237.987976 336.974152,227.162476
C364.338928,197.162552 369.454559,162.760147 356.405457,124.268288
M268.634521,133.791916
C261.435730,129.018372 253.425751,128.322891 245.122940,129.130722
C234.116776,130.201599 225.950470,136.141373 220.777145,145.368439
C213.741730,157.916687 217.097366,174.164322 227.668137,183.724991
C238.079376,193.141373 255.483780,194.725571 267.235260,187.763977
C285.373993,177.018570 290.088287,147.068359 268.634521,133.791916
M286.690704,350.666260
C283.073761,338.484985 279.456818,326.303711 275.772766,313.896423
C274.745789,314.482666 274.244965,314.642212 273.918823,314.973633
C268.661133,320.316406 263.408295,325.664154 258.189056,331.044495
C249.024734,340.491669 251.638290,341.343170 241.631134,331.271332
C236.165268,325.770142 230.452621,320.514130 224.038467,314.368835
C218.145218,334.096436 212.393341,353.350830 206.605148,372.726746
C214.570541,375.746155 218.134323,368.296600 224.309280,368.164673
C218.917908,357.937775 219.188019,351.260925 224.728683,346.714874
C229.023331,343.191223 234.006760,343.232758 238.397964,346.788879
C241.007828,348.902466 242.176208,351.830658 242.947189,354.928497
C244.211365,360.008148 240.678787,363.593567 238.377060,367.936462
C242.154160,368.983948 245.724915,369.803528 248.167587,372.921753
C249.189819,374.226685 250.964798,373.909790 252.300446,373.011749
C254.325912,371.650055 256.251190,370.139282 258.166138,368.730743
C253.521988,359.369202 253.934601,351.971100 259.197723,347.407288
C264.208771,343.062103 270.516296,342.728516 275.760345,346.464325
C278.503723,348.418701 279.753571,351.237274 280.751892,354.307312
C282.494507,359.666077 280.563568,364.345306 278.017242,368.739349
C280.038635,370.242065 281.681458,371.673737 283.520142,372.779724
C286.112366,374.338959 289.253326,374.417480 291.647003,373.106995
C294.029663,371.802582 292.249725,369.146912 291.697357,367.200562
C290.198151,361.918121 288.480316,356.697693 286.690704,350.666260
M197.844955,387.166626
C194.495209,387.145660 191.097061,387.396637 191.118668,391.838074
C191.139786,396.176361 194.490173,396.587402 197.844757,396.650452
C198.343704,396.659851 198.843033,396.647064 199.342194,396.647308
C233.118744,396.663361 266.895294,396.690125 300.671844,396.681152
C304.418884,396.680145 309.425903,397.485016 309.381592,391.975586
C309.338409,386.602997 304.376617,387.220398 300.603088,387.215973
C266.660065,387.176208 232.716995,387.176392 197.844955,387.166626
M284.500610,412.873077
C279.869080,410.690521 276.711487,417.116486 272.213654,414.497894
C270.418884,421.808319 271.017181,422.636108 277.720612,422.663025
C282.216461,422.681061 286.713562,422.712311 291.207703,422.619812
C292.645935,422.590240 294.444763,422.642609 294.724182,420.626129
C294.948059,419.010925 295.488739,416.953003 294.066681,415.886932
C291.527130,413.983063 289.195496,410.831879 284.500610,412.873077
M289.175385,448.009460
C291.802826,447.776215 294.825836,448.051544 294.755219,444.063080
C294.686249,440.169739 291.186920,440.616211 289.221802,440.673828
C283.381470,440.844940 277.420410,439.675232 271.777588,441.434296
C270.335388,446.318329 272.115631,448.124512 276.815430,447.886566
C280.612976,447.694305 284.433929,447.964142 289.175385,448.009460
M238.234695,417.788025
C237.712830,421.490997 239.303986,422.954254 243.022919,422.708832
C246.340927,422.489868 249.689148,422.561951 253.016342,422.696259
C256.311798,422.829315 256.856476,420.956512 256.821686,418.254303
C256.789215,415.732056 256.156097,413.987915 253.199783,414.088898
C249.207947,414.225311 245.215164,414.346710 241.221802,414.421082
C239.459579,414.453918 238.334167,415.088104 238.234695,417.788025
M209.085571,414.945923
C205.857712,414.364563 205.099594,416.061371 205.114075,418.907349
C205.128265,421.691925 206.306808,422.772125 209.022018,422.689728
C212.495605,422.584290 215.978394,422.569977 219.450638,422.696594
C222.417038,422.804810 223.571274,421.561615 223.630890,418.597595
C223.695663,415.377808 222.378311,414.107422 219.231003,414.128204
C216.079300,414.148987 212.952408,414.191833 209.085571,414.945923
M253.105240,447.957825
C256.271423,448.057312 256.988068,446.181152 256.892090,443.457825
C256.782776,440.357635 254.756134,440.108612 252.422150,440.242401
C247.853165,440.504242 243.285919,440.796387 238.782867,441.072021
C237.770279,447.416168 237.983765,447.731720 243.741348,447.922913
C246.557449,448.016418 249.378372,447.964325 253.105240,447.957825
M209.901199,447.877686
C213.048691,447.900940 216.196167,447.936066 219.343704,447.943878
C222.144440,447.950836 223.046631,446.342377 223.004105,443.768799
C222.962601,441.257141 221.744614,440.092194 219.306076,440.217010
C214.739456,440.450684 210.175949,440.744934 205.707458,441.008301
C204.907272,446.512238 204.907272,446.512238 209.901199,447.877686
z"/>
</svg>
)
}
Binary file removed client/src/logo.png
View file
Binary file not shown.
10 changes: 9 additions & 1 deletion client/src/styles/footer.css
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
footer {
padding: 1rem 8rem;
padding: 1rem 10rem;
/* padding-top: 4rem; */
margin-top: auto ;
display: flex;
Expand Down Expand Up @@ -123,4 +123,12 @@ h4 {
.user-trips{
padding: 0.4rem;
}

.navbar__left{
gap: 0.5rem;
}

.navbar{
padding: 0.7rem 1.3rem;
}
}
6 changes: 3 additions & 3 deletions client/src/styles/navbarStyle.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
display: flex;
justify-content: space-between;
align-items: center;
padding: 10px 20px;
padding: 0.8rem 3rem;
border-bottom: 1px solid var(--line);
}

Expand All @@ -11,7 +11,7 @@
font-weight: bold;

background-color: var(--text);
background-image: linear-gradient(120deg, var(--primary), var(--accent));
background-image: linear-gradient(120deg, var(--accent), var(--primary));
background-size: 100%;
background-repeat: repeat;
-webkit-background-clip: text;
Expand All @@ -37,7 +37,7 @@
}

.navbar__site-name:hover{
background-image: linear-gradient(240deg, var(--primary), var(--accent));
background-image: linear-gradient(240deg, var(--accent), var(--primary));
}

.navbar__user {
Expand Down

0 comments on commit 89ecea0

Please sign in to comment.