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/MoleculaTables/MoleculaTable/MoleculaTable.tsx b/lattice/src/App/MoleculaTables/MoleculaTable/MoleculaTable.tsx index 6c09fdf27..141447f1b 100644 --- a/lattice/src/App/MoleculaTables/MoleculaTable/MoleculaTable.tsx +++ b/lattice/src/App/MoleculaTables/MoleculaTable/MoleculaTable.tsx @@ -6,7 +6,6 @@ import Fuse from 'fuse.js'; import Highlighter from 'react-highlight-words'; import Link from '@material-ui/core/Link'; import map from 'lodash/map'; -import moment from 'moment'; import OrderBy from 'lodash/orderBy'; import Table from '@material-ui/core/Table'; import TableBody from '@material-ui/core/TableBody'; @@ -131,14 +130,14 @@ export const MoleculaTable: FC = ({ onSortClick('name')} > Name{' '} @@ -151,7 +150,7 @@ export const MoleculaTable: FC = ({ {filteredFields .slice(sliceStart, sliceStart + resultsPerPage) .map((field) => { - const { name, options, cardinality } = field; + const { name, options } = field; const { type, keys, bitDepth, ...rest } = options; const showKeys = ['set', 'time', 'mutex'].includes(type); 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/shared/Header/Header.tsx b/lattice/src/shared/Header/Header.tsx index b32e72e63..ba255567b 100644 --- a/lattice/src/shared/Header/Header.tsx +++ b/lattice/src/shared/Header/Header.tsx @@ -1,6 +1,6 @@ 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 { 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"; @@ -32,8 +32,8 @@ export const Header: FC = ({ onToggleTheme }) => {
- {!isDark && } - {isDark && } + {!isDark && } + {isDark && }
diff --git a/lattice/yarn.lock b/lattice/yarn.lock index 914b40f4b..a25d7845f 100644 --- a/lattice/yarn.lock +++ b/lattice/yarn.lock @@ -2480,12 +2480,12 @@ dependencies: "@types/react" "*" -"@types/react-dom@^16.9.8": - version "16.9.8" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.8.tgz#fe4c1e11dfc67155733dfa6aa65108b4971cb423" - integrity sha512-ykkPQ+5nFknnlU6lDd947WbQ6TE3NNzbQAkInC2EKY1qeYdTKp7onFusmYZb+ityzx2YviqT6BXSu+LyWWJwcA== +"@types/react-dom@^17.0.0": + version "17.0.18" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.18.tgz#8f7af38f5d9b42f79162eea7492e5a1caff70dc2" + integrity sha512-rLVtIfbwyur2iFKykP2w0pl/1unw26b5td16d5xMgp7/yjTHomkyxPYChFoCr/FtEX1lN9wY6lFj1qvKdS5kDw== dependencies: - "@types/react" "*" + "@types/react" "^17" "@types/react-router-dom@^5.1.5": version "5.1.5" @@ -2511,13 +2511,14 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@^16.9.41": - version "16.9.41" - resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.41.tgz#925137ee4d2ff406a0ecf29e8e9237390844002e" - integrity sha512-6cFei7F7L4wwuM+IND/Q2cV1koQUvJ8iSV+Gwn0c3kvABZ691g7sp3hfEQHOUBJtccl1gPi+EyNjMIl9nGA0ug== +"@types/react@*", "@types/react@^17", "@types/react@^17.0.0": + version "17.0.52" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.52.tgz#10d8b907b5c563ac014a541f289ae8eaa9bf2e9b" + integrity sha512-vwk8QqVODi0VaZZpDXQCmEmiOuyjEFPY7Ttaw5vjM112LOq37yz1CDJGrRJwA1fYEq4Iitd5rnjd1yWAc/bT+A== dependencies: "@types/prop-types" "*" - csstype "^2.2.0" + "@types/scheduler" "*" + csstype "^3.0.2" "@types/resolve@0.0.8": version "0.0.8" @@ -2526,6 +2527,11 @@ dependencies: "@types/node" "*" +"@types/scheduler@*": + version "0.16.2" + resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" + integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew== + "@types/source-list-map@*": version "0.1.2" resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9" @@ -4773,7 +4779,7 @@ cssstyle@^2.2.0: dependencies: cssom "~0.3.6" -csstype@^2.2.0, csstype@^2.5.2, csstype@^2.6.5, csstype@^2.6.7: +csstype@^2.5.2, csstype@^2.6.5, csstype@^2.6.7: version "2.6.11" resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.11.tgz#452f4d024149ecf260a852b025e36562a253ffc5" integrity sha512-l8YyEC9NBkSm783PFTvh0FmJy7s5pFKrDp49ZL7zBGX3fWkO+N4EEyan1qqp8cwPLDcD0OSdyY6hAMoxp34JFw== @@ -4783,6 +4789,11 @@ csstype@^2.5.5: resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.13.tgz#a6893015b90e84dd6e85d0e3b442a1e84f2dbe0f" integrity sha512-ul26pfSQTZW8dcOnD2iiJssfXw0gdNVX9IJDH/X3K5DGPfj+fUYe3kB+swUY6BF3oZDxaID3AJt+9/ojSAE05A== +csstype@^3.0.2: + version "3.1.1" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.1.tgz#841b532c45c758ee546a11d5bd7b7b473c8c30b9" + integrity sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw== + currently-unhandled@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea" @@ -8504,7 +8515,7 @@ lodash@^4.0.0, lodash@~4.17.10: resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b" integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ== -lodash@^4.17.19: +lodash@^4.17.19, lodash@^4.17.21: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==