Skip to content

Move Apps to ui/components#6245

Merged
JeroenReumkens merged 3 commits intomainfrom
chor/ui-apps-cleanup
Jan 4, 2023
Merged

Move Apps to ui/components#6245
JeroenReumkens merged 3 commits intomainfrom
chor/ui-apps-cleanup

Conversation

@sean-brydon
Copy link
Copy Markdown
Member

@sean-brydon sean-brydon commented Jan 3, 2023

Part of cleaning up V2 folder.

Moves apps from v2 into ui/components folder.

More stories will be added when we move to SB V7 - allows us to use next link easily supporting AppCard that uses useRouter currently its a bit of a pain

#6244 was created on the back of this PR. While moving files about i realised a lot of the skeleton loaders acrossed the app are using the skeleton loader dedicated for app store :thisisfine:

@vercel
Copy link
Copy Markdown

vercel Bot commented Jan 3, 2023

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

Name Status Preview Updated
cal ✅ Ready (Inspect) Visit Preview Jan 4, 2023 at 10:56AM (UTC)

ShellSubHeading,
showToast,
SkeletonLoader,
AppSkeletonLoader as SkeletonLoader,
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

See comment in PR description

Comment on lines +1 to +3
import { AppFrontendPayload as App } from "@calcom/types/App";

export const _SBApps: App[] = [
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Mock data - can be ignored and is only used in stories

import { Canvas, Meta, Story, ArgsTable } from '@storybook/addon-docs';
import { Examples, Example, Note, Title,CustomArgsTable, VariantRow,VariantsTable} from '@calcom/storybook/components'
import { Icon } from "@calcom/ui/Icon";
import { Icon } from "@calcom/ui";
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Icon is breaking stories when directly imported - speaking to @JeroenReumkens this has been fixed in a PR he is working on

Copy link
Copy Markdown
Member

@PeerRich PeerRich left a comment

Choose a reason for hiding this comment

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

looks good, tho merge conflicts

Copy link
Copy Markdown
Contributor

@JeroenReumkens JeroenReumkens left a comment

Choose a reason for hiding this comment

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

@sean-brydon Looks good, one small question remaining.

import { HOSTED_CAL_FEATURES } from "@calcom/lib/constants";
import { trpc } from "@calcom/trpc/react";
import { getSettingsLayout as getLayout, SkeletonLoader } from "@calcom/ui";
// TODO(Sean): Figure out why this is using AppSkeletonLoader
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Is this a todo we still need to do, or is this before you realised it was actually used quite often throughout the rest of the app? In that case we can delete this todo I think. Might be a good idea to create an issue to check all AppSkeletonUsage and see if we have to replace it with a real skeleton (I think we should).

Comment thread packages/features/ee/sso/page/teams-sso-view.tsx Outdated
@JeroenReumkens JeroenReumkens enabled auto-merge (squash) January 4, 2023 10:49
@PeerRich PeerRich added ♻️ autoupdate tells kodiak to keep this branch up-to-date automerge labels Jan 4, 2023
@JeroenReumkens JeroenReumkens merged commit b02c7e0 into main Jan 4, 2023
@JeroenReumkens JeroenReumkens deleted the chor/ui-apps-cleanup branch January 4, 2023 11:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

automerge ♻️ autoupdate tells kodiak to keep this branch up-to-date

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants