Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates agenda #50

Merged
merged 3 commits into from
Sep 15, 2024
Merged

Updates agenda #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
434a945
Updates agenda
marvinhosea Sep 15, 2024
8543af4
Updates agenda
marvinhosea Sep 15, 2024
ec94451
Updates agenda
marvinhosea Sep 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frontend/src/components/Agenda.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const Sessions = () => {
GopherCon Africa Agenda
</h2>
<div className="w-full lg:w-[80%] mt-8">
<div className="border border-b-2 border-l-0 border-r-0 border-t-0 overscroll-contain">
<div className="border border-b-2 border-l-0 border-r-0 bg-gray-200 pt-6 border-t-0 overscroll-contain sticky top-0 z-50">
<ul className="flex space-x-4 cursor-pointer">
<li onClick={() => setActiveDay('all')} className={`${activeDay == 'all' ? 'border border-b-4 border-l-0 border-r-0 border-t-0 border-blue-600' : ''} px-2`}>All Days</li>
<li onClick={() => setActiveDay('18th')} className={`${activeDay == '18th' ? 'border border-b-4 border-l-0 border-r-0 border-t-0 border-blue-600' : ''} px-2`}>Fri Oct 18th</li>
Expand Down
49 changes: 37 additions & 12 deletions frontend/src/components/SessionCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import {LocationIcon} from "./icons/Location.tsx";
import SpeakerImagePH from "../assets/speakers/placeholder.png";
import Twitter from "../assets/icons/twitter-outline.svg";

export interface ISession {
startTime: string
Expand All @@ -11,11 +10,17 @@ export interface ISession {
description: string
level: string
image?: string
coPresenterImage?: string
name: string
role: string
company: string
titleDescription: string
day: string
twitter?: string
bio?: string
coPresenterName?: string
coPresenterRole?: string
coPresenterCompany?: string
}

interface IProps {
Expand All @@ -25,9 +30,9 @@ const SessionCard = (props: IProps) => {
return (
<div className={`w-full lg:flex text-left my-4 flex-1 lg:space-x-4`}>
<div className="py-4 w-20 text-center">
<div className="bg-blue-700 text-white rounded p-2">
{props.session.startTime.length > 2 && <div className="bg-blue-700 text-white rounded p-2">
{props.session.startTime}
</div>
</div>}
</div>
<div className="border flex-1 p-4">
<p className="font-semibold text-gray-600 tracking-wider">{props.session.date} <span
Expand All @@ -46,17 +51,37 @@ const SessionCard = (props: IProps) => {
</p>
</div>
<div className="mt-2">
<div className="flex justify-start space-x-1 items-center">
<div className="p-4">
<img className="w-16" src={props.session.image ?? SpeakerImagePH} alt=""/>
</div>
<div className="font-normal">
<p className="font-semibold">{props.session.name}</p>
<p>{props.session.role} {props.session.company}</p>
<img className="w-8" src={Twitter} alt=""/>
<div className="flex-1 lg:flex justify-start space-x-2 items-center">
<div className="flex justify-start space-x-1 items-center">
<div className="p-4">
<img className="w-16" src={props.session.image ?? SpeakerImagePH} alt=""/>
</div>
<div className="font-normal">
<p className="font-semibold">{props.session.name}</p>
<p>{props.session.role} {props.session.company.length > 2 ? '@' + props.session.company : props.session.company}</p>
{/*<p className='my-1'>{props.session.bio}</p>*/}
{/*{(props.session.twitter && props.session.twitter.length > 2) && <a href={`https://x.com/${props.session.twitter}`}>*/}
{/* <img className="w-8" src={Twitter} alt=""/>*/}
{/* <span>@{props.session.twitter}</span>*/}
{/*</a>}*/}
</div>
</div>
{(props.session.coPresenterName && props.session.coPresenterName.length > 1) && <div className="flex justify-start space-x-1 items-center">
<div className="p-4">
<img className="w-16" src={props.session.coPresenterImage ?? SpeakerImagePH} alt=""/>
</div>
<div className="font-normal">
<p className="font-semibold">{props.session.coPresenterName}</p>
<p>{props.session.coPresenterRole} {(props.session.coPresenterCompany && props.session.coPresenterCompany.length > 2) ? '@' + props.session.coPresenterCompany : props.session.coPresenterCompany}</p>
{/*<p className='my-1'>{props.session.bio}</p>*/}
{/*{(props.session.twitter && props.session.twitter.length > 2) && <a href={`https://x.com/${props.session.twitter}`}>*/}
{/* <img className="w-8" src={Twitter} alt=""/>*/}
{/* <span>@{props.session.twitter}</span>*/}
{/*</a>}*/}
</div>
</div>}
</div>
<p>{props.session.titleDescription}</p>
{/*<p>{props.session.titleDescription}</p>*/}
</div>
</div>}
</div>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/TravelInfoIntro.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export default function TravelInfoIntro() {
return (
<section
id="travel-info"
className="container mx-auto flex flex-col lg:flex-row lg:px-6 h-fit"
className="container mx-auto flex flex-col lg:flex-row lg:px-6 h-fit mb-16"
>
<div className="md:w-1/2 flex justify-center items-center">
<img
Expand Down
Loading