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.

Sign up for GitHub

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

Jump to bottom

Demo opentrons ai #15186

Closed
wants to merge 20 commits into from
Closed

Demo opentrons ai #15186

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
bcde2a3
feat(opentrons-ai-client): add auth0 package
koji May 9, 2024
81435a3
Merge branch 'edge' into feat_add-auth0-provider
koji May 10, 2024
7d4aa5a
add useAuth0 hook
koji May 10, 2024
5268be1
update test for useAuth0
koji May 10, 2024
be4f18a
Update App.test.tsx
koji May 10, 2024
9282701
add loading
koji May 10, 2024
3e04f05
fix test errors
koji May 13, 2024
c98fe92
remove any from test
koji May 13, 2024
70eab36
add a test for logout function
koji May 13, 2024
3541320
fix(opentrons-ai-client): fix ChatContainer layout issue
koji May 14, 2024
10dff35
add loginWithRedirect
koji May 14, 2024
95cab2c
remove unused link
koji May 14, 2024
d48583e
centralize the link button
koji May 14, 2024
0543ee9
Update App.tsx
koji May 14, 2024
21eb39b
update loading component
koji May 14, 2024
db8bd8c
Merge branch 'edge' into feat_add-auth0-provider
koji May 14, 2024
4db6477
add getAccessTokenWithPopup
koji May 15, 2024
0c560d1
update type to align with the be return type
koji May 15, 2024
871e0ec
switch back markdown of div
koji May 15, 2024
e850baa
Merge branch 'fix_ChatCointainer-layout-issue' into demo-opentrons-ai
koji May 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
feat(opentrons-ai-client): add auth0 package 
add auth0 package

close AUTH-
  • Loading branch information
@koji
koji committed May 9, 2024
commit bcde2a38ade8ad304780d655e700ca34858f6856
1 change: 1 addition & 0 deletions opentrons-ai-client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
},
"homepage": "https://github.com/Opentrons/opentrons",
"dependencies": {
"@auth0/auth0-react": "2.2.4",
"@fontsource/public-sans": "5.0.3",
"@opentrons/components": "link:../components",
"axios": "^0.21.1",
Expand Down
17 changes: 13 additions & 4 deletions opentrons-ai-client/src/main.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React from 'react'
import ReactDOM from 'react-dom/client'
import { I18nextProvider } from 'react-i18next'
import { GlobalStyle } from './atoms/GlobalStyle'
import { Auth0Provider } from '@auth0/auth0-react'

import { i18n } from './i18n'
import { App } from './App'
Expand All @@ -10,10 +11,18 @@ const rootElement = document.getElementById('root')
if (rootElement != null) {
ReactDOM.createRoot(rootElement).render(
<React.StrictMode>
<GlobalStyle />
<I18nextProvider i18n={i18n}>
<App />
</I18nextProvider>
<Auth0Provider
domain="identity.auth-dev.opentrons.com"
clientId="PcuD1wEutfijyglNeRBi41oxsKJ1HtKw"
authorizationParams={{
redirect_uri: window.location.origin,
}}
>
<GlobalStyle />
<I18nextProvider i18n={i18n}>
<App />
</I18nextProvider>
</Auth0Provider>
</React.StrictMode>
)
} else {
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"step-generation",
"api-client",
"react-api-client",
"usb-bridge/node-client"
"usb-bridge/node-client",
"opentrons-ai-client"
]
},
"config": {
Expand Down Expand Up @@ -105,7 +106,6 @@
"handlebars-loader": "^1.7.1",
"html-webpack-plugin": "^3.2.0",
"identity-obj-proxy": "^3.0.0",
"jotai": "2.8.0",
"jsdom": "^16.4.0",
"lost": "^8.3.1",
"madge": "^3.6.0",
Expand Down
12 changes: 12 additions & 0 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,18 @@
"@jridgewell/gen-mapping" "^0.3.5"
"@jridgewell/trace-mapping" "^0.3.24"

"@auth0/[email protected]":
version "2.2.4"
resolved "https://registry.yarnpkg.com/@auth0/auth0-react/-/auth0-react-2.2.4.tgz#7f21751a219d4e0e019141819f00e76e436176dd"
integrity sha512-l29PQC0WdgkCoOc6WeMAY26gsy/yXJICW0jHfj0nz8rZZphYKrLNqTRWFFCMJY+sagza9tSgB1kG/UvQYgGh9A==
dependencies:
"@auth0/auth0-spa-js" "^2.1.3"

"@auth0/auth0-spa-js@^2.1.3":
version "2.1.3"
resolved "https://registry.yarnpkg.com/@auth0/auth0-spa-js/-/auth0-spa-js-2.1.3.tgz#aabf6f439e41edbeef0cf4766ad754e5b47616e5"
integrity sha512-NMTBNuuG4g3rame1aCnNS5qFYIzsTUV5qTFPRfTyYFS1feS6jsCBR+eTq9YkxCp1yuoM2UIcjunPaoPl77U9xQ==

"@aw-web-design/[email protected]":
version "1.4.126"
resolved "https://registry.yarnpkg.com/@aw-web-design/x-default-browser/-/x-default-browser-1.4.126.tgz#43e4bd8f0314ed907a8718d7e862a203af79bc16"
Expand Down
Loading