From b859be98e76faa84feda9135b2165b512a42d700 Mon Sep 17 00:00:00 2001 From: Chris Thompson Date: Fri, 30 Jun 2023 16:50:12 -0700 Subject: [PATCH 1/6] Multi-db banner notice --- .../List/ExtensionsCallout.module.scss | 11 +++++-- src/components/Firestore/index.tsx | 33 +++++++++++++++++++ src/components/common/Callout.scss | 2 +- 3 files changed, 43 insertions(+), 3 deletions(-) diff --git a/src/components/Extensions/List/ExtensionsCallout.module.scss b/src/components/Extensions/List/ExtensionsCallout.module.scss index 240da7a17..81ad25e8d 100644 --- a/src/components/Extensions/List/ExtensionsCallout.module.scss +++ b/src/components/Extensions/List/ExtensionsCallout.module.scss @@ -13,12 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - .callout { margin-bottom: 32px; } +.Extensions { + .Callout-message { + .Callout-icon { + color: var(--mdc-theme-primary); + } + } +} + .link { --mdc-theme-on-primary: var(--mdc-theme-primary); white-space: nowrap; -} +} \ No newline at end of file diff --git a/src/components/Firestore/index.tsx b/src/components/Firestore/index.tsx index db54bf04c..89dccb52e 100644 --- a/src/components/Firestore/index.tsx +++ b/src/components/Firestore/index.tsx @@ -21,6 +21,7 @@ import { Card } from '@rmwc/card'; import { Elevation } from '@rmwc/elevation'; import { GridCell } from '@rmwc/grid'; import { Tab, TabBar } from '@rmwc/tabs'; +import { Typography } from '@rmwc/typography'; import React, { Suspense, useState } from 'react'; import { Link, @@ -33,9 +34,11 @@ import { } from 'react-router-dom'; import { CustomThemeProvider } from '../../themes'; +import { Callout } from '../common/Callout'; import { useIsEmulatorDisabled } from '../common/EmulatorConfigProvider'; import { EmulatorDisabled } from '../common/EmulatorDisabled'; import { InteractiveBreadCrumbBar } from '../common/InteractiveBreadCrumbBar'; +import { DocsLink } from '../common/links/DocsLink'; import { Spinner } from '../common/Spinner'; import { promptClearAll } from './dialogs/clearAll'; import { Root } from './Document'; @@ -128,10 +131,40 @@ export const Firestore: React.FC> = React.memo( } } + function getButton() { + return ( + <> + + + ); + } + return isRefreshing ? ( ) : ( + + + + + Learn more about named databases and Firebase here + + + + } + > + The Emulator Suite UI only supports the (default) database right + now. + +
diff --git a/src/components/common/Callout.scss b/src/components/common/Callout.scss index ae4941b3d..7e154af4f 100644 --- a/src/components/common/Callout.scss +++ b/src/components/common/Callout.scss @@ -32,7 +32,7 @@ display: flex; align-items: stretch; .Callout-icon { - color: white; + color: var(--mdc-theme-text-primary-on-background); } } From 7843c217c4727e739563f3e9e29d52105b97129b Mon Sep 17 00:00:00 2001 From: Chris Thompson Date: Fri, 30 Jun 2023 16:58:41 -0700 Subject: [PATCH 2/6] Revert some changes, adjust copy --- .../Extensions/List/ExtensionsCallout.module.scss | 10 +--------- src/components/Firestore/index.tsx | 12 ++---------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/src/components/Extensions/List/ExtensionsCallout.module.scss b/src/components/Extensions/List/ExtensionsCallout.module.scss index 81ad25e8d..4ef26294a 100644 --- a/src/components/Extensions/List/ExtensionsCallout.module.scss +++ b/src/components/Extensions/List/ExtensionsCallout.module.scss @@ -17,15 +17,7 @@ margin-bottom: 32px; } -.Extensions { - .Callout-message { - .Callout-icon { - color: var(--mdc-theme-primary); - } - } -} - .link { --mdc-theme-on-primary: var(--mdc-theme-primary); white-space: nowrap; -} \ No newline at end of file +} diff --git a/src/components/Firestore/index.tsx b/src/components/Firestore/index.tsx index 89dccb52e..214d378ee 100644 --- a/src/components/Firestore/index.tsx +++ b/src/components/Firestore/index.tsx @@ -131,14 +131,6 @@ export const Firestore: React.FC> = React.memo( } } - function getButton() { - return ( - <> - - - ); - } - return isRefreshing ? ( ) : ( @@ -150,12 +142,12 @@ export const Firestore: React.FC> = React.memo( // styles.link in 2 places
- Learn more about named databases and Firebase here + Learn more about named databases and the Firestore emulator here
From a6789ae31e871bb26035c30a5362d83fdee17175 Mon Sep 17 00:00:00 2001 From: Chris Thompson Date: Fri, 30 Jun 2023 16:59:27 -0700 Subject: [PATCH 3/6] Whitespace --- src/components/Extensions/List/ExtensionsCallout.module.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/Extensions/List/ExtensionsCallout.module.scss b/src/components/Extensions/List/ExtensionsCallout.module.scss index 4ef26294a..de84ff48e 100644 --- a/src/components/Extensions/List/ExtensionsCallout.module.scss +++ b/src/components/Extensions/List/ExtensionsCallout.module.scss @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + .callout { margin-bottom: 32px; } From c9b969b703afdf072ba47fe8c2336972c43b320d Mon Sep 17 00:00:00 2001 From: christhompsongoogle <106194718+christhompsongoogle@users.noreply.github.com> Date: Wed, 5 Jul 2023 14:19:04 -0700 Subject: [PATCH 4/6] Update index.tsx --- src/components/Firestore/index.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/Firestore/index.tsx b/src/components/Firestore/index.tsx index 214d378ee..6d3eb2b1b 100644 --- a/src/components/Firestore/index.tsx +++ b/src/components/Firestore/index.tsx @@ -139,7 +139,6 @@ export const Firestore: React.FC> = React.memo( > = React.memo( rel="noopener noreferrer" > - Learn more about named databases and the Firestore emulator here + Learn more
From 10a8b817b044358a46dfe920ae3b8a0740f5eaa5 Mon Sep 17 00:00:00 2001 From: Chris Thompson Date: Wed, 5 Jul 2023 14:20:25 -0700 Subject: [PATCH 5/6] Comment fix --- src/components/Firestore/index.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/Firestore/index.tsx b/src/components/Firestore/index.tsx index 214d378ee..314168dd9 100644 --- a/src/components/Firestore/index.tsx +++ b/src/components/Firestore/index.tsx @@ -139,7 +139,6 @@ export const Firestore: React.FC> = React.memo( Date: Wed, 5 Jul 2023 14:44:01 -0700 Subject: [PATCH 6/6] Lint --- src/components/Extensions/List/ExtensionsCallout.module.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Extensions/List/ExtensionsCallout.module.scss b/src/components/Extensions/List/ExtensionsCallout.module.scss index de84ff48e..240da7a17 100644 --- a/src/components/Extensions/List/ExtensionsCallout.module.scss +++ b/src/components/Extensions/List/ExtensionsCallout.module.scss @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - + .callout { margin-bottom: 32px; }