Skip to content

Commit 259034d

Browse files
committed
some improvements to destino devconnect table, misc.
1 parent 4ee2228 commit 259034d

5 files changed

Lines changed: 34 additions & 25 deletions

File tree

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
11
.team-col {
22
background: yellow;
33
}
4+
5+
.event-table {
6+
--table-row-background: none;
7+
--table-row-hover-background: #232334;
8+
--table-header-background: none;
9+
--icon-color: white;
10+
--table-header-color: #f3a24a;
11+
--table-row-background-even: #36364c;
12+
}

devconnect/src/common/components/ba/destino/event-table.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ const tableColumns: Array<TableColumn> = [
6767
// if (item.link) {
6868
return (
6969
<Link
70-
className="bold"
70+
className="bolda"
7171
href={`/destino/${encodeURIComponent(item.name).replace(/%20/g, '-')}-${encodeURIComponent(item.event_id)}`}
7272
indicateExternal
7373
>
@@ -175,13 +175,13 @@ const EventsTable = React.memo(({ events, pages }: any) => {
175175
})
176176

177177
return (
178-
<div className="w-full">
178+
<div className={`w-full ${styles['event-table']}`}>
179179
<div className="flex justify-between items-center mb-4 gap-2">
180180
{/* <div className="font-bold">Destino Devconnect Events</div> */}
181181

182182
<div className="flex">
183183
<p
184-
className={`no-select cursor-pointer translate-y-[1px] hover:font-bold px-2 md:px-4 py-2 ${
184+
className={`no-select cursor-pointer translate-y-[1px] hover:font-bold px-2 md:px-0 py-2 ${
185185
!includePastEvents ? 'font-bold' : ''
186186
}`}
187187
onClick={() => {
@@ -204,7 +204,7 @@ const EventsTable = React.memo(({ events, pages }: any) => {
204204
</div>
205205

206206
<input
207-
className={`rounded-lg p-1.5 text-base lg:text-sm px-4 border-solid text-black border border-slate-300 outline-none`}
207+
className={`p-1.5 text-base lg:text-sm px-3 border-solid text-black outline-none`}
208208
type="text"
209209
value={search}
210210
onChange={e => setSearch(e.target.value)}
@@ -214,7 +214,7 @@ const EventsTable = React.memo(({ events, pages }: any) => {
214214

215215
<div className="mb-4">{/* <RichText content={pages.events_table}></RichText> */}</div>
216216

217-
<div className="text-sm text-black rounded-xl overflow-hidden">
217+
<div className="text-sm overflow-hidden text-white">
218218
<Table itemKey="_key" items={filteredEvents} columns={tableColumns} initialSort={0} />
219219
</div>
220220
</div>

devconnect/src/common/components/link/Link.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ const WrappedLink = React.forwardRef(
103103
<span className={css['link']} data-type="link-text">
104104
{children}
105105
</span>
106-
{indicateExternal && (
106+
{isExternal && indicateExternal && (
107107
<span className={css['external-indicator']} data-type="external-indicator">
108108
&nbsp;
109109
<LinkIndicator className={`${css['icon']} icon`} />

devconnect/src/pages/destino/[event].tsx

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ ${currentUrl}`
3535
'MMMM D, YYYY'
3636
)} as part of the Destino Devconnect series.%0A%0A${encodeURIComponent(
3737
currentUrl
38-
)}&channelKey=devcon&embeds[]=${encodeURIComponent(currentUrl)}`
38+
)}&channelKey=devconnect&embeds[]=${encodeURIComponent(currentUrl)}`
3939

4040
const hasLink = eventData.link && eventData.link.startsWith('http')
4141

@@ -61,7 +61,12 @@ ${currentUrl}`
6161
{(globalThis as any).translations.this_is_a_destino_devconnect_event}
6262
</Link>
6363
</div>
64-
<Tilty className="max-w-full relative contents md:block" style={{ transformStyle: 'preserve-3d' }} speed={5000}>
64+
<Tilty
65+
className="max-w-full relative contents md:block"
66+
style={{ transformStyle: 'preserve-3d' }}
67+
speed={5000}
68+
reverse
69+
>
6570
<div className="flex flex-col bg-white rounded-2xl overflow-hidden w-full max-w-[800px] shadow-lg border border-gray-600 border-solid mt-4 mb-0 sm:mt-0 ">
6671
<div className="w-full aspect-[7/2] relative">
6772
<Image
@@ -74,9 +79,6 @@ ${currentUrl}`
7479
<div className="py-4 px-6 flex flex-col">
7580
<div className="flex flex-col md:flex-row md:items-start md:justify-between gap-4 mb-3">
7681
<h1 className="text-xl md:text-2xl font-extrabold text-gray-900 leading-tight">{eventData?.name}</h1>
77-
{/* <span className="inline-block bg-gradient-to-r from-purple-500 to-pink-500 text-white text-xs font-semibold px-3 py-1 rounded-full shadow">
78-
{eventData.name}
79-
</span> */}
8082
<span className="inline-flex items-center gap-1 text-gray-500 text-xs font-medium">
8183
<svg
8284
className="w-4 h-4 text-gray-400"
@@ -94,7 +96,6 @@ ${currentUrl}`
9496
{eventData?.location}
9597
</span>
9698
</div>
97-
{/* <h1 className="text-xl md:text-2xl font-extrabold text-gray-900 leading-tight mb-2">{eventData?.name}</h1> */}
9899
<p className="mb-4 text-xs md:text-base">{eventData?.content}</p>
99100
<div className="flex flex-col sm:flex-row gap-4 text-sm justify-between">
100101
<div className="flex gap-4">
@@ -128,11 +129,7 @@ ${currentUrl}`
128129
</Button>
129130
</Link>
130131
)}
131-
{/* <Image
132-
src={DestinoLogo}
133-
alt="Destino Logo"
134-
className="object-cover w-[250px] max-w-[70vw] absolute bottom-0 translate-y-[calc(100%+24px)] left-1/2 -translate-x-1/2"
135-
/> */}
132+
136133
<div>
137134
{(globalThis as any).translations.destino_ai_generated}
138135
{hasLink && ' - ' + (globalThis as any).translations.destino_ai_generated_2}
@@ -180,8 +177,6 @@ export const getStaticPaths = async ({ locales }: { locales: string[] }) => {
180177

181178
const events = await eventsResponse.json()
182179

183-
console.log(events, 'EVENTS')
184-
185180
const paths = locales.flatMap(locale =>
186181
events.map((event: any) => ({
187182
params: { event: `${encodeURIComponent(event.name).replace(/%20/g, '-')}-${encodeURIComponent(event.event_id)}` },

lib/components/table/table.module.scss

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,14 @@
2828
.header {
2929
align-self: flex-start;
3030
border-bottom: 1px solid #b9b9b9;
31-
background: white;
31+
background: var(--table-header-background, white);
32+
color: var(--icon-color, black);
3233
@extend .distribute-items;
3334

3435
.column-header {
36+
color: var(--table-header-color, inherit);
3537
text-transform: uppercase;
36-
font-weight: 600;
38+
// font-weight: 600;
3739
display: flex;
3840
align-items: center;
3941

@@ -55,21 +57,24 @@
5557

5658
$bg-color: white;
5759

58-
background: $bg-color;
60+
background: var(--table-row-background, $bg-color);
5961

6062
@media not all and (hover: none) {
6163
&:hover {
6264
outline: 1px solid rgba(121, 128, 135, 1);
63-
background: darken($bg-color, 5%);
65+
background: var(--table-row-hover-background, darken($bg-color, 5%));
6466
}
6567
}
6668

6769
&:nth-child(even) {
6870
$even-bg-color: #f8f8f8;
69-
background: $even-bg-color;
71+
background: var(--table-row-background-even, $even-bg-color);
7072

7173
&:hover {
72-
background: darken($even-bg-color, 5%);
74+
background: var(
75+
--table-row-hover-background,
76+
darken($even-bg-color, 5%)
77+
);
7378
}
7479
}
7580
}

0 commit comments

Comments
 (0)