Skip to content

fix: added create github account content in login screen#640

Merged
vishnoianil merged 5 commits intoinstructlab:mainfrom
Bhas-kar:613_github_account_content
Mar 12, 2025
Merged

fix: added create github account content in login screen#640
vishnoianil merged 5 commits intoinstructlab:mainfrom
Bhas-kar:613_github_account_content

Conversation

@Bhas-kar
Copy link
Contributor

@Bhas-kar Bhas-kar commented Mar 5, 2025

Closes #613

added the required content as per the expectations.

@vishnoianil
Copy link
Member

@Bhas-kar the UI lint job is failing, can you please run npm run pretty and npm run lint:fix locally on your branch and push the changes.

@Bhas-kar Bhas-kar force-pushed the 613_github_account_content branch from f649c36 to c07fde7 Compare March 6, 2025 11:26
@Bhas-kar Bhas-kar requested a review from vishnoianil March 6, 2025 11:27
@Bhas-kar
Copy link
Contributor Author

Bhas-kar commented Mar 6, 2025

Hi @vishnoianil ,

I have fixed the UI lint job failure.
requesting to kindly re review the same.

thanks

@vishnoianil
Copy link
Member

@Bhas-kar The PR looks good. But seems like the commit history got messed up (16 commits). Can you please fix the commit history. Pull the latest main and rebase your branch over the latest main, that should fix it.

@Bhas-kar Bhas-kar force-pushed the 613_github_account_content branch from 9f09610 to 62ca673 Compare March 7, 2025 08:05
@Bhas-kar
Copy link
Contributor Author

Bhas-kar commented Mar 7, 2025

@Bhas-kar The PR looks good. But seems like the commit history got messed up (16 commits). Can you please fix the commit history. Pull the latest main and rebase your branch over the latest main, that should fix it.

Hey @vishnoianil
rebased my branch, the commits issue seems resolved now.
thanks

@Bhas-kar
Copy link
Contributor Author

hey @vishnoianil and @jeff-phillips-18 ,
could you please review the PR
thanks

@jeff-phillips-18
Copy link
Collaborator

@Bhas-kar Could you please squash your commits and rebase such that you don't require a merge commit?

Kanchi Bhaskar added 4 commits March 11, 2025 19:41
Signed-off-by: Kanchi Bhaskar <Kanchi.Bhaskar@ibm.com>
Signed-off-by: Kanchi Bhaskar <Kanchi.Bhaskar@ibm.com>
Signed-off-by: Kanchi Bhaskar <Kanchi.Bhaskar@ibm.com>
Signed-off-by: Kanchi Bhaskar <Kanchi.Bhaskar@ibm.com>
@Bhas-kar Bhas-kar force-pushed the 613_github_account_content branch from c28c4e2 to 7ffa350 Compare March 11, 2025 14:11
@Bhas-kar
Copy link
Contributor Author

@Bhas-kar Could you please squash your commits and rebase such that you don't require a merge commit?

rebased the branch as suggested, thanks @jeff-phillips-18

@jeff-phillips-18
Copy link
Collaborator

Screen shot:

image

/cc @Misjohns

@vishnoianil vishnoianil merged commit 275b7a3 into instructlab:main Mar 12, 2025
5 checks passed
@Misjohns
Copy link
Collaborator

@jeff-phillips-18 Why are we adding the username and password fields? I missed those requirements being added. If we do need them then we need a little tweaking. Reach out if you'd like to discuss further.

  • Hierarchy is off. Typically we place the traditional login first, followed by the alternatives (ie. GitHub)
    -- The secondary login (GitHub) should be treated as a secondary button so let's outline the button.
    -- Let's discuss if we really need the GH login first. Otherwise, please follow mockup.
    -- Need to group the actions beneath the appropriate button (forgot username or password beneath primary login button, New to GH? beneath GH login)
  • The username and password fields are black so a user won't be able to see them.
  • The blue login button doesn't pass contrast requirements so that'll need to be black.

image

@jeff-phillips-18
Copy link
Collaborator

jeff-phillips-18 commented Mar 13, 2025

@Misjohns Sorry, the username/password is only necessary in dev mode. I should have given the latest from non-dev mode:

image

@vishnoianil
Copy link
Member

  • The blue login button doesn't pass contrast requirements so that'll need to be black.

@Misjohns We have 3 modes that we support.

  • Github mode (ui.instructlab/qa.ui.instructlab) - That only supports github login.
  • Native model - It only supports username/password because github login is not required there, given that everything is contributed locally.
  • Dev Mode - That mode is only for developer to test both of these modes, and that's where they can use username/password or github login both, but that's only for developer. I am thinking of getting rid of this page, because dev's can use the respective login page of these modes and doesn't really require this third mode.

Let me know if you need any more details around it.

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.

Add "Create a GitHub account" link on Login screen

4 participants