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

chore: move ui back into monorepo #1467

Merged
merged 12 commits into from
Apr 10, 2023
Merged

chore: move ui back into monorepo #1467

merged 12 commits into from
Apr 10, 2023

Conversation

markphelps
Copy link
Collaborator

@markphelps markphelps commented Apr 7, 2023

Fixes: FLI-219

  • Moves UI code back to this repo under ui directory
  • Fix CI / dagger to use local ui folder instead of cloning from other repo

All of the code in ui is a direct copy over from the https:/flipt-io/flipt-ui repo as of commit f968a91

TODO

(in follow up PRs)

  • Rethink/Redo development workflow now that UI is back in this repo
  • Add back UI ITs to build/run from this repo instead of relying on flipt/flipt:nightly image

@codecov
Copy link

codecov bot commented Apr 7, 2023

Codecov Report

Merging #1467 (649f5d6) into main (2a491f6) will increase coverage by 0.17%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##             main    #1467      +/-   ##
==========================================
+ Coverage   77.60%   77.77%   +0.17%     
==========================================
  Files          44       44              
  Lines        3402     3402              
==========================================
+ Hits         2640     2646       +6     
+ Misses        607      603       -4     
+ Partials      155      153       -2     

see 1 file with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@markphelps markphelps changed the base branch from main to devcontainer-fix April 7, 2023 18:49
@@ -6,7 +6,7 @@ package ui
import "embed"

var (
//go:embed index.html
//go:embed dev.html
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

TODO: this doesnt work yet. will have to redo the development workflow in another PR

@@ -0,0 +1,21 @@
<!DOCTYPE html>
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

same as above, this is just copied over for posterity

@markphelps markphelps changed the title chore: (wip) move ui back into monorepo chore: move ui back into monorepo Apr 7, 2023
@markphelps markphelps marked this pull request as ready for review April 7, 2023 19:08
@markphelps markphelps requested a review from a team as a code owner April 7, 2023 19:08
Base automatically changed from devcontainer-fix to main April 8, 2023 19:11
Copy link
Contributor

@GeorgeMac GeorgeMac left a comment

Choose a reason for hiding this comment

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

Welcome home UI 🏡

@markphelps
Copy link
Collaborator Author

@all-contributors please add @darinmclain for code

@allcontributors
Copy link
Contributor

@markphelps

I've put up a pull request to add @darinmclain! 🎉

@markphelps markphelps merged commit 0874732 into main Apr 10, 2023
@markphelps markphelps deleted the mv-ui branch April 10, 2023 13:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants