Skip to content

Commit

Permalink
feat(nx-dev): update Nx Conf website
Browse files Browse the repository at this point in the history
  • Loading branch information
juristr committed Jun 21, 2023
1 parent 6305e7f commit 99265e4
Show file tree
Hide file tree
Showing 8 changed files with 221 additions and 203 deletions.
215 changes: 137 additions & 78 deletions nx-dev/nx-dev/pages/conf.tsx

Large diffs are not rendered by default.

Binary file removed nx-dev/nx-dev/public/images/nx-conf-2022-media.jpg
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions nx-dev/ui-common/src/lib/announcement-banner.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@ export function AnnouncementBanner(): JSX.Element {
href="https://www.producthunt.com/posts/nx-cloud#nx-cloud"
className="underline"
>
Nx 16 is out!!
Nx Conf is happening again!!
</Link>
</span>
<span className="hidden md:inline">
<span className="font-semibold">Nx 16 is out!!</span>
<span className="font-semibold">
Nx Conf is happening again!!
</span>
</span>
<span className="ml-2 inline-block">
<Link
href="https://blog.nrwl.io/nx-16-is-here-69584ec87053?source=friends_link&sk=e62d25031428743ad9ffc08f2ccc3b06"
rel="noreferrer"
target="_blank"
href="/conf"
className="font-semibold text-blue-500 underline dark:text-sky-500"
>
<span className="absolute inset-0" aria-hidden="true" />
Learn about all the details
Details here
<span aria-hidden="true">&rarr;</span>
</Link>
</span>
Expand Down
81 changes: 38 additions & 43 deletions nx-dev/ui-conference/src/lib/conf-health-and-safety.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,55 +4,50 @@ export function ConfHealthAndSafety(): JSX.Element {
<div className="mx-auto max-w-screen-lg xl:max-w-screen-xl">
<article className="grid grid-cols-1 md:grid-cols-2 md:divide-x md:divide-slate-200 md:dark:divide-slate-700">
<div className="px-5 py-12 md:pr-12">
<h3 className="font-input-mono mb-8 text-xl">COVID Precautions</h3>
<p className="mb-4">
Due to the ongoing health risk of COVID-19,{' '}
<span className="font-semibold">
we require that all attendees be fully vaccinated and boosted in
order to reduce the risk of severe illness
</span>
. We will also{' '}
<span className="font-semibold">
require that attendees wear masks
</span>{' '}
upon entering and remaining within the Nx conference event.
Nx Conf is also dedicated to providing a harassment-free
conference experience for everyone, regardless of gender, gender
identity and expression, age, sexual orientation, disability,
physical appearance, body size, race, ethnicity, religion (or lack
thereof), or technology choices.
</p>
<p className="mb-8">
Conference organizers reserve the right to take additional safety
measures during the conference.
<p className="mb-4">
We do not tolerate harassment of conference participants in any
form. Sexual language and imagery are not appropriate for any
conference venue, including talks, workshops, parties, Twitter,
and other online media.
</p>
<p className="mb-4">
Conference participants violating these rules may be sanctioned or
expelled from the conference without a refund at the discretion of
the conference organizers.
</p>
</div>
<div className="divide-y divide-slate-200 dark:divide-slate-700">

<div className="divide-y divide-slate-200 py-12 dark:divide-slate-700">
<div className="px-5 py-12 md:pl-12">
<h3 className="font-input-mono mb-8 text-xl">Code of Conduct</h3>
<p className="mb-4">
Nx Conf is also dedicated to providing a harassment-free
conference experience for everyone, regardless of gender, gender
identity and expression, age, sexual orientation, disability,
physical appearance, body size, race, ethnicity, religion (or
lack thereof), or technology choices.
</p>
<p className="mb-4">
We do not tolerate harassment of conference participants in any
form. Sexual language and imagery are not appropriate for any
conference venue, including talks, workshops, parties, Twitter,
and other online media.
</p>
<p className="mb-4">
Conference participants violating these rules may be sanctioned
or expelled from the conference without a refund at the
discretion of the conference organizers.
</p>
<p>
<a
href="https://docs.google.com/document/d/1biFWD08Wrd99gRZNv4Q1tawEYGZEI3bd3J55E5uG2ZU/edit?usp=sharing"
rel="noreferrer"
target="_blank"
className="text-blue-500 underline dark:text-sky-500"
<a
className="font-input-mono group flex w-full items-center text-blue-500 dark:text-sky-500 sm:text-xl"
href="https://docs.google.com/document/d/1biFWD08Wrd99gRZNv4Q1tawEYGZEI3bd3J55E5uG2ZU/edit?usp=sharing"
>
<span className="group-hover:underline">
review full Code of Conduct here
</span>
<svg
xmlns="http://www.w3.org/2000/svg"
className="ml-1 h-8 w-8 transform-gpu transition duration-200 ease-out group-hover:translate-x-2 "
fill="none"
viewBox="0 0 24 24"
stroke="currentColor"
>
You can review our full Code of Conduct here.
</a>
</p>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth={2}
d="M13 7l5 5m0 0l-5 5m5-5H6"
/>
</svg>
</a>
</div>
</div>
</article>
Expand Down
10 changes: 5 additions & 5 deletions nx-dev/ui-conference/src/lib/conf-location.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ export function ConfLocation(): JSX.Element {
<article className="grid grid-cols-1 md:grid-cols-2 md:divide-x md:divide-slate-200 md:dark:divide-slate-700">
<div className="px-5 py-12 md:pr-12">
<p className="mb-8">
Nx Conf 2022 will be located at the Tempe Mission Palms in Tempe,
AZ.{' '}
<a
Nx Conf 2023 will be located in New York. More details soon.
{/* <a
href="https://www.hyatt.com/en-US/group-booking/PHXDT/G-NXCF"
rel="noreferrer"
target="_blank"
className="text-blue-500 underline dark:text-sky-500"
>
Use this link to book your room at a discounted rate
</a>
.
. */}
</p>
<iframe
src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d3329.891740501581!2d-111.9388799!3d33.42606669999999!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x872b08d80cf29ca3%3A0x40c5db5254810ce!2sTempe%20Mission%20Palms!5e0!3m2!1sen!2sca!4v1660064364837!5m2!1sen!2sca"
title="Nx Conf 2023 Location Map"
src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d6044.237559417721!2d-73.99232750171791!3d40.759412185545926!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x89c258f88254f2c3%3A0xc307e150c50c51f7!2sSheraton%20New%20York%20Times%20Square%20Hotel!5e0!3m2!1sen!2sus!4v1686622720321!5m2!1sen!2sus"
loading="lazy"
referrerPolicy="no-referrer-when-downgrade"
className="h-96 w-full rounded-lg shadow"
Expand Down
90 changes: 21 additions & 69 deletions nx-dev/ui-conference/src/lib/conf-schedule-short.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,44 +8,7 @@ interface ScheduleItem {
}

export function ConfScheduleShort(): JSX.Element {
const scheduleItemsForSunday16: ScheduleItem[] = [
{
type: 'event',
time: '8:00am - 9:00am (UTC-07:00)',
title: 'Workshop Registration',
description:
'Chime in to register for the workshop and get help with your environment setup',
speakers: [],
videoUrl: '',
},
{
type: 'event',
time: '9:00am - 5:00pm (UTC-07:00)',
title: 'Nx Workshop - Day 1',
description:
'Note, environment setup starts at 8am. This is the introductory part of the workshop which will give you all you need to get set up and running with your brand new Nx workspace. More details in the workshop section further down.',
speakers: ['Zack DeRose', 'Miroslav Jonas'],
videoUrl: '',
},
{
type: 'event',
time: '12:00pm - 1:30pm (UTC-07:00)',
title: 'Lunch',
description: '',
speakers: [],
videoUrl: '',
},
{
type: 'event',
time: '7:00pm (UTC-07:00)',
title: 'Speaker + VIP dinner (all attendees invited)',
description:
'All speakers as well as attendees are invited. Enjoy some food and good conversations!',
speakers: ['Speakers', 'Attendees'],
videoUrl: '',
},
];
const scheduleItemsForTuesday18: ScheduleItem[] = [
const scheduleItemsDiscussions: ScheduleItem[] = [
{
type: 'event',
time: '9:00am - 5:00pm (UTC-07:00)',
Expand All @@ -56,7 +19,7 @@ export function ConfScheduleShort(): JSX.Element {
videoUrl: '',
},
];
const scheduleItemsForMonday17: ScheduleItem[] = [
const scheduleItemsConference: ScheduleItem[] = [
{
type: 'event',
time: '8:30 - 9:30am (UTC-07:00)',
Expand Down Expand Up @@ -238,44 +201,33 @@ export function ConfScheduleShort(): JSX.Element {
<div className="date-container-l font-input-mono mt-16 grid grid-cols-1 divide-x divide-slate-200 dark:divide-slate-700">
<div className="p-8 text-center">
<span className="rounded-md bg-slate-100 p-2 dark:bg-slate-800">
Sunday, October 16th
</span>
</div>
</div>
</div>
<section className="w-full divide-y divide-slate-200 border-t border-b dark:border-slate-700">
{scheduleItemsForSunday16.map((item) =>
item.type === 'event' ? scheduleRow(item) : breakRow(item)
)}
</section>
<div className="mx-auto max-w-screen-lg xl:max-w-screen-xl">
<div className="date-container-l font-input-mono mt-16 grid grid-cols-1 divide-x divide-slate-200 dark:divide-slate-700">
<div className="p-8 text-center">
<span className="rounded-md bg-slate-100 p-2 dark:bg-slate-800">
Monday, October 17th
Tuesday, September 26th
</span>
</div>
</div>
</div>
<section className="w-full divide-y divide-slate-200 border-t border-b border-slate-200 dark:divide-slate-700 dark:border-slate-700">
{scheduleItemsForMonday17.map((item) =>
item.type === 'event' ? scheduleRow(item) : breakRow(item)
)}
</section>
<div className="mx-auto max-w-screen-lg xl:max-w-screen-xl">
<div className="date-container-l font-input-mono mt-16 grid grid-cols-1 divide-x divide-slate-200 dark:divide-slate-700">
<div className="p-8 text-center">
<span className="rounded-md bg-slate-100 p-2 dark:bg-slate-800">
Tuesday, October 18th
</span>
</div>
<div className="mx-auto max-w-screen-lg xl:max-w-screen-xl">
<article className="md:divide-x md:divide-slate-200 md:dark:divide-slate-700">
<div className="px-5 py-12 md:pr-12">
<p className="mb-4">
Main conference day with speakers from the Nx core team and
selected community speakers.
</p>
<p className="mb-4">
The detailed scheduled will be announced soon.
</p>
</div>
</article>
</div>
</div>
<section className="w-full divide-y divide-slate-200 border-t border-b dark:border-slate-700">
{scheduleItemsForTuesday18.map((item) =>
{/* {scheduleItemsConference.map((item) =>
item.type === 'event' ? scheduleRow(item) : breakRow(item)
)}
)} */}
</section>

{/* {scheduleItemsDiscussions.map((item) =>
item.type === 'event' ? scheduleRow(item) : breakRow(item)
)} */}
</div>
);
}
Expand Down
16 changes: 14 additions & 2 deletions nx-dev/ui-conference/src/lib/conf-speakers.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,19 @@ export function ConfSpeakers(): JSX.Element {
const rows = chunkList(speakers, 2);
return (
<div className="border-t border-slate-200 dark:border-slate-700">
{rows.map((row, rowIndex) => (
<div className="border-t border-b border-slate-200 dark:border-slate-700">
<div className="mx-auto max-w-screen-lg xl:max-w-screen-xl">
<article className="grid grid-cols-1 md:grid-cols-2 md:divide-x md:divide-slate-200 md:dark:divide-slate-700">
<div className="px-5 py-12 md:pr-12">
<p className="mb-4">
Speakers will be announced soon. Stay tuned!
</p>
</div>
</article>
</div>
</div>

{/* {rows.map((row, rowIndex) => (
<div
key={'speaker-row--' + rowIndex}
className="border-b border-slate-200 dark:border-slate-700"
Expand All @@ -168,7 +180,7 @@ export function ConfSpeakers(): JSX.Element {
</div>
</div>
</div>
))}
))} */}
</div>
);
}

1 comment on commit 99265e4

@vercel
Copy link

@vercel vercel bot commented on 99265e4 Jun 21, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

nx-dev – ./

nx-dev-git-master-nrwl.vercel.app
nx-dev-nrwl.vercel.app
nx-five.vercel.app
nx.dev

Please sign in to comment.