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

V2 Main #3549

Merged
merged 122 commits into from
Aug 24, 2022
Merged

V2 Main #3549

merged 122 commits into from
Aug 24, 2022

Conversation

sean-brydon
Copy link
Member

V2. WIP

@vercel
Copy link

vercel bot commented Jul 27, 2022

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Updated
cal ❌ Failed (Inspect) Aug 24, 2022 at 7:31PM (UTC)
cal-com ❌ Failed (Inspect) Aug 24, 2022 at 7:31PM (UTC)
nightly-cal ❌ Failed (Inspect) Aug 24, 2022 at 7:31PM (UTC)
1 Ignored Deployment
Name Status Preview Updated
swagger ⬜️ Ignored (Inspect) Aug 24, 2022 at 7:31PM (UTC)

@sean-brydon sean-brydon changed the title [WIP] Fix breadcrumb colors [WIP] V2 Main Jul 27, 2022
@leog
Copy link
Contributor

leog commented Jul 27, 2022

@sean-brydon very good job so far!

JM2C, I think @PeerRich removed all shadows from everywhere to avoid those from now on and also @Jaibles asked to only use rounded-sm if I'm not mistaken, just to see if v2 should be aligned with those changes that were already applied in the app

import { HttpError } from "@lib/core/http/error";

import { EmbedButton, EmbedDialog } from "@components/Embed";
import EventTypeDescription from "@components/eventtype/EventTypeDescription";
Copy link
Member

Choose a reason for hiding this comment

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

We don't use the v2 component for EventTypeDescription here. @sean-brydon is that on purpose?

Copy link
Member

@zomars zomars left a comment

Choose a reason for hiding this comment

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

LGTM

@@ -20,6 +20,10 @@ module.exports = {
* @see https://github.com/storybookjs/storybook/issues/12844#issuecomment-867544160
*/
config.resolve.roots = [path.resolve(__dirname, "../public"), "node_modules"];
config.resolve.alias = {
...config.resolve.alias,
"@/interfaces": path.resolve(__dirname, "../interfaces"),
Copy link
Member

Choose a reason for hiding this comment

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

What are these for?

@@ -1,7 +1,7 @@
import { ComponentMeta } from "@storybook/react";
import { Bell } from "react-feather";

import { Badge } from "@calcom/ui/v2";
Copy link
Member

Choose a reason for hiding this comment

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

Is the v2 index causing issues?

@@ -1,7 +1,7 @@
import { ComponentStory, ComponentMeta } from "@storybook/react";
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
import { ComponentStory, ComponentMeta } from "@storybook/react";
import { ComponentMeta } from "@storybook/react";

@@ -1,6 +1,6 @@
import { ComponentMeta } from "@storybook/react";

import { Breadcrumb, BreadcrumbItem } from "@calcom/ui/v2";
import Breadcrumb, { BreadcrumbItem } from "@calcom/ui/v2/core/Breadcrumb";

Copy link
Member

Choose a reason for hiding this comment

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

Was the other approach causing issues? I think the former is the desirable way to consume these components. If they are causing issues we should figure out why.

@@ -222,7 +222,11 @@ const getEmbedTypeSpecificString = ({
if (!frameworkCodes) {
throw new Error(`No code available for the framework:${embedFramework}`);
}
let uiInstructionStringArg = undefined;
let uiInstructionStringArg: {
Copy link
Member

Choose a reason for hiding this comment

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

Why the change?

@@ -29,7 +29,7 @@ import { detectBrowserTimeFormat } from "@calcom/lib/timeFormat";
import { localStorage } from "@calcom/lib/webstorage";
import { trpc } from "@calcom/trpc/react";
import { Icon } from "@calcom/ui/Icon";
import DatePicker from "@calcom/ui/booker/DatePicker";
import DatePicker from "@calcom/ui/v2/modules/booker/DatePicker";
Copy link
Member

Choose a reason for hiding this comment

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

Do we want to modify v1 AvailabilityPage in this PR? Would it make sense to take the duplicate v2 approach in here as well?

import Swatch from "@calcom/ui/v2/Swatch";
import { Swatch } from "@calcom/ui/v2";
Copy link
Member

Choose a reason for hiding this comment

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

This is how we should be consuming components IMO.

import React, { FC } from "react";
import { Controller, SubmitHandler, useForm, useWatch } from "react-hook-form";

import { Button, Select, TextArea, TextField } from "@calcom/ui/v2";
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
import { Button, Select, TextArea, TextField } from "@calcom/ui/v2";
import { Button, Select, TextField } from "@calcom/ui/v2";

@@ -0,0 +1,322 @@
import autoAnimate from "@formkit/auto-animate";
import { EventTypeCustomInput, EventTypeCustomInputType } from "@prisma/client/";
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
import { EventTypeCustomInput, EventTypeCustomInputType } from "@prisma/client/";
import { EventTypeCustomInput } from "@prisma/client";

@zomars
Copy link
Member

zomars commented Aug 24, 2022

Merging as we need to test this on staging ASAP

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2.0 Bookings {View} 2.0 Event Types / Single {View}
6 participants