diff --git a/backend/oauth_login.json b/backend/oauth_login.json index 0d43a50d72..6d4b1142c7 100644 --- a/backend/oauth_login.json +++ b/backend/oauth_login.json @@ -12,5 +12,12 @@ "scopes": [ "read_user" ] + }, + "google": { + "auth_url": "https://accounts.google.com/o/oauth2/v2/auth", + "token_url": "https://oauth2.googleapis.com/token", + "scopes": [ + "https://www.googleapis.com/auth/userinfo.email" + ] } } diff --git a/frontend/src/app.css b/frontend/src/app.css index 72af153fe1..b3ad3ab8eb 100644 --- a/frontend/src/app.css +++ b/frontend/src/app.css @@ -55,6 +55,21 @@ @apply font-mono; } + .item-button { + @apply py-1; + @apply border border-gray-300; + @apply rounded-sm; + } + .item-button:hover { + @apply border border-gray-800 bg-gray-100 border-opacity-50; + } + .item-button-selected { + @apply py-1; + @apply border border-blue-500; + @apply bg-blue-50; + @apply rounded-sm; + } + .default-button { /*this styling does not impact the Dropdown component */ @apply bg-blue-500; diff --git a/frontend/src/lib/components/AppConnect.svelte b/frontend/src/lib/components/AppConnect.svelte index cd9508cf78..814de3edf7 100644 --- a/frontend/src/lib/components/AppConnect.svelte +++ b/frontend/src/lib/components/AppConnect.svelte @@ -139,16 +139,6 @@ } const dispatch = createEventDispatcher() - - $: { - if ($workspaceStore) { - loadResources() - } - } - - onMount(() => { - loadConnects() - }) { dispatch('close') }} + on:open={() => { + loadConnects() + loadResources() + }} > -
Connect an app
+
Connect an App
{#if step == 1}
- {#each Object.entries(connects) as [key, values]} + {#each Object.entries(connects).sort((a, b) => a[0].localeCompare(b[0])) as [key, values]}
diff --git a/frontend/src/lib/components/icons/AirtableIcon.svelte b/frontend/src/lib/components/icons/AirtableIcon.svelte new file mode 100644 index 0000000000..0b99330aeb --- /dev/null +++ b/frontend/src/lib/components/icons/AirtableIcon.svelte @@ -0,0 +1,18 @@ + + + + diff --git a/frontend/src/lib/components/icons/GCloudIcon.svelte b/frontend/src/lib/components/icons/GCloudIcon.svelte new file mode 100644 index 0000000000..99ba34d602 --- /dev/null +++ b/frontend/src/lib/components/icons/GCloudIcon.svelte @@ -0,0 +1,17 @@ + + + diff --git a/frontend/src/lib/components/icons/GItlabIcon.svelte b/frontend/src/lib/components/icons/GItlabIcon.svelte new file mode 100644 index 0000000000..4940172e45 --- /dev/null +++ b/frontend/src/lib/components/icons/GItlabIcon.svelte @@ -0,0 +1,17 @@ + + + diff --git a/frontend/src/lib/components/icons/GSheetsIcon.svelte b/frontend/src/lib/components/icons/GSheetsIcon.svelte new file mode 100644 index 0000000000..102e37fe7f --- /dev/null +++ b/frontend/src/lib/components/icons/GSheetsIcon.svelte @@ -0,0 +1,17 @@ + + + diff --git a/frontend/src/lib/components/icons/GcalIcon.svelte b/frontend/src/lib/components/icons/GcalIcon.svelte new file mode 100644 index 0000000000..922394ffec --- /dev/null +++ b/frontend/src/lib/components/icons/GcalIcon.svelte @@ -0,0 +1,17 @@ + + + diff --git a/frontend/src/lib/components/icons/GdriveIcon.svelte b/frontend/src/lib/components/icons/GdriveIcon.svelte new file mode 100644 index 0000000000..3b08837598 --- /dev/null +++ b/frontend/src/lib/components/icons/GdriveIcon.svelte @@ -0,0 +1,17 @@ + + + diff --git a/frontend/src/lib/components/icons/GmailIcon.svelte b/frontend/src/lib/components/icons/GmailIcon.svelte new file mode 100644 index 0000000000..e1e93e1580 --- /dev/null +++ b/frontend/src/lib/components/icons/GmailIcon.svelte @@ -0,0 +1,17 @@ + + + diff --git a/frontend/src/lib/components/icons/PostgresIcon.svelte b/frontend/src/lib/components/icons/PostgresIcon.svelte index 3823a30bb4..4456289fef 100644 --- a/frontend/src/lib/components/icons/PostgresIcon.svelte +++ b/frontend/src/lib/components/icons/PostgresIcon.svelte @@ -4,55 +4,14 @@ - - - - - - - - - - - - - - - - diff --git a/frontend/src/lib/components/icons/Slack.svelte b/frontend/src/lib/components/icons/Slack.svelte index 3e97b7cada..fdda70bb6b 100644 --- a/frontend/src/lib/components/icons/Slack.svelte +++ b/frontend/src/lib/components/icons/Slack.svelte @@ -4,24 +4,15 @@ + diff --git a/frontend/src/routes/resources.svelte b/frontend/src/routes/resources.svelte index a87bad0c28..ff9de97aa8 100644 --- a/frontend/src/routes/resources.svelte +++ b/frontend/src/routes/resources.svelte @@ -181,7 +181,7 @@ >
- + {#if is_oauth} @@ -269,7 +269,7 @@ resourceViewerSchema = schema typeModalMode = 'view-type' resourceViewer.openModal() - }}>