mirror of
https://github.com/wassname/talk.git
synced 2026-07-10 08:37:12 +08:00
Adding found
This commit is contained in:
@@ -2,36 +2,10 @@ import React, { StatelessComponent } from "react";
|
||||
import { HorizontalGutter } from "talk-ui/components";
|
||||
import NavigationContainer from "../containers/NavigationContainer";
|
||||
|
||||
export type View =
|
||||
| "MODERATE"
|
||||
| "COMMUNITY"
|
||||
| "STORIES"
|
||||
| "CONFIGURE"
|
||||
| "%future added value";
|
||||
|
||||
export interface AppProps {
|
||||
view: View;
|
||||
}
|
||||
|
||||
const renderView = (view: View) => {
|
||||
switch (view) {
|
||||
case "MODERATE":
|
||||
return <div>MODERATE</div>;
|
||||
case "COMMUNITY":
|
||||
return <div>COMMUNITY</div>;
|
||||
case "STORIES":
|
||||
return <div>STORIES</div>;
|
||||
case "CONFIGURE":
|
||||
return <div>CONFIGURE</div>;
|
||||
default:
|
||||
throw new Error(`Unknown view ${view}`);
|
||||
}
|
||||
};
|
||||
|
||||
const App: StatelessComponent<AppProps> = ({ view }) => (
|
||||
const App: StatelessComponent = ({ children }) => (
|
||||
<HorizontalGutter>
|
||||
<NavigationContainer />
|
||||
{renderView(view)}
|
||||
{children}
|
||||
</HorizontalGutter>
|
||||
);
|
||||
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
import * as React from "react";
|
||||
import { StatelessComponent } from "react";
|
||||
|
||||
import { AppContainerLocal as Local } from "talk-admin/__generated__/AppContainerLocal.graphql";
|
||||
import { graphql, withLocalStateContainer } from "talk-framework/lib/relay";
|
||||
|
||||
import App from "../components/App";
|
||||
|
||||
interface InnerProps {
|
||||
local: Local;
|
||||
}
|
||||
|
||||
const AppContainer: StatelessComponent<InnerProps> = ({ local: { view } }) => {
|
||||
return <App view={view} />;
|
||||
};
|
||||
|
||||
const enhanced = withLocalStateContainer(
|
||||
graphql`
|
||||
fragment AppContainerLocal on Local {
|
||||
view
|
||||
}
|
||||
`
|
||||
)(AppContainer);
|
||||
|
||||
export default enhanced;
|
||||
@@ -9,7 +9,7 @@ import ReactDOM from "react-dom";
|
||||
import { createManaged } from "talk-framework/lib/bootstrap";
|
||||
|
||||
import { TalkContextConsumer } from "talk-framework/lib/bootstrap/TalkContext";
|
||||
import AppContainer from "./containers/AppContainer";
|
||||
import App from "./components/App";
|
||||
import { initLocalState } from "./local";
|
||||
import localesData from "./locales";
|
||||
|
||||
@@ -23,7 +23,7 @@ async function main() {
|
||||
const Router = createFarceRouter({
|
||||
historyProtocol: new BrowserProtocol(),
|
||||
historyMiddlewares: [queryMiddleware],
|
||||
routeConfig: makeRouteConfig(<Route path="/" Component={AppContainer} />),
|
||||
routeConfig: makeRouteConfig(<Route path="/" Component={App} />),
|
||||
render: createRender({}),
|
||||
});
|
||||
|
||||
|
||||
@@ -50,9 +50,6 @@ async function createTenantRouter(app: AppOptions, options: RouterOptions) {
|
||||
// Setup auth routes.
|
||||
router.use("/auth", createNewAuthRouter(app, options));
|
||||
|
||||
// Handle the admin handler.
|
||||
router.get("/admin", adminHandler);
|
||||
|
||||
// Tenant API
|
||||
router.use(
|
||||
"/graphql",
|
||||
@@ -131,6 +128,9 @@ export async function createRouter(app: AppOptions, options: RouterOptions) {
|
||||
// Create a router.
|
||||
const router = express.Router();
|
||||
|
||||
// Handle the admin handler.
|
||||
router.get("/admin", adminHandler);
|
||||
|
||||
router.use("/api", nocacheMiddleware, await createAPIRouter(app, options));
|
||||
|
||||
if (app.config.get("env") === "development") {
|
||||
|
||||
Vendored
+2
-1
@@ -1,3 +1,4 @@
|
||||
declare module "farce" {
|
||||
|
||||
export class BrowserProtocol {}
|
||||
export class queryMiddleware {}
|
||||
}
|
||||
|
||||
Vendored
+4
-1
@@ -1,3 +1,6 @@
|
||||
declare module "found-relay" {
|
||||
|
||||
import { Environment } from "relay-runtime";
|
||||
export class Resolver {
|
||||
constructor(relayEnvironment: Environment);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user