diff --git a/lattice/public/favicon.ico b/lattice/public/favicon.ico old mode 100755 new mode 100644 index 2fc5595e1..7e53bed5e Binary files a/lattice/public/favicon.ico and b/lattice/public/favicon.ico differ diff --git a/lattice/public/favicon.png b/lattice/public/favicon.png index fca3ac8c0..8b26a3857 100644 Binary files a/lattice/public/favicon.png and b/lattice/public/favicon.png differ diff --git a/lattice/public/favicon.svg b/lattice/public/favicon.svg deleted file mode 100644 index c8f396a21..000000000 --- a/lattice/public/favicon.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - diff --git a/lattice/public/index.html b/lattice/public/index.html index 5a7acad02..32bbaaeb7 100644 --- a/lattice/public/index.html +++ b/lattice/public/index.html @@ -2,7 +2,6 @@ - - Molecula + FeatureBase diff --git a/lattice/public/manifest.json b/lattice/public/manifest.json index 1a608464d..9f1632193 100644 --- a/lattice/public/manifest.json +++ b/lattice/public/manifest.json @@ -1,6 +1,6 @@ { - "short_name": "Molecula", - "name": "Molecula Demo App", + "short_name": "FeatureBase", + "name": "FeatureBase Demo App", "icons": [ { "src": "favicon.ico", diff --git a/lattice/src/App/AuthFlow/AuthFlow.module.scss b/lattice/src/App/AuthFlow/AuthFlow.module.scss index 5ac275622..2ce23015e 100644 --- a/lattice/src/App/AuthFlow/AuthFlow.module.scss +++ b/lattice/src/App/AuthFlow/AuthFlow.module.scss @@ -16,7 +16,7 @@ } .logo { - height: 85px; + height: 50px; margin: 16px; } diff --git a/lattice/src/App/AuthFlow/Signin.tsx b/lattice/src/App/AuthFlow/Signin.tsx index 4a5bb8ce2..66e863900 100644 --- a/lattice/src/App/AuthFlow/Signin.tsx +++ b/lattice/src/App/AuthFlow/Signin.tsx @@ -2,7 +2,7 @@ import Card from '@material-ui/core/Card'; import CardContent from '@material-ui/core/CardContent'; import CardHeader from '@material-ui/core/CardHeader'; -import { ReactComponent as MLogo } from 'assets/m-bug-alt.svg'; +import { ReactComponent as FeatureBaseIcon } from 'assets/featurebase-icon.svg'; import css from './AuthFlow.module.scss'; import SignInButton from './SignInButton'; @@ -20,7 +20,7 @@ function Signin(props) {
- +
{renderLoginForm()}
diff --git a/lattice/src/App/Home/ClusterHealth/Metrics/Metrics.tsx b/lattice/src/App/Home/ClusterHealth/Metrics/Metrics.tsx index e2d3a5229..40df99384 100644 --- a/lattice/src/App/Home/ClusterHealth/Metrics/Metrics.tsx +++ b/lattice/src/App/Home/ClusterHealth/Metrics/Metrics.tsx @@ -239,7 +239,7 @@ export const Metrics: FC = ({ open, node, onClose }) => {
- Molecula provides metrics for use with Prometheus. Instantaneous + FeatureBase provides metrics for use with Prometheus. Instantaneous metrics are shown here for convenience; to take full advantage of this feature, consider using a Prometheus instance, perhaps with a{' '} ( Try FeatureBase Cloud at - - app.molecula.cloud + + cloud.featurebase.com diff --git a/lattice/src/App/QueryBuilder/QueryBuilderContainer.tsx b/lattice/src/App/QueryBuilder/QueryBuilderContainer.tsx index 3f7afb292..a2dacce41 100644 --- a/lattice/src/App/QueryBuilder/QueryBuilderContainer.tsx +++ b/lattice/src/App/QueryBuilder/QueryBuilderContainer.tsx @@ -113,7 +113,7 @@ export const QueryBuilderContainer = () => { type: 'text/plain;charset=utf-8', }); element.href = URL.createObjectURL(file); - element.download = `molecula-${results?.index}-${dateTime}.csv`; + element.download = `featurebase-${results?.index}-${dateTime}.csv`; document.body.appendChild(element); element.click(); exportRows = []; diff --git a/lattice/src/assets/darkTheme/MoleculaBug.svg b/lattice/src/assets/darkTheme/MoleculaBug.svg deleted file mode 100644 index b52c8e27d..000000000 --- a/lattice/src/assets/darkTheme/MoleculaBug.svg +++ /dev/null @@ -1 +0,0 @@ -MoleculaBug diff --git a/lattice/src/assets/darkTheme/MoleculaLogo.svg b/lattice/src/assets/darkTheme/MoleculaLogo.svg deleted file mode 100644 index ae3bdaac0..000000000 --- a/lattice/src/assets/darkTheme/MoleculaLogo.svg +++ /dev/null @@ -1 +0,0 @@ -Molecula Logo diff --git a/lattice/src/assets/darkTheme/featurebase-logo.svg b/lattice/src/assets/darkTheme/featurebase-logo.svg new file mode 100644 index 000000000..0f388dd15 --- /dev/null +++ b/lattice/src/assets/darkTheme/featurebase-logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/lattice/src/assets/featurebase-icon.svg b/lattice/src/assets/featurebase-icon.svg new file mode 100644 index 000000000..6510e5e7e --- /dev/null +++ b/lattice/src/assets/featurebase-icon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/lattice/src/assets/lightTheme/MoleculaBug.svg b/lattice/src/assets/lightTheme/MoleculaBug.svg deleted file mode 100644 index e37ef93b4..000000000 --- a/lattice/src/assets/lightTheme/MoleculaBug.svg +++ /dev/null @@ -1 +0,0 @@ -MoleculaBug diff --git a/lattice/src/assets/lightTheme/MoleculaLogo.svg b/lattice/src/assets/lightTheme/MoleculaLogo.svg deleted file mode 100644 index 0a5159864..000000000 --- a/lattice/src/assets/lightTheme/MoleculaLogo.svg +++ /dev/null @@ -1 +0,0 @@ -Molecula Logo diff --git a/lattice/src/assets/lightTheme/featurebase-logo.svg b/lattice/src/assets/lightTheme/featurebase-logo.svg new file mode 100644 index 000000000..1d5da210c --- /dev/null +++ b/lattice/src/assets/lightTheme/featurebase-logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/lattice/src/assets/m-bug-alt.svg b/lattice/src/assets/m-bug-alt.svg deleted file mode 100644 index a0cc81bc1..000000000 --- a/lattice/src/assets/m-bug-alt.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/lattice/src/lattice.config.js b/lattice/src/lattice.config.js index 2ab3f6fa3..53b84a536 100644 --- a/lattice/src/lattice.config.js +++ b/lattice/src/lattice.config.js @@ -1,4 +1,4 @@ export const pilosaConfig = { - // hostname: 'localhost', - // httpPort: '10101' + hostname: 'localhost', + httpPort: '10101' }; diff --git a/lattice/src/shared/Header/Header.tsx b/lattice/src/shared/Header/Header.tsx index b32e72e63..e0a609140 100644 --- a/lattice/src/shared/Header/Header.tsx +++ b/lattice/src/shared/Header/Header.tsx @@ -1,17 +1,17 @@ -import SignOutButton from "App/AuthFlow/SignOutButton"; -import { ReactComponent as MoleculaLogoDark } from "assets/darkTheme/MoleculaLogo.svg"; -import { ReactComponent as MoleculaLogo } from "assets/lightTheme/MoleculaLogo.svg"; -import { FC } from "react"; -import { Link } from "react-router-dom"; -import { useAuth } from "services/useAuth"; -import { ThemeToggle } from "shared/ThemeToggle"; +import SignOutButton from 'App/AuthFlow/SignOutButton'; +import { ReactComponent as FeatureBaseLogoDark } from 'assets/darkTheme/featurebase-logo.svg'; +import { ReactComponent as FeatureBaseLogo } from 'assets/lightTheme/featurebase-logo.svg'; +import { FC } from 'react'; +import { Link } from 'react-router-dom'; +import { useAuth } from 'services/useAuth'; +import { ThemeToggle } from 'shared/ThemeToggle'; -import AppBar from "@material-ui/core/AppBar"; -import Button from "@material-ui/core/Button"; -import { useTheme } from "@material-ui/core/styles"; -import Toolbar from "@material-ui/core/Toolbar"; +import AppBar from '@material-ui/core/AppBar'; +import Button from '@material-ui/core/Button'; +import { useTheme } from '@material-ui/core/styles'; +import Toolbar from '@material-ui/core/Toolbar'; -import css from "./Header.module.scss"; +import css from './Header.module.scss'; type HeaderProps = { onToggleTheme: () => void; @@ -19,7 +19,7 @@ type HeaderProps = { export const Header: FC = ({ onToggleTheme }) => { const theme = useTheme(); - const isDark = theme.palette.type === "dark"; + const isDark = theme.palette.type === 'dark'; const auth = useAuth(); return ( @@ -32,8 +32,8 @@ export const Header: FC = ({ onToggleTheme }) => {
- {!isDark && } - {isDark && } + {!isDark && } + {isDark && }
@@ -50,8 +50,8 @@ export const Header: FC = ({ onToggleTheme }) => { {auth.user && (