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

Closes [661] - Customize the google login button #662

Merged
merged 6 commits into from
Sep 3, 2024

Conversation

epixieme
Copy link
Collaborator

@epixieme epixieme commented Sep 2, 2024

Created a custom component called GoogleLogin which uses the google api and CmButton2 for customized google button.
Have applied the component to the LoginPage and SignUpPage components. I have also added a google provided to the App.tsx file.

Closes [#661]

@epixieme epixieme self-assigned this Sep 2, 2024
@epixieme epixieme linked an issue Sep 2, 2024 that may be closed by this pull request
@epixieme epixieme marked this pull request as draft September 2, 2024 16:56
@epixieme epixieme marked this pull request as ready for review September 2, 2024 17:00
@epixieme epixieme requested a review from Svenstar74 September 2, 2024 17:00
@epixieme epixieme merged commit 01b8381 into develop Sep 3, 2024
1 check passed
@epixieme epixieme deleted the 661-customise-the-google-login-button branch September 3, 2024 08:53
Svenstar74 added a commit that referenced this pull request Sep 8, 2024
* pushing changes to logic

* clean up

* update login and sign up screens

* added fetch request

* refactored code to use the useApi hook

* refactored google login to use useLogin hook

* feat: Add cursor pointer to CmButton2 component

* close modals for changing password and email when successful

* finished clean up for google login

* made google login optional so it doesn't affect userb journey

* added devmode

* clean up

* cleaned up

* pushing changes to button

* Bump @tanstack/react-query from 5.51.15 to 5.51.21 (#634)

Bumps [@tanstack/react-query](https://github.com/TanStack/query/tree/HEAD/packages/react-query) from 5.51.15 to 5.51.21.
- [Release notes](https://github.com/TanStack/query/releases)
- [Commits](https://github.com/TanStack/query/commits/v5.51.21/packages/react-query)

---
updated-dependencies:
- dependency-name: "@tanstack/react-query"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump axios from 1.7.2 to 1.7.3 (#633)

Bumps [axios](https://github.com/axios/axios) from 1.7.2 to 1.7.3.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](axios/axios@v1.7.2...v1.7.3)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump @mui/icons-material from 5.16.5 to 5.16.6 (#626)

Bumps [@mui/icons-material](https://github.com/mui/material-ui/tree/HEAD/packages/mui-icons-material) from 5.16.5 to 5.16.6.
- [Release notes](https://github.com/mui/material-ui/releases)
- [Changelog](https://github.com/mui/material-ui/blob/v5.16.6/CHANGELOG.md)
- [Commits](https://github.com/mui/material-ui/commits/v5.16.6/packages/mui-icons-material)

---
updated-dependencies:
- dependency-name: "@mui/icons-material"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump uuid and @types/uuid (#608)

Bumps [uuid](https://github.com/uuidjs/uuid) and [@types/uuid](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/uuid). These dependencies needed to be updated together.

Updates `uuid` from 9.0.1 to 10.0.0
- [Changelog](https://github.com/uuidjs/uuid/blob/main/CHANGELOG.md)
- [Commits](uuidjs/uuid@v9.0.1...v10.0.0)

Updates `@types/uuid` from 9.0.8 to 10.0.0
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/uuid)

---
updated-dependencies:
- dependency-name: uuid
  dependency-type: direct:production
  update-type: version-update:semver-major
- dependency-name: "@types/uuid"
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* 630 refactor google client logic (#636)

* pushing changes to logic

* clean up

* added fetch request

* refactored code to use the useApi hook

* refactored google login to use useLogin hook

* finished clean up for google login

* made google login optional so it doesn't affect userb journey

* added devmode

* clean up

* cleaned up

* pushing changes to button

* chore: Update Google login button text capitalization

---------

Co-authored-by: Svenstar74 <[email protected]>

* pushing changes

* clean up

* cleanup

* google login code in place

* pushing working code ready for refactoring

* clean up credentials

* pushing code so we can test backend

* upgraded to @react-oauth/google so CI works

* cleaned up code

* clean up

* clean up

* clean up

* changed style of button on login page to demonstrate it can be done

* pushing sign up button chnages

* clean up

* small cleanup

* chore: Clean up nginx.config file (#654)

* chore: Add Content-Security-Policy header to nginx.config (#655)

* chore: Update Content-Security-Policy header in nginx.config

* chore: Update Content-Security-Policy header in nginx.config

* chore: Update environment variables for Google OAuth

* chore: Update serverdata.sh to include additional environment variable in index.html

* Remove log statement

* chore: Update Content-Security-Policy header in nginx.config

* Update Content-Security-Policy header in nginx.config

* clean up

* Closes [661] - Customize the google login button (#662)

* Customized the google button

* login form styled

* created custom google login component

* cleaned and refactored

* added devmode

* cleanup

---------

Co-authored-by: Svenstar74 <[email protected]>

* chore: Update Content-Security-Policy header in nginx.config (#664)

* Closes [665] - Create userb google login and sign in (#667)

* feat: Add support for logging in with Google for User B

* adding changes to logic

* Added logic for userb if user does not exist

* feat: Update Google login component for User B journey

* logic implemented for both userb sign in and login

* cleanup

---------

Co-authored-by: Svenstar74 <[email protected]>

* Bump @mui/material from 5.16.5 to 5.16.7 (#642)

Bumps [@mui/material](https://github.com/mui/material-ui/tree/HEAD/packages/mui-material) from 5.16.5 to 5.16.7.
- [Release notes](https://github.com/mui/material-ui/releases)
- [Changelog](https://github.com/mui/material-ui/blob/v5.16.7/CHANGELOG.md)
- [Commits](https://github.com/mui/material-ui/commits/v5.16.7/packages/mui-material)

---
updated-dependencies:
- dependency-name: "@mui/material"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump react-router-dom from 6.25.1 to 6.26.1 (#647)

Bumps [react-router-dom](https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom) from 6.25.1 to 6.26.1.
- [Release notes](https://github.com/remix-run/react-router/releases)
- [Changelog](https://github.com/remix-run/react-router/blob/main/packages/react-router-dom/CHANGELOG.md)
- [Commits](https://github.com/remix-run/react-router/commits/[email protected]/packages/react-router-dom)

---
updated-dependencies:
- dependency-name: react-router-dom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump @sentry/react from 7.118.0 to 8.28.0 (#666)

Bumps [@sentry/react](https://github.com/getsentry/sentry-javascript) from 7.118.0 to 8.28.0.
- [Release notes](https://github.com/getsentry/sentry-javascript/releases)
- [Changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md)
- [Commits](getsentry/sentry-javascript@7.118.0...8.28.0)

---
updated-dependencies:
- dependency-name: "@sentry/react"
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump @sentry/cli from 2.33.0 to 2.35.0 (#669)

Bumps [@sentry/cli](https://github.com/getsentry/sentry-cli) from 2.33.0 to 2.35.0.
- [Release notes](https://github.com/getsentry/sentry-cli/releases)
- [Changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md)
- [Commits](getsentry/sentry-cli@2.33.0...2.35.0)

---
updated-dependencies:
- dependency-name: "@sentry/cli"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump @tanstack/react-query from 5.51.21 to 5.55.0 (#670)

Bumps [@tanstack/react-query](https://github.com/TanStack/query/tree/HEAD/packages/react-query) from 5.51.21 to 5.55.0.
- [Release notes](https://github.com/TanStack/query/releases)
- [Commits](https://github.com/TanStack/query/commits/v5.55.0/packages/react-query)

---
updated-dependencies:
- dependency-name: "@tanstack/react-query"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Kirstie <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
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.

Customise the google login button
2 participants