Skip to content

Commit

Permalink
[#98] 2024 web updates (#100)
Browse files Browse the repository at this point in the history
  • Loading branch information
manuelgeek authored Feb 29, 2024
1 parent 8f16776 commit 2ed6953
Show file tree
Hide file tree
Showing 15 changed files with 288 additions and 65 deletions.
8 changes: 4 additions & 4 deletions components/home/Banner.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export const Banner = () => {
<h1 className="font-light text-3xl md:text-4xl black px-0">
<span className="lowercase">welcome to</span> <br />
<span className="font-black text-4xl md:text-5xl">
DROIDCONKE23
DROIDCONKE24
</span>
</h1>
<div className="mt-12 md:mt-8 text-3xl md:text-4xl lowercase font-light">
Expand Down Expand Up @@ -46,13 +46,13 @@ export const Banner = () => {
</a>
</div>
<div className="flex flex-wrap mt-8 md:mt-10 items-center">
<img
{/* <img
className="h-[48px] md:h-[66px] mr-3"
src="/images/hashtag-23.png"
alt="droid alt"
/>
/> */}
<div className="text-accent dark:text-accent-dark font-black text-base md:text-2xl mt-3 md:mt-4 lowercase">
<span>08TH - 10TH</span> <br />
<span>06TH - 8TH</span> <br />
NOVEMBER
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion components/home/Sponsor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export const Sponsor = () => {
<div className="text-left md:text-center">
<h2 className="title dark:text-accent lowercase">
<span>sponsor</span>{' '}
<span className="font-medium"> droidconke23</span>
<span className="font-medium"> droidconke24</span>
</h2>
<div className="w-full">
<h6 className="mt-4 text-white text-xl md:text-2xl">
Expand Down
20 changes: 14 additions & 6 deletions components/home/SponsorsList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,22 @@ function SponsorsList({
<div className="items-center text-center py-10 md:py-20">
<div className="w-full py-10">
<h2 className="title lowercase dark:text-accent-dark">
<span>sponsored</span> <span className="font-medium"> by;</span>
<span>{year === 24 ? '' : `dcKe${year}`} sponsored</span>{' '}
<span className="font-medium"> by;</span>
</h2>
<div className="flex justify-center">
<p className="mt-8 md:w-7/12">
Please make sure to stop by and visit our sponsors at the show
and give them a high-five and a huge thank you for helping to
bring the community together at droidconke.
</p>
{year === 24 ? (
<p className="mt-8 md:w-7/12">
Please make sure to stop by and visit our sponsors at the show
and give them a high-five and a huge thank you for helping to
bring the community together at droidconke.
</p>
) : (
<p className="mt-8 md:w-7/12">
Thanks for being our sponsors and for making droidconKe 20
{year} a success.
</p>
)}
</div>
</div>
<div className="w-full">
Expand Down
6 changes: 3 additions & 3 deletions components/layouts/components/Footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,17 @@ export const Footer = () => {
</span>
<ul className="list-unstyled mt-3">
<p className="text-white dark:text-white-dark text-base">
Daystar University - Nairobi Campus
TBA
</p>

<a
{/* <a
href="https://maps.app.goo.gl/e8tapzru1QwwMSHs5"
target="_blank"
className="text-white dark:text-white-dark text-base"
rel="noreferrer"
>
<i className="fa fa-map-marker" /> View Map location
</a>
</a> */}
</ul>
</div>
{showExtraInfo && (
Expand Down
32 changes: 18 additions & 14 deletions components/layouts/components/NavBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export const NavBar = () => {
<div
className={`w-full md:w-8/12 flex-grow lg:flex ${
navVisible ? 'bg-white dark:bg-dark' : ''
}`}
} ${isEventReady ? 'md:w-8/12' : 'md:w-7/12'}`}
>
<ul className="list-reset lg:flex justify-end text-base flex-1 items-center space-y-2 md:space-y-0">
<li className="mr-3 black">
Expand Down Expand Up @@ -142,20 +142,24 @@ export const NavBar = () => {
</li>
</ul>
</div>
{/* <div className="w-full md:w-2/12 flex md:justify-end mt-4 md:mt-0 px-4 md:px-0"> */}
{/* <Link href="/sponsors"> */}
{/* <a
className="btn-secondary"
href="https://bit.ly/getYourDcKE22Tickets"
target="_blank"
rel="noreferrer"
>
get your ticket
</a> */}
{/* </Link> */}
{/* </div> */}
<div
className={`w-full ${
isEventReady ? 'md:w-2/12' : 'md:w-3/12'
} flex md:justify-end mt-4 md:mt-0 px-4 md:px-0`}
>
<Link href="/sponsors">
<a
className="btn-secondary"
href="https://bit.ly/getYourDcKE22Tickets"
target="_blank"
rel="noreferrer"
>
get your ticket
</a>
</Link>
</div>

<div className="w-2/12 flex-grow lg:flex justify-end">
<div className="w-2/12 flex-grow lg:flex justify-end">
{showLogin &&
(!isAuthenticated ? (
<button
Expand Down
15 changes: 14 additions & 1 deletion components/layouts/components/PastEventsDropdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export const PastEventsDropdown = () => {
<svg
className={`-ml-5 mt-2 h-5 w-5 ${
router.pathname.includes('past-events')
? 'text-primary dark:text-accent'
? 'text-primary dark:text-accent -mt-0'
: 'text-black dark:text-white'
}`}
viewBox="0 0 20 20"
Expand Down Expand Up @@ -85,6 +85,19 @@ export const PastEventsDropdown = () => {
</a>
</Link>
</div>
<div className="py-1 text-sm" role="none">
<Link href="/past-events/2023">
<a
className={
router.pathname === '/past-events/2023'
? 'active-link'
: 'link'
}
>
droidconKe 2023
</a>
</Link>
</div>
</div>
)}
</div>
Expand Down
33 changes: 33 additions & 0 deletions components/speakers/SpeakersList.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import { Session, Speaker } from '../../types/types'
import { SpeakerCard } from './SpeakerCard'

export const SpeakersList = ({
speakers,
sessions,
}: {
speakers: Speaker[]
sessions: Session[]
}) => (
<div>
<h3 className="text-3xl md:text-4xl text-primary dark:text-accent font-medium w-full mt-6 lowercase md:mt-12">
<span className="font-black">All</span> speakers
</h3>
<div className="py-10">
<div className="grid grid-cols-1 md:grid-cols-4 gap-6 gap-y-16">
{speakers.map((speaker) => {
const speakerSession = sessions.find((s) =>
s.speakers.find((sp) => sp.name === speaker.name)
)

return (
<SpeakerCard
speaker={speaker}
slug={speakerSession?.slug}
key={speaker.name}
/>
)
})}
</div>
</div>
</div>
)
2 changes: 1 addition & 1 deletion context/ThemeContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const THEME_NAME = 'droidcon_theme'
export const ThemeProvider = ({ children }: { children: ReactNode }) => {
const [isDarkTheme, setIsDarkTheme] = useState(false)

const isEventReady = Boolean(process.env.NEXT_PUBLIC_EVENT_READY) || false
const isEventReady = process.env.NEXT_PUBLIC_EVENT_READY === 'true' || false

useEffect(() => {
if (isClient) {
Expand Down
4 changes: 2 additions & 2 deletions middleware.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { NextResponse } from 'next/server'
import type { NextRequest } from 'next/server'

const isEventReady = Boolean(process.env.NEXT_PUBLIC_EVENT_READY) || false
const isEventReady = process.env.NEXT_PUBLIC_EVENT_READY === 'true' || false

const BLOCKED_ROUTES = ['/sessions']
const BLOCKED_ROUTES = ['/sessions', '/speakers']

export function middleware(request: NextRequest) {
if (!isEventReady && BLOCKED_ROUTES.includes(request.nextUrl.pathname)) {
Expand Down
8 changes: 4 additions & 4 deletions pages/about.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const About: NextPage<AboutProps> = ({ organizers }) => {
apps and products, and to learn and teach.
<br /> <br />
This three-day developer focused gathering will be held in
Nairobi Kenya on November 8th to 10th 2023 and will be the
Nairobi Kenya on November 6th to 8th 2024 and will be the
largest of its kind in Africa.
<br /> <br />
It will have workshops and codelabs focused on the building of
Expand Down Expand Up @@ -83,8 +83,8 @@ const About: NextPage<AboutProps> = ({ organizers }) => {
and products in the ecosystem.
<br />
<br />
The three-day gathering will be held in Nairobi, Kenya, from 8th
to 10th November 2023 and will be the largest in Africa.
The three-day gathering will be held in Nairobi, Kenya, from 6th
to 8th November 2024 and will be the largest in Africa.
<br />
<br />
The conference will include workshops, codelabs and talks geared
Expand All @@ -106,7 +106,7 @@ const About: NextPage<AboutProps> = ({ organizers }) => {
Tanzania and Nigeria graced the event.
<br />
<br />
This year, we will host the 4th in-person event. Tech
This year, we will host the 5th in-person event. Tech
communities from the East African Region and continental members
will be present. Participants will have an excellent chance to
learn about Android development, opportunities and services in
Expand Down
2 changes: 1 addition & 1 deletion pages/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const Home: NextPage<HomeProps> = ({ organizers, sponsors }) => {
<span>about</span> <span className="font-medium">droidconke</span>
</h2>
<p className="dark:text-lighter-dark py-5 md:py-8 text-xl md:text-2xl">
This 4th in-person event will include several tech communities
This 5th in-person event will include several tech communities
from the East African Region and continental members. Participants
will have an excellent chance to learn about Android development
and opportunities and to network with Android experts in the
Expand Down
2 changes: 1 addition & 1 deletion pages/past-events/2022.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const Home2022: NextPage<SessionProps> = ({
<div className="l-container mt-8 md:mt-0 py-2 md:py-4">
<div className="w-full flex justify-between md:flex-row items-center mt-5 md:mt-6">
<h3 className="lowercase text-2xl md:text-3xl text-white dark:text-white-dark">
Sessions
dcke22 Sessions
</h3>
<SessionToggles
setShowFilterSession={setShowFilterSession}
Expand Down
Loading

0 comments on commit 2ed6953

Please sign in to comment.