Skip to content
This repository has been archived by the owner on Aug 21, 2024. It is now read-only.

(Chore): Moved mui components under primitives/mui #7795

Merged
merged 11 commits into from
Mar 29, 2023

Conversation

Abhijay007
Copy link
Contributor

Summary

  • Moved mui components under primitives/mui
  • changed respective imports for the components

References

closes #7764

Checklist

Signed-off-by: Abhijay Jain <Abhijay007j@gmail.com>
@Abhijay007
Copy link
Contributor Author

Abhijay007 commented Mar 22, 2023

@jerknose, I tried to change the base branch to 7763-create-pure-components-write-stories-default-props-and-tests-for-ui-library but this PR is covering some commits from the dev branch too as I pulled the dev, so I skipped the branch change, you can change that if needed.

@Abhijay007 Abhijay007 marked this pull request as draft March 22, 2023 19:42
Signed-off-by: Abhijay Jain <Abhijay007j@gmail.com>
@Abhijay007 Abhijay007 marked this pull request as ready for review March 23, 2023 06:33
@Abhijay007 Abhijay007 marked this pull request as draft March 23, 2023 06:37
@Abhijay007 Abhijay007 marked this pull request as ready for review March 23, 2023 08:31
@Abhijay007 Abhijay007 requested a review from speigg March 23, 2023 11:41
@Abhijay007 Abhijay007 force-pushed the Abhijay007/primitives-mui branch 2 times, most recently from 5528b71 to 57a1725 Compare March 25, 2023 17:49
@speigg speigg enabled auto-merge March 28, 2023 16:00
AidanCaruso and others added 9 commits March 29, 2023 20:37
… provider (#7797)

* add condition to allow guests to log in while not having any identity provider

* tests
Signed-off-by: Abhijay Jain <Abhijay007j@gmail.com>
Signed-off-by: Abhijay Jain <Abhijay007j@gmail.com>
Signed-off-by: Abhijay Jain <Abhijay007j@gmail.com>
Signed-off-by: Abhijay Jain <Abhijay007j@gmail.com>
Signed-off-by: Abhijay Jain <Abhijay007j@gmail.com>
@speigg speigg added this pull request to the merge queue Mar 29, 2023
Merged via the queue into EtherealEngine:dev with commit 271c5c7 Mar 29, 2023
@speigg
Copy link
Member

speigg commented Mar 29, 2023

Hmm, I shouldn't have enabled auto-merge on this, it's causing build errors

@Abhijay007
Copy link
Contributor Author

Abhijay007 commented Mar 29, 2023 via email

jerknose added a commit that referenced this pull request Mar 29, 2023
speigg pushed a commit that referenced this pull request Mar 29, 2023
Arnav2001 pushed a commit that referenced this pull request Mar 31, 2023
* (Chore): Moved mui components under primitives/mui

Signed-off-by: Abhijay Jain <Abhijay007j@gmail.com>

* (Chore): updated imports

Signed-off-by: Abhijay Jain <Abhijay007j@gmail.com>

* Use > on number only (#7798)

* add condition to allow guests to log in while not having any identity provider (#7797)

* add condition to allow guests to log in while not having any identity provider

* tests

* Fixed issue of branch-build being running twice on a PR.

* Added branch-build action for push on dev

* (Chore): updated imports left over imports

Signed-off-by: Abhijay Jain <Abhijay007j@gmail.com>

* (Chore): updated imports left over imports

Signed-off-by: Abhijay Jain <Abhijay007j@gmail.com>

* (Chore): Fixed path imports for tailwind

Signed-off-by: Abhijay Jain <Abhijay007j@gmail.com>

* resolved conflicts

Signed-off-by: Abhijay Jain <Abhijay007j@gmail.com>

---------

Signed-off-by: Abhijay Jain <Abhijay007j@gmail.com>
Co-authored-by: lonedevr <102248647+AidanCaruso@users.noreply.github.com>
Co-authored-by: Josh Field <joshfield999@gmail.com>
Co-authored-by: hanzlamateen <hanzlamateen@live.com>
Arnav2001 pushed a commit that referenced this pull request Mar 31, 2023
Arnav2001 pushed a commit that referenced this pull request Mar 31, 2023
* (Chore): Moved mui components under primitives/mui

Signed-off-by: Abhijay Jain <Abhijay007j@gmail.com>

* (Chore): updated imports

Signed-off-by: Abhijay Jain <Abhijay007j@gmail.com>

* Use > on number only (#7798)

* add condition to allow guests to log in while not having any identity provider (#7797)

* add condition to allow guests to log in while not having any identity provider

* tests

* Fixed issue of branch-build being running twice on a PR.

* Added branch-build action for push on dev

* (Chore): updated imports left over imports

Signed-off-by: Abhijay Jain <Abhijay007j@gmail.com>

* (Chore): updated imports left over imports

Signed-off-by: Abhijay Jain <Abhijay007j@gmail.com>

* (Chore): Fixed path imports for tailwind

Signed-off-by: Abhijay Jain <Abhijay007j@gmail.com>

* resolved conflicts

Signed-off-by: Abhijay Jain <Abhijay007j@gmail.com>

---------

Signed-off-by: Abhijay Jain <Abhijay007j@gmail.com>
Co-authored-by: lonedevr <102248647+AidanCaruso@users.noreply.github.com>
Co-authored-by: Josh Field <joshfield999@gmail.com>
Co-authored-by: hanzlamateen <hanzlamateen@live.com>
Arnav2001 pushed a commit that referenced this pull request Mar 31, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update existing components in UI Library
6 participants