diff --git a/components/Settings.tsx b/components/Settings.tsx index 94f38e93..b9f56c62 100644 --- a/components/Settings.tsx +++ b/components/Settings.tsx @@ -35,7 +35,7 @@ export default function SettingsShell(props) { ]; return ( -
+
+
-
{props.children}
+
{props.children}
); } diff --git a/components/Shell.tsx b/components/Shell.tsx index 3edf9206..e4af877a 100644 --- a/components/Shell.tsx +++ b/components/Shell.tsx @@ -20,6 +20,7 @@ import classNames from "@lib/classNames"; export default function Shell(props) { const router = useRouter(); + // eslint-disable-next-line @typescript-eslint/no-unused-vars const [session, loading] = useSession(); const telemetry = useTelemetry(); @@ -71,7 +72,7 @@ export default function Shell(props) {
{/* Static sidebar for desktop */}
-
+
{/* Sidebar component, swap this element with another sidebar if you like */}
@@ -105,7 +106,7 @@ export default function Shell(props) { ))}
-
+
@@ -135,10 +136,10 @@ export default function Shell(props) {
-
+
-
-

{props.heading}

+
+

{props.heading}

{props.subtitle}

{props.CTA}
diff --git a/components/ui/Scheduler.tsx b/components/ui/Scheduler.tsx index a10fe998..f043eff7 100644 --- a/components/ui/Scheduler.tsx +++ b/components/ui/Scheduler.tsx @@ -91,7 +91,7 @@ export const Scheduler = ({ type="button" onClick={() => removeScheduleAt(idx)} className="btn-sm bg-transparent px-2 py-1 ml-1"> - + ); diff --git a/pages/[user].tsx b/pages/[user].tsx index 58e28c30..d49d2aac 100644 --- a/pages/[user].tsx +++ b/pages/[user].tsx @@ -4,50 +4,65 @@ import Link from "next/link"; import prisma, { whereAndSelect } from "@lib/prisma"; import Avatar from "../components/Avatar"; import Theme from "@components/Theme"; +import { ClockIcon, InformationCircleIcon, UserIcon } from "@heroicons/react/solid"; +import React from "react"; export default function User(props): User { const { isReady } = Theme(props.user.theme); const eventTypes = props.eventTypes.map((type) => ( -
  • + className="dark:bg-neutral-800 dark:border-neutral-700 dark:hover:border-neutral-600 bg-white hover:bg-gray-50 border border-neutral-200 hover:border-black rounded-sm"> -
    -

    {type.title}

    -

    {type.description}

    +

    {type.title}

    +
    +
    +
    +
    +
    +
    +
    +
    -
    • +
    )); return ( isReady && ( -
    +
    {props.user.name || props.user.username} | Calendso -
    +
    -

    +

    {props.user.name || props.user.username}

    -

    {props.user.bio}

    +

    {props.user.bio}

    -
    -
      {eventTypes}
    - {eventTypes.length == 0 && ( +
    {eventTypes}
    + {eventTypes.length == 0 && ( +

    Uh oh!

    This user hasn't set up any event types yet.

    - )} -
    +
    + )}
    ) @@ -76,6 +91,7 @@ export const getServerSideProps: GetServerSideProps = async (context) => { select: { slug: true, title: true, + length: true, description: true, }, }); diff --git a/pages/auth/logout.tsx b/pages/auth/logout.tsx index e5156c5a..94e60c2c 100644 --- a/pages/auth/logout.tsx +++ b/pages/auth/logout.tsx @@ -29,7 +29,7 @@ export default function Logout() {
    - + Go back to the login page diff --git a/pages/availability/index.tsx b/pages/availability/index.tsx index 5b7edc68..c6a25f55 100644 --- a/pages/availability/index.tsx +++ b/pages/availability/index.tsx @@ -10,6 +10,7 @@ import { ClockIcon } from "@heroicons/react/outline"; import Loader from '@components/Loader'; export default function Availability(props) { + // eslint-disable-next-line @typescript-eslint/no-unused-vars const [session, loading] = useSession(); const router = useRouter(); const [showAddModal, setShowAddModal] = useState(false); @@ -29,7 +30,7 @@ export default function Availability(props) { const bufferMinsRef = useRef(); if (loading) { - return ; + return ; } function toggleAddModal() { @@ -124,7 +125,7 @@ export default function Availability(props) { ">
    -
    +

    Change the start and end times of your day @@ -143,7 +144,7 @@ export default function Availability(props) {

    -
    +

    Something doesn't look right? @@ -153,7 +154,7 @@ export default function Availability(props) {

    diff --git a/pages/availability/troubleshoot.tsx b/pages/availability/troubleshoot.tsx index a22390a1..cf33092b 100644 --- a/pages/availability/troubleshoot.tsx +++ b/pages/availability/troubleshoot.tsx @@ -10,12 +10,13 @@ import Loader from '@components/Loader'; dayjs.extend(utc); export default function Troubleshoot({ user }) { + // eslint-disable-next-line @typescript-eslint/no-unused-vars const [session, loading] = useSession(); const [availability, setAvailability] = useState([]); const [selectedDate, setSelectedDate] = useState(dayjs()); if (loading) { - return ; + return ; } function convertMinsToHrsMins(mins) { diff --git a/pages/bookings/index.tsx b/pages/bookings/index.tsx index 917d6e7d..b83eaf0c 100644 --- a/pages/bookings/index.tsx +++ b/pages/bookings/index.tsx @@ -43,25 +43,8 @@ export default function Bookings({ bookings }) {
    -
    +
    - - - - - - - {bookings .filter((booking) => !booking.confirmed && !booking.rejected) diff --git a/pages/event-types/[type].tsx b/pages/event-types/[type].tsx index afa9e7d1..42678984 100644 --- a/pages/event-types/[type].tsx +++ b/pages/event-types/[type].tsx @@ -388,35 +388,28 @@ export default function EventTypePage({ {eventType.title} | Event Type | Calendso - + + } + subtitle={eventType.description}>
    -
    -
    - -
    -
    - -
    -
    -
    -
    -
    -
    -
    -
    - Event - - Date - - Actions -