structured branch code and translations

This commit is contained in:
Florian Scholdei
2019-03-28 17:09:59 +01:00
parent c8ac5a391c
commit fe510d592a
10 changed files with 174 additions and 60 deletions

View File

@@ -23,8 +23,9 @@ import {
import { translate } from "react-i18next";
import RepositoryDetails from "../components/RepositoryDetails";
import EditRepo from "./EditRepo";
import BranchesOverview from "./BranchesOverview";
import CreateBranch from "./CreateBranch";
import BranchesOverview from "../branches/containers/BranchesOverview";
import BranchView from "../branches/components/BranchView";
import CreateBranch from "../branches/containers/CreateBranch";
import Permissions from "../permissions/containers/Permissions";
import type { History } from "history";
@@ -168,6 +169,15 @@ class RepositoryRoot extends React.Component<Props> {
/>
)}
/>
<Route
path={`${url}/branch/:branch/info`}
render={() => (
<BranchView
repository={repository}
baseUrl={`${url}/branch`}
/>
)}
/>
<Route
path={`${url}/branch/:branch/changesets`}
render={() => (
@@ -181,7 +191,12 @@ class RepositoryRoot extends React.Component<Props> {
<Route
path={`${url}/branches`}
exact={true}
render={() => <BranchesOverview repository={repository} />}
render={() => (
<BranchesOverview
repository={repository}
baseUrl={`${url}/branch`}
/>
)}
/>
<Route
path={`${url}/branches/create`}