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.

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

Version 1.0.0 #82

Merged
merged 87 commits into from
Nov 7, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
b2b8a4d
added isEvent ready for sponsors
manuelgeek Aug 24, 2022
e0d3f3f
hide login
manuelgeek Aug 25, 2022
d541d5c
Added tickets link
manuelgeek Sep 5, 2022
dab45ea
Merge pull request #39 from droidconKE/ft/add-event-tickets-link
manuelgeek Sep 5, 2022
1c56695
#31 sessions container page
manuelgeek Sep 6, 2022
e8f650b
Merge pull request #41 from droidconKE/ft/sessions-container-page
manuelgeek Sep 6, 2022
ca57a1f
#42 #35 Single session view, no sessions, skeletons
manuelgeek Sep 8, 2022
2fc6919
format
manuelgeek Sep 9, 2022
4acc1c5
format
manuelgeek Sep 9, 2022
ca7af29
updated text
manuelgeek Sep 9, 2022
f452c0a
updated tickets link position
manuelgeek Sep 10, 2022
9a7040f
Merge pull request #44 from droidconKE/fx/tickets-link
manuelgeek Sep 10, 2022
d54c34f
Merge pull request #43 from droidconKE/ft/single-sessions-view-skeletons
manuelgeek Sep 13, 2022
cc4d72b
sessionGrid
i-Krypt Sep 9, 2022
8042272
stage changes
i-Krypt Sep 15, 2022
19e6356
sessions grid card
i-Krypt Sep 16, 2022
2b6d2d2
Added GTM analytics, tracked tickets link
manuelgeek Sep 16, 2022
32784e7
#47 issue
manuelgeek Sep 16, 2022
b444cb2
Merge pull request #48 from droidconKE/ft/gtm-additions-analytics
manuelgeek Sep 16, 2022
beea197
update changes on component
i-Krypt Sep 16, 2022
57e709f
Merge pull request #46 from droidconKE/ft-sessions-grid
manuelgeek Sep 16, 2022
508feef
session list card view section
GloriaBargoria Sep 18, 2022
89bbf7f
merge conflicts
GloriaBargoria Sep 18, 2022
398aad0
add e
brianmugweru Sep 20, 2022
2ed2cc3
add session toggles to app
brianmugweru Sep 20, 2022
4e47bbb
add filter sessions
brianmugweru Sep 20, 2022
7f46db4
add groupBy3 helper
brianmugweru Sep 20, 2022
578e58e
Merge branch 'dev' of github.com:droidconKE/droidconKE2022Web into ad…
brianmugweru Sep 20, 2022
8e08b78
reponsiveness
brianmugweru Sep 20, 2022
4348441
lint
brianmugweru Sep 20, 2022
91cee28
lint
brianmugweru Sep 20, 2022
547cb05
lint
brianmugweru Sep 20, 2022
0e7b201
add husky lint
brianmugweru Sep 20, 2022
50eab11
lint
brianmugweru Sep 20, 2022
04e89ae
add lint
brianmugweru Sep 20, 2022
2f9188e
lint
brianmugweru Sep 20, 2022
98751bc
lint
brianmugweru Sep 20, 2022
ad143cb
lint
brianmugweru Sep 20, 2022
9e9cf07
lint
brianmugweru Sep 20, 2022
2992089
lint
brianmugweru Sep 20, 2022
ff5df10
lint
brianmugweru Sep 20, 2022
4968cdf
lint
brianmugweru Sep 20, 2022
86447b5
add lint
brianmugweru Sep 20, 2022
006bb81
lint
brianmugweru Sep 20, 2022
98e5695
lint
brianmugweru Sep 20, 2022
38872f9
lint
brianmugweru Sep 20, 2022
e073b75
add tsx
brianmugweru Sep 20, 2022
f7b7edd
add tsx
brianmugweru Sep 20, 2022
244b69a
lock files
brianmugweru Sep 20, 2022
49ac35f
add filter session
brianmugweru Sep 20, 2022
025e8c6
fixed issues on the PR ft/sessions-list-card-view, here #32
manuelgeek Sep 20, 2022
3dde240
update components
brianmugweru Sep 20, 2022
5da4e96
fix lint
brianmugweru Sep 20, 2022
654e74c
add helpers
brianmugweru Sep 20, 2022
f36632b
Merge pull request #51 from droidconKE/ft/sessions-list-card-view-man…
GloriaBargoria Sep 20, 2022
f577b08
Merge pull request #49 from droidconKE/ft/sessions-list-card-view
manuelgeek Sep 21, 2022
2f3a83b
fix(*): merge conflicts
brianmugweru Sep 21, 2022
cf6aab6
refactor filter sessions, move types out
brianmugweru Sep 21, 2022
555e728
fix merge conflicts
brianmugweru Sep 21, 2022
9f65ade
ch(components/sessions/FilterSessions.tsx): add mobile pixels
brianmugweru Sep 21, 2022
b73622a
filter session inteface
brianmugweru Sep 21, 2022
ffb252e
Merge pull request #50 from droidconKE/add-filter-section-side-view
manuelgeek Sep 21, 2022
f380e69
#38 #37 #36 modals
manuelgeek Sep 26, 2022
3abb7ee
Merge pull request #52 from droidconKE/ft/login-n-feedback-modal
manuelgeek Sep 27, 2022
1706be8
#54 google login, auth provider, logout, sessions, etc (#55)
manuelgeek Oct 11, 2022
ffdd596
fix greetings CI #63 (#64)
manuelgeek Oct 14, 2022
8b8d557
#57 Add close modal, add width prop (#65)
manuelgeek Oct 14, 2022
7c076d3
month update
manuelgeek Oct 17, 2022
ee80143
hide
manuelgeek Oct 17, 2022
5088131
fixed API keu bug on firebase
manuelgeek Oct 17, 2022
be29a3b
#66 added sposrs card, api fetch (#67)
manuelgeek Oct 17, 2022
f52cf77
added sponsors to page
manuelgeek Oct 21, 2022
e96f1b9
#62 single session data (#68)
njeririziki Oct 25, 2022
c2f92b3
Ft sessions grid (#72)
GloriaBargoria Oct 27, 2022
1976498
#56 filter sidebar fixes (#70)
manuelgeek Oct 27, 2022
ce244c2
added session and event feedback #60 (#71)
manuelgeek Oct 27, 2022
8fa40c5
Ft/star sessions (#73)
manuelgeek Oct 28, 2022
1317f82
Ft/added filters (#74)
manuelgeek Oct 28, 2022
26dbd5e
fixed env ready
manuelgeek Oct 28, 2022
9a69d54
added image fallbacks
manuelgeek Nov 4, 2022
17f1658
fixes error 401 in prod
manuelgeek Nov 4, 2022
acd38c5
fix
manuelgeek Nov 4, 2022
2cc6818
Merge branch 'main' into dev
manuelgeek Nov 4, 2022
1a902a7
Merge branch 'dev' of https://github.com/droidconKE/droidconKE2022Web…
manuelgeek Nov 4, 2022
a66a66c
revert
manuelgeek Nov 4, 2022
e11b837
added cachings images
manuelgeek Nov 4, 2022
8f0b526
fixed grid view
manuelgeek Nov 7, 2022
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
4 changes: 2 additions & 2 deletions components/layouts/components/NavBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ export const NavBar = () => {
setNavVisible((prev) => !prev)
}

const showLogin = !isEventReady
const showSessions = !isEventReady
const showLogin = isEventReady
const showSessions = isEventReady

useEffect(() => {
Router.events.on('beforeHistoryChange', () => {
Expand Down
41 changes: 22 additions & 19 deletions components/sessions/SessionGridCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,27 +22,27 @@ export const SessionGridCard = ({
<div className="lg:grid gap-4 grid-cols-3" key={key}>
{/* component */}
{schedules[key]?.map((schedule: Session) => (
<div key={schedule.id}>
<div className='className="max-w-sm rounded-lg shadow-lg overflow-hidden bg-lighter dark:bg-black-dark mb-6"'>
<div className="flex" key={schedule.id}>
<div className="max-w-sm rounded-lg shadow-lg overflow-hidden bg-lighter dark:bg-black-dark mb-6 flex flex-col">
{schedule.is_serviceSession ? (
<img
className="object-cover md:object-cover"
src={schedule.session_image ?? `images/testara.png`}
src={schedule.session_image ?? 'images/all.png'}
alt={schedule.title}
/>
) : (
<Link href={`/sessions/${schedule.slug}`}>
<a>
<img
className="object-cover md:object-cover"
src="images/testara.png"
src={schedule.session_image ?? 'images/all.png'}
alt={schedule.title}
/>
</a>
</Link>
)}
<div className="m-4">
<h3 className="text-light text-sm mt-4">
<div className="m-4 flex flex-1 flex-wrap">
<h3 className="text-light text-sm mt-4 w-full">
@ {hour(schedule.start_date_time)} |{' '}
{schedule.rooms?.map((venue) => (
<span key={venue.id} className="rooms">
Expand All @@ -51,30 +51,33 @@ export const SessionGridCard = ({
))}
</h3>
{schedule.is_serviceSession ? (
<p className="text-sm mt-2 h-10 font-bold dark:text-white-dark">
<p className="text-sm mt-2 font-bold dark:text-white-dark">
{schedule.title}
</p>
) : (
<Link href={`/sessions/${schedule.slug}`}>
<a>
<p className="text-sm mt-2 h-10 font-bold dark:text-white-dark">
<p className="text-sm mt-2 font-bold dark:text-white-dark">
{schedule.title}
</p>
</a>
</Link>
)}
<div className="flex justify-between mt-4 h-8">
<div className="flex justify-between mt-4 w-full self-end">
<div className="flex items-start space-x-4">
{!schedule.is_serviceSession}
{schedule.speakers?.map((speaker) => (
<div key={speaker.avatar} className="w-9 h-9">
<img
className="rounded-full border border-accent shadow-sm"
src={speaker.avatar}
alt=""
/>
</div>
))}
{!schedule.is_serviceSession &&
schedule.speakers?.map((speaker) => (
<div key={speaker.name} className="w-9 h-9">
<img
className="rounded-full border border-accent shadow-sm"
src={
speaker.avatar ??
'/images/icons/apple-icon.png'
}
alt=""
/>
</div>
))}
</div>
<div className="w-full flex items-center justify-end">
<span>
Expand Down
6 changes: 3 additions & 3 deletions components/sessions/SpeakersDetails.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ export const SpeakersDetails = ({ session }: { session: Session }) => {
showStatus={false}
showIndicators={session.speakers.length > 1}
>
{session.speakers.map((speaker, index) => {
{session.speakers.map((speaker) => {
return (
// eslint-disable-next-line react/no-array-index-key
<div key={index}>
<div key={speaker.name}>
<div className="w-full flex items-start text-center">
<div className="w-1/3 md:pr-4 flex-none bg-green-c-2 rounded">
<img
className="w-full p-0 rounded-lg border-2 border-green-500"
src={speaker.avatar}
src={speaker.avatar ?? '/images/icons/apple-icon.png'}
alt={speaker.name}
/>
</div>
Expand Down
18 changes: 11 additions & 7 deletions context/AuthContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,18 @@ export const AuthProvider = ({ children }: { children: ReactNode }) => {

useEffect(() => {
if (getCookie('token')) {
const getUser = async () => {
await axios.get('/details').then((response) => {
setIsAuthenticated(true)
setCurrentUser(response.data.user)
})
try {
const getUser = async () => {
await axios.get('/details').then((response) => {
setIsAuthenticated(true)
setCurrentUser(response.data.user)
})
}
getUser()
} catch (error) {
// eslint-disable-next-line no-console
console.log({ error })
}

getUser()
}
}, [])

Expand Down
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 = false // Boolean(process.env.NEXT_PUBLIC_EVENT_READY) || false
const isEventReady = Boolean(process.env.NEXT_PUBLIC_EVENT_READY) || false

useEffect(() => {
if (isClient) {
Expand Down
13 changes: 13 additions & 0 deletions next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,19 @@ module.exports = withPWA({
// method: 'GET',
// strategyOptions: { cacheableResponse: { statuses: [0, 200] } },
},
{
urlPattern: '/^https://res.cloudinary.com/droidconke/*/i',
handler: 'CacheFirst',
options: {
cacheName: 'static-image-assets-1',
expiration: {
maxEntries: 4,
maxAgeSeconds: 7 * 24 * 60 * 60, // 7 days
},
},
// method: 'GET',
// strategyOptions: { cacheableResponse: { statuses: [0, 200] } },
},
{
urlPattern: '/^https://sessionize.com/image*/i',
handler: 'CacheFirst',
Expand Down
5 changes: 1 addition & 4 deletions pages/sessions/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,7 @@ const Sessions: NextPage<SessionProps> = ({
<section className="w-full py-6 md:py-12 mb-0">
{!loading ? (
<div className="l-container flex flex-wrap">
<div
className="flex flex-row lg:flex-col w-full lg:w-1/12 h-auto lg:h-64 bor border-r-0 lg:border-r border-green-200 space-y-0 lg:space-y-6 space-x-6 lg:space-x-0 items-center lg:items-start justify-center lg:justify-start py-2 lg:py-0 sticky nav-bg nav-side z-0"
style={{ top: '80px' }}
>
<div className="flex flex-row lg:flex-col w-full lg:w-1/12 h-auto lg:h-64 bor border-r-0 lg:border-r border-green-200 space-y-0 lg:space-y-6 space-x-6 lg:space-x-0 items-center lg:items-start justify-center lg:justify-start py-2 lg:py-0 sticky nav-bg nav-side z-0 top-[60px] md:top-[80px]">
{Object.keys(schedules)?.map((key, i) => {
return (
<div
Expand Down
Binary file added public/images/all.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion types/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export interface Speaker {
name: string
tagline: string
biography: string
avatar: string
avatar: string | null
twitter?: string
facebook?: string
linkedin?: string
Expand Down