diff --git a/README.md b/README.md index 6bd37db05..428fbf930 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@ -# talk ![CircleCI](https://img.shields.io/circleci/project/github/coralproject/talk/next.svg) +# Coral ![CircleCI](https://img.shields.io/circleci/project/github/coralproject/talk/next.svg) -Online comments are broken. Our open-source commenting platform, Talk, rethinks +Online comments are broken. Our open-source commenting platform, Coral, rethinks how moderation, comment display, and conversation function, creating the opportunity for safer, smarter discussions around your work. -[Read more about Talk here](https://coralproject.net/talk). +[Read more about Coral here](https://coralproject.net/talk). Built with <3 by The Coral Project, a part of [Vox Media](https://product.voxmedia.com/). -Preview Talk easily by running Talk via a Heroku App: +Preview Coral easily by running Coral via a Heroku App: [![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/coralproject/talk/tree/next) @@ -36,7 +36,7 @@ Preview Talk easily by running Talk via a Heroku App: ## Running -You can install Talk using Docker or via Source. We recommend Docker, as it +You can install Coral using Docker or via Source. We recommend Docker, as it provides the easiest deployment solution going forward, as all the dependencies are baked and shipped with the provided [coralproject/talk:next](https://hub.docker.com/r/coralproject/talk) image. @@ -45,7 +45,7 @@ When v5 releases to master, you'll be able to select it using ### Docker -The easiest way to get started with Talk is through our published Docker image +The easiest way to get started with Coral is through our published Docker image and provided example `docker-compose.yml` file. The following assumes that you have Docker and Docker Compose installed on your local machine: @@ -69,7 +69,7 @@ services: - mongo - redis environment: - - MONGODB_URI=mongodb://mongo:27017/talk + - MONGODB_URI=mongodb://mongo:27017/coral - REDIS_URI=redis://redis:6379 - SIGNING_SECRET= mongo: @@ -82,19 +82,19 @@ services: - ./data/redis:/data EOF -# Start up Talk using Docker. +# Start up Coral using Docker. docker-compose up -d ``` -Then head on over to http://localhost:3000 to install Talk! +Then head on over to http://localhost:3000 to install Coral! ### Source -Talk requires NodeJS >=10, we recommend using `nvm` to help manage node +Coral requires NodeJS >=10, we recommend using `nvm` to help manage node versions: https://github.com/creationix/nvm. ```bash -# Clone and cd into the Talk directory. +# Clone and cd into the Coral directory. git clone https://github.com/coralproject/talk.git cd talk @@ -108,7 +108,7 @@ npm run build This should output all the compiled application code to `./dist`. -Running Talk with default settings assumes that you have: +Running Coral with default settings assumes that you have: - MongoDB >=3.6 running on `127.0.0.1:27017` - Redis >=3.2 running on `127.0.0.1:6379` @@ -121,25 +121,25 @@ docker run -d -p 27017:27017 --restart always --name mongo mongo:3.6 docker run -d -p 6379:6379 --restart always --name redis redis:3.2 ``` -Then start Talk with: +Then start Coral with: ```bash # Start the server in production mode. npm run start ``` -Then head on over to http://localhost:3000 to install Talk! +Then head on over to http://localhost:3000 to install Coral! ### Development -Running Talk for development is very similar to installing Talk via Source as +Running Coral for development is very similar to installing Coral via Source as described above. -Talk requires NodeJS >=10, we recommend using `nvm` to help manage node +Coral requires NodeJS >=10, we recommend using `nvm` to help manage node versions: https://github.com/creationix/nvm. ```bash -# Clone and cd into the Talk directory. +# Clone and cd into the Coral directory. git clone https://github.com/coralproject/talk.git cd talk @@ -147,7 +147,7 @@ cd talk npm install ``` -Running Talk with default settings assumes that you have: +Running Coral with default settings assumes that you have: - MongoDB >=3.6 running on `127.0.0.1:27017` - Redis >=3.2 running on `127.0.0.1:6379` @@ -160,7 +160,7 @@ docker run -d -p 27017:27017 --restart always --name mongo mongo:3.6 docker run -d -p 6379:6379 --restart always --name redis redis:3.2 ``` -Then start Talk with: +Then start Coral with: ```bash # Run the server in development mode in order to facilitate auto-restarting and @@ -192,7 +192,7 @@ which provides a test SMTP server that can visualize emails in the browser: docker run -d --name inbucket -p 2500:2500 -p 9000:9000 inbucket/inbucket ``` -You can then configure the email server on Talk by updating the Tenant with: +You can then configure the email server on Coral by updating the Tenant with: ```js { @@ -206,7 +206,7 @@ You can then configure the email server on Talk by updating the Tenant with: } ``` -Restarting Talk will be needed. Navigate to http://localhost:9000, click the +Restarting Coral will be needed. Navigate to http://localhost:9000, click the "Monitor" tab. New emails received on this screen. #### Design Language System (UI Components) @@ -226,7 +226,7 @@ After compilation has finished you can access docz at http://localhost:3030/. ## Configuration -The following environment variables can be set to configure the Talk Server. You +The following environment variables can be set to configure the Coral Server. You can expose them in your shell via `export NODE_ENV=development` or by placing the variables in a `.env` file in the root of the project in a simple `NODE_ENV=development` format delimited by newlines. @@ -236,7 +236,7 @@ the variables in a `.env` file in the root of the project in a simple `npm run start` and `development` when run with `npm run start:development`. - `PORT` - The port to listen for HTTP and Websocket requests. (Default `3000`) - `MONGODB_URI` - The MongoDB database URI to connect to. - (Default `mongodb://127.0.0.1:27017/talk`) + (Default `mongodb://127.0.0.1:27017/coral`) - `REDIS_URI` - The Redis database URI to connect to. (Default `redis://127.0.0.1:6379`) - `SIGNING_SECRET` - The shared secret to use to sign JSON Web Tokens (JWT) with @@ -247,14 +247,14 @@ the variables in a `.env` file in the root of the project in a simple - `LOGGING_LEVEL` - The logging level that can be set to one of `fatal`, `error`, `warn`, `info`, `debug`, or `trace`. (Default `info`) - `STATIC_URI` - The URI that static assets can be accessed from. This URI can - be to a proxy that uses this Talk server on `PORT` as the upstream. Disabled + be to a proxy that uses this Coral server on `PORT` as the upstream. Disabled by default. - `DISABLE_TENANT_CACHING` - When `true`, all tenants will be loaded from the database when needed rather than keeping a in-memory copy in sync via published events on Redis. (Default `false`) -- `DISABLE_MONGODB_AUTOINDEXING` - When `true`, Talk will not perform indexing +- `DISABLE_MONGODB_AUTOINDEXING` - When `true`, Coral will not perform indexing operations when it starts up. This can be desired when you've already - installed Talk on the target MongoDB, but want to improve start performance. + installed Coral on the target MongoDB, but want to improve start performance. (Default `false`) - `LOCALE` - Specify the default locale to use for all requests without a locale specified. (Default `en-US`) @@ -273,4 +273,4 @@ the variables in a `.env` file in the root of the project in a simple ## License -Talk is released under the [Apache License, v2.0](/LICENSE). +Coral is released under the [Apache License, v2.0](/LICENSE). diff --git a/app.json b/app.json index 6ba40488a..9dac82a91 100644 --- a/app.json +++ b/app.json @@ -1,5 +1,5 @@ { - "name": "Talk", + "name": "Coral", "description": "A better commenting experience from Vox Media.", "env": { "REWRITE_ENV": { @@ -7,8 +7,7 @@ "value": "REDIS_URI:REDIS_URL,MONGODB_URI:MONGO_URI" }, "SIGNING_SECRET": { - "description": - "The shared secret to use to sign JSON Web Tokens (JWT) with the selected signing algorithm.", + "description": "The shared secret to use to sign JSON Web Tokens (JWT) with the selected signing algorithm.", "generator": "secret" }, "CONCURRENCY": { @@ -16,8 +15,7 @@ "value": "1" }, "LOCALE": { - "description": - "Specify the default locale to use for all requests without a locale specified", + "description": "Specify the default locale to use for all requests without a locale specified", "value": "en-US" }, "ENABLE_GRAPHIQL": { diff --git a/config/jest/client.config.js b/config/jest/client.config.js index 0611df4c1..0dbc517c2 100644 --- a/config/jest/client.config.js +++ b/config/jest/client.config.js @@ -27,13 +27,13 @@ module.exports = { "[/\\\\]node_modules[/\\\\](?!(fluent|react-relay-network-modern)[/\\\\]).+\\.(js|jsx|mjs|ts|tsx)$", ], moduleNameMapper: { - "^talk-account/(.*)$": "/src/core/client/account/$1", - "^talk-admin/(.*)$": "/src/core/client/admin/$1", - "^talk-auth/(.*)$": "/src/core/client/auth/$1", - "^talk-ui/(.*)$": "/src/core/client/ui/$1", - "^talk-stream/(.*)$": "/src/core/client/stream/$1", - "^talk-framework/(.*)$": "/src/core/client/framework/$1", - "^talk-common/(.*)$": "/src/core/common/$1", + "^coral-account/(.*)$": "/src/core/client/account/$1", + "^coral-admin/(.*)$": "/src/core/client/admin/$1", + "^coral-auth/(.*)$": "/src/core/client/auth/$1", + "^coral-ui/(.*)$": "/src/core/client/ui/$1", + "^coral-stream/(.*)$": "/src/core/client/stream/$1", + "^coral-framework/(.*)$": "/src/core/client/framework/$1", + "^coral-common/(.*)$": "/src/core/common/$1", }, moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node", "ftl"], snapshotSerializers: ["enzyme-to-json/serializer"], diff --git a/config/jest/server.config.js b/config/jest/server.config.js index c37b956b2..f871f4106 100644 --- a/config/jest/server.config.js +++ b/config/jest/server.config.js @@ -12,8 +12,8 @@ module.exports = { "^.+\\.tsx?$": "/node_modules/ts-jest", }, moduleNameMapper: { - "^talk-server/(.*)$": "/src/core/server/$1", - "^talk-common/(.*)$": "/src/core/common/$1", + "^coral-server/(.*)$": "/src/core/server/$1", + "^coral-common/(.*)$": "/src/core/common/$1", }, moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node"], globals: { diff --git a/doczrc.js b/doczrc.js index ec1200ff1..45cfc59f8 100644 --- a/doczrc.js +++ b/doczrc.js @@ -19,7 +19,7 @@ const styleLoader = { }; export default { - title: "Talk 5.0", + title: "Coral 5.0", source: "./src", typescript: true, host: process.env.HOST || "0.0.0.0", diff --git a/scripts/generateSchemaTypes.js b/scripts/generateSchemaTypes.js index a40ff6b80..4c3b3b2ba 100644 --- a/scripts/generateSchemaTypes.js +++ b/scripts/generateSchemaTypes.js @@ -18,8 +18,8 @@ async function main() { config: { contextType: "TenantContext", importStatements: [ - 'import TenantContext from "talk-server/graph/tenant/context";', - 'import { Cursor } from "talk-server/models/helpers/connection";', + 'import TenantContext from "coral-server/graph/tenant/context";', + 'import { Cursor } from "coral-server/models/helpers/connection";', ], customScalarType: { Cursor: "Cursor", Time: "Date" }, }, diff --git a/scripts/start.ts b/scripts/start.ts index 57942e962..78e0a5742 100644 --- a/scripts/start.ts +++ b/scripts/start.ts @@ -66,7 +66,7 @@ const devSocket = { const compiler = createCompiler({ webpack, config: webpackConfig, - appName: "Talk", + appName: "Coral", urls, // useTypeScript: true, /* This is currently not working, as the ForkTsCheckerWebpackPlugin hooks are not triggering for some reason */ useTypeScript: false, // This would diff --git a/src/core/build/createWebpackConfig.ts b/src/core/build/createWebpackConfig.ts index 6c92e87b0..8cf2231be 100644 --- a/src/core/build/createWebpackConfig.ts +++ b/src/core/build/createWebpackConfig.ts @@ -14,7 +14,7 @@ import webpack, { Configuration, Plugin } from "webpack"; import WebpackAssetsManifest from "webpack-assets-manifest"; import { BundleAnalyzerPlugin } from "webpack-bundle-analyzer"; -// TODO: import form talk-common/version, for some reason this fails currently. +// TODO: import form coral-common/version, for some reason this fails currently. // Try again when we have a chance to upgrade typescript. import { version } from "../common/version"; import { Config } from "./config"; diff --git a/src/core/client/account/App.tsx b/src/core/client/account/App.tsx index 5d91a0305..4e23f1720 100644 --- a/src/core/client/account/App.tsx +++ b/src/core/client/account/App.tsx @@ -1,10 +1,10 @@ +import TransitionControl from "coral-framework/testHelpers/TransitionControl"; import { BrowserProtocol, queryMiddleware } from "farce"; import { createFarceRouter, ElementsRenderer } from "found"; import { Resolver } from "found-relay"; import React, { FunctionComponent } from "react"; -import TransitionControl from "talk-framework/testHelpers/TransitionControl"; -import { TalkContextConsumer } from "talk-framework/lib/bootstrap/TalkContext"; +import { CoralContextConsumer } from "coral-framework/lib/bootstrap/CoralContext"; import routeConfig from "./routeConfig"; import NotFound from "./routes/NotFound"; @@ -28,11 +28,11 @@ const Router = createFarceRouter({ }); const EntryContainer: FunctionComponent = () => ( - + {({ relayEnvironment }) => ( )} - + ); export default EntryContainer; diff --git a/src/core/client/account/fetches/CheckResetTokenFetch.tsx b/src/core/client/account/fetches/CheckResetTokenFetch.tsx index 514c2c471..934f13f4d 100644 --- a/src/core/client/account/fetches/CheckResetTokenFetch.tsx +++ b/src/core/client/account/fetches/CheckResetTokenFetch.tsx @@ -1,6 +1,6 @@ import { Environment } from "relay-runtime"; -import { createFetch } from "talk-framework/lib/relay"; +import { createFetch } from "coral-framework/lib/relay"; const CheckResetTokenFetch = createFetch( "resetToken", diff --git a/src/core/client/account/index.html b/src/core/client/account/index.html index d3bc470d9..9d6ffd78f 100644 --- a/src/core/client/account/index.html +++ b/src/core/client/account/index.html @@ -1,7 +1,7 @@ - Talk - Account + Coral - Account diff --git a/src/core/client/account/index.tsx b/src/core/client/account/index.tsx index 7318db694..b9fd0f04f 100644 --- a/src/core/client/account/index.tsx +++ b/src/core/client/account/index.tsx @@ -1,25 +1,25 @@ +import { createManaged } from "coral-framework/lib/bootstrap"; import React, { FunctionComponent } from "react"; import ReactDOM from "react-dom"; -import { createManaged } from "talk-framework/lib/bootstrap"; import App from "./App"; import { initLocalState } from "./local"; import localesData from "./locales"; // Import css variables. -import "talk-ui/theme/variables.css"; +import "coral-ui/theme/variables.css"; async function main() { - const ManagedTalkContextProvider = await createManaged({ + const ManagedCoralContextProvider = await createManaged({ initLocalState, localesData, userLocales: navigator.languages, }); const Index: FunctionComponent = () => ( - + - + ); ReactDOM.render(, document.getElementById("app")); diff --git a/src/core/client/account/local/initLocalState.ts b/src/core/client/account/local/initLocalState.ts index 50f8d3741..1b7ac36fe 100644 --- a/src/core/client/account/local/initLocalState.ts +++ b/src/core/client/account/local/initLocalState.ts @@ -1,14 +1,14 @@ import { Environment } from "relay-runtime"; -import { TalkContext } from "talk-framework/lib/bootstrap"; -import { initLocalBaseState } from "talk-framework/lib/relay"; +import { CoralContext } from "coral-framework/lib/bootstrap"; +import { initLocalBaseState } from "coral-framework/lib/relay"; /** * Initializes the local state, before we start the App. */ export default async function initLocalState( environment: Environment, - context: TalkContext + context: CoralContext ) { await initLocalBaseState(environment, context); } diff --git a/src/core/client/account/locales.ts b/src/core/client/account/locales.ts index b9c9f16c7..b0f080a61 100644 --- a/src/core/client/account/locales.ts +++ b/src/core/client/account/locales.ts @@ -5,5 +5,5 @@ * This file only represents the types that gets exported. */ -import { LocalesData } from "talk-framework/lib/i18n"; +import { LocalesData } from "coral-framework/lib/i18n"; export default {} as LocalesData; diff --git a/src/core/client/account/mutations/ResetPasswordMutation.tsx b/src/core/client/account/mutations/ResetPasswordMutation.tsx index 825e3c3e0..f9217f48d 100644 --- a/src/core/client/account/mutations/ResetPasswordMutation.tsx +++ b/src/core/client/account/mutations/ResetPasswordMutation.tsx @@ -1,6 +1,6 @@ import { Environment } from "relay-runtime"; -import { createMutation } from "talk-framework/lib/relay"; +import { createMutation } from "coral-framework/lib/relay"; const ResetPasswordMutation = createMutation( "resetPassword", diff --git a/src/core/client/account/routes/NotFound.tsx b/src/core/client/account/routes/NotFound.tsx index 899dc6ff9..3f0aba29f 100644 --- a/src/core/client/account/routes/NotFound.tsx +++ b/src/core/client/account/routes/NotFound.tsx @@ -1,5 +1,5 @@ +import { HorizontalGutter, Typography } from "coral-ui/components"; import React, { FunctionComponent } from "react"; -import { HorizontalGutter, Typography } from "talk-ui/components"; const NotFound: FunctionComponent = ({ children }) => ( diff --git a/src/core/client/account/routes/password/reset/Index.tsx b/src/core/client/account/routes/password/reset/Index.tsx index c63932063..f5c0706d9 100644 --- a/src/core/client/account/routes/password/reset/Index.tsx +++ b/src/core/client/account/routes/password/reset/Index.tsx @@ -1,8 +1,8 @@ import React, { useCallback, useState } from "react"; -import { withRouteConfig } from "talk-framework/lib/router"; +import { withRouteConfig } from "coral-framework/lib/router"; -import { parseHashQuery } from "talk-framework/utils"; +import { parseHashQuery } from "coral-framework/utils"; import ResetPasswordForm from "./ResetPasswordForm"; import ResetTokenChecker from "./ResetTokenChecker"; import Success from "./Success"; diff --git a/src/core/client/account/routes/password/reset/ResetPasswordForm.tsx b/src/core/client/account/routes/password/reset/ResetPasswordForm.tsx index 570a66792..8b50b19e9 100644 --- a/src/core/client/account/routes/password/reset/ResetPasswordForm.tsx +++ b/src/core/client/account/routes/password/reset/ResetPasswordForm.tsx @@ -3,14 +3,14 @@ import { Localized } from "fluent-react/compat"; import React, { useCallback } from "react"; import { Field, Form } from "react-final-form"; -import { ResetPasswordMutation } from "talk-account/mutations"; -import { InvalidRequestError } from "talk-framework/lib/errors"; -import { useMutation } from "talk-framework/lib/relay"; +import { ResetPasswordMutation } from "coral-account/mutations"; +import { InvalidRequestError } from "coral-framework/lib/errors"; +import { useMutation } from "coral-framework/lib/relay"; import { composeValidators, required, validatePassword, -} from "talk-framework/lib/validation"; +} from "coral-framework/lib/validation"; import { Button, CallOut, @@ -21,7 +21,7 @@ import { PasswordField, Typography, ValidationMessage, -} from "talk-ui/components"; +} from "coral-ui/components"; interface Props { token: string; diff --git a/src/core/client/account/routes/password/reset/ResetTokenChecker.tsx b/src/core/client/account/routes/password/reset/ResetTokenChecker.tsx index 0975de408..b3bf1834b 100644 --- a/src/core/client/account/routes/password/reset/ResetTokenChecker.tsx +++ b/src/core/client/account/routes/password/reset/ResetTokenChecker.tsx @@ -1,11 +1,11 @@ import { Localized } from "fluent-react/compat"; import React, { useEffect, useState } from "react"; -import { CheckResetTokenFetch } from "talk-account/fetches"; -import { ERROR_CODES } from "talk-common/errors"; -import { InvalidRequestError } from "talk-framework/lib/errors"; -import { useFetch } from "talk-framework/lib/relay"; -import { Delay, Flex, Spinner } from "talk-ui/components"; +import { CheckResetTokenFetch } from "coral-account/fetches"; +import { ERROR_CODES } from "coral-common/errors"; +import { InvalidRequestError } from "coral-framework/lib/errors"; +import { useFetch } from "coral-framework/lib/relay"; +import { Delay, Flex, Spinner } from "coral-ui/components"; import Sorry from "./Sorry"; diff --git a/src/core/client/account/routes/password/reset/Sorry.tsx b/src/core/client/account/routes/password/reset/Sorry.tsx index 8b9ac7d73..0fe9b1e4e 100644 --- a/src/core/client/account/routes/password/reset/Sorry.tsx +++ b/src/core/client/account/routes/password/reset/Sorry.tsx @@ -1,7 +1,7 @@ import { Localized } from "fluent-react/compat"; import React from "react"; -import { CallOut, HorizontalGutter, Typography } from "talk-ui/components"; +import { CallOut, HorizontalGutter, Typography } from "coral-ui/components"; interface Props { reason: React.ReactNode; diff --git a/src/core/client/account/routes/password/reset/Success.tsx b/src/core/client/account/routes/password/reset/Success.tsx index 62ba16ffb..40f9d1397 100644 --- a/src/core/client/account/routes/password/reset/Success.tsx +++ b/src/core/client/account/routes/password/reset/Success.tsx @@ -1,7 +1,7 @@ import { Localized } from "fluent-react/compat"; import React from "react"; -import { HorizontalGutter, Typography } from "talk-ui/components"; +import { HorizontalGutter, Typography } from "coral-ui/components"; const Sorry: React.FunctionComponent = () => { return ( diff --git a/src/core/client/account/test/create.tsx b/src/core/client/account/test/create.tsx index 73d24fc71..7f0347e88 100644 --- a/src/core/client/account/test/create.tsx +++ b/src/core/client/account/test/create.tsx @@ -1,11 +1,11 @@ import React from "react"; -import App from "talk-account/App"; -import { GQLResolver } from "talk-framework/schema"; +import App from "coral-account/App"; +import { GQLResolver } from "coral-framework/schema"; import { createTestRenderer, CreateTestRendererParams, -} from "talk-framework/testHelpers"; +} from "coral-framework/testHelpers"; export default function create( params: CreateTestRendererParams = {} diff --git a/src/core/client/account/test/resetPassword.spec.tsx b/src/core/client/account/test/resetPassword.spec.tsx index d11844005..1389b3d08 100644 --- a/src/core/client/account/test/resetPassword.spec.tsx +++ b/src/core/client/account/test/resetPassword.spec.tsx @@ -1,16 +1,16 @@ import sinon from "sinon"; -import { GQLResolver } from "talk-framework/schema"; +import { GQLResolver } from "coral-framework/schema"; import { createAccessToken, CreateTestRendererParams, replaceHistoryLocation, waitForElement, within, -} from "talk-framework/testHelpers"; +} from "coral-framework/testHelpers"; -import { ERROR_CODES } from "talk-common/errors"; -import { InvalidRequestError } from "talk-framework/lib/errors"; +import { ERROR_CODES } from "coral-common/errors"; +import { InvalidRequestError } from "coral-framework/lib/errors"; import create from "./create"; const token = createAccessToken(); diff --git a/src/core/client/admin/components/App.spec.tsx b/src/core/client/admin/components/App.spec.tsx index acdc2c6cd..1cec1b5a9 100644 --- a/src/core/client/admin/components/App.spec.tsx +++ b/src/core/client/admin/components/App.spec.tsx @@ -1,8 +1,8 @@ +import { removeFragmentRefs } from "coral-framework/testHelpers"; import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { removeFragmentRefs } from "talk-framework/testHelpers"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import App from "./App"; diff --git a/src/core/client/admin/components/App.tsx b/src/core/client/admin/components/App.tsx index 6734eba0a..96c636135 100644 --- a/src/core/client/admin/components/App.tsx +++ b/src/core/client/admin/components/App.tsx @@ -1,8 +1,8 @@ import React, { FunctionComponent } from "react"; -import { PropTypesOf } from "talk-framework/types"; -import { Logo } from "talk-ui/components"; -import { AppBar, Begin, Divider, End } from "talk-ui/components/AppBar"; +import { PropTypesOf } from "coral-framework/types"; +import { Logo } from "coral-ui/components"; +import { AppBar, Begin, Divider, End } from "coral-ui/components/AppBar"; import NavigationContainer from "../containers/NavigationContainer"; import UserMenuContainer from "../containers/UserMenuContainer"; diff --git a/src/core/client/admin/components/AuthBox.spec.tsx b/src/core/client/admin/components/AuthBox.spec.tsx index 30221b1f0..e5900a8d7 100644 --- a/src/core/client/admin/components/AuthBox.spec.tsx +++ b/src/core/client/admin/components/AuthBox.spec.tsx @@ -1,7 +1,7 @@ import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import AuthBox from "./AuthBox"; diff --git a/src/core/client/admin/components/AuthBox.tsx b/src/core/client/admin/components/AuthBox.tsx index f42707e96..afe0403b0 100644 --- a/src/core/client/admin/components/AuthBox.tsx +++ b/src/core/client/admin/components/AuthBox.tsx @@ -6,7 +6,7 @@ import { Flex, HorizontalGutter, Typography, -} from "talk-ui/components"; +} from "coral-ui/components"; import styles from "./AuthBox.css"; diff --git a/src/core/client/admin/components/DecisionHistoryButton.tsx b/src/core/client/admin/components/DecisionHistoryButton.tsx index bcf711dd2..21c09e56b 100644 --- a/src/core/client/admin/components/DecisionHistoryButton.tsx +++ b/src/core/client/admin/components/DecisionHistoryButton.tsx @@ -1,7 +1,7 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; -import { BaseButton, ClickOutside, Icon, Popover } from "talk-ui/components"; +import { BaseButton, ClickOutside, Icon, Popover } from "coral-ui/components"; import DecisionHistoryQuery from "../views/decisionHistory/queries/DecisionHistoryQuery"; diff --git a/src/core/client/admin/components/MainLayout.spec.tsx b/src/core/client/admin/components/MainLayout.spec.tsx index a203a9b5d..b254940a3 100644 --- a/src/core/client/admin/components/MainLayout.spec.tsx +++ b/src/core/client/admin/components/MainLayout.spec.tsx @@ -1,7 +1,7 @@ import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import MainLayout from "./MainLayout"; diff --git a/src/core/client/admin/components/Navigation.tsx b/src/core/client/admin/components/Navigation.tsx index ec15fcdfb..0a8de2169 100644 --- a/src/core/client/admin/components/Navigation.tsx +++ b/src/core/client/admin/components/Navigation.tsx @@ -1,7 +1,7 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; -import { AppBarNavigation } from "talk-ui/components"; +import { AppBarNavigation } from "coral-ui/components"; import NavigationLink from "./NavigationLink"; diff --git a/src/core/client/admin/components/NavigationLink.spec.tsx b/src/core/client/admin/components/NavigationLink.spec.tsx index 42d57e1f2..662b95449 100644 --- a/src/core/client/admin/components/NavigationLink.spec.tsx +++ b/src/core/client/admin/components/NavigationLink.spec.tsx @@ -1,7 +1,7 @@ import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import NavigationLink from "./NavigationLink"; diff --git a/src/core/client/admin/components/NavigationLink.tsx b/src/core/client/admin/components/NavigationLink.tsx index 78acdfe27..29ef2243b 100644 --- a/src/core/client/admin/components/NavigationLink.tsx +++ b/src/core/client/admin/components/NavigationLink.tsx @@ -1,7 +1,7 @@ import { Link, LocationDescriptor } from "found"; import React, { FunctionComponent } from "react"; -import { AppBarNavigationItem } from "talk-ui/components"; +import { AppBarNavigationItem } from "coral-ui/components"; interface Props { children: React.ReactNode; diff --git a/src/core/client/admin/components/TranslatedRole.tsx b/src/core/client/admin/components/TranslatedRole.tsx index 351634181..2485efd73 100644 --- a/src/core/client/admin/components/TranslatedRole.tsx +++ b/src/core/client/admin/components/TranslatedRole.tsx @@ -1,7 +1,7 @@ import { Localized } from "fluent-react/compat"; import React from "react"; -import { GQLUSER_ROLE, GQLUSER_ROLE_RL } from "talk-framework/schema"; +import { GQLUSER_ROLE, GQLUSER_ROLE_RL } from "coral-framework/schema"; interface Props { container?: React.ReactElement | React.ComponentType | string; diff --git a/src/core/client/admin/components/TranslatedStoryStatus.tsx b/src/core/client/admin/components/TranslatedStoryStatus.tsx index 941088d3d..b431024b8 100644 --- a/src/core/client/admin/components/TranslatedStoryStatus.tsx +++ b/src/core/client/admin/components/TranslatedStoryStatus.tsx @@ -1,7 +1,7 @@ import { Localized } from "fluent-react/compat"; import React from "react"; -import { GQLSTORY_STATUS, GQLSTORY_STATUS_RL } from "talk-framework/schema"; +import { GQLSTORY_STATUS, GQLSTORY_STATUS_RL } from "coral-framework/schema"; interface Props { container?: React.ReactElement | React.ComponentType | string; diff --git a/src/core/client/admin/components/UserMenu.spec.tsx b/src/core/client/admin/components/UserMenu.spec.tsx index b92c27351..07d1bf27b 100644 --- a/src/core/client/admin/components/UserMenu.spec.tsx +++ b/src/core/client/admin/components/UserMenu.spec.tsx @@ -2,7 +2,7 @@ import { noop } from "lodash"; import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import UserMenu from "./UserMenu"; diff --git a/src/core/client/admin/components/UserMenu.tsx b/src/core/client/admin/components/UserMenu.tsx index b315c225e..462ec283e 100644 --- a/src/core/client/admin/components/UserMenu.tsx +++ b/src/core/client/admin/components/UserMenu.tsx @@ -9,7 +9,7 @@ import { DropdownButton, DropdownDivider, Popover, -} from "talk-ui/components"; +} from "coral-ui/components"; import styles from "./UserMenu.css"; diff --git a/src/core/client/admin/components/Version.css b/src/core/client/admin/components/Version.css index 02722beec..f9dd6f125 100644 --- a/src/core/client/admin/components/Version.css +++ b/src/core/client/admin/components/Version.css @@ -1,6 +1,6 @@ .version { position: absolute; right: 0; - top: 22px; + top: 23px; font-size: calc(10rem / var(--rem-base)); } diff --git a/src/core/client/admin/components/Version.tsx b/src/core/client/admin/components/Version.tsx index c44f147c0..2d5a368e4 100644 --- a/src/core/client/admin/components/Version.tsx +++ b/src/core/client/admin/components/Version.tsx @@ -1,6 +1,6 @@ import React, { FunctionComponent } from "react"; -import { Typography } from "talk-ui/components"; +import { Typography } from "coral-ui/components"; import styles from "./Version.css"; diff --git a/src/core/client/admin/containers/AppContainer.tsx b/src/core/client/admin/containers/AppContainer.tsx index aaa7d4c89..1422270cc 100644 --- a/src/core/client/admin/containers/AppContainer.tsx +++ b/src/core/client/admin/containers/AppContainer.tsx @@ -1,9 +1,9 @@ import React from "react"; -import { AppContainerQueryResponse } from "talk-admin/__generated__/AppContainerQuery.graphql"; +import { AppContainerQueryResponse } from "coral-admin/__generated__/AppContainerQuery.graphql"; -import { graphql } from "talk-framework/lib/relay"; -import { withRouteConfig } from "talk-framework/lib/router"; +import { graphql } from "coral-framework/lib/relay"; +import { withRouteConfig } from "coral-framework/lib/router"; import App from "../components/App"; diff --git a/src/core/client/admin/containers/AuthCheckContainer.tsx b/src/core/client/admin/containers/AuthCheckContainer.tsx index aac32255d..525671d2c 100644 --- a/src/core/client/admin/containers/AuthCheckContainer.tsx +++ b/src/core/client/admin/containers/AuthCheckContainer.tsx @@ -1,13 +1,13 @@ import { Match, Router, withRouter } from "found"; import React from "react"; -import { AuthCheckContainerQueryResponse } from "talk-admin/__generated__/AuthCheckContainerQuery.graphql"; -import { SetRedirectPathMutation } from "talk-admin/mutations"; -import { AbilityType, can } from "talk-admin/permissions"; -import RestrictedContainer from "talk-admin/views/restricted/containers/RestrictedContainer"; -import { graphql, MutationProp, withMutation } from "talk-framework/lib/relay"; -import { withRouteConfig } from "talk-framework/lib/router"; -import { GQLUSER_ROLE } from "talk-framework/schema"; +import { AuthCheckContainerQueryResponse } from "coral-admin/__generated__/AuthCheckContainerQuery.graphql"; +import { SetRedirectPathMutation } from "coral-admin/mutations"; +import { AbilityType, can } from "coral-admin/permissions"; +import RestrictedContainer from "coral-admin/views/restricted/containers/RestrictedContainer"; +import { graphql, MutationProp, withMutation } from "coral-framework/lib/relay"; +import { withRouteConfig } from "coral-framework/lib/router"; +import { GQLUSER_ROLE } from "coral-framework/schema"; interface Props { match: Match; diff --git a/src/core/client/admin/containers/AutoLoadMoreContainer.tsx b/src/core/client/admin/containers/AutoLoadMoreContainer.tsx index 7b68836f6..d6f5f2751 100644 --- a/src/core/client/admin/containers/AutoLoadMoreContainer.tsx +++ b/src/core/client/admin/containers/AutoLoadMoreContainer.tsx @@ -1,7 +1,7 @@ import React from "react"; -import { withInView } from "talk-framework/lib/intersection"; -import { BaseButton, Spinner } from "talk-ui/components"; +import { withInView } from "coral-framework/lib/intersection"; +import { BaseButton, Spinner } from "coral-ui/components"; interface Props { inView: boolean | undefined; diff --git a/src/core/client/admin/containers/EntryContainer.tsx b/src/core/client/admin/containers/EntryContainer.tsx index d704b0a9d..70ae1ad42 100644 --- a/src/core/client/admin/containers/EntryContainer.tsx +++ b/src/core/client/admin/containers/EntryContainer.tsx @@ -1,10 +1,10 @@ +import TransitionControl from "coral-framework/testHelpers/TransitionControl"; import { BrowserProtocol, queryMiddleware } from "farce"; import { createFarceRouter, ElementsRenderer } from "found"; import { Resolver } from "found-relay"; import React, { FunctionComponent } from "react"; -import TransitionControl from "talk-framework/testHelpers/TransitionControl"; -import { TalkContextConsumer } from "talk-framework/lib/bootstrap/TalkContext"; +import { CoralContextConsumer } from "coral-framework/lib/bootstrap/CoralContext"; import routeConfig from "../routeConfig"; import NotFound from "../routes/NotFound"; @@ -26,11 +26,11 @@ const Router = createFarceRouter({ }); const EntryContainer: FunctionComponent = () => ( - + {({ relayEnvironment }) => ( )} - + ); export default EntryContainer; diff --git a/src/core/client/admin/containers/NavigationContainer.tsx b/src/core/client/admin/containers/NavigationContainer.tsx index cf32a2a35..6f8d83d55 100644 --- a/src/core/client/admin/containers/NavigationContainer.tsx +++ b/src/core/client/admin/containers/NavigationContainer.tsx @@ -1,9 +1,12 @@ import React from "react"; -import { NavigationContainer_viewer as ViewerData } from "talk-admin/__generated__/NavigationContainer_viewer.graphql"; -import { Ability, can } from "talk-admin/permissions"; -import { graphql, withFragmentContainer } from "talk-framework/lib/relay"; -import { SignOutMutation, withSignOutMutation } from "talk-framework/mutations"; +import { NavigationContainer_viewer as ViewerData } from "coral-admin/__generated__/NavigationContainer_viewer.graphql"; +import { Ability, can } from "coral-admin/permissions"; +import { graphql, withFragmentContainer } from "coral-framework/lib/relay"; +import { + SignOutMutation, + withSignOutMutation, +} from "coral-framework/mutations"; import Navigation from "../components/Navigation"; diff --git a/src/core/client/admin/containers/UserMenuContainer.tsx b/src/core/client/admin/containers/UserMenuContainer.tsx index 809a451bd..03bded8d2 100644 --- a/src/core/client/admin/containers/UserMenuContainer.tsx +++ b/src/core/client/admin/containers/UserMenuContainer.tsx @@ -1,8 +1,11 @@ import React from "react"; -import { UserMenuContainer_viewer as ViewerData } from "talk-admin/__generated__/UserMenuContainer_viewer.graphql"; -import { graphql, withFragmentContainer } from "talk-framework/lib/relay"; -import { SignOutMutation, withSignOutMutation } from "talk-framework/mutations"; +import { UserMenuContainer_viewer as ViewerData } from "coral-admin/__generated__/UserMenuContainer_viewer.graphql"; +import { graphql, withFragmentContainer } from "coral-framework/lib/relay"; +import { + SignOutMutation, + withSignOutMutation, +} from "coral-framework/mutations"; import UserMenu from "../components/UserMenu"; diff --git a/src/core/client/admin/fetches/DiscoverOIDCConfigurationQuery.ts b/src/core/client/admin/fetches/DiscoverOIDCConfigurationQuery.ts index ad8602b84..c780bec4e 100644 --- a/src/core/client/admin/fetches/DiscoverOIDCConfigurationQuery.ts +++ b/src/core/client/admin/fetches/DiscoverOIDCConfigurationQuery.ts @@ -1,12 +1,12 @@ import { graphql } from "react-relay"; import { Environment } from "relay-runtime"; -import { DiscoverOIDCConfigurationQuery as QueryTypes } from "talk-admin/__generated__/DiscoverOIDCConfigurationQuery.graphql"; +import { DiscoverOIDCConfigurationQuery as QueryTypes } from "coral-admin/__generated__/DiscoverOIDCConfigurationQuery.graphql"; import { createFetch, fetchQuery, FetchVariables, -} from "talk-framework/lib/relay"; +} from "coral-framework/lib/relay"; const DiscoverOIDCConfigurationFetch = createFetch( "discoverOIDCConfiguration", diff --git a/src/core/client/admin/fetches/SearchStoryQuery.ts b/src/core/client/admin/fetches/SearchStoryQuery.ts index 20c8c8904..64e5338c4 100644 --- a/src/core/client/admin/fetches/SearchStoryQuery.ts +++ b/src/core/client/admin/fetches/SearchStoryQuery.ts @@ -1,12 +1,12 @@ import { graphql } from "react-relay"; import { Environment } from "relay-runtime"; -import { SearchStoryQuery as QueryTypes } from "talk-admin/__generated__/SearchStoryQuery.graphql"; +import { SearchStoryQuery as QueryTypes } from "coral-admin/__generated__/SearchStoryQuery.graphql"; import { createFetch, fetchQuery, FetchVariables, -} from "talk-framework/lib/relay"; +} from "coral-framework/lib/relay"; const SearchStoryFetch = createFetch( "searchStory", diff --git a/src/core/client/admin/index.html b/src/core/client/admin/index.html index 78a4c7467..13fb0a90e 100644 --- a/src/core/client/admin/index.html +++ b/src/core/client/admin/index.html @@ -1,15 +1,13 @@ + + Coral - Admin + + + + - - Talk - Admin - - - - - - -
- - + +
+ diff --git a/src/core/client/admin/index.tsx b/src/core/client/admin/index.tsx index e86246149..7fefbd895 100644 --- a/src/core/client/admin/index.tsx +++ b/src/core/client/admin/index.tsx @@ -1,25 +1,25 @@ +import { createManaged } from "coral-framework/lib/bootstrap"; import React, { FunctionComponent } from "react"; import ReactDOM from "react-dom"; -import { createManaged } from "talk-framework/lib/bootstrap"; import EntryContainer from "./containers/EntryContainer"; import { initLocalState } from "./local"; import localesData from "./locales"; // Import css variables. -import "talk-ui/theme/variables.css"; +import "coral-ui/theme/variables.css"; async function main() { - const ManagedTalkContextProvider = await createManaged({ + const ManagedCoralContextProvider = await createManaged({ initLocalState, localesData, userLocales: navigator.languages, }); const Index: FunctionComponent = () => ( - + - + ); ReactDOM.render(, document.getElementById("app")); diff --git a/src/core/client/admin/local/initLocalState.ts b/src/core/client/admin/local/initLocalState.ts index bdf39b035..25fa56f02 100644 --- a/src/core/client/admin/local/initLocalState.ts +++ b/src/core/client/admin/local/initLocalState.ts @@ -1,16 +1,16 @@ import { commitLocalUpdate, Environment } from "relay-runtime"; -import { REDIRECT_PATH_KEY } from "talk-admin/constants"; -import { getParamsFromHashAndClearIt } from "talk-framework/helpers"; -import { TalkContext } from "talk-framework/lib/bootstrap"; -import { initLocalBaseState, LOCAL_ID } from "talk-framework/lib/relay"; +import { REDIRECT_PATH_KEY } from "coral-admin/constants"; +import { getParamsFromHashAndClearIt } from "coral-framework/helpers"; +import { CoralContext } from "coral-framework/lib/bootstrap"; +import { initLocalBaseState, LOCAL_ID } from "coral-framework/lib/relay"; /** * Initializes the local state, before we start the App. */ export default async function initLocalState( environment: Environment, - context: TalkContext + context: CoralContext ) { const { error = null, accessToken } = getParamsFromHashAndClearIt(); let redirectPath: string | null = null; diff --git a/src/core/client/admin/locales.ts b/src/core/client/admin/locales.ts index b9c9f16c7..b0f080a61 100644 --- a/src/core/client/admin/locales.ts +++ b/src/core/client/admin/locales.ts @@ -5,5 +5,5 @@ * This file only represents the types that gets exported. */ -import { LocalesData } from "talk-framework/lib/i18n"; +import { LocalesData } from "coral-framework/lib/i18n"; export default {} as LocalesData; diff --git a/src/core/client/admin/mutations/AcceptCommentMutation.ts b/src/core/client/admin/mutations/AcceptCommentMutation.ts index ac20bc4f6..6d16fd363 100644 --- a/src/core/client/admin/mutations/AcceptCommentMutation.ts +++ b/src/core/client/admin/mutations/AcceptCommentMutation.ts @@ -1,13 +1,13 @@ import { graphql } from "react-relay"; import { ConnectionHandler, Environment } from "relay-runtime"; -import { AcceptCommentMutation as MutationTypes } from "talk-admin/__generated__/AcceptCommentMutation.graphql"; -import { getQueueConnection } from "talk-admin/helpers"; +import { AcceptCommentMutation as MutationTypes } from "coral-admin/__generated__/AcceptCommentMutation.graphql"; +import { getQueueConnection } from "coral-admin/helpers"; import { commitMutationPromiseNormalized, createMutation, MutationInput, -} from "talk-framework/lib/relay"; +} from "coral-framework/lib/relay"; let clientMutationId = 0; diff --git a/src/core/client/admin/mutations/BanUserMutation.ts b/src/core/client/admin/mutations/BanUserMutation.ts index 40f754801..5220a2959 100644 --- a/src/core/client/admin/mutations/BanUserMutation.ts +++ b/src/core/client/admin/mutations/BanUserMutation.ts @@ -1,14 +1,14 @@ import { graphql } from "react-relay"; import { Environment } from "relay-runtime"; -import { BanUserMutation as MutationTypes } from "talk-admin/__generated__/BanUserMutation.graphql"; +import { BanUserMutation as MutationTypes } from "coral-admin/__generated__/BanUserMutation.graphql"; import { commitMutationPromiseNormalized, createMutation, lookup, MutationInput, -} from "talk-framework/lib/relay"; -import { GQLUser, GQLUSER_STATUS } from "talk-framework/schema"; +} from "coral-framework/lib/relay"; +import { GQLUser, GQLUSER_STATUS } from "coral-framework/schema"; let clientMutationId = 0; diff --git a/src/core/client/admin/mutations/ClearAuthErrorMutation.ts b/src/core/client/admin/mutations/ClearAuthErrorMutation.ts index 61c1fda2c..1984db5f6 100644 --- a/src/core/client/admin/mutations/ClearAuthErrorMutation.ts +++ b/src/core/client/admin/mutations/ClearAuthErrorMutation.ts @@ -1,7 +1,7 @@ import { commitLocalUpdate, Environment } from "relay-runtime"; -import { createMutation } from "talk-framework/lib/relay"; -import { LOCAL_ID } from "talk-framework/lib/relay/withLocalStateContainer"; +import { createMutation } from "coral-framework/lib/relay"; +import { LOCAL_ID } from "coral-framework/lib/relay/withLocalStateContainer"; const ClearAuthErrorMutation = createMutation( "clearAuthError", diff --git a/src/core/client/admin/mutations/CloseStoryMutation.ts b/src/core/client/admin/mutations/CloseStoryMutation.ts index 4e2f3c9a7..7e9e96226 100644 --- a/src/core/client/admin/mutations/CloseStoryMutation.ts +++ b/src/core/client/admin/mutations/CloseStoryMutation.ts @@ -1,13 +1,13 @@ import { graphql } from "react-relay"; import { Environment } from "relay-runtime"; -import { CloseStoryMutation as MutationTypes } from "talk-admin/__generated__/CloseStoryMutation.graphql"; +import { CloseStoryMutation as MutationTypes } from "coral-admin/__generated__/CloseStoryMutation.graphql"; import { commitMutationPromiseNormalized, createMutation, MutationInput, -} from "talk-framework/lib/relay"; -import { GQLSTORY_STATUS } from "talk-framework/schema"; +} from "coral-framework/lib/relay"; +import { GQLSTORY_STATUS } from "coral-framework/schema"; let clientMutationId = 0; diff --git a/src/core/client/admin/mutations/CompleteAccountMutation.ts b/src/core/client/admin/mutations/CompleteAccountMutation.ts index 6e1349f5e..daf6d12d0 100644 --- a/src/core/client/admin/mutations/CompleteAccountMutation.ts +++ b/src/core/client/admin/mutations/CompleteAccountMutation.ts @@ -1,8 +1,8 @@ import { Environment } from "relay-runtime"; -import { TalkContext } from "talk-framework/lib/bootstrap"; -import { createMutation } from "talk-framework/lib/relay"; -import SetAccessTokenMutation from "talk-framework/mutations/SetAccessTokenMutation"; +import { CoralContext } from "coral-framework/lib/bootstrap"; +import { createMutation } from "coral-framework/lib/relay"; +import SetAccessTokenMutation from "coral-framework/mutations/SetAccessTokenMutation"; const CompleteAccountMutation = createMutation( "completeAccount", @@ -11,7 +11,7 @@ const CompleteAccountMutation = createMutation( input: { accessToken: string; }, - context: TalkContext + context: CoralContext ) => await SetAccessTokenMutation.commit( environment, diff --git a/src/core/client/admin/mutations/OpenStoryMutation.ts b/src/core/client/admin/mutations/OpenStoryMutation.ts index c4343c957..310106df9 100644 --- a/src/core/client/admin/mutations/OpenStoryMutation.ts +++ b/src/core/client/admin/mutations/OpenStoryMutation.ts @@ -1,13 +1,13 @@ import { graphql } from "react-relay"; import { Environment } from "relay-runtime"; -import { OpenStoryMutation as MutationTypes } from "talk-admin/__generated__/OpenStoryMutation.graphql"; +import { OpenStoryMutation as MutationTypes } from "coral-admin/__generated__/OpenStoryMutation.graphql"; import { commitMutationPromiseNormalized, createMutation, MutationInput, -} from "talk-framework/lib/relay"; -import { GQLSTORY_STATUS } from "talk-framework/schema"; +} from "coral-framework/lib/relay"; +import { GQLSTORY_STATUS } from "coral-framework/schema"; let clientMutationId = 0; diff --git a/src/core/client/admin/mutations/RegenerateSSOKeyMutation.ts b/src/core/client/admin/mutations/RegenerateSSOKeyMutation.ts index e0a3f2885..d9558dfa6 100644 --- a/src/core/client/admin/mutations/RegenerateSSOKeyMutation.ts +++ b/src/core/client/admin/mutations/RegenerateSSOKeyMutation.ts @@ -1,11 +1,11 @@ import { graphql } from "react-relay"; import { Environment } from "relay-runtime"; -import { RegenerateSSOKeyMutation as MutationTypes } from "talk-admin/__generated__/RegenerateSSOKeyMutation.graphql"; +import { RegenerateSSOKeyMutation as MutationTypes } from "coral-admin/__generated__/RegenerateSSOKeyMutation.graphql"; import { commitMutationPromiseNormalized, createMutation, -} from "talk-framework/lib/relay"; +} from "coral-framework/lib/relay"; let clientMutationId = 0; diff --git a/src/core/client/admin/mutations/RejectCommentMutation.ts b/src/core/client/admin/mutations/RejectCommentMutation.ts index edaaa4afa..fd0662ad6 100644 --- a/src/core/client/admin/mutations/RejectCommentMutation.ts +++ b/src/core/client/admin/mutations/RejectCommentMutation.ts @@ -1,13 +1,13 @@ import { graphql } from "react-relay"; import { ConnectionHandler, Environment } from "relay-runtime"; -import { RejectCommentMutation as MutationTypes } from "talk-admin/__generated__/RejectCommentMutation.graphql"; -import { getQueueConnection } from "talk-admin/helpers"; +import { RejectCommentMutation as MutationTypes } from "coral-admin/__generated__/RejectCommentMutation.graphql"; +import { getQueueConnection } from "coral-admin/helpers"; import { commitMutationPromiseNormalized, createMutation, MutationInput, -} from "talk-framework/lib/relay"; +} from "coral-framework/lib/relay"; let clientMutationId = 0; diff --git a/src/core/client/admin/mutations/RemoveUserBanMutation.ts b/src/core/client/admin/mutations/RemoveUserBanMutation.ts index c0358a668..b10b0bdf0 100644 --- a/src/core/client/admin/mutations/RemoveUserBanMutation.ts +++ b/src/core/client/admin/mutations/RemoveUserBanMutation.ts @@ -1,14 +1,14 @@ import { graphql } from "react-relay"; import { Environment } from "relay-runtime"; -import { RemoveUserBanMutation as MutationTypes } from "talk-admin/__generated__/RemoveUserBanMutation.graphql"; +import { RemoveUserBanMutation as MutationTypes } from "coral-admin/__generated__/RemoveUserBanMutation.graphql"; import { commitMutationPromiseNormalized, createMutation, lookup, MutationInput, -} from "talk-framework/lib/relay"; -import { GQLUser, GQLUSER_STATUS } from "talk-framework/schema"; +} from "coral-framework/lib/relay"; +import { GQLUser, GQLUSER_STATUS } from "coral-framework/schema"; let clientMutationId = 0; diff --git a/src/core/client/admin/mutations/SetAuthViewMutation.spec.ts b/src/core/client/admin/mutations/SetAuthViewMutation.spec.ts index b8ce4beaa..2a0527232 100644 --- a/src/core/client/admin/mutations/SetAuthViewMutation.spec.ts +++ b/src/core/client/admin/mutations/SetAuthViewMutation.spec.ts @@ -1,7 +1,7 @@ import { Environment, RecordSource } from "relay-runtime"; -import { LOCAL_ID } from "talk-framework/lib/relay"; -import { createRelayEnvironment } from "talk-framework/testHelpers"; +import { LOCAL_ID } from "coral-framework/lib/relay"; +import { createRelayEnvironment } from "coral-framework/testHelpers"; import SetAuthViewMutation from "./SetAuthViewMutation"; diff --git a/src/core/client/admin/mutations/SetAuthViewMutation.ts b/src/core/client/admin/mutations/SetAuthViewMutation.ts index 755e5bbd7..25b23f065 100644 --- a/src/core/client/admin/mutations/SetAuthViewMutation.ts +++ b/src/core/client/admin/mutations/SetAuthViewMutation.ts @@ -1,7 +1,7 @@ import { commitLocalUpdate, Environment } from "relay-runtime"; -import { createMutation } from "talk-framework/lib/relay"; -import { LOCAL_ID } from "talk-framework/lib/relay/withLocalStateContainer"; +import { createMutation } from "coral-framework/lib/relay"; +import { LOCAL_ID } from "coral-framework/lib/relay/withLocalStateContainer"; export interface SetAuthViewInput { // TODO: replace with generated typescript types. diff --git a/src/core/client/admin/mutations/SetEmailMutation.ts b/src/core/client/admin/mutations/SetEmailMutation.ts index effb8bb3e..90a84002f 100644 --- a/src/core/client/admin/mutations/SetEmailMutation.ts +++ b/src/core/client/admin/mutations/SetEmailMutation.ts @@ -1,12 +1,12 @@ import { graphql } from "react-relay"; import { Environment } from "relay-runtime"; -import { SetEmailMutation as MutationTypes } from "talk-admin/__generated__/SetEmailMutation.graphql"; +import { SetEmailMutation as MutationTypes } from "coral-admin/__generated__/SetEmailMutation.graphql"; import { commitMutationPromiseNormalized, createMutation, MutationInput, -} from "talk-framework/lib/relay"; +} from "coral-framework/lib/relay"; let clientMutationId = 0; diff --git a/src/core/client/admin/mutations/SetPasswordMutation.ts b/src/core/client/admin/mutations/SetPasswordMutation.ts index 43a5b37a3..b0b8aa9e1 100644 --- a/src/core/client/admin/mutations/SetPasswordMutation.ts +++ b/src/core/client/admin/mutations/SetPasswordMutation.ts @@ -1,12 +1,12 @@ import { graphql } from "react-relay"; import { Environment } from "relay-runtime"; -import { SetPasswordMutation as MutationTypes } from "talk-admin/__generated__/SetPasswordMutation.graphql"; +import { SetPasswordMutation as MutationTypes } from "coral-admin/__generated__/SetPasswordMutation.graphql"; import { commitMutationPromiseNormalized, createMutation, MutationInput, -} from "talk-framework/lib/relay"; +} from "coral-framework/lib/relay"; let clientMutationId = 0; diff --git a/src/core/client/admin/mutations/SetRedirectPathMutation.spec.ts b/src/core/client/admin/mutations/SetRedirectPathMutation.spec.ts index 6829a6ece..034ec5af4 100644 --- a/src/core/client/admin/mutations/SetRedirectPathMutation.spec.ts +++ b/src/core/client/admin/mutations/SetRedirectPathMutation.spec.ts @@ -1,13 +1,13 @@ import { Environment, RecordSource } from "relay-runtime"; -import { REDIRECT_PATH_KEY } from "talk-admin/constants"; -import { LOCAL_ID } from "talk-framework/lib/relay"; -import { createRelayEnvironment } from "talk-framework/testHelpers"; +import { REDIRECT_PATH_KEY } from "coral-admin/constants"; +import { LOCAL_ID } from "coral-framework/lib/relay"; +import { createRelayEnvironment } from "coral-framework/testHelpers"; import { createInMemoryStorage, createPromisifiedStorage, -} from "talk-framework/lib/storage"; +} from "coral-framework/lib/storage"; import SetRedirectPathMutation from "./SetRedirectPathMutation"; let environment: Environment; diff --git a/src/core/client/admin/mutations/SetRedirectPathMutation.ts b/src/core/client/admin/mutations/SetRedirectPathMutation.ts index 9c46b061e..b851134f3 100644 --- a/src/core/client/admin/mutations/SetRedirectPathMutation.ts +++ b/src/core/client/admin/mutations/SetRedirectPathMutation.ts @@ -1,8 +1,8 @@ import { commitLocalUpdate, Environment } from "relay-runtime"; -import { REDIRECT_PATH_KEY } from "talk-admin/constants"; -import { TalkContext } from "talk-framework/lib/bootstrap"; -import { createMutation, LOCAL_ID } from "talk-framework/lib/relay"; +import { REDIRECT_PATH_KEY } from "coral-admin/constants"; +import { CoralContext } from "coral-framework/lib/bootstrap"; +import { createMutation, LOCAL_ID } from "coral-framework/lib/relay"; export interface SetRedirectPathInput { path: string | null; @@ -13,7 +13,7 @@ const SetRedirectPathMutation = createMutation( async ( environment: Environment, input: SetRedirectPathInput, - { localStorage }: TalkContext + { localStorage }: CoralContext ) => { if (!input.path) { await localStorage.removeItem(REDIRECT_PATH_KEY); diff --git a/src/core/client/admin/mutations/SetUsernameMutation.ts b/src/core/client/admin/mutations/SetUsernameMutation.ts index 5f0bea318..5fd5654dd 100644 --- a/src/core/client/admin/mutations/SetUsernameMutation.ts +++ b/src/core/client/admin/mutations/SetUsernameMutation.ts @@ -1,12 +1,12 @@ import { graphql } from "react-relay"; import { Environment } from "relay-runtime"; -import { SetUsernameMutation as MutationTypes } from "talk-admin/__generated__/SetUsernameMutation.graphql"; +import { SetUsernameMutation as MutationTypes } from "coral-admin/__generated__/SetUsernameMutation.graphql"; import { commitMutationPromiseNormalized, createMutation, MutationInput, -} from "talk-framework/lib/relay"; +} from "coral-framework/lib/relay"; let clientMutationId = 0; diff --git a/src/core/client/admin/mutations/SignInMutation.ts b/src/core/client/admin/mutations/SignInMutation.ts index 9c0a1c0f1..e13505868 100644 --- a/src/core/client/admin/mutations/SignInMutation.ts +++ b/src/core/client/admin/mutations/SignInMutation.ts @@ -1,15 +1,15 @@ import { Environment } from "relay-runtime"; -import { TalkContext } from "talk-framework/lib/bootstrap"; -import { createMutation } from "talk-framework/lib/relay"; -import { signIn, SignInInput } from "talk-framework/rest"; +import { CoralContext } from "coral-framework/lib/bootstrap"; +import { createMutation } from "coral-framework/lib/relay"; +import { signIn, SignInInput } from "coral-framework/rest"; const SignInMutation = createMutation( "signIn", async ( environment: Environment, input: SignInInput, - context: TalkContext + context: CoralContext ) => { const result = await signIn(context.rest, input); diff --git a/src/core/client/admin/mutations/UpdateSettingsMutation.ts b/src/core/client/admin/mutations/UpdateSettingsMutation.ts index f4543454e..026f6e774 100644 --- a/src/core/client/admin/mutations/UpdateSettingsMutation.ts +++ b/src/core/client/admin/mutations/UpdateSettingsMutation.ts @@ -1,12 +1,12 @@ import { graphql } from "react-relay"; import { Environment } from "relay-runtime"; -import { UpdateSettingsMutation as MutationTypes } from "talk-admin/__generated__/UpdateSettingsMutation.graphql"; +import { UpdateSettingsMutation as MutationTypes } from "coral-admin/__generated__/UpdateSettingsMutation.graphql"; import { commitMutationPromiseNormalized, createMutation, MutationInput, -} from "talk-framework/lib/relay"; +} from "coral-framework/lib/relay"; let clientMutationId = 0; diff --git a/src/core/client/admin/mutations/UpdateUserRoleMutation.ts b/src/core/client/admin/mutations/UpdateUserRoleMutation.ts index 2fe21bf9b..318bbc43a 100644 --- a/src/core/client/admin/mutations/UpdateUserRoleMutation.ts +++ b/src/core/client/admin/mutations/UpdateUserRoleMutation.ts @@ -1,12 +1,12 @@ import { graphql } from "react-relay"; import { Environment } from "relay-runtime"; -import { UpdateUserRoleMutation as MutationTypes } from "talk-admin/__generated__/UpdateUserRoleMutation.graphql"; +import { UpdateUserRoleMutation as MutationTypes } from "coral-admin/__generated__/UpdateUserRoleMutation.graphql"; import { commitMutationPromiseNormalized, createMutation, MutationInput, -} from "talk-framework/lib/relay"; +} from "coral-framework/lib/relay"; let clientMutationId = 0; diff --git a/src/core/client/admin/permissions.tsx b/src/core/client/admin/permissions.tsx index b1a7da259..9ba6b64e9 100644 --- a/src/core/client/admin/permissions.tsx +++ b/src/core/client/admin/permissions.tsx @@ -1,5 +1,5 @@ +import { GQLUSER_ROLE, GQLUSER_ROLE_RL } from "coral-framework/schema"; import { mapValues } from "lodash"; -import { GQLUSER_ROLE, GQLUSER_ROLE_RL } from "talk-framework/schema"; /** * permissionMap describes what abilities certain roles have. diff --git a/src/core/client/admin/routes/NotFound.tsx b/src/core/client/admin/routes/NotFound.tsx index 899dc6ff9..3f0aba29f 100644 --- a/src/core/client/admin/routes/NotFound.tsx +++ b/src/core/client/admin/routes/NotFound.tsx @@ -1,5 +1,5 @@ +import { HorizontalGutter, Typography } from "coral-ui/components"; import React, { FunctionComponent } from "react"; -import { HorizontalGutter, Typography } from "talk-ui/components"; const NotFound: FunctionComponent = ({ children }) => ( diff --git a/src/core/client/admin/routes/community/components/BanModal.tsx b/src/core/client/admin/routes/community/components/BanModal.tsx index 9a76631b3..90c17d676 100644 --- a/src/core/client/admin/routes/community/components/BanModal.tsx +++ b/src/core/client/admin/routes/community/components/BanModal.tsx @@ -1,7 +1,7 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; -import NotAvailable from "talk-admin/components/NotAvailable"; +import NotAvailable from "coral-admin/components/NotAvailable"; import { Button, Card, @@ -10,7 +10,7 @@ import { HorizontalGutter, Modal, Typography, -} from "talk-ui/components"; +} from "coral-ui/components"; import styles from "./BanModal.css"; diff --git a/src/core/client/admin/routes/community/components/Community.tsx b/src/core/client/admin/routes/community/components/Community.tsx index 3ca07104e..a3dfafa23 100644 --- a/src/core/client/admin/routes/community/components/Community.tsx +++ b/src/core/client/admin/routes/community/components/Community.tsx @@ -1,7 +1,7 @@ import React, { FunctionComponent } from "react"; -import MainLayout from "talk-admin/components/MainLayout"; -import { PropTypesOf } from "talk-framework/types"; +import MainLayout from "coral-admin/components/MainLayout"; +import { PropTypesOf } from "coral-framework/types"; import UserTableContainer from "../containers/UserTableContainer"; diff --git a/src/core/client/admin/routes/community/components/EmptyMessage.tsx b/src/core/client/admin/routes/community/components/EmptyMessage.tsx index a5cb8ef6a..1d6c3999d 100644 --- a/src/core/client/admin/routes/community/components/EmptyMessage.tsx +++ b/src/core/client/admin/routes/community/components/EmptyMessage.tsx @@ -1,7 +1,7 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; -import { Typography } from "talk-ui/components"; +import { Typography } from "coral-ui/components"; import styles from "./EmptyMessage.css"; diff --git a/src/core/client/admin/routes/community/components/RoleChange.tsx b/src/core/client/admin/routes/community/components/RoleChange.tsx index 74185e631..fcf3f0d2e 100644 --- a/src/core/client/admin/routes/community/components/RoleChange.tsx +++ b/src/core/client/admin/routes/community/components/RoleChange.tsx @@ -1,8 +1,8 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; -import TranslatedRole from "talk-admin/components/TranslatedRole"; -import { GQLUSER_ROLE, GQLUSER_ROLE_RL } from "talk-framework/schema"; +import TranslatedRole from "coral-admin/components/TranslatedRole"; +import { GQLUSER_ROLE, GQLUSER_ROLE_RL } from "coral-framework/schema"; import { Button, ButtonIcon, @@ -10,7 +10,7 @@ import { Dropdown, DropdownButton, Popover, -} from "talk-ui/components"; +} from "coral-ui/components"; import styles from "./RoleChange.css"; import RoleText from "./RoleText"; diff --git a/src/core/client/admin/routes/community/components/RoleText.tsx b/src/core/client/admin/routes/community/components/RoleText.tsx index f5ba917c9..9ae6e4fba 100644 --- a/src/core/client/admin/routes/community/components/RoleText.tsx +++ b/src/core/client/admin/routes/community/components/RoleText.tsx @@ -1,9 +1,9 @@ import cn from "classnames"; import React, { FunctionComponent } from "react"; -import TranslatedRole from "talk-admin/components/TranslatedRole"; -import { GQLUSER_ROLE } from "talk-framework/schema"; -import { PropTypesOf } from "talk-ui/types"; +import TranslatedRole from "coral-admin/components/TranslatedRole"; +import { GQLUSER_ROLE } from "coral-framework/schema"; +import { PropTypesOf } from "coral-ui/types"; import styles from "./RoleText.css"; diff --git a/src/core/client/admin/routes/community/components/UserRow.tsx b/src/core/client/admin/routes/community/components/UserRow.tsx index 8a30c1363..dcc9ac3f5 100644 --- a/src/core/client/admin/routes/community/components/UserRow.tsx +++ b/src/core/client/admin/routes/community/components/UserRow.tsx @@ -1,8 +1,8 @@ import React, { FunctionComponent } from "react"; -import NotAvailable from "talk-admin/components/NotAvailable"; -import { PropTypesOf } from "talk-framework/types"; -import { TableCell, TableRow, TextLink } from "talk-ui/components"; +import NotAvailable from "coral-admin/components/NotAvailable"; +import { PropTypesOf } from "coral-framework/types"; +import { TableCell, TableRow, TextLink } from "coral-ui/components"; import RoleChangeContainer from "../containers/RoleChangeContainer"; import UserStatusChangeContainer from "../containers/UserStatusChangeContainer"; diff --git a/src/core/client/admin/routes/community/components/UserStatus.tsx b/src/core/client/admin/routes/community/components/UserStatus.tsx index d75e9cfb3..0cdb3eec5 100644 --- a/src/core/client/admin/routes/community/components/UserStatus.tsx +++ b/src/core/client/admin/routes/community/components/UserStatus.tsx @@ -1,8 +1,8 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; -import { Flex, Typography } from "talk-ui/components"; -import { PropTypesOf } from "talk-ui/types"; +import { Flex, Typography } from "coral-ui/components"; +import { PropTypesOf } from "coral-ui/types"; import styles from "./UserStatus.css"; diff --git a/src/core/client/admin/routes/community/components/UserStatusChange.tsx b/src/core/client/admin/routes/community/components/UserStatusChange.tsx index 63bafbf14..f7d13a57d 100644 --- a/src/core/client/admin/routes/community/components/UserStatusChange.tsx +++ b/src/core/client/admin/routes/community/components/UserStatusChange.tsx @@ -8,7 +8,7 @@ import { Dropdown, DropdownButton, Popover, -} from "talk-ui/components"; +} from "coral-ui/components"; import styles from "./UserStatusChange.css"; diff --git a/src/core/client/admin/routes/community/components/UserTable.tsx b/src/core/client/admin/routes/community/components/UserTable.tsx index f7665e751..92f475fef 100644 --- a/src/core/client/admin/routes/community/components/UserTable.tsx +++ b/src/core/client/admin/routes/community/components/UserTable.tsx @@ -1,20 +1,20 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; -import AutoLoadMoreContainer from "talk-admin/containers/AutoLoadMoreContainer"; +import AutoLoadMoreContainer from "coral-admin/containers/AutoLoadMoreContainer"; import { Table, TableBody, TableCell, TableHead, TableRow, -} from "talk-ui/components/Table"; +} from "coral-ui/components/Table"; import UserRowContainer from "../containers/UserRowContainer"; -import { Flex, HorizontalGutter, Spinner } from "talk-ui/components"; +import { Flex, HorizontalGutter, Spinner } from "coral-ui/components"; import EmptyMessage from "./EmptyMessage"; import styles from "./UserTable.css"; diff --git a/src/core/client/admin/routes/community/components/UserTableFilter.tsx b/src/core/client/admin/routes/community/components/UserTableFilter.tsx index e35d7103a..101ab3dad 100644 --- a/src/core/client/admin/routes/community/components/UserTableFilter.tsx +++ b/src/core/client/admin/routes/community/components/UserTableFilter.tsx @@ -7,7 +7,7 @@ import { GQLUSER_ROLE_RL, GQLUSER_STATUS, GQLUSER_STATUS_RL, -} from "talk-framework/schema"; +} from "coral-framework/schema"; import { Button, FieldSet, @@ -18,7 +18,7 @@ import { SelectField, TextField, Typography, -} from "talk-ui/components"; +} from "coral-ui/components"; import styles from "./UserTableFilter.css"; diff --git a/src/core/client/admin/routes/community/containers/CommunityContainer.tsx b/src/core/client/admin/routes/community/containers/CommunityContainer.tsx index ba88f9cde..e4eb87579 100644 --- a/src/core/client/admin/routes/community/containers/CommunityContainer.tsx +++ b/src/core/client/admin/routes/community/containers/CommunityContainer.tsx @@ -2,8 +2,8 @@ import { FormApi } from "final-form"; import React, { FunctionComponent } from "react"; import { graphql } from "react-relay"; -import { CommunityContainerQueryResponse } from "talk-admin/__generated__/CommunityContainerQuery.graphql"; -import { withRouteConfig } from "talk-framework/lib/router"; +import { CommunityContainerQueryResponse } from "coral-admin/__generated__/CommunityContainerQuery.graphql"; +import { withRouteConfig } from "coral-framework/lib/router"; import Community from "../components/Community"; diff --git a/src/core/client/admin/routes/community/containers/RoleChangeContainer.tsx b/src/core/client/admin/routes/community/containers/RoleChangeContainer.tsx index e5310bf9c..1c39791cd 100644 --- a/src/core/client/admin/routes/community/containers/RoleChangeContainer.tsx +++ b/src/core/client/admin/routes/community/containers/RoleChangeContainer.tsx @@ -1,8 +1,8 @@ import React, { FunctionComponent, useCallback } from "react"; -import { UpdateUserRoleMutation } from "talk-admin/mutations"; -import { useMutation } from "talk-framework/lib/relay"; -import { GQLUSER_ROLE_RL } from "talk-framework/schema"; +import { UpdateUserRoleMutation } from "coral-admin/mutations"; +import { useMutation } from "coral-framework/lib/relay"; +import { GQLUSER_ROLE_RL } from "coral-framework/schema"; import RoleChange from "../components/RoleChange"; diff --git a/src/core/client/admin/routes/community/containers/UserRowContainer.tsx b/src/core/client/admin/routes/community/containers/UserRowContainer.tsx index a753579f6..ce364b4ae 100644 --- a/src/core/client/admin/routes/community/containers/UserRowContainer.tsx +++ b/src/core/client/admin/routes/community/containers/UserRowContainer.tsx @@ -1,12 +1,12 @@ import React, { FunctionComponent } from "react"; import { graphql } from "react-relay"; -import { UserRowContainer_user as UserData } from "talk-admin/__generated__/UserRowContainer_user.graphql"; -import { UserRowContainer_viewer as ViewerData } from "talk-admin/__generated__/UserRowContainer_viewer.graphql"; -import { useTalkContext } from "talk-framework/lib/bootstrap"; -import { withFragmentContainer } from "talk-framework/lib/relay"; +import { UserRowContainer_user as UserData } from "coral-admin/__generated__/UserRowContainer_user.graphql"; +import { UserRowContainer_viewer as ViewerData } from "coral-admin/__generated__/UserRowContainer_viewer.graphql"; +import { useCoralContext } from "coral-framework/lib/bootstrap"; +import { withFragmentContainer } from "coral-framework/lib/relay"; -import { Ability, can } from "talk-admin/permissions"; +import { Ability, can } from "coral-admin/permissions"; import UserRow from "../components/UserRow"; interface Props { @@ -15,7 +15,7 @@ interface Props { } const UserRowContainer: FunctionComponent = props => { - const { locales } = useTalkContext(); + const { locales } = useCoralContext(); return ( { diff --git a/src/core/client/admin/routes/configure/containers/ConfigureContainer.tsx b/src/core/client/admin/routes/configure/containers/ConfigureContainer.tsx index 25cff6d06..780e16250 100644 --- a/src/core/client/admin/routes/configure/containers/ConfigureContainer.tsx +++ b/src/core/client/admin/routes/configure/containers/ConfigureContainer.tsx @@ -1,9 +1,9 @@ import { FormApi, FormState } from "final-form"; import React from "react"; -import { UpdateSettingsMutation } from "talk-admin/mutations"; -import { SubmitHookHandler } from "talk-framework/lib/form"; -import { MutationProp, withMutation } from "talk-framework/lib/relay"; +import { UpdateSettingsMutation } from "coral-admin/mutations"; +import { SubmitHookHandler } from "coral-framework/lib/form"; +import { MutationProp, withMutation } from "coral-framework/lib/relay"; import Configure from "../components/Configure"; import NavigationWarningContainer from "./NavigationWarningContainer"; diff --git a/src/core/client/admin/routes/configure/containers/NavigationWarningContainer.tsx b/src/core/client/admin/routes/configure/containers/NavigationWarningContainer.tsx index 7011dde4c..e772c0cf9 100644 --- a/src/core/client/admin/routes/configure/containers/NavigationWarningContainer.tsx +++ b/src/core/client/admin/routes/configure/containers/NavigationWarningContainer.tsx @@ -1,11 +1,11 @@ import { Match, Router, withRouter } from "found"; import React from "react"; -import { TalkContext, withContext } from "talk-framework/lib/bootstrap"; -import { getMessage } from "talk-framework/lib/i18n"; +import { CoralContext, withContext } from "coral-framework/lib/bootstrap"; +import { getMessage } from "coral-framework/lib/i18n"; interface Props { - localeBundles: TalkContext["localeBundles"]; + localeBundles: CoralContext["localeBundles"]; router: Router; active: boolean; match: Match; diff --git a/src/core/client/admin/routes/configure/sections/advanced/components/AdvancedConfig.tsx b/src/core/client/admin/routes/configure/sections/advanced/components/AdvancedConfig.tsx index e2e9e74e3..1c1fc6054 100644 --- a/src/core/client/admin/routes/configure/sections/advanced/components/AdvancedConfig.tsx +++ b/src/core/client/admin/routes/configure/sections/advanced/components/AdvancedConfig.tsx @@ -1,7 +1,7 @@ import React, { FunctionComponent } from "react"; -import { PropTypesOf } from "talk-framework/types"; -import { HorizontalGutter } from "talk-ui/components"; +import { PropTypesOf } from "coral-framework/types"; +import { HorizontalGutter } from "coral-ui/components"; import CustomCSSConfigContainer from "../containers/CustomCSSConfigContainer"; import PermittedDomainsConfigContainer from "../containers/PermittedDomainsConfigContainer"; diff --git a/src/core/client/admin/routes/configure/sections/advanced/components/CustomCSSConfig.tsx b/src/core/client/admin/routes/configure/sections/advanced/components/CustomCSSConfig.tsx index fc7f96265..23ce67b1f 100644 --- a/src/core/client/admin/routes/configure/sections/advanced/components/CustomCSSConfig.tsx +++ b/src/core/client/admin/routes/configure/sections/advanced/components/CustomCSSConfig.tsx @@ -2,14 +2,14 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; -import { formatEmpty, parseEmptyAsNull } from "talk-framework/lib/form"; +import { formatEmpty, parseEmptyAsNull } from "coral-framework/lib/form"; import { FormField, HorizontalGutter, TextField, Typography, ValidationMessage, -} from "talk-ui/components"; +} from "coral-ui/components"; import Header from "../../../components/Header"; diff --git a/src/core/client/admin/routes/configure/sections/advanced/components/PermittedDomainsConfig.tsx b/src/core/client/admin/routes/configure/sections/advanced/components/PermittedDomainsConfig.tsx index 3b534772c..603e1fb12 100644 --- a/src/core/client/admin/routes/configure/sections/advanced/components/PermittedDomainsConfig.tsx +++ b/src/core/client/admin/routes/configure/sections/advanced/components/PermittedDomainsConfig.tsx @@ -2,14 +2,14 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; -import { formatStringList, parseStringList } from "talk-framework/lib/form"; +import { formatStringList, parseStringList } from "coral-framework/lib/form"; import { FormField, HorizontalGutter, TextField, Typography, ValidationMessage, -} from "talk-ui/components"; +} from "coral-ui/components"; import Header from "../../../components/Header"; @@ -30,7 +30,7 @@ const PermittedDomainsConfig: FunctionComponent = ({ disabled }) => ( strong={} > - Domains where your Talk instance is allowed to be embedded. Typical + Domains where your Coral instance is allowed to be embedded. Typical use is localhost, staging.yourdomain.com, yourdomain.com, etc. diff --git a/src/core/client/admin/routes/configure/sections/advanced/containers/AdvancedConfigContainer.tsx b/src/core/client/admin/routes/configure/sections/advanced/containers/AdvancedConfigContainer.tsx index 253372332..0e1f072ab 100644 --- a/src/core/client/admin/routes/configure/sections/advanced/containers/AdvancedConfigContainer.tsx +++ b/src/core/client/admin/routes/configure/sections/advanced/containers/AdvancedConfigContainer.tsx @@ -3,9 +3,9 @@ import { RouteProps } from "found"; import React from "react"; import { graphql } from "react-relay"; -import { AdvancedConfigContainer_settings as SettingsData } from "talk-admin/__generated__/AdvancedConfigContainer_settings.graphql"; -import { pureMerge } from "talk-common/utils"; -import { withFragmentContainer } from "talk-framework/lib/relay"; +import { AdvancedConfigContainer_settings as SettingsData } from "coral-admin/__generated__/AdvancedConfigContainer_settings.graphql"; +import { pureMerge } from "coral-common/utils"; +import { withFragmentContainer } from "coral-framework/lib/relay"; import AdvancedConfig from "../components/AdvancedConfig"; diff --git a/src/core/client/admin/routes/configure/sections/advanced/containers/AdvancedConfigRouteContainer.tsx b/src/core/client/admin/routes/configure/sections/advanced/containers/AdvancedConfigRouteContainer.tsx index b06f383b8..58b67b4dd 100644 --- a/src/core/client/admin/routes/configure/sections/advanced/containers/AdvancedConfigRouteContainer.tsx +++ b/src/core/client/admin/routes/configure/sections/advanced/containers/AdvancedConfigRouteContainer.tsx @@ -2,9 +2,9 @@ import { FormApi } from "final-form"; import React from "react"; import { graphql } from "react-relay"; -import { AdvancedConfigRouteContainerQueryResponse } from "talk-admin/__generated__/AdvancedConfigRouteContainerQuery.graphql"; -import { withRouteConfig } from "talk-framework/lib/router"; -import { Delay, Spinner } from "talk-ui/components"; +import { AdvancedConfigRouteContainerQueryResponse } from "coral-admin/__generated__/AdvancedConfigRouteContainerQuery.graphql"; +import { withRouteConfig } from "coral-framework/lib/router"; +import { Delay, Spinner } from "coral-ui/components"; import AdvancedConfigContainer from "./AdvancedConfigContainer"; diff --git a/src/core/client/admin/routes/configure/sections/advanced/containers/CustomCSSConfigContainer.tsx b/src/core/client/admin/routes/configure/sections/advanced/containers/CustomCSSConfigContainer.tsx index b1d0db328..bdea6ceb4 100644 --- a/src/core/client/admin/routes/configure/sections/advanced/containers/CustomCSSConfigContainer.tsx +++ b/src/core/client/admin/routes/configure/sections/advanced/containers/CustomCSSConfigContainer.tsx @@ -1,8 +1,8 @@ import React from "react"; import { graphql } from "react-relay"; -import { CustomCSSConfigContainer_settings as SettingsData } from "talk-admin/__generated__/CustomCSSConfigContainer_settings.graphql"; -import { withFragmentContainer } from "talk-framework/lib/relay"; +import { CustomCSSConfigContainer_settings as SettingsData } from "coral-admin/__generated__/CustomCSSConfigContainer_settings.graphql"; +import { withFragmentContainer } from "coral-framework/lib/relay"; import CustomCSSConfig from "../components/CustomCSSConfig"; diff --git a/src/core/client/admin/routes/configure/sections/advanced/containers/PermittedDomainsConfigContainer.tsx b/src/core/client/admin/routes/configure/sections/advanced/containers/PermittedDomainsConfigContainer.tsx index 7fa83a873..69ea73a85 100644 --- a/src/core/client/admin/routes/configure/sections/advanced/containers/PermittedDomainsConfigContainer.tsx +++ b/src/core/client/admin/routes/configure/sections/advanced/containers/PermittedDomainsConfigContainer.tsx @@ -1,8 +1,8 @@ import React from "react"; import { graphql } from "react-relay"; -import { PermittedDomainsConfigContainer_settings as SettingsData } from "talk-admin/__generated__/PermittedDomainsConfigContainer_settings.graphql"; -import { withFragmentContainer } from "talk-framework/lib/relay"; +import { PermittedDomainsConfigContainer_settings as SettingsData } from "coral-admin/__generated__/PermittedDomainsConfigContainer_settings.graphql"; +import { withFragmentContainer } from "coral-framework/lib/relay"; import PermittedDomainsConfig from "../components/PermittedDomainsConfig"; diff --git a/src/core/client/admin/routes/configure/sections/auth/components/AuthConfig.tsx b/src/core/client/admin/routes/configure/sections/auth/components/AuthConfig.tsx index 883875e01..01e6b58f2 100644 --- a/src/core/client/admin/routes/configure/sections/auth/components/AuthConfig.tsx +++ b/src/core/client/admin/routes/configure/sections/auth/components/AuthConfig.tsx @@ -1,7 +1,7 @@ import React, { FunctionComponent } from "react"; -import { PropTypesOf } from "talk-framework/types"; -import { HorizontalGutter } from "talk-ui/components"; +import { PropTypesOf } from "coral-framework/types"; +import { HorizontalGutter } from "coral-ui/components"; import AuthIntegrationsConfig from "./AuthIntegrationsConfig"; diff --git a/src/core/client/admin/routes/configure/sections/auth/components/AuthIntegrationsConfig.tsx b/src/core/client/admin/routes/configure/sections/auth/components/AuthIntegrationsConfig.tsx index 089d78f6d..f90186826 100644 --- a/src/core/client/admin/routes/configure/sections/auth/components/AuthIntegrationsConfig.tsx +++ b/src/core/client/admin/routes/configure/sections/auth/components/AuthIntegrationsConfig.tsx @@ -1,8 +1,8 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; -import { PropTypesOf } from "talk-framework/types"; -import { HorizontalGutter } from "talk-ui/components"; +import { PropTypesOf } from "coral-framework/types"; +import { HorizontalGutter } from "coral-ui/components"; import Header from "../../../components/Header"; import FacebookConfigContainer from "../containers/FacebookConfigContainer"; diff --git a/src/core/client/admin/routes/configure/sections/auth/components/ClientIDField.tsx b/src/core/client/admin/routes/configure/sections/auth/components/ClientIDField.tsx index ef00234f7..d2b9641c5 100644 --- a/src/core/client/admin/routes/configure/sections/auth/components/ClientIDField.tsx +++ b/src/core/client/admin/routes/configure/sections/auth/components/ClientIDField.tsx @@ -3,8 +3,8 @@ import { identity } from "lodash"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; -import { Validator } from "talk-framework/lib/validation"; -import { FormField, InputLabel, TextField } from "talk-ui/components"; +import { Validator } from "coral-framework/lib/validation"; +import { FormField, InputLabel, TextField } from "coral-ui/components"; import ValidationMessage from "../../../components/ValidationMessage"; diff --git a/src/core/client/admin/routes/configure/sections/auth/components/ClientSecretField.tsx b/src/core/client/admin/routes/configure/sections/auth/components/ClientSecretField.tsx index 209f0141a..5733dd08b 100644 --- a/src/core/client/admin/routes/configure/sections/auth/components/ClientSecretField.tsx +++ b/src/core/client/admin/routes/configure/sections/auth/components/ClientSecretField.tsx @@ -3,8 +3,8 @@ import { identity } from "lodash"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; -import { Validator } from "talk-framework/lib/validation"; -import { FormField, InputLabel, TextField } from "talk-ui/components"; +import { Validator } from "coral-framework/lib/validation"; +import { FormField, InputLabel, TextField } from "coral-ui/components"; import ValidationMessage from "../../../components/ValidationMessage"; diff --git a/src/core/client/admin/routes/configure/sections/auth/components/ConfigBoxWithToggleField.tsx b/src/core/client/admin/routes/configure/sections/auth/components/ConfigBoxWithToggleField.tsx index 162ed1f5c..d4a9fcd57 100644 --- a/src/core/client/admin/routes/configure/sections/auth/components/ConfigBoxWithToggleField.tsx +++ b/src/core/client/admin/routes/configure/sections/auth/components/ConfigBoxWithToggleField.tsx @@ -1,9 +1,9 @@ +import { parseBool } from "coral-framework/lib/form"; import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; -import { parseBool } from "talk-framework/lib/form"; -import { CheckBox, FormField } from "talk-ui/components"; +import { CheckBox, FormField } from "coral-ui/components"; import ConfigBox from "../../../components/ConfigBox"; diff --git a/src/core/client/admin/routes/configure/sections/auth/components/ConfigDescription.tsx b/src/core/client/admin/routes/configure/sections/auth/components/ConfigDescription.tsx index b16c4fa7e..f3e9b7842 100644 --- a/src/core/client/admin/routes/configure/sections/auth/components/ConfigDescription.tsx +++ b/src/core/client/admin/routes/configure/sections/auth/components/ConfigDescription.tsx @@ -1,7 +1,7 @@ import React, { FunctionComponent } from "react"; -import { InputDescription } from "talk-ui/components"; -import { PropTypesOf } from "talk-ui/types"; +import { InputDescription } from "coral-ui/components"; +import { PropTypesOf } from "coral-ui/types"; import styles from "./ConfigDescription.css"; diff --git a/src/core/client/admin/routes/configure/sections/auth/components/FacebookConfig.tsx b/src/core/client/admin/routes/configure/sections/auth/components/FacebookConfig.tsx index 4ddc620ee..fcf2e252d 100644 --- a/src/core/client/admin/routes/configure/sections/auth/components/FacebookConfig.tsx +++ b/src/core/client/admin/routes/configure/sections/auth/components/FacebookConfig.tsx @@ -1,8 +1,8 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; -import { required, Validator } from "talk-framework/lib/validation"; -import { HorizontalGutter, TextLink, Typography } from "talk-ui/components"; +import { required, Validator } from "coral-framework/lib/validation"; +import { HorizontalGutter, TextLink, Typography } from "coral-ui/components"; import HorizontalRule from "../../../components/HorizontalRule"; import ClientIDField from "./ClientIDField"; diff --git a/src/core/client/admin/routes/configure/sections/auth/components/GoogleConfig.tsx b/src/core/client/admin/routes/configure/sections/auth/components/GoogleConfig.tsx index afeb1c232..43d82557f 100644 --- a/src/core/client/admin/routes/configure/sections/auth/components/GoogleConfig.tsx +++ b/src/core/client/admin/routes/configure/sections/auth/components/GoogleConfig.tsx @@ -1,8 +1,8 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; -import { required, Validator } from "talk-framework/lib/validation"; -import { HorizontalGutter, TextLink, Typography } from "talk-ui/components"; +import { required, Validator } from "coral-framework/lib/validation"; +import { HorizontalGutter, TextLink, Typography } from "coral-ui/components"; import HorizontalRule from "../../../components/HorizontalRule"; import ClientIDField from "./ClientIDField"; diff --git a/src/core/client/admin/routes/configure/sections/auth/components/LocalAuthConfig.tsx b/src/core/client/admin/routes/configure/sections/auth/components/LocalAuthConfig.tsx index 8f3b0b081..0814f24f8 100644 --- a/src/core/client/admin/routes/configure/sections/auth/components/LocalAuthConfig.tsx +++ b/src/core/client/admin/routes/configure/sections/auth/components/LocalAuthConfig.tsx @@ -1,7 +1,7 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; -import { HorizontalGutter } from "talk-ui/components"; +import { HorizontalGutter } from "coral-ui/components"; import ConfigBoxWithToggleField from "./ConfigBoxWithToggleField"; import RegistrationField from "./RegistrationField"; diff --git a/src/core/client/admin/routes/configure/sections/auth/components/OIDCConfig.tsx b/src/core/client/admin/routes/configure/sections/auth/components/OIDCConfig.tsx index 72f229eff..89245cc29 100644 --- a/src/core/client/admin/routes/configure/sections/auth/components/OIDCConfig.tsx +++ b/src/core/client/admin/routes/configure/sections/auth/components/OIDCConfig.tsx @@ -8,7 +8,7 @@ import { required, validateURL, Validator, -} from "talk-framework/lib/validation"; +} from "coral-framework/lib/validation"; import { Button, Flex, @@ -18,7 +18,7 @@ import { TextField, TextLink, Typography, -} from "talk-ui/components"; +} from "coral-ui/components"; import HorizontalRule from "../../../components/HorizontalRule"; import ClientIDField from "./ClientIDField"; @@ -132,7 +132,7 @@ const OIDCConfig: FunctionComponent = ({ After entering your Issuer information, click the Discover - button to have Talk complete the remaining fields. You may also + button to have Coral complete the remaining fields. You may also enter the information manually diff --git a/src/core/client/admin/routes/configure/sections/auth/components/RedirectField.tsx b/src/core/client/admin/routes/configure/sections/auth/components/RedirectField.tsx index ea758a6c9..e90249565 100644 --- a/src/core/client/admin/routes/configure/sections/auth/components/RedirectField.tsx +++ b/src/core/client/admin/routes/configure/sections/auth/components/RedirectField.tsx @@ -1,8 +1,8 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; -import { CopyButton } from "talk-framework/components"; -import { Flex, FormField, InputLabel, TextField } from "talk-ui/components"; +import { CopyButton } from "coral-framework/components"; +import { Flex, FormField, InputLabel, TextField } from "coral-ui/components"; interface Props { description?: React.ReactNode; diff --git a/src/core/client/admin/routes/configure/sections/auth/components/RegistrationField.tsx b/src/core/client/admin/routes/configure/sections/auth/components/RegistrationField.tsx index 1848ad3c7..336f821ff 100644 --- a/src/core/client/admin/routes/configure/sections/auth/components/RegistrationField.tsx +++ b/src/core/client/admin/routes/configure/sections/auth/components/RegistrationField.tsx @@ -2,7 +2,7 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; -import { CheckBox, FormField, InputLabel } from "talk-ui/components"; +import { CheckBox, FormField, InputLabel } from "coral-ui/components"; import ConfigDescription from "./ConfigDescription"; diff --git a/src/core/client/admin/routes/configure/sections/auth/components/SSOConfig.tsx b/src/core/client/admin/routes/configure/sections/auth/components/SSOConfig.tsx index e795b8b9e..c7a20ad70 100644 --- a/src/core/client/admin/routes/configure/sections/auth/components/SSOConfig.tsx +++ b/src/core/client/admin/routes/configure/sections/auth/components/SSOConfig.tsx @@ -1,8 +1,8 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; -import { PropTypesOf } from "talk-framework/types"; -import { HorizontalGutter } from "talk-ui/components"; +import { PropTypesOf } from "coral-framework/types"; +import { HorizontalGutter } from "coral-ui/components"; import SSOKeyFieldContainer from "../containers/SSOKeyFieldContainer"; import ConfigBoxWithToggleField from "./ConfigBoxWithToggleField"; diff --git a/src/core/client/admin/routes/configure/sections/auth/components/SSOKeyField.css b/src/core/client/admin/routes/configure/sections/auth/components/SSOKeyField.css index cc3665d27..4d3dce4eb 100644 --- a/src/core/client/admin/routes/configure/sections/auth/components/SSOKeyField.css +++ b/src/core/client/admin/routes/configure/sections/auth/components/SSOKeyField.css @@ -1,5 +1,5 @@ .keyGenerated { - composes: button from "talk-ui/shared/typography.css"; + composes: button from "coral-ui/shared/typography.css"; color: var(--palette-text-secondary); width: calc(29 * var(--mini-unit)); flex-shrink: 0; diff --git a/src/core/client/admin/routes/configure/sections/auth/components/SSOKeyField.tsx b/src/core/client/admin/routes/configure/sections/auth/components/SSOKeyField.tsx index 577360c60..34e506eda 100644 --- a/src/core/client/admin/routes/configure/sections/auth/components/SSOKeyField.tsx +++ b/src/core/client/admin/routes/configure/sections/auth/components/SSOKeyField.tsx @@ -9,7 +9,7 @@ import { InputLabel, TextField, Typography, -} from "talk-ui/components"; +} from "coral-ui/components"; import styles from "./SSOKeyField.css"; diff --git a/src/core/client/admin/routes/configure/sections/auth/components/TargetFilterField.tsx b/src/core/client/admin/routes/configure/sections/auth/components/TargetFilterField.tsx index 0ac075b3e..21d5e9c37 100644 --- a/src/core/client/admin/routes/configure/sections/auth/components/TargetFilterField.tsx +++ b/src/core/client/admin/routes/configure/sections/auth/components/TargetFilterField.tsx @@ -1,9 +1,9 @@ +import { parseBool } from "coral-framework/lib/form"; import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; -import { parseBool } from "talk-framework/lib/form"; -import { CheckBox, Flex, FormField, InputLabel } from "talk-ui/components"; +import { CheckBox, Flex, FormField, InputLabel } from "coral-ui/components"; interface Props { label: React.ReactNode; @@ -21,7 +21,7 @@ const TargetFilterField: FunctionComponent = ({ {({ input, meta }) => ( - + = ({ checked={!!input.value} disabled={disabled} > - Talk Admin + Coral Admin )} diff --git a/src/core/client/admin/routes/configure/sections/auth/containers/AuthConfigContainer.tsx b/src/core/client/admin/routes/configure/sections/auth/containers/AuthConfigContainer.tsx index 2c2d1b63e..7de5274c2 100644 --- a/src/core/client/admin/routes/configure/sections/auth/containers/AuthConfigContainer.tsx +++ b/src/core/client/admin/routes/configure/sections/auth/containers/AuthConfigContainer.tsx @@ -5,22 +5,22 @@ import { get } from "lodash"; import React from "react"; import { graphql } from "react-relay"; -import { AuthConfigContainer_auth as AuthData } from "talk-admin/__generated__/AuthConfigContainer_auth.graphql"; -import { pureMerge } from "talk-common/utils"; -import { TalkContext, withContext } from "talk-framework/lib/bootstrap"; +import { AuthConfigContainer_auth as AuthData } from "coral-admin/__generated__/AuthConfigContainer_auth.graphql"; +import { pureMerge } from "coral-common/utils"; +import { CoralContext, withContext } from "coral-framework/lib/bootstrap"; import { AddSubmitHook, RemoveSubmitHook, SubmitHook, withSubmitHookContext, -} from "talk-framework/lib/form"; -import { getMessage } from "talk-framework/lib/i18n"; -import { withFragmentContainer } from "talk-framework/lib/relay"; +} from "coral-framework/lib/form"; +import { getMessage } from "coral-framework/lib/i18n"; +import { withFragmentContainer } from "coral-framework/lib/relay"; import AuthConfig from "../components/AuthConfig"; interface Props { - localeBundles: TalkContext["localeBundles"]; + localeBundles: CoralContext["localeBundles"]; form: FormApi; submitting?: boolean; addSubmitHook: AddSubmitHook; @@ -58,7 +58,7 @@ class AuthConfigContainer extends React.Component { [FORM_ERROR]: ( - Please enable at least one authentication integration for Talk + Please enable at least one authentication integration for Coral Admin diff --git a/src/core/client/admin/routes/configure/sections/auth/containers/AuthConfigRouteContainer.tsx b/src/core/client/admin/routes/configure/sections/auth/containers/AuthConfigRouteContainer.tsx index e8e7a50ed..0716a3b38 100644 --- a/src/core/client/admin/routes/configure/sections/auth/containers/AuthConfigRouteContainer.tsx +++ b/src/core/client/admin/routes/configure/sections/auth/containers/AuthConfigRouteContainer.tsx @@ -2,9 +2,9 @@ import { FormApi } from "final-form"; import React from "react"; import { graphql } from "react-relay"; -import { AuthConfigRouteContainerQueryResponse } from "talk-admin/__generated__/AuthConfigRouteContainerQuery.graphql"; -import { withRouteConfig } from "talk-framework/lib/router"; -import { Delay, Spinner } from "talk-ui/components"; +import { AuthConfigRouteContainerQueryResponse } from "coral-admin/__generated__/AuthConfigRouteContainerQuery.graphql"; +import { withRouteConfig } from "coral-framework/lib/router"; +import { Delay, Spinner } from "coral-ui/components"; import AuthConfigContainer from "./AuthConfigContainer"; diff --git a/src/core/client/admin/routes/configure/sections/auth/containers/FacebookConfigContainer.tsx b/src/core/client/admin/routes/configure/sections/auth/containers/FacebookConfigContainer.tsx index fddaf3b7c..0fced2201 100644 --- a/src/core/client/admin/routes/configure/sections/auth/containers/FacebookConfigContainer.tsx +++ b/src/core/client/admin/routes/configure/sections/auth/containers/FacebookConfigContainer.tsx @@ -1,9 +1,9 @@ import React from "react"; import { graphql } from "react-relay"; -import { FacebookConfigContainer_auth as AuthData } from "talk-admin/__generated__/FacebookConfigContainer_auth.graphql"; -import { FacebookConfigContainer_authReadOnly as AuthReadOnlyData } from "talk-admin/__generated__/FacebookConfigContainer_authReadOnly.graphql"; -import { withFragmentContainer } from "talk-framework/lib/relay"; +import { FacebookConfigContainer_auth as AuthData } from "coral-admin/__generated__/FacebookConfigContainer_auth.graphql"; +import { FacebookConfigContainer_authReadOnly as AuthReadOnlyData } from "coral-admin/__generated__/FacebookConfigContainer_authReadOnly.graphql"; +import { withFragmentContainer } from "coral-framework/lib/relay"; import FacebookConfig from "../components/FacebookConfig"; diff --git a/src/core/client/admin/routes/configure/sections/auth/containers/GoogleConfigContainer.tsx b/src/core/client/admin/routes/configure/sections/auth/containers/GoogleConfigContainer.tsx index b38e4136f..f1f24dd49 100644 --- a/src/core/client/admin/routes/configure/sections/auth/containers/GoogleConfigContainer.tsx +++ b/src/core/client/admin/routes/configure/sections/auth/containers/GoogleConfigContainer.tsx @@ -1,9 +1,9 @@ import React from "react"; import { graphql } from "react-relay"; -import { GoogleConfigContainer_auth as AuthData } from "talk-admin/__generated__/GoogleConfigContainer_auth.graphql"; -import { GoogleConfigContainer_authReadOnly as AuthReadOnlyData } from "talk-admin/__generated__/GoogleConfigContainer_authReadOnly.graphql"; -import { withFragmentContainer } from "talk-framework/lib/relay"; +import { GoogleConfigContainer_auth as AuthData } from "coral-admin/__generated__/GoogleConfigContainer_auth.graphql"; +import { GoogleConfigContainer_authReadOnly as AuthReadOnlyData } from "coral-admin/__generated__/GoogleConfigContainer_authReadOnly.graphql"; +import { withFragmentContainer } from "coral-framework/lib/relay"; import GoogleConfig from "../components/GoogleConfig"; diff --git a/src/core/client/admin/routes/configure/sections/auth/containers/LocalAuthConfigContainer.tsx b/src/core/client/admin/routes/configure/sections/auth/containers/LocalAuthConfigContainer.tsx index 7c3b18dca..76c1a9f69 100644 --- a/src/core/client/admin/routes/configure/sections/auth/containers/LocalAuthConfigContainer.tsx +++ b/src/core/client/admin/routes/configure/sections/auth/containers/LocalAuthConfigContainer.tsx @@ -1,8 +1,8 @@ import React from "react"; import { graphql } from "react-relay"; -import { LocalAuthConfigContainer_auth as AuthData } from "talk-admin/__generated__/LocalAuthConfigContainer_auth.graphql"; -import { withFragmentContainer } from "talk-framework/lib/relay"; +import { LocalAuthConfigContainer_auth as AuthData } from "coral-admin/__generated__/LocalAuthConfigContainer_auth.graphql"; +import { withFragmentContainer } from "coral-framework/lib/relay"; import LocalAuthConfig from "../components/LocalAuthConfig"; diff --git a/src/core/client/admin/routes/configure/sections/auth/containers/OIDCConfigContainer.tsx b/src/core/client/admin/routes/configure/sections/auth/containers/OIDCConfigContainer.tsx index 585824ce4..9c5095697 100644 --- a/src/core/client/admin/routes/configure/sections/auth/containers/OIDCConfigContainer.tsx +++ b/src/core/client/admin/routes/configure/sections/auth/containers/OIDCConfigContainer.tsx @@ -4,14 +4,14 @@ import { ReactContext, withReactFinalForm } from "react-final-form"; import { graphql } from "react-relay"; import { InferableComponentEnhancer } from "recompose"; -import { OIDCConfigContainer_auth as AuthData } from "talk-admin/__generated__/OIDCConfigContainer_auth.graphql"; -import { OIDCConfigContainer_authReadOnly as AuthReadOnlyData } from "talk-admin/__generated__/OIDCConfigContainer_authReadOnly.graphql"; -import { DiscoverOIDCConfigurationFetch } from "talk-admin/fetches"; +import { OIDCConfigContainer_auth as AuthData } from "coral-admin/__generated__/OIDCConfigContainer_auth.graphql"; +import { OIDCConfigContainer_authReadOnly as AuthReadOnlyData } from "coral-admin/__generated__/OIDCConfigContainer_authReadOnly.graphql"; +import { DiscoverOIDCConfigurationFetch } from "coral-admin/fetches"; import { FetchProp, withFetch, withFragmentContainer, -} from "talk-framework/lib/relay"; +} from "coral-framework/lib/relay"; import OIDCConfig from "../components/OIDCConfig"; diff --git a/src/core/client/admin/routes/configure/sections/auth/containers/SSOConfigContainer.tsx b/src/core/client/admin/routes/configure/sections/auth/containers/SSOConfigContainer.tsx index 3201d0b98..0b2692641 100644 --- a/src/core/client/admin/routes/configure/sections/auth/containers/SSOConfigContainer.tsx +++ b/src/core/client/admin/routes/configure/sections/auth/containers/SSOConfigContainer.tsx @@ -1,9 +1,9 @@ import React from "react"; import { graphql } from "react-relay"; -import { SSOConfigContainer_auth as AuthData } from "talk-admin/__generated__/SSOConfigContainer_auth.graphql"; -import { SSOConfigContainer_authReadOnly as AuthReadOnlyData } from "talk-admin/__generated__/SSOConfigContainer_authReadOnly.graphql"; -import { withFragmentContainer } from "talk-framework/lib/relay"; +import { SSOConfigContainer_auth as AuthData } from "coral-admin/__generated__/SSOConfigContainer_auth.graphql"; +import { SSOConfigContainer_authReadOnly as AuthReadOnlyData } from "coral-admin/__generated__/SSOConfigContainer_authReadOnly.graphql"; +import { withFragmentContainer } from "coral-framework/lib/relay"; import SSOConfig from "../components/SSOConfig"; diff --git a/src/core/client/admin/routes/configure/sections/auth/containers/SSOKeyFieldContainer.tsx b/src/core/client/admin/routes/configure/sections/auth/containers/SSOKeyFieldContainer.tsx index b4154008c..0a97297b3 100644 --- a/src/core/client/admin/routes/configure/sections/auth/containers/SSOKeyFieldContainer.tsx +++ b/src/core/client/admin/routes/configure/sections/auth/containers/SSOKeyFieldContainer.tsx @@ -1,13 +1,13 @@ import React from "react"; import { graphql } from "react-relay"; -import { SSOKeyFieldContainer_sso as SSOData } from "talk-admin/__generated__/SSOKeyFieldContainer_sso.graphql"; -import { RegenerateSSOKeyMutation } from "talk-admin/mutations"; +import { SSOKeyFieldContainer_sso as SSOData } from "coral-admin/__generated__/SSOKeyFieldContainer_sso.graphql"; +import { RegenerateSSOKeyMutation } from "coral-admin/mutations"; import { MutationProp, withFragmentContainer, withMutation, -} from "talk-framework/lib/relay"; +} from "coral-framework/lib/relay"; import SSOKeyField from "../components/SSOKeyField"; diff --git a/src/core/client/admin/routes/configure/sections/general/components/ClosedStreamMessageConfig.tsx b/src/core/client/admin/routes/configure/sections/general/components/ClosedStreamMessageConfig.tsx index 6761a800e..0d463e870 100644 --- a/src/core/client/admin/routes/configure/sections/general/components/ClosedStreamMessageConfig.tsx +++ b/src/core/client/admin/routes/configure/sections/general/components/ClosedStreamMessageConfig.tsx @@ -2,13 +2,13 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, Suspense } from "react"; import { Field } from "react-final-form"; -import { MarkdownEditor } from "talk-framework/components/loadables"; +import { MarkdownEditor } from "coral-framework/components/loadables"; import { HorizontalGutter, Spinner, Typography, ValidationMessage, -} from "talk-ui/components"; +} from "coral-ui/components"; import Header from "../../../components/Header"; diff --git a/src/core/client/admin/routes/configure/sections/general/components/ClosingCommentStreamsConfig.tsx b/src/core/client/admin/routes/configure/sections/general/components/ClosingCommentStreamsConfig.tsx index 7c44087be..9f067052c 100644 --- a/src/core/client/admin/routes/configure/sections/general/components/ClosingCommentStreamsConfig.tsx +++ b/src/core/client/admin/routes/configure/sections/general/components/ClosingCommentStreamsConfig.tsx @@ -1,7 +1,7 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; -import { DURATION_UNIT, DurationField } from "talk-framework/components"; +import { DURATION_UNIT, DurationField } from "coral-framework/components"; import { FieldSet, FormField, @@ -9,15 +9,15 @@ import { InputLabel, Typography, ValidationMessage, -} from "talk-ui/components"; +} from "coral-ui/components"; -import { Field } from "react-final-form"; -import OnOffField from "talk-admin/routes/configure/components/OnOffField"; +import OnOffField from "coral-admin/routes/configure/components/OnOffField"; import { composeValidators, required, validateWholeNumberGreaterThan, -} from "talk-framework/lib/validation"; +} from "coral-framework/lib/validation"; +import { Field } from "react-final-form"; import Header from "../../../components/Header"; diff --git a/src/core/client/admin/routes/configure/sections/general/components/CommentEditingConfig.tsx b/src/core/client/admin/routes/configure/sections/general/components/CommentEditingConfig.tsx index 3d2819fb3..8d6e39eb5 100644 --- a/src/core/client/admin/routes/configure/sections/general/components/CommentEditingConfig.tsx +++ b/src/core/client/admin/routes/configure/sections/general/components/CommentEditingConfig.tsx @@ -2,12 +2,12 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; -import { DURATION_UNIT, DurationField } from "talk-framework/components"; +import { DURATION_UNIT, DurationField } from "coral-framework/components"; import { composeValidators, required, validateWholeNumberGreaterThanOrEqual, -} from "talk-framework/lib/validation"; +} from "coral-framework/lib/validation"; import { FieldSet, FormField, @@ -15,7 +15,7 @@ import { InputLabel, Typography, ValidationMessage, -} from "talk-ui/components"; +} from "coral-ui/components"; import Header from "../../../components/Header"; diff --git a/src/core/client/admin/routes/configure/sections/general/components/CommentLengthConfig.tsx b/src/core/client/admin/routes/configure/sections/general/components/CommentLengthConfig.tsx index 43a42b250..13f01789f 100644 --- a/src/core/client/admin/routes/configure/sections/general/components/CommentLengthConfig.tsx +++ b/src/core/client/admin/routes/configure/sections/general/components/CommentLengthConfig.tsx @@ -6,7 +6,7 @@ import { composeValidators, createValidator, validateWholeNumberGreaterThan, -} from "talk-framework/lib/validation"; +} from "coral-framework/lib/validation"; import { FieldSet, FormField, @@ -15,12 +15,12 @@ import { TextField, Typography, ValidationMessage, -} from "talk-ui/components"; +} from "coral-ui/components"; import Header from "../../../components/Header"; import OnOffField from "../../../components/OnOffField"; -import { formatEmpty, parseEmptyAsNull } from "talk-framework/lib/form"; +import { formatEmpty, parseEmptyAsNull } from "coral-framework/lib/form"; import styles from "./CommentLengthConfig.css"; const validateMaxLongerThanMin = createValidator( diff --git a/src/core/client/admin/routes/configure/sections/general/components/GeneralConfig.tsx b/src/core/client/admin/routes/configure/sections/general/components/GeneralConfig.tsx index a4f393e50..7030f2cff 100644 --- a/src/core/client/admin/routes/configure/sections/general/components/GeneralConfig.tsx +++ b/src/core/client/admin/routes/configure/sections/general/components/GeneralConfig.tsx @@ -1,7 +1,7 @@ import React, { FunctionComponent } from "react"; -import { PropTypesOf } from "talk-framework/types"; -import { HorizontalGutter } from "talk-ui/components"; +import { PropTypesOf } from "coral-framework/types"; +import { HorizontalGutter } from "coral-ui/components"; import ClosedStreamMessageConfigContainer from "../containers/ClosedStreamMessageConfigContainer"; import ClosingCommentStreamsConfigContainer from "../containers/ClosingCommentStreamsConfigContainer"; diff --git a/src/core/client/admin/routes/configure/sections/general/components/GuidelinesConfig.tsx b/src/core/client/admin/routes/configure/sections/general/components/GuidelinesConfig.tsx index 183ee926f..9af09808e 100644 --- a/src/core/client/admin/routes/configure/sections/general/components/GuidelinesConfig.tsx +++ b/src/core/client/admin/routes/configure/sections/general/components/GuidelinesConfig.tsx @@ -2,7 +2,7 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, Suspense } from "react"; import { Field } from "react-final-form"; -import { ExternalLink } from "talk-framework/lib/i18n/components"; +import { ExternalLink } from "coral-framework/lib/i18n/components"; import { FieldSet, FormField, @@ -11,10 +11,10 @@ import { Spinner, Typography, ValidationMessage, -} from "talk-ui/components"; +} from "coral-ui/components"; -import OnOffField from "talk-admin/routes/configure/components/OnOffField"; -import { MarkdownEditor } from "talk-framework/components/loadables"; +import OnOffField from "coral-admin/routes/configure/components/OnOffField"; +import { MarkdownEditor } from "coral-framework/components/loadables"; import Header from "../../../components/Header"; diff --git a/src/core/client/admin/routes/configure/sections/general/components/SitewideCommentingConfig.tsx b/src/core/client/admin/routes/configure/sections/general/components/SitewideCommentingConfig.tsx index 24d8e8273..3a72f8084 100644 --- a/src/core/client/admin/routes/configure/sections/general/components/SitewideCommentingConfig.tsx +++ b/src/core/client/admin/routes/configure/sections/general/components/SitewideCommentingConfig.tsx @@ -10,10 +10,10 @@ import { Spinner, Typography, ValidationMessage, -} from "talk-ui/components"; +} from "coral-ui/components"; -import OnOffField from "talk-admin/routes/configure/components/OnOffField"; -import { MarkdownEditor } from "talk-framework/components/loadables"; +import OnOffField from "coral-admin/routes/configure/components/OnOffField"; +import { MarkdownEditor } from "coral-framework/components/loadables"; import Header from "../../../components/Header"; diff --git a/src/core/client/admin/routes/configure/sections/general/containers/ClosedStreamMessageConfigContainer.tsx b/src/core/client/admin/routes/configure/sections/general/containers/ClosedStreamMessageConfigContainer.tsx index 21a948912..f26a1fd3f 100644 --- a/src/core/client/admin/routes/configure/sections/general/containers/ClosedStreamMessageConfigContainer.tsx +++ b/src/core/client/admin/routes/configure/sections/general/containers/ClosedStreamMessageConfigContainer.tsx @@ -1,8 +1,8 @@ import React from "react"; import { graphql } from "react-relay"; -import { ClosedStreamMessageConfigContainer_settings as SettingsData } from "talk-admin/__generated__/ClosedStreamMessageConfigContainer_settings.graphql"; -import { withFragmentContainer } from "talk-framework/lib/relay"; +import { ClosedStreamMessageConfigContainer_settings as SettingsData } from "coral-admin/__generated__/ClosedStreamMessageConfigContainer_settings.graphql"; +import { withFragmentContainer } from "coral-framework/lib/relay"; import ClosedStreamMessageConfig from "../components/ClosedStreamMessageConfig"; diff --git a/src/core/client/admin/routes/configure/sections/general/containers/ClosingCommentStreamsConfigContainer.tsx b/src/core/client/admin/routes/configure/sections/general/containers/ClosingCommentStreamsConfigContainer.tsx index dd0505313..e2cd5d6d8 100644 --- a/src/core/client/admin/routes/configure/sections/general/containers/ClosingCommentStreamsConfigContainer.tsx +++ b/src/core/client/admin/routes/configure/sections/general/containers/ClosingCommentStreamsConfigContainer.tsx @@ -1,8 +1,8 @@ import React from "react"; import { graphql } from "react-relay"; -import { ClosingCommentStreamsConfigContainer_settings as SettingsData } from "talk-admin/__generated__/ClosingCommentStreamsConfigContainer_settings.graphql"; -import { withFragmentContainer } from "talk-framework/lib/relay"; +import { ClosingCommentStreamsConfigContainer_settings as SettingsData } from "coral-admin/__generated__/ClosingCommentStreamsConfigContainer_settings.graphql"; +import { withFragmentContainer } from "coral-framework/lib/relay"; import ClosingCommentStreamsConfig from "../components/ClosingCommentStreamsConfig"; diff --git a/src/core/client/admin/routes/configure/sections/general/containers/CommentEditingConfigContainer.tsx b/src/core/client/admin/routes/configure/sections/general/containers/CommentEditingConfigContainer.tsx index 527dc3b1d..1654a619d 100644 --- a/src/core/client/admin/routes/configure/sections/general/containers/CommentEditingConfigContainer.tsx +++ b/src/core/client/admin/routes/configure/sections/general/containers/CommentEditingConfigContainer.tsx @@ -1,8 +1,8 @@ import React from "react"; import { graphql } from "react-relay"; -import { CommentEditingConfigContainer_settings as SettingsData } from "talk-admin/__generated__/CommentEditingConfigContainer_settings.graphql"; -import { withFragmentContainer } from "talk-framework/lib/relay"; +import { CommentEditingConfigContainer_settings as SettingsData } from "coral-admin/__generated__/CommentEditingConfigContainer_settings.graphql"; +import { withFragmentContainer } from "coral-framework/lib/relay"; import CommentEditingConfig from "../components/CommentEditingConfig"; diff --git a/src/core/client/admin/routes/configure/sections/general/containers/CommentLengthConfigContainer.tsx b/src/core/client/admin/routes/configure/sections/general/containers/CommentLengthConfigContainer.tsx index 29859ac5b..f8cb12cbd 100644 --- a/src/core/client/admin/routes/configure/sections/general/containers/CommentLengthConfigContainer.tsx +++ b/src/core/client/admin/routes/configure/sections/general/containers/CommentLengthConfigContainer.tsx @@ -1,8 +1,8 @@ import React from "react"; import { graphql } from "react-relay"; -import { CommentLengthConfigContainer_settings as SettingsData } from "talk-admin/__generated__/CommentLengthConfigContainer_settings.graphql"; -import { withFragmentContainer } from "talk-framework/lib/relay"; +import { CommentLengthConfigContainer_settings as SettingsData } from "coral-admin/__generated__/CommentLengthConfigContainer_settings.graphql"; +import { withFragmentContainer } from "coral-framework/lib/relay"; import CommentLengthConfig from "../components/CommentLengthConfig"; diff --git a/src/core/client/admin/routes/configure/sections/general/containers/GeneralConfigContainer.tsx b/src/core/client/admin/routes/configure/sections/general/containers/GeneralConfigContainer.tsx index 37dde46c6..58acffcf3 100644 --- a/src/core/client/admin/routes/configure/sections/general/containers/GeneralConfigContainer.tsx +++ b/src/core/client/admin/routes/configure/sections/general/containers/GeneralConfigContainer.tsx @@ -3,9 +3,9 @@ import { RouteProps } from "found"; import React from "react"; import { graphql } from "react-relay"; -import { GeneralConfigContainer_settings as SettingsData } from "talk-admin/__generated__/GeneralConfigContainer_settings.graphql"; -import { pureMerge } from "talk-common/utils"; -import { withFragmentContainer } from "talk-framework/lib/relay"; +import { GeneralConfigContainer_settings as SettingsData } from "coral-admin/__generated__/GeneralConfigContainer_settings.graphql"; +import { pureMerge } from "coral-common/utils"; +import { withFragmentContainer } from "coral-framework/lib/relay"; import GeneralConfig from "../components/GeneralConfig"; diff --git a/src/core/client/admin/routes/configure/sections/general/containers/GeneralConfigRouteContainer.tsx b/src/core/client/admin/routes/configure/sections/general/containers/GeneralConfigRouteContainer.tsx index 1d1c65193..b6f19841b 100644 --- a/src/core/client/admin/routes/configure/sections/general/containers/GeneralConfigRouteContainer.tsx +++ b/src/core/client/admin/routes/configure/sections/general/containers/GeneralConfigRouteContainer.tsx @@ -2,10 +2,10 @@ import { FormApi } from "final-form"; import React from "react"; import { graphql } from "react-relay"; -import { GeneralConfigRouteContainerQueryResponse } from "talk-admin/__generated__/GeneralConfigRouteContainerQuery.graphql"; -import { loadMarkdownEditor } from "talk-framework/components/loadables"; -import { withRouteConfig } from "talk-framework/lib/router"; -import { Delay, Spinner } from "talk-ui/components"; +import { GeneralConfigRouteContainerQueryResponse } from "coral-admin/__generated__/GeneralConfigRouteContainerQuery.graphql"; +import { loadMarkdownEditor } from "coral-framework/components/loadables"; +import { withRouteConfig } from "coral-framework/lib/router"; +import { Delay, Spinner } from "coral-ui/components"; import GeneralConfigContainer from "./GeneralConfigContainer"; diff --git a/src/core/client/admin/routes/configure/sections/general/containers/GuidelinesConfigContainer.tsx b/src/core/client/admin/routes/configure/sections/general/containers/GuidelinesConfigContainer.tsx index cc3401185..8c71a9319 100644 --- a/src/core/client/admin/routes/configure/sections/general/containers/GuidelinesConfigContainer.tsx +++ b/src/core/client/admin/routes/configure/sections/general/containers/GuidelinesConfigContainer.tsx @@ -1,8 +1,8 @@ import React from "react"; import { graphql } from "react-relay"; -import { GuidelinesConfigContainer_settings as SettingsData } from "talk-admin/__generated__/GuidelinesConfigContainer_settings.graphql"; -import { withFragmentContainer } from "talk-framework/lib/relay"; +import { GuidelinesConfigContainer_settings as SettingsData } from "coral-admin/__generated__/GuidelinesConfigContainer_settings.graphql"; +import { withFragmentContainer } from "coral-framework/lib/relay"; import GuidelinesConfig from "../components/GuidelinesConfig"; diff --git a/src/core/client/admin/routes/configure/sections/general/containers/SitewideCommentingConfigContainer.tsx b/src/core/client/admin/routes/configure/sections/general/containers/SitewideCommentingConfigContainer.tsx index 28a140bf9..17e645cb6 100644 --- a/src/core/client/admin/routes/configure/sections/general/containers/SitewideCommentingConfigContainer.tsx +++ b/src/core/client/admin/routes/configure/sections/general/containers/SitewideCommentingConfigContainer.tsx @@ -1,8 +1,8 @@ import React from "react"; import { graphql } from "react-relay"; -import { SitewideCommentingConfigContainer_settings as SettingsData } from "talk-admin/__generated__/SitewideCommentingConfigContainer_settings.graphql"; -import { withFragmentContainer } from "talk-framework/lib/relay"; +import { SitewideCommentingConfigContainer_settings as SettingsData } from "coral-admin/__generated__/SitewideCommentingConfigContainer_settings.graphql"; +import { withFragmentContainer } from "coral-framework/lib/relay"; import SitewideCommentingConfig from "../components/SitewideCommentingConfig"; diff --git a/src/core/client/admin/routes/configure/sections/moderation/components/APIKeyField.tsx b/src/core/client/admin/routes/configure/sections/moderation/components/APIKeyField.tsx index 118cebb4d..98c00c952 100644 --- a/src/core/client/admin/routes/configure/sections/moderation/components/APIKeyField.tsx +++ b/src/core/client/admin/routes/configure/sections/moderation/components/APIKeyField.tsx @@ -3,8 +3,8 @@ import { identity } from "lodash"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; -import { Validator } from "talk-framework/lib/validation"; -import { FormField, InputLabel, TextField } from "talk-ui/components"; +import { Validator } from "coral-framework/lib/validation"; +import { FormField, InputLabel, TextField } from "coral-ui/components"; import ValidationMessage from "../../../components/ValidationMessage"; diff --git a/src/core/client/admin/routes/configure/sections/moderation/components/AkismetConfig.tsx b/src/core/client/admin/routes/configure/sections/moderation/components/AkismetConfig.tsx index 7e5e667f0..87ca66fc6 100644 --- a/src/core/client/admin/routes/configure/sections/moderation/components/AkismetConfig.tsx +++ b/src/core/client/admin/routes/configure/sections/moderation/components/AkismetConfig.tsx @@ -2,13 +2,13 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; -import { ExternalLink } from "talk-framework/lib/i18n/components"; +import { ExternalLink } from "coral-framework/lib/i18n/components"; import { composeValidators, required, validateURL, Validator, -} from "talk-framework/lib/validation"; +} from "coral-framework/lib/validation"; import { FieldSet, FormField, @@ -16,7 +16,7 @@ import { InputLabel, TextField, Typography, -} from "talk-ui/components"; +} from "coral-ui/components"; import ConfigurationSubHeader from "../../../components/ConfigurationSubHeader"; import Header from "../../../components/Header"; diff --git a/src/core/client/admin/routes/configure/sections/moderation/components/ModerationConfig.spec.tsx b/src/core/client/admin/routes/configure/sections/moderation/components/ModerationConfig.spec.tsx index 4b8f32e18..f2a8f4163 100644 --- a/src/core/client/admin/routes/configure/sections/moderation/components/ModerationConfig.spec.tsx +++ b/src/core/client/admin/routes/configure/sections/moderation/components/ModerationConfig.spec.tsx @@ -2,8 +2,8 @@ import { noop } from "lodash"; import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { removeFragmentRefs } from "talk-framework/testHelpers"; -import { PropTypesOf } from "talk-framework/types"; +import { removeFragmentRefs } from "coral-framework/testHelpers"; +import { PropTypesOf } from "coral-framework/types"; import ModerationConfig from "./ModerationConfig"; diff --git a/src/core/client/admin/routes/configure/sections/moderation/components/ModerationConfig.tsx b/src/core/client/admin/routes/configure/sections/moderation/components/ModerationConfig.tsx index 96abc2a3c..ba6528211 100644 --- a/src/core/client/admin/routes/configure/sections/moderation/components/ModerationConfig.tsx +++ b/src/core/client/admin/routes/configure/sections/moderation/components/ModerationConfig.tsx @@ -1,7 +1,7 @@ import React, { FunctionComponent } from "react"; -import { PropTypesOf } from "talk-framework/types"; -import { HorizontalGutter } from "talk-ui/components"; +import { PropTypesOf } from "coral-framework/types"; +import { HorizontalGutter } from "coral-ui/components"; import AkismetConfigContainer from "../containers/AkismetConfigContainer"; import PerspectiveConfigContainer from "../containers/PerspectiveConfigContainer"; diff --git a/src/core/client/admin/routes/configure/sections/moderation/components/PerspectiveConfig.tsx b/src/core/client/admin/routes/configure/sections/moderation/components/PerspectiveConfig.tsx index 60c1eaa53..d8b98bbc6 100644 --- a/src/core/client/admin/routes/configure/sections/moderation/components/PerspectiveConfig.tsx +++ b/src/core/client/admin/routes/configure/sections/moderation/components/PerspectiveConfig.tsx @@ -3,16 +3,16 @@ import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; -import { formatPercentage, parsePercentage } from "talk-framework/lib/form"; +import { formatPercentage, parsePercentage } from "coral-framework/lib/form"; -import { ExternalLink } from "talk-framework/lib/i18n/components"; +import { ExternalLink } from "coral-framework/lib/i18n/components"; import { composeValidators, required, validatePercentage, validateURL, Validator, -} from "talk-framework/lib/validation"; +} from "coral-framework/lib/validation"; import { FieldSet, FormField, @@ -21,7 +21,7 @@ import { InputLabel, TextField, Typography, -} from "talk-ui/components"; +} from "coral-ui/components"; import ConfigurationSubHeader from "../../../components/ConfigurationSubHeader"; import Header from "../../../components/Header"; diff --git a/src/core/client/admin/routes/configure/sections/moderation/containers/AkismetConfigContainer.tsx b/src/core/client/admin/routes/configure/sections/moderation/containers/AkismetConfigContainer.tsx index 2e4b95752..fccf73ba8 100644 --- a/src/core/client/admin/routes/configure/sections/moderation/containers/AkismetConfigContainer.tsx +++ b/src/core/client/admin/routes/configure/sections/moderation/containers/AkismetConfigContainer.tsx @@ -1,8 +1,8 @@ import React from "react"; import { graphql } from "react-relay"; -import { AkismetConfigContainer_settings as SettingsData } from "talk-admin/__generated__/AkismetConfigContainer_settings.graphql"; -import { withFragmentContainer } from "talk-framework/lib/relay"; +import { AkismetConfigContainer_settings as SettingsData } from "coral-admin/__generated__/AkismetConfigContainer_settings.graphql"; +import { withFragmentContainer } from "coral-framework/lib/relay"; import AkismetConfig from "../components/AkismetConfig"; diff --git a/src/core/client/admin/routes/configure/sections/moderation/containers/ModerationConfigContainer.tsx b/src/core/client/admin/routes/configure/sections/moderation/containers/ModerationConfigContainer.tsx index 3e7b7e2e6..b44b88a41 100644 --- a/src/core/client/admin/routes/configure/sections/moderation/containers/ModerationConfigContainer.tsx +++ b/src/core/client/admin/routes/configure/sections/moderation/containers/ModerationConfigContainer.tsx @@ -3,9 +3,9 @@ import { RouteProps } from "found"; import React from "react"; import { graphql } from "react-relay"; -import { ModerationConfigContainer_settings as SettingsData } from "talk-admin/__generated__/ModerationConfigContainer_settings.graphql"; -import { pureMerge } from "talk-common/utils"; -import { withFragmentContainer } from "talk-framework/lib/relay"; +import { ModerationConfigContainer_settings as SettingsData } from "coral-admin/__generated__/ModerationConfigContainer_settings.graphql"; +import { pureMerge } from "coral-common/utils"; +import { withFragmentContainer } from "coral-framework/lib/relay"; import ModerationConfig from "../components/ModerationConfig"; diff --git a/src/core/client/admin/routes/configure/sections/moderation/containers/ModerationConfigRouteContainer.tsx b/src/core/client/admin/routes/configure/sections/moderation/containers/ModerationConfigRouteContainer.tsx index 68baf059a..68f2bcbb7 100644 --- a/src/core/client/admin/routes/configure/sections/moderation/containers/ModerationConfigRouteContainer.tsx +++ b/src/core/client/admin/routes/configure/sections/moderation/containers/ModerationConfigRouteContainer.tsx @@ -2,9 +2,9 @@ import { FormApi } from "final-form"; import React from "react"; import { graphql } from "react-relay"; -import { ModerationConfigRouteContainerQueryResponse } from "talk-admin/__generated__/ModerationConfigRouteContainerQuery.graphql"; -import { withRouteConfig } from "talk-framework/lib/router"; -import { Delay, Spinner } from "talk-ui/components"; +import { ModerationConfigRouteContainerQueryResponse } from "coral-admin/__generated__/ModerationConfigRouteContainerQuery.graphql"; +import { withRouteConfig } from "coral-framework/lib/router"; +import { Delay, Spinner } from "coral-ui/components"; import ModerationConfigContainer from "./ModerationConfigContainer"; diff --git a/src/core/client/admin/routes/configure/sections/moderation/containers/PerspectiveConfigContainer.tsx b/src/core/client/admin/routes/configure/sections/moderation/containers/PerspectiveConfigContainer.tsx index ed0479eb9..9558a6c3c 100644 --- a/src/core/client/admin/routes/configure/sections/moderation/containers/PerspectiveConfigContainer.tsx +++ b/src/core/client/admin/routes/configure/sections/moderation/containers/PerspectiveConfigContainer.tsx @@ -1,8 +1,8 @@ import React from "react"; import { graphql } from "react-relay"; -import { PerspectiveConfigContainer_settings as SettingsData } from "talk-admin/__generated__/PerspectiveConfigContainer_settings.graphql"; -import { withFragmentContainer } from "talk-framework/lib/relay"; +import { PerspectiveConfigContainer_settings as SettingsData } from "coral-admin/__generated__/PerspectiveConfigContainer_settings.graphql"; +import { withFragmentContainer } from "coral-framework/lib/relay"; import PerspectiveConfig from "../components/PerspectiveConfig"; diff --git a/src/core/client/admin/routes/configure/sections/organization/components/OrganizationConfig.tsx b/src/core/client/admin/routes/configure/sections/organization/components/OrganizationConfig.tsx index 4ea07a190..7df403ee9 100644 --- a/src/core/client/admin/routes/configure/sections/organization/components/OrganizationConfig.tsx +++ b/src/core/client/admin/routes/configure/sections/organization/components/OrganizationConfig.tsx @@ -1,7 +1,7 @@ import React, { FunctionComponent } from "react"; -import { PropTypesOf } from "talk-framework/types"; -import { HorizontalGutter } from "talk-ui/components"; +import { PropTypesOf } from "coral-framework/types"; +import { HorizontalGutter } from "coral-ui/components"; import OrganizationContactEmailConfigContainer from "../containers/OrganizationContactEmailConfigContainer"; import OrganizationNameConfigContainer from "../containers/OrganizationNameConfigContainer"; diff --git a/src/core/client/admin/routes/configure/sections/organization/components/OrganizationContactEmailConfig.tsx b/src/core/client/admin/routes/configure/sections/organization/components/OrganizationContactEmailConfig.tsx index d919488f4..2b7cc73bd 100644 --- a/src/core/client/admin/routes/configure/sections/organization/components/OrganizationContactEmailConfig.tsx +++ b/src/core/client/admin/routes/configure/sections/organization/components/OrganizationContactEmailConfig.tsx @@ -2,14 +2,14 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; -import { required } from "talk-framework/lib/validation"; +import { required } from "coral-framework/lib/validation"; import { FormField, HorizontalGutter, TextField, Typography, ValidationMessage, -} from "talk-ui/components"; +} from "coral-ui/components"; import Header from "../../../components/Header"; diff --git a/src/core/client/admin/routes/configure/sections/organization/components/OrganizationNameConfig.tsx b/src/core/client/admin/routes/configure/sections/organization/components/OrganizationNameConfig.tsx index f16efc6db..b191f384e 100644 --- a/src/core/client/admin/routes/configure/sections/organization/components/OrganizationNameConfig.tsx +++ b/src/core/client/admin/routes/configure/sections/organization/components/OrganizationNameConfig.tsx @@ -2,14 +2,14 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; -import { required } from "talk-framework/lib/validation"; +import { required } from "coral-framework/lib/validation"; import { FormField, HorizontalGutter, TextField, Typography, ValidationMessage, -} from "talk-ui/components"; +} from "coral-ui/components"; import Header from "../../../components/Header"; @@ -34,7 +34,7 @@ const OrganizationNameConfig: FunctionComponent = ({ disabled }) => ( strong={} > - Your organization name will appear on emails sent by Talk to your + Your organization name will appear on emails sent by Coral to your community and organization members diff --git a/src/core/client/admin/routes/configure/sections/organization/containers/OrganizationConfigContainer.tsx b/src/core/client/admin/routes/configure/sections/organization/containers/OrganizationConfigContainer.tsx index 16128c2c7..8bce78f18 100644 --- a/src/core/client/admin/routes/configure/sections/organization/containers/OrganizationConfigContainer.tsx +++ b/src/core/client/admin/routes/configure/sections/organization/containers/OrganizationConfigContainer.tsx @@ -3,9 +3,9 @@ import { RouteProps } from "found"; import React from "react"; import { graphql } from "react-relay"; -import { OrganizationConfigContainer_settings as SettingsData } from "talk-admin/__generated__/OrganizationConfigContainer_settings.graphql"; -import { pureMerge } from "talk-common/utils"; -import { withFragmentContainer } from "talk-framework/lib/relay"; +import { OrganizationConfigContainer_settings as SettingsData } from "coral-admin/__generated__/OrganizationConfigContainer_settings.graphql"; +import { pureMerge } from "coral-common/utils"; +import { withFragmentContainer } from "coral-framework/lib/relay"; import OrganizationConfig from "../components/OrganizationConfig"; diff --git a/src/core/client/admin/routes/configure/sections/organization/containers/OrganizationContactEmailConfigContainer.tsx b/src/core/client/admin/routes/configure/sections/organization/containers/OrganizationContactEmailConfigContainer.tsx index 15bfea03e..00b6e48cc 100644 --- a/src/core/client/admin/routes/configure/sections/organization/containers/OrganizationContactEmailConfigContainer.tsx +++ b/src/core/client/admin/routes/configure/sections/organization/containers/OrganizationContactEmailConfigContainer.tsx @@ -1,8 +1,8 @@ import React from "react"; import { graphql } from "react-relay"; -import { OrganizationContactEmailConfigContainer_settings as SettingsData } from "talk-admin/__generated__/OrganizationContactEmailConfigContainer_settings.graphql"; -import { withFragmentContainer } from "talk-framework/lib/relay"; +import { OrganizationContactEmailConfigContainer_settings as SettingsData } from "coral-admin/__generated__/OrganizationContactEmailConfigContainer_settings.graphql"; +import { withFragmentContainer } from "coral-framework/lib/relay"; import OrganizationContactEmailConfig from "../components/OrganizationContactEmailConfig"; diff --git a/src/core/client/admin/routes/configure/sections/organization/containers/OrganizationNameConfigContainer.tsx b/src/core/client/admin/routes/configure/sections/organization/containers/OrganizationNameConfigContainer.tsx index 7c91f4554..ab1b6a178 100644 --- a/src/core/client/admin/routes/configure/sections/organization/containers/OrganizationNameConfigContainer.tsx +++ b/src/core/client/admin/routes/configure/sections/organization/containers/OrganizationNameConfigContainer.tsx @@ -1,8 +1,8 @@ import React from "react"; import { graphql } from "react-relay"; -import { OrganizationNameConfigContainer_settings as SettingsData } from "talk-admin/__generated__/OrganizationNameConfigContainer_settings.graphql"; -import { withFragmentContainer } from "talk-framework/lib/relay"; +import { OrganizationNameConfigContainer_settings as SettingsData } from "coral-admin/__generated__/OrganizationNameConfigContainer_settings.graphql"; +import { withFragmentContainer } from "coral-framework/lib/relay"; import OrganizationNameConfig from "../components/OrganizationNameConfig"; diff --git a/src/core/client/admin/routes/configure/sections/organization/containers/OrganizationRouteContainer.tsx b/src/core/client/admin/routes/configure/sections/organization/containers/OrganizationRouteContainer.tsx index 5059ad107..f83451b3e 100644 --- a/src/core/client/admin/routes/configure/sections/organization/containers/OrganizationRouteContainer.tsx +++ b/src/core/client/admin/routes/configure/sections/organization/containers/OrganizationRouteContainer.tsx @@ -2,9 +2,9 @@ import { FormApi } from "final-form"; import React from "react"; import { graphql } from "react-relay"; -import { OrganizationRouteContainerQueryResponse } from "talk-admin/__generated__/OrganizationRouteContainerQuery.graphql"; -import { withRouteConfig } from "talk-framework/lib/router"; -import { Delay, Spinner } from "talk-ui/components"; +import { OrganizationRouteContainerQueryResponse } from "coral-admin/__generated__/OrganizationRouteContainerQuery.graphql"; +import { withRouteConfig } from "coral-framework/lib/router"; +import { Delay, Spinner } from "coral-ui/components"; import OrganizationConfigContainer from "./OrganizationConfigContainer"; diff --git a/src/core/client/admin/routes/configure/sections/wordList/components/BannedWordListConfig.tsx b/src/core/client/admin/routes/configure/sections/wordList/components/BannedWordListConfig.tsx index d8fa1598a..08c464bb4 100644 --- a/src/core/client/admin/routes/configure/sections/wordList/components/BannedWordListConfig.tsx +++ b/src/core/client/admin/routes/configure/sections/wordList/components/BannedWordListConfig.tsx @@ -1,14 +1,14 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; -import { ExternalLink } from "talk-framework/lib/i18n/components"; +import { ExternalLink } from "coral-framework/lib/i18n/components"; import { FormField, HorizontalGutter, InputDescription, InputLabel, Typography, -} from "talk-ui/components"; +} from "coral-ui/components"; import Header from "../../../components/Header"; import WordListTextArea from "./WordListTextArea"; diff --git a/src/core/client/admin/routes/configure/sections/wordList/components/SuspectWordListConfig.tsx b/src/core/client/admin/routes/configure/sections/wordList/components/SuspectWordListConfig.tsx index 51060576d..6598c1228 100644 --- a/src/core/client/admin/routes/configure/sections/wordList/components/SuspectWordListConfig.tsx +++ b/src/core/client/admin/routes/configure/sections/wordList/components/SuspectWordListConfig.tsx @@ -1,14 +1,14 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; -import { ExternalLink } from "talk-framework/lib/i18n/components"; +import { ExternalLink } from "coral-framework/lib/i18n/components"; import { FormField, HorizontalGutter, InputDescription, InputLabel, Typography, -} from "talk-ui/components"; +} from "coral-ui/components"; import Header from "../../../components/Header"; import WordListTextArea from "./WordListTextArea"; diff --git a/src/core/client/admin/routes/configure/sections/wordList/components/WordListConfig.tsx b/src/core/client/admin/routes/configure/sections/wordList/components/WordListConfig.tsx index 7dae3b496..8d651ecf4 100644 --- a/src/core/client/admin/routes/configure/sections/wordList/components/WordListConfig.tsx +++ b/src/core/client/admin/routes/configure/sections/wordList/components/WordListConfig.tsx @@ -1,7 +1,7 @@ import React, { FunctionComponent } from "react"; -import { PropTypesOf } from "talk-framework/types"; -import { HorizontalGutter } from "talk-ui/components"; +import { PropTypesOf } from "coral-framework/types"; +import { HorizontalGutter } from "coral-ui/components"; import BannedWordListConfigContainer from "../containers/BannedWordListConfigContainer"; import SuspectWordListConfigContainer from "../containers/SuspectWordListConfigContainer"; diff --git a/src/core/client/admin/routes/configure/sections/wordList/components/WordListTextArea.tsx b/src/core/client/admin/routes/configure/sections/wordList/components/WordListTextArea.tsx index c0f9ec1de..c25857ed9 100644 --- a/src/core/client/admin/routes/configure/sections/wordList/components/WordListTextArea.tsx +++ b/src/core/client/admin/routes/configure/sections/wordList/components/WordListTextArea.tsx @@ -5,8 +5,8 @@ import { Field } from "react-final-form"; import { formatNewLineDelimitedString, parseNewLineDelimitedString, -} from "talk-framework/lib/form"; -import { Validator } from "talk-framework/lib/validation"; +} from "coral-framework/lib/form"; +import { Validator } from "coral-framework/lib/validation"; import ValidationMessage from "../../../components/ValidationMessage"; diff --git a/src/core/client/admin/routes/configure/sections/wordList/containers/BannedWordListConfigContainer.tsx b/src/core/client/admin/routes/configure/sections/wordList/containers/BannedWordListConfigContainer.tsx index 2e3575e79..fd44703a8 100644 --- a/src/core/client/admin/routes/configure/sections/wordList/containers/BannedWordListConfigContainer.tsx +++ b/src/core/client/admin/routes/configure/sections/wordList/containers/BannedWordListConfigContainer.tsx @@ -1,8 +1,8 @@ import React from "react"; import { graphql } from "react-relay"; -import { BannedWordListConfigContainer_settings as SettingsData } from "talk-admin/__generated__/BannedWordListConfigContainer_settings.graphql"; -import { withFragmentContainer } from "talk-framework/lib/relay"; +import { BannedWordListConfigContainer_settings as SettingsData } from "coral-admin/__generated__/BannedWordListConfigContainer_settings.graphql"; +import { withFragmentContainer } from "coral-framework/lib/relay"; import BannedWordListConfig from "../components/BannedWordListConfig"; diff --git a/src/core/client/admin/routes/configure/sections/wordList/containers/SuspectWordListConfigContainer.tsx b/src/core/client/admin/routes/configure/sections/wordList/containers/SuspectWordListConfigContainer.tsx index 7ba3f2e49..02bbd0b2b 100644 --- a/src/core/client/admin/routes/configure/sections/wordList/containers/SuspectWordListConfigContainer.tsx +++ b/src/core/client/admin/routes/configure/sections/wordList/containers/SuspectWordListConfigContainer.tsx @@ -1,8 +1,8 @@ import React from "react"; import { graphql } from "react-relay"; -import { SuspectWordListConfigContainer_settings as SettingsData } from "talk-admin/__generated__/SuspectWordListConfigContainer_settings.graphql"; -import { withFragmentContainer } from "talk-framework/lib/relay"; +import { SuspectWordListConfigContainer_settings as SettingsData } from "coral-admin/__generated__/SuspectWordListConfigContainer_settings.graphql"; +import { withFragmentContainer } from "coral-framework/lib/relay"; import SuspectWordListConfig from "../components/SuspectWordListConfig"; diff --git a/src/core/client/admin/routes/configure/sections/wordList/containers/WordListConfigContainer.tsx b/src/core/client/admin/routes/configure/sections/wordList/containers/WordListConfigContainer.tsx index e31743f27..ec0ff9302 100644 --- a/src/core/client/admin/routes/configure/sections/wordList/containers/WordListConfigContainer.tsx +++ b/src/core/client/admin/routes/configure/sections/wordList/containers/WordListConfigContainer.tsx @@ -3,9 +3,9 @@ import { RouteProps } from "found"; import React from "react"; import { graphql } from "react-relay"; -import { WordListConfigContainer_settings as SettingsData } from "talk-admin/__generated__/WordListConfigContainer_settings.graphql"; -import { pureMerge } from "talk-common/utils"; -import { withFragmentContainer } from "talk-framework/lib/relay"; +import { WordListConfigContainer_settings as SettingsData } from "coral-admin/__generated__/WordListConfigContainer_settings.graphql"; +import { pureMerge } from "coral-common/utils"; +import { withFragmentContainer } from "coral-framework/lib/relay"; import WordListConfig from "../components/WordListConfig"; diff --git a/src/core/client/admin/routes/configure/sections/wordList/containers/WordListRouteContainer.tsx b/src/core/client/admin/routes/configure/sections/wordList/containers/WordListRouteContainer.tsx index 8ff91d827..317d8829e 100644 --- a/src/core/client/admin/routes/configure/sections/wordList/containers/WordListRouteContainer.tsx +++ b/src/core/client/admin/routes/configure/sections/wordList/containers/WordListRouteContainer.tsx @@ -2,9 +2,9 @@ import { FormApi } from "final-form"; import React from "react"; import { graphql } from "react-relay"; -import { WordListRouteContainerQueryResponse } from "talk-admin/__generated__/WordListRouteContainerQuery.graphql"; -import { withRouteConfig } from "talk-framework/lib/router"; -import { Delay, Spinner } from "talk-ui/components"; +import { WordListRouteContainerQueryResponse } from "coral-admin/__generated__/WordListRouteContainerQuery.graphql"; +import { withRouteConfig } from "coral-framework/lib/router"; +import { Delay, Spinner } from "coral-ui/components"; import WordListConfigContainer from "./WordListConfigContainer"; diff --git a/src/core/client/admin/routes/login/components/CompleteAccountBox.spec.tsx b/src/core/client/admin/routes/login/components/CompleteAccountBox.spec.tsx index e9ec23981..5595ce9d6 100644 --- a/src/core/client/admin/routes/login/components/CompleteAccountBox.spec.tsx +++ b/src/core/client/admin/routes/login/components/CompleteAccountBox.spec.tsx @@ -1,7 +1,7 @@ import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import CompleteAccountBox from "./CompleteAccountBox"; diff --git a/src/core/client/admin/routes/login/components/CompleteAccountBox.tsx b/src/core/client/admin/routes/login/components/CompleteAccountBox.tsx index d3f8fb4fc..9a16d184f 100644 --- a/src/core/client/admin/routes/login/components/CompleteAccountBox.tsx +++ b/src/core/client/admin/routes/login/components/CompleteAccountBox.tsx @@ -1,6 +1,6 @@ import React, { FunctionComponent } from "react"; -import { Flex, Typography } from "talk-ui/components"; +import { Flex, Typography } from "coral-ui/components"; import styles from "./CompleteAccountBox.css"; diff --git a/src/core/client/admin/routes/login/components/EmailField.tsx b/src/core/client/admin/routes/login/components/EmailField.tsx index 114f08e3c..c4c6fc456 100644 --- a/src/core/client/admin/routes/login/components/EmailField.tsx +++ b/src/core/client/admin/routes/login/components/EmailField.tsx @@ -1,18 +1,18 @@ -import { Localized } from "fluent-react/compat"; -import * as React from "react"; -import { FunctionComponent } from "react"; -import { Field } from "react-final-form"; import { composeValidators, required, validateEmail, -} from "talk-framework/lib/validation"; +} from "coral-framework/lib/validation"; import { FormField, InputLabel, TextField, ValidationMessage, -} from "talk-ui/components"; +} from "coral-ui/components"; +import { Localized } from "fluent-react/compat"; +import * as React from "react"; +import { FunctionComponent } from "react"; +import { Field } from "react-final-form"; interface Props { disabled: boolean; diff --git a/src/core/client/admin/routes/login/components/Login.tsx b/src/core/client/admin/routes/login/components/Login.tsx index dc65f59d2..976ff35db 100644 --- a/src/core/client/admin/routes/login/components/Login.tsx +++ b/src/core/client/admin/routes/login/components/Login.tsx @@ -1,6 +1,6 @@ import React, { FunctionComponent } from "react"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import AddEmailAddressContainer from "../views/addEmailAddress/containers/AddEmailAddressContainer"; import CreatePasswordContainer from "../views/createPassword/containers/CreatePasswordContainer"; diff --git a/src/core/client/admin/routes/login/containers/AccountCompletionContainer.tsx b/src/core/client/admin/routes/login/containers/AccountCompletionContainer.tsx index 0ad57fa7c..34ac3ee80 100644 --- a/src/core/client/admin/routes/login/containers/AccountCompletionContainer.tsx +++ b/src/core/client/admin/routes/login/containers/AccountCompletionContainer.tsx @@ -2,21 +2,21 @@ import { withRouter, WithRouter } from "found"; import * as React from "react"; import { Component } from "react"; -import { AccountCompletionContainer_auth as AuthData } from "talk-admin/__generated__/AccountCompletionContainer_auth.graphql"; -import { AccountCompletionContainer_viewer as UserData } from "talk-admin/__generated__/AccountCompletionContainer_viewer.graphql"; -import { AccountCompletionContainerLocal as Local } from "talk-admin/__generated__/AccountCompletionContainerLocal.graphql"; +import { AccountCompletionContainer_auth as AuthData } from "coral-admin/__generated__/AccountCompletionContainer_auth.graphql"; +import { AccountCompletionContainer_viewer as UserData } from "coral-admin/__generated__/AccountCompletionContainer_viewer.graphql"; +import { AccountCompletionContainerLocal as Local } from "coral-admin/__generated__/AccountCompletionContainerLocal.graphql"; import { CompleteAccountMutation, SetAuthViewMutation, SetRedirectPathMutation, -} from "talk-admin/mutations"; +} from "coral-admin/mutations"; import { graphql, MutationProp, withFragmentContainer, withLocalStateContainer, withMutation, -} from "talk-framework/lib/relay"; +} from "coral-framework/lib/relay"; type Props = { completeAccount: MutationProp; diff --git a/src/core/client/admin/routes/login/containers/LoginContainer.tsx b/src/core/client/admin/routes/login/containers/LoginContainer.tsx index 53a4585d2..b35351a9d 100644 --- a/src/core/client/admin/routes/login/containers/LoginContainer.tsx +++ b/src/core/client/admin/routes/login/containers/LoginContainer.tsx @@ -1,10 +1,10 @@ import { RouteProps } from "found"; import React, { Component } from "react"; -import { LoginContainerLocal as LocalData } from "talk-admin/__generated__/LoginContainerLocal.graphql"; -import { LoginContainerQueryResponse } from "talk-admin/__generated__/LoginContainerQuery.graphql"; -import { graphql, withLocalStateContainer } from "talk-framework/lib/relay"; -import { withRouteConfig } from "talk-framework/lib/router"; +import { LoginContainerLocal as LocalData } from "coral-admin/__generated__/LoginContainerLocal.graphql"; +import { LoginContainerQueryResponse } from "coral-admin/__generated__/LoginContainerQuery.graphql"; +import { graphql, withLocalStateContainer } from "coral-framework/lib/relay"; +import { withRouteConfig } from "coral-framework/lib/router"; import Login from "../components/Login"; import AccountCompletionContainer from "./AccountCompletionContainer"; diff --git a/src/core/client/admin/routes/login/views/addEmailAddress/components/AddEmailAddress.tsx b/src/core/client/admin/routes/login/views/addEmailAddress/components/AddEmailAddress.tsx index aeb44065c..7605ddcaf 100644 --- a/src/core/client/admin/routes/login/views/addEmailAddress/components/AddEmailAddress.tsx +++ b/src/core/client/admin/routes/login/views/addEmailAddress/components/AddEmailAddress.tsx @@ -2,13 +2,13 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; import { Form } from "react-final-form"; -import { OnSubmit } from "talk-framework/lib/form"; +import { OnSubmit } from "coral-framework/lib/form"; import { Button, CallOut, HorizontalGutter, Typography, -} from "talk-ui/components"; +} from "coral-ui/components"; import CompleteAccountBox from "../../../components/CompleteAccountBox"; import ConfirmEmailField from "./ConfirmEmailField"; diff --git a/src/core/client/admin/routes/login/views/addEmailAddress/components/ConfirmEmailField.tsx b/src/core/client/admin/routes/login/views/addEmailAddress/components/ConfirmEmailField.tsx index 7c4e38cae..4d2117959 100644 --- a/src/core/client/admin/routes/login/views/addEmailAddress/components/ConfirmEmailField.tsx +++ b/src/core/client/admin/routes/login/views/addEmailAddress/components/ConfirmEmailField.tsx @@ -1,18 +1,18 @@ -import { Localized } from "fluent-react/compat"; -import * as React from "react"; -import { FunctionComponent } from "react"; -import { Field } from "react-final-form"; import { composeValidators, required, validateEqualEmails, -} from "talk-framework/lib/validation"; +} from "coral-framework/lib/validation"; import { FormField, InputLabel, TextField, ValidationMessage, -} from "talk-ui/components"; +} from "coral-ui/components"; +import { Localized } from "fluent-react/compat"; +import * as React from "react"; +import { FunctionComponent } from "react"; +import { Field } from "react-final-form"; interface Props { disabled: boolean; diff --git a/src/core/client/admin/routes/login/views/addEmailAddress/components/EmailField.tsx b/src/core/client/admin/routes/login/views/addEmailAddress/components/EmailField.tsx index 4bb0bdec3..f15c0c32e 100644 --- a/src/core/client/admin/routes/login/views/addEmailAddress/components/EmailField.tsx +++ b/src/core/client/admin/routes/login/views/addEmailAddress/components/EmailField.tsx @@ -1,18 +1,18 @@ -import { Localized } from "fluent-react/compat"; -import * as React from "react"; -import { FunctionComponent } from "react"; -import { Field } from "react-final-form"; import { composeValidators, required, validateEmail, -} from "talk-framework/lib/validation"; +} from "coral-framework/lib/validation"; import { FormField, InputLabel, TextField, ValidationMessage, -} from "talk-ui/components"; +} from "coral-ui/components"; +import { Localized } from "fluent-react/compat"; +import * as React from "react"; +import { FunctionComponent } from "react"; +import { Field } from "react-final-form"; interface Props { disabled: boolean; diff --git a/src/core/client/admin/routes/login/views/addEmailAddress/components/UnorderedList/ListItem.tsx b/src/core/client/admin/routes/login/views/addEmailAddress/components/UnorderedList/ListItem.tsx index 0c1b5a5e9..6dd562b4d 100644 --- a/src/core/client/admin/routes/login/views/addEmailAddress/components/UnorderedList/ListItem.tsx +++ b/src/core/client/admin/routes/login/views/addEmailAddress/components/UnorderedList/ListItem.tsx @@ -1,7 +1,7 @@ import React from "react"; import { FunctionComponent } from "react"; -import { Icon } from "talk-ui/components"; +import { Icon } from "coral-ui/components"; import styles from "./ListItem.css"; diff --git a/src/core/client/admin/routes/login/views/addEmailAddress/containers/AddEmailAddressContainer.tsx b/src/core/client/admin/routes/login/views/addEmailAddress/containers/AddEmailAddressContainer.tsx index f034fa5cb..5e3b0a37b 100644 --- a/src/core/client/admin/routes/login/views/addEmailAddress/containers/AddEmailAddressContainer.tsx +++ b/src/core/client/admin/routes/login/views/addEmailAddress/containers/AddEmailAddressContainer.tsx @@ -1,9 +1,9 @@ import { FORM_ERROR } from "final-form"; import React, { Component } from "react"; -import { SetEmailMutation } from "talk-admin/mutations"; -import { MutationProp, withMutation } from "talk-framework/lib/relay"; -import { PropTypesOf } from "talk-framework/types"; +import { SetEmailMutation } from "coral-admin/mutations"; +import { MutationProp, withMutation } from "coral-framework/lib/relay"; +import { PropTypesOf } from "coral-framework/types"; import AddEmailAddress from "../components/AddEmailAddress"; diff --git a/src/core/client/admin/routes/login/views/createPassword/components/CreatePassword.tsx b/src/core/client/admin/routes/login/views/createPassword/components/CreatePassword.tsx index 17fb59b27..2efda4c3b 100644 --- a/src/core/client/admin/routes/login/views/createPassword/components/CreatePassword.tsx +++ b/src/core/client/admin/routes/login/views/createPassword/components/CreatePassword.tsx @@ -2,13 +2,13 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; import { Form } from "react-final-form"; -import { OnSubmit } from "talk-framework/lib/form"; +import { OnSubmit } from "coral-framework/lib/form"; import { Button, CallOut, HorizontalGutter, Typography, -} from "talk-ui/components"; +} from "coral-ui/components"; import CompleteAccountBox from "../../../components/CompleteAccountBox"; import SetPasswordField from "./SetPasswordField"; diff --git a/src/core/client/admin/routes/login/views/createPassword/components/SetPasswordField.tsx b/src/core/client/admin/routes/login/views/createPassword/components/SetPasswordField.tsx index f66ec22e5..bee4d82bc 100644 --- a/src/core/client/admin/routes/login/views/createPassword/components/SetPasswordField.tsx +++ b/src/core/client/admin/routes/login/views/createPassword/components/SetPasswordField.tsx @@ -1,19 +1,19 @@ -import { Localized } from "fluent-react/compat"; -import * as React from "react"; -import { FunctionComponent } from "react"; -import { Field } from "react-final-form"; -import { PasswordField } from "talk-framework/components"; +import { PasswordField } from "coral-framework/components"; import { composeValidators, required, validatePassword, -} from "talk-framework/lib/validation"; +} from "coral-framework/lib/validation"; import { FormField, InputDescription, InputLabel, ValidationMessage, -} from "talk-ui/components"; +} from "coral-ui/components"; +import { Localized } from "fluent-react/compat"; +import * as React from "react"; +import { FunctionComponent } from "react"; +import { Field } from "react-final-form"; interface Props { disabled: boolean; diff --git a/src/core/client/admin/routes/login/views/createPassword/containers/CreatePasswordContainer.tsx b/src/core/client/admin/routes/login/views/createPassword/containers/CreatePasswordContainer.tsx index 4743d1949..0fdb3bddc 100644 --- a/src/core/client/admin/routes/login/views/createPassword/containers/CreatePasswordContainer.tsx +++ b/src/core/client/admin/routes/login/views/createPassword/containers/CreatePasswordContainer.tsx @@ -1,9 +1,9 @@ import { FORM_ERROR } from "final-form"; import React, { Component } from "react"; -import { SetPasswordMutation } from "talk-admin/mutations"; -import { MutationProp, withMutation } from "talk-framework/lib/relay"; -import { PropTypesOf } from "talk-framework/types"; +import { SetPasswordMutation } from "coral-admin/mutations"; +import { MutationProp, withMutation } from "coral-framework/lib/relay"; +import { PropTypesOf } from "coral-framework/types"; import CreatePassword from "../components/CreatePassword"; diff --git a/src/core/client/admin/routes/login/views/createUsername/components/CreateUsername.tsx b/src/core/client/admin/routes/login/views/createUsername/components/CreateUsername.tsx index a98c9f245..7e5b06292 100644 --- a/src/core/client/admin/routes/login/views/createUsername/components/CreateUsername.tsx +++ b/src/core/client/admin/routes/login/views/createUsername/components/CreateUsername.tsx @@ -2,13 +2,13 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; import { Form } from "react-final-form"; -import { OnSubmit } from "talk-framework/lib/form"; +import { OnSubmit } from "coral-framework/lib/form"; import { Button, CallOut, HorizontalGutter, Typography, -} from "talk-ui/components"; +} from "coral-ui/components"; import CompleteAccountBox from "../../../components/CompleteAccountBox"; import UsernameField from "./UsernameField"; diff --git a/src/core/client/admin/routes/login/views/createUsername/components/UsernameField.tsx b/src/core/client/admin/routes/login/views/createUsername/components/UsernameField.tsx index 0139e7244..6df6ea83a 100644 --- a/src/core/client/admin/routes/login/views/createUsername/components/UsernameField.tsx +++ b/src/core/client/admin/routes/login/views/createUsername/components/UsernameField.tsx @@ -1,19 +1,19 @@ -import { Localized } from "fluent-react/compat"; -import * as React from "react"; -import { FunctionComponent } from "react"; -import { Field } from "react-final-form"; import { composeValidators, required, validateUsername, -} from "talk-framework/lib/validation"; +} from "coral-framework/lib/validation"; import { FormField, InputDescription, InputLabel, TextField, ValidationMessage, -} from "talk-ui/components"; +} from "coral-ui/components"; +import { Localized } from "fluent-react/compat"; +import * as React from "react"; +import { FunctionComponent } from "react"; +import { Field } from "react-final-form"; interface Props { disabled: boolean; diff --git a/src/core/client/admin/routes/login/views/createUsername/containers/CreateUsernameContainer.tsx b/src/core/client/admin/routes/login/views/createUsername/containers/CreateUsernameContainer.tsx index dda308b0e..98488cb1e 100644 --- a/src/core/client/admin/routes/login/views/createUsername/containers/CreateUsernameContainer.tsx +++ b/src/core/client/admin/routes/login/views/createUsername/containers/CreateUsernameContainer.tsx @@ -1,9 +1,9 @@ import { FORM_ERROR } from "final-form"; import React, { Component } from "react"; -import { SetUsernameMutation } from "talk-admin/mutations"; -import { MutationProp, withMutation } from "talk-framework/lib/relay"; -import { PropTypesOf } from "talk-framework/types"; +import { SetUsernameMutation } from "coral-admin/mutations"; +import { MutationProp, withMutation } from "coral-framework/lib/relay"; +import { PropTypesOf } from "coral-framework/types"; import CreateUsername from "../components/CreateUsername"; diff --git a/src/core/client/admin/routes/login/views/signIn/components/HorizontalSeparator.css b/src/core/client/admin/routes/login/views/signIn/components/HorizontalSeparator.css index 0ded7b742..f1f9dc9fa 100644 --- a/src/core/client/admin/routes/login/views/signIn/components/HorizontalSeparator.css +++ b/src/core/client/admin/routes/login/views/signIn/components/HorizontalSeparator.css @@ -9,7 +9,7 @@ margin: 0; } .text { - composes: heading3 from "talk-ui/shared/typography.css"; + composes: heading3 from "coral-ui/shared/typography.css"; position: relative; background-color: #f5f5f5; padding: 0 var(--mini-unit); diff --git a/src/core/client/admin/routes/login/views/signIn/components/HorizontalSeparator.tsx b/src/core/client/admin/routes/login/views/signIn/components/HorizontalSeparator.tsx index 6261e0b88..9ed69766e 100644 --- a/src/core/client/admin/routes/login/views/signIn/components/HorizontalSeparator.tsx +++ b/src/core/client/admin/routes/login/views/signIn/components/HorizontalSeparator.tsx @@ -1,7 +1,7 @@ import React from "react"; import { FunctionComponent } from "react"; -import { Flex } from "talk-ui/components"; +import { Flex } from "coral-ui/components"; import styles from "./HorizontalSeparator.css"; diff --git a/src/core/client/admin/routes/login/views/signIn/components/SignIn.spec.tsx b/src/core/client/admin/routes/login/views/signIn/components/SignIn.spec.tsx index fbafcffb5..0e3a3df54 100644 --- a/src/core/client/admin/routes/login/views/signIn/components/SignIn.spec.tsx +++ b/src/core/client/admin/routes/login/views/signIn/components/SignIn.spec.tsx @@ -1,8 +1,8 @@ import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { removeFragmentRefs } from "talk-framework/testHelpers"; -import { PropTypesOf } from "talk-framework/types"; +import { removeFragmentRefs } from "coral-framework/testHelpers"; +import { PropTypesOf } from "coral-framework/types"; import SignIn from "./SignIn"; diff --git a/src/core/client/admin/routes/login/views/signIn/components/SignIn.tsx b/src/core/client/admin/routes/login/views/signIn/components/SignIn.tsx index a35e873b3..3e8edd19a 100644 --- a/src/core/client/admin/routes/login/views/signIn/components/SignIn.tsx +++ b/src/core/client/admin/routes/login/views/signIn/components/SignIn.tsx @@ -1,9 +1,9 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; -import AuthBox from "talk-admin/components/AuthBox"; -import { PropTypesOf } from "talk-framework/types"; -import { CallOut, HorizontalGutter } from "talk-ui/components"; +import AuthBox from "coral-admin/components/AuthBox"; +import { PropTypesOf } from "coral-framework/types"; +import { CallOut, HorizontalGutter } from "coral-ui/components"; import SignInWithEmailContainer from "../containers/SignInWithEmailContainer"; import SignInWithFacebookContainer from "../containers/SignInWithFacebookContainer"; diff --git a/src/core/client/admin/routes/login/views/signIn/components/SignInWithEmail.tsx b/src/core/client/admin/routes/login/views/signIn/components/SignInWithEmail.tsx index af114dc50..3534451be 100644 --- a/src/core/client/admin/routes/login/views/signIn/components/SignInWithEmail.tsx +++ b/src/core/client/admin/routes/login/views/signIn/components/SignInWithEmail.tsx @@ -1,10 +1,10 @@ +import { OnSubmit } from "coral-framework/lib/form"; import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; import { Field, Form } from "react-final-form"; -import { OnSubmit } from "talk-framework/lib/form"; -import { PasswordField } from "talk-framework/components"; -import { composeValidators, required } from "talk-framework/lib/validation"; +import { PasswordField } from "coral-framework/components"; +import { composeValidators, required } from "coral-framework/lib/validation"; import { Button, ButtonIcon, @@ -13,7 +13,7 @@ import { HorizontalGutter, InputLabel, ValidationMessage, -} from "talk-ui/components"; +} from "coral-ui/components"; import EmailField from "../../../components/EmailField"; diff --git a/src/core/client/admin/routes/login/views/signIn/components/Version.tsx b/src/core/client/admin/routes/login/views/signIn/components/Version.tsx index 3828dbd86..038bff98f 100644 --- a/src/core/client/admin/routes/login/views/signIn/components/Version.tsx +++ b/src/core/client/admin/routes/login/views/signIn/components/Version.tsx @@ -1,6 +1,6 @@ import React, { FunctionComponent } from "react"; -import { Flex, Typography } from "talk-ui/components"; +import { Flex, Typography } from "coral-ui/components"; import styles from "./Version.css"; diff --git a/src/core/client/admin/routes/login/views/signIn/containers/SignInContainer.tsx b/src/core/client/admin/routes/login/views/signIn/containers/SignInContainer.tsx index b7bbb35b7..f15736493 100644 --- a/src/core/client/admin/routes/login/views/signIn/containers/SignInContainer.tsx +++ b/src/core/client/admin/routes/login/views/signIn/containers/SignInContainer.tsx @@ -1,16 +1,16 @@ import { RouteProps } from "found"; import React, { Component } from "react"; -import { SignInContainer_auth as AuthData } from "talk-admin/__generated__/SignInContainer_auth.graphql"; -import { SignInContainerLocal as LocalData } from "talk-admin/__generated__/SignInContainerLocal.graphql"; -import { ClearAuthErrorMutation, SignInMutation } from "talk-admin/mutations"; +import { SignInContainer_auth as AuthData } from "coral-admin/__generated__/SignInContainer_auth.graphql"; +import { SignInContainerLocal as LocalData } from "coral-admin/__generated__/SignInContainerLocal.graphql"; +import { ClearAuthErrorMutation, SignInMutation } from "coral-admin/mutations"; import { graphql, MutationProp, withFragmentContainer, withLocalStateContainer, withMutation, -} from "talk-framework/lib/relay"; +} from "coral-framework/lib/relay"; import SignIn from "../components/SignIn"; diff --git a/src/core/client/admin/routes/login/views/signIn/containers/SignInWithEmailContainer.tsx b/src/core/client/admin/routes/login/views/signIn/containers/SignInWithEmailContainer.tsx index f197863b0..e31fd56a5 100644 --- a/src/core/client/admin/routes/login/views/signIn/containers/SignInWithEmailContainer.tsx +++ b/src/core/client/admin/routes/login/views/signIn/containers/SignInWithEmailContainer.tsx @@ -1,8 +1,8 @@ import { FORM_ERROR } from "final-form"; import React, { Component } from "react"; -import { SignInMutation } from "talk-admin/mutations"; -import { MutationProp, withMutation } from "talk-framework/lib/relay"; +import { SignInMutation } from "coral-admin/mutations"; +import { MutationProp, withMutation } from "coral-framework/lib/relay"; import SignInWithEmail, { SignInWithEmailForm, diff --git a/src/core/client/admin/routes/login/views/signIn/containers/SignInWithFacebookContainer.tsx b/src/core/client/admin/routes/login/views/signIn/containers/SignInWithFacebookContainer.tsx index 46cb61277..1544562d7 100644 --- a/src/core/client/admin/routes/login/views/signIn/containers/SignInWithFacebookContainer.tsx +++ b/src/core/client/admin/routes/login/views/signIn/containers/SignInWithFacebookContainer.tsx @@ -1,10 +1,10 @@ import { Localized } from "fluent-react/compat"; import React, { Component } from "react"; -import { SignInWithFacebookContainer_auth as AuthData } from "talk-admin/__generated__/SignInWithFacebookContainer_auth.graphql"; -import FacebookButton from "talk-framework/components/FacebookButton"; -import { redirectOAuth2 } from "talk-framework/helpers"; -import { graphql, withFragmentContainer } from "talk-framework/lib/relay"; +import { SignInWithFacebookContainer_auth as AuthData } from "coral-admin/__generated__/SignInWithFacebookContainer_auth.graphql"; +import FacebookButton from "coral-framework/components/FacebookButton"; +import { redirectOAuth2 } from "coral-framework/helpers"; +import { graphql, withFragmentContainer } from "coral-framework/lib/relay"; interface Props { auth: AuthData; diff --git a/src/core/client/admin/routes/login/views/signIn/containers/SignInWithGoogleContainer.tsx b/src/core/client/admin/routes/login/views/signIn/containers/SignInWithGoogleContainer.tsx index c76e0c28f..e1941e9ce 100644 --- a/src/core/client/admin/routes/login/views/signIn/containers/SignInWithGoogleContainer.tsx +++ b/src/core/client/admin/routes/login/views/signIn/containers/SignInWithGoogleContainer.tsx @@ -1,10 +1,10 @@ import { Localized } from "fluent-react/compat"; import React, { Component } from "react"; -import { SignInWithGoogleContainer_auth as AuthData } from "talk-admin/__generated__/SignInWithGoogleContainer_auth.graphql"; -import GoogleButton from "talk-framework/components/GoogleButton"; -import { redirectOAuth2 } from "talk-framework/helpers"; -import { graphql, withFragmentContainer } from "talk-framework/lib/relay"; +import { SignInWithGoogleContainer_auth as AuthData } from "coral-admin/__generated__/SignInWithGoogleContainer_auth.graphql"; +import GoogleButton from "coral-framework/components/GoogleButton"; +import { redirectOAuth2 } from "coral-framework/helpers"; +import { graphql, withFragmentContainer } from "coral-framework/lib/relay"; interface Props { auth: AuthData; diff --git a/src/core/client/admin/routes/login/views/signIn/containers/SignInWithOIDCContainer.tsx b/src/core/client/admin/routes/login/views/signIn/containers/SignInWithOIDCContainer.tsx index 2253a2705..a56c6e4dc 100644 --- a/src/core/client/admin/routes/login/views/signIn/containers/SignInWithOIDCContainer.tsx +++ b/src/core/client/admin/routes/login/views/signIn/containers/SignInWithOIDCContainer.tsx @@ -1,10 +1,10 @@ import { Localized } from "fluent-react/compat"; import React, { Component } from "react"; -import { SignInWithOIDCContainer_auth as AuthData } from "talk-admin/__generated__/SignInWithOIDCContainer_auth.graphql"; -import OIDCButton from "talk-framework/components/OIDCButton"; -import { redirectOAuth2 } from "talk-framework/helpers"; -import { graphql, withFragmentContainer } from "talk-framework/lib/relay"; +import { SignInWithOIDCContainer_auth as AuthData } from "coral-admin/__generated__/SignInWithOIDCContainer_auth.graphql"; +import OIDCButton from "coral-framework/components/OIDCButton"; +import { redirectOAuth2 } from "coral-framework/helpers"; +import { graphql, withFragmentContainer } from "coral-framework/lib/relay"; interface Props { auth: AuthData; diff --git a/src/core/client/admin/routes/moderate/components/AcceptButton.spec.tsx b/src/core/client/admin/routes/moderate/components/AcceptButton.spec.tsx index 8af608292..e27c93433 100644 --- a/src/core/client/admin/routes/moderate/components/AcceptButton.spec.tsx +++ b/src/core/client/admin/routes/moderate/components/AcceptButton.spec.tsx @@ -3,7 +3,7 @@ import { createRenderer } from "react-test-renderer/shallow"; import AcceptButton from "./AcceptButton"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; it("renders correctly", () => { const props: PropTypesOf = { diff --git a/src/core/client/admin/routes/moderate/components/AcceptButton.tsx b/src/core/client/admin/routes/moderate/components/AcceptButton.tsx index a3075d304..8c6abfb0b 100644 --- a/src/core/client/admin/routes/moderate/components/AcceptButton.tsx +++ b/src/core/client/admin/routes/moderate/components/AcceptButton.tsx @@ -2,8 +2,8 @@ import cn from "classnames"; import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; -import { PropTypesOf } from "talk-framework/types"; -import { BaseButton, Icon } from "talk-ui/components"; +import { PropTypesOf } from "coral-framework/types"; +import { BaseButton, Icon } from "coral-ui/components"; import styles from "./AcceptButton.css"; diff --git a/src/core/client/admin/routes/moderate/components/CommentContent.css b/src/core/client/admin/routes/moderate/components/CommentContent.css index 7cbea3ee8..0d59c0902 100644 --- a/src/core/client/admin/routes/moderate/components/CommentContent.css +++ b/src/core/client/admin/routes/moderate/components/CommentContent.css @@ -1,5 +1,5 @@ .root { - composes: root from "talk-stream/shared/htmlContent.css"; + composes: root from "coral-stream/shared/htmlContent.css"; mark { background-color: var(--palette-highlight); diff --git a/src/core/client/admin/routes/moderate/components/CommentContent.spec.tsx b/src/core/client/admin/routes/moderate/components/CommentContent.spec.tsx index 43cd2c698..8691ea5c7 100644 --- a/src/core/client/admin/routes/moderate/components/CommentContent.spec.tsx +++ b/src/core/client/admin/routes/moderate/components/CommentContent.spec.tsx @@ -3,7 +3,7 @@ import { createRenderer } from "react-test-renderer/shallow"; import CommentContent from "./CommentContent"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; it("renders correctly", () => { const props: PropTypesOf = { diff --git a/src/core/client/admin/routes/moderate/components/CommentContent.tsx b/src/core/client/admin/routes/moderate/components/CommentContent.tsx index 4f70c6a16..b78268668 100644 --- a/src/core/client/admin/routes/moderate/components/CommentContent.tsx +++ b/src/core/client/admin/routes/moderate/components/CommentContent.tsx @@ -2,8 +2,8 @@ import cn from "classnames"; import { memoize } from "lodash"; import React, { FunctionComponent } from "react"; -import { createPurify } from "talk-common/utils/purify"; -import { Typography } from "talk-ui/components"; +import { createPurify } from "coral-common/utils/purify"; +import { Typography } from "coral-ui/components"; import styles from "./CommentContent.css"; diff --git a/src/core/client/admin/routes/moderate/components/EmptyMessage.css b/src/core/client/admin/routes/moderate/components/EmptyMessage.css index 692d7de87..c551f82e9 100644 --- a/src/core/client/admin/routes/moderate/components/EmptyMessage.css +++ b/src/core/client/admin/routes/moderate/components/EmptyMessage.css @@ -1,5 +1,5 @@ .root { - composes: bodyCopy from "talk-ui/shared/typography.css"; + composes: bodyCopy from "coral-ui/shared/typography.css"; color: var(--palette-grey-dark); text-align: center; } diff --git a/src/core/client/admin/routes/moderate/components/EmptyMessage.tsx b/src/core/client/admin/routes/moderate/components/EmptyMessage.tsx index 0fd272d70..41beb968a 100644 --- a/src/core/client/admin/routes/moderate/components/EmptyMessage.tsx +++ b/src/core/client/admin/routes/moderate/components/EmptyMessage.tsx @@ -1,8 +1,8 @@ import cn from "classnames"; import React, { FunctionComponent } from "react"; -import { PropTypesOf } from "talk-framework/types"; -import { Card } from "talk-ui/components"; +import { PropTypesOf } from "coral-framework/types"; +import { Card } from "coral-ui/components"; import styles from "./EmptyMessage.css"; diff --git a/src/core/client/admin/routes/moderate/components/FlagDetailsCategory.tsx b/src/core/client/admin/routes/moderate/components/FlagDetailsCategory.tsx index 7dfb4570d..e0e70ed68 100644 --- a/src/core/client/admin/routes/moderate/components/FlagDetailsCategory.tsx +++ b/src/core/client/admin/routes/moderate/components/FlagDetailsCategory.tsx @@ -1,6 +1,6 @@ import React, { FunctionComponent } from "react"; -import { HorizontalGutter, Typography } from "talk-ui/components"; +import { HorizontalGutter, Typography } from "coral-ui/components"; import styles from "./FlagDetailsCategory.css"; diff --git a/src/core/client/admin/routes/moderate/components/InReplyTo.spec.tsx b/src/core/client/admin/routes/moderate/components/InReplyTo.spec.tsx index 89753689d..daeecc37f 100644 --- a/src/core/client/admin/routes/moderate/components/InReplyTo.spec.tsx +++ b/src/core/client/admin/routes/moderate/components/InReplyTo.spec.tsx @@ -1,7 +1,7 @@ import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import InReplyTo from "./InReplyTo"; diff --git a/src/core/client/admin/routes/moderate/components/InReplyTo.tsx b/src/core/client/admin/routes/moderate/components/InReplyTo.tsx index 56b032ed9..5aeab09c6 100644 --- a/src/core/client/admin/routes/moderate/components/InReplyTo.tsx +++ b/src/core/client/admin/routes/moderate/components/InReplyTo.tsx @@ -1,7 +1,7 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; -import { Flex, Icon, Typography } from "talk-ui/components"; +import { Flex, Icon, Typography } from "coral-ui/components"; import styles from "./InReplyTo.css"; diff --git a/src/core/client/admin/routes/moderate/components/LoadingQueue.tsx b/src/core/client/admin/routes/moderate/components/LoadingQueue.tsx index b6b8c4477..53f416f7b 100644 --- a/src/core/client/admin/routes/moderate/components/LoadingQueue.tsx +++ b/src/core/client/admin/routes/moderate/components/LoadingQueue.tsx @@ -1,6 +1,6 @@ import React, { FunctionComponent } from "react"; -import { Flex, Spinner } from "talk-ui/components"; +import { Flex, Spinner } from "coral-ui/components"; const LoadingQueue: FunctionComponent = () => ( diff --git a/src/core/client/admin/routes/moderate/components/Markers.tsx b/src/core/client/admin/routes/moderate/components/Markers.tsx index f6ebf33b1..1bdd9fef2 100644 --- a/src/core/client/admin/routes/moderate/components/Markers.tsx +++ b/src/core/client/admin/routes/moderate/components/Markers.tsx @@ -1,8 +1,8 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, useCallback, useState } from "react"; -import { useUUID } from "talk-framework/hooks"; -import { Button, Flex, HorizontalGutter, Icon } from "talk-ui/components"; +import { useUUID } from "coral-framework/hooks"; +import { Button, Flex, HorizontalGutter, Icon } from "coral-ui/components"; import styles from "./Markers.css"; diff --git a/src/core/client/admin/routes/moderate/components/Moderate.spec.tsx b/src/core/client/admin/routes/moderate/components/Moderate.spec.tsx index 135f0a4d9..5e3860d4e 100644 --- a/src/core/client/admin/routes/moderate/components/Moderate.spec.tsx +++ b/src/core/client/admin/routes/moderate/components/Moderate.spec.tsx @@ -1,8 +1,8 @@ import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { removeFragmentRefs } from "talk-framework/testHelpers"; -import { PropTypesOf } from "talk-framework/types"; +import { removeFragmentRefs } from "coral-framework/testHelpers"; +import { PropTypesOf } from "coral-framework/types"; import Moderate from "./Moderate"; diff --git a/src/core/client/admin/routes/moderate/components/Moderate.tsx b/src/core/client/admin/routes/moderate/components/Moderate.tsx index f7d277c09..9215c822e 100644 --- a/src/core/client/admin/routes/moderate/components/Moderate.tsx +++ b/src/core/client/admin/routes/moderate/components/Moderate.tsx @@ -1,8 +1,8 @@ import React, { FunctionComponent } from "react"; -import MainLayout from "talk-admin/components/MainLayout"; -import { PropTypesOf } from "talk-framework/types"; -import { SubBar } from "talk-ui/components/SubBar"; +import MainLayout from "coral-admin/components/MainLayout"; +import { PropTypesOf } from "coral-framework/types"; +import { SubBar } from "coral-ui/components/SubBar"; import ModerateNavigationContainer from "../containers/ModerateNavigationContainer"; import ModerateSearchBarContainer from "../containers/ModerateSearchBarContainer"; diff --git a/src/core/client/admin/routes/moderate/components/ModerateCard.spec.tsx b/src/core/client/admin/routes/moderate/components/ModerateCard.spec.tsx index cae4afdee..d3f2ee985 100644 --- a/src/core/client/admin/routes/moderate/components/ModerateCard.spec.tsx +++ b/src/core/client/admin/routes/moderate/components/ModerateCard.spec.tsx @@ -2,8 +2,8 @@ import { noop } from "lodash"; import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { removeFragmentRefs } from "talk-framework/testHelpers"; -import { PropTypesOf } from "talk-framework/types"; +import { removeFragmentRefs } from "coral-framework/testHelpers"; +import { PropTypesOf } from "coral-framework/types"; import ModerateCard from "./ModerateCard"; diff --git a/src/core/client/admin/routes/moderate/components/ModerateCard.tsx b/src/core/client/admin/routes/moderate/components/ModerateCard.tsx index 264aa13b2..34542f251 100644 --- a/src/core/client/admin/routes/moderate/components/ModerateCard.tsx +++ b/src/core/client/admin/routes/moderate/components/ModerateCard.tsx @@ -2,8 +2,8 @@ import cn from "classnames"; import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; -import { PropTypesOf } from "talk-framework/types"; -import { Card, Flex, HorizontalGutter, TextLink } from "talk-ui/components"; +import { PropTypesOf } from "coral-framework/types"; +import { Card, Flex, HorizontalGutter, TextLink } from "coral-ui/components"; import MarkersContainer from "../containers/MarkersContainer"; import AcceptButton from "./AcceptButton"; diff --git a/src/core/client/admin/routes/moderate/components/Navigation.spec.tsx b/src/core/client/admin/routes/moderate/components/Navigation.spec.tsx index d110c9601..3442b02b5 100644 --- a/src/core/client/admin/routes/moderate/components/Navigation.spec.tsx +++ b/src/core/client/admin/routes/moderate/components/Navigation.spec.tsx @@ -3,7 +3,7 @@ import { createRenderer } from "react-test-renderer/shallow"; import Navigation from "./Navigation"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; it("renders correctly", () => { const renderer = createRenderer(); renderer.render(); diff --git a/src/core/client/admin/routes/moderate/components/Navigation.tsx b/src/core/client/admin/routes/moderate/components/Navigation.tsx index c7e6e8c05..3270eefbc 100644 --- a/src/core/client/admin/routes/moderate/components/Navigation.tsx +++ b/src/core/client/admin/routes/moderate/components/Navigation.tsx @@ -1,8 +1,8 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; -import { getModerationLink } from "talk-admin/helpers"; -import { Counter, Icon, SubBarNavigation } from "talk-ui/components"; +import { getModerationLink } from "coral-admin/helpers"; +import { Counter, Icon, SubBarNavigation } from "coral-ui/components"; import NavigationLink from "./NavigationLink"; diff --git a/src/core/client/admin/routes/moderate/components/NavigationLink.spec.tsx b/src/core/client/admin/routes/moderate/components/NavigationLink.spec.tsx index 42d57e1f2..662b95449 100644 --- a/src/core/client/admin/routes/moderate/components/NavigationLink.spec.tsx +++ b/src/core/client/admin/routes/moderate/components/NavigationLink.spec.tsx @@ -1,7 +1,7 @@ import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import NavigationLink from "./NavigationLink"; diff --git a/src/core/client/admin/routes/moderate/components/NavigationLink.tsx b/src/core/client/admin/routes/moderate/components/NavigationLink.tsx index 29d7aa41e..c3ac7a438 100644 --- a/src/core/client/admin/routes/moderate/components/NavigationLink.tsx +++ b/src/core/client/admin/routes/moderate/components/NavigationLink.tsx @@ -1,7 +1,7 @@ import { Link, LocationDescriptor } from "found"; import React, { FunctionComponent } from "react"; -import { SubBarNavigationItem } from "talk-ui/components"; +import { SubBarNavigationItem } from "coral-ui/components"; interface Props { children: React.ReactNode; diff --git a/src/core/client/admin/routes/moderate/components/Queue.spec.tsx b/src/core/client/admin/routes/moderate/components/Queue.spec.tsx index 532f78803..ad2982e3c 100644 --- a/src/core/client/admin/routes/moderate/components/Queue.spec.tsx +++ b/src/core/client/admin/routes/moderate/components/Queue.spec.tsx @@ -2,8 +2,8 @@ import { noop } from "lodash"; import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { removeFragmentRefs } from "talk-framework/testHelpers"; -import { PropTypesOf } from "talk-framework/types"; +import { removeFragmentRefs } from "coral-framework/testHelpers"; +import { PropTypesOf } from "coral-framework/types"; import Queue from "./Queue"; diff --git a/src/core/client/admin/routes/moderate/components/Queue.tsx b/src/core/client/admin/routes/moderate/components/Queue.tsx index 1bfae5f8b..738bb7426 100644 --- a/src/core/client/admin/routes/moderate/components/Queue.tsx +++ b/src/core/client/admin/routes/moderate/components/Queue.tsx @@ -1,9 +1,9 @@ import React, { FunctionComponent } from "react"; import { CSSTransition, TransitionGroup } from "react-transition-group"; -import AutoLoadMoreContainer from "talk-admin/containers/AutoLoadMoreContainer"; -import { Flex, HorizontalGutter } from "talk-ui/components"; -import { PropTypesOf } from "talk-ui/types"; +import AutoLoadMoreContainer from "coral-admin/containers/AutoLoadMoreContainer"; +import { Flex, HorizontalGutter } from "coral-ui/components"; +import { PropTypesOf } from "coral-ui/types"; import ModerateCardContainer from "../containers/ModerateCardContainer"; diff --git a/src/core/client/admin/routes/moderate/components/RejectButton.spec.tsx b/src/core/client/admin/routes/moderate/components/RejectButton.spec.tsx index ad23a243c..b7df9bd89 100644 --- a/src/core/client/admin/routes/moderate/components/RejectButton.spec.tsx +++ b/src/core/client/admin/routes/moderate/components/RejectButton.spec.tsx @@ -3,7 +3,7 @@ import { createRenderer } from "react-test-renderer/shallow"; import RejectButton from "./RejectButton"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; it("renders correctly", () => { const props: PropTypesOf = { diff --git a/src/core/client/admin/routes/moderate/components/RejectButton.tsx b/src/core/client/admin/routes/moderate/components/RejectButton.tsx index 5d8c19427..1a3ad1191 100644 --- a/src/core/client/admin/routes/moderate/components/RejectButton.tsx +++ b/src/core/client/admin/routes/moderate/components/RejectButton.tsx @@ -2,8 +2,8 @@ import cn from "classnames"; import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; -import { PropTypesOf } from "talk-framework/types"; -import { BaseButton, Icon } from "talk-ui/components"; +import { PropTypesOf } from "coral-framework/types"; +import { BaseButton, Icon } from "coral-ui/components"; import styles from "./RejectButton.css"; diff --git a/src/core/client/admin/routes/moderate/components/Search/Bar.tsx b/src/core/client/admin/routes/moderate/components/Search/Bar.tsx index 8d47dc780..44fd8ade5 100644 --- a/src/core/client/admin/routes/moderate/components/Search/Bar.tsx +++ b/src/core/client/admin/routes/moderate/components/Search/Bar.tsx @@ -2,15 +2,15 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, useCallback } from "react"; import { Form } from "react-final-form"; -import { Backdrop, Icon, Popover, SubBar } from "talk-ui/components"; -import { combineEventHandlers } from "talk-ui/helpers"; +import { Backdrop, Icon, Popover, SubBar } from "coral-ui/components"; +import { combineEventHandlers } from "coral-ui/helpers"; import { useBlurOnEsc, useComboBox, useFocus, usePreventFocusLoss, -} from "talk-ui/hooks"; -import { ListBoxOption } from "talk-ui/hooks/useComboBox"; +} from "coral-ui/hooks"; +import { ListBoxOption } from "coral-ui/hooks/useComboBox"; import Field from "./Field"; import Group from "./Group"; diff --git a/src/core/client/admin/routes/moderate/components/Search/Field.css b/src/core/client/admin/routes/moderate/components/Search/Field.css index 0d802c6b6..b9293c853 100644 --- a/src/core/client/admin/routes/moderate/components/Search/Field.css +++ b/src/core/client/admin/routes/moderate/components/Search/Field.css @@ -38,7 +38,7 @@ } .searchButton { - composes: button from "talk-ui/shared/typography.css"; + composes: button from "coral-ui/shared/typography.css"; padding: 0 calc(1 * var(--mini-unit)); color: var(--palette-text-light); border-left: 1px solid var(--palette-text-light); @@ -50,7 +50,7 @@ } .input { - composes: inputText placeholderPseudo from "talk-ui/shared/typography.css"; + composes: inputText placeholderPseudo from "coral-ui/shared/typography.css"; position: relative; display: block; padding: calc(0.5 * var(--mini-unit)); diff --git a/src/core/client/admin/routes/moderate/components/Search/Field.tsx b/src/core/client/admin/routes/moderate/components/Search/Field.tsx index ac3e4da04..d86eb017a 100644 --- a/src/core/client/admin/routes/moderate/components/Search/Field.tsx +++ b/src/core/client/admin/routes/moderate/components/Search/Field.tsx @@ -3,7 +3,7 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, HTMLAttributes } from "react"; import { Field as FormField } from "react-final-form"; -import { BaseButton, Flex, Icon } from "talk-ui/components"; +import { BaseButton, Flex, Icon } from "coral-ui/components"; import styles from "./Field.css"; diff --git a/src/core/client/admin/routes/moderate/components/Search/GoToAriaInfo.tsx b/src/core/client/admin/routes/moderate/components/Search/GoToAriaInfo.tsx index 6400ccddf..ca773c30d 100644 --- a/src/core/client/admin/routes/moderate/components/Search/GoToAriaInfo.tsx +++ b/src/core/client/admin/routes/moderate/components/Search/GoToAriaInfo.tsx @@ -1,7 +1,7 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; -import { AriaInfo } from "talk-ui/components"; +import { AriaInfo } from "coral-ui/components"; const GoToAriaInfo: FunctionComponent = () => ( diff --git a/src/core/client/admin/routes/moderate/components/Search/ModerateAllOption.tsx b/src/core/client/admin/routes/moderate/components/Search/ModerateAllOption.tsx index 417df6724..ded840df3 100644 --- a/src/core/client/admin/routes/moderate/components/Search/ModerateAllOption.tsx +++ b/src/core/client/admin/routes/moderate/components/Search/ModerateAllOption.tsx @@ -2,7 +2,7 @@ import cn from "classnames"; import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, HTMLAttributes } from "react"; -import { Button, Icon } from "talk-ui/components"; +import { Button, Icon } from "coral-ui/components"; import styles from "./ModerateAllOption.css"; diff --git a/src/core/client/admin/routes/moderate/components/Search/SeeAllOption.tsx b/src/core/client/admin/routes/moderate/components/Search/SeeAllOption.tsx index 61e6f2d60..08956d37b 100644 --- a/src/core/client/admin/routes/moderate/components/Search/SeeAllOption.tsx +++ b/src/core/client/admin/routes/moderate/components/Search/SeeAllOption.tsx @@ -2,7 +2,7 @@ import cn from "classnames"; import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, HTMLAttributes } from "react"; -import { Icon } from "talk-ui/components"; +import { Icon } from "coral-ui/components"; import styles from "./SeeAllOption.css"; diff --git a/src/core/client/admin/routes/moderate/components/SingleModerate.spec.tsx b/src/core/client/admin/routes/moderate/components/SingleModerate.spec.tsx index 0bc36153f..1686f04d8 100644 --- a/src/core/client/admin/routes/moderate/components/SingleModerate.spec.tsx +++ b/src/core/client/admin/routes/moderate/components/SingleModerate.spec.tsx @@ -1,7 +1,7 @@ import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import SingleModerate from "./SingleModerate"; diff --git a/src/core/client/admin/routes/moderate/components/SingleModerate.tsx b/src/core/client/admin/routes/moderate/components/SingleModerate.tsx index 9a8ae397c..9ea92903e 100644 --- a/src/core/client/admin/routes/moderate/components/SingleModerate.tsx +++ b/src/core/client/admin/routes/moderate/components/SingleModerate.tsx @@ -2,8 +2,8 @@ import { Localized } from "fluent-react/compat"; import { Link } from "found"; import React, { FunctionComponent } from "react"; -import MainLayout from "talk-admin/components/MainLayout"; -import { SubBar } from "talk-ui/components"; +import MainLayout from "coral-admin/components/MainLayout"; +import { SubBar } from "coral-ui/components"; import styles from "./SingleModerate.css"; diff --git a/src/core/client/admin/routes/moderate/components/Timestamp.css b/src/core/client/admin/routes/moderate/components/Timestamp.css index e69cca547..cecdbd98f 100644 --- a/src/core/client/admin/routes/moderate/components/Timestamp.css +++ b/src/core/client/admin/routes/moderate/components/Timestamp.css @@ -1,4 +1,4 @@ .root { - composes: timestamp from "talk-ui/shared/typography.css"; + composes: timestamp from "coral-ui/shared/typography.css"; color: var(--palette-grey-lighter); } diff --git a/src/core/client/admin/routes/moderate/components/Timestamp.spec.tsx b/src/core/client/admin/routes/moderate/components/Timestamp.spec.tsx index 5cc93c1f0..a17e264dd 100644 --- a/src/core/client/admin/routes/moderate/components/Timestamp.spec.tsx +++ b/src/core/client/admin/routes/moderate/components/Timestamp.spec.tsx @@ -1,7 +1,7 @@ import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import Timestamp from "./Timestamp"; diff --git a/src/core/client/admin/routes/moderate/components/Timestamp.tsx b/src/core/client/admin/routes/moderate/components/Timestamp.tsx index 866e7f7d1..54f8c5461 100644 --- a/src/core/client/admin/routes/moderate/components/Timestamp.tsx +++ b/src/core/client/admin/routes/moderate/components/Timestamp.tsx @@ -1,7 +1,7 @@ import React from "react"; import { FunctionComponent } from "react"; -import { RelativeTime } from "talk-ui/components"; +import { RelativeTime } from "coral-ui/components"; import styles from "./Timestamp.css"; diff --git a/src/core/client/admin/routes/moderate/components/Username.spec.tsx b/src/core/client/admin/routes/moderate/components/Username.spec.tsx index ec1ac95db..3c7c29678 100644 --- a/src/core/client/admin/routes/moderate/components/Username.spec.tsx +++ b/src/core/client/admin/routes/moderate/components/Username.spec.tsx @@ -1,7 +1,7 @@ import React from "react"; import TestRenderer from "react-test-renderer"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import Username from "./Username"; diff --git a/src/core/client/admin/routes/moderate/components/Username.tsx b/src/core/client/admin/routes/moderate/components/Username.tsx index b44e81065..b29792346 100644 --- a/src/core/client/admin/routes/moderate/components/Username.tsx +++ b/src/core/client/admin/routes/moderate/components/Username.tsx @@ -2,7 +2,7 @@ import cn from "classnames"; import React from "react"; import { FunctionComponent } from "react"; -import { Typography } from "talk-ui/components"; +import { Typography } from "coral-ui/components"; import styles from "./Username.css"; diff --git a/src/core/client/admin/routes/moderate/containers/FlagDetailsContainer.tsx b/src/core/client/admin/routes/moderate/containers/FlagDetailsContainer.tsx index 217feb7ba..131c66b2a 100644 --- a/src/core/client/admin/routes/moderate/containers/FlagDetailsContainer.tsx +++ b/src/core/client/admin/routes/moderate/containers/FlagDetailsContainer.tsx @@ -2,11 +2,11 @@ import { Localized } from "fluent-react/compat"; import React from "react"; import { graphql } from "react-relay"; -import { FlagDetailsContainer_comment as CommentData } from "talk-admin/__generated__/FlagDetailsContainer_comment.graphql"; -import NotAvailable from "talk-admin/components/NotAvailable"; -import { withFragmentContainer } from "talk-framework/lib/relay"; -import { GQLCOMMENT_FLAG_REASON } from "talk-framework/schema"; -import { HorizontalGutter } from "talk-ui/components"; +import { FlagDetailsContainer_comment as CommentData } from "coral-admin/__generated__/FlagDetailsContainer_comment.graphql"; +import NotAvailable from "coral-admin/components/NotAvailable"; +import { withFragmentContainer } from "coral-framework/lib/relay"; +import { GQLCOMMENT_FLAG_REASON } from "coral-framework/schema"; +import { HorizontalGutter } from "coral-ui/components"; import FlagDetailsCategory from "../components/FlagDetailsCategory"; import FlagDetailsEntry from "../components/FlagDetailsEntry"; diff --git a/src/core/client/admin/routes/moderate/containers/MarkersContainer.spec.tsx b/src/core/client/admin/routes/moderate/containers/MarkersContainer.spec.tsx index 4b27b6992..bdf91e667 100644 --- a/src/core/client/admin/routes/moderate/containers/MarkersContainer.spec.tsx +++ b/src/core/client/admin/routes/moderate/containers/MarkersContainer.spec.tsx @@ -1,8 +1,8 @@ import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { removeFragmentRefs } from "talk-framework/testHelpers"; -import { PropTypesOf } from "talk-framework/types"; +import { removeFragmentRefs } from "coral-framework/testHelpers"; +import { PropTypesOf } from "coral-framework/types"; import { MarkersContainer } from "./MarkersContainer"; diff --git a/src/core/client/admin/routes/moderate/containers/MarkersContainer.tsx b/src/core/client/admin/routes/moderate/containers/MarkersContainer.tsx index 715f87526..10f7f4534 100644 --- a/src/core/client/admin/routes/moderate/containers/MarkersContainer.tsx +++ b/src/core/client/admin/routes/moderate/containers/MarkersContainer.tsx @@ -2,9 +2,9 @@ import { Localized } from "fluent-react/compat"; import React from "react"; import { graphql } from "react-relay"; -import { MarkersContainer_comment as CommentData } from "talk-admin/__generated__/MarkersContainer_comment.graphql"; -import { withFragmentContainer } from "talk-framework/lib/relay"; -import { Marker, MarkerCount } from "talk-ui/components"; +import { MarkersContainer_comment as CommentData } from "coral-admin/__generated__/MarkersContainer_comment.graphql"; +import { withFragmentContainer } from "coral-framework/lib/relay"; +import { Marker, MarkerCount } from "coral-ui/components"; import Markers from "../components/Markers"; import FlagDetailsContainer from "./FlagDetailsContainer"; diff --git a/src/core/client/admin/routes/moderate/containers/ModerateCardContainer.tsx b/src/core/client/admin/routes/moderate/containers/ModerateCardContainer.tsx index 4b6c90855..5b36ee313 100644 --- a/src/core/client/admin/routes/moderate/containers/ModerateCardContainer.tsx +++ b/src/core/client/admin/routes/moderate/containers/ModerateCardContainer.tsx @@ -5,18 +5,18 @@ import { graphql } from "react-relay"; import { COMMENT_STATUS, ModerateCardContainer_comment as CommentData, -} from "talk-admin/__generated__/ModerateCardContainer_comment.graphql"; -import { ModerateCardContainer_settings as SettingsData } from "talk-admin/__generated__/ModerateCardContainer_settings.graphql"; -import NotAvailable from "talk-admin/components/NotAvailable"; -import { AcceptCommentMutation } from "talk-admin/mutations"; -import { RejectCommentMutation } from "talk-admin/mutations"; +} from "coral-admin/__generated__/ModerateCardContainer_comment.graphql"; +import { ModerateCardContainer_settings as SettingsData } from "coral-admin/__generated__/ModerateCardContainer_settings.graphql"; +import NotAvailable from "coral-admin/components/NotAvailable"; +import { AcceptCommentMutation } from "coral-admin/mutations"; +import { RejectCommentMutation } from "coral-admin/mutations"; import { MutationProp, withFragmentContainer, withMutation, -} from "talk-framework/lib/relay"; +} from "coral-framework/lib/relay"; -import { getModerationLink } from "talk-admin/helpers"; +import { getModerationLink } from "coral-admin/helpers"; import ModerateCard from "../components/ModerateCard"; interface Props { diff --git a/src/core/client/admin/routes/moderate/containers/ModerateContainer.tsx b/src/core/client/admin/routes/moderate/containers/ModerateContainer.tsx index c752800f6..ddb7cd1d9 100644 --- a/src/core/client/admin/routes/moderate/containers/ModerateContainer.tsx +++ b/src/core/client/admin/routes/moderate/containers/ModerateContainer.tsx @@ -2,9 +2,9 @@ import { Match, RouteProps, Router, withRouter } from "found"; import React from "react"; import { graphql } from "react-relay"; -import { ModerateContainerQueryResponse } from "talk-admin/__generated__/ModerateContainerQuery.graphql"; -import { withRouteConfig } from "talk-framework/lib/router"; -import { Spinner } from "talk-ui/components"; +import { ModerateContainerQueryResponse } from "coral-admin/__generated__/ModerateContainerQuery.graphql"; +import { withRouteConfig } from "coral-framework/lib/router"; +import { Spinner } from "coral-ui/components"; import Moderate from "../components/Moderate"; diff --git a/src/core/client/admin/routes/moderate/containers/ModerateNavigationContainer.tsx b/src/core/client/admin/routes/moderate/containers/ModerateNavigationContainer.tsx index 6d6349d17..95ef3ae9d 100644 --- a/src/core/client/admin/routes/moderate/containers/ModerateNavigationContainer.tsx +++ b/src/core/client/admin/routes/moderate/containers/ModerateNavigationContainer.tsx @@ -1,9 +1,9 @@ import React from "react"; import { graphql } from "react-relay"; -import { ModerateNavigationContainer_moderationQueues as ModerationQueuesData } from "talk-admin/__generated__/ModerateNavigationContainer_moderationQueues.graphql"; -import { ModerateNavigationContainer_story as StoryData } from "talk-admin/__generated__/ModerateNavigationContainer_story.graphql"; -import { withFragmentContainer } from "talk-framework/lib/relay"; +import { ModerateNavigationContainer_moderationQueues as ModerationQueuesData } from "coral-admin/__generated__/ModerateNavigationContainer_moderationQueues.graphql"; +import { ModerateNavigationContainer_story as StoryData } from "coral-admin/__generated__/ModerateNavigationContainer_story.graphql"; +import { withFragmentContainer } from "coral-framework/lib/relay"; import Navigation from "../components/Navigation"; diff --git a/src/core/client/admin/routes/moderate/containers/ModerateSearchBarContainer.tsx b/src/core/client/admin/routes/moderate/containers/ModerateSearchBarContainer.tsx index c1f4e8e44..efbb3fc04 100644 --- a/src/core/client/admin/routes/moderate/containers/ModerateSearchBarContainer.tsx +++ b/src/core/client/admin/routes/moderate/containers/ModerateSearchBarContainer.tsx @@ -9,17 +9,17 @@ import React, { } from "react"; import { graphql } from "react-relay"; -import { ModerateSearchBarContainer_story as ModerationQueuesData } from "talk-admin/__generated__/ModerateSearchBarContainer_story.graphql"; -import { SearchStoryFetch } from "talk-admin/fetches"; -import { useEffectWhenChanged } from "talk-framework/hooks"; -import { useFetch, withFragmentContainer } from "talk-framework/lib/relay"; -import { PropTypesOf } from "talk-framework/types"; -import { Spinner } from "talk-ui/components"; -import { blur } from "talk-ui/helpers"; +import { ModerateSearchBarContainer_story as ModerationQueuesData } from "coral-admin/__generated__/ModerateSearchBarContainer_story.graphql"; +import { SearchStoryFetch } from "coral-admin/fetches"; +import { useEffectWhenChanged } from "coral-framework/hooks"; +import { useFetch, withFragmentContainer } from "coral-framework/lib/relay"; +import { PropTypesOf } from "coral-framework/types"; +import { Spinner } from "coral-ui/components"; +import { blur } from "coral-ui/helpers"; import { ListBoxOptionClickOrEnterHandler, ListBoxOptionElement, -} from "talk-ui/hooks/useComboBox"; +} from "coral-ui/hooks/useComboBox"; import * as Search from "../components/Search"; import GoToAriaInfo from "../components/Search/GoToAriaInfo"; diff --git a/src/core/client/admin/routes/moderate/containers/QueueContainer.tsx b/src/core/client/admin/routes/moderate/containers/QueueContainer.tsx index b0e302137..9a54812e9 100644 --- a/src/core/client/admin/routes/moderate/containers/QueueContainer.tsx +++ b/src/core/client/admin/routes/moderate/containers/QueueContainer.tsx @@ -3,11 +3,11 @@ import { RouteProps } from "found"; import React from "react"; import { graphql, GraphQLTaggedNode, RelayPaginationProp } from "react-relay"; -import { QueueContainer_queue as QueueData } from "talk-admin/__generated__/QueueContainer_queue.graphql"; -import { QueueContainer_settings as SettingsData } from "talk-admin/__generated__/QueueContainer_settings.graphql"; -import { QueueContainerPaginationPendingQueryVariables } from "talk-admin/__generated__/QueueContainerPaginationPendingQuery.graphql"; -import { IntersectionProvider } from "talk-framework/lib/intersection"; -import { withPaginationContainer } from "talk-framework/lib/relay"; +import { QueueContainer_queue as QueueData } from "coral-admin/__generated__/QueueContainer_queue.graphql"; +import { QueueContainer_settings as SettingsData } from "coral-admin/__generated__/QueueContainer_settings.graphql"; +import { QueueContainerPaginationPendingQueryVariables } from "coral-admin/__generated__/QueueContainerPaginationPendingQuery.graphql"; +import { IntersectionProvider } from "coral-framework/lib/intersection"; +import { withPaginationContainer } from "coral-framework/lib/relay"; import EmptyMessage from "../components/EmptyMessage"; import LoadingQueue from "../components/LoadingQueue"; diff --git a/src/core/client/admin/routes/moderate/containers/RejectedQueueContainer.tsx b/src/core/client/admin/routes/moderate/containers/RejectedQueueContainer.tsx index 3fe059499..7486dd261 100644 --- a/src/core/client/admin/routes/moderate/containers/RejectedQueueContainer.tsx +++ b/src/core/client/admin/routes/moderate/containers/RejectedQueueContainer.tsx @@ -3,10 +3,10 @@ import { RouteProps } from "found"; import React from "react"; import { graphql, RelayPaginationProp } from "react-relay"; -import { RejectedQueueContainer_query as QueryData } from "talk-admin/__generated__/RejectedQueueContainer_query.graphql"; -import { RejectedQueueContainerPaginationQueryVariables } from "talk-admin/__generated__/RejectedQueueContainerPaginationQuery.graphql"; -import { IntersectionProvider } from "talk-framework/lib/intersection"; -import { withPaginationContainer } from "talk-framework/lib/relay"; +import { RejectedQueueContainer_query as QueryData } from "coral-admin/__generated__/RejectedQueueContainer_query.graphql"; +import { RejectedQueueContainerPaginationQueryVariables } from "coral-admin/__generated__/RejectedQueueContainerPaginationQuery.graphql"; +import { IntersectionProvider } from "coral-framework/lib/intersection"; +import { withPaginationContainer } from "coral-framework/lib/relay"; import EmptyMessage from "../components/EmptyMessage"; import LoadingQueue from "../components/LoadingQueue"; diff --git a/src/core/client/admin/routes/moderate/containers/SingleModerateContainer.tsx b/src/core/client/admin/routes/moderate/containers/SingleModerateContainer.tsx index 4b9101008..1c880de52 100644 --- a/src/core/client/admin/routes/moderate/containers/SingleModerateContainer.tsx +++ b/src/core/client/admin/routes/moderate/containers/SingleModerateContainer.tsx @@ -3,7 +3,7 @@ import { noop } from "lodash"; import React from "react"; import { graphql } from "react-relay"; -import { SingleModerateContainerQueryResponse } from "talk-admin/__generated__/SingleModerateContainerQuery.graphql"; +import { SingleModerateContainerQueryResponse } from "coral-admin/__generated__/SingleModerateContainerQuery.graphql"; import NotFound from "../../NotFound"; import LoadingQueue from "../components/LoadingQueue"; diff --git a/src/core/client/admin/routes/stories/components/EmptyMessage.tsx b/src/core/client/admin/routes/stories/components/EmptyMessage.tsx index a19fc4a9b..5f5aa8de6 100644 --- a/src/core/client/admin/routes/stories/components/EmptyMessage.tsx +++ b/src/core/client/admin/routes/stories/components/EmptyMessage.tsx @@ -1,7 +1,7 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; -import { Typography } from "talk-ui/components"; +import { Typography } from "coral-ui/components"; import styles from "./EmptyMessage.css"; diff --git a/src/core/client/admin/routes/stories/components/NoMatchMessage.tsx b/src/core/client/admin/routes/stories/components/NoMatchMessage.tsx index 5647b22b8..cd8b7a073 100644 --- a/src/core/client/admin/routes/stories/components/NoMatchMessage.tsx +++ b/src/core/client/admin/routes/stories/components/NoMatchMessage.tsx @@ -1,7 +1,7 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; -import { Typography } from "talk-ui/components"; +import { Typography } from "coral-ui/components"; import styles from "./NoMatchMessage.css"; diff --git a/src/core/client/admin/routes/stories/components/StatusChange.tsx b/src/core/client/admin/routes/stories/components/StatusChange.tsx index ee85d57b9..e1b8d8ae8 100644 --- a/src/core/client/admin/routes/stories/components/StatusChange.tsx +++ b/src/core/client/admin/routes/stories/components/StatusChange.tsx @@ -1,8 +1,8 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; -import TranslatedStoryStatus from "talk-admin/components/TranslatedStoryStatus"; -import { GQLSTORY_STATUS, GQLSTORY_STATUS_RL } from "talk-framework/schema"; +import TranslatedStoryStatus from "coral-admin/components/TranslatedStoryStatus"; +import { GQLSTORY_STATUS, GQLSTORY_STATUS_RL } from "coral-framework/schema"; import { Button, ButtonIcon, @@ -10,7 +10,7 @@ import { Dropdown, DropdownButton, Popover, -} from "talk-ui/components"; +} from "coral-ui/components"; import styles from "./StatusChange.css"; import StatusText from "./StatusText"; diff --git a/src/core/client/admin/routes/stories/components/StatusText.tsx b/src/core/client/admin/routes/stories/components/StatusText.tsx index fcbd4b0ca..bd77948a3 100644 --- a/src/core/client/admin/routes/stories/components/StatusText.tsx +++ b/src/core/client/admin/routes/stories/components/StatusText.tsx @@ -1,9 +1,9 @@ import cn from "classnames"; import React, { FunctionComponent } from "react"; -import TranslatedStoryStatus from "talk-admin/components/TranslatedStoryStatus"; +import TranslatedStoryStatus from "coral-admin/components/TranslatedStoryStatus"; -import { GQLSTORY_STATUS_RL } from "talk-framework/schema"; +import { GQLSTORY_STATUS_RL } from "coral-framework/schema"; import styles from "./StatusText.css"; interface Props { diff --git a/src/core/client/admin/routes/stories/components/Stories.tsx b/src/core/client/admin/routes/stories/components/Stories.tsx index 7a2ed1241..c85d3efe8 100644 --- a/src/core/client/admin/routes/stories/components/Stories.tsx +++ b/src/core/client/admin/routes/stories/components/Stories.tsx @@ -1,7 +1,7 @@ import React, { FunctionComponent } from "react"; -import MainLayout from "talk-admin/components/MainLayout"; -import { PropTypesOf } from "talk-framework/types"; +import MainLayout from "coral-admin/components/MainLayout"; +import { PropTypesOf } from "coral-framework/types"; import StoryTableContainer from "../containers/StoryTableContainer"; diff --git a/src/core/client/admin/routes/stories/components/StoryRow.tsx b/src/core/client/admin/routes/stories/components/StoryRow.tsx index 3fe3f4844..7b0af5002 100644 --- a/src/core/client/admin/routes/stories/components/StoryRow.tsx +++ b/src/core/client/admin/routes/stories/components/StoryRow.tsx @@ -1,10 +1,10 @@ import { Link } from "found"; import React, { FunctionComponent } from "react"; -import NotAvailable from "talk-admin/components/NotAvailable"; -import { getModerationLink } from "talk-admin/helpers"; -import { PropTypesOf } from "talk-framework/types"; -import { TableCell, TableRow, TextLink } from "talk-ui/components"; +import NotAvailable from "coral-admin/components/NotAvailable"; +import { getModerationLink } from "coral-admin/helpers"; +import { PropTypesOf } from "coral-framework/types"; +import { TableCell, TableRow, TextLink } from "coral-ui/components"; import StatusChangeContainer from "../containers/StatusChangeContainer"; import StatusText from "./StatusText"; diff --git a/src/core/client/admin/routes/stories/components/StoryTable.tsx b/src/core/client/admin/routes/stories/components/StoryTable.tsx index 71d5c0319..6af691fd0 100644 --- a/src/core/client/admin/routes/stories/components/StoryTable.tsx +++ b/src/core/client/admin/routes/stories/components/StoryTable.tsx @@ -1,17 +1,17 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; -import AutoLoadMoreContainer from "talk-admin/containers/AutoLoadMoreContainer"; -import { Flex, HorizontalGutter, Spinner } from "talk-ui/components"; +import AutoLoadMoreContainer from "coral-admin/containers/AutoLoadMoreContainer"; +import { Flex, HorizontalGutter, Spinner } from "coral-ui/components"; import { Table, TableBody, TableCell, TableHead, TableRow, -} from "talk-ui/components/Table"; +} from "coral-ui/components/Table"; import StoryRowContainer from "../containers/StoryRowContainer"; diff --git a/src/core/client/admin/routes/stories/components/StoryTableFilter.tsx b/src/core/client/admin/routes/stories/components/StoryTableFilter.tsx index 990a9b8f4..895cf4ec6 100644 --- a/src/core/client/admin/routes/stories/components/StoryTableFilter.tsx +++ b/src/core/client/admin/routes/stories/components/StoryTableFilter.tsx @@ -2,7 +2,7 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; import { Field, Form } from "react-final-form"; -import { GQLSTORY_STATUS, GQLSTORY_STATUS_RL } from "talk-framework/schema"; +import { GQLSTORY_STATUS, GQLSTORY_STATUS_RL } from "coral-framework/schema"; import { Button, FieldSet, @@ -12,7 +12,7 @@ import { SelectField, TextField, Typography, -} from "talk-ui/components"; +} from "coral-ui/components"; import styles from "./StoryTableFilter.css"; diff --git a/src/core/client/admin/routes/stories/containers/StatusChangeContainer.tsx b/src/core/client/admin/routes/stories/containers/StatusChangeContainer.tsx index 9986d26c8..1520d8ef2 100644 --- a/src/core/client/admin/routes/stories/containers/StatusChangeContainer.tsx +++ b/src/core/client/admin/routes/stories/containers/StatusChangeContainer.tsx @@ -1,9 +1,9 @@ import React, { FunctionComponent, useCallback } from "react"; -import { CloseStoryMutation, OpenStoryMutation } from "talk-admin/mutations"; -import { GQLSTORY_STATUS, GQLSTORY_STATUS_RL } from "talk-framework/schema"; +import { CloseStoryMutation, OpenStoryMutation } from "coral-admin/mutations"; +import { GQLSTORY_STATUS, GQLSTORY_STATUS_RL } from "coral-framework/schema"; -import { MutationProp, withMutation } from "talk-framework/lib/relay"; +import { MutationProp, withMutation } from "coral-framework/lib/relay"; import StatusChange from "../components/StatusChange"; interface Props { diff --git a/src/core/client/admin/routes/stories/containers/StoriesContainer.tsx b/src/core/client/admin/routes/stories/containers/StoriesContainer.tsx index b17338871..fb6c1c0f2 100644 --- a/src/core/client/admin/routes/stories/containers/StoriesContainer.tsx +++ b/src/core/client/admin/routes/stories/containers/StoriesContainer.tsx @@ -2,8 +2,8 @@ import { FormApi } from "final-form"; import React, { FunctionComponent } from "react"; import { graphql } from "react-relay"; -import { StoriesContainerQueryResponse } from "talk-admin/__generated__/StoriesContainerQuery.graphql"; -import { withRouteConfig } from "talk-framework/lib/router"; +import { StoriesContainerQueryResponse } from "coral-admin/__generated__/StoriesContainerQuery.graphql"; +import { withRouteConfig } from "coral-framework/lib/router"; import Stories from "../components/Stories"; diff --git a/src/core/client/admin/routes/stories/containers/StoryRowContainer.tsx b/src/core/client/admin/routes/stories/containers/StoryRowContainer.tsx index 81046d7e5..f581ad1a9 100644 --- a/src/core/client/admin/routes/stories/containers/StoryRowContainer.tsx +++ b/src/core/client/admin/routes/stories/containers/StoryRowContainer.tsx @@ -1,12 +1,12 @@ import React, { FunctionComponent } from "react"; import { graphql } from "react-relay"; -import { StoryRowContainer_story as StoryData } from "talk-admin/__generated__/StoryRowContainer_story.graphql"; -import { StoryRowContainer_viewer as ViewerData } from "talk-admin/__generated__/StoryRowContainer_viewer.graphql"; -import { useTalkContext } from "talk-framework/lib/bootstrap"; -import { withFragmentContainer } from "talk-framework/lib/relay"; +import { StoryRowContainer_story as StoryData } from "coral-admin/__generated__/StoryRowContainer_story.graphql"; +import { StoryRowContainer_viewer as ViewerData } from "coral-admin/__generated__/StoryRowContainer_viewer.graphql"; +import { useCoralContext } from "coral-framework/lib/bootstrap"; +import { withFragmentContainer } from "coral-framework/lib/relay"; -import { Ability, can } from "talk-admin/permissions"; +import { Ability, can } from "coral-admin/permissions"; import StoryRow from "../components/StoryRow"; interface Props { @@ -15,7 +15,7 @@ interface Props { } const StoryRowContainer: FunctionComponent = props => { - const { locales } = useTalkContext(); + const { locales } = useCoralContext(); const title = props.story.metadata && props.story.metadata.title; const author = props.story.metadata && props.story.metadata.author; const publishedAt = props.story.metadata && props.story.metadata.publishedAt; diff --git a/src/core/client/admin/routes/stories/containers/StoryTableContainer.tsx b/src/core/client/admin/routes/stories/containers/StoryTableContainer.tsx index 26173009c..fed286489 100644 --- a/src/core/client/admin/routes/stories/containers/StoryTableContainer.tsx +++ b/src/core/client/admin/routes/stories/containers/StoryTableContainer.tsx @@ -1,17 +1,17 @@ import React, { FunctionComponent, useState } from "react"; import { graphql, RelayPaginationProp } from "react-relay"; -import { StoryTableContainer_query as QueryData } from "talk-admin/__generated__/StoryTableContainer_query.graphql"; -import { StoryTableContainerPaginationQueryVariables } from "talk-admin/__generated__/StoryTableContainerPaginationQuery.graphql"; -import { IntersectionProvider } from "talk-framework/lib/intersection"; +import { StoryTableContainer_query as QueryData } from "coral-admin/__generated__/StoryTableContainer_query.graphql"; +import { StoryTableContainerPaginationQueryVariables } from "coral-admin/__generated__/StoryTableContainerPaginationQuery.graphql"; +import { IntersectionProvider } from "coral-framework/lib/intersection"; import { useLoadMore, useRefetch, withPaginationContainer, -} from "talk-framework/lib/relay"; -import { GQLSTORY_STATUS_RL } from "talk-framework/schema"; +} from "coral-framework/lib/relay"; +import { GQLSTORY_STATUS_RL } from "coral-framework/schema"; -import { HorizontalGutter } from "talk-ui/components"; +import { HorizontalGutter } from "coral-ui/components"; import StoryTable from "../components/StoryTable"; import StoryTableFilter from "../components/StoryTableFilter"; diff --git a/src/core/client/admin/test/auth/__snapshots__/restricted.spec.tsx.snap b/src/core/client/admin/test/auth/__snapshots__/restricted.spec.tsx.snap index 09ec4d183..e8310e6a5 100644 --- a/src/core/client/admin/test/auth/__snapshots__/restricted.spec.tsx.snap +++ b/src/core/client/admin/test/auth/__snapshots__/restricted.spec.tsx.snap @@ -71,7 +71,7 @@ exports[`show restricted screen for commenters and staff 1`] = `

- Talk + Coral

- Talk + Coral
- Talk + Coral
- Domains where your Talk instance is allowed to be embedded. + Domains where your Coral instance is allowed to be embedded. Typical use is localhost, staging.yourdomain.com, yourdomain.com, etc.

diff --git a/src/core/client/admin/test/configure/__snapshots__/auth.spec.tsx.snap b/src/core/client/admin/test/configure/__snapshots__/auth.spec.tsx.snap index 144bada52..25972bd98 100644 --- a/src/core/client/admin/test/configure/__snapshots__/auth.spec.tsx.snap +++ b/src/core/client/admin/test/configure/__snapshots__/auth.spec.tsx.snap @@ -203,7 +203,7 @@ needs to be displayed, e.g. “Log in with <Facebook>”.

- After entering your Issuer information, click the Discover button to have Talk complete + After entering your Issuer information, click the Discover button to have Coral complete the remaining fields. You may also enter the information manually.

- Talk Admin + Coral Admin
@@ -631,7 +631,7 @@ For more information visit: - Talk Admin + Coral Admin
@@ -914,7 +914,7 @@ needs to be displayed, e.g. “Log in with <Facebook>”.

- After entering your Issuer information, click the Discover button to have Talk complete + After entering your Issuer information, click the Discover button to have Coral complete the remaining fields. You may also enter the information manually.

- Talk Admin + Coral Admin
@@ -1387,7 +1387,7 @@ needs to be displayed, e.g. “Log in with <Facebook>”.

- After entering your Issuer information, click the Discover button to have Talk complete + After entering your Issuer information, click the Discover button to have Coral complete the remaining fields. You may also enter the information manually.

- Talk Admin + Coral Admin
@@ -1676,7 +1676,7 @@ exports[`prevents admin lock out 1`] = ` data-testid="configure-auth-submitError" > - Please enable at least one authentication integration for Talk Admin + Please enable at least one authentication integration for Coral Admin `; @@ -1944,7 +1944,7 @@ exports[`renders configure auth 1`] = ` - Talk Admin + Coral Admin @@ -2224,7 +2224,7 @@ needs to be displayed, e.g. “Log in with <Facebook>”.

- After entering your Issuer information, click the Discover button to have Talk complete + After entering your Issuer information, click the Discover button to have Coral complete the remaining fields. You may also enter the information manually.

- Talk Admin + Coral Admin
@@ -2597,7 +2597,7 @@ and all signed-in users will be signed out. - Talk Admin + Coral Admin @@ -2870,7 +2870,7 @@ to create and set up a web application. For more information visit: - Talk Admin + Coral Admin @@ -3144,7 +3144,7 @@ For more information visit: - Talk Admin + Coral Admin diff --git a/src/core/client/admin/test/configure/__snapshots__/organization.spec.tsx.snap b/src/core/client/admin/test/configure/__snapshots__/organization.spec.tsx.snap index 3c5ef2faf..4bcad43c0 100644 --- a/src/core/client/admin/test/configure/__snapshots__/organization.spec.tsx.snap +++ b/src/core/client/admin/test/configure/__snapshots__/organization.spec.tsx.snap @@ -122,7 +122,7 @@ exports[`renders configure organization 1`] = `

- Your organization name will appear on emails sent by Talk to your community and organization members. + Your organization name will appear on emails sent by Coral to your community and organization members.

) { return createTestRenderer("admin", , params); diff --git a/src/core/client/admin/test/decisionHistory/decisionHistory.spec.tsx b/src/core/client/admin/test/decisionHistory/decisionHistory.spec.tsx index 49340f010..202ec6cff 100644 --- a/src/core/client/admin/test/decisionHistory/decisionHistory.spec.tsx +++ b/src/core/client/admin/test/decisionHistory/decisionHistory.spec.tsx @@ -1,8 +1,8 @@ -import { pureMerge } from "talk-common/utils"; +import { pureMerge } from "coral-common/utils"; import { GQLResolver, UserToCommentModerationActionHistoryResolver, -} from "talk-framework/schema"; +} from "coral-framework/schema"; import { createQueryResolverStub, createResolversStub, @@ -12,7 +12,7 @@ import { waitForElement, waitUntilThrow, within, -} from "talk-framework/testHelpers"; +} from "coral-framework/testHelpers"; import create from "../create"; import { moderationActions, settings, users } from "../fixtures"; diff --git a/src/core/client/admin/test/fixtures.ts b/src/core/client/admin/test/fixtures.ts index b74b00b70..b23ae92c5 100644 --- a/src/core/client/admin/test/fixtures.ts +++ b/src/core/client/admin/test/fixtures.ts @@ -14,8 +14,8 @@ import { GQLUSER_ROLE, GQLUSER_STATUS, GQLUsersConnection, -} from "talk-framework/schema"; -import { createFixture, createFixtures } from "talk-framework/testHelpers"; +} from "coral-framework/schema"; +import { createFixture, createFixtures } from "coral-framework/testHelpers"; export const settings = createFixture({ id: "settings", diff --git a/src/core/client/admin/test/moderate/moderate.spec.tsx b/src/core/client/admin/test/moderate/moderate.spec.tsx index 70d5dcb33..47d877f7a 100644 --- a/src/core/client/admin/test/moderate/moderate.spec.tsx +++ b/src/core/client/admin/test/moderate/moderate.spec.tsx @@ -1,7 +1,7 @@ import { noop } from "lodash"; import { ReactTestRenderer } from "react-test-renderer"; -import { pureMerge } from "talk-common/utils"; +import { pureMerge } from "coral-common/utils"; import { GQLCOMMENT_STATUS, GQLResolver, @@ -9,7 +9,7 @@ import { MutationToAcceptCommentResolver, MutationToRejectCommentResolver, QueryToCommentResolver, -} from "talk-framework/schema"; +} from "coral-framework/schema"; import { createMutationResolverStub, createQueryResolverStub, @@ -22,7 +22,7 @@ import { waitForElement, waitUntilThrow, within, -} from "talk-framework/testHelpers"; +} from "coral-framework/testHelpers"; import create from "../create"; import { diff --git a/src/core/client/admin/test/stories/stories.spec.tsx b/src/core/client/admin/test/stories/stories.spec.tsx index c665a9dce..84d559f01 100644 --- a/src/core/client/admin/test/stories/stories.spec.tsx +++ b/src/core/client/admin/test/stories/stories.spec.tsx @@ -1,7 +1,7 @@ import { noop } from "lodash"; import TestRenderer from "react-test-renderer"; -import { pureMerge } from "talk-common/utils"; +import { pureMerge } from "coral-common/utils"; import { createMutationResolverStub, createResolversStub, @@ -11,14 +11,14 @@ import { waitForElement, waitUntilThrow, within, -} from "talk-framework/testHelpers"; +} from "coral-framework/testHelpers"; import { GQLResolver, GQLSTORY_STATUS, MutationToCloseStoryResolver, MutationToOpenStoryResolver, -} from "talk-framework/schema"; +} from "coral-framework/schema"; import create from "../create"; import { emptyStories, diff --git a/src/core/client/admin/views/decisionHistory/components/AcceptedComment.spec.tsx b/src/core/client/admin/views/decisionHistory/components/AcceptedComment.spec.tsx index 388aab5a1..5a5fc13ad 100644 --- a/src/core/client/admin/views/decisionHistory/components/AcceptedComment.spec.tsx +++ b/src/core/client/admin/views/decisionHistory/components/AcceptedComment.spec.tsx @@ -2,7 +2,7 @@ import { noop } from "lodash"; import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import AcceptedComment from "./AcceptedComment"; diff --git a/src/core/client/admin/views/decisionHistory/components/AcceptedComment.tsx b/src/core/client/admin/views/decisionHistory/components/AcceptedComment.tsx index 5afb40260..1d78e948e 100644 --- a/src/core/client/admin/views/decisionHistory/components/AcceptedComment.tsx +++ b/src/core/client/admin/views/decisionHistory/components/AcceptedComment.tsx @@ -9,7 +9,7 @@ import GoToCommentLink from "./GoToCommentLink"; import Info from "./Info"; import Timestamp from "./Timestamp"; -import { Typography } from "talk-ui/components"; +import { Typography } from "coral-ui/components"; interface Props { href: string; diff --git a/src/core/client/admin/views/decisionHistory/components/AcceptedIcon.tsx b/src/core/client/admin/views/decisionHistory/components/AcceptedIcon.tsx index de9ae84df..4b01e322d 100644 --- a/src/core/client/admin/views/decisionHistory/components/AcceptedIcon.tsx +++ b/src/core/client/admin/views/decisionHistory/components/AcceptedIcon.tsx @@ -1,6 +1,6 @@ import React, { FunctionComponent } from "react"; -import { Icon } from "talk-ui/components"; +import { Icon } from "coral-ui/components"; import styles from "./AcceptedIcon.css"; diff --git a/src/core/client/admin/views/decisionHistory/components/DecisionHistory.spec.tsx b/src/core/client/admin/views/decisionHistory/components/DecisionHistory.spec.tsx index 6e42da137..9b3309b87 100644 --- a/src/core/client/admin/views/decisionHistory/components/DecisionHistory.spec.tsx +++ b/src/core/client/admin/views/decisionHistory/components/DecisionHistory.spec.tsx @@ -2,8 +2,8 @@ import { noop } from "lodash"; import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { removeFragmentRefs } from "talk-framework/testHelpers"; -import { PropTypesOf } from "talk-framework/types"; +import { removeFragmentRefs } from "coral-framework/testHelpers"; +import { PropTypesOf } from "coral-framework/types"; import DecisionHistory from "./DecisionHistory"; diff --git a/src/core/client/admin/views/decisionHistory/components/DecisionHistory.tsx b/src/core/client/admin/views/decisionHistory/components/DecisionHistory.tsx index 1c74c6c8c..8a6743e32 100644 --- a/src/core/client/admin/views/decisionHistory/components/DecisionHistory.tsx +++ b/src/core/client/admin/views/decisionHistory/components/DecisionHistory.tsx @@ -1,6 +1,6 @@ import React, { FunctionComponent } from "react"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import DecisionHistoryItemContainer from "../containers/DecisionHistoryItemContainer"; import DecisionList from "./DecisionList"; diff --git a/src/core/client/admin/views/decisionHistory/components/DecisionHistoryLoading.tsx b/src/core/client/admin/views/decisionHistory/components/DecisionHistoryLoading.tsx index f37ef5f86..61f3dacf7 100644 --- a/src/core/client/admin/views/decisionHistory/components/DecisionHistoryLoading.tsx +++ b/src/core/client/admin/views/decisionHistory/components/DecisionHistoryLoading.tsx @@ -1,6 +1,6 @@ import React, { FunctionComponent } from "react"; -import { Delay, Flex, Spinner } from "talk-ui/components"; +import { Delay, Flex, Spinner } from "coral-ui/components"; import Main from "./Main"; import Title from "./Title"; diff --git a/src/core/client/admin/views/decisionHistory/components/DecisionItem.spec.tsx b/src/core/client/admin/views/decisionHistory/components/DecisionItem.spec.tsx index 14fb9051f..c25634743 100644 --- a/src/core/client/admin/views/decisionHistory/components/DecisionItem.spec.tsx +++ b/src/core/client/admin/views/decisionHistory/components/DecisionItem.spec.tsx @@ -1,7 +1,7 @@ import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import DecisionItem from "./DecisionItem"; diff --git a/src/core/client/admin/views/decisionHistory/components/DecisionItem.tsx b/src/core/client/admin/views/decisionHistory/components/DecisionItem.tsx index 18d96ca73..562e2da39 100644 --- a/src/core/client/admin/views/decisionHistory/components/DecisionItem.tsx +++ b/src/core/client/admin/views/decisionHistory/components/DecisionItem.tsx @@ -1,6 +1,6 @@ import React, { FunctionComponent } from "react"; -import { Flex } from "talk-ui/components"; +import { Flex } from "coral-ui/components"; import styles from "./DecisionItem.css"; diff --git a/src/core/client/admin/views/decisionHistory/components/DecisionList.spec.tsx b/src/core/client/admin/views/decisionHistory/components/DecisionList.spec.tsx index 8138cac79..4d63ce6c8 100644 --- a/src/core/client/admin/views/decisionHistory/components/DecisionList.spec.tsx +++ b/src/core/client/admin/views/decisionHistory/components/DecisionList.spec.tsx @@ -1,7 +1,7 @@ import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import DecisionList from "./DecisionList"; diff --git a/src/core/client/admin/views/decisionHistory/components/Empty.tsx b/src/core/client/admin/views/decisionHistory/components/Empty.tsx index 40418f6a3..1c3b83a98 100644 --- a/src/core/client/admin/views/decisionHistory/components/Empty.tsx +++ b/src/core/client/admin/views/decisionHistory/components/Empty.tsx @@ -1,7 +1,7 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; -import { Flex, Typography } from "talk-ui/components"; +import { Flex, Typography } from "coral-ui/components"; import styles from "./Empty.css"; diff --git a/src/core/client/admin/views/decisionHistory/components/Footer.spec.tsx b/src/core/client/admin/views/decisionHistory/components/Footer.spec.tsx index 32cfd9dca..4a05917b2 100644 --- a/src/core/client/admin/views/decisionHistory/components/Footer.spec.tsx +++ b/src/core/client/admin/views/decisionHistory/components/Footer.spec.tsx @@ -1,7 +1,7 @@ import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import Footer from "./Footer"; diff --git a/src/core/client/admin/views/decisionHistory/components/Footer.tsx b/src/core/client/admin/views/decisionHistory/components/Footer.tsx index 9139c7a6a..c1e50a899 100644 --- a/src/core/client/admin/views/decisionHistory/components/Footer.tsx +++ b/src/core/client/admin/views/decisionHistory/components/Footer.tsx @@ -1,6 +1,6 @@ import React, { FunctionComponent } from "react"; -import { Flex } from "talk-ui/components"; +import { Flex } from "coral-ui/components"; import styles from "./Footer.css"; diff --git a/src/core/client/admin/views/decisionHistory/components/GoToCommentLink.spec.tsx b/src/core/client/admin/views/decisionHistory/components/GoToCommentLink.spec.tsx index 908fcf43b..bedd5be68 100644 --- a/src/core/client/admin/views/decisionHistory/components/GoToCommentLink.spec.tsx +++ b/src/core/client/admin/views/decisionHistory/components/GoToCommentLink.spec.tsx @@ -2,7 +2,7 @@ import { noop } from "lodash"; import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import GoToCommentLink from "./GoToCommentLink"; diff --git a/src/core/client/admin/views/decisionHistory/components/GoToCommentLink.tsx b/src/core/client/admin/views/decisionHistory/components/GoToCommentLink.tsx index 457f25825..81696b12c 100644 --- a/src/core/client/admin/views/decisionHistory/components/GoToCommentLink.tsx +++ b/src/core/client/admin/views/decisionHistory/components/GoToCommentLink.tsx @@ -2,7 +2,7 @@ import { Localized } from "fluent-react/compat"; import { Link } from "found"; import React, { FunctionComponent } from "react"; -import { Icon, TextLink } from "talk-ui/components"; +import { Icon, TextLink } from "coral-ui/components"; import styles from "./GoToCommentLink.css"; diff --git a/src/core/client/admin/views/decisionHistory/components/Info.spec.tsx b/src/core/client/admin/views/decisionHistory/components/Info.spec.tsx index b2969a0c1..2bc2ea089 100644 --- a/src/core/client/admin/views/decisionHistory/components/Info.spec.tsx +++ b/src/core/client/admin/views/decisionHistory/components/Info.spec.tsx @@ -1,7 +1,7 @@ import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import Info from "./Info"; diff --git a/src/core/client/admin/views/decisionHistory/components/Info.tsx b/src/core/client/admin/views/decisionHistory/components/Info.tsx index 0de6801d3..452eda05f 100644 --- a/src/core/client/admin/views/decisionHistory/components/Info.tsx +++ b/src/core/client/admin/views/decisionHistory/components/Info.tsx @@ -1,6 +1,6 @@ import React, { FunctionComponent } from "react"; -import { Typography } from "talk-ui/components"; +import { Typography } from "coral-ui/components"; import styles from "./Info.css"; diff --git a/src/core/client/admin/views/decisionHistory/components/Main.spec.tsx b/src/core/client/admin/views/decisionHistory/components/Main.spec.tsx index 5704e91bf..8aeb77831 100644 --- a/src/core/client/admin/views/decisionHistory/components/Main.spec.tsx +++ b/src/core/client/admin/views/decisionHistory/components/Main.spec.tsx @@ -1,7 +1,7 @@ import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import Main from "./Main"; diff --git a/src/core/client/admin/views/decisionHistory/components/RejectedComment.spec.tsx b/src/core/client/admin/views/decisionHistory/components/RejectedComment.spec.tsx index c0f9ab847..397a1f55b 100644 --- a/src/core/client/admin/views/decisionHistory/components/RejectedComment.spec.tsx +++ b/src/core/client/admin/views/decisionHistory/components/RejectedComment.spec.tsx @@ -2,7 +2,7 @@ import { noop } from "lodash"; import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import RejectedComment from "./RejectedComment"; diff --git a/src/core/client/admin/views/decisionHistory/components/RejectedComment.tsx b/src/core/client/admin/views/decisionHistory/components/RejectedComment.tsx index 9d915398c..8f2066604 100644 --- a/src/core/client/admin/views/decisionHistory/components/RejectedComment.tsx +++ b/src/core/client/admin/views/decisionHistory/components/RejectedComment.tsx @@ -9,7 +9,7 @@ import Info from "./Info"; import RejectedIcon from "./RejectedIcon"; import Timestamp from "./Timestamp"; -import { Typography } from "talk-ui/components"; +import { Typography } from "coral-ui/components"; interface Props { href: string; diff --git a/src/core/client/admin/views/decisionHistory/components/RejectedIcon.tsx b/src/core/client/admin/views/decisionHistory/components/RejectedIcon.tsx index bf511ceeb..1dde0162f 100644 --- a/src/core/client/admin/views/decisionHistory/components/RejectedIcon.tsx +++ b/src/core/client/admin/views/decisionHistory/components/RejectedIcon.tsx @@ -1,6 +1,6 @@ import React, { FunctionComponent } from "react"; -import { Icon } from "talk-ui/components"; +import { Icon } from "coral-ui/components"; import styles from "./RejectedIcon.css"; diff --git a/src/core/client/admin/views/decisionHistory/components/ShowMoreButton.spec.tsx b/src/core/client/admin/views/decisionHistory/components/ShowMoreButton.spec.tsx index 8615a9136..dd7375d3e 100644 --- a/src/core/client/admin/views/decisionHistory/components/ShowMoreButton.spec.tsx +++ b/src/core/client/admin/views/decisionHistory/components/ShowMoreButton.spec.tsx @@ -2,7 +2,7 @@ import { noop } from "lodash"; import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import ShowMoreButton from "./ShowMoreButton"; diff --git a/src/core/client/admin/views/decisionHistory/components/ShowMoreButton.tsx b/src/core/client/admin/views/decisionHistory/components/ShowMoreButton.tsx index 9a402697d..4cdf8bc7e 100644 --- a/src/core/client/admin/views/decisionHistory/components/ShowMoreButton.tsx +++ b/src/core/client/admin/views/decisionHistory/components/ShowMoreButton.tsx @@ -1,7 +1,7 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; -import { BaseButton } from "talk-ui/components"; +import { BaseButton } from "coral-ui/components"; import styles from "./ShowMoreButton.css"; diff --git a/src/core/client/admin/views/decisionHistory/components/Timestamp.spec.tsx b/src/core/client/admin/views/decisionHistory/components/Timestamp.spec.tsx index 214872f1c..c58cdc592 100644 --- a/src/core/client/admin/views/decisionHistory/components/Timestamp.spec.tsx +++ b/src/core/client/admin/views/decisionHistory/components/Timestamp.spec.tsx @@ -1,7 +1,7 @@ import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import Timestamp from "./Timestamp"; diff --git a/src/core/client/admin/views/decisionHistory/components/Timestamp.tsx b/src/core/client/admin/views/decisionHistory/components/Timestamp.tsx index 02f90b273..881e41ca8 100644 --- a/src/core/client/admin/views/decisionHistory/components/Timestamp.tsx +++ b/src/core/client/admin/views/decisionHistory/components/Timestamp.tsx @@ -1,6 +1,6 @@ import React, { FunctionComponent } from "react"; -import { RelativeTime } from "talk-ui/components"; +import { RelativeTime } from "coral-ui/components"; import styles from "./Timestamp.css"; diff --git a/src/core/client/admin/views/decisionHistory/components/Title.tsx b/src/core/client/admin/views/decisionHistory/components/Title.tsx index 51f15214d..d56a34daf 100644 --- a/src/core/client/admin/views/decisionHistory/components/Title.tsx +++ b/src/core/client/admin/views/decisionHistory/components/Title.tsx @@ -1,7 +1,7 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; -import { Flex, Icon, Typography } from "talk-ui/components"; +import { Flex, Icon, Typography } from "coral-ui/components"; import styles from "./Title.css"; diff --git a/src/core/client/admin/views/decisionHistory/containers/DecisionHistoryContainer.tsx b/src/core/client/admin/views/decisionHistory/containers/DecisionHistoryContainer.tsx index f4df3134c..6f0d4c418 100644 --- a/src/core/client/admin/views/decisionHistory/containers/DecisionHistoryContainer.tsx +++ b/src/core/client/admin/views/decisionHistory/containers/DecisionHistoryContainer.tsx @@ -1,9 +1,9 @@ import React from "react"; import { graphql, RelayPaginationProp } from "react-relay"; -import { DecisionHistoryContainer_viewer as ViewerData } from "talk-admin/__generated__/DecisionHistoryContainer_viewer.graphql"; -import { DecisionHistoryContainerPaginationQueryVariables } from "talk-admin/__generated__/DecisionHistoryContainerPaginationQuery.graphql"; -import { withPaginationContainer } from "talk-framework/lib/relay"; +import { DecisionHistoryContainer_viewer as ViewerData } from "coral-admin/__generated__/DecisionHistoryContainer_viewer.graphql"; +import { DecisionHistoryContainerPaginationQueryVariables } from "coral-admin/__generated__/DecisionHistoryContainerPaginationQuery.graphql"; +import { withPaginationContainer } from "coral-framework/lib/relay"; import DecisionHistory from "../components/DecisionHistory"; diff --git a/src/core/client/admin/views/decisionHistory/containers/DecisionHistoryItemContainer.tsx b/src/core/client/admin/views/decisionHistory/containers/DecisionHistoryItemContainer.tsx index 3dcce4f57..5f45fa881 100644 --- a/src/core/client/admin/views/decisionHistory/containers/DecisionHistoryItemContainer.tsx +++ b/src/core/client/admin/views/decisionHistory/containers/DecisionHistoryItemContainer.tsx @@ -1,8 +1,8 @@ import React from "react"; import { graphql } from "react-relay"; -import { DecisionHistoryItemContainer_action as ActionData } from "talk-admin/__generated__/DecisionHistoryItemContainer_action.graphql"; -import { withFragmentContainer } from "talk-framework/lib/relay"; +import { DecisionHistoryItemContainer_action as ActionData } from "coral-admin/__generated__/DecisionHistoryItemContainer_action.graphql"; +import { withFragmentContainer } from "coral-framework/lib/relay"; import AcceptedComment from "../components/AcceptedComment"; import RejectedComment from "../components/RejectedComment"; diff --git a/src/core/client/admin/views/decisionHistory/queries/DecisionHistoryQuery.tsx b/src/core/client/admin/views/decisionHistory/queries/DecisionHistoryQuery.tsx index 38d6d1467..0ea305403 100644 --- a/src/core/client/admin/views/decisionHistory/queries/DecisionHistoryQuery.tsx +++ b/src/core/client/admin/views/decisionHistory/queries/DecisionHistoryQuery.tsx @@ -1,7 +1,7 @@ +import { graphql, QueryRenderer } from "coral-framework/lib/relay"; import React, { Component } from "react"; -import { graphql, QueryRenderer } from "talk-framework/lib/relay"; -import { DecisionHistoryQuery as QueryTypes } from "talk-admin/__generated__/DecisionHistoryQuery.graphql"; +import { DecisionHistoryQuery as QueryTypes } from "coral-admin/__generated__/DecisionHistoryQuery.graphql"; import DecisionHistoryLoading from "../components/DecisionHistoryLoading"; import DecisionHistoryContainer from "../containers/DecisionHistoryContainer"; diff --git a/src/core/client/admin/views/restricted/components/Restricted.spec.tsx b/src/core/client/admin/views/restricted/components/Restricted.spec.tsx index c953766c7..82bbdd66b 100644 --- a/src/core/client/admin/views/restricted/components/Restricted.spec.tsx +++ b/src/core/client/admin/views/restricted/components/Restricted.spec.tsx @@ -2,7 +2,7 @@ import { noop } from "lodash"; import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import Restricted from "./Restricted"; diff --git a/src/core/client/admin/views/restricted/components/Restricted.tsx b/src/core/client/admin/views/restricted/components/Restricted.tsx index b0ec91983..85cfab1b1 100644 --- a/src/core/client/admin/views/restricted/components/Restricted.tsx +++ b/src/core/client/admin/views/restricted/components/Restricted.tsx @@ -1,14 +1,14 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; -import AuthBox from "talk-admin/components/AuthBox"; +import AuthBox from "coral-admin/components/AuthBox"; import { Button, Flex, HorizontalGutter, Icon, Typography, -} from "talk-ui/components"; +} from "coral-ui/components"; import styles from "./Restricted.css"; diff --git a/src/core/client/admin/views/restricted/containers/RestrictedContainer.tsx b/src/core/client/admin/views/restricted/containers/RestrictedContainer.tsx index cd75f56cb..08e2ec084 100644 --- a/src/core/client/admin/views/restricted/containers/RestrictedContainer.tsx +++ b/src/core/client/admin/views/restricted/containers/RestrictedContainer.tsx @@ -1,16 +1,19 @@ import { RouteProps } from "found"; import React, { Component } from "react"; -import { RestrictedContainer_viewer as ViewerData } from "talk-admin/__generated__/RestrictedContainer_viewer.graphql"; -import { SetRedirectPathMutation } from "talk-admin/mutations"; -import { timeout } from "talk-common/utils"; +import { RestrictedContainer_viewer as ViewerData } from "coral-admin/__generated__/RestrictedContainer_viewer.graphql"; +import { SetRedirectPathMutation } from "coral-admin/mutations"; +import { timeout } from "coral-common/utils"; import { graphql, MutationProp, withFragmentContainer, withMutation, -} from "talk-framework/lib/relay"; -import { SignOutMutation, withSignOutMutation } from "talk-framework/mutations"; +} from "coral-framework/lib/relay"; +import { + SignOutMutation, + withSignOutMutation, +} from "coral-framework/mutations"; import Restricted from "../components/Restricted"; diff --git a/src/core/client/auth-callback/index.html b/src/core/client/auth-callback/index.html index 919bf9910..53c5d6e00 100644 --- a/src/core/client/auth-callback/index.html +++ b/src/core/client/auth-callback/index.html @@ -1,13 +1,11 @@ + + Coral - Auth Callback + + + + - - Talk - Auth Callback - - - - - - - + diff --git a/src/core/client/auth-callback/index.ts b/src/core/client/auth-callback/index.ts index c70a144c3..dfb93819b 100644 --- a/src/core/client/auth-callback/index.ts +++ b/src/core/client/auth-callback/index.ts @@ -1,4 +1,4 @@ -import { authRedirectBackTo as key } from "talk-framework/helpers/storageKeys"; +import { authRedirectBackTo as key } from "coral-framework/helpers/storageKeys"; try { // Pull the redirection diff --git a/src/core/client/auth/components/App.spec.tsx b/src/core/client/auth/components/App.spec.tsx index ffcabca35..9a4be9746 100644 --- a/src/core/client/auth/components/App.spec.tsx +++ b/src/core/client/auth/components/App.spec.tsx @@ -1,8 +1,8 @@ import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { removeFragmentRefs } from "talk-framework/testHelpers"; -import { PropTypesOf } from "talk-framework/types"; +import { removeFragmentRefs } from "coral-framework/testHelpers"; +import { PropTypesOf } from "coral-framework/types"; import App from "./App"; diff --git a/src/core/client/auth/components/App.tsx b/src/core/client/auth/components/App.tsx index 480c57c92..3dc5e0fc3 100644 --- a/src/core/client/auth/components/App.tsx +++ b/src/core/client/auth/components/App.tsx @@ -1,6 +1,6 @@ import React, { FunctionComponent } from "react"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import AddEmailAddressContainer from "../views/addEmailAddress/containers/AddEmailAddressContainer"; import CreatePasswordContainer from "../views/createPassword/containers/CreatePasswordContainer"; diff --git a/src/core/client/auth/components/ConfirmEmailField.tsx b/src/core/client/auth/components/ConfirmEmailField.tsx index 1ecc71786..c9189e547 100644 --- a/src/core/client/auth/components/ConfirmEmailField.tsx +++ b/src/core/client/auth/components/ConfirmEmailField.tsx @@ -1,18 +1,18 @@ -import { Localized } from "fluent-react/compat"; -import * as React from "react"; -import { FunctionComponent } from "react"; -import { Field } from "react-final-form"; import { composeValidators, required, validateEqualEmails, -} from "talk-framework/lib/validation"; +} from "coral-framework/lib/validation"; import { FormField, InputLabel, TextField, ValidationMessage, -} from "talk-ui/components"; +} from "coral-ui/components"; +import { Localized } from "fluent-react/compat"; +import * as React from "react"; +import { FunctionComponent } from "react"; +import { Field } from "react-final-form"; interface Props { disabled: boolean; diff --git a/src/core/client/auth/components/ConfirmPasswordField.tsx b/src/core/client/auth/components/ConfirmPasswordField.tsx index 58b95797a..4ebe03a6a 100644 --- a/src/core/client/auth/components/ConfirmPasswordField.tsx +++ b/src/core/client/auth/components/ConfirmPasswordField.tsx @@ -7,13 +7,13 @@ import { composeValidators, required, validateEqualPasswords, -} from "talk-framework/lib/validation"; +} from "coral-framework/lib/validation"; import { FormField, InputLabel, TextField, ValidationMessage, -} from "talk-ui/components"; +} from "coral-ui/components"; interface Props { disabled: boolean; diff --git a/src/core/client/auth/components/EmailField.tsx b/src/core/client/auth/components/EmailField.tsx index 9c51a7a52..086c4b65a 100644 --- a/src/core/client/auth/components/EmailField.tsx +++ b/src/core/client/auth/components/EmailField.tsx @@ -1,18 +1,18 @@ -import { Localized } from "fluent-react/compat"; -import * as React from "react"; -import { FunctionComponent } from "react"; -import { Field } from "react-final-form"; import { composeValidators, required, validateEmail, -} from "talk-framework/lib/validation"; +} from "coral-framework/lib/validation"; import { FormField, InputLabel, TextField, ValidationMessage, -} from "talk-ui/components"; +} from "coral-ui/components"; +import { Localized } from "fluent-react/compat"; +import * as React from "react"; +import { FunctionComponent } from "react"; +import { Field } from "react-final-form"; interface Props { disabled: boolean; diff --git a/src/core/client/auth/components/Header/Bar.spec.tsx b/src/core/client/auth/components/Header/Bar.spec.tsx index 8fc583ac0..d6c1a2053 100644 --- a/src/core/client/auth/components/Header/Bar.spec.tsx +++ b/src/core/client/auth/components/Header/Bar.spec.tsx @@ -1,7 +1,7 @@ import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import Bar from "./Bar"; diff --git a/src/core/client/auth/components/Header/Bar.tsx b/src/core/client/auth/components/Header/Bar.tsx index d3fd62ce7..717e567ce 100644 --- a/src/core/client/auth/components/Header/Bar.tsx +++ b/src/core/client/auth/components/Header/Bar.tsx @@ -1,7 +1,7 @@ import React from "react"; import { FunctionComponent } from "react"; -import { Flex } from "talk-ui/components"; +import { Flex } from "coral-ui/components"; import styles from "./Bar.css"; diff --git a/src/core/client/auth/components/Header/SubBar.spec.tsx b/src/core/client/auth/components/Header/SubBar.spec.tsx index 20f2b6943..6e1924001 100644 --- a/src/core/client/auth/components/Header/SubBar.spec.tsx +++ b/src/core/client/auth/components/Header/SubBar.spec.tsx @@ -1,7 +1,7 @@ import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import SubBar from "./SubBar"; diff --git a/src/core/client/auth/components/Header/SubBar.tsx b/src/core/client/auth/components/Header/SubBar.tsx index 548817dc4..3334cdc0a 100644 --- a/src/core/client/auth/components/Header/SubBar.tsx +++ b/src/core/client/auth/components/Header/SubBar.tsx @@ -1,7 +1,7 @@ import React from "react"; import { FunctionComponent } from "react"; -import { Flex } from "talk-ui/components"; +import { Flex } from "coral-ui/components"; import styles from "./SubBar.css"; diff --git a/src/core/client/auth/components/Header/Subtitle.spec.tsx b/src/core/client/auth/components/Header/Subtitle.spec.tsx index cfeaabb5a..244f73ee7 100644 --- a/src/core/client/auth/components/Header/Subtitle.spec.tsx +++ b/src/core/client/auth/components/Header/Subtitle.spec.tsx @@ -1,7 +1,7 @@ import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import Subtitle from "./Subtitle"; diff --git a/src/core/client/auth/components/Header/Subtitle.tsx b/src/core/client/auth/components/Header/Subtitle.tsx index 0db0c4c59..e6fff9e75 100644 --- a/src/core/client/auth/components/Header/Subtitle.tsx +++ b/src/core/client/auth/components/Header/Subtitle.tsx @@ -1,7 +1,7 @@ import React from "react"; import { FunctionComponent } from "react"; -import { Typography } from "talk-ui/components"; +import { Typography } from "coral-ui/components"; import styles from "./Subtitle.css"; interface Props { diff --git a/src/core/client/auth/components/Header/Title.spec.tsx b/src/core/client/auth/components/Header/Title.spec.tsx index 490849f38..e34ec113e 100644 --- a/src/core/client/auth/components/Header/Title.spec.tsx +++ b/src/core/client/auth/components/Header/Title.spec.tsx @@ -1,7 +1,7 @@ import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import Title from "./Title"; diff --git a/src/core/client/auth/components/Header/Title.tsx b/src/core/client/auth/components/Header/Title.tsx index eba613e74..bbe31a302 100644 --- a/src/core/client/auth/components/Header/Title.tsx +++ b/src/core/client/auth/components/Header/Title.tsx @@ -1,7 +1,7 @@ import React from "react"; import { FunctionComponent } from "react"; -import { Typography } from "talk-ui/components"; +import { Typography } from "coral-ui/components"; import styles from "./Title.css"; interface Props { diff --git a/src/core/client/auth/components/HorizontalSeparator.css b/src/core/client/auth/components/HorizontalSeparator.css index 9c6c7bd51..3f2f7b0b3 100644 --- a/src/core/client/auth/components/HorizontalSeparator.css +++ b/src/core/client/auth/components/HorizontalSeparator.css @@ -9,7 +9,7 @@ margin: 0; } .text { - composes: heading3 from "talk-ui/shared/typography.css"; + composes: heading3 from "coral-ui/shared/typography.css"; position: relative; background-color: var(--palette-common-white); padding: 0 var(--mini-unit); diff --git a/src/core/client/auth/components/HorizontalSeparator.tsx b/src/core/client/auth/components/HorizontalSeparator.tsx index 6261e0b88..9ed69766e 100644 --- a/src/core/client/auth/components/HorizontalSeparator.tsx +++ b/src/core/client/auth/components/HorizontalSeparator.tsx @@ -1,7 +1,7 @@ import React from "react"; import { FunctionComponent } from "react"; -import { Flex } from "talk-ui/components"; +import { Flex } from "coral-ui/components"; import styles from "./HorizontalSeparator.css"; diff --git a/src/core/client/auth/components/Main.spec.tsx b/src/core/client/auth/components/Main.spec.tsx index 326c6e106..445c88f62 100644 --- a/src/core/client/auth/components/Main.spec.tsx +++ b/src/core/client/auth/components/Main.spec.tsx @@ -1,7 +1,7 @@ import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import Main from "./Main"; diff --git a/src/core/client/auth/components/SetPasswordField.tsx b/src/core/client/auth/components/SetPasswordField.tsx index f0d41168c..7e8da0a2b 100644 --- a/src/core/client/auth/components/SetPasswordField.tsx +++ b/src/core/client/auth/components/SetPasswordField.tsx @@ -1,19 +1,19 @@ -import { Localized } from "fluent-react/compat"; -import * as React from "react"; -import { FunctionComponent } from "react"; -import { Field } from "react-final-form"; -import { PasswordField } from "talk-framework/components"; +import { PasswordField } from "coral-framework/components"; import { composeValidators, required, validatePassword, -} from "talk-framework/lib/validation"; +} from "coral-framework/lib/validation"; import { FormField, InputDescription, InputLabel, ValidationMessage, -} from "talk-ui/components"; +} from "coral-ui/components"; +import { Localized } from "fluent-react/compat"; +import * as React from "react"; +import { FunctionComponent } from "react"; +import { Field } from "react-final-form"; interface Props { disabled: boolean; diff --git a/src/core/client/auth/components/UsernameField.tsx b/src/core/client/auth/components/UsernameField.tsx index e1ea59d59..52d9c6420 100644 --- a/src/core/client/auth/components/UsernameField.tsx +++ b/src/core/client/auth/components/UsernameField.tsx @@ -1,19 +1,19 @@ -import { Localized } from "fluent-react/compat"; -import * as React from "react"; -import { FunctionComponent } from "react"; -import { Field } from "react-final-form"; import { composeValidators, required, validateUsername, -} from "talk-framework/lib/validation"; +} from "coral-framework/lib/validation"; import { FormField, InputDescription, InputLabel, TextField, ValidationMessage, -} from "talk-ui/components"; +} from "coral-ui/components"; +import { Localized } from "fluent-react/compat"; +import * as React from "react"; +import { FunctionComponent } from "react"; +import { Field } from "react-final-form"; interface Props { disabled: boolean; diff --git a/src/core/client/auth/containers/AccountCompletionContainer.tsx b/src/core/client/auth/containers/AccountCompletionContainer.tsx index 246d2e4b2..0c69b4b8c 100644 --- a/src/core/client/auth/containers/AccountCompletionContainer.tsx +++ b/src/core/client/auth/containers/AccountCompletionContainer.tsx @@ -1,21 +1,21 @@ import * as React from "react"; import { Component } from "react"; -import { AccountCompletionContainer_auth as AuthData } from "talk-auth/__generated__/AccountCompletionContainer_auth.graphql"; -import { AccountCompletionContainer_viewer as UserData } from "talk-auth/__generated__/AccountCompletionContainer_viewer.graphql"; -import { AccountCompletionContainerLocal as Local } from "talk-auth/__generated__/AccountCompletionContainerLocal.graphql"; +import { AccountCompletionContainer_auth as AuthData } from "coral-auth/__generated__/AccountCompletionContainer_auth.graphql"; +import { AccountCompletionContainer_viewer as UserData } from "coral-auth/__generated__/AccountCompletionContainer_viewer.graphql"; +import { AccountCompletionContainerLocal as Local } from "coral-auth/__generated__/AccountCompletionContainerLocal.graphql"; import { CompleteAccountMutation, SetViewMutation, withCompleteAccountMutation, -} from "talk-auth/mutations"; +} from "coral-auth/mutations"; import { graphql, MutationProp, withFragmentContainer, withLocalStateContainer, withMutation, -} from "talk-framework/lib/relay"; +} from "coral-framework/lib/relay"; interface Props { completeAccount: CompleteAccountMutation; diff --git a/src/core/client/auth/containers/AppContainer.tsx b/src/core/client/auth/containers/AppContainer.tsx index da814b136..affb753d7 100644 --- a/src/core/client/auth/containers/AppContainer.tsx +++ b/src/core/client/auth/containers/AppContainer.tsx @@ -1,14 +1,14 @@ import * as React from "react"; import { Component } from "react"; -import { AppContainer_auth as AuthData } from "talk-auth/__generated__/AppContainer_auth.graphql"; -import { AppContainer_viewer as UserData } from "talk-auth/__generated__/AppContainer_viewer.graphql"; -import { AppContainerLocal as Local } from "talk-auth/__generated__/AppContainerLocal.graphql"; +import { AppContainer_auth as AuthData } from "coral-auth/__generated__/AppContainer_auth.graphql"; +import { AppContainer_viewer as UserData } from "coral-auth/__generated__/AppContainer_viewer.graphql"; +import { AppContainerLocal as Local } from "coral-auth/__generated__/AppContainerLocal.graphql"; import { graphql, withFragmentContainer, withLocalStateContainer, -} from "talk-framework/lib/relay"; +} from "coral-framework/lib/relay"; import App from "../components/App"; import AccountCompletionContainer from "./AccountCompletionContainer"; diff --git a/src/core/client/auth/containers/ViewRouterContainer.tsx b/src/core/client/auth/containers/ViewRouterContainer.tsx index 62b8ef9d4..d4e5917de 100644 --- a/src/core/client/auth/containers/ViewRouterContainer.tsx +++ b/src/core/client/auth/containers/ViewRouterContainer.tsx @@ -1,9 +1,9 @@ import { FunctionComponent, useEffect } from "react"; -import { SetViewMutation } from "talk-auth/mutations"; -import { View } from "talk-auth/mutations/SetViewMutation"; -import { parseQuery } from "talk-common/utils"; -import { useMutation } from "talk-framework/lib/relay"; +import { SetViewMutation } from "coral-auth/mutations"; +import { View } from "coral-auth/mutations/SetViewMutation"; +import { parseQuery } from "coral-common/utils"; +import { useMutation } from "coral-framework/lib/relay"; /** * ViewRouterContainer listens for changes to the location diff --git a/src/core/client/auth/helpers/getViewURL.ts b/src/core/client/auth/helpers/getViewURL.ts index e1efb184a..44a200957 100644 --- a/src/core/client/auth/helpers/getViewURL.ts +++ b/src/core/client/auth/helpers/getViewURL.ts @@ -1,5 +1,5 @@ -import { View } from "talk-auth/mutations/SetViewMutation"; -import { modifyQuery } from "talk-framework/utils"; +import { View } from "coral-auth/mutations/SetViewMutation"; +import { modifyQuery } from "coral-framework/utils"; export default function getViewURL(view: View) { return modifyQuery(window.location.href, { view }); diff --git a/src/core/client/auth/index.html b/src/core/client/auth/index.html index 7de15b991..aaecfbc6e 100644 --- a/src/core/client/auth/index.html +++ b/src/core/client/auth/index.html @@ -1,15 +1,13 @@ + + Coral - Auth + + + + - - Talk - Auth - - - - - - -
- - + +
+ diff --git a/src/core/client/auth/index.tsx b/src/core/client/auth/index.tsx index aa12ccf79..0dbe19500 100644 --- a/src/core/client/auth/index.tsx +++ b/src/core/client/auth/index.tsx @@ -2,7 +2,7 @@ import React from "react"; import { FunctionComponent } from "react"; import ReactDOM from "react-dom"; -import { createManaged } from "talk-framework/lib/bootstrap"; +import { createManaged } from "coral-framework/lib/bootstrap"; import ViewRouterContainer from "./containers/ViewRouterContainer"; import resizePopup from "./dom/resizePopup"; @@ -11,7 +11,7 @@ import localesData from "./locales"; import AppQuery from "./queries/AppQuery"; // Import css variables. -import "talk-ui/theme/variables.css"; +import "coral-ui/theme/variables.css"; /** * Adapt popup height to current content every 100ms. @@ -33,19 +33,19 @@ function pollPopupHeight(interval: number = 100) { } async function main() { - const ManagedTalkContextProvider = await createManaged({ + const ManagedCoralContextProvider = await createManaged({ initLocalState, localesData, userLocales: navigator.languages, }); const Index: FunctionComponent = () => ( - + <> - + ); ReactDOM.render(, document.getElementById("app")); diff --git a/src/core/client/auth/local/initLocalState.spec.ts b/src/core/client/auth/local/initLocalState.spec.ts index cd3dab579..c7c35d62d 100644 --- a/src/core/client/auth/local/initLocalState.spec.ts +++ b/src/core/client/auth/local/initLocalState.spec.ts @@ -1,11 +1,11 @@ import { Environment, RecordSource } from "relay-runtime"; -import { LOCAL_ID } from "talk-framework/lib/relay"; +import { LOCAL_ID } from "coral-framework/lib/relay"; import { createAccessToken, createRelayEnvironment, replaceHistoryLocation, -} from "talk-framework/testHelpers"; +} from "coral-framework/testHelpers"; import initLocalState from "./initLocalState"; diff --git a/src/core/client/auth/local/initLocalState.ts b/src/core/client/auth/local/initLocalState.ts index 799c18d88..01fdb7fa6 100644 --- a/src/core/client/auth/local/initLocalState.ts +++ b/src/core/client/auth/local/initLocalState.ts @@ -1,16 +1,16 @@ import { commitLocalUpdate, Environment } from "relay-runtime"; -import { parseQuery } from "talk-common/utils"; -import { getParamsFromHashAndClearIt } from "talk-framework/helpers"; -import { TalkContext } from "talk-framework/lib/bootstrap"; -import { initLocalBaseState, LOCAL_ID } from "talk-framework/lib/relay"; +import { parseQuery } from "coral-common/utils"; +import { getParamsFromHashAndClearIt } from "coral-framework/helpers"; +import { CoralContext } from "coral-framework/lib/bootstrap"; +import { initLocalBaseState, LOCAL_ID } from "coral-framework/lib/relay"; /** * Initializes the local state, before we start the App. */ export default async function initLocalState( environment: Environment, - context: TalkContext + context: CoralContext ) { const { error = null, accessToken = null } = getParamsFromHashAndClearIt(); diff --git a/src/core/client/auth/locales.ts b/src/core/client/auth/locales.ts index b9c9f16c7..b0f080a61 100644 --- a/src/core/client/auth/locales.ts +++ b/src/core/client/auth/locales.ts @@ -5,5 +5,5 @@ * This file only represents the types that gets exported. */ -import { LocalesData } from "talk-framework/lib/i18n"; +import { LocalesData } from "coral-framework/lib/i18n"; export default {} as LocalesData; diff --git a/src/core/client/auth/mutations/ClearErrorMutation.ts b/src/core/client/auth/mutations/ClearErrorMutation.ts index a47485b51..d71193e44 100644 --- a/src/core/client/auth/mutations/ClearErrorMutation.ts +++ b/src/core/client/auth/mutations/ClearErrorMutation.ts @@ -1,15 +1,15 @@ import { commitLocalUpdate, Environment } from "relay-runtime"; -import { TalkContext } from "talk-framework/lib/bootstrap"; -import { createMutationContainer } from "talk-framework/lib/relay"; -import { LOCAL_ID } from "talk-framework/lib/relay/withLocalStateContainer"; +import { CoralContext } from "coral-framework/lib/bootstrap"; +import { createMutationContainer } from "coral-framework/lib/relay"; +import { LOCAL_ID } from "coral-framework/lib/relay/withLocalStateContainer"; export type ClearErrorMutation = () => Promise; export async function commit( environment: Environment, input: undefined, - { pym }: TalkContext + { pym }: CoralContext ) { return commitLocalUpdate(environment, store => { const record = store.get(LOCAL_ID)!; diff --git a/src/core/client/auth/mutations/CompleteAccountMutation.ts b/src/core/client/auth/mutations/CompleteAccountMutation.ts index fe68f0764..4e90d675e 100644 --- a/src/core/client/auth/mutations/CompleteAccountMutation.ts +++ b/src/core/client/auth/mutations/CompleteAccountMutation.ts @@ -1,7 +1,7 @@ import { Environment } from "relay-runtime"; -import { TalkContext } from "talk-framework/lib/bootstrap"; -import { createMutationContainer } from "talk-framework/lib/relay"; +import { CoralContext } from "coral-framework/lib/bootstrap"; +import { createMutationContainer } from "coral-framework/lib/relay"; export interface CompleteAccountInput { accessToken: string; @@ -13,7 +13,7 @@ export type CompleteAccountMutation = ( export async function commit( environment: Environment, input: CompleteAccountInput, - { postMessage }: TalkContext + { postMessage }: CoralContext ) { postMessage.send("setAccessToken", input.accessToken, window.opener); window.close(); diff --git a/src/core/client/auth/mutations/ForgotPasswordMutation.ts b/src/core/client/auth/mutations/ForgotPasswordMutation.ts index 2d2d2ca53..8e0622ac6 100644 --- a/src/core/client/auth/mutations/ForgotPasswordMutation.ts +++ b/src/core/client/auth/mutations/ForgotPasswordMutation.ts @@ -1,7 +1,7 @@ import { pick } from "lodash"; -import { createMutation } from "talk-framework/lib/relay"; -import { forgotPassword, ForgotPasswordInput } from "talk-framework/rest"; +import { createMutation } from "coral-framework/lib/relay"; +import { forgotPassword, ForgotPasswordInput } from "coral-framework/rest"; const ForgotPasswordMutation = createMutation( "forgotPassword", diff --git a/src/core/client/auth/mutations/SetEmailMutation.ts b/src/core/client/auth/mutations/SetEmailMutation.ts index 3a40bbcfd..711f1780f 100644 --- a/src/core/client/auth/mutations/SetEmailMutation.ts +++ b/src/core/client/auth/mutations/SetEmailMutation.ts @@ -4,10 +4,10 @@ import { Environment } from "relay-runtime"; import { commitMutationPromiseNormalized, createMutationContainer, -} from "talk-framework/lib/relay"; -import { Omit } from "talk-framework/types"; +} from "coral-framework/lib/relay"; +import { Omit } from "coral-framework/types"; -import { SetEmailMutation as MutationTypes } from "talk-auth/__generated__/SetEmailMutation.graphql"; +import { SetEmailMutation as MutationTypes } from "coral-auth/__generated__/SetEmailMutation.graphql"; export type SetEmailInput = Omit< MutationTypes["variables"]["input"], diff --git a/src/core/client/auth/mutations/SetPasswordMutation.ts b/src/core/client/auth/mutations/SetPasswordMutation.ts index d04fc299a..c2c2750f9 100644 --- a/src/core/client/auth/mutations/SetPasswordMutation.ts +++ b/src/core/client/auth/mutations/SetPasswordMutation.ts @@ -4,10 +4,10 @@ import { Environment } from "relay-runtime"; import { commitMutationPromiseNormalized, createMutationContainer, -} from "talk-framework/lib/relay"; -import { Omit } from "talk-framework/types"; +} from "coral-framework/lib/relay"; +import { Omit } from "coral-framework/types"; -import { SetPasswordMutation as MutationTypes } from "talk-auth/__generated__/SetPasswordMutation.graphql"; +import { SetPasswordMutation as MutationTypes } from "coral-auth/__generated__/SetPasswordMutation.graphql"; export type SetPasswordInput = Omit< MutationTypes["variables"]["input"], diff --git a/src/core/client/auth/mutations/SetUsernameMutation.ts b/src/core/client/auth/mutations/SetUsernameMutation.ts index af747e880..85dc4911f 100644 --- a/src/core/client/auth/mutations/SetUsernameMutation.ts +++ b/src/core/client/auth/mutations/SetUsernameMutation.ts @@ -4,10 +4,10 @@ import { Environment } from "relay-runtime"; import { commitMutationPromiseNormalized, createMutationContainer, -} from "talk-framework/lib/relay"; -import { Omit } from "talk-framework/types"; +} from "coral-framework/lib/relay"; +import { Omit } from "coral-framework/types"; -import { SetUsernameMutation as MutationTypes } from "talk-auth/__generated__/SetUsernameMutation.graphql"; +import { SetUsernameMutation as MutationTypes } from "coral-auth/__generated__/SetUsernameMutation.graphql"; export type SetUsernameInput = Omit< MutationTypes["variables"]["input"], diff --git a/src/core/client/auth/mutations/SetViewMutation.spec.ts b/src/core/client/auth/mutations/SetViewMutation.spec.ts index 499907aac..d3f59e4d4 100644 --- a/src/core/client/auth/mutations/SetViewMutation.spec.ts +++ b/src/core/client/auth/mutations/SetViewMutation.spec.ts @@ -1,7 +1,7 @@ import { Environment, RecordSource } from "relay-runtime"; -import { LOCAL_ID } from "talk-framework/lib/relay"; -import { createRelayEnvironment } from "talk-framework/testHelpers"; +import { LOCAL_ID } from "coral-framework/lib/relay"; +import { createRelayEnvironment } from "coral-framework/testHelpers"; import SetViewMutation from "./SetViewMutation"; diff --git a/src/core/client/auth/mutations/SetViewMutation.ts b/src/core/client/auth/mutations/SetViewMutation.ts index a61ef8a7c..524f6e45b 100644 --- a/src/core/client/auth/mutations/SetViewMutation.ts +++ b/src/core/client/auth/mutations/SetViewMutation.ts @@ -1,7 +1,7 @@ import { commitLocalUpdate, Environment } from "relay-runtime"; -import { createMutation } from "talk-framework/lib/relay"; -import { LOCAL_ID } from "talk-framework/lib/relay/withLocalStateContainer"; +import { createMutation } from "coral-framework/lib/relay"; +import { LOCAL_ID } from "coral-framework/lib/relay/withLocalStateContainer"; export type View = | "SIGN_IN" diff --git a/src/core/client/auth/mutations/SignInMutation.ts b/src/core/client/auth/mutations/SignInMutation.ts index cac6fd55c..56113a867 100644 --- a/src/core/client/auth/mutations/SignInMutation.ts +++ b/src/core/client/auth/mutations/SignInMutation.ts @@ -1,16 +1,16 @@ import { pick } from "lodash"; import { Environment } from "relay-runtime"; -import { TalkContext } from "talk-framework/lib/bootstrap"; -import { createMutationContainer } from "talk-framework/lib/relay"; -import { signIn, SignInInput } from "talk-framework/rest"; +import { CoralContext } from "coral-framework/lib/bootstrap"; +import { createMutationContainer } from "coral-framework/lib/relay"; +import { signIn, SignInInput } from "coral-framework/rest"; export type SignInMutation = (input: SignInInput) => Promise; export async function commit( environment: Environment, input: SignInInput, - { rest, clearSession }: TalkContext + { rest, clearSession }: CoralContext ) { const result = await signIn(rest, pick(input, ["email", "password"])); // Put the token on the hash and clean the session. diff --git a/src/core/client/auth/mutations/SignUpMutation.ts b/src/core/client/auth/mutations/SignUpMutation.ts index 8ee054fbe..9bf3fbe66 100644 --- a/src/core/client/auth/mutations/SignUpMutation.ts +++ b/src/core/client/auth/mutations/SignUpMutation.ts @@ -1,16 +1,16 @@ import { pick } from "lodash"; import { Environment } from "relay-runtime"; -import { TalkContext } from "talk-framework/lib/bootstrap"; -import { createMutationContainer } from "talk-framework/lib/relay"; -import { signUp, SignUpInput } from "talk-framework/rest"; +import { CoralContext } from "coral-framework/lib/bootstrap"; +import { createMutationContainer } from "coral-framework/lib/relay"; +import { signUp, SignUpInput } from "coral-framework/rest"; export type SignUpMutation = (input: SignUpInput) => Promise; export async function commit( environment: Environment, input: SignUpInput, - { rest, clearSession }: TalkContext + { rest, clearSession }: CoralContext ) { const result = await signUp( rest, diff --git a/src/core/client/auth/queries/AppQuery.tsx b/src/core/client/auth/queries/AppQuery.tsx index 61a2d7b4e..6e4fded1f 100644 --- a/src/core/client/auth/queries/AppQuery.tsx +++ b/src/core/client/auth/queries/AppQuery.tsx @@ -1,7 +1,7 @@ +import { graphql, QueryRenderer } from "coral-framework/lib/relay"; import React, { Component } from "react"; -import { graphql, QueryRenderer } from "talk-framework/lib/relay"; -import { AppQuery as QueryTypes } from "talk-auth/__generated__/AppQuery.graphql"; +import { AppQuery as QueryTypes } from "coral-auth/__generated__/AppQuery.graphql"; import AppContainer from "../containers/AppContainer"; diff --git a/src/core/client/auth/test/accountCompletion.spec.tsx b/src/core/client/auth/test/accountCompletion.spec.tsx index e5382c996..58db9a492 100644 --- a/src/core/client/auth/test/accountCompletion.spec.tsx +++ b/src/core/client/auth/test/accountCompletion.spec.tsx @@ -1,13 +1,13 @@ import { get } from "lodash"; import sinon from "sinon"; -import { pureMerge } from "talk-common/utils"; +import { pureMerge } from "coral-common/utils"; import { createAccessToken, wait, waitForElement, within, -} from "talk-framework/testHelpers"; +} from "coral-framework/testHelpers"; import create from "./create"; import { settings } from "./fixtures"; diff --git a/src/core/client/auth/test/addEmailAddress.spec.tsx b/src/core/client/auth/test/addEmailAddress.spec.tsx index c11ffb00e..399c9c6b4 100644 --- a/src/core/client/auth/test/addEmailAddress.spec.tsx +++ b/src/core/client/auth/test/addEmailAddress.spec.tsx @@ -1,13 +1,13 @@ import { get } from "lodash"; import sinon from "sinon"; -import { pureMerge } from "talk-common/utils"; +import { pureMerge } from "coral-common/utils"; import { toJSON, wait, waitForElement, within, -} from "talk-framework/testHelpers"; +} from "coral-framework/testHelpers"; import create from "./create"; import { settings } from "./fixtures"; diff --git a/src/core/client/auth/test/create.tsx b/src/core/client/auth/test/create.tsx index 67ed4b15d..20d38455b 100644 --- a/src/core/client/auth/test/create.tsx +++ b/src/core/client/auth/test/create.tsx @@ -1,10 +1,10 @@ import React from "react"; -import AppQuery from "talk-auth/queries/AppQuery"; +import AppQuery from "coral-auth/queries/AppQuery"; import { createTestRenderer, CreateTestRendererParams, -} from "talk-framework/testHelpers"; +} from "coral-framework/testHelpers"; export default function create(params: CreateTestRendererParams) { return createTestRenderer("auth", , params); diff --git a/src/core/client/auth/test/createPassword.spec.tsx b/src/core/client/auth/test/createPassword.spec.tsx index 567519573..983d82280 100644 --- a/src/core/client/auth/test/createPassword.spec.tsx +++ b/src/core/client/auth/test/createPassword.spec.tsx @@ -1,13 +1,13 @@ import { get } from "lodash"; import sinon from "sinon"; -import { pureMerge } from "talk-common/utils"; +import { pureMerge } from "coral-common/utils"; import { toJSON, wait, waitForElement, within, -} from "talk-framework/testHelpers"; +} from "coral-framework/testHelpers"; import create from "./create"; import { settings } from "./fixtures"; diff --git a/src/core/client/auth/test/createUsername.spec.tsx b/src/core/client/auth/test/createUsername.spec.tsx index 3561cff26..0bcfe7a4f 100644 --- a/src/core/client/auth/test/createUsername.spec.tsx +++ b/src/core/client/auth/test/createUsername.spec.tsx @@ -1,13 +1,13 @@ import { get } from "lodash"; import sinon from "sinon"; -import { pureMerge } from "talk-common/utils"; +import { pureMerge } from "coral-common/utils"; import { toJSON, wait, waitForElement, within, -} from "talk-framework/testHelpers"; +} from "coral-framework/testHelpers"; import create from "./create"; import { settings } from "./fixtures"; diff --git a/src/core/client/auth/test/forgotPassword.spec.tsx b/src/core/client/auth/test/forgotPassword.spec.tsx index 6aaf1afc3..7cebfed52 100644 --- a/src/core/client/auth/test/forgotPassword.spec.tsx +++ b/src/core/client/auth/test/forgotPassword.spec.tsx @@ -1,15 +1,15 @@ import { act } from "react-test-renderer"; import sinon from "sinon"; -import { pureMerge } from "talk-common/utils"; -import { GQLResolver } from "talk-framework/schema"; +import { pureMerge } from "coral-common/utils"; +import { GQLResolver } from "coral-framework/schema"; import { createResolversStub, CreateTestRendererParams, wait, waitForElement, within, -} from "talk-framework/testHelpers"; +} from "coral-framework/testHelpers"; import create from "./create"; import { settings } from "./fixtures"; diff --git a/src/core/client/auth/test/navigation.spec.tsx b/src/core/client/auth/test/navigation.spec.tsx index 2b75a31ca..7214fd219 100644 --- a/src/core/client/auth/test/navigation.spec.tsx +++ b/src/core/client/auth/test/navigation.spec.tsx @@ -1,7 +1,7 @@ import { ReactTestRenderer } from "react-test-renderer"; import sinon from "sinon"; -import { wait, waitForElement, within } from "talk-framework/testHelpers"; +import { wait, waitForElement, within } from "coral-framework/testHelpers"; import create from "./create"; import { settings } from "./fixtures"; diff --git a/src/core/client/auth/test/signIn.spec.tsx b/src/core/client/auth/test/signIn.spec.tsx index d81f1aeb9..2e06086be 100644 --- a/src/core/client/auth/test/signIn.spec.tsx +++ b/src/core/client/auth/test/signIn.spec.tsx @@ -1,13 +1,13 @@ import { get } from "lodash"; import sinon from "sinon"; -import { pureMerge } from "talk-common/utils"; +import { pureMerge } from "coral-common/utils"; import { toJSON, wait, waitForElement, within, -} from "talk-framework/testHelpers"; +} from "coral-framework/testHelpers"; import create from "./create"; import { settings } from "./fixtures"; diff --git a/src/core/client/auth/test/signUp.spec.tsx b/src/core/client/auth/test/signUp.spec.tsx index 9ea41d1ca..c2446185d 100644 --- a/src/core/client/auth/test/signUp.spec.tsx +++ b/src/core/client/auth/test/signUp.spec.tsx @@ -6,7 +6,7 @@ import { wait, waitForElement, within, -} from "talk-framework/testHelpers"; +} from "coral-framework/testHelpers"; import create from "./create"; import { settings } from "./fixtures"; diff --git a/src/core/client/auth/views/addEmailAddress/components/AddEmailAddress.tsx b/src/core/client/auth/views/addEmailAddress/components/AddEmailAddress.tsx index d02d9eb28..ab0c6e3b2 100644 --- a/src/core/client/auth/views/addEmailAddress/components/AddEmailAddress.tsx +++ b/src/core/client/auth/views/addEmailAddress/components/AddEmailAddress.tsx @@ -2,19 +2,19 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; import { Form } from "react-final-form"; -import { Bar, Title } from "talk-auth/components//Header"; -import ConfirmEmailField from "talk-auth/components/ConfirmEmailField"; -import EmailField from "talk-auth/components/EmailField"; -import Main from "talk-auth/components/Main"; -import AutoHeightContainer from "talk-auth/containers/AutoHeightContainer"; -import { OnSubmit } from "talk-framework/lib/form"; +import { Bar, Title } from "coral-auth/components//Header"; +import ConfirmEmailField from "coral-auth/components/ConfirmEmailField"; +import EmailField from "coral-auth/components/EmailField"; +import Main from "coral-auth/components/Main"; +import AutoHeightContainer from "coral-auth/containers/AutoHeightContainer"; +import { OnSubmit } from "coral-framework/lib/form"; import { Button, CallOut, HorizontalGutter, Icon, Typography, -} from "talk-ui/components"; +} from "coral-ui/components"; import { ListItem, UnorderedList } from "./UnorderedList"; diff --git a/src/core/client/auth/views/addEmailAddress/components/UnorderedList/ListItem.tsx b/src/core/client/auth/views/addEmailAddress/components/UnorderedList/ListItem.tsx index 0c1b5a5e9..6dd562b4d 100644 --- a/src/core/client/auth/views/addEmailAddress/components/UnorderedList/ListItem.tsx +++ b/src/core/client/auth/views/addEmailAddress/components/UnorderedList/ListItem.tsx @@ -1,7 +1,7 @@ import React from "react"; import { FunctionComponent } from "react"; -import { Icon } from "talk-ui/components"; +import { Icon } from "coral-ui/components"; import styles from "./ListItem.css"; diff --git a/src/core/client/auth/views/addEmailAddress/containers/AddEmailAddressContainer.tsx b/src/core/client/auth/views/addEmailAddress/containers/AddEmailAddressContainer.tsx index 330e04a97..ec90da7e1 100644 --- a/src/core/client/auth/views/addEmailAddress/containers/AddEmailAddressContainer.tsx +++ b/src/core/client/auth/views/addEmailAddress/containers/AddEmailAddressContainer.tsx @@ -4,8 +4,8 @@ import React, { Component } from "react"; import { SetEmailMutation, withSetEmailMutation, -} from "talk-auth/mutations/SetEmailMutation"; -import { PropTypesOf } from "talk-framework/types"; +} from "coral-auth/mutations/SetEmailMutation"; +import { PropTypesOf } from "coral-framework/types"; import AddEmailAddress from "../components/AddEmailAddress"; diff --git a/src/core/client/auth/views/createPassword/components/CreatePassword.tsx b/src/core/client/auth/views/createPassword/components/CreatePassword.tsx index 1c1d02cb7..f594335ce 100644 --- a/src/core/client/auth/views/createPassword/components/CreatePassword.tsx +++ b/src/core/client/auth/views/createPassword/components/CreatePassword.tsx @@ -2,18 +2,18 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; import { Form } from "react-final-form"; -import { Bar, Title } from "talk-auth/components//Header"; -import Main from "talk-auth/components/Main"; -import AutoHeightContainer from "talk-auth/containers/AutoHeightContainer"; -import { OnSubmit } from "talk-framework/lib/form"; +import { Bar, Title } from "coral-auth/components//Header"; +import Main from "coral-auth/components/Main"; +import AutoHeightContainer from "coral-auth/containers/AutoHeightContainer"; +import { OnSubmit } from "coral-framework/lib/form"; import { Button, CallOut, HorizontalGutter, Typography, -} from "talk-ui/components"; +} from "coral-ui/components"; -import SetPasswordField from "talk-auth/components/SetPasswordField"; +import SetPasswordField from "coral-auth/components/SetPasswordField"; interface FormProps { password: string; diff --git a/src/core/client/auth/views/createPassword/containers/CreatePasswordContainer.tsx b/src/core/client/auth/views/createPassword/containers/CreatePasswordContainer.tsx index d60491cc9..29e28f45d 100644 --- a/src/core/client/auth/views/createPassword/containers/CreatePasswordContainer.tsx +++ b/src/core/client/auth/views/createPassword/containers/CreatePasswordContainer.tsx @@ -4,8 +4,8 @@ import React, { Component } from "react"; import { SetPasswordMutation, withSetPasswordMutation, -} from "talk-auth/mutations/SetPasswordMutation"; -import { PropTypesOf } from "talk-framework/types"; +} from "coral-auth/mutations/SetPasswordMutation"; +import { PropTypesOf } from "coral-framework/types"; import CreatePassword from "../components/CreatePassword"; diff --git a/src/core/client/auth/views/createUsername/components/CreateUsername.tsx b/src/core/client/auth/views/createUsername/components/CreateUsername.tsx index c09733889..61a798599 100644 --- a/src/core/client/auth/views/createUsername/components/CreateUsername.tsx +++ b/src/core/client/auth/views/createUsername/components/CreateUsername.tsx @@ -2,18 +2,18 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; import { Form } from "react-final-form"; -import { Bar, Title } from "talk-auth/components//Header"; -import Main from "talk-auth/components/Main"; -import AutoHeightContainer from "talk-auth/containers/AutoHeightContainer"; -import { OnSubmit } from "talk-framework/lib/form"; +import { Bar, Title } from "coral-auth/components//Header"; +import Main from "coral-auth/components/Main"; +import AutoHeightContainer from "coral-auth/containers/AutoHeightContainer"; +import { OnSubmit } from "coral-framework/lib/form"; import { Button, CallOut, HorizontalGutter, Typography, -} from "talk-ui/components"; +} from "coral-ui/components"; -import UsernameField from "talk-auth/components/UsernameField"; +import UsernameField from "coral-auth/components/UsernameField"; interface FormProps { username: string; diff --git a/src/core/client/auth/views/createUsername/containers/CreateUsernameContainer.tsx b/src/core/client/auth/views/createUsername/containers/CreateUsernameContainer.tsx index 276f1086d..e8845dba7 100644 --- a/src/core/client/auth/views/createUsername/containers/CreateUsernameContainer.tsx +++ b/src/core/client/auth/views/createUsername/containers/CreateUsernameContainer.tsx @@ -4,8 +4,8 @@ import React, { Component } from "react"; import { SetUsernameMutation, withSetUsernameMutation, -} from "talk-auth/mutations/SetUsernameMutation"; -import { PropTypesOf } from "talk-framework/types"; +} from "coral-auth/mutations/SetUsernameMutation"; +import { PropTypesOf } from "coral-framework/types"; import CreateUsername from "../components/CreateUsername"; diff --git a/src/core/client/auth/views/forgotPassword/components/CheckEmail.tsx b/src/core/client/auth/views/forgotPassword/components/CheckEmail.tsx index 902aec8ec..a7e9f5d45 100644 --- a/src/core/client/auth/views/forgotPassword/components/CheckEmail.tsx +++ b/src/core/client/auth/views/forgotPassword/components/CheckEmail.tsx @@ -1,9 +1,9 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, useCallback } from "react"; -import { Bar, Title } from "talk-auth/components/Header"; -import Main from "talk-auth/components/Main"; -import { Button, HorizontalGutter, Typography } from "talk-ui/components"; +import { Bar, Title } from "coral-auth/components/Header"; +import Main from "coral-auth/components/Main"; +import { Button, HorizontalGutter, Typography } from "coral-ui/components"; interface Props { email: string; diff --git a/src/core/client/auth/views/forgotPassword/components/ForgotPasswordForm.tsx b/src/core/client/auth/views/forgotPassword/components/ForgotPasswordForm.tsx index 26079b69d..4b48e11e7 100644 --- a/src/core/client/auth/views/forgotPassword/components/ForgotPasswordForm.tsx +++ b/src/core/client/auth/views/forgotPassword/components/ForgotPasswordForm.tsx @@ -3,18 +3,18 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, useCallback } from "react"; import { Field, Form } from "react-final-form"; -import { Bar, SubBar, Title } from "talk-auth/components/Header"; -import Main from "talk-auth/components/Main"; -import AutoHeightContainer from "talk-auth/containers/AutoHeightContainer"; -import { getViewURL } from "talk-auth/helpers"; -import { ForgotPasswordMutation, SetViewMutation } from "talk-auth/mutations"; -import { InvalidRequestError } from "talk-framework/lib/errors"; -import { useMutation } from "talk-framework/lib/relay"; +import { Bar, SubBar, Title } from "coral-auth/components/Header"; +import Main from "coral-auth/components/Main"; +import AutoHeightContainer from "coral-auth/containers/AutoHeightContainer"; +import { getViewURL } from "coral-auth/helpers"; +import { ForgotPasswordMutation, SetViewMutation } from "coral-auth/mutations"; +import { InvalidRequestError } from "coral-framework/lib/errors"; +import { useMutation } from "coral-framework/lib/relay"; import { composeValidators, required, validateEmail, -} from "talk-framework/lib/validation"; +} from "coral-framework/lib/validation"; import { Button, CallOut, @@ -26,7 +26,7 @@ import { TextLink, Typography, ValidationMessage, -} from "talk-ui/components"; +} from "coral-ui/components"; interface FormProps { email: string; diff --git a/src/core/client/auth/views/signIn/components/SignIn.spec.tsx b/src/core/client/auth/views/signIn/components/SignIn.spec.tsx index d2e129435..6d94dc319 100644 --- a/src/core/client/auth/views/signIn/components/SignIn.spec.tsx +++ b/src/core/client/auth/views/signIn/components/SignIn.spec.tsx @@ -2,8 +2,8 @@ import { noop } from "lodash"; import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { removeFragmentRefs } from "talk-framework/testHelpers"; -import { PropTypesOf } from "talk-framework/types"; +import { removeFragmentRefs } from "coral-framework/testHelpers"; +import { PropTypesOf } from "coral-framework/types"; import SignIn from "./SignIn"; diff --git a/src/core/client/auth/views/signIn/components/SignIn.tsx b/src/core/client/auth/views/signIn/components/SignIn.tsx index c1cd8eee0..499067f14 100644 --- a/src/core/client/auth/views/signIn/components/SignIn.tsx +++ b/src/core/client/auth/views/signIn/components/SignIn.tsx @@ -1,18 +1,18 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; -import { Bar, SubBar, Subtitle, Title } from "talk-auth/components//Header"; -import Main from "talk-auth/components/Main"; -import OrSeparator from "talk-auth/components/OrSeparator"; -import AutoHeightContainer from "talk-auth/containers/AutoHeightContainer"; -import { PropTypesOf } from "talk-framework/types"; +import { Bar, SubBar, Subtitle, Title } from "coral-auth/components//Header"; +import Main from "coral-auth/components/Main"; +import OrSeparator from "coral-auth/components/OrSeparator"; +import AutoHeightContainer from "coral-auth/containers/AutoHeightContainer"; +import { PropTypesOf } from "coral-framework/types"; import { CallOut, Flex, HorizontalGutter, TextLink, Typography, -} from "talk-ui/components"; +} from "coral-ui/components"; import SignInWithEmailContainer from "../containers/SignInWithEmailContainer"; import SignInWithFacebookContainer from "../containers/SignInWithFacebookContainer"; diff --git a/src/core/client/auth/views/signIn/components/SignInWithEmail.tsx b/src/core/client/auth/views/signIn/components/SignInWithEmail.tsx index f6342ed39..a2da89864 100644 --- a/src/core/client/auth/views/signIn/components/SignInWithEmail.tsx +++ b/src/core/client/auth/views/signIn/components/SignInWithEmail.tsx @@ -1,12 +1,12 @@ +import { OnSubmit } from "coral-framework/lib/form"; import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; import { Field, Form } from "react-final-form"; -import { OnSubmit } from "talk-framework/lib/form"; -import EmailField from "talk-auth/components/EmailField"; -import AutoHeightContainer from "talk-auth/containers/AutoHeightContainer"; -import { PasswordField } from "talk-framework/components"; -import { composeValidators, required } from "talk-framework/lib/validation"; +import EmailField from "coral-auth/components/EmailField"; +import AutoHeightContainer from "coral-auth/containers/AutoHeightContainer"; +import { PasswordField } from "coral-framework/components"; +import { composeValidators, required } from "coral-framework/lib/validation"; import { Button, ButtonIcon, @@ -18,7 +18,7 @@ import { TextLink, Typography, ValidationMessage, -} from "talk-ui/components"; +} from "coral-ui/components"; interface FormProps { email: string; diff --git a/src/core/client/auth/views/signIn/containers/SignInContainer.tsx b/src/core/client/auth/views/signIn/containers/SignInContainer.tsx index 806010aa0..97217122c 100644 --- a/src/core/client/auth/views/signIn/containers/SignInContainer.tsx +++ b/src/core/client/auth/views/signIn/containers/SignInContainer.tsx @@ -1,23 +1,23 @@ import React, { Component } from "react"; -import { SignInContainer_auth as AuthData } from "talk-auth/__generated__/SignInContainer_auth.graphql"; -import { SignInContainerLocal as LocalData } from "talk-auth/__generated__/SignInContainerLocal.graphql"; +import { SignInContainer_auth as AuthData } from "coral-auth/__generated__/SignInContainer_auth.graphql"; +import { SignInContainerLocal as LocalData } from "coral-auth/__generated__/SignInContainerLocal.graphql"; import { ClearErrorMutation, SetViewMutation, SignInMutation, withClearErrorMutation, withSignInMutation, -} from "talk-auth/mutations"; +} from "coral-auth/mutations"; import { graphql, MutationProp, withFragmentContainer, withLocalStateContainer, withMutation, -} from "talk-framework/lib/relay"; +} from "coral-framework/lib/relay"; -import { getViewURL } from "talk-auth/helpers"; +import { getViewURL } from "coral-auth/helpers"; import SignIn from "../components/SignIn"; interface Props { diff --git a/src/core/client/auth/views/signIn/containers/SignInWithEmailContainer.tsx b/src/core/client/auth/views/signIn/containers/SignInWithEmailContainer.tsx index bf3ff6767..284920e20 100644 --- a/src/core/client/auth/views/signIn/containers/SignInWithEmailContainer.tsx +++ b/src/core/client/auth/views/signIn/containers/SignInWithEmailContainer.tsx @@ -5,10 +5,10 @@ import { SetViewMutation, SignInMutation, withSignInMutation, -} from "talk-auth/mutations"; -import { MutationProp, withMutation } from "talk-framework/lib/relay"; +} from "coral-auth/mutations"; +import { MutationProp, withMutation } from "coral-framework/lib/relay"; -import { getViewURL } from "talk-auth/helpers"; +import { getViewURL } from "coral-auth/helpers"; import SignInWithEmail, { SignInWithEmailForm, } from "../components/SignInWithEmail"; diff --git a/src/core/client/auth/views/signIn/containers/SignInWithFacebookContainer.tsx b/src/core/client/auth/views/signIn/containers/SignInWithFacebookContainer.tsx index 80343e6d9..502fa5adc 100644 --- a/src/core/client/auth/views/signIn/containers/SignInWithFacebookContainer.tsx +++ b/src/core/client/auth/views/signIn/containers/SignInWithFacebookContainer.tsx @@ -1,10 +1,10 @@ import { Localized } from "fluent-react/compat"; import React, { Component } from "react"; -import { SignInWithFacebookContainer_auth as AuthData } from "talk-auth/__generated__/SignInWithFacebookContainer_auth.graphql"; -import FacebookButton from "talk-framework/components/FacebookButton"; -import { redirectOAuth2 } from "talk-framework/helpers"; -import { graphql, withFragmentContainer } from "talk-framework/lib/relay"; +import { SignInWithFacebookContainer_auth as AuthData } from "coral-auth/__generated__/SignInWithFacebookContainer_auth.graphql"; +import FacebookButton from "coral-framework/components/FacebookButton"; +import { redirectOAuth2 } from "coral-framework/helpers"; +import { graphql, withFragmentContainer } from "coral-framework/lib/relay"; interface Props { auth: AuthData; diff --git a/src/core/client/auth/views/signIn/containers/SignInWithGoogleContainer.tsx b/src/core/client/auth/views/signIn/containers/SignInWithGoogleContainer.tsx index c226c4f45..2d6cbed08 100644 --- a/src/core/client/auth/views/signIn/containers/SignInWithGoogleContainer.tsx +++ b/src/core/client/auth/views/signIn/containers/SignInWithGoogleContainer.tsx @@ -1,10 +1,10 @@ import { Localized } from "fluent-react/compat"; import React, { Component } from "react"; -import { SignInWithGoogleContainer_auth as AuthData } from "talk-auth/__generated__/SignInWithGoogleContainer_auth.graphql"; -import GoogleButton from "talk-framework/components/GoogleButton"; -import { redirectOAuth2 } from "talk-framework/helpers"; -import { graphql, withFragmentContainer } from "talk-framework/lib/relay"; +import { SignInWithGoogleContainer_auth as AuthData } from "coral-auth/__generated__/SignInWithGoogleContainer_auth.graphql"; +import GoogleButton from "coral-framework/components/GoogleButton"; +import { redirectOAuth2 } from "coral-framework/helpers"; +import { graphql, withFragmentContainer } from "coral-framework/lib/relay"; interface Props { auth: AuthData; diff --git a/src/core/client/auth/views/signIn/containers/SignInWithOIDCContainer.tsx b/src/core/client/auth/views/signIn/containers/SignInWithOIDCContainer.tsx index 7db78843c..58e5ed1ac 100644 --- a/src/core/client/auth/views/signIn/containers/SignInWithOIDCContainer.tsx +++ b/src/core/client/auth/views/signIn/containers/SignInWithOIDCContainer.tsx @@ -1,10 +1,10 @@ import { Localized } from "fluent-react/compat"; import React, { Component } from "react"; -import { SignInWithOIDCContainer_auth as AuthData } from "talk-auth/__generated__/SignInWithOIDCContainer_auth.graphql"; -import OIDCButton from "talk-framework/components/OIDCButton"; -import { redirectOAuth2 } from "talk-framework/helpers"; -import { graphql, withFragmentContainer } from "talk-framework/lib/relay"; +import { SignInWithOIDCContainer_auth as AuthData } from "coral-auth/__generated__/SignInWithOIDCContainer_auth.graphql"; +import OIDCButton from "coral-framework/components/OIDCButton"; +import { redirectOAuth2 } from "coral-framework/helpers"; +import { graphql, withFragmentContainer } from "coral-framework/lib/relay"; interface Props { auth: AuthData; diff --git a/src/core/client/auth/views/signUp/components/SignUp.spec.tsx b/src/core/client/auth/views/signUp/components/SignUp.spec.tsx index 21833f83b..c6d499ffe 100644 --- a/src/core/client/auth/views/signUp/components/SignUp.spec.tsx +++ b/src/core/client/auth/views/signUp/components/SignUp.spec.tsx @@ -2,8 +2,8 @@ import { noop } from "lodash"; import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { removeFragmentRefs } from "talk-framework/testHelpers"; -import { PropTypesOf } from "talk-framework/types"; +import { removeFragmentRefs } from "coral-framework/testHelpers"; +import { PropTypesOf } from "coral-framework/types"; import SignUp from "./SignUp"; diff --git a/src/core/client/auth/views/signUp/components/SignUp.tsx b/src/core/client/auth/views/signUp/components/SignUp.tsx index 4331786b1..3eeb451f1 100644 --- a/src/core/client/auth/views/signUp/components/SignUp.tsx +++ b/src/core/client/auth/views/signUp/components/SignUp.tsx @@ -1,17 +1,17 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; -import { Bar, SubBar, Subtitle, Title } from "talk-auth/components//Header"; -import Main from "talk-auth/components/Main"; -import OrSeparator from "talk-auth/components/OrSeparator"; -import AutoHeightContainer from "talk-auth/containers/AutoHeightContainer"; -import { PropTypesOf } from "talk-framework/types"; +import { Bar, SubBar, Subtitle, Title } from "coral-auth/components//Header"; +import Main from "coral-auth/components/Main"; +import OrSeparator from "coral-auth/components/OrSeparator"; +import AutoHeightContainer from "coral-auth/containers/AutoHeightContainer"; +import { PropTypesOf } from "coral-framework/types"; import { Flex, HorizontalGutter, TextLink, Typography, -} from "talk-ui/components"; +} from "coral-ui/components"; import SignUpWithEmailContainer from "../containers/SignUpWithEmailContainer"; import SignUpWithFacebookContainer from "../containers/SignUpWithFacebookContainer"; diff --git a/src/core/client/auth/views/signUp/components/SignUpWithEmail.tsx b/src/core/client/auth/views/signUp/components/SignUpWithEmail.tsx index 2d01927a6..220ae6e22 100644 --- a/src/core/client/auth/views/signUp/components/SignUpWithEmail.tsx +++ b/src/core/client/auth/views/signUp/components/SignUpWithEmail.tsx @@ -3,18 +3,18 @@ import * as React from "react"; import { FunctionComponent } from "react"; import { Form } from "react-final-form"; -import EmailField from "talk-auth/components/EmailField"; -import SetPasswordField from "talk-auth/components/SetPasswordField"; -import UsernameField from "talk-auth/components/UsernameField"; -import { OnSubmit } from "talk-framework/lib/form"; +import EmailField from "coral-auth/components/EmailField"; +import SetPasswordField from "coral-auth/components/SetPasswordField"; +import UsernameField from "coral-auth/components/UsernameField"; +import { OnSubmit } from "coral-framework/lib/form"; import { Button, ButtonIcon, CallOut, HorizontalGutter, -} from "talk-ui/components"; +} from "coral-ui/components"; -import AutoHeightContainer from "talk-auth/containers/AutoHeightContainer"; +import AutoHeightContainer from "coral-auth/containers/AutoHeightContainer"; interface FormProps { email: string; diff --git a/src/core/client/auth/views/signUp/containers/SignUpContainer.tsx b/src/core/client/auth/views/signUp/containers/SignUpContainer.tsx index 31ebb09ca..baa1b7c63 100644 --- a/src/core/client/auth/views/signUp/containers/SignUpContainer.tsx +++ b/src/core/client/auth/views/signUp/containers/SignUpContainer.tsx @@ -1,15 +1,15 @@ import React, { Component } from "react"; -import { SignUpContainer_auth as AuthData } from "talk-auth/__generated__/SignUpContainer_auth.graphql"; -import { SetViewMutation } from "talk-auth/mutations"; +import { SignUpContainer_auth as AuthData } from "coral-auth/__generated__/SignUpContainer_auth.graphql"; +import { SetViewMutation } from "coral-auth/mutations"; import { graphql, MutationProp, withFragmentContainer, withMutation, -} from "talk-framework/lib/relay"; +} from "coral-framework/lib/relay"; -import { getViewURL } from "talk-auth/helpers"; +import { getViewURL } from "coral-auth/helpers"; import SignUp from "../components/SignUp"; interface Props { diff --git a/src/core/client/auth/views/signUp/containers/SignUpWithEmailContainer.tsx b/src/core/client/auth/views/signUp/containers/SignUpWithEmailContainer.tsx index 3c4e91f43..8408ad0a1 100644 --- a/src/core/client/auth/views/signUp/containers/SignUpWithEmailContainer.tsx +++ b/src/core/client/auth/views/signUp/containers/SignUpWithEmailContainer.tsx @@ -1,8 +1,8 @@ import { FORM_ERROR } from "final-form"; import React, { Component } from "react"; -import { SignUpMutation, withSignUpMutation } from "talk-auth/mutations"; -import { PropTypesOf } from "talk-framework/types"; +import { SignUpMutation, withSignUpMutation } from "coral-auth/mutations"; +import { PropTypesOf } from "coral-framework/types"; import SignUp from "../components/SignUpWithEmail"; diff --git a/src/core/client/auth/views/signUp/containers/SignUpWithFacebookContainer.tsx b/src/core/client/auth/views/signUp/containers/SignUpWithFacebookContainer.tsx index f370e0d18..335270562 100644 --- a/src/core/client/auth/views/signUp/containers/SignUpWithFacebookContainer.tsx +++ b/src/core/client/auth/views/signUp/containers/SignUpWithFacebookContainer.tsx @@ -1,10 +1,10 @@ import { Localized } from "fluent-react/compat"; import React, { Component } from "react"; -import { SignUpWithFacebookContainer_auth as AuthData } from "talk-auth/__generated__/SignUpWithFacebookContainer_auth.graphql"; -import FacebookButton from "talk-framework/components/FacebookButton"; -import { redirectOAuth2 } from "talk-framework/helpers"; -import { graphql, withFragmentContainer } from "talk-framework/lib/relay"; +import { SignUpWithFacebookContainer_auth as AuthData } from "coral-auth/__generated__/SignUpWithFacebookContainer_auth.graphql"; +import FacebookButton from "coral-framework/components/FacebookButton"; +import { redirectOAuth2 } from "coral-framework/helpers"; +import { graphql, withFragmentContainer } from "coral-framework/lib/relay"; interface Props { auth: AuthData; diff --git a/src/core/client/auth/views/signUp/containers/SignUpWithGoogleContainer.tsx b/src/core/client/auth/views/signUp/containers/SignUpWithGoogleContainer.tsx index cca960143..fc5f5b468 100644 --- a/src/core/client/auth/views/signUp/containers/SignUpWithGoogleContainer.tsx +++ b/src/core/client/auth/views/signUp/containers/SignUpWithGoogleContainer.tsx @@ -1,10 +1,10 @@ import { Localized } from "fluent-react/compat"; import React, { Component } from "react"; -import { SignUpWithGoogleContainer_auth as AuthData } from "talk-auth/__generated__/SignUpWithGoogleContainer_auth.graphql"; -import GoogleButton from "talk-framework/components/GoogleButton"; -import { redirectOAuth2 } from "talk-framework/helpers"; -import { graphql, withFragmentContainer } from "talk-framework/lib/relay"; +import { SignUpWithGoogleContainer_auth as AuthData } from "coral-auth/__generated__/SignUpWithGoogleContainer_auth.graphql"; +import GoogleButton from "coral-framework/components/GoogleButton"; +import { redirectOAuth2 } from "coral-framework/helpers"; +import { graphql, withFragmentContainer } from "coral-framework/lib/relay"; interface Props { auth: AuthData; diff --git a/src/core/client/auth/views/signUp/containers/SignUpWithOIDCContainer.tsx b/src/core/client/auth/views/signUp/containers/SignUpWithOIDCContainer.tsx index 985558383..207ba2262 100644 --- a/src/core/client/auth/views/signUp/containers/SignUpWithOIDCContainer.tsx +++ b/src/core/client/auth/views/signUp/containers/SignUpWithOIDCContainer.tsx @@ -1,10 +1,10 @@ import { Localized } from "fluent-react/compat"; import React, { Component } from "react"; -import { SignUpWithOIDCContainer_auth as AuthData } from "talk-auth/__generated__/SignUpWithOIDCContainer_auth.graphql"; -import OIDCButton from "talk-framework/components/OIDCButton"; -import { redirectOAuth2 } from "talk-framework/helpers"; -import { graphql, withFragmentContainer } from "talk-framework/lib/relay"; +import { SignUpWithOIDCContainer_auth as AuthData } from "coral-auth/__generated__/SignUpWithOIDCContainer_auth.graphql"; +import OIDCButton from "coral-framework/components/OIDCButton"; +import { redirectOAuth2 } from "coral-framework/helpers"; +import { graphql, withFragmentContainer } from "coral-framework/lib/relay"; interface Props { auth: AuthData; diff --git a/src/core/client/embed/Talk.ts b/src/core/client/embed/Coral.ts similarity index 80% rename from src/core/client/embed/Talk.ts rename to src/core/client/embed/Coral.ts index f21e4b757..147df1ea9 100644 --- a/src/core/client/embed/Talk.ts +++ b/src/core/client/embed/Coral.ts @@ -1,6 +1,6 @@ import { EventEmitter2 } from "eventemitter2"; -import { parseQuery } from "talk-common/utils"; +import { parseQuery } from "coral-common/utils"; import { default as create, StreamEmbed } from "./StreamEmbed"; @@ -34,7 +34,7 @@ function resolveStoryURL() { // tslint:disable-next-line:no-console console.warn( - "This page does not include a canonical link tag. Talk has inferred this story_url from the window object. Query params have been stripped, which may cause a single thread to be present across multiple pages." + "This page does not include a canonical link tag. Coral has inferred this story_url from the window object. Query params have been stripped, which may cause a single thread to be present across multiple pages." ); return getLocationOrigin() + window.location.pathname; @@ -50,11 +50,11 @@ export function createStreamEmbed(config: Config): StreamEmbed { } return create({ - title: "Talk Embed Stream", + title: "Coral Embed Stream", storyID: config.storyID || query.storyID, storyURL: config.storyURL || resolveStoryURL(), commentID: config.commentID || query.commentID, - id: config.id || "talk-embed-stream", + id: config.id || "coral-embed-stream", rootURL: config.rootURL || getLocationOrigin(), autoRender: config.autoRender, eventEmitter, diff --git a/src/core/client/embed/StreamEmbed.ts b/src/core/client/embed/StreamEmbed.ts index a8f2363f1..a4ff2fd13 100644 --- a/src/core/client/embed/StreamEmbed.ts +++ b/src/core/client/embed/StreamEmbed.ts @@ -1,9 +1,9 @@ import { EventEmitter2 } from "eventemitter2"; -import { stringifyQuery } from "talk-common/utils"; -import ensureNoEndSlash from "talk-common/utils/ensureNoEndSlash"; -import urls from "talk-framework/helpers/urls"; -import { ExternalConfig } from "talk-framework/lib/externalConfig"; +import { stringifyQuery } from "coral-common/utils"; +import ensureNoEndSlash from "coral-common/utils/ensureNoEndSlash"; +import urls from "coral-framework/helpers/urls"; +import { ExternalConfig } from "coral-framework/lib/externalConfig"; import { Decorator, diff --git a/src/core/client/embed/__snapshots__/index.spec.ts.snap b/src/core/client/embed/__snapshots__/index.spec.ts.snap index a4b6bdb7b..951476e2d 100644 --- a/src/core/client/embed/__snapshots__/index.spec.ts.snap +++ b/src/core/client/embed/__snapshots__/index.spec.ts.snap @@ -1,5 +1,5 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Basic integration test should render iframe 1`] = `""`; +exports[`Basic integration test should render iframe 1`] = `""`; -exports[`Basic integration test should use canonical link 1`] = `""`; +exports[`Basic integration test should use canonical link 1`] = `""`; diff --git a/src/core/client/embed/decorators/__snapshots__/withPymStorage.spec.ts.snap b/src/core/client/embed/decorators/__snapshots__/withPymStorage.spec.ts.snap index 127601892..6e9c5dd4b 100644 --- a/src/core/client/embed/decorators/__snapshots__/withPymStorage.spec.ts.snap +++ b/src/core/client/embed/decorators/__snapshots__/withPymStorage.spec.ts.snap @@ -44,7 +44,7 @@ Array [ exports[`withPymStorage should handle unknown method 1`] = `"[{\\"key\\":\\"pymStorage.localStorage.error\\",\\"value\\":\\"{\\\\\\"id\\\\\\":\\\\\\"0\\\\\\",\\\\\\"error\\\\\\":\\\\\\"Unknown method unknown\\\\\\"}\\"}]"`; -exports[`withPymStorage should set, get and remove item 1`] = `"{\\"talk:key\\":\\"test\\"}"`; +exports[`withPymStorage should set, get and remove item 1`] = `"{\\"coral:key\\":\\"test\\"}"`; exports[`withPymStorage should set, get and remove item 2`] = `"{}"`; diff --git a/src/core/client/embed/decorators/withConfig.ts b/src/core/client/embed/decorators/withConfig.ts index f798697de..6a2edec70 100644 --- a/src/core/client/embed/decorators/withConfig.ts +++ b/src/core/client/embed/decorators/withConfig.ts @@ -1,4 +1,4 @@ -import { ExternalConfig } from "talk-framework/lib/externalConfig"; +import { ExternalConfig } from "coral-framework/lib/externalConfig"; import { Decorator } from "./types"; diff --git a/src/core/client/embed/decorators/withPymStorage.spec.ts b/src/core/client/embed/decorators/withPymStorage.spec.ts index 84d51017f..fcb7416fd 100644 --- a/src/core/client/embed/decorators/withPymStorage.spec.ts +++ b/src/core/client/embed/decorators/withPymStorage.spec.ts @@ -1,7 +1,7 @@ import mockConsole from "jest-mock-console"; import sinon from "sinon"; -import { createInMemoryStorage } from "talk-framework/lib/storage"; +import { createInMemoryStorage } from "coral-framework/lib/storage"; import withPymStorage from "./withPymStorage"; class PymStub { @@ -25,7 +25,7 @@ describe("withPymStorage", () => { it("should set, get and remove item", () => { const pym = new PymStub("localStorage"); const storage = createInMemoryStorage(); - withPymStorage(storage, "localStorage", "talk:")(pym as any); + withPymStorage(storage, "localStorage", "coral:")(pym as any); pym.listeners["pymStorage.localStorage.request"]( JSON.stringify({ id: "0", @@ -114,7 +114,7 @@ describe("withPymStorage", () => { mockConsole(); const pym = new PymStub("localStorage"); const storage = createInMemoryStorage(); - withPymStorage(storage, "localStorage", "talk:")(pym as any); + withPymStorage(storage, "localStorage", "coral:")(pym as any); pym.listeners["pymStorage.localStorage.request"]( JSON.stringify({ id: "0", @@ -134,7 +134,7 @@ describe("withPymStorage", () => { .mock(storage) .expects("getItem") .throws("error"); - withPymStorage(storage, "localStorage", "talk:")(pym as any); + withPymStorage(storage, "localStorage", "coral:")(pym as any); pym.listeners["pymStorage.localStorage.request"]( JSON.stringify({ id: "0", diff --git a/src/core/client/embed/decorators/withPymStorage.ts b/src/core/client/embed/decorators/withPymStorage.ts index d104dc53e..61c454c09 100644 --- a/src/core/client/embed/decorators/withPymStorage.ts +++ b/src/core/client/embed/decorators/withPymStorage.ts @@ -4,7 +4,7 @@ import { Decorator } from "./types"; const withPymStorage = ( storage: Storage, type: "localStorage" | "sessionStorage", - prefix = "talk:" + prefix = "coral:" ): Decorator => pym => { pym.onMessage(`pymStorage.${type}.request`, (msg: any) => { const { id, method, parameters } = JSON.parse(msg); diff --git a/src/core/client/embed/decorators/withSetCommentID.ts b/src/core/client/embed/decorators/withSetCommentID.ts index 69e55d57d..4c4cd72df 100644 --- a/src/core/client/embed/decorators/withSetCommentID.ts +++ b/src/core/client/embed/decorators/withSetCommentID.ts @@ -1,5 +1,5 @@ -import { parseQuery, stringifyQuery } from "talk-common/utils"; -import { buildURL } from "talk-framework/utils"; +import { parseQuery, stringifyQuery } from "coral-common/utils"; +import { buildURL } from "coral-framework/utils"; import { Decorator } from "./types"; diff --git a/src/core/client/embed/index.html b/src/core/client/embed/index.html index a686f5f5b..2c6bc47d5 100644 --- a/src/core/client/embed/index.html +++ b/src/core/client/embed/index.html @@ -1,7 +1,7 @@ - Talk 5.0 – Embed Stream + Coral 5.0 – Embed Stream @@ -18,14 +18,14 @@ Admin | Story | Story With Button

-

Talk 5.0 – Embed Stream

+

Coral 5.0 – Embed Stream

diff --git a/src/core/client/embed/index.spec.ts b/src/core/client/embed/index.spec.ts index 66ea2d4e3..bcc10f2f0 100644 --- a/src/core/client/embed/index.spec.ts +++ b/src/core/client/embed/index.spec.ts @@ -14,10 +14,10 @@ describe("Basic integration test", () => { }); it("should render iframe", () => { mockConsole(); - const TalkEmbedStream = Coral.Talk.createStreamEmbed({ + const CoralEmbedStream = Coral.Coral.createStreamEmbed({ id: "basic-integration-test-id", }); - TalkEmbedStream.render(); + CoralEmbedStream.render(); expect(container.innerHTML).toMatchSnapshot(); expect(console.warn).toHaveBeenCalledTimes(1); expect(console.error).not.toHaveBeenCalled(); @@ -28,10 +28,10 @@ describe("Basic integration test", () => { link.rel = "canonical"; link.href = "http://localhost/canonical"; document.head!.appendChild(link); - const TalkEmbedStream = Coral.Talk.createStreamEmbed({ + const CoralEmbedStream = Coral.Coral.createStreamEmbed({ id: "basic-integration-test-id", }); - TalkEmbedStream.render(); + CoralEmbedStream.render(); expect(container.innerHTML).toMatchSnapshot(); document.head!.removeChild(link); expect(console.warn).not.toHaveBeenCalled(); @@ -39,11 +39,11 @@ describe("Basic integration test", () => { }); it("should remove iframe", () => { mockConsole(); - const TalkEmbedStream = Coral.Talk.createStreamEmbed({ + const CoralEmbedStream = Coral.Coral.createStreamEmbed({ id: "basic-integration-test-id", }); - TalkEmbedStream.render(); - TalkEmbedStream.remove(); + CoralEmbedStream.render(); + CoralEmbedStream.remove(); expect(container.innerHTML).toBe(""); // tslint:disable-next-line:no-console expect(console.warn).toHaveBeenCalledTimes(1); diff --git a/src/core/client/embed/index.ts b/src/core/client/embed/index.ts index 542bc1caa..725a93526 100644 --- a/src/core/client/embed/index.ts +++ b/src/core/client/embed/index.ts @@ -1,2 +1,2 @@ -import * as TalkImport from "./Talk"; -export const Talk = TalkImport; +import * as CoralImport from "./Coral"; +export const Coral = CoralImport; diff --git a/src/core/client/embed/story.html b/src/core/client/embed/story.html index c2f309056..36411abaa 100644 --- a/src/core/client/embed/story.html +++ b/src/core/client/embed/story.html @@ -1,7 +1,7 @@ - Talk 5.0 – Embed Stream – Story + Coral 5.0 – Embed Stream – Story @@ -18,7 +18,7 @@ Admin | Default | Story With Button

-

Talk 5.0 – Story

+

Coral 5.0 – Story

Dismember a mouse and then regurgitate parts of it on the family room floor. Dont wait for the storm to pass, dance in the rain stand in front @@ -118,11 +118,11 @@

diff --git a/src/core/client/embed/storyButton.html b/src/core/client/embed/storyButton.html index 5d8e42e34..9eeee32ac 100644 --- a/src/core/client/embed/storyButton.html +++ b/src/core/client/embed/storyButton.html @@ -1,7 +1,7 @@ - Talk 5.0 – Embed Stream – Story with Button + Coral 5.0 – Embed Stream – Story with Button @@ -18,7 +18,7 @@ Admin | Default | Story

-

Talk 5.0 – Story with Button

+

Coral 5.0 – Story with Button

Dismember a mouse and then regurgitate parts of it on the family room floor. Dont wait for the storm to pass, dance in the rain stand in front @@ -121,20 +121,20 @@

diff --git a/src/core/client/embed/utils/prefixStorage.spec.ts b/src/core/client/embed/utils/prefixStorage.spec.ts index 1c0ca31ca..bfc525bb1 100644 --- a/src/core/client/embed/utils/prefixStorage.spec.ts +++ b/src/core/client/embed/utils/prefixStorage.spec.ts @@ -1,19 +1,19 @@ +import { createInMemoryStorage } from "coral-framework/lib/storage"; import sinon from "sinon"; -import { createInMemoryStorage } from "talk-framework/lib/storage"; import prefixStorage from "./prefixStorage"; it("should get nth key", () => { const storage = createInMemoryStorage({ a: "0", b: "1", - "talk:c": "2", + "coral:c": "2", d: "3", - "talk:e": "4", + "coral:e": "4", }); - const prefixed = prefixStorage(storage, "talk:"); - expect(prefixed.key(0)).toBe("talk:c"); - expect(prefixed.key(1)).toBe("talk:e"); + const prefixed = prefixStorage(storage, "coral:"); + expect(prefixed.key(0)).toBe("coral:c"); + expect(prefixed.key(1)).toBe("coral:e"); expect(prefixed.key(2)).toBeNull(); }); @@ -21,12 +21,12 @@ it("should call clear", () => { const storage = createInMemoryStorage({ a: "0", b: "1", - "talk:c": "2", + "coral:c": "2", d: "3", - "talk:e": "4", + "coral:e": "4", }); - const prefixed = prefixStorage(storage, "talk:"); + const prefixed = prefixStorage(storage, "coral:"); prefixed.clear(); expect(storage.toString()).toMatchSnapshot(); }); @@ -35,31 +35,31 @@ it("should call length", () => { const storage = createInMemoryStorage({ a: "0", b: "1", - "talk:c": "2", + "coral:c": "2", d: "3", - "talk:e": "4", + "coral:e": "4", }); - const prefixed = prefixStorage(storage, "talk:"); + const prefixed = prefixStorage(storage, "coral:"); expect(prefixed.length).toBe(2); }); it("should prefix setItem", () => { const storage = { - setItem: sinon.mock().withArgs("talk:key", "value"), + setItem: sinon.mock().withArgs("coral:key", "value"), }; - const prefixed = prefixStorage(storage as any, "talk:"); + const prefixed = prefixStorage(storage as any, "coral:"); prefixed.setItem("key", "value"); storage.setItem.verify(); }); it("should prefix removeItem", () => { const storage = { - removeItem: sinon.mock().withArgs("talk:key"), + removeItem: sinon.mock().withArgs("coral:key"), }; - const prefixed = prefixStorage(storage as any, "talk:"); + const prefixed = prefixStorage(storage as any, "coral:"); prefixed.removeItem("key"); storage.removeItem.verify(); }); @@ -69,11 +69,11 @@ it("should prefix getItem", () => { const storage = { getItem: sinon .mock() - .withArgs("talk:key") + .withArgs("coral:key") .returns(ret), }; - const prefixed = prefixStorage(storage as any, "talk:"); + const prefixed = prefixStorage(storage as any, "coral:"); expect(prefixed.getItem("key")).toBe(ret); (storage.getItem as any).verify(); }); diff --git a/src/core/client/framework/components/CopyButton.tsx b/src/core/client/framework/components/CopyButton.tsx index f5e792db2..37a198f38 100644 --- a/src/core/client/framework/components/CopyButton.tsx +++ b/src/core/client/framework/components/CopyButton.tsx @@ -2,8 +2,8 @@ import { Localized } from "fluent-react/compat"; import React from "react"; import CopyToClipboard from "react-copy-to-clipboard"; -import { Button } from "talk-ui/components"; -import { PropTypesOf } from "talk-ui/types"; +import { Button } from "coral-ui/components"; +import { PropTypesOf } from "coral-ui/types"; interface Props extends PropTypesOf { text: string; diff --git a/src/core/client/framework/components/DurationField.spec.tsx b/src/core/client/framework/components/DurationField.spec.tsx index 144591132..7cea24a92 100644 --- a/src/core/client/framework/components/DurationField.spec.tsx +++ b/src/core/client/framework/components/DurationField.spec.tsx @@ -2,7 +2,7 @@ import { noop } from "lodash"; import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import DurationField, { DURATION_UNIT } from "./DurationField"; diff --git a/src/core/client/framework/components/DurationField.tsx b/src/core/client/framework/components/DurationField.tsx index ffa28d538..63b609f35 100644 --- a/src/core/client/framework/components/DurationField.tsx +++ b/src/core/client/framework/components/DurationField.tsx @@ -1,7 +1,7 @@ import { Localized } from "fluent-react/compat"; import React, { ChangeEvent, Component } from "react"; -import { Flex, Option, SelectField, TextField } from "talk-ui/components"; +import { Flex, Option, SelectField, TextField } from "coral-ui/components"; import styles from "./DurationField.css"; diff --git a/src/core/client/framework/components/FacebookButton.spec.tsx b/src/core/client/framework/components/FacebookButton.spec.tsx index 382e81a41..3bc2676dd 100644 --- a/src/core/client/framework/components/FacebookButton.spec.tsx +++ b/src/core/client/framework/components/FacebookButton.spec.tsx @@ -2,7 +2,7 @@ import { noop } from "lodash"; import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import FacebookButton from "./FacebookButton"; diff --git a/src/core/client/framework/components/FacebookButton.tsx b/src/core/client/framework/components/FacebookButton.tsx index 88a98c90f..0f79d95e5 100644 --- a/src/core/client/framework/components/FacebookButton.tsx +++ b/src/core/client/framework/components/FacebookButton.tsx @@ -1,8 +1,8 @@ import React from "react"; import { FunctionComponent } from "react"; -import { PropTypesOf } from "talk-framework/types"; -import { Button } from "talk-ui/components"; +import { PropTypesOf } from "coral-framework/types"; +import { Button } from "coral-ui/components"; import styles from "./FacebookButton.css"; diff --git a/src/core/client/framework/components/GoogleButton.spec.tsx b/src/core/client/framework/components/GoogleButton.spec.tsx index 0d7b89b1b..d6d86a247 100644 --- a/src/core/client/framework/components/GoogleButton.spec.tsx +++ b/src/core/client/framework/components/GoogleButton.spec.tsx @@ -2,7 +2,7 @@ import { noop } from "lodash"; import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import GoogleButton from "./GoogleButton"; diff --git a/src/core/client/framework/components/GoogleButton.tsx b/src/core/client/framework/components/GoogleButton.tsx index 57f3fdd1a..ad8df1ec9 100644 --- a/src/core/client/framework/components/GoogleButton.tsx +++ b/src/core/client/framework/components/GoogleButton.tsx @@ -1,8 +1,8 @@ import React from "react"; import { FunctionComponent } from "react"; -import { PropTypesOf } from "talk-framework/types"; -import { Button } from "talk-ui/components"; +import { PropTypesOf } from "coral-framework/types"; +import { Button } from "coral-ui/components"; import styles from "./GoogleButton.css"; diff --git a/src/core/client/framework/components/OIDCButton.spec.tsx b/src/core/client/framework/components/OIDCButton.spec.tsx index 2967bcba7..a86aabe0f 100644 --- a/src/core/client/framework/components/OIDCButton.spec.tsx +++ b/src/core/client/framework/components/OIDCButton.spec.tsx @@ -2,7 +2,7 @@ import { noop } from "lodash"; import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import OIDCButton from "./OIDCButton"; diff --git a/src/core/client/framework/components/OIDCButton.tsx b/src/core/client/framework/components/OIDCButton.tsx index 331cff49e..dd1c373fd 100644 --- a/src/core/client/framework/components/OIDCButton.tsx +++ b/src/core/client/framework/components/OIDCButton.tsx @@ -1,8 +1,8 @@ import React from "react"; import { FunctionComponent } from "react"; -import { PropTypesOf } from "talk-framework/types"; -import { Button } from "talk-ui/components"; +import { PropTypesOf } from "coral-framework/types"; +import { Button } from "coral-ui/components"; import styles from "./OIDCButton.css"; diff --git a/src/core/client/framework/components/PasswordField.tsx b/src/core/client/framework/components/PasswordField.tsx index a6afdf3d7..5fbe8c930 100644 --- a/src/core/client/framework/components/PasswordField.tsx +++ b/src/core/client/framework/components/PasswordField.tsx @@ -1,8 +1,8 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; -import { Omit, PropTypesOf } from "talk-framework/types"; -import { PasswordField as PasswordFieldUI } from "talk-ui/components"; +import { Omit, PropTypesOf } from "coral-framework/types"; +import { PasswordField as PasswordFieldUI } from "coral-ui/components"; export interface Props extends Omit< diff --git a/src/core/client/framework/components/loadables/MarkdownEditor/MarkdownEditor.css b/src/core/client/framework/components/loadables/MarkdownEditor/MarkdownEditor.css index 2c30cf836..04e463d6d 100644 --- a/src/core/client/framework/components/loadables/MarkdownEditor/MarkdownEditor.css +++ b/src/core/client/framework/components/loadables/MarkdownEditor/MarkdownEditor.css @@ -44,84 +44,84 @@ $fullscreenZIndex: 10; } .iconBold { - composes: icon from "talk-ui/shared/icon.css"; + composes: icon from "coral-ui/shared/icon.css"; &::before { content: "format_bold"; } } .iconItalic { - composes: icon from "talk-ui/shared/icon.css"; + composes: icon from "coral-ui/shared/icon.css"; &::before { content: "format_italic"; } } .iconTitle { - composes: icon from "talk-ui/shared/icon.css"; + composes: icon from "coral-ui/shared/icon.css"; &::before { content: "title"; } } .iconQuote { - composes: icon from "talk-ui/shared/icon.css"; + composes: icon from "coral-ui/shared/icon.css"; &::before { content: "format_quote"; } } .iconUnorderedList { - composes: icon from "talk-ui/shared/icon.css"; + composes: icon from "coral-ui/shared/icon.css"; &::before { content: "format_list_bulleted"; } } .iconOrderedList { - composes: icon from "talk-ui/shared/icon.css"; + composes: icon from "coral-ui/shared/icon.css"; &::before { content: "format_list_numbered"; } } .iconLink { - composes: icon from "talk-ui/shared/icon.css"; + composes: icon from "coral-ui/shared/icon.css"; &::before { content: "link"; } } .iconImage { - composes: icon from "talk-ui/shared/icon.css"; + composes: icon from "coral-ui/shared/icon.css"; &::before { content: "insert_photo"; } } .iconPreview { - composes: icon from "talk-ui/shared/icon.css"; + composes: icon from "coral-ui/shared/icon.css"; &::before { content: "remove_red_eye"; } } .iconSideBySide { - composes: icon from "talk-ui/shared/icon.css"; + composes: icon from "coral-ui/shared/icon.css"; &::before { content: "chrome_reader_mode"; } } .iconFullscreen { - composes: icon from "talk-ui/shared/icon.css"; + composes: icon from "coral-ui/shared/icon.css"; &::before { content: "fullscreen"; } } .iconGuide { - composes: icon from "talk-ui/shared/icon.css"; + composes: icon from "coral-ui/shared/icon.css"; &::before { content: "help_outline"; } diff --git a/src/core/client/framework/components/loadables/MarkdownEditor/MarkdownEditor.tsx b/src/core/client/framework/components/loadables/MarkdownEditor/MarkdownEditor.tsx index 3175390dd..42e10829d 100644 --- a/src/core/client/framework/components/loadables/MarkdownEditor/MarkdownEditor.tsx +++ b/src/core/client/framework/components/loadables/MarkdownEditor/MarkdownEditor.tsx @@ -2,7 +2,7 @@ import cn from "classnames"; import React, { ChangeEvent, Component, Ref } from "react"; import SimpleMDE from "simplemde"; -import { GetMessage, withGetMessage } from "talk-framework/lib/i18n"; +import { GetMessage, withGetMessage } from "coral-framework/lib/i18n"; import styles from "./MarkdownEditor.css"; diff --git a/src/core/client/framework/helpers/createContextHOC.tsx b/src/core/client/framework/helpers/createContextHOC.tsx index da458e55a..85e6faa23 100644 --- a/src/core/client/framework/helpers/createContextHOC.tsx +++ b/src/core/client/framework/helpers/createContextHOC.tsx @@ -6,8 +6,8 @@ import { } from "recompose"; /** - * withContext is a HOC wrapper around `TalkContextConsumer`. - * `propsCallback` must be provided which accepts the `TalkContext` + * withContext is a HOC wrapper around `CoralContextConsumer`. + * `propsCallback` must be provided which accepts the `CoralContext` * and returns the props the should be injected. */ function createContextHOC( diff --git a/src/core/client/framework/helpers/getParamsFromHashAndClearIt.ts b/src/core/client/framework/helpers/getParamsFromHashAndClearIt.ts index e8dd53166..c0d97c2f7 100644 --- a/src/core/client/framework/helpers/getParamsFromHashAndClearIt.ts +++ b/src/core/client/framework/helpers/getParamsFromHashAndClearIt.ts @@ -1,4 +1,4 @@ -import { parseQuery } from "talk-common/utils"; +import { parseQuery } from "coral-common/utils"; export default function getParamsFromHashAndClearIt() { try { diff --git a/src/core/client/framework/helpers/getURLWithCommentID.tsx b/src/core/client/framework/helpers/getURLWithCommentID.tsx index 316edb5b4..3732a638f 100644 --- a/src/core/client/framework/helpers/getURLWithCommentID.tsx +++ b/src/core/client/framework/helpers/getURLWithCommentID.tsx @@ -1,4 +1,4 @@ -import { modifyQuery } from "talk-framework/utils"; +import { modifyQuery } from "coral-framework/utils"; export default function getURLWithCommentID( storyURL: string, diff --git a/src/core/client/framework/helpers/getViewer.ts b/src/core/client/framework/helpers/getViewer.ts index 02b4ea824..bdf95b7f5 100644 --- a/src/core/client/framework/helpers/getViewer.ts +++ b/src/core/client/framework/helpers/getViewer.ts @@ -1,6 +1,6 @@ +import { lookup } from "coral-framework/lib/relay"; +import { GQLUser } from "coral-framework/schema"; import { Environment } from "relay-runtime"; -import { lookup } from "talk-framework/lib/relay"; -import { GQLUser } from "talk-framework/schema"; import getViewerSourceID from "./getViewerSourceID"; diff --git a/src/core/client/framework/helpers/redirectOAuth2.ts b/src/core/client/framework/helpers/redirectOAuth2.ts index 2202c1c4f..dbbda1647 100644 --- a/src/core/client/framework/helpers/redirectOAuth2.ts +++ b/src/core/client/framework/helpers/redirectOAuth2.ts @@ -1,4 +1,4 @@ -import { authRedirectBackTo } from "talk-framework/helpers/storageKeys"; +import { authRedirectBackTo } from "coral-framework/helpers/storageKeys"; export default function redirectOAuth2(redirectURL: string) { sessionStorage.setItem(authRedirectBackTo, window.location.pathname); diff --git a/src/core/client/framework/hooks/useUUID.ts b/src/core/client/framework/hooks/useUUID.ts index 2cf7dfb40..77df3b0ec 100644 --- a/src/core/client/framework/hooks/useUUID.ts +++ b/src/core/client/framework/hooks/useUUID.ts @@ -1,11 +1,11 @@ import { useMemo } from "react"; -import { useTalkContext } from "talk-framework/lib/bootstrap"; +import { useCoralContext } from "coral-framework/lib/bootstrap"; /** * useUUID returns a unique identifier. */ export default function useUUID(): string { - const { uuidGenerator } = useTalkContext(); + const { uuidGenerator } = useCoralContext(); return useMemo(() => uuidGenerator(), []); } diff --git a/src/core/client/framework/lib/bootstrap/TalkContext.tsx b/src/core/client/framework/lib/bootstrap/CoralContext.tsx similarity index 69% rename from src/core/client/framework/lib/bootstrap/TalkContext.tsx rename to src/core/client/framework/lib/bootstrap/CoralContext.tsx index 4eecce04b..b88962704 100644 --- a/src/core/client/framework/lib/bootstrap/TalkContext.tsx +++ b/src/core/client/framework/lib/bootstrap/CoralContext.tsx @@ -7,15 +7,15 @@ import { MediaQueryMatchers } from "react-responsive"; import { Formatter } from "react-timeago"; import { Environment } from "relay-runtime"; -import { BrowserInfo } from "talk-framework/lib/browserInfo"; -import { PostMessageService } from "talk-framework/lib/postMessage"; -import { RestClient } from "talk-framework/lib/rest"; -import { PromisifiedStorage } from "talk-framework/lib/storage"; -import { TransitionControlData } from "talk-framework/testHelpers"; -import { UIContext } from "talk-ui/components"; -import { ClickFarAwayRegister } from "talk-ui/components/ClickOutside"; +import { BrowserInfo } from "coral-framework/lib/browserInfo"; +import { PostMessageService } from "coral-framework/lib/postMessage"; +import { RestClient } from "coral-framework/lib/rest"; +import { PromisifiedStorage } from "coral-framework/lib/storage"; +import { TransitionControlData } from "coral-framework/testHelpers"; +import { UIContext } from "coral-ui/components"; +import { ClickFarAwayRegister } from "coral-ui/components/ClickOutside"; -export interface TalkContext { +export interface CoralContext { /** relayEnvironment for our relay framework. */ relayEnvironment: Environment; @@ -68,23 +68,23 @@ export interface TalkContext { transitionControl?: TransitionControlData; } -export const TalkReactContext = React.createContext({} as any); +export const CoralReactContext = React.createContext({} as any); -export const useTalkContext = () => React.useContext(TalkReactContext); +export const useCoralContext = () => React.useContext(CoralReactContext); /** * Allows consuming the provided context using the React Context API. */ -export const TalkContextConsumer = TalkReactContext.Consumer; +export const CoralContextConsumer = CoralReactContext.Consumer; /** - * In addition to just providing the context, TalkContextProvider also + * In addition to just providing the context, CoralContextProvider also * renders the `LocalizationProvider` with the appropite data. */ -export const TalkContextProvider: FunctionComponent<{ - value: TalkContext; +export const CoralContextProvider: FunctionComponent<{ + value: CoralContext; }> = ({ value, children }) => ( - + - + ); diff --git a/src/core/client/framework/lib/bootstrap/createManaged.tsx b/src/core/client/framework/lib/bootstrap/createManaged.tsx index 2d47994c4..c7824ecd4 100644 --- a/src/core/client/framework/lib/bootstrap/createManaged.tsx +++ b/src/core/client/framework/lib/bootstrap/createManaged.tsx @@ -7,28 +7,28 @@ import { Formatter } from "react-timeago"; import { Environment, RecordSource, Store } from "relay-runtime"; import uuid from "uuid/v4"; -import { getBrowserInfo } from "talk-framework/lib/browserInfo"; -import { LOCAL_ID } from "talk-framework/lib/relay"; +import { getBrowserInfo } from "coral-framework/lib/browserInfo"; +import { LOCAL_ID } from "coral-framework/lib/relay"; import { createLocalStorage, createPromisifiedStorage, createPymStorage, createSessionStorage, PromisifiedStorage, -} from "talk-framework/lib/storage"; +} from "coral-framework/lib/storage"; -import { RestClient } from "talk-framework/lib/rest"; -import { ClickFarAwayRegister } from "talk-ui/components/ClickOutside"; +import { RestClient } from "coral-framework/lib/rest"; +import { ClickFarAwayRegister } from "coral-ui/components/ClickOutside"; import { generateBundles, LocalesData, negotiateLanguages } from "../i18n"; import { createNetwork, TokenGetter } from "../network"; import { PostMessageService } from "../postMessage"; +import { CoralContext, CoralContextProvider } from "./CoralContext"; import SendPymReady from "./SendPymReady"; -import { TalkContext, TalkContextProvider } from "./TalkContext"; export type InitLocalState = ( environment: Environment, - context: TalkContext + context: CoralContext ) => void | Promise; interface CreateContextArguments { @@ -109,16 +109,16 @@ function createRestClient(tokenGetter: () => string) { } /** - * Returns a managed TalkContextProvider, that includes given context + * Returns a managed CoralContextProvider, that includes given context * and handles context changes, e.g. when a user session changes. */ -function createMangedTalkContextProvider( - context: TalkContext, +function createMangedCoralContextProvider( + context: CoralContext, initLocalState: InitLocalState ) { - const ManagedTalkContextProvider = class extends Component< + const ManagedCoralContextProvider = class extends Component< {}, - { context: TalkContext } + { context: CoralContext } > { constructor(props: {}) { super(props); @@ -158,15 +158,15 @@ function createMangedTalkContextProvider( public render() { return ( - + {this.props.children} {this.state.context.pym && } - + ); } }; - return ManagedTalkContextProvider; + return ManagedCoralContextProvider; } /** @@ -195,7 +195,7 @@ function resolveSessionStorage(pym?: PymChild): PromisifiedStorage { /** * `createManaged` establishes the dependencies of our framework - * and returns a `ManagedTalkContextProvider` that provides the context + * and returns a `ManagedCoralContextProvider` that provides the context * to the rest of the application. */ export default async function createManaged({ @@ -236,7 +236,7 @@ export default async function createManaged({ const { environment, tokenGetter } = createRelayEnvironment(); // Assemble context. - const context: TalkContext = { + const context: CoralContext = { relayEnvironment: environment, locales, localeBundles, @@ -251,14 +251,14 @@ export default async function createManaged({ browserInfo: getBrowserInfo(), uuidGenerator: uuid, // Noop, this is later replaced by the - // managed TalkContextProvider. + // managed CoralContextProvider. clearSession: () => Promise.resolve(), }; // Initialize local state. await initLocalState(context.relayEnvironment, context); - // Returns a managed TalkContextProvider, that includes the above + // Returns a managed CoralContextProvider, that includes the above // context and handles context changes, e.g. when a user session changes. - return createMangedTalkContextProvider(context, initLocalState); + return createMangedCoralContextProvider(context, initLocalState); } diff --git a/src/core/client/framework/lib/bootstrap/index.ts b/src/core/client/framework/lib/bootstrap/index.ts index ed180cd94..bbf657dda 100644 --- a/src/core/client/framework/lib/bootstrap/index.ts +++ b/src/core/client/framework/lib/bootstrap/index.ts @@ -1,9 +1,9 @@ export { - TalkContext, - TalkContextConsumer, - TalkContextProvider, - TalkReactContext, - useTalkContext, -} from "./TalkContext"; + CoralContext, + CoralContextConsumer, + CoralContextProvider, + CoralReactContext, + useCoralContext, +} from "./CoralContext"; export { default as createManaged } from "./createManaged"; export { default as withContext } from "./withContext"; diff --git a/src/core/client/framework/lib/bootstrap/withContext.tsx b/src/core/client/framework/lib/bootstrap/withContext.tsx index fe4e43c5f..12c803fe5 100644 --- a/src/core/client/framework/lib/bootstrap/withContext.tsx +++ b/src/core/client/framework/lib/bootstrap/withContext.tsx @@ -1,9 +1,9 @@ -import { createContextHOC } from "talk-framework/helpers"; -import { TalkContext, TalkContextConsumer } from "./TalkContext"; +import { createContextHOC } from "coral-framework/helpers"; +import { CoralContext, CoralContextConsumer } from "./CoralContext"; -const withContext = createContextHOC( +const withContext = createContextHOC( "withContext", - TalkContextConsumer + CoralContextConsumer ); export default withContext; diff --git a/src/core/client/framework/lib/errors/invalidRequestError.ts b/src/core/client/framework/lib/errors/invalidRequestError.ts index 04a5b1e33..2ef2bd04f 100644 --- a/src/core/client/framework/lib/errors/invalidRequestError.ts +++ b/src/core/client/framework/lib/errors/invalidRequestError.ts @@ -1,5 +1,5 @@ +import { ERROR_CODES } from "coral-common/errors"; import { FORM_ERROR } from "final-form"; -import { ERROR_CODES } from "talk-common/errors"; /** * Shape of the `InvalidRequest` extension as diff --git a/src/core/client/framework/lib/errors/moderationNudgeError.ts b/src/core/client/framework/lib/errors/moderationNudgeError.ts index a7d19457f..89867a7dc 100644 --- a/src/core/client/framework/lib/errors/moderationNudgeError.ts +++ b/src/core/client/framework/lib/errors/moderationNudgeError.ts @@ -1,4 +1,4 @@ -import { ERROR_CODES } from "talk-common/errors"; +import { ERROR_CODES } from "coral-common/errors"; /** * Shape of the `ModerationNudge` extension as diff --git a/src/core/client/framework/lib/externalConfig.ts b/src/core/client/framework/lib/externalConfig.ts index 0af0c76fb..43da97c3d 100644 --- a/src/core/client/framework/lib/externalConfig.ts +++ b/src/core/client/framework/lib/externalConfig.ts @@ -1,5 +1,5 @@ +import { areWeInIframe } from "coral-framework/utils"; import { Child as PymChild } from "pym.js"; -import { areWeInIframe } from "talk-framework/utils"; export interface ExternalConfig { accessToken?: string; diff --git a/src/core/client/framework/lib/form/SubmitHookHandler.tsx b/src/core/client/framework/lib/form/SubmitHookHandler.tsx index b29b30a19..7a64c4a6a 100644 --- a/src/core/client/framework/lib/form/SubmitHookHandler.tsx +++ b/src/core/client/framework/lib/form/SubmitHookHandler.tsx @@ -1,7 +1,7 @@ import { FormApi } from "final-form"; import React from "react"; -import { InvalidRequestError } from "talk-framework/lib/errors"; +import { InvalidRequestError } from "coral-framework/lib/errors"; import { AddSubmitHook, SubmitHook, SubmitHookContextProvider } from "./"; diff --git a/src/core/client/framework/lib/form/withSubmitHookContext.ts b/src/core/client/framework/lib/form/withSubmitHookContext.ts index ebd33be53..a018db7e5 100644 --- a/src/core/client/framework/lib/form/withSubmitHookContext.ts +++ b/src/core/client/framework/lib/form/withSubmitHookContext.ts @@ -1,4 +1,4 @@ -import { createContextHOC } from "talk-framework/helpers"; +import { createContextHOC } from "coral-framework/helpers"; import { SubmitHookContext, SubmitHookContextConsumer, diff --git a/src/core/client/framework/lib/i18n/components/ExternalLink.spec.tsx b/src/core/client/framework/lib/i18n/components/ExternalLink.spec.tsx index 36a147b05..23790c8d5 100644 --- a/src/core/client/framework/lib/i18n/components/ExternalLink.spec.tsx +++ b/src/core/client/framework/lib/i18n/components/ExternalLink.spec.tsx @@ -1,7 +1,7 @@ import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import ExternalLink from "./ExternalLink"; diff --git a/src/core/client/framework/lib/i18n/withGetMessage.tsx b/src/core/client/framework/lib/i18n/withGetMessage.tsx index f16814caa..6ff0aefe4 100644 --- a/src/core/client/framework/lib/i18n/withGetMessage.tsx +++ b/src/core/client/framework/lib/i18n/withGetMessage.tsx @@ -1,7 +1,7 @@ import * as React from "react"; import { DefaultingInferableComponentEnhancer, hoistStatics } from "recompose"; -import { TalkContext, withContext } from "../bootstrap"; +import { CoralContext, withContext } from "../bootstrap"; import getMessage from "./getMessage"; export type GetMessage = (id: string, defaultTo?: string) => string; @@ -11,7 +11,7 @@ interface InjectedProps { } interface Props { - localeBundles: TalkContext["localeBundles"]; + localeBundles: CoralContext["localeBundles"]; } interface InjectedProps { @@ -19,7 +19,7 @@ interface InjectedProps { } interface Props { - localeBundles: TalkContext["localeBundles"]; + localeBundles: CoralContext["localeBundles"]; } /** diff --git a/src/core/client/framework/lib/intersection/IntersectionContext.tsx b/src/core/client/framework/lib/intersection/IntersectionContext.tsx index 90c10d58c..c85df2bd6 100644 --- a/src/core/client/framework/lib/intersection/IntersectionContext.tsx +++ b/src/core/client/framework/lib/intersection/IntersectionContext.tsx @@ -1,6 +1,6 @@ import * as React from "react"; -import { createContextHOC } from "talk-framework/helpers"; +import { createContextHOC } from "coral-framework/helpers"; export type IntersectionCallback = (entry: IntersectionObserverEntry) => void; export type Observe = ( diff --git a/src/core/client/framework/lib/network/extractError.ts b/src/core/client/framework/lib/network/extractError.ts index f5e4da1d1..7010fd2c2 100644 --- a/src/core/client/framework/lib/network/extractError.ts +++ b/src/core/client/framework/lib/network/extractError.ts @@ -1,4 +1,4 @@ -import { ERROR_TYPES } from "talk-common/errors"; +import { ERROR_TYPES } from "coral-common/errors"; import { InvalidRequestError, @@ -6,21 +6,21 @@ import { UnknownServerError, } from "../errors"; -interface TalkError { +interface CoralError { type: string; code: string; message: string; } -function isTalkError(err: any): err is TalkError { +function isCoralError(err: any): err is CoralError { return err.type && err.code && err.message; } export default function extractError( - err: TalkError, + err: CoralError, unknownErrorMessage: string = "Unknown error" ): Error { - if (!isTalkError(err)) { + if (!isCoralError(err)) { return new UnknownServerError(unknownErrorMessage, err); } if (err.type === ERROR_TYPES.INVALID_REQUEST_ERROR) { diff --git a/src/core/client/framework/lib/postMessage.ts b/src/core/client/framework/lib/postMessage.ts index 70523cd5a..f3707db5e 100644 --- a/src/core/client/framework/lib/postMessage.ts +++ b/src/core/client/framework/lib/postMessage.ts @@ -8,7 +8,7 @@ export class PostMessageService { private scope: string; constructor( - scope = "talk", + scope = "coral", origin: string = `${location.protocol}//${location.host}` ) { this.origin = origin; diff --git a/src/core/client/framework/lib/relay/QueryRenderer.tsx b/src/core/client/framework/lib/relay/QueryRenderer.tsx index cc8acac40..88fac171a 100644 --- a/src/core/client/framework/lib/relay/QueryRenderer.tsx +++ b/src/core/client/framework/lib/relay/QueryRenderer.tsx @@ -5,9 +5,9 @@ import { } from "react-relay"; import { OperationBase, OperationDefaults } from "relay-runtime"; -import { Omit } from "talk-framework/types"; +import { Omit } from "coral-framework/types"; -import { TalkContextConsumer } from "../bootstrap/TalkContext"; +import { CoralContextConsumer } from "../bootstrap/CoralContext"; // Omit environment as we are passing this from the context. export type QueryRendererProps< @@ -15,22 +15,22 @@ export type QueryRendererProps< > = Omit, "environment">; /** - * TalkQueryRenderer is a wrappper around Relay's `QueryRenderer`. + * CoralQueryRenderer is a wrappper around Relay's `QueryRenderer`. * It supplies the `environment` from the context and has better * generics type support. */ -class TalkQueryRenderer< +class CoralQueryRenderer< T extends OperationBase = OperationDefaults > extends Component> { public render() { return ( - + {({ relayEnvironment }) => ( )} - + ); } } -export default TalkQueryRenderer; +export default CoralQueryRenderer; diff --git a/src/core/client/framework/lib/relay/commitMutationPromise.ts b/src/core/client/framework/lib/relay/commitMutationPromise.ts index 8fc470b5f..d3a46abbc 100644 --- a/src/core/client/framework/lib/relay/commitMutationPromise.ts +++ b/src/core/client/framework/lib/relay/commitMutationPromise.ts @@ -1,7 +1,7 @@ import { commitMutation } from "react-relay"; import { Environment, MutationConfig, OperationBase } from "relay-runtime"; -import { DeepPartial, Omit } from "talk-framework/types"; +import { DeepPartial, Omit } from "coral-framework/types"; import extractPayload from "./extractPayload"; diff --git a/src/core/client/framework/lib/relay/createFetchContainer.tsx b/src/core/client/framework/lib/relay/createFetchContainer.tsx index 789d4e6a2..3d9665c8e 100644 --- a/src/core/client/framework/lib/relay/createFetchContainer.tsx +++ b/src/core/client/framework/lib/relay/createFetchContainer.tsx @@ -7,7 +7,7 @@ import { } from "recompose"; import { Environment } from "relay-runtime"; -import { TalkContext, withContext } from "../bootstrap"; +import { CoralContext, withContext } from "../bootstrap"; /** * createFetchContainer creates a HOC that @@ -20,7 +20,7 @@ function createFetchContainer( fetch: ( environment: Environment, variables: V, - context: TalkContext + context: CoralContext ) => Promise ): InferableComponentEnhancer<{ [P in T]: (variables: V) => Promise }> { return compose( diff --git a/src/core/client/framework/lib/relay/createMutationContainer.tsx b/src/core/client/framework/lib/relay/createMutationContainer.tsx index 411548f99..9fe55d79a 100644 --- a/src/core/client/framework/lib/relay/createMutationContainer.tsx +++ b/src/core/client/framework/lib/relay/createMutationContainer.tsx @@ -7,7 +7,7 @@ import { } from "recompose"; import { Environment } from "relay-runtime"; -import { TalkContext, withContext } from "../bootstrap"; +import { CoralContext, withContext } from "../bootstrap"; /** * createMutationContainer creates a HOC that @@ -23,14 +23,14 @@ function createMutationContainer( commit: ( environment: Environment, input: I, - context: TalkContext + context: CoralContext ) => Promise ): InferableComponentEnhancer<{ [P in T]: (input: I) => Promise }> { return compose( withContext(context => ({ context })), hoistStatics((BaseComponent: React.ComponentType) => { class CreateMutationContainer extends React.Component<{ - context: TalkContext; + context: CoralContext; }> { public static displayName = wrapDisplayName( BaseComponent, diff --git a/src/core/client/framework/lib/relay/fetch.tsx b/src/core/client/framework/lib/relay/fetch.tsx index 474a78973..234a71f6e 100644 --- a/src/core/client/framework/lib/relay/fetch.tsx +++ b/src/core/client/framework/lib/relay/fetch.tsx @@ -13,12 +13,12 @@ import { Variables, } from "relay-runtime"; -import { TalkContext, useTalkContext, withContext } from "../bootstrap"; +import { CoralContext, useCoralContext, withContext } from "../bootstrap"; import extractPayload from "./extractPayload"; export interface Fetch { name: N; - fetch: (environment: Environment, variables: V, context: TalkContext) => R; + fetch: (environment: Environment, variables: V, context: CoralContext) => R; } export type FetchVariables = T["variables"]; @@ -36,7 +36,7 @@ export type FetchProp> = T extends Fetch< export function createFetch( name: N, - fetch: (environment: Environment, variables: V, context: TalkContext) => R + fetch: (environment: Environment, variables: V, context: CoralContext) => R ): Fetch { return { name, @@ -66,7 +66,7 @@ export async function fetchQuery( export function useFetch( fetch: Fetch ): FetchProp { - const context = useTalkContext(); + const context = useCoralContext(); return useCallback>( ((variables: V) => { context.eventEmitter.emit(`fetch.${fetch.name}`, variables); @@ -87,7 +87,7 @@ export function withFetch( withContext(context => ({ context })), hoistStatics((BaseComponent: React.ComponentType) => { class WithFetch extends React.Component<{ - context: TalkContext; + context: CoralContext; }> { public static displayName = wrapDisplayName(BaseComponent, "withFetch"); diff --git a/src/core/client/framework/lib/relay/localState.ts b/src/core/client/framework/lib/relay/localState.ts index 1e2817c5c..54b90d6e6 100644 --- a/src/core/client/framework/lib/relay/localState.ts +++ b/src/core/client/framework/lib/relay/localState.ts @@ -4,9 +4,9 @@ import { RecordSourceProxy, } from "relay-runtime"; -import { TalkContext } from "talk-framework/lib/bootstrap"; -import { parseJWT } from "talk-framework/lib/jwt"; -import { createAndRetain } from "talk-framework/lib/relay"; +import { CoralContext } from "coral-framework/lib/bootstrap"; +import { parseJWT } from "coral-framework/lib/jwt"; +import { createAndRetain } from "coral-framework/lib/relay"; /** * The Root Record of Client-Side Schema Extension must be of this type. @@ -41,7 +41,7 @@ export function setAccessTokenInLocalState( export async function initLocalBaseState( environment: Environment, - { localStorage }: TalkContext, + { localStorage }: CoralContext, accessToken?: string | null ) { if (accessToken === undefined) { diff --git a/src/core/client/framework/lib/relay/mutation.tsx b/src/core/client/framework/lib/relay/mutation.tsx index 3bdbf5894..099b8d20e 100644 --- a/src/core/client/framework/lib/relay/mutation.tsx +++ b/src/core/client/framework/lib/relay/mutation.tsx @@ -7,13 +7,13 @@ import { } from "recompose"; import { Environment } from "relay-runtime"; -import { Omit } from "talk-framework/types"; +import { Omit } from "coral-framework/types"; -import { TalkContext, useTalkContext, withContext } from "../bootstrap"; +import { CoralContext, useCoralContext, withContext } from "../bootstrap"; export interface Mutation { name: N; - commit: (environment: Environment, input: I, context: TalkContext) => R; + commit: (environment: Environment, input: I, context: CoralContext) => R; } export type MutationInput< @@ -50,7 +50,7 @@ type RemoveClientMutationID = T extends Promise export function createMutation( name: N, - commit: (environment: Environment, input: I, context: TalkContext) => R + commit: (environment: Environment, input: I, context: CoralContext) => R // (cvle) We remove `clientMutationId` from the response, so we don't use it inside our app. // It is a Relay implementation detail that is pending for removal. // https://github.com/facebook/relay/pull/2349 @@ -68,7 +68,7 @@ export function createMutation( export function useMutation( mutation: Mutation ): MutationProp { - const context = useTalkContext(); + const context = useCoralContext(); return useCallback>( ((input: I) => { context.eventEmitter.emit(`mutation.${mutation.name}`, input); @@ -89,7 +89,7 @@ export function withMutation( withContext(context => ({ context })), hoistStatics((BaseComponent: React.ComponentType) => { class WithMutation extends React.Component<{ - context: TalkContext; + context: CoralContext; }> { public static displayName = wrapDisplayName( BaseComponent, diff --git a/src/core/client/framework/lib/relay/useRefetch.ts b/src/core/client/framework/lib/relay/useRefetch.ts index 18b3a5b0c..a425416f1 100644 --- a/src/core/client/framework/lib/relay/useRefetch.ts +++ b/src/core/client/framework/lib/relay/useRefetch.ts @@ -2,7 +2,7 @@ import { useState } from "react"; import { RelayPaginationProp } from "react-relay"; import { Variables } from "relay-runtime"; -import { useEffectWhenChanged } from "talk-framework/hooks"; +import { useEffectWhenChanged } from "coral-framework/hooks"; /** * useRefetch is a react hook that returns a `refetch` callback diff --git a/src/core/client/framework/lib/rest.ts b/src/core/client/framework/lib/rest.ts index 713ac12f9..bf89b5af6 100644 --- a/src/core/client/framework/lib/rest.ts +++ b/src/core/client/framework/lib/rest.ts @@ -1,5 +1,5 @@ +import { Overwrite } from "coral-framework/types"; import { merge } from "lodash"; -import { Overwrite } from "talk-framework/types"; import { extractError } from "./network"; diff --git a/src/core/client/framework/lib/storage/LocalStorage.ts b/src/core/client/framework/lib/storage/LocalStorage.ts index 91d8db2ad..94309c2ea 100644 --- a/src/core/client/framework/lib/storage/LocalStorage.ts +++ b/src/core/client/framework/lib/storage/LocalStorage.ts @@ -1,5 +1,5 @@ import prefixStorage from "./prefixStorage"; -export default function createLocalStorage(prefix = "talk:"): Storage { +export default function createLocalStorage(prefix = "coral:"): Storage { return prefixStorage(window.localStorage, prefix); } diff --git a/src/core/client/framework/lib/storage/SessionStorage.ts b/src/core/client/framework/lib/storage/SessionStorage.ts index 092c03edf..7a7139441 100644 --- a/src/core/client/framework/lib/storage/SessionStorage.ts +++ b/src/core/client/framework/lib/storage/SessionStorage.ts @@ -1,5 +1,5 @@ import prefixStorage from "./prefixStorage"; -export default function createSessionStorage(prefix = "talk:"): Storage { +export default function createSessionStorage(prefix = "coral:"): Storage { return prefixStorage(window.sessionStorage, prefix); } diff --git a/src/core/client/framework/lib/storage/prefixStorage.spec.ts b/src/core/client/framework/lib/storage/prefixStorage.spec.ts index 1c483ef33..e48e42e26 100644 --- a/src/core/client/framework/lib/storage/prefixStorage.spec.ts +++ b/src/core/client/framework/lib/storage/prefixStorage.spec.ts @@ -6,14 +6,14 @@ it("should get nth key", () => { const storage = createInMemoryStorage({ a: "0", b: "1", - "talk:c": "2", + "coral:c": "2", d: "3", - "talk:e": "4", + "coral:e": "4", }); - const prefixed = prefixStorage(storage, "talk:"); - expect(prefixed.key(0)).toBe("talk:c"); - expect(prefixed.key(1)).toBe("talk:e"); + const prefixed = prefixStorage(storage, "coral:"); + expect(prefixed.key(0)).toBe("coral:c"); + expect(prefixed.key(1)).toBe("coral:e"); expect(prefixed.key(2)).toBeNull(); }); @@ -21,12 +21,12 @@ it("should call clear", () => { const storage = createInMemoryStorage({ a: "0", b: "1", - "talk:c": "2", + "coral:c": "2", d: "3", - "talk:e": "4", + "coral:e": "4", }); - const prefixed = prefixStorage(storage, "talk:"); + const prefixed = prefixStorage(storage, "coral:"); prefixed.clear(); expect(storage.toString()).toMatchSnapshot(); }); @@ -35,31 +35,31 @@ it("should call length", () => { const storage = createInMemoryStorage({ a: "0", b: "1", - "talk:c": "2", + "coral:c": "2", d: "3", - "talk:e": "4", + "coral:e": "4", }); - const prefixed = prefixStorage(storage, "talk:"); + const prefixed = prefixStorage(storage, "coral:"); expect(prefixed.length).toBe(2); }); it("should prefix setItem", () => { const storage = { - setItem: sinon.mock().withArgs("talk:key", "value"), + setItem: sinon.mock().withArgs("coral:key", "value"), }; - const prefixed = prefixStorage(storage as any, "talk:"); + const prefixed = prefixStorage(storage as any, "coral:"); prefixed.setItem("key", "value"); storage.setItem.verify(); }); it("should prefix removeItem", () => { const storage = { - removeItem: sinon.mock().withArgs("talk:key"), + removeItem: sinon.mock().withArgs("coral:key"), }; - const prefixed = prefixStorage(storage as any, "talk:"); + const prefixed = prefixStorage(storage as any, "coral:"); prefixed.removeItem("key"); storage.removeItem.verify(); }); @@ -69,11 +69,11 @@ it("should prefix getItem", () => { const storage = { getItem: sinon .mock() - .withArgs("talk:key") + .withArgs("coral:key") .returns(ret), }; - const prefixed = prefixStorage(storage as any, "talk:"); + const prefixed = prefixStorage(storage as any, "coral:"); expect(prefixed.getItem("key")).toBe(ret); (storage.getItem as any).verify(); }); diff --git a/src/core/client/framework/lib/validation.tsx b/src/core/client/framework/lib/validation.tsx index f2b55236c..1d000ec41 100644 --- a/src/core/client/framework/lib/validation.tsx +++ b/src/core/client/framework/lib/validation.tsx @@ -7,7 +7,7 @@ import { USERNAME_MAX_LENGTH, USERNAME_MIN_LENGTH, USERNAME_REGEX, -} from "talk-common/helpers/validate"; +} from "coral-common/helpers/validate"; import { EMAILS_DO_NOT_MATCH, diff --git a/src/core/client/framework/mutations/SetAccessTokenMutation.spec.ts b/src/core/client/framework/mutations/SetAccessTokenMutation.spec.ts index b5d67f827..239e59865 100644 --- a/src/core/client/framework/mutations/SetAccessTokenMutation.spec.ts +++ b/src/core/client/framework/mutations/SetAccessTokenMutation.spec.ts @@ -1,13 +1,13 @@ import { Environment, RecordSource } from "relay-runtime"; import sinon from "sinon"; -import { TalkContext } from "talk-framework/lib/bootstrap"; -import { LOCAL_ID } from "talk-framework/lib/relay"; -import { createPromisifiedStorage } from "talk-framework/lib/storage"; +import { CoralContext } from "coral-framework/lib/bootstrap"; +import { LOCAL_ID } from "coral-framework/lib/relay"; +import { createPromisifiedStorage } from "coral-framework/lib/storage"; import { createAccessToken, createRelayEnvironment, -} from "talk-framework/testHelpers"; +} from "coral-framework/testHelpers"; import SetAccessTokenMutation from "./SetAccessTokenMutation"; @@ -24,7 +24,7 @@ const accessToken = createAccessToken(); it("Sets auth token to localStorage", async () => { const clearSessionStub = sinon.stub(); - const context: Partial = { + const context: Partial = { localStorage: createPromisifiedStorage(), clearSession: clearSessionStub, }; @@ -42,7 +42,7 @@ it("Sets auth token to localStorage", async () => { it("Removes auth token from localStorage", async () => { const clearSessionStub = sinon.stub(); - const context: Partial = { + const context: Partial = { localStorage: createPromisifiedStorage(), clearSession: clearSessionStub, }; diff --git a/src/core/client/framework/mutations/SetAccessTokenMutation.ts b/src/core/client/framework/mutations/SetAccessTokenMutation.ts index bb15810f0..6a73d12ac 100644 --- a/src/core/client/framework/mutations/SetAccessTokenMutation.ts +++ b/src/core/client/framework/mutations/SetAccessTokenMutation.ts @@ -1,11 +1,11 @@ import { Environment } from "relay-runtime"; -import { TalkContext } from "talk-framework/lib/bootstrap"; +import { CoralContext } from "coral-framework/lib/bootstrap"; import { commitLocalUpdatePromisified, createMutation, setAccessTokenInLocalState, -} from "talk-framework/lib/relay"; +} from "coral-framework/lib/relay"; interface SetAccessTokenInput { accessToken: string | null; @@ -16,7 +16,7 @@ const SetAccessTokenMutation = createMutation( async ( environment: Environment, input: SetAccessTokenInput, - { localStorage, clearSession }: TalkContext + { localStorage, clearSession }: CoralContext ) => { await commitLocalUpdatePromisified(environment, async store => { setAccessTokenInLocalState(input.accessToken, store); diff --git a/src/core/client/framework/mutations/SetNetworkStatusMutation.spec.ts b/src/core/client/framework/mutations/SetNetworkStatusMutation.spec.ts index fe3bcbde9..2ca2e417f 100644 --- a/src/core/client/framework/mutations/SetNetworkStatusMutation.spec.ts +++ b/src/core/client/framework/mutations/SetNetworkStatusMutation.spec.ts @@ -1,6 +1,6 @@ import { Environment, RecordSource } from "relay-runtime"; -import { createRelayEnvironment } from "talk-framework/testHelpers"; +import { createRelayEnvironment } from "coral-framework/testHelpers"; import { NETWORK_ID, NETWORK_TYPE } from "../lib/relay/localState"; import { commit } from "./SetNetworkStatusMutation"; diff --git a/src/core/client/framework/mutations/SetNetworkStatusMutation.ts b/src/core/client/framework/mutations/SetNetworkStatusMutation.ts index a1e1969e3..a79ff7d0f 100644 --- a/src/core/client/framework/mutations/SetNetworkStatusMutation.ts +++ b/src/core/client/framework/mutations/SetNetworkStatusMutation.ts @@ -1,6 +1,6 @@ import { commitLocalUpdate, Environment } from "relay-runtime"; -import { createMutationContainer } from "talk-framework/lib/relay"; +import { createMutationContainer } from "coral-framework/lib/relay"; import { NETWORK_ID } from "../lib/relay/localState"; diff --git a/src/core/client/framework/mutations/SignOutMutation.ts b/src/core/client/framework/mutations/SignOutMutation.ts index 1e728fc2e..08f5e0729 100644 --- a/src/core/client/framework/mutations/SignOutMutation.ts +++ b/src/core/client/framework/mutations/SignOutMutation.ts @@ -1,6 +1,6 @@ +import { CoralContext } from "coral-framework/lib/bootstrap"; +import { createMutationContainer } from "coral-framework/lib/relay"; import { Environment } from "relay-runtime"; -import { TalkContext } from "talk-framework/lib/bootstrap"; -import { createMutationContainer } from "talk-framework/lib/relay"; import signOut from "../rest/signOut"; import SetAccessTokenMutation from "./SetAccessTokenMutation"; @@ -9,7 +9,7 @@ export type SignOutMutation = () => Promise; export async function commit( environment: Environment, input: undefined, - ctx: TalkContext + ctx: CoralContext ) { await signOut(ctx.rest); await SetAccessTokenMutation.commit(environment, { accessToken: "" }, ctx); diff --git a/src/core/client/framework/testHelpers/TransitionControl.tsx b/src/core/client/framework/testHelpers/TransitionControl.tsx index 29eaa83a7..9b7c197d7 100644 --- a/src/core/client/framework/testHelpers/TransitionControl.tsx +++ b/src/core/client/framework/testHelpers/TransitionControl.tsx @@ -1,6 +1,6 @@ +import { withContext } from "coral-framework/lib/bootstrap"; import { Location, Match, Router, withRouter } from "found"; import React, { useEffect } from "react"; -import { withContext } from "talk-framework/lib/bootstrap"; interface Props { /** router is injected by `withRouter` HOC */ diff --git a/src/core/client/framework/testHelpers/createFixture.ts b/src/core/client/framework/testHelpers/createFixture.ts index 19820c1f0..8b46357f8 100644 --- a/src/core/client/framework/testHelpers/createFixture.ts +++ b/src/core/client/framework/testHelpers/createFixture.ts @@ -1,5 +1,5 @@ -import { pureMerge } from "talk-common/utils"; -import { DeepPartial } from "talk-framework/types"; +import { pureMerge } from "coral-common/utils"; +import { DeepPartial } from "coral-framework/types"; /** * Callbackify turns Fields e.g. `{a: string}` diff --git a/src/core/client/framework/testHelpers/createFluentBundle.ts b/src/core/client/framework/testHelpers/createFluentBundle.ts index bbd9ca37b..8dcb0eefc 100644 --- a/src/core/client/framework/testHelpers/createFluentBundle.ts +++ b/src/core/client/framework/testHelpers/createFluentBundle.ts @@ -1,7 +1,7 @@ import "fluent-intl-polyfill/compat"; import { FluentBundle } from "fluent/compat"; -import * as functions from "talk-framework/lib/i18n/functions"; +import * as functions from "coral-framework/lib/i18n/functions"; import fs from "fs"; import path from "path"; diff --git a/src/core/client/framework/testHelpers/createMutationResolverStub.ts b/src/core/client/framework/testHelpers/createMutationResolverStub.ts index 12e9897ff..31073ef18 100644 --- a/src/core/client/framework/testHelpers/createMutationResolverStub.ts +++ b/src/core/client/framework/testHelpers/createMutationResolverStub.ts @@ -1,6 +1,6 @@ +import { Omit } from "coral-framework/types"; import { identity, omit } from "lodash"; import sinon from "sinon"; -import { Omit } from "talk-framework/types"; import { Fixture } from "./createFixture"; import { Resolver } from "./createTestRenderer"; diff --git a/src/core/client/framework/testHelpers/createRelayEnvironment.ts b/src/core/client/framework/testHelpers/createRelayEnvironment.ts index c5c5274a4..5b67e8142 100644 --- a/src/core/client/framework/testHelpers/createRelayEnvironment.ts +++ b/src/core/client/framework/testHelpers/createRelayEnvironment.ts @@ -16,13 +16,13 @@ import { LOCAL_ID, LOCAL_TYPE, wrapFetchWithLogger, -} from "talk-framework/lib/relay"; +} from "coral-framework/lib/relay"; -import { loadSchema } from "talk-common/graphql"; +import { loadSchema } from "coral-common/graphql"; import { InvalidRequestError, ModerationNudgeError, -} from "talk-framework/lib/errors"; +} from "coral-framework/lib/errors"; export interface CreateRelayEnvironmentNetworkParams { /** project name of graphql-config */ diff --git a/src/core/client/framework/testHelpers/createTestRenderer.tsx b/src/core/client/framework/testHelpers/createTestRenderer.tsx index 106a72769..0afdbc9c6 100644 --- a/src/core/client/framework/testHelpers/createTestRenderer.tsx +++ b/src/core/client/framework/testHelpers/createTestRenderer.tsx @@ -6,12 +6,15 @@ import React from "react"; import TestRenderer, { ReactTestRenderer } from "react-test-renderer"; import { Environment, RecordProxy, RecordSourceProxy } from "relay-runtime"; -import { RequireProperty } from "talk-common/types"; -import { TalkContext, TalkContextProvider } from "talk-framework/lib/bootstrap"; -import { PostMessageService } from "talk-framework/lib/postMessage"; -import { RestClient } from "talk-framework/lib/rest"; -import { createPromisifiedStorage } from "talk-framework/lib/storage"; -import { createUUIDGenerator } from "talk-framework/testHelpers"; +import { RequireProperty } from "coral-common/types"; +import { + CoralContext, + CoralContextProvider, +} from "coral-framework/lib/bootstrap"; +import { PostMessageService } from "coral-framework/lib/postMessage"; +import { RestClient } from "coral-framework/lib/rest"; +import { createPromisifiedStorage } from "coral-framework/lib/storage"; +import { createUUIDGenerator } from "coral-framework/testHelpers"; import createFluentBundle from "./createFluentBundle"; import createRelayEnvironment from "./createRelayEnvironment"; @@ -48,7 +51,7 @@ export interface CreateTestRendererParams { logNetwork?: boolean; muteNetworkErrors?: boolean; resolvers?: TestResolvers; - browserInfo?: TalkContext["browserInfo"]; + browserInfo?: CoralContext["browserInfo"]; initLocalState?: ( local: RecordProxy, source: RecordSourceProxy, @@ -78,7 +81,7 @@ export default function createTestRenderer< }, }); - const context: RequireProperty = { + const context: RequireProperty = { relayEnvironment: environment, locales: ["en-US"], localeBundles: [ @@ -104,7 +107,7 @@ export default function createTestRenderer< let testRenderer: ReactTestRenderer; TestRenderer.act(() => { testRenderer = TestRenderer.create( - {element}, + {element}, { createNodeMock } ); }); diff --git a/src/core/client/framework/testHelpers/denormalize.ts b/src/core/client/framework/testHelpers/denormalize.ts index 5af66a39f..fc0da0136 100644 --- a/src/core/client/framework/testHelpers/denormalize.ts +++ b/src/core/client/framework/testHelpers/denormalize.ts @@ -1,4 +1,4 @@ -import { GQLComment, GQLCommentEdge, GQLStory } from "talk-framework/schema"; +import { GQLComment, GQLCommentEdge, GQLStory } from "coral-framework/schema"; import createFixture, { Fixture } from "./createFixture"; diff --git a/src/core/client/framework/types.ts b/src/core/client/framework/types.ts index 6852ca358..350574156 100644 --- a/src/core/client/framework/types.ts +++ b/src/core/client/framework/types.ts @@ -1,5 +1,5 @@ // TODO: (@cvle) Extract useful common types into its own package. -export { Omit, Overwrite, PropTypesOf } from "talk-ui/types"; -export { DeepPartial } from "talk-common/types"; +export { Omit, Overwrite, PropTypesOf } from "coral-ui/types"; +export { DeepPartial } from "coral-common/types"; export type RelayEnumLiteral = keyof T | "%future added value"; diff --git a/src/core/client/framework/utils/modifyQuery.ts b/src/core/client/framework/utils/modifyQuery.ts index ea39c4815..903edc78c 100644 --- a/src/core/client/framework/utils/modifyQuery.ts +++ b/src/core/client/framework/utils/modifyQuery.ts @@ -1,4 +1,4 @@ -import { parseQuery, stringifyQuery } from "talk-common/utils"; +import { parseQuery, stringifyQuery } from "coral-common/utils"; import buildURL from "./buildURL"; import parseURL from "./parseURL"; diff --git a/src/core/client/framework/utils/parseHashQuery.ts b/src/core/client/framework/utils/parseHashQuery.ts index 9fa5616a9..fb7a96b8e 100644 --- a/src/core/client/framework/utils/parseHashQuery.ts +++ b/src/core/client/framework/utils/parseHashQuery.ts @@ -1,4 +1,4 @@ -import { parseQuery } from "talk-common/utils"; +import { parseQuery } from "coral-common/utils"; export default function parseQueryHash( hash: string diff --git a/src/core/client/install/components/Header.tsx b/src/core/client/install/components/Header.tsx index 4582a413c..bbd418ace 100644 --- a/src/core/client/install/components/Header.tsx +++ b/src/core/client/install/components/Header.tsx @@ -2,7 +2,7 @@ import cn from "classnames"; import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; -import { Flex, Typography } from "talk-ui/components"; +import { Flex, Typography } from "coral-ui/components"; import styles from "./Header.css"; @@ -32,7 +32,7 @@ const Header: FunctionComponent = ({ main }) => { })} variant="heading1" > - Talk Installation Wizard + Coral Installation Wizard diff --git a/src/core/client/install/components/MainBar.tsx b/src/core/client/install/components/MainBar.tsx index 01db8d346..80c2e9baa 100644 --- a/src/core/client/install/components/MainBar.tsx +++ b/src/core/client/install/components/MainBar.tsx @@ -1,6 +1,6 @@ import React from "react"; -import { Typography } from "talk-ui/components"; +import { Typography } from "coral-ui/components"; import styles from "./MainBar.css"; @@ -9,7 +9,7 @@ const MainBar = () => {
- Talk + Coral
diff --git a/src/core/client/install/components/Wizard.tsx b/src/core/client/install/components/Wizard.tsx index 0ef9d220b..d840af7ca 100644 --- a/src/core/client/install/components/Wizard.tsx +++ b/src/core/client/install/components/Wizard.tsx @@ -2,7 +2,7 @@ import cn from "classnames"; import { Localized } from "fluent-react/compat"; import React, { Component, ReactNode } from "react"; -import { Step, StepBar } from "talk-ui/components"; +import { Step, StepBar } from "coral-ui/components"; import { WizardProps } from "../components/Wizard"; import Header from "./Header"; diff --git a/src/core/client/install/containers/WizardContainer.tsx b/src/core/client/install/containers/WizardContainer.tsx index ab1476b1e..be6d2bb58 100644 --- a/src/core/client/install/containers/WizardContainer.tsx +++ b/src/core/client/install/containers/WizardContainer.tsx @@ -8,7 +8,7 @@ import AddOrganizationContainer from "../steps/containers/AddOrganizationContain import CreateYourAccountContainer from "../steps/containers/CreateYourAccountContainer"; import PermittedDomainsContainer from "../steps/containers/PermittedDomainsContainer"; -import { InstallInput } from "talk-framework/rest"; +import { InstallInput } from "coral-framework/rest"; interface FormData { organizationName: string; diff --git a/src/core/client/install/index.html b/src/core/client/install/index.html index b2bee43ac..b1854c5a7 100644 --- a/src/core/client/install/index.html +++ b/src/core/client/install/index.html @@ -1,15 +1,13 @@ + + Coral - Install + + + + - - Talk - Install - - - - - - -
- - + +
+ diff --git a/src/core/client/install/index.tsx b/src/core/client/install/index.tsx index 879c7cd7e..ff48364a2 100644 --- a/src/core/client/install/index.tsx +++ b/src/core/client/install/index.tsx @@ -2,24 +2,24 @@ import React from "react"; import { FunctionComponent } from "react"; import ReactDOM from "react-dom"; -import { createManaged } from "talk-framework/lib/bootstrap"; +import { createManaged } from "coral-framework/lib/bootstrap"; import App from "./components/App"; import localesData from "./locales"; // Import css variables. -import "talk-ui/theme/variables.css"; +import "coral-ui/theme/variables.css"; async function main() { - const ManagedTalkContextProvider = await createManaged({ + const ManagedCoralContextProvider = await createManaged({ localesData, userLocales: navigator.languages, }); const Index: FunctionComponent = () => ( - + - + ); ReactDOM.render(, document.getElementById("app")); diff --git a/src/core/client/install/locales.ts b/src/core/client/install/locales.ts index b9c9f16c7..b0f080a61 100644 --- a/src/core/client/install/locales.ts +++ b/src/core/client/install/locales.ts @@ -5,5 +5,5 @@ * This file only represents the types that gets exported. */ -import { LocalesData } from "talk-framework/lib/i18n"; +import { LocalesData } from "coral-framework/lib/i18n"; export default {} as LocalesData; diff --git a/src/core/client/install/mutations/InstallMutation.ts b/src/core/client/install/mutations/InstallMutation.ts index bac3ffac7..67dc873e4 100644 --- a/src/core/client/install/mutations/InstallMutation.ts +++ b/src/core/client/install/mutations/InstallMutation.ts @@ -1,15 +1,15 @@ import { Environment } from "relay-runtime"; -import { TalkContext } from "talk-framework/lib/bootstrap"; -import { createMutationContainer } from "talk-framework/lib/relay"; -import { install, InstallInput } from "talk-framework/rest"; +import { CoralContext } from "coral-framework/lib/bootstrap"; +import { createMutationContainer } from "coral-framework/lib/relay"; +import { install, InstallInput } from "coral-framework/rest"; export type InstallMutation = (input: InstallInput) => Promise; export async function commit( environment: Environment, input: InstallInput, - { rest }: TalkContext + { rest }: CoralContext ) { await install(rest, input); } diff --git a/src/core/client/install/steps/components/AddOrganization.tsx b/src/core/client/install/steps/components/AddOrganization.tsx index d0cc0ae27..d665c2309 100644 --- a/src/core/client/install/steps/components/AddOrganization.tsx +++ b/src/core/client/install/steps/components/AddOrganization.tsx @@ -2,13 +2,13 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; import { Field, Form } from "react-final-form"; -import { OnSubmit } from "talk-framework/lib/form"; +import { OnSubmit } from "coral-framework/lib/form"; import { composeValidators, required, validateEmail, validateURL, -} from "talk-framework/lib/validation"; +} from "coral-framework/lib/validation"; import { CallOut, Flex, @@ -19,7 +19,7 @@ import { TextField, Typography, ValidationMessage, -} from "talk-ui/components"; +} from "coral-ui/components"; import BackButton from "./BackButton"; import NextButton from "./NextButton"; diff --git a/src/core/client/install/steps/components/BackButton.tsx b/src/core/client/install/steps/components/BackButton.tsx index 2430f315a..b0de674a8 100644 --- a/src/core/client/install/steps/components/BackButton.tsx +++ b/src/core/client/install/steps/components/BackButton.tsx @@ -1,7 +1,7 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; -import { Button } from "talk-ui/components"; +import { Button } from "coral-ui/components"; export interface BackButtonProps { submitting: boolean; diff --git a/src/core/client/install/steps/components/CreateYourAccount.tsx b/src/core/client/install/steps/components/CreateYourAccount.tsx index 05e004a04..e541107d6 100644 --- a/src/core/client/install/steps/components/CreateYourAccount.tsx +++ b/src/core/client/install/steps/components/CreateYourAccount.tsx @@ -2,7 +2,7 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; import { Field, Form } from "react-final-form"; -import { OnSubmit } from "talk-framework/lib/form"; +import { OnSubmit } from "coral-framework/lib/form"; import { composeValidators, required, @@ -10,7 +10,7 @@ import { validateEqualPasswords, validatePassword, validateUsername, -} from "talk-framework/lib/validation"; +} from "coral-framework/lib/validation"; import { CallOut, Flex, @@ -21,7 +21,7 @@ import { TextField, Typography, ValidationMessage, -} from "talk-ui/components"; +} from "coral-ui/components"; import NextButton from "./NextButton"; diff --git a/src/core/client/install/steps/components/FinalStep.tsx b/src/core/client/install/steps/components/FinalStep.tsx index 176a98c1f..d8a448d77 100644 --- a/src/core/client/install/steps/components/FinalStep.tsx +++ b/src/core/client/install/steps/components/FinalStep.tsx @@ -1,8 +1,8 @@ import { Localized } from "fluent-react/compat"; import React, { Component } from "react"; -import { urls } from "talk-framework/helpers"; -import { Button, Flex, Typography } from "talk-ui/components"; +import { urls } from "coral-framework/helpers"; +import { Button, Flex, Typography } from "coral-ui/components"; class FinalStep extends Component { public render() { @@ -10,7 +10,7 @@ class FinalStep extends Component { - Thanks for installing Talk! We sent an email to verify your email + Thanks for installing Coral! We sent an email to verify your email address. While you finish setting up the account, you can start engaging with your readers now. diff --git a/src/core/client/install/steps/components/InitialStep.tsx b/src/core/client/install/steps/components/InitialStep.tsx index 2cfe1cb30..932a0aa08 100644 --- a/src/core/client/install/steps/components/InitialStep.tsx +++ b/src/core/client/install/steps/components/InitialStep.tsx @@ -1,7 +1,7 @@ import { Localized } from "fluent-react/compat"; import React, { Component } from "react"; -import { Button, Flex, Typography } from "talk-ui/components"; +import { Button, Flex, Typography } from "coral-ui/components"; interface InitialStepProps { onGoToNextStep: () => void; @@ -13,7 +13,7 @@ class InitialStep extends Component { - The remainder of the Talk installation will take about ten minutes. + The remainder of the Coral installation will take about ten minutes. Once you complete the following three steps, you will have a free installation and provision Mongo and Redis. diff --git a/src/core/client/install/steps/components/NextButton.tsx b/src/core/client/install/steps/components/NextButton.tsx index 5b2d8ee25..66939fd12 100644 --- a/src/core/client/install/steps/components/NextButton.tsx +++ b/src/core/client/install/steps/components/NextButton.tsx @@ -1,7 +1,7 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; -import { Button, ButtonIcon } from "talk-ui/components"; +import { Button, ButtonIcon } from "coral-ui/components"; export interface NextButtonProps { submitting: boolean; diff --git a/src/core/client/install/steps/components/PermittedDomains.tsx b/src/core/client/install/steps/components/PermittedDomains.tsx index 7901ad3b3..5120eb527 100644 --- a/src/core/client/install/steps/components/PermittedDomains.tsx +++ b/src/core/client/install/steps/components/PermittedDomains.tsx @@ -1,7 +1,7 @@ +import { OnSubmit } from "coral-framework/lib/form"; import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; import { Field, Form } from "react-final-form"; -import { OnSubmit } from "talk-framework/lib/form"; import { Button, @@ -14,7 +14,7 @@ import { TextField, Typography, ValidationMessage, -} from "talk-ui/components"; +} from "coral-ui/components"; import BackButton from "./BackButton"; @@ -48,7 +48,7 @@ const PermittedDomains: FunctionComponent = props => { - Enter the domains you would like to permit for Talk, e.g. your + Enter the domains you would like to permit for Coral, e.g. your local, staging and production environments (ex. localhost:3000, staging.domain.com, domain.com). diff --git a/src/core/client/install/steps/containers/AddOrganizationContainer.tsx b/src/core/client/install/steps/containers/AddOrganizationContainer.tsx index 8567381c9..14d6861cf 100644 --- a/src/core/client/install/steps/containers/AddOrganizationContainer.tsx +++ b/src/core/client/install/steps/containers/AddOrganizationContainer.tsx @@ -1,6 +1,6 @@ import React, { Component } from "react"; -import { PropTypesOf } from "talk-ui/types"; +import { PropTypesOf } from "coral-ui/types"; import AddOrganization, { AddOrganizationForm, diff --git a/src/core/client/install/steps/containers/CreateYourAccountContainer.tsx b/src/core/client/install/steps/containers/CreateYourAccountContainer.tsx index ddd1d9e57..946c822b3 100644 --- a/src/core/client/install/steps/containers/CreateYourAccountContainer.tsx +++ b/src/core/client/install/steps/containers/CreateYourAccountContainer.tsx @@ -1,6 +1,6 @@ import React, { Component } from "react"; -import { PropTypesOf } from "talk-ui/types"; +import { PropTypesOf } from "coral-ui/types"; import CreateYourAccount, { CreateYourAccountForm, diff --git a/src/core/client/install/steps/containers/PermittedDomainsContainer.tsx b/src/core/client/install/steps/containers/PermittedDomainsContainer.tsx index 6112b2f10..6ede2b867 100644 --- a/src/core/client/install/steps/containers/PermittedDomainsContainer.tsx +++ b/src/core/client/install/steps/containers/PermittedDomainsContainer.tsx @@ -1,7 +1,7 @@ import { FORM_ERROR } from "final-form"; import React, { Component } from "react"; -import { PropTypesOf } from "talk-ui/types"; +import { PropTypesOf } from "coral-ui/types"; import PermittedDomains, { PermittedDomainsForm, diff --git a/src/core/client/stream/components/App.spec.tsx b/src/core/client/stream/components/App.spec.tsx index 0b2241f71..9dbc205b4 100644 --- a/src/core/client/stream/components/App.spec.tsx +++ b/src/core/client/stream/components/App.spec.tsx @@ -1,7 +1,7 @@ import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import App from "./App"; diff --git a/src/core/client/stream/components/App.tsx b/src/core/client/stream/components/App.tsx index 8e917156f..2d31a59bd 100644 --- a/src/core/client/stream/components/App.tsx +++ b/src/core/client/stream/components/App.tsx @@ -1,7 +1,7 @@ +import TabBarQuery from "coral-stream/queries/TabBarQuery"; +import { HorizontalGutter, TabContent, TabPane } from "coral-ui/components"; import * as React from "react"; import { FunctionComponent } from "react"; -import TabBarQuery from "talk-stream/queries/TabBarQuery"; -import { HorizontalGutter, TabContent, TabPane } from "talk-ui/components"; import CommentsPaneContainer from "../tabs/comments/containers/CommentsPaneContainer"; import ConfigureQuery from "../tabs/configure/queries/ConfigureQuery"; diff --git a/src/core/client/stream/components/CommentCountTab.tsx b/src/core/client/stream/components/CommentCountTab.tsx index d72ce465d..acad74690 100644 --- a/src/core/client/stream/components/CommentCountTab.tsx +++ b/src/core/client/stream/components/CommentCountTab.tsx @@ -1,7 +1,7 @@ +import { Tab } from "coral-ui/components"; +import { PropTypesOf } from "coral-ui/types"; import { Localized } from "fluent-react/compat"; import React, { Component } from "react"; -import { Tab } from "talk-ui/components"; -import { PropTypesOf } from "talk-ui/types"; interface CommentCountTabProps extends PropTypesOf { commentCount: number; diff --git a/src/core/client/stream/components/HTMLContent.css b/src/core/client/stream/components/HTMLContent.css index b5327e5c0..82f89c2a6 100644 --- a/src/core/client/stream/components/HTMLContent.css +++ b/src/core/client/stream/components/HTMLContent.css @@ -1,3 +1,3 @@ .root { - composes: root from "talk-stream/shared/htmlContent.css"; + composes: root from "coral-stream/shared/htmlContent.css"; } diff --git a/src/core/client/stream/components/HTMLContent.tsx b/src/core/client/stream/components/HTMLContent.tsx index 9938e4c5f..4f4018e1c 100644 --- a/src/core/client/stream/components/HTMLContent.tsx +++ b/src/core/client/stream/components/HTMLContent.tsx @@ -1,7 +1,7 @@ import cn from "classnames"; import React, { FunctionComponent } from "react"; -import { createPurify } from "talk-common/utils/purify"; +import { createPurify } from "coral-common/utils/purify"; import styles from "./HTMLContent.css"; diff --git a/src/core/client/stream/components/MessageBox/MessageBox.spec.tsx b/src/core/client/stream/components/MessageBox/MessageBox.spec.tsx index 5b47d98b3..e004c85a8 100644 --- a/src/core/client/stream/components/MessageBox/MessageBox.spec.tsx +++ b/src/core/client/stream/components/MessageBox/MessageBox.spec.tsx @@ -1,7 +1,7 @@ import React from "react"; import TestRenderer from "react-test-renderer"; -import { PropTypesOf } from "talk-ui/types"; +import { PropTypesOf } from "coral-ui/types"; import MessageBox from "./MessageBox"; import MessageBoxIcon from "./MessageBoxIcon"; diff --git a/src/core/client/stream/components/MessageBox/MessageBox.tsx b/src/core/client/stream/components/MessageBox/MessageBox.tsx index d3de5a7ab..49b3afcf9 100644 --- a/src/core/client/stream/components/MessageBox/MessageBox.tsx +++ b/src/core/client/stream/components/MessageBox/MessageBox.tsx @@ -1,6 +1,6 @@ import cn from "classnames"; +import { withStyles } from "coral-ui/hocs"; import React, { FunctionComponent, ReactNode } from "react"; -import { withStyles } from "talk-ui/hocs"; import styles from "./MessageBox.css"; diff --git a/src/core/client/stream/components/MessageBox/MessageBoxContent.css b/src/core/client/stream/components/MessageBox/MessageBoxContent.css index 60ef6f68d..7df99b09e 100644 --- a/src/core/client/stream/components/MessageBox/MessageBoxContent.css +++ b/src/core/client/stream/components/MessageBox/MessageBoxContent.css @@ -1,4 +1,4 @@ .root { - composes: root from "talk-stream/shared/htmlContent.css"; + composes: root from "coral-stream/shared/htmlContent.css"; color: var(--palette-text-light); } diff --git a/src/core/client/stream/components/MessageBox/MessageBoxContent.tsx b/src/core/client/stream/components/MessageBox/MessageBoxContent.tsx index f8d8d3d22..55a2634c6 100644 --- a/src/core/client/stream/components/MessageBox/MessageBoxContent.tsx +++ b/src/core/client/stream/components/MessageBox/MessageBoxContent.tsx @@ -1,8 +1,8 @@ import cn from "classnames"; import React, { FunctionComponent } from "react"; -import { Markdown } from "talk-framework/components"; -import { withStyles } from "talk-ui/hocs"; +import { Markdown } from "coral-framework/components"; +import { withStyles } from "coral-ui/hocs"; import styles from "./MessageBoxContent.css"; diff --git a/src/core/client/stream/components/MessageBox/MessageBoxIcon.tsx b/src/core/client/stream/components/MessageBox/MessageBoxIcon.tsx index 2a3c28452..dd0cef049 100644 --- a/src/core/client/stream/components/MessageBox/MessageBoxIcon.tsx +++ b/src/core/client/stream/components/MessageBox/MessageBoxIcon.tsx @@ -1,9 +1,9 @@ import cn from "classnames"; import React, { FunctionComponent, HTMLAttributes, Ref } from "react"; -import Icon, { IconProps } from "talk-ui/components/Icon"; -import { withForwardRef, withStyles } from "talk-ui/hocs"; -import { Omit } from "talk-ui/types"; +import Icon, { IconProps } from "coral-ui/components/Icon"; +import { withForwardRef, withStyles } from "coral-ui/hocs"; +import { Omit } from "coral-ui/types"; import styles from "./MessageBoxIcon.css"; diff --git a/src/core/client/stream/components/TabBar.tsx b/src/core/client/stream/components/TabBar.tsx index bd3f69364..78e65a18f 100644 --- a/src/core/client/stream/components/TabBar.tsx +++ b/src/core/client/stream/components/TabBar.tsx @@ -1,7 +1,7 @@ +import { Icon, MatchMedia, Tab, TabBar } from "coral-ui/components"; import { Localized } from "fluent-react/compat"; import * as React from "react"; import { FunctionComponent } from "react"; -import { Icon, MatchMedia, Tab, TabBar } from "talk-ui/components"; type TabValue = "COMMENTS" | "PROFILE" | "%future added value"; diff --git a/src/core/client/stream/components/Timestamp.css b/src/core/client/stream/components/Timestamp.css index f2d263ad4..bf1e3bafe 100644 --- a/src/core/client/stream/components/Timestamp.css +++ b/src/core/client/stream/components/Timestamp.css @@ -1,3 +1,3 @@ .root { - composes: timestamp from "talk-ui/shared/typography.css"; + composes: timestamp from "coral-ui/shared/typography.css"; } diff --git a/src/core/client/stream/components/Timestamp.spec.tsx b/src/core/client/stream/components/Timestamp.spec.tsx index 5cc93c1f0..a17e264dd 100644 --- a/src/core/client/stream/components/Timestamp.spec.tsx +++ b/src/core/client/stream/components/Timestamp.spec.tsx @@ -1,7 +1,7 @@ import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import Timestamp from "./Timestamp"; diff --git a/src/core/client/stream/components/Timestamp.tsx b/src/core/client/stream/components/Timestamp.tsx index 866e7f7d1..54f8c5461 100644 --- a/src/core/client/stream/components/Timestamp.tsx +++ b/src/core/client/stream/components/Timestamp.tsx @@ -1,7 +1,7 @@ import React from "react"; import { FunctionComponent } from "react"; -import { RelativeTime } from "talk-ui/components"; +import { RelativeTime } from "coral-ui/components"; import styles from "./Timestamp.css"; diff --git a/src/core/client/stream/components/UserBoxAuthenticated.spec.tsx b/src/core/client/stream/components/UserBoxAuthenticated.spec.tsx index d901eec04..03374edc7 100644 --- a/src/core/client/stream/components/UserBoxAuthenticated.spec.tsx +++ b/src/core/client/stream/components/UserBoxAuthenticated.spec.tsx @@ -2,7 +2,7 @@ import { noop } from "lodash"; import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import UserBoxAuthenticated from "./UserBoxAuthenticated"; diff --git a/src/core/client/stream/components/UserBoxAuthenticated.tsx b/src/core/client/stream/components/UserBoxAuthenticated.tsx index 82a12515c..ea619c69f 100644 --- a/src/core/client/stream/components/UserBoxAuthenticated.tsx +++ b/src/core/client/stream/components/UserBoxAuthenticated.tsx @@ -1,7 +1,7 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; -import { Button, Flex, Typography } from "talk-ui/components"; +import { Button, Flex, Typography } from "coral-ui/components"; export interface UserBoxAuthenticatedProps { onSignOut?: () => void; diff --git a/src/core/client/stream/components/UserBoxUnauthenticated.spec.tsx b/src/core/client/stream/components/UserBoxUnauthenticated.spec.tsx index 3a2d1d1ae..32dcf2f75 100644 --- a/src/core/client/stream/components/UserBoxUnauthenticated.spec.tsx +++ b/src/core/client/stream/components/UserBoxUnauthenticated.spec.tsx @@ -2,7 +2,7 @@ import { noop } from "lodash"; import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import UserBoxUnauthenticated from "./UserBoxUnauthenticated"; diff --git a/src/core/client/stream/components/UserBoxUnauthenticated.tsx b/src/core/client/stream/components/UserBoxUnauthenticated.tsx index 102d50f34..644a74253 100644 --- a/src/core/client/stream/components/UserBoxUnauthenticated.tsx +++ b/src/core/client/stream/components/UserBoxUnauthenticated.tsx @@ -1,8 +1,8 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; -import { Button, Flex, Typography } from "talk-ui/components"; -import MatchMedia from "talk-ui/components/MatchMedia"; +import { Button, Flex, Typography } from "coral-ui/components"; +import MatchMedia from "coral-ui/components/MatchMedia"; import styles from "./UserBoxUnauthenticated.css"; diff --git a/src/core/client/stream/containers/AppContainer.tsx b/src/core/client/stream/containers/AppContainer.tsx index 81e167774..f4124e864 100644 --- a/src/core/client/stream/containers/AppContainer.tsx +++ b/src/core/client/stream/containers/AppContainer.tsx @@ -1,7 +1,7 @@ import React from "react"; -import { graphql, withLocalStateContainer } from "talk-framework/lib/relay"; -import { AppContainerLocal as Local } from "talk-stream/__generated__/AppContainerLocal.graphql"; +import { graphql, withLocalStateContainer } from "coral-framework/lib/relay"; +import { AppContainerLocal as Local } from "coral-stream/__generated__/AppContainerLocal.graphql"; import App from "../components/App"; diff --git a/src/core/client/stream/containers/StoryClosedTimeoutContainer.tsx b/src/core/client/stream/containers/StoryClosedTimeoutContainer.tsx index 731ead9c9..a63b18471 100644 --- a/src/core/client/stream/containers/StoryClosedTimeoutContainer.tsx +++ b/src/core/client/stream/containers/StoryClosedTimeoutContainer.tsx @@ -1,12 +1,12 @@ import React from "react"; -import { graphql, withFragmentContainer } from "talk-framework/lib/relay"; +import { graphql, withFragmentContainer } from "coral-framework/lib/relay"; -import { StoryClosedTimeoutContainer_story as StoryData } from "talk-stream/__generated__/StoryClosedTimeoutContainer_story.graphql"; +import { StoryClosedTimeoutContainer_story as StoryData } from "coral-stream/__generated__/StoryClosedTimeoutContainer_story.graphql"; import { SetStoryClosedMutation, withSetStoryClosedMutation, -} from "talk-stream/mutations"; +} from "coral-stream/mutations"; interface Props { story: StoryData; diff --git a/src/core/client/stream/containers/TabBarContainer.tsx b/src/core/client/stream/containers/TabBarContainer.tsx index 1de035a0a..f3950c3bd 100644 --- a/src/core/client/stream/containers/TabBarContainer.tsx +++ b/src/core/client/stream/containers/TabBarContainer.tsx @@ -5,18 +5,18 @@ import { graphql, withFragmentContainer, withLocalStateContainer, -} from "talk-framework/lib/relay"; +} from "coral-framework/lib/relay"; -import { TabBarContainer_story as StoryData } from "talk-stream/__generated__/TabBarContainer_story.graphql"; -import { TabBarContainer_viewer as ViewerData } from "talk-stream/__generated__/TabBarContainer_viewer.graphql"; -import { TabBarContainerLocal as Local } from "talk-stream/__generated__/TabBarContainerLocal.graphql"; +import { TabBarContainer_story as StoryData } from "coral-stream/__generated__/TabBarContainer_story.graphql"; +import { TabBarContainer_viewer as ViewerData } from "coral-stream/__generated__/TabBarContainer_viewer.graphql"; +import { TabBarContainerLocal as Local } from "coral-stream/__generated__/TabBarContainerLocal.graphql"; import { SetActiveTabInput, SetActiveTabMutation, withSetActiveTabMutation, -} from "talk-stream/mutations"; +} from "coral-stream/mutations"; -import { Ability, can } from "talk-stream/permissions"; +import { Ability, can } from "coral-stream/permissions"; import TabBar from "../components/TabBar"; interface Props { diff --git a/src/core/client/stream/containers/UserBoxContainer.spec.tsx b/src/core/client/stream/containers/UserBoxContainer.spec.tsx index 4860a74c8..0bffcf8a7 100644 --- a/src/core/client/stream/containers/UserBoxContainer.spec.tsx +++ b/src/core/client/stream/containers/UserBoxContainer.spec.tsx @@ -1,8 +1,8 @@ import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { removeFragmentRefs } from "talk-framework/testHelpers"; -import { PropTypesOf } from "talk-framework/types"; +import { removeFragmentRefs } from "coral-framework/testHelpers"; +import { PropTypesOf } from "coral-framework/types"; import { UserBoxContainer } from "./UserBoxContainer"; diff --git a/src/core/client/stream/containers/UserBoxContainer.tsx b/src/core/client/stream/containers/UserBoxContainer.tsx index e4f9c89dd..a9b1ec599 100644 --- a/src/core/client/stream/containers/UserBoxContainer.tsx +++ b/src/core/client/stream/containers/UserBoxContainer.tsx @@ -5,21 +5,24 @@ import { graphql, withFragmentContainer, withLocalStateContainer, -} from "talk-framework/lib/relay"; -import { SignOutMutation, withSignOutMutation } from "talk-framework/mutations"; -import { UserBoxContainer_settings as SettingsData } from "talk-stream/__generated__/UserBoxContainer_settings.graphql"; -import { UserBoxContainer_viewer as ViewerData } from "talk-stream/__generated__/UserBoxContainer_viewer.graphql"; -import { UserBoxContainerLocal as Local } from "talk-stream/__generated__/UserBoxContainerLocal.graphql"; -import UserBoxUnauthenticated from "talk-stream/components/UserBoxUnauthenticated"; +} from "coral-framework/lib/relay"; +import { + SignOutMutation, + withSignOutMutation, +} from "coral-framework/mutations"; +import { UserBoxContainer_settings as SettingsData } from "coral-stream/__generated__/UserBoxContainer_settings.graphql"; +import { UserBoxContainer_viewer as ViewerData } from "coral-stream/__generated__/UserBoxContainer_viewer.graphql"; +import { UserBoxContainerLocal as Local } from "coral-stream/__generated__/UserBoxContainerLocal.graphql"; +import UserBoxUnauthenticated from "coral-stream/components/UserBoxUnauthenticated"; import { SetAuthPopupStateMutation, ShowAuthPopupMutation, withSetAuthPopupStateMutation, withShowAuthPopupMutation, -} from "talk-stream/mutations"; -import { Popup } from "talk-ui/components"; +} from "coral-stream/mutations"; +import { Popup } from "coral-ui/components"; -import { urls } from "talk-framework/helpers"; +import { urls } from "coral-framework/helpers"; import UserBoxAuthenticated from "../components/UserBoxAuthenticated"; interface Props { @@ -89,7 +92,7 @@ export class UserBoxContainer extends Component { <> + + Coral - Stream + + + + - - Talk - Stream - - - - - - -
- - + +
+ diff --git a/src/core/client/stream/index.tsx b/src/core/client/stream/index.tsx index ee7cb7029..033550a12 100644 --- a/src/core/client/stream/index.tsx +++ b/src/core/client/stream/index.tsx @@ -3,8 +3,8 @@ import React from "react"; import { FunctionComponent } from "react"; import ReactDOM from "react-dom"; -import { createManaged } from "talk-framework/lib/bootstrap"; -import AppContainer from "talk-stream/containers/AppContainer"; +import { createManaged } from "coral-framework/lib/bootstrap"; +import AppContainer from "coral-stream/containers/AppContainer"; import { OnEvents, @@ -17,7 +17,7 @@ import { initLocalState } from "./local"; import localesData from "./locales"; // Import css variables. -import "talk-ui/theme/variables.css"; +import "coral-ui/theme/variables.css"; const listeners = ( <> @@ -30,7 +30,7 @@ const listeners = ( ); async function main() { - const ManagedTalkContextProvider = await createManaged({ + const ManagedCoralContextProvider = await createManaged({ initLocalState, localesData, userLocales: navigator.languages, @@ -38,12 +38,12 @@ async function main() { }); const Index: FunctionComponent = () => ( - + <> {listeners} - + ); ReactDOM.render(, document.getElementById("app")); diff --git a/src/core/client/stream/listeners/OnEvents.spec.tsx b/src/core/client/stream/listeners/OnEvents.spec.tsx index d1faab561..bcf954d95 100644 --- a/src/core/client/stream/listeners/OnEvents.spec.tsx +++ b/src/core/client/stream/listeners/OnEvents.spec.tsx @@ -1,7 +1,7 @@ import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { createSinonStub } from "talk-framework/testHelpers"; +import { createSinonStub } from "coral-framework/testHelpers"; import { OnEvents } from "./OnEvents"; diff --git a/src/core/client/stream/listeners/OnEvents.tsx b/src/core/client/stream/listeners/OnEvents.tsx index 18a58cb01..2e9000a6b 100644 --- a/src/core/client/stream/listeners/OnEvents.tsx +++ b/src/core/client/stream/listeners/OnEvents.tsx @@ -1,10 +1,10 @@ import { Component } from "react"; -import { TalkContext, withContext } from "talk-framework/lib/bootstrap"; +import { CoralContext, withContext } from "coral-framework/lib/bootstrap"; interface Props { - pym: TalkContext["pym"]; - eventEmitter: TalkContext["eventEmitter"]; + pym: CoralContext["pym"]; + eventEmitter: CoralContext["eventEmitter"]; } export class OnEvents extends Component { diff --git a/src/core/client/stream/listeners/OnPostMessageSetAccessToken.spec.tsx b/src/core/client/stream/listeners/OnPostMessageSetAccessToken.spec.tsx index c51b4ff28..a59962b61 100644 --- a/src/core/client/stream/listeners/OnPostMessageSetAccessToken.spec.tsx +++ b/src/core/client/stream/listeners/OnPostMessageSetAccessToken.spec.tsx @@ -1,7 +1,7 @@ import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { createSinonStub } from "talk-framework/testHelpers"; +import { createSinonStub } from "coral-framework/testHelpers"; import { OnPostMessageSetAccessToken } from "./OnPostMessageSetAccessToken"; diff --git a/src/core/client/stream/listeners/OnPostMessageSetAccessToken.ts b/src/core/client/stream/listeners/OnPostMessageSetAccessToken.ts index c5e458309..975041714 100644 --- a/src/core/client/stream/listeners/OnPostMessageSetAccessToken.ts +++ b/src/core/client/stream/listeners/OnPostMessageSetAccessToken.ts @@ -1,11 +1,11 @@ import { Component } from "react"; -import { TalkContext, withContext } from "talk-framework/lib/bootstrap"; -import { MutationProp, withMutation } from "talk-framework/lib/relay"; -import { SetAccessTokenMutation } from "talk-framework/mutations"; +import { CoralContext, withContext } from "coral-framework/lib/bootstrap"; +import { MutationProp, withMutation } from "coral-framework/lib/relay"; +import { SetAccessTokenMutation } from "coral-framework/mutations"; interface Props { - postMessage: TalkContext["postMessage"]; + postMessage: CoralContext["postMessage"]; setAccessToken: MutationProp; } diff --git a/src/core/client/stream/listeners/OnPymLogin.spec.tsx b/src/core/client/stream/listeners/OnPymLogin.spec.tsx index a61b4a035..f9f5e4c97 100644 --- a/src/core/client/stream/listeners/OnPymLogin.spec.tsx +++ b/src/core/client/stream/listeners/OnPymLogin.spec.tsx @@ -1,7 +1,7 @@ import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { createSinonStub } from "talk-framework/testHelpers"; +import { createSinonStub } from "coral-framework/testHelpers"; import { OnPymLogin } from "./OnPymLogin"; diff --git a/src/core/client/stream/listeners/OnPymLogin.ts b/src/core/client/stream/listeners/OnPymLogin.ts index 61890664c..04008b74f 100644 --- a/src/core/client/stream/listeners/OnPymLogin.ts +++ b/src/core/client/stream/listeners/OnPymLogin.ts @@ -1,9 +1,9 @@ import { Child } from "pym.js"; import { Component } from "react"; -import { withContext } from "talk-framework/lib/bootstrap"; -import { MutationProp, withMutation } from "talk-framework/lib/relay"; -import { SetAccessTokenMutation } from "talk-framework/mutations"; +import { withContext } from "coral-framework/lib/bootstrap"; +import { MutationProp, withMutation } from "coral-framework/lib/relay"; +import { SetAccessTokenMutation } from "coral-framework/mutations"; interface Props { pym: Child; diff --git a/src/core/client/stream/listeners/OnPymLogout.ts b/src/core/client/stream/listeners/OnPymLogout.ts index 8775603d1..04f0a086e 100644 --- a/src/core/client/stream/listeners/OnPymLogout.ts +++ b/src/core/client/stream/listeners/OnPymLogout.ts @@ -1,8 +1,11 @@ +import { + SignOutMutation, + withSignOutMutation, +} from "coral-framework/mutations"; import { Child } from "pym.js"; import { Component } from "react"; -import { SignOutMutation, withSignOutMutation } from "talk-framework/mutations"; -import { withContext } from "talk-framework/lib/bootstrap"; +import { withContext } from "coral-framework/lib/bootstrap"; interface Props { pym: Child; diff --git a/src/core/client/stream/listeners/OnPymSetCommentID.spec.tsx b/src/core/client/stream/listeners/OnPymSetCommentID.spec.tsx index 0cc8f7938..7c6ed522a 100644 --- a/src/core/client/stream/listeners/OnPymSetCommentID.spec.tsx +++ b/src/core/client/stream/listeners/OnPymSetCommentID.spec.tsx @@ -2,9 +2,9 @@ import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; import { Environment, RecordSource } from "relay-runtime"; -import { parseQuery } from "talk-common/utils"; -import { LOCAL_ID } from "talk-framework/lib/relay"; -import { createRelayEnvironment } from "talk-framework/testHelpers"; +import { parseQuery } from "coral-common/utils"; +import { LOCAL_ID } from "coral-framework/lib/relay"; +import { createRelayEnvironment } from "coral-framework/testHelpers"; import { OnPymSetCommentID } from "./OnPymSetCommentID"; diff --git a/src/core/client/stream/listeners/OnPymSetCommentID.ts b/src/core/client/stream/listeners/OnPymSetCommentID.ts index 1c485f113..5c20bb3ff 100644 --- a/src/core/client/stream/listeners/OnPymSetCommentID.ts +++ b/src/core/client/stream/listeners/OnPymSetCommentID.ts @@ -3,9 +3,9 @@ import { Component } from "react"; import { commitLocalUpdate } from "react-relay"; import { Environment } from "relay-runtime"; -import { getURLWithCommentID } from "talk-framework/helpers"; -import { withContext } from "talk-framework/lib/bootstrap"; -import { LOCAL_ID } from "talk-framework/lib/relay"; +import { getURLWithCommentID } from "coral-framework/helpers"; +import { withContext } from "coral-framework/lib/bootstrap"; +import { LOCAL_ID } from "coral-framework/lib/relay"; interface Props { relayEnvironment: Environment; diff --git a/src/core/client/stream/local/initLocalState.spec.ts b/src/core/client/stream/local/initLocalState.spec.ts index 0dee67816..3840834a3 100644 --- a/src/core/client/stream/local/initLocalState.spec.ts +++ b/src/core/client/stream/local/initLocalState.spec.ts @@ -1,14 +1,14 @@ import { Environment, RecordSource } from "relay-runtime"; -import { timeout } from "talk-common/utils"; -import { TalkContext } from "talk-framework/lib/bootstrap"; -import { LOCAL_ID } from "talk-framework/lib/relay"; -import { createPromisifiedStorage } from "talk-framework/lib/storage"; +import { timeout } from "coral-common/utils"; +import { CoralContext } from "coral-framework/lib/bootstrap"; +import { LOCAL_ID } from "coral-framework/lib/relay"; +import { createPromisifiedStorage } from "coral-framework/lib/storage"; import { createAccessToken, createRelayEnvironment, replaceHistoryLocation, -} from "talk-framework/testHelpers"; +} from "coral-framework/testHelpers"; import initLocalState from "./initLocalState"; @@ -24,7 +24,7 @@ beforeEach(() => { }); it("init local state", async () => { - const context: Partial = { + const context: Partial = { localStorage: createPromisifiedStorage(), }; await initLocalState(environment, context as any); @@ -33,7 +33,7 @@ it("init local state", async () => { }); it("set storyID from query", async () => { - const context: Partial = { + const context: Partial = { localStorage: createPromisifiedStorage(), }; const storyID = "story-id"; @@ -46,7 +46,7 @@ it("set storyID from query", async () => { }); it("set commentID from query", async () => { - const context: Partial = { + const context: Partial = { localStorage: createPromisifiedStorage(), }; const commentID = "comment-id"; @@ -59,7 +59,7 @@ it("set commentID from query", async () => { }); it("set accessToken from localStorage", async () => { - const context: Partial = { + const context: Partial = { localStorage: createPromisifiedStorage(), }; const accessToken = createAccessToken(); diff --git a/src/core/client/stream/local/initLocalState.ts b/src/core/client/stream/local/initLocalState.ts index 8cb0a0fd7..a24480216 100644 --- a/src/core/client/stream/local/initLocalState.ts +++ b/src/core/client/stream/local/initLocalState.ts @@ -1,9 +1,9 @@ import { commitLocalUpdate, Environment } from "relay-runtime"; -import { parseQuery } from "talk-common/utils"; -import { TalkContext } from "talk-framework/lib/bootstrap"; -import { getExternalConfig } from "talk-framework/lib/externalConfig"; -import { createAndRetain, initLocalBaseState } from "talk-framework/lib/relay"; +import { parseQuery } from "coral-common/utils"; +import { CoralContext } from "coral-framework/lib/bootstrap"; +import { getExternalConfig } from "coral-framework/lib/externalConfig"; +import { createAndRetain, initLocalBaseState } from "coral-framework/lib/relay"; import { AUTH_POPUP_ID, AUTH_POPUP_TYPE } from "./constants"; @@ -12,7 +12,7 @@ import { AUTH_POPUP_ID, AUTH_POPUP_TYPE } from "./constants"; */ export default async function initLocalState( environment: Environment, - context: TalkContext + context: CoralContext ) { const config = await getExternalConfig(context.pym); await initLocalBaseState( diff --git a/src/core/client/stream/locales.ts b/src/core/client/stream/locales.ts index b9c9f16c7..b0f080a61 100644 --- a/src/core/client/stream/locales.ts +++ b/src/core/client/stream/locales.ts @@ -5,5 +5,5 @@ * This file only represents the types that gets exported. */ -import { LocalesData } from "talk-framework/lib/i18n"; +import { LocalesData } from "coral-framework/lib/i18n"; export default {} as LocalesData; diff --git a/src/core/client/stream/mutations/CloseStoryMutation.ts b/src/core/client/stream/mutations/CloseStoryMutation.ts index 5f1729a56..6fcbb569b 100644 --- a/src/core/client/stream/mutations/CloseStoryMutation.ts +++ b/src/core/client/stream/mutations/CloseStoryMutation.ts @@ -6,9 +6,9 @@ import { createMutationContainer, MutationInput, MutationResponsePromise, -} from "talk-framework/lib/relay"; +} from "coral-framework/lib/relay"; -import { CloseStoryMutation as MutationTypes } from "talk-stream/__generated__/CloseStoryMutation.graphql"; +import { CloseStoryMutation as MutationTypes } from "coral-stream/__generated__/CloseStoryMutation.graphql"; export type CloseStoryInput = MutationInput; diff --git a/src/core/client/stream/mutations/CreateCommentDontAgreeMutation.ts b/src/core/client/stream/mutations/CreateCommentDontAgreeMutation.ts index 0339481f2..7356e9d47 100644 --- a/src/core/client/stream/mutations/CreateCommentDontAgreeMutation.ts +++ b/src/core/client/stream/mutations/CreateCommentDontAgreeMutation.ts @@ -7,9 +7,9 @@ import { createMutationContainer, MutationInput, MutationResponsePromise, -} from "talk-framework/lib/relay"; +} from "coral-framework/lib/relay"; -import { CreateCommentDontAgreeMutation as MutationTypes } from "talk-stream/__generated__/CreateCommentDontAgreeMutation.graphql"; +import { CreateCommentDontAgreeMutation as MutationTypes } from "coral-stream/__generated__/CreateCommentDontAgreeMutation.graphql"; export type CreateCommentDontAgreeInput = MutationInput; diff --git a/src/core/client/stream/mutations/CreateCommentFlagMutation.ts b/src/core/client/stream/mutations/CreateCommentFlagMutation.ts index a35f4f105..258279461 100644 --- a/src/core/client/stream/mutations/CreateCommentFlagMutation.ts +++ b/src/core/client/stream/mutations/CreateCommentFlagMutation.ts @@ -7,9 +7,9 @@ import { createMutationContainer, MutationInput, MutationResponsePromise, -} from "talk-framework/lib/relay"; +} from "coral-framework/lib/relay"; -import { CreateCommentFlagMutation as MutationTypes } from "talk-stream/__generated__/CreateCommentFlagMutation.graphql"; +import { CreateCommentFlagMutation as MutationTypes } from "coral-stream/__generated__/CreateCommentFlagMutation.graphql"; export type CreateCommentFlagInput = MutationInput; diff --git a/src/core/client/stream/mutations/CreateCommentMutation.ts b/src/core/client/stream/mutations/CreateCommentMutation.ts index d974771f8..5c35955d4 100644 --- a/src/core/client/stream/mutations/CreateCommentMutation.ts +++ b/src/core/client/stream/mutations/CreateCommentMutation.ts @@ -6,17 +6,17 @@ import { RecordSourceSelectorProxy, } from "relay-runtime"; -import { getViewer } from "talk-framework/helpers"; -import { TalkContext } from "talk-framework/lib/bootstrap"; +import { getViewer } from "coral-framework/helpers"; +import { CoralContext } from "coral-framework/lib/bootstrap"; import { commitMutationPromiseNormalized, createMutationContainer, lookup, MutationInput, MutationResponsePromise, -} from "talk-framework/lib/relay"; -import { GQLStory, GQLUSER_ROLE } from "talk-framework/schema"; -import { CreateCommentMutation as MutationTypes } from "talk-stream/__generated__/CreateCommentMutation.graphql"; +} from "coral-framework/lib/relay"; +import { GQLStory, GQLUSER_ROLE } from "coral-framework/schema"; +import { CreateCommentMutation as MutationTypes } from "coral-stream/__generated__/CreateCommentMutation.graphql"; import { incrementStoryCommentCounts, @@ -106,7 +106,7 @@ let clientMutationId = 0; function commit( environment: Environment, input: CreateCommentInput, - { uuidGenerator, relayEnvironment }: TalkContext + { uuidGenerator, relayEnvironment }: CoralContext ) { const me = getViewer(environment)!; const currentDate = new Date().toISOString(); diff --git a/src/core/client/stream/mutations/CreateCommentReactionMutation.ts b/src/core/client/stream/mutations/CreateCommentReactionMutation.ts index 90b6b6282..f4bbd419a 100644 --- a/src/core/client/stream/mutations/CreateCommentReactionMutation.ts +++ b/src/core/client/stream/mutations/CreateCommentReactionMutation.ts @@ -7,9 +7,9 @@ import { createMutationContainer, MutationInput, MutationResponsePromise, -} from "talk-framework/lib/relay"; +} from "coral-framework/lib/relay"; -import { CreateCommentReactionMutation as MutationTypes } from "talk-stream/__generated__/CreateCommentReactionMutation.graphql"; +import { CreateCommentReactionMutation as MutationTypes } from "coral-stream/__generated__/CreateCommentReactionMutation.graphql"; export type CreateCommentReactionInput = MutationInput; diff --git a/src/core/client/stream/mutations/CreateCommentReplyMutation.ts b/src/core/client/stream/mutations/CreateCommentReplyMutation.ts index f87458ba4..98a8c153b 100644 --- a/src/core/client/stream/mutations/CreateCommentReplyMutation.ts +++ b/src/core/client/stream/mutations/CreateCommentReplyMutation.ts @@ -6,17 +6,17 @@ import { RecordSourceSelectorProxy, } from "relay-runtime"; -import { getViewer } from "talk-framework/helpers"; -import { TalkContext } from "talk-framework/lib/bootstrap"; +import { getViewer } from "coral-framework/helpers"; +import { CoralContext } from "coral-framework/lib/bootstrap"; import { commitMutationPromiseNormalized, createMutationContainer, lookup, MutationInput, MutationResponsePromise, -} from "talk-framework/lib/relay"; -import { GQLStory, GQLUSER_ROLE } from "talk-framework/schema"; -import { CreateCommentReplyMutation as MutationTypes } from "talk-stream/__generated__/CreateCommentReplyMutation.graphql"; +} from "coral-framework/lib/relay"; +import { GQLStory, GQLUSER_ROLE } from "coral-framework/schema"; +import { CreateCommentReplyMutation as MutationTypes } from "coral-stream/__generated__/CreateCommentReplyMutation.graphql"; import { incrementStoryCommentCounts, @@ -133,7 +133,7 @@ let clientMutationId = 0; function commit( environment: Environment, input: CreateCommentReplyInput, - { uuidGenerator, relayEnvironment }: TalkContext + { uuidGenerator, relayEnvironment }: CoralContext ) { const viewer = getViewer(environment)!; const currentDate = new Date().toISOString(); diff --git a/src/core/client/stream/mutations/EditCommentMutation.ts b/src/core/client/stream/mutations/EditCommentMutation.ts index 83cca5715..0b21e2c85 100644 --- a/src/core/client/stream/mutations/EditCommentMutation.ts +++ b/src/core/client/stream/mutations/EditCommentMutation.ts @@ -7,9 +7,9 @@ import { createMutationContainer, MutationInput, MutationResponsePromise, -} from "talk-framework/lib/relay"; +} from "coral-framework/lib/relay"; -import { EditCommentMutation as MutationTypes } from "talk-stream/__generated__/EditCommentMutation.graphql"; +import { EditCommentMutation as MutationTypes } from "coral-stream/__generated__/EditCommentMutation.graphql"; export type EditCommentInput = MutationInput; diff --git a/src/core/client/stream/mutations/OpenStoryMutation.ts b/src/core/client/stream/mutations/OpenStoryMutation.ts index 5d808c654..ea60bd7cf 100644 --- a/src/core/client/stream/mutations/OpenStoryMutation.ts +++ b/src/core/client/stream/mutations/OpenStoryMutation.ts @@ -6,9 +6,9 @@ import { createMutationContainer, MutationInput, MutationResponsePromise, -} from "talk-framework/lib/relay"; +} from "coral-framework/lib/relay"; -import { OpenStoryMutation as MutationTypes } from "talk-stream/__generated__/OpenStoryMutation.graphql"; +import { OpenStoryMutation as MutationTypes } from "coral-stream/__generated__/OpenStoryMutation.graphql"; export type OpenStoryInput = MutationInput; diff --git a/src/core/client/stream/mutations/RemoveCommentReactionMutation.ts b/src/core/client/stream/mutations/RemoveCommentReactionMutation.ts index d57278b04..94804cf50 100644 --- a/src/core/client/stream/mutations/RemoveCommentReactionMutation.ts +++ b/src/core/client/stream/mutations/RemoveCommentReactionMutation.ts @@ -7,9 +7,9 @@ import { createMutationContainer, MutationInput, MutationResponsePromise, -} from "talk-framework/lib/relay"; +} from "coral-framework/lib/relay"; -import { RemoveCommentReactionMutation as MutationTypes } from "talk-stream/__generated__/RemoveCommentReactionMutation.graphql"; +import { RemoveCommentReactionMutation as MutationTypes } from "coral-stream/__generated__/RemoveCommentReactionMutation.graphql"; export type RemoveCommentReactionInput = MutationInput; diff --git a/src/core/client/stream/mutations/SetActiveTabMutation.spec.ts b/src/core/client/stream/mutations/SetActiveTabMutation.spec.ts index d91b8aa68..b571e8beb 100644 --- a/src/core/client/stream/mutations/SetActiveTabMutation.spec.ts +++ b/src/core/client/stream/mutations/SetActiveTabMutation.spec.ts @@ -1,7 +1,7 @@ import { Environment, RecordSource } from "relay-runtime"; -import { LOCAL_ID } from "talk-framework/lib/relay"; -import { createRelayEnvironment } from "talk-framework/testHelpers"; +import { LOCAL_ID } from "coral-framework/lib/relay"; +import { createRelayEnvironment } from "coral-framework/testHelpers"; import { commit } from "./SetActiveTabMutation"; diff --git a/src/core/client/stream/mutations/SetActiveTabMutation.ts b/src/core/client/stream/mutations/SetActiveTabMutation.ts index e7e742042..cc7740bbf 100644 --- a/src/core/client/stream/mutations/SetActiveTabMutation.ts +++ b/src/core/client/stream/mutations/SetActiveTabMutation.ts @@ -1,6 +1,6 @@ import { commitLocalUpdate, Environment } from "relay-runtime"; -import { createMutationContainer, LOCAL_ID } from "talk-framework/lib/relay"; +import { createMutationContainer, LOCAL_ID } from "coral-framework/lib/relay"; export interface SetActiveTabInput { tab: "COMMENTS" | "PROFILE" | "%future added value"; diff --git a/src/core/client/stream/mutations/SetAuthPopupStateMutation.spec.ts b/src/core/client/stream/mutations/SetAuthPopupStateMutation.spec.ts index 2e03b736c..8c234a10c 100644 --- a/src/core/client/stream/mutations/SetAuthPopupStateMutation.spec.ts +++ b/src/core/client/stream/mutations/SetAuthPopupStateMutation.spec.ts @@ -1,6 +1,6 @@ import { Environment, RecordSource } from "relay-runtime"; -import { createRelayEnvironment } from "talk-framework/testHelpers"; +import { createRelayEnvironment } from "coral-framework/testHelpers"; import { AUTH_POPUP_ID, AUTH_POPUP_TYPE } from "../local"; import { commit } from "./SetAuthPopupStateMutation"; diff --git a/src/core/client/stream/mutations/SetAuthPopupStateMutation.ts b/src/core/client/stream/mutations/SetAuthPopupStateMutation.ts index f3984a69a..93e5aedb2 100644 --- a/src/core/client/stream/mutations/SetAuthPopupStateMutation.ts +++ b/src/core/client/stream/mutations/SetAuthPopupStateMutation.ts @@ -1,6 +1,6 @@ import { commitLocalUpdate, Environment } from "relay-runtime"; -import { createMutationContainer } from "talk-framework/lib/relay"; +import { createMutationContainer } from "coral-framework/lib/relay"; import { AUTH_POPUP_ID } from "../local"; diff --git a/src/core/client/stream/mutations/SetCommentIDMutation.spec.ts b/src/core/client/stream/mutations/SetCommentIDMutation.spec.ts index 69db29381..54b20866d 100644 --- a/src/core/client/stream/mutations/SetCommentIDMutation.spec.ts +++ b/src/core/client/stream/mutations/SetCommentIDMutation.spec.ts @@ -1,10 +1,10 @@ import { Environment, RecordSource } from "relay-runtime"; import sinon from "sinon"; -import { timeout } from "talk-common/utils"; -import { parseQuery } from "talk-common/utils"; -import { LOCAL_ID } from "talk-framework/lib/relay"; -import { createRelayEnvironment } from "talk-framework/testHelpers"; +import { timeout } from "coral-common/utils"; +import { parseQuery } from "coral-common/utils"; +import { LOCAL_ID } from "coral-framework/lib/relay"; +import { createRelayEnvironment } from "coral-framework/testHelpers"; import { commit } from "./SetCommentIDMutation"; diff --git a/src/core/client/stream/mutations/SetCommentIDMutation.ts b/src/core/client/stream/mutations/SetCommentIDMutation.ts index 5bf668f1f..96e5dd97d 100644 --- a/src/core/client/stream/mutations/SetCommentIDMutation.ts +++ b/src/core/client/stream/mutations/SetCommentIDMutation.ts @@ -1,9 +1,9 @@ import { commitLocalUpdate, Environment } from "relay-runtime"; -import { getURLWithCommentID } from "talk-framework/helpers"; -import { TalkContext } from "talk-framework/lib/bootstrap"; -import { createMutationContainer } from "talk-framework/lib/relay"; -import { LOCAL_ID } from "talk-framework/lib/relay/withLocalStateContainer"; +import { getURLWithCommentID } from "coral-framework/helpers"; +import { CoralContext } from "coral-framework/lib/bootstrap"; +import { createMutationContainer } from "coral-framework/lib/relay"; +import { LOCAL_ID } from "coral-framework/lib/relay/withLocalStateContainer"; export interface SetCommentIDInput { id: string | null; @@ -14,7 +14,7 @@ export type SetCommentIDMutation = (input: SetCommentIDInput) => Promise; export async function commit( environment: Environment, input: SetCommentIDInput, - { pym }: TalkContext + { pym }: CoralContext ) { return commitLocalUpdate(environment, store => { const record = store.get(LOCAL_ID)!; diff --git a/src/core/client/stream/mutations/SetStoryClosedMutation.ts b/src/core/client/stream/mutations/SetStoryClosedMutation.ts index 8bd839bad..73d915852 100644 --- a/src/core/client/stream/mutations/SetStoryClosedMutation.ts +++ b/src/core/client/stream/mutations/SetStoryClosedMutation.ts @@ -1,6 +1,6 @@ import { commitLocalUpdate, Environment } from "relay-runtime"; -import { createMutationContainer } from "talk-framework/lib/relay"; +import { createMutationContainer } from "coral-framework/lib/relay"; export interface SetStoryClosedInput { storyID: string; diff --git a/src/core/client/stream/mutations/SetStreamOrderByMutation.spec.ts b/src/core/client/stream/mutations/SetStreamOrderByMutation.spec.ts index 810deb795..5899b8e6a 100644 --- a/src/core/client/stream/mutations/SetStreamOrderByMutation.spec.ts +++ b/src/core/client/stream/mutations/SetStreamOrderByMutation.spec.ts @@ -1,7 +1,7 @@ import { Environment, RecordSource } from "relay-runtime"; -import { LOCAL_ID } from "talk-framework/lib/relay"; -import { createRelayEnvironment } from "talk-framework/testHelpers"; +import { LOCAL_ID } from "coral-framework/lib/relay"; +import { createRelayEnvironment } from "coral-framework/testHelpers"; import { commit } from "./SetStreamOrderByMutation"; diff --git a/src/core/client/stream/mutations/SetStreamOrderByMutation.ts b/src/core/client/stream/mutations/SetStreamOrderByMutation.ts index 1074998d5..814e293f2 100644 --- a/src/core/client/stream/mutations/SetStreamOrderByMutation.ts +++ b/src/core/client/stream/mutations/SetStreamOrderByMutation.ts @@ -1,6 +1,6 @@ import { commitLocalUpdate, Environment } from "relay-runtime"; -import { createMutationContainer, LOCAL_ID } from "talk-framework/lib/relay"; +import { createMutationContainer, LOCAL_ID } from "coral-framework/lib/relay"; export interface SetStreamOrderByInput { orderBy: diff --git a/src/core/client/stream/mutations/ShowAuthPopupMutation.spec.ts b/src/core/client/stream/mutations/ShowAuthPopupMutation.spec.ts index 17d612d89..e7432424e 100644 --- a/src/core/client/stream/mutations/ShowAuthPopupMutation.spec.ts +++ b/src/core/client/stream/mutations/ShowAuthPopupMutation.spec.ts @@ -1,6 +1,6 @@ import { Environment, RecordSource } from "relay-runtime"; -import { createRelayEnvironment } from "talk-framework/testHelpers"; +import { createRelayEnvironment } from "coral-framework/testHelpers"; import { AUTH_POPUP_ID, AUTH_POPUP_TYPE } from "../local"; import { commit } from "./ShowAuthPopupMutation"; diff --git a/src/core/client/stream/mutations/ShowAuthPopupMutation.ts b/src/core/client/stream/mutations/ShowAuthPopupMutation.ts index 2d6936d53..5261d500b 100644 --- a/src/core/client/stream/mutations/ShowAuthPopupMutation.ts +++ b/src/core/client/stream/mutations/ShowAuthPopupMutation.ts @@ -1,6 +1,6 @@ import { commitLocalUpdate, Environment } from "relay-runtime"; -import { createMutationContainer } from "talk-framework/lib/relay"; +import { createMutationContainer } from "coral-framework/lib/relay"; import { AUTH_POPUP_ID } from "../local"; diff --git a/src/core/client/stream/mutations/UpdateStorySettingsMutation.ts b/src/core/client/stream/mutations/UpdateStorySettingsMutation.ts index 4ab8b1d4b..c51611900 100644 --- a/src/core/client/stream/mutations/UpdateStorySettingsMutation.ts +++ b/src/core/client/stream/mutations/UpdateStorySettingsMutation.ts @@ -6,9 +6,9 @@ import { createMutationContainer, MutationInput, MutationResponsePromise, -} from "talk-framework/lib/relay"; +} from "coral-framework/lib/relay"; -import { UpdateStorySettingsMutation as MutationTypes } from "talk-stream/__generated__/UpdateStorySettingsMutation.graphql"; +import { UpdateStorySettingsMutation as MutationTypes } from "coral-stream/__generated__/UpdateStorySettingsMutation.graphql"; export type UpdateStorySettingsInput = MutationInput; diff --git a/src/core/client/stream/permissions.tsx b/src/core/client/stream/permissions.tsx index 561fc5433..fb2f9e3cc 100644 --- a/src/core/client/stream/permissions.tsx +++ b/src/core/client/stream/permissions.tsx @@ -1,5 +1,5 @@ +import { GQLUSER_ROLE, GQLUSER_ROLE_RL } from "coral-framework/schema"; import { mapValues } from "lodash"; -import { GQLUSER_ROLE, GQLUSER_ROLE_RL } from "talk-framework/schema"; /** * permissionMap describes what abilities certain roles have. diff --git a/src/core/client/stream/queries/TabBarQuery.tsx b/src/core/client/stream/queries/TabBarQuery.tsx index 7e265a160..f773125f0 100644 --- a/src/core/client/stream/queries/TabBarQuery.tsx +++ b/src/core/client/stream/queries/TabBarQuery.tsx @@ -1,12 +1,12 @@ -import React, { Component } from "react"; import { graphql, QueryRenderer, withLocalStateContainer, -} from "talk-framework/lib/relay"; +} from "coral-framework/lib/relay"; +import React, { Component } from "react"; -import { TabBarQuery as QueryTypes } from "talk-stream/__generated__/TabBarQuery.graphql"; -import { TabBarQueryLocal as Local } from "talk-stream/__generated__/TabBarQueryLocal.graphql"; +import { TabBarQuery as QueryTypes } from "coral-stream/__generated__/TabBarQuery.graphql"; +import { TabBarQueryLocal as Local } from "coral-stream/__generated__/TabBarQueryLocal.graphql"; import TabBarContainer from "../containers/TabBarContainer"; diff --git a/src/core/client/stream/shared/htmlContent.css b/src/core/client/stream/shared/htmlContent.css index 6ea9be50e..8dac38a88 100644 --- a/src/core/client/stream/shared/htmlContent.css +++ b/src/core/client/stream/shared/htmlContent.css @@ -1,5 +1,5 @@ .root { - composes: bodyCopy from "talk-ui/shared/typography.css"; + composes: bodyCopy from "coral-ui/shared/typography.css"; overflow-wrap: break-word; & * bold, diff --git a/src/core/client/stream/tabs/comments/components/Comment/ButtonsBar.spec.tsx b/src/core/client/stream/tabs/comments/components/Comment/ButtonsBar.spec.tsx index ef7102bbb..99132468b 100644 --- a/src/core/client/stream/tabs/comments/components/Comment/ButtonsBar.spec.tsx +++ b/src/core/client/stream/tabs/comments/components/Comment/ButtonsBar.spec.tsx @@ -1,7 +1,7 @@ import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import ButtonsBar from "./ButtonsBar"; diff --git a/src/core/client/stream/tabs/comments/components/Comment/ButtonsBar.tsx b/src/core/client/stream/tabs/comments/components/Comment/ButtonsBar.tsx index b6ef61ef1..706042ffa 100644 --- a/src/core/client/stream/tabs/comments/components/Comment/ButtonsBar.tsx +++ b/src/core/client/stream/tabs/comments/components/Comment/ButtonsBar.tsx @@ -1,6 +1,6 @@ import React, { FunctionComponent } from "react"; -import { Flex } from "talk-ui/components"; +import { Flex } from "coral-ui/components"; const ButtonsBar: FunctionComponent = props => { return ( diff --git a/src/core/client/stream/tabs/comments/components/Comment/Comment.spec.tsx b/src/core/client/stream/tabs/comments/components/Comment/Comment.spec.tsx index fee7a40a0..0190b1515 100644 --- a/src/core/client/stream/tabs/comments/components/Comment/Comment.spec.tsx +++ b/src/core/client/stream/tabs/comments/components/Comment/Comment.spec.tsx @@ -1,7 +1,7 @@ import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import Comment from "./Comment"; diff --git a/src/core/client/stream/tabs/comments/components/Comment/Comment.tsx b/src/core/client/stream/tabs/comments/components/Comment/Comment.tsx index 9fd4bd5d3..75139e4bb 100644 --- a/src/core/client/stream/tabs/comments/components/Comment/Comment.tsx +++ b/src/core/client/stream/tabs/comments/components/Comment/Comment.tsx @@ -1,9 +1,9 @@ import cn from "classnames"; import React, { FunctionComponent } from "react"; -import HTMLContent from "talk-stream/components/HTMLContent"; -import Timestamp from "talk-stream/components/Timestamp"; -import { Flex, HorizontalGutter, Tag } from "talk-ui/components"; +import HTMLContent from "coral-stream/components/HTMLContent"; +import Timestamp from "coral-stream/components/Timestamp"; +import { Flex, HorizontalGutter, Tag } from "coral-ui/components"; import EditedMarker from "./EditedMarker"; import InReplyTo from "./InReplyTo"; diff --git a/src/core/client/stream/tabs/comments/components/Comment/EditedMarker.css b/src/core/client/stream/tabs/comments/components/Comment/EditedMarker.css index 147c8656f..6df550f5c 100644 --- a/src/core/client/stream/tabs/comments/components/Comment/EditedMarker.css +++ b/src/core/client/stream/tabs/comments/components/Comment/EditedMarker.css @@ -1,3 +1,3 @@ .root { - composes: detail from "talk-ui/shared/typography.css"; + composes: detail from "coral-ui/shared/typography.css"; } diff --git a/src/core/client/stream/tabs/comments/components/Comment/InReplyTo.spec.tsx b/src/core/client/stream/tabs/comments/components/Comment/InReplyTo.spec.tsx index c0fbcf91c..b6c6907de 100644 --- a/src/core/client/stream/tabs/comments/components/Comment/InReplyTo.spec.tsx +++ b/src/core/client/stream/tabs/comments/components/Comment/InReplyTo.spec.tsx @@ -1,7 +1,7 @@ import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import InReplyTo from "./InReplyTo"; diff --git a/src/core/client/stream/tabs/comments/components/Comment/InReplyTo.tsx b/src/core/client/stream/tabs/comments/components/Comment/InReplyTo.tsx index d306e7b41..6faa5f847 100644 --- a/src/core/client/stream/tabs/comments/components/Comment/InReplyTo.tsx +++ b/src/core/client/stream/tabs/comments/components/Comment/InReplyTo.tsx @@ -1,7 +1,7 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; -import { Flex, Icon, Typography } from "talk-ui/components"; +import { Flex, Icon, Typography } from "coral-ui/components"; import styles from "./InReplyTo.css"; diff --git a/src/core/client/stream/tabs/comments/components/Comment/IndentedComment.spec.tsx b/src/core/client/stream/tabs/comments/components/Comment/IndentedComment.spec.tsx index cecf5e81c..ad84a0fa9 100644 --- a/src/core/client/stream/tabs/comments/components/Comment/IndentedComment.spec.tsx +++ b/src/core/client/stream/tabs/comments/components/Comment/IndentedComment.spec.tsx @@ -1,7 +1,7 @@ import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import IndentedComment from "./IndentedComment"; diff --git a/src/core/client/stream/tabs/comments/components/Comment/IndentedComment.tsx b/src/core/client/stream/tabs/comments/components/Comment/IndentedComment.tsx index ce8778323..acaa3a069 100644 --- a/src/core/client/stream/tabs/comments/components/Comment/IndentedComment.tsx +++ b/src/core/client/stream/tabs/comments/components/Comment/IndentedComment.tsx @@ -1,7 +1,7 @@ import cn from "classnames"; import React, { FunctionComponent } from "react"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import Indent from "../Indent"; import Comment from "./Comment"; diff --git a/src/core/client/stream/tabs/comments/components/Comment/ReplyButton.spec.tsx b/src/core/client/stream/tabs/comments/components/Comment/ReplyButton.spec.tsx index 174068018..8ecd8ca5d 100644 --- a/src/core/client/stream/tabs/comments/components/Comment/ReplyButton.spec.tsx +++ b/src/core/client/stream/tabs/comments/components/Comment/ReplyButton.spec.tsx @@ -2,7 +2,7 @@ import { noop } from "lodash"; import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import ReplyButton from "./ReplyButton"; diff --git a/src/core/client/stream/tabs/comments/components/Comment/ReplyButton.tsx b/src/core/client/stream/tabs/comments/components/Comment/ReplyButton.tsx index 6dc55176a..de3a1d006 100644 --- a/src/core/client/stream/tabs/comments/components/Comment/ReplyButton.tsx +++ b/src/core/client/stream/tabs/comments/components/Comment/ReplyButton.tsx @@ -1,7 +1,7 @@ import { Localized } from "fluent-react/compat"; import React, { EventHandler, FunctionComponent, MouseEvent } from "react"; -import { Button, ButtonIcon, MatchMedia } from "talk-ui/components"; +import { Button, ButtonIcon, MatchMedia } from "coral-ui/components"; interface Props { id?: string; diff --git a/src/core/client/stream/tabs/comments/components/Comment/RootParent.tsx b/src/core/client/stream/tabs/comments/components/Comment/RootParent.tsx index b02ed28f0..4b9074e11 100644 --- a/src/core/client/stream/tabs/comments/components/Comment/RootParent.tsx +++ b/src/core/client/stream/tabs/comments/components/Comment/RootParent.tsx @@ -1,7 +1,7 @@ import React, { FunctionComponent } from "react"; -import Timestamp from "talk-stream/components/Timestamp"; -import { Flex, Tag } from "talk-ui/components"; +import Timestamp from "coral-stream/components/Timestamp"; +import { Flex, Tag } from "coral-ui/components"; import TopBarLeft from "./TopBarLeft"; import Username from "./Username"; diff --git a/src/core/client/stream/tabs/comments/components/Comment/ShowConversationLink.spec.tsx b/src/core/client/stream/tabs/comments/components/Comment/ShowConversationLink.spec.tsx index 4f7ff5670..17d8f1799 100644 --- a/src/core/client/stream/tabs/comments/components/Comment/ShowConversationLink.spec.tsx +++ b/src/core/client/stream/tabs/comments/components/Comment/ShowConversationLink.spec.tsx @@ -2,7 +2,7 @@ import { noop } from "lodash"; import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import ShowConversationLink from "./ShowConversationLink"; diff --git a/src/core/client/stream/tabs/comments/components/Comment/ShowConversationLink.tsx b/src/core/client/stream/tabs/comments/components/Comment/ShowConversationLink.tsx index 02f775cd3..ef0bf8a13 100644 --- a/src/core/client/stream/tabs/comments/components/Comment/ShowConversationLink.tsx +++ b/src/core/client/stream/tabs/comments/components/Comment/ShowConversationLink.tsx @@ -1,8 +1,8 @@ import React, { EventHandler, MouseEvent } from "react"; import { FunctionComponent } from "react"; +import { Button } from "coral-ui/components"; import { Localized } from "fluent-react/compat"; -import { Button } from "talk-ui/components"; export interface ShowConversationLinkProps { id?: string; diff --git a/src/core/client/stream/tabs/comments/components/Comment/TopBarLeft.spec.tsx b/src/core/client/stream/tabs/comments/components/Comment/TopBarLeft.spec.tsx index 8769bb3dd..e003a6019 100644 --- a/src/core/client/stream/tabs/comments/components/Comment/TopBarLeft.spec.tsx +++ b/src/core/client/stream/tabs/comments/components/Comment/TopBarLeft.spec.tsx @@ -1,8 +1,8 @@ import React from "react"; import TestRenderer from "react-test-renderer"; -import { PropTypesOf } from "talk-framework/types"; -import { UIContext, UIContextProps } from "talk-ui/components"; +import { PropTypesOf } from "coral-framework/types"; +import { UIContext, UIContextProps } from "coral-ui/components"; import TopBarLeft from "./TopBarLeft"; diff --git a/src/core/client/stream/tabs/comments/components/Comment/TopBarLeft.tsx b/src/core/client/stream/tabs/comments/components/Comment/TopBarLeft.tsx index fc2219b22..5246a44ec 100644 --- a/src/core/client/stream/tabs/comments/components/Comment/TopBarLeft.tsx +++ b/src/core/client/stream/tabs/comments/components/Comment/TopBarLeft.tsx @@ -2,7 +2,7 @@ import cn from "classnames"; import React from "react"; import { FunctionComponent } from "react"; -import { Flex, MatchMedia } from "talk-ui/components"; +import { Flex, MatchMedia } from "coral-ui/components"; export interface TopBarLeftProps { className?: string; diff --git a/src/core/client/stream/tabs/comments/components/Comment/Username.spec.tsx b/src/core/client/stream/tabs/comments/components/Comment/Username.spec.tsx index 1a10e4012..3b7fb6e0d 100644 --- a/src/core/client/stream/tabs/comments/components/Comment/Username.spec.tsx +++ b/src/core/client/stream/tabs/comments/components/Comment/Username.spec.tsx @@ -1,8 +1,8 @@ import React from "react"; import TestRenderer from "react-test-renderer"; -import { PropTypesOf } from "talk-framework/types"; -import { UIContext, UIContextProps } from "talk-ui/components"; +import { PropTypesOf } from "coral-framework/types"; +import { UIContext, UIContextProps } from "coral-ui/components"; import Username from "./Username"; diff --git a/src/core/client/stream/tabs/comments/components/Comment/Username.tsx b/src/core/client/stream/tabs/comments/components/Comment/Username.tsx index 0d5ceda6d..5fe2c4bda 100644 --- a/src/core/client/stream/tabs/comments/components/Comment/Username.tsx +++ b/src/core/client/stream/tabs/comments/components/Comment/Username.tsx @@ -1,7 +1,7 @@ import React from "react"; import { FunctionComponent } from "react"; -import { MatchMedia, Typography } from "talk-ui/components"; +import { MatchMedia, Typography } from "coral-ui/components"; import styles from "./Username.css"; diff --git a/src/core/client/stream/tabs/comments/components/CommentsPane.spec.tsx b/src/core/client/stream/tabs/comments/components/CommentsPane.spec.tsx index c88d1eb54..128d41954 100644 --- a/src/core/client/stream/tabs/comments/components/CommentsPane.spec.tsx +++ b/src/core/client/stream/tabs/comments/components/CommentsPane.spec.tsx @@ -1,7 +1,7 @@ import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import CommentsPane from "./CommentsPane"; diff --git a/src/core/client/stream/tabs/comments/components/CommunityGuidelines.tsx b/src/core/client/stream/tabs/comments/components/CommunityGuidelines.tsx index 38807d7ec..db607c2aa 100644 --- a/src/core/client/stream/tabs/comments/components/CommunityGuidelines.tsx +++ b/src/core/client/stream/tabs/comments/components/CommunityGuidelines.tsx @@ -1,7 +1,7 @@ import React, { FunctionComponent } from "react"; -import { Markdown } from "talk-framework/components"; -import { CallOut } from "talk-ui/components"; +import { Markdown } from "coral-framework/components"; +import { CallOut } from "coral-ui/components"; interface Props { children: string; diff --git a/src/core/client/stream/tabs/comments/components/EditCommentForm.tsx b/src/core/client/stream/tabs/comments/components/EditCommentForm.tsx index 53be16a73..bedcbbf42 100644 --- a/src/core/client/stream/tabs/comments/components/EditCommentForm.tsx +++ b/src/core/client/stream/tabs/comments/components/EditCommentForm.tsx @@ -3,8 +3,8 @@ import { Localized } from "fluent-react/compat"; import React, { EventHandler, FunctionComponent, MouseEvent, Ref } from "react"; import { Field, Form } from "react-final-form"; -import { OnSubmit } from "talk-framework/lib/form"; -import Timestamp from "talk-stream/components/Timestamp"; +import { OnSubmit } from "coral-framework/lib/form"; +import Timestamp from "coral-stream/components/Timestamp"; import { AriaInfo, Button, @@ -15,7 +15,7 @@ import { MessageIcon, RelativeTime, ValidationMessage, -} from "talk-ui/components"; +} from "coral-ui/components"; import RemainingCharactersContainer from "../containers/RemainingCharactersContainer"; import { cleanupRTEEmptyHTML, getCommentBodyValidators } from "../helpers"; diff --git a/src/core/client/stream/tabs/comments/components/Indent.spec.tsx b/src/core/client/stream/tabs/comments/components/Indent.spec.tsx index dc16290e6..c9604782e 100644 --- a/src/core/client/stream/tabs/comments/components/Indent.spec.tsx +++ b/src/core/client/stream/tabs/comments/components/Indent.spec.tsx @@ -1,7 +1,7 @@ import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import Indent from "./Indent"; diff --git a/src/core/client/stream/tabs/comments/components/PermalinkButton/PermalinkButton.tsx b/src/core/client/stream/tabs/comments/components/PermalinkButton/PermalinkButton.tsx index cc5b72010..43f5757b0 100644 --- a/src/core/client/stream/tabs/comments/components/PermalinkButton/PermalinkButton.tsx +++ b/src/core/client/stream/tabs/comments/components/PermalinkButton/PermalinkButton.tsx @@ -7,7 +7,7 @@ import { ClickOutside, MatchMedia, Popover, -} from "talk-ui/components"; +} from "coral-ui/components"; import PermalinkPopover from "./PermalinkPopover"; diff --git a/src/core/client/stream/tabs/comments/components/PermalinkButton/PermalinkPopover.tsx b/src/core/client/stream/tabs/comments/components/PermalinkButton/PermalinkPopover.tsx index 8c035c564..e932900dc 100644 --- a/src/core/client/stream/tabs/comments/components/PermalinkButton/PermalinkPopover.tsx +++ b/src/core/client/stream/tabs/comments/components/PermalinkButton/PermalinkPopover.tsx @@ -1,7 +1,7 @@ import React from "react"; -import { CopyButton } from "talk-framework/components"; -import { Flex, TextField } from "talk-ui/components"; +import { CopyButton } from "coral-framework/components"; +import { Flex, TextField } from "coral-ui/components"; import styles from "./PermalinkPopover.css"; diff --git a/src/core/client/stream/tabs/comments/components/PostCommentForm.tsx b/src/core/client/stream/tabs/comments/components/PostCommentForm.tsx index 4da62bc36..458bf1396 100644 --- a/src/core/client/stream/tabs/comments/components/PostCommentForm.tsx +++ b/src/core/client/stream/tabs/comments/components/PostCommentForm.tsx @@ -1,12 +1,12 @@ +import { PropTypesOf } from "coral-framework/types"; import { FormApi, FormState } from "final-form"; import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; import { Field, Form, FormSpy } from "react-final-form"; -import { PropTypesOf } from "talk-framework/types"; -import ValidationMessage from "talk-admin/routes/configure/components/ValidationMessage"; -import { OnSubmit } from "talk-framework/lib/form"; -import { AriaInfo, Button, Flex, HorizontalGutter } from "talk-ui/components"; +import ValidationMessage from "coral-admin/routes/configure/components/ValidationMessage"; +import { OnSubmit } from "coral-framework/lib/form"; +import { AriaInfo, Button, Flex, HorizontalGutter } from "coral-ui/components"; import MessageBoxContainer from "../containers/MessageBoxContainer"; import PostCommentSubmitStatusContainer from "../containers/PostCommentSubmitStatusContainer"; diff --git a/src/core/client/stream/tabs/comments/components/PostCommentFormClosed.tsx b/src/core/client/stream/tabs/comments/components/PostCommentFormClosed.tsx index 0d3714d51..936c439fd 100644 --- a/src/core/client/stream/tabs/comments/components/PostCommentFormClosed.tsx +++ b/src/core/client/stream/tabs/comments/components/PostCommentFormClosed.tsx @@ -1,8 +1,8 @@ import React, { FunctionComponent } from "react"; -import { Markdown } from "talk-framework/components"; -import { PropTypesOf } from "talk-framework/types"; -import { CallOut } from "talk-ui/components"; +import { Markdown } from "coral-framework/components"; +import { PropTypesOf } from "coral-framework/types"; +import { CallOut } from "coral-ui/components"; import MessageBoxContainer from "../containers/MessageBoxContainer"; diff --git a/src/core/client/stream/tabs/comments/components/PostCommentFormClosedSitewide.tsx b/src/core/client/stream/tabs/comments/components/PostCommentFormClosedSitewide.tsx index 62605549c..8efac75aa 100644 --- a/src/core/client/stream/tabs/comments/components/PostCommentFormClosedSitewide.tsx +++ b/src/core/client/stream/tabs/comments/components/PostCommentFormClosedSitewide.tsx @@ -1,8 +1,8 @@ import React, { FunctionComponent } from "react"; -import { Markdown } from "talk-framework/components"; -import { PropTypesOf } from "talk-framework/types"; -import { CallOut, HorizontalGutter } from "talk-ui/components"; +import { Markdown } from "coral-framework/components"; +import { PropTypesOf } from "coral-framework/types"; +import { CallOut, HorizontalGutter } from "coral-ui/components"; import MessageBoxContainer from "../containers/MessageBoxContainer"; diff --git a/src/core/client/stream/tabs/comments/components/PostCommentFormFake.css b/src/core/client/stream/tabs/comments/components/PostCommentFormFake.css index b3962220c..541366080 100644 --- a/src/core/client/stream/tabs/comments/components/PostCommentFormFake.css +++ b/src/core/client/stream/tabs/comments/components/PostCommentFormFake.css @@ -6,7 +6,7 @@ } .textarea { - composes: bodyCopy from "talk-ui/shared/typography.css"; + composes: bodyCopy from "coral-ui/shared/typography.css"; display: block; height: 150px; width: 100%; diff --git a/src/core/client/stream/tabs/comments/components/PostCommentFormFake.spec.tsx b/src/core/client/stream/tabs/comments/components/PostCommentFormFake.spec.tsx index 9c69ea6d5..a3c194699 100644 --- a/src/core/client/stream/tabs/comments/components/PostCommentFormFake.spec.tsx +++ b/src/core/client/stream/tabs/comments/components/PostCommentFormFake.spec.tsx @@ -1,7 +1,8 @@ import { noop } from "lodash"; import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { removeFragmentRefs } from "talk-framework/testHelpers"; + +import { removeFragmentRefs } from "coral-framework/testHelpers"; import PostCommentFormFake from "./PostCommentFormFake"; diff --git a/src/core/client/stream/tabs/comments/components/PostCommentFormFake.tsx b/src/core/client/stream/tabs/comments/components/PostCommentFormFake.tsx index 6ab6b4aef..159490598 100644 --- a/src/core/client/stream/tabs/comments/components/PostCommentFormFake.tsx +++ b/src/core/client/stream/tabs/comments/components/PostCommentFormFake.tsx @@ -1,8 +1,8 @@ import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, useCallback } from "react"; -import { PropTypesOf } from "talk-framework/types"; -import { Button, HorizontalGutter } from "talk-ui/components"; +import { PropTypesOf } from "coral-framework/types"; +import { Button, HorizontalGutter } from "coral-ui/components"; import MessageBoxContainer from "../containers/MessageBoxContainer"; import RTE from "./RTE"; diff --git a/src/core/client/stream/tabs/comments/components/PostCommentInReviewMessage.tsx b/src/core/client/stream/tabs/comments/components/PostCommentInReviewMessage.tsx index 9d65edb41..522421aa4 100644 --- a/src/core/client/stream/tabs/comments/components/PostCommentInReviewMessage.tsx +++ b/src/core/client/stream/tabs/comments/components/PostCommentInReviewMessage.tsx @@ -1,6 +1,6 @@ import React, { FunctionComponent } from "react"; -import { Button, Flex, Message } from "talk-ui/components"; +import { Button, Flex, Message } from "coral-ui/components"; import { Localized } from "fluent-react/compat"; import styles from "./PostCommentInReviewMessage.css"; diff --git a/src/core/client/stream/tabs/comments/components/PoweredBy.spec.tsx b/src/core/client/stream/tabs/comments/components/PoweredBy.spec.tsx index 8440a759f..a366102a5 100644 --- a/src/core/client/stream/tabs/comments/components/PoweredBy.spec.tsx +++ b/src/core/client/stream/tabs/comments/components/PoweredBy.spec.tsx @@ -1,7 +1,7 @@ import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import PoweredBy from "./PoweredBy"; diff --git a/src/core/client/stream/tabs/comments/components/PoweredBy.tsx b/src/core/client/stream/tabs/comments/components/PoweredBy.tsx index 83d4b6e41..1a1597fd2 100644 --- a/src/core/client/stream/tabs/comments/components/PoweredBy.tsx +++ b/src/core/client/stream/tabs/comments/components/PoweredBy.tsx @@ -1,7 +1,7 @@ import cn from "classnames"; +import { Typography } from "coral-ui/components"; import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; -import { Typography } from "talk-ui/components"; interface Props { className: string; diff --git a/src/core/client/stream/tabs/comments/components/RTE.css b/src/core/client/stream/tabs/comments/components/RTE.css index a98ad645c..674360b34 100644 --- a/src/core/client/stream/tabs/comments/components/RTE.css +++ b/src/core/client/stream/tabs/comments/components/RTE.css @@ -1,5 +1,5 @@ .content { - composes: root from "talk-stream/shared/htmlContent.css"; + composes: root from "coral-stream/shared/htmlContent.css"; border: 1px solid var(--palette-grey-main); } @@ -9,6 +9,6 @@ } .placeholder { - composes: placeholder from "talk-ui/shared/typography.css"; + composes: placeholder from "coral-ui/shared/typography.css"; margin: 10px 0 0 calc(10px); } diff --git a/src/core/client/stream/tabs/comments/components/RTE.spec.tsx b/src/core/client/stream/tabs/comments/components/RTE.spec.tsx index 9503624d9..bdeebe576 100644 --- a/src/core/client/stream/tabs/comments/components/RTE.spec.tsx +++ b/src/core/client/stream/tabs/comments/components/RTE.spec.tsx @@ -1,7 +1,7 @@ import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { PropTypesOf } from "talk-framework/types"; +import { PropTypesOf } from "coral-framework/types"; import RTE from "./RTE"; diff --git a/src/core/client/stream/tabs/comments/components/RTE.tsx b/src/core/client/stream/tabs/comments/components/RTE.tsx index 5cedf89c2..f05a9475b 100644 --- a/src/core/client/stream/tabs/comments/components/RTE.tsx +++ b/src/core/client/stream/tabs/comments/components/RTE.tsx @@ -2,8 +2,8 @@ import { Blockquote, Bold, CoralRTE, Italic } from "@coralproject/rte"; import { Localized as LocalizedOriginal } from "fluent-react/compat"; import React, { FunctionComponent, Ref } from "react"; -import { Icon } from "talk-ui/components"; -import { PropTypesOf } from "talk-ui/types"; +import { Icon } from "coral-ui/components"; +import { PropTypesOf } from "coral-ui/types"; import styles from "./RTE.css"; diff --git a/src/core/client/stream/tabs/comments/components/ReactionButton.tsx b/src/core/client/stream/tabs/comments/components/ReactionButton.tsx index 39846d297..28acc8fef 100644 --- a/src/core/client/stream/tabs/comments/components/ReactionButton.tsx +++ b/src/core/client/stream/tabs/comments/components/ReactionButton.tsx @@ -1,6 +1,6 @@ import React from "react"; -import { Button, ButtonIcon, MatchMedia } from "talk-ui/components"; +import { Button, ButtonIcon, MatchMedia } from "coral-ui/components"; interface ReactionButtonProps { onClick: () => void; diff --git a/src/core/client/stream/tabs/comments/components/RemainingCharacters.tsx b/src/core/client/stream/tabs/comments/components/RemainingCharacters.tsx index 1a4628175..dcebcbba2 100644 --- a/src/core/client/stream/tabs/comments/components/RemainingCharacters.tsx +++ b/src/core/client/stream/tabs/comments/components/RemainingCharacters.tsx @@ -1,7 +1,7 @@ import cn from "classnames"; +import { Flex, Icon, Typography } from "coral-ui/components"; import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; -import { Flex, Icon, Typography } from "talk-ui/components"; interface Props { className?: string; diff --git a/src/core/client/stream/tabs/comments/components/ReplyCommentForm.tsx b/src/core/client/stream/tabs/comments/components/ReplyCommentForm.tsx index 29fcf7871..e68b24fad 100644 --- a/src/core/client/stream/tabs/comments/components/ReplyCommentForm.tsx +++ b/src/core/client/stream/tabs/comments/components/ReplyCommentForm.tsx @@ -4,7 +4,7 @@ import { Localized } from "fluent-react/compat"; import React, { EventHandler, FunctionComponent, MouseEvent, Ref } from "react"; import { Field, Form, FormSpy } from "react-final-form"; -import { OnSubmit } from "talk-framework/lib/form"; +import { OnSubmit } from "coral-framework/lib/form"; import { AriaInfo, Button, @@ -12,7 +12,7 @@ import { HorizontalGutter, MatchMedia, ValidationMessage, -} from "talk-ui/components"; +} from "coral-ui/components"; import RemainingCharactersContainer from "../containers/RemainingCharactersContainer"; import { cleanupRTEEmptyHTML, getCommentBodyValidators } from "../helpers"; diff --git a/src/core/client/stream/tabs/comments/components/ReplyEditSubmitStatus.tsx b/src/core/client/stream/tabs/comments/components/ReplyEditSubmitStatus.tsx index 3ebe5c312..cada2471f 100644 --- a/src/core/client/stream/tabs/comments/components/ReplyEditSubmitStatus.tsx +++ b/src/core/client/stream/tabs/comments/components/ReplyEditSubmitStatus.tsx @@ -1,6 +1,6 @@ import React from "react"; -import { Button, CallOut, Flex, HorizontalGutter } from "talk-ui/components"; +import { Button, CallOut, Flex, HorizontalGutter } from "coral-ui/components"; import { SubmitStatus } from "../helpers/getSubmitStatus"; import { Localized } from "fluent-react/compat"; diff --git a/src/core/client/stream/tabs/comments/components/ReplyList.spec.tsx b/src/core/client/stream/tabs/comments/components/ReplyList.spec.tsx index 9ab0b6e6e..47958fd55 100644 --- a/src/core/client/stream/tabs/comments/components/ReplyList.spec.tsx +++ b/src/core/client/stream/tabs/comments/components/ReplyList.spec.tsx @@ -3,8 +3,8 @@ import { noop } from "lodash"; import React from "react"; import sinon, { SinonSpy } from "sinon"; -import { removeFragmentRefs } from "talk-framework/testHelpers"; -import { PropTypesOf } from "talk-framework/types"; +import { removeFragmentRefs } from "coral-framework/testHelpers"; +import { PropTypesOf } from "coral-framework/types"; import ReplyList from "./ReplyList"; @@ -61,7 +61,7 @@ describe("when there is more", () => { it("calls onLoadMore", () => { wrapper - .find("#talk-comments-replyList-showAll--comment-id") + .find("#coral-comments-replyList-showAll--comment-id") .simulate("click"); expect((props.onShowAll as SinonSpy).calledOnce).toBe(true); }); diff --git a/src/core/client/stream/tabs/comments/components/ReplyList.tsx b/src/core/client/stream/tabs/comments/components/ReplyList.tsx index 9924c5481..28971392f 100644 --- a/src/core/client/stream/tabs/comments/components/ReplyList.tsx +++ b/src/core/client/stream/tabs/comments/components/ReplyList.tsx @@ -2,8 +2,8 @@ import { Localized } from "fluent-react/compat"; import * as React from "react"; import { FunctionComponent } from "react"; -import { PropTypesOf } from "talk-framework/types"; -import { Button, HorizontalGutter } from "talk-ui/components"; +import { PropTypesOf } from "coral-framework/types"; +import { Button, HorizontalGutter } from "coral-ui/components"; import CommentContainer from "../containers/CommentContainer"; import Indent from "./Indent"; @@ -33,7 +33,7 @@ export interface ReplyListProps { const ReplyList: FunctionComponent = props => { return ( @@ -57,8 +57,10 @@ const ReplyList: FunctionComponent = props => { diff --git a/src/core/client/stream/tabs/comments/components/__snapshots__/ReplyList.spec.tsx.snap b/src/core/client/stream/tabs/comments/components/__snapshots__/ReplyList.spec.tsx.snap index cdc821b7b..f9c4edeac 100644 --- a/src/core/client/stream/tabs/comments/components/__snapshots__/ReplyList.spec.tsx.snap +++ b/src/core/client/stream/tabs/comments/components/__snapshots__/ReplyList.spec.tsx.snap @@ -3,7 +3,7 @@ exports[`renders correctly 1`] = ` @@ -157,7 +157,7 @@ exports[`when there is more disables load more button 1`] = ` exports[`when there is more renders a load more button 1`] = ` diff --git a/src/core/client/stream/tabs/comments/components/__snapshots__/SortMenu.spec.tsx.snap b/src/core/client/stream/tabs/comments/components/__snapshots__/SortMenu.spec.tsx.snap index 80e326e47..f1fc06b14 100644 --- a/src/core/client/stream/tabs/comments/components/__snapshots__/SortMenu.spec.tsx.snap +++ b/src/core/client/stream/tabs/comments/components/__snapshots__/SortMenu.spec.tsx.snap @@ -7,7 +7,7 @@ exports[`renders correctly on big screens 1`] = ` > @@ -16,7 +16,7 @@ exports[`renders correctly on big screens 1`] = ` > @@ -353,7 +353,7 @@ exports[`when there is more renders a load more button 1`] = ` @@ -513,7 +513,7 @@ exports[`when use is logged in renders correctly 1`] = ` import( diff --git a/src/core/client/stream/tabs/profile/components/CommentHistory.spec.tsx b/src/core/client/stream/tabs/profile/components/CommentHistory.spec.tsx index b91e40422..8ad7c2ef6 100644 --- a/src/core/client/stream/tabs/profile/components/CommentHistory.spec.tsx +++ b/src/core/client/stream/tabs/profile/components/CommentHistory.spec.tsx @@ -2,8 +2,8 @@ import { noop } from "lodash"; import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { removeFragmentRefs } from "talk-framework/testHelpers"; -import { PropTypesOf } from "talk-framework/types"; +import { removeFragmentRefs } from "coral-framework/testHelpers"; +import { PropTypesOf } from "coral-framework/types"; import CommentHistory from "./CommentHistory"; diff --git a/src/core/client/stream/tabs/profile/components/CommentHistory.tsx b/src/core/client/stream/tabs/profile/components/CommentHistory.tsx index 06c2d8972..f3b348bb9 100644 --- a/src/core/client/stream/tabs/profile/components/CommentHistory.tsx +++ b/src/core/client/stream/tabs/profile/components/CommentHistory.tsx @@ -1,8 +1,8 @@ +import { PropTypesOf } from "coral-framework/types"; +import { Button, HorizontalGutter, Typography } from "coral-ui/components"; import { Localized } from "fluent-react/compat"; import * as React from "react"; import { FunctionComponent } from "react"; -import { PropTypesOf } from "talk-framework/types"; -import { Button, HorizontalGutter, Typography } from "talk-ui/components"; import HistoryCommentContainer from "../containers/HistoryCommentContainer"; @@ -32,12 +32,12 @@ const CommentHistory: FunctionComponent = props => { {props.hasMore && ( diff --git a/src/core/client/stream/tabs/profile/components/HistoryComment.css b/src/core/client/stream/tabs/profile/components/HistoryComment.css index 19577119d..d2caaffb4 100644 --- a/src/core/client/stream/tabs/profile/components/HistoryComment.css +++ b/src/core/client/stream/tabs/profile/components/HistoryComment.css @@ -4,10 +4,10 @@ } .replies { - composes: button from "talk-ui/shared/typography.css"; + composes: button from "coral-ui/shared/typography.css"; } .viewConversation { - composes: button from "talk-ui/shared/typography.css"; + composes: button from "coral-ui/shared/typography.css"; color: var(--palette-grey-main); } diff --git a/src/core/client/stream/tabs/profile/components/HistoryComment.spec.tsx b/src/core/client/stream/tabs/profile/components/HistoryComment.spec.tsx index cff290190..79c70a83c 100644 --- a/src/core/client/stream/tabs/profile/components/HistoryComment.spec.tsx +++ b/src/core/client/stream/tabs/profile/components/HistoryComment.spec.tsx @@ -2,8 +2,8 @@ import { noop } from "lodash"; import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { removeFragmentRefs } from "talk-framework/testHelpers"; -import { PropTypesOf } from "talk-framework/types"; +import { removeFragmentRefs } from "coral-framework/testHelpers"; +import { PropTypesOf } from "coral-framework/types"; import HistoryComment from "./HistoryComment"; diff --git a/src/core/client/stream/tabs/profile/components/HistoryComment.tsx b/src/core/client/stream/tabs/profile/components/HistoryComment.tsx index 9591f2a7d..b19586294 100644 --- a/src/core/client/stream/tabs/profile/components/HistoryComment.tsx +++ b/src/core/client/stream/tabs/profile/components/HistoryComment.tsx @@ -1,14 +1,14 @@ -import { Localized } from "fluent-react/compat"; -import * as React from "react"; -import { FunctionComponent } from "react"; -import Timestamp from "talk-stream/components/Timestamp"; +import Timestamp from "coral-stream/components/Timestamp"; import { Flex, HorizontalGutter, Icon, TextLink, Typography, -} from "talk-ui/components"; +} from "coral-ui/components"; +import { Localized } from "fluent-react/compat"; +import * as React from "react"; +import { FunctionComponent } from "react"; import HTMLContent from "../../../components/HTMLContent"; diff --git a/src/core/client/stream/tabs/profile/components/Profile.spec.tsx b/src/core/client/stream/tabs/profile/components/Profile.spec.tsx index 5eb0c4bb1..4f41bf1d5 100644 --- a/src/core/client/stream/tabs/profile/components/Profile.spec.tsx +++ b/src/core/client/stream/tabs/profile/components/Profile.spec.tsx @@ -1,8 +1,8 @@ import React from "react"; import { createRenderer } from "react-test-renderer/shallow"; -import { removeFragmentRefs } from "talk-framework/testHelpers"; -import { PropTypesOf } from "talk-framework/types"; +import { removeFragmentRefs } from "coral-framework/testHelpers"; +import { PropTypesOf } from "coral-framework/types"; import Profile from "./Profile"; diff --git a/src/core/client/stream/tabs/profile/components/Profile.tsx b/src/core/client/stream/tabs/profile/components/Profile.tsx index 788b92287..54cb46911 100644 --- a/src/core/client/stream/tabs/profile/components/Profile.tsx +++ b/src/core/client/stream/tabs/profile/components/Profile.tsx @@ -1,8 +1,8 @@ +import { PropTypesOf } from "coral-framework/types"; +import UserBoxContainer from "coral-stream/containers/UserBoxContainer"; +import { HorizontalGutter } from "coral-ui/components"; import * as React from "react"; import { FunctionComponent } from "react"; -import { PropTypesOf } from "talk-framework/types"; -import UserBoxContainer from "talk-stream/containers/UserBoxContainer"; -import { HorizontalGutter } from "talk-ui/components"; import CommentHistoryContainer from "../containers/CommentHistoryContainer"; export interface ProfileProps { diff --git a/src/core/client/stream/tabs/profile/components/__snapshots__/CommentHistory.spec.tsx.snap b/src/core/client/stream/tabs/profile/components/__snapshots__/CommentHistory.spec.tsx.snap index 0fe371c41..d13265f87 100644 --- a/src/core/client/stream/tabs/profile/components/__snapshots__/CommentHistory.spec.tsx.snap +++ b/src/core/client/stream/tabs/profile/components/__snapshots__/CommentHistory.spec.tsx.snap @@ -34,10 +34,10 @@ exports[`has more disables load more 1`] = ` id="profile-commentHistory-loadMore" > @@ -81,10 +81,10 @@ exports[`has more renders correctly 1`] = ` id="profile-commentHistory-loadMore" > diff --git a/src/core/client/stream/tabs/profile/containers/CommentHistoryContainer.tsx b/src/core/client/stream/tabs/profile/containers/CommentHistoryContainer.tsx index f1d90e26a..8a262a7d0 100644 --- a/src/core/client/stream/tabs/profile/containers/CommentHistoryContainer.tsx +++ b/src/core/client/stream/tabs/profile/containers/CommentHistoryContainer.tsx @@ -1,10 +1,10 @@ import React from "react"; import { graphql, RelayPaginationProp } from "react-relay"; -import { withPaginationContainer } from "talk-framework/lib/relay"; -import { CommentHistoryContainer_story as StoryData } from "talk-stream/__generated__/CommentHistoryContainer_story.graphql"; -import { CommentHistoryContainer_viewer as ViewerData } from "talk-stream/__generated__/CommentHistoryContainer_viewer.graphql"; -import { CommentHistoryContainerPaginationQueryVariables } from "talk-stream/__generated__/CommentHistoryContainerPaginationQuery.graphql"; +import { withPaginationContainer } from "coral-framework/lib/relay"; +import { CommentHistoryContainer_story as StoryData } from "coral-stream/__generated__/CommentHistoryContainer_story.graphql"; +import { CommentHistoryContainer_viewer as ViewerData } from "coral-stream/__generated__/CommentHistoryContainer_viewer.graphql"; +import { CommentHistoryContainerPaginationQueryVariables } from "coral-stream/__generated__/CommentHistoryContainerPaginationQuery.graphql"; import CommentHistory from "../components/CommentHistory"; diff --git a/src/core/client/stream/tabs/profile/containers/HistoryCommentContainer.tsx b/src/core/client/stream/tabs/profile/containers/HistoryCommentContainer.tsx index dae02c774..04d5daf6c 100644 --- a/src/core/client/stream/tabs/profile/containers/HistoryCommentContainer.tsx +++ b/src/core/client/stream/tabs/profile/containers/HistoryCommentContainer.tsx @@ -1,14 +1,14 @@ import React from "react"; import { graphql } from "react-relay"; -import { getURLWithCommentID } from "talk-framework/helpers"; -import { withFragmentContainer } from "talk-framework/lib/relay"; -import { HistoryCommentContainer_comment as CommentData } from "talk-stream/__generated__/HistoryCommentContainer_comment.graphql"; -import { HistoryCommentContainer_story as StoryData } from "talk-stream/__generated__/HistoryCommentContainer_story.graphql"; +import { getURLWithCommentID } from "coral-framework/helpers"; +import { withFragmentContainer } from "coral-framework/lib/relay"; +import { HistoryCommentContainer_comment as CommentData } from "coral-stream/__generated__/HistoryCommentContainer_comment.graphql"; +import { HistoryCommentContainer_story as StoryData } from "coral-stream/__generated__/HistoryCommentContainer_story.graphql"; import { SetCommentIDMutation, withSetCommentIDMutation, -} from "talk-stream/mutations"; +} from "coral-stream/mutations"; import HistoryComment from "../components/HistoryComment"; interface HistoryCommentContainerProps { diff --git a/src/core/client/stream/tabs/profile/containers/ProfileContainer.tsx b/src/core/client/stream/tabs/profile/containers/ProfileContainer.tsx index eb14efa24..f832d2902 100644 --- a/src/core/client/stream/tabs/profile/containers/ProfileContainer.tsx +++ b/src/core/client/stream/tabs/profile/containers/ProfileContainer.tsx @@ -1,10 +1,10 @@ import React from "react"; import { graphql } from "react-relay"; -import { withFragmentContainer } from "talk-framework/lib/relay"; -import { ProfileContainer_settings as SettingsData } from "talk-stream/__generated__/ProfileContainer_settings.graphql"; -import { ProfileContainer_story as StoryData } from "talk-stream/__generated__/ProfileContainer_story.graphql"; -import { ProfileContainer_viewer as ViewerData } from "talk-stream/__generated__/ProfileContainer_viewer.graphql"; +import { withFragmentContainer } from "coral-framework/lib/relay"; +import { ProfileContainer_settings as SettingsData } from "coral-stream/__generated__/ProfileContainer_settings.graphql"; +import { ProfileContainer_story as StoryData } from "coral-stream/__generated__/ProfileContainer_story.graphql"; +import { ProfileContainer_viewer as ViewerData } from "coral-stream/__generated__/ProfileContainer_viewer.graphql"; import Profile from "../components/Profile"; diff --git a/src/core/client/stream/tabs/profile/queries/ProfileQuery.tsx b/src/core/client/stream/tabs/profile/queries/ProfileQuery.tsx index ebfd54b79..c5b0b144f 100644 --- a/src/core/client/stream/tabs/profile/queries/ProfileQuery.tsx +++ b/src/core/client/stream/tabs/profile/queries/ProfileQuery.tsx @@ -7,10 +7,10 @@ import { graphql, QueryRenderer, withLocalStateContainer, -} from "talk-framework/lib/relay"; -import { ProfileQuery as QueryTypes } from "talk-stream/__generated__/ProfileQuery.graphql"; -import { ProfileQueryLocal as Local } from "talk-stream/__generated__/ProfileQueryLocal.graphql"; -import { Delay, Spinner } from "talk-ui/components"; +} from "coral-framework/lib/relay"; +import { ProfileQuery as QueryTypes } from "coral-stream/__generated__/ProfileQuery.graphql"; +import { ProfileQueryLocal as Local } from "coral-stream/__generated__/ProfileQueryLocal.graphql"; +import { Delay, Spinner } from "coral-ui/components"; const loadProfileContainer = () => import("../containers/ProfileContainer" /* webpackChunkName: "profile" */); diff --git a/src/core/client/stream/test/comments/__snapshots__/loadMore.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/loadMore.spec.tsx.snap index 9b3a783bc..f745bcb93 100644 --- a/src/core/client/stream/test/comments/__snapshots__/loadMore.spec.tsx.snap +++ b/src/core/client/stream/test/comments/__snapshots__/loadMore.spec.tsx.snap @@ -5,7 +5,7 @@ exports[`renders comment stream with load more button 1`] = ` aria-live="polite" className="HorizontalGutter-root HorizontalGutter-full" data-testid="comments-stream-log" - id="talk-comments-stream-log" + id="coral-comments-stream-log" role="log" >