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

feat(setup): update logo and components props #10204

Merged
merged 6 commits into from
May 23, 2024

Conversation

mikeplascdev
Copy link
Collaborator

Pull request type

  • Bug Fix
  • Enhancement
  • Documentation

Description

  • Update logos
  • Add new props to the Accordion and Button components

Figma

Console-Design

Evidence

Screen.Recording.2024-05-21.at.12.06.29.a.m.mov

Jira

IR-2119

Copy link

cla-bot bot commented May 21, 2024

Thank you for your pull request and welcome to the Ethereal Engine developer community!

We require contributors to sign our Copyright Assignment Agreement, and we don't seem to have you on file.

In order for us to review and merge your code, please sign the agreement at https://forms.gle/15ENsSAJGKf2ozvB7

The agreement has not been signed by users: @mikeplascdev.

After signing the agreement, you can ask me to recheck this PR by posting @cla-bot check as a comment to the PR :)

Copy link

cla-bot bot commented May 22, 2024

Thank you for your pull request and welcome to the Ethereal Engine developer community!

We require contributors to sign our Copyright Assignment Agreement, and we don't seem to have you on file.

In order for us to review and merge your code, please sign the agreement at https://forms.gle/15ENsSAJGKf2ozvB7

The agreement has not been signed by users: @mikeplascdev.

After signing the agreement, you can ask me to recheck this PR by posting @cla-bot check as a comment to the PR :)

Copy link

cla-bot bot commented May 22, 2024

Thank you for your pull request and welcome to the Ethereal Engine developer community!

We require contributors to sign our Copyright Assignment Agreement, and we don't seem to have you on file.

In order for us to review and merge your code, please sign the agreement at https://forms.gle/15ENsSAJGKf2ozvB7

The agreement has not been signed by users: @mikeplascdev.

After signing the agreement, you can ask me to recheck this PR by posting @cla-bot check as a comment to the PR :)

@mikeplascdev mikeplascdev force-pushed the IR-2119-update-console-to-reflect-latest-mocks branch from 35b0cea to a20a1b1 Compare May 22, 2024 16:55
Copy link

cla-bot bot commented May 22, 2024

Thank you for your pull request and welcome to the Ethereal Engine developer community!

We require contributors to sign our Copyright Assignment Agreement, and we don't seem to have you on file.

In order for us to review and merge your code, please sign the agreement at https://forms.gle/15ENsSAJGKf2ozvB7

The agreement has not been signed by users: @mikeplascdev.

After signing the agreement, you can ask me to recheck this PR by posting @cla-bot check as a comment to the PR :)

@HexaField
Copy link
Member

I'd like @aditya-mitra 's eyes on this before we merge in, as there are some changes to the tailwind primitives.

Copy link
Collaborator

@aditya-mitra aditya-mitra 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!
A small modification in the tailwind button would be nice.

import { twMerge } from 'tailwind-merge'

export interface ButtonProps extends React.HTMLAttributes<HTMLButtonElement> {
startIcon?: ReactNode
endIcon?: ReactNode
children?: ReactNode
size?: 'small' | 'medium' | 'large'
variant?: 'primary' | 'outline' | 'danger' | 'success' | 'pink' | 'transparent' | 'onboarding'
variant?: 'primary' | 'outline' | 'danger' | 'success' | 'pink' | 'transparent' | 'onboarding' | 'sidebar'
Copy link
Collaborator

@aditya-mitra aditya-mitra May 23, 2024

Choose a reason for hiding this comment

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

Is a sidebar variant present in the primitive figma designs?
We should only add colour variant which are primitives. (I plan to refactor the onboarding variant)

For any other variant, we should add it as a separate derived button. Something like this

const SidebarButton = (props: ButtonProps) => <Button className='bg-[#141619] {...props} />

Copy link
Member

Choose a reason for hiding this comment

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

I am merging this PR for now as I want to deploy this in MT. @mikeplascdev can you please address aditya's concern in a separate PR.

@hanzlamateen hanzlamateen self-requested a review May 23, 2024 10:24
@hanzlamateen hanzlamateen merged commit df2e384 into dev May 23, 2024
7 checks passed
@hanzlamateen hanzlamateen deleted the IR-2119-update-console-to-reflect-latest-mocks branch May 23, 2024 10:27
MbfloydIR added a commit that referenced this pull request May 24, 2024
* dev: (63 commits)
  hotfix vrm0 data not being where we expect it (#10236)
  Update tween.js version (#10241)
  Added ProjectPermissionDatabaseType
  physics bug fix (#10221)
  updated the background to use the color with when in wireframe render mode (#10231)
  vrm expressionmanager was being thrown away it is actually needed for viseme support to work (#10230)
  IR-1887-Asset-Preview-breaking-if-you-click-gltf-that-is-in-the-scene (#10208)
  query function fix (#10229)
  IR-2102 Material/Plugin Parameters (#10180)
  Fixed webcam light not turning off when camera paused. (#10224)
  Made client's server.js not bound to a specific host (#10223)
  Update FeathersHooks.tsx (#10228)
  Updated app name
  feat(setup): update logo and components props (#10204)
  Changes for feature flag schema to be string enum (#10225)
  Cleaned location hooks (#10216)
  Ir 1652 interactable input refactor (#10219)
  IR-2018 Refactor the Select component to disable search functionality for the dropdown only (#10206)
  refactor: Update Primus initialization to include pathname in server URL (#10205)
  Move physics enter/exit back to reactors (#10193)
  ...

# Conflicts:
#	packages/editor/src/components/element/ElementList.tsx
#	packages/editor/src/components/properties/PostProcessingSettingsEditor.tsx
#	packages/engine/src/scene/SceneModule.ts
#	packages/spatial/src/renderer/components/PostProcessingComponent.tsx
#	packages/spatial/src/renderer/functions/configureEffectComposer.ts
@DanielBelmes
Copy link
Contributor

Since the urls have stayed the same. We won't be able to see the updated assets on domains we visited before. In my PR I added query parameters to the urls to cache bust them. Whoever is giving demos Wednesday needs to clear their cache to be able to see these changes. @hanzlamateen

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants