Skip to content

Commit

Permalink
Merge pull request #4 from asusoda/Luan-Navbar
Browse files Browse the repository at this point in the history
Add changes to Navbar
  • Loading branch information
LuaanNguyen authored Jun 30, 2024
2 parents 2c8f4d1 + 0eee17f commit cc8fc29
Show file tree
Hide file tree
Showing 5 changed files with 147 additions and 96 deletions.
Binary file added public/logo/soda-logo-red.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion src/components/Info/InfoCards.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ import "./InfoCards.css";
class InfoCards extends Component {
render() {
return (
<div className="infocards">

<div className="infocards" id="info">

<Divider horizontal id="title">
Info
</Divider>
Expand Down
35 changes: 25 additions & 10 deletions src/components/Navbar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,35 @@ function Navbar() {
return (
<header className="navigation">
{/* Primary Navigation - Hidden on mobile */}
<nav className="nav-container">
<a href="/">
<h1 className="text-purple-dark text-[21px] text-soda-red font-extrabold">
<section className="w-full justify-between hidden sm:flex py-5 px-10">
<a href="/" className="flex gap-3 items-center">
<img src="/logo/soda-logo-red.png" className="w-8"></img>
<h1 className="text-purple-dark text-[21px] text-soda-white font-extrabold text-3xl">
SoDA
</h1>
</a>

<div className="flex gap-10">
<h3>Info</h3>
<h3>Sponsors</h3>
<h3>Team</h3>
</div>
<Button name="Contact" />
</nav>

<ul className="flex gap-10 items-center text-soda-white">
<li>
<a href="#info" className="nav-text-animation">
Info
</a>
</li>
<li>
<a href="#sponsors" className="nav-text-animation">
Sponsors
</a>
</li>
<li>
<a href="#team" className="nav-text-animation">
Team
</a>
</li>
</ul>
<Button name="Join SoDA" />
</section>


{/*Mobile Navigation*/}
<nav className="w-full sm:hidden flex justify-between py-5 px-5">
Expand Down
193 changes: 108 additions & 85 deletions src/components/Team/TeamCards.jsx
Original file line number Diff line number Diff line change
@@ -1,96 +1,119 @@
import React, { Component } from 'react';
import { Card, Divider, Popup, Image} from 'semantic-ui-react';
import React, { Component } from "react";
import { Card, Divider, Popup, Image } from "semantic-ui-react";

import contacts from './TeamList.json';
import './TeamCards.css';
import contacts from "./TeamList.json";
import "./TeamCards.css";

class MemberCards extends Component{
class MemberCards extends Component {
constructor(props) {
super(props);
this.onGClick = this.onGClick.bind(this);
this.onIClick = this.onIClick.bind(this);
}
onGClick() {
window.location.href = "mailto:[email protected]";
}
onIClick() {
window.location.href = "mailto:[email protected]";
}

constructor(props) {
super(props);
this.onGClick = this.onGClick.bind(this);
this.onIClick = this.onIClick.bind(this);
}
onGClick() {
window.location.href = 'mailto:[email protected]';
}
onIClick() {
window.location.href = 'mailto:[email protected]';
}
render() {
const teams = contacts.teams;
const advisors = contacts.advisors;

render() {
const teams = contacts.teams
const advisors = contacts.advisors
return (
<div className="team" id="team">
<Divider horizontal id="title">
Team
</Divider>
<br />
<div id="content">
SoDA is here to help you. Please feel free to reach out to any of us,
we want to help and would be happy to answer any questions you have!
</div>

return (
<div className="team">
<Divider horizontal id="title">Team</Divider><br/>
<div id="content">
SoDA is here to help you. Please feel free to reach out to any of us, we want to help and would be happy to answer any questions you have!
</div>
{Object.keys(teams).map((team, i) => (
<React.Fragment key={i}>
<Divider horizontal className="subteam-divider">
{team}
</Divider>
<div id="cards">
{teams[team].map((member, j) => (
<Card key={j} className="Card rounded-card">
<Card.Content className="card-content">
<div className="card-image-wrapper">
<Image
className="card-image"
src={member.image}
size="tiny"
/>
</div>

{Object.keys(teams).map((team, i) =>
<React.Fragment key={i}>
<Divider horizontal className="subteam-divider">{team}</Divider>
<div id="cards">
{teams[team].map((member, j) => (
<Card key={j} className="Card rounded-card">
<Card.Content className="card-content">
<div className="card-text">
<Card.Header className="card-header">
{member.name}
</Card.Header>
<Card.Meta className="card-meta">
{member.role}
<br />
<Popup
key={member.name}
position="bottom center"
inverted
trigger={
<a
href={"mailto:" + member.email}
className="card-email"
>
{member.email}
</a>
}
//header='Open Mail Client'
//content={member.email}
/>
</Card.Meta>
</div>
</Card.Content>
</Card>
))}
</div>
</React.Fragment>
))}

<div className="card-image-wrapper">
<Image className="card-image" src={member.image} size="tiny" />
</div>

<div className="card-text">
<Card.Header className="card-header">{member.name}</Card.Header>
<Card.Meta className="card-meta">
{member.role}
<br />
<Popup
key={member.name}
position='bottom center'
inverted
trigger={<a href={'mailto:' + member.email} className="card-email">{member.email}</a>}
//header='Open Mail Client'
//content={member.email}
/>
</Card.Meta>
</div>

</Card.Content>
</Card>
))}
</div>
</React.Fragment>
)}

<Divider horizontal className="subteam-divider">Advisors</Divider>
<div id="cards">
{advisors.map((advisor, j) => (
<Card key={j} className="Card rounded-card">
<Card.Content className="card-content">

<div className="card-image-wrapper">
<Image className="card-image" src={advisor.image} size="tiny" />
</div>

<div className="card-text">
<Card.Header className="card-header">{advisor.name}</Card.Header>
<Card.Meta className="card-meta">
{advisor.role}
<br />
<a href={'mailto:' + advisor.email} className="card-email">{advisor.email}</a>
</Card.Meta>
</div>

</Card.Content>
</Card>
))}
<Divider horizontal className="subteam-divider">
Advisors
</Divider>
<div id="cards">
{advisors.map((advisor, j) => (
<Card key={j} className="Card rounded-card">
<Card.Content className="card-content">
<div className="card-image-wrapper">
<Image
className="card-image"
src={advisor.image}
size="tiny"
/>
</div>

</div>
);
}
<div className="card-text">
<Card.Header className="card-header">
{advisor.name}
</Card.Header>
<Card.Meta className="card-meta">
{advisor.role}
<br />
<a href={"mailto:" + advisor.email} className="card-email">
{advisor.email}
</a>
</Card.Meta>
</div>
</Card.Content>
</Card>
))}
</div>
</div>
);
}
}

export default MemberCards;
export default MemberCards;
11 changes: 11 additions & 0 deletions src/styles/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,20 @@
@tailwind components;
@tailwind utilities;

html {
scroll-behavior: smooth;
}

body {
@apply bg-soda-black text-soda-white text-[18px] max-md:text-[14px] font-apfel min-h-screen flex flex-col justify-between;
}


.nav-text-animation {
@apply hover:text-xl transition ease-in-out;
}


/* --------- NAVIGATION SECTION --------- */
.navigation {
@apply w-full fixed z-10 bg-soda-black;
Expand All @@ -16,6 +26,7 @@ body {
}

/* --------- HOME SECTION --------- */

.home {
@apply min-h-screen bg-soda-black;
}
Expand Down

0 comments on commit cc8fc29

Please sign in to comment.