From 94055aadfcf9e129f06cc819dc3dfa96646a9640 Mon Sep 17 00:00:00 2001
From: Brandon Thomas <echelon@gmail.com>
Date: Fri, 31 Dec 2021 06:06:00 -0500
Subject: [PATCH] rename /upload -> /contribute, improve links

---
 fakeyou/src/common/FrontendUrlConfig.ts                  | 6 ++++++
 fakeyou/src/v2/view/NewTopNavFc.tsx                      | 2 +-
 fakeyou/src/v2/view/NewVocodesContainer.tsx              | 6 +++---
 fakeyou/src/v2/view/category/CreateCategoryPage.tsx      | 8 +++-----
 .../ContributeIndexPage.tsx}                             | 4 ++--
 fakeyou/src/v2/view/upload/UploadTtsModelFc.tsx          | 9 ++++-----
 fakeyou/src/v2/view/upload/UploadW2lPhotoFc.tsx          | 8 +++-----
 fakeyou/src/v2/view/upload/UploadW2lVideoFc.tsx          | 8 +++-----
 8 files changed, 25 insertions(+), 26 deletions(-)
 rename fakeyou/src/v2/view/{upload/UploadChoiceFc.tsx => contribute/ContributeIndexPage.tsx} (96%)

diff --git a/fakeyou/src/common/FrontendUrlConfig.ts b/fakeyou/src/common/FrontendUrlConfig.ts
index 36dcc611c1..61c18e5c3d 100644
--- a/fakeyou/src/common/FrontendUrlConfig.ts
+++ b/fakeyou/src/common/FrontendUrlConfig.ts
@@ -84,6 +84,12 @@ class FrontendUrlConfig {
     return `/profile/${userDisplayName}/ban`;
   }
 
+  // Contribute 
+
+  static contributePage() : string {
+    return '/contribute';
+  }
+  
   // Moderation links
 
   static moderationMain() : string {
diff --git a/fakeyou/src/v2/view/NewTopNavFc.tsx b/fakeyou/src/v2/view/NewTopNavFc.tsx
index f1cf7bf66e..51569c9683 100644
--- a/fakeyou/src/v2/view/NewTopNavFc.tsx
+++ b/fakeyou/src/v2/view/NewTopNavFc.tsx
@@ -30,7 +30,7 @@ function NewTopNavFc(props: Props) {
             >Video</Link>
         </div>
         <div className="column">
-          <Link to="/upload"
+          <Link to="/contribute"
             className="button is-link is-medium is-inverted"
             >Contribute</Link>
         </div>
diff --git a/fakeyou/src/v2/view/NewVocodesContainer.tsx b/fakeyou/src/v2/view/NewVocodesContainer.tsx
index 98d40ef1aa..b09f1464c7 100644
--- a/fakeyou/src/v2/view/NewVocodesContainer.tsx
+++ b/fakeyou/src/v2/view/NewVocodesContainer.tsx
@@ -20,7 +20,7 @@ import { TtsModelUploadJob } from '../../jobs/TtsModelUploadJobs';
 import { TtsModelViewFc } from './tts/tts_model_view/TtsModelViewFc';
 import { TtsResultDeleteFc } from './tts/tts_result_delete/TtsResultDeleteFc';
 import { TtsResultViewFc } from './tts/tts_result_view/TtsResultViewFc';
-import { UploadChoiceFc } from './upload/UploadChoiceFc';
+import { ContributeIndexPage } from './contribute/ContributeIndexPage';
 import { UploadTtsModelFc } from './upload/UploadTtsModelFc';
 import { UploadW2lPhotoFc } from './upload/UploadW2lPhotoFc';
 import { UploadW2lVideoFc } from './upload/UploadW2lVideoFc';
@@ -267,8 +267,8 @@ class NewVocodesContainer extends React.Component<Props, State> {
               />
             </Route>
 
-            <Route path="/upload">
-              <UploadChoiceFc
+            <Route path="/contribute">
+              <ContributeIndexPage
                 sessionWrapper={this.props.sessionWrapper}
               />
             </Route>
diff --git a/fakeyou/src/v2/view/category/CreateCategoryPage.tsx b/fakeyou/src/v2/view/category/CreateCategoryPage.tsx
index 8e8c569fd8..ff1fd8d2e1 100644
--- a/fakeyou/src/v2/view/category/CreateCategoryPage.tsx
+++ b/fakeyou/src/v2/view/category/CreateCategoryPage.tsx
@@ -4,6 +4,8 @@ import { useHistory, Link } from "react-router-dom";
 import { v4 as uuidv4 } from 'uuid';
 import { CreateCategory, CreateCategoryIsError, CreateCategoryRequest } from '../../api/category/CreateCategory';
 import { CreateSessionIsSuccess } from '../../api/user/CreateSession';
+import { BackLink } from '../_common/BackLink';
+import { FrontendUrlConfig } from '../../../common/FrontendUrlConfig';
 
 const DEFAULT_CAN_DIRECTLY_HAVE_MODELS = true;
 const DEFAULT_CAN_HAVE_SUBCATEGORIES = false;
@@ -196,11 +198,7 @@ function CreateCategoryPage(props: Props) {
 
       <br />
 
-      <Link
-        to="/upload"
-        className="button is-link is-fullwidth is-outlined"
-        onClick={() => {}}
-        >&lt; Back to contribute</Link>
+      <BackLink link={FrontendUrlConfig.contributePage()} text="Back to contribute page" />
 
       <br />
     </div>
diff --git a/fakeyou/src/v2/view/upload/UploadChoiceFc.tsx b/fakeyou/src/v2/view/contribute/ContributeIndexPage.tsx
similarity index 96%
rename from fakeyou/src/v2/view/upload/UploadChoiceFc.tsx
rename to fakeyou/src/v2/view/contribute/ContributeIndexPage.tsx
index c9a44ec57c..79f0ba9143 100644
--- a/fakeyou/src/v2/view/upload/UploadChoiceFc.tsx
+++ b/fakeyou/src/v2/view/contribute/ContributeIndexPage.tsx
@@ -7,7 +7,7 @@ interface Props {
   sessionWrapper: SessionWrapper,
 }
 
-function UploadChoiceFc(props: Props) {
+function ContributeIndexPage(props: Props) {
   const categoryActionName = props.sessionWrapper.canEditCategories() ? "Create" : "Suggest";
 
   return (
@@ -67,4 +67,4 @@ function UploadChoiceFc(props: Props) {
   )
 }
 
-export { UploadChoiceFc };
+export { ContributeIndexPage };
diff --git a/fakeyou/src/v2/view/upload/UploadTtsModelFc.tsx b/fakeyou/src/v2/view/upload/UploadTtsModelFc.tsx
index ef72bed3e7..71f0c2f7f8 100644
--- a/fakeyou/src/v2/view/upload/UploadTtsModelFc.tsx
+++ b/fakeyou/src/v2/view/upload/UploadTtsModelFc.tsx
@@ -6,6 +6,8 @@ import { TtsModelUploadJob } from '../../../jobs/TtsModelUploadJobs';
 import { useHistory, Link } from "react-router-dom";
 import { v4 as uuidv4 } from 'uuid';
 import { DiscordLink } from '../_common/DiscordLink';
+import { BackLink } from '../_common/BackLink';
+import { FrontendUrlConfig } from '../../../common/FrontendUrlConfig';
 
 interface Props {
   sessionWrapper: SessionWrapper,
@@ -178,11 +180,8 @@ function UploadTtsModelFc(props: Props) {
         </div>*/}
       </form>
       <br />
-      <Link
-        to="/upload"
-        className="button is-link is-fullwidth is-outlined"
-        onClick={() => {}}
-        >&lt; Back to upload type selection</Link>
+
+      <BackLink link={FrontendUrlConfig.contributePage()} text="Back to contribute page" />
 
       <br />
       <br />
diff --git a/fakeyou/src/v2/view/upload/UploadW2lPhotoFc.tsx b/fakeyou/src/v2/view/upload/UploadW2lPhotoFc.tsx
index 796399fa7b..4866f0b004 100644
--- a/fakeyou/src/v2/view/upload/UploadW2lPhotoFc.tsx
+++ b/fakeyou/src/v2/view/upload/UploadW2lPhotoFc.tsx
@@ -5,6 +5,8 @@ import { W2lTemplateUploadJob } from '../../../jobs/W2lTemplateUploadJobs';
 import { useHistory, Link } from "react-router-dom";
 import { v4 as uuidv4 } from 'uuid';
 import { SessionW2lTemplateUploadResultListFc } from '../_common/SessionW2lTemplateUploadResultsListFc';
+import { BackLink } from '../_common/BackLink';
+import { FrontendUrlConfig } from '../../../common/FrontendUrlConfig';
 
 interface W2lTemplateUploadJobResponsePayload {
   success: boolean,
@@ -141,11 +143,7 @@ function UploadW2lPhotoFc(props: Props) {
 
       <br />
 
-      <Link
-        to="/upload"
-        className="button is-link is-fullwidth is-outlined"
-        onClick={() => {}}
-        >&lt; Back to upload type selection</Link>
+      <BackLink link={FrontendUrlConfig.contributePage()} text="Back to contribute page" />
       
       <br />
       <br />
diff --git a/fakeyou/src/v2/view/upload/UploadW2lVideoFc.tsx b/fakeyou/src/v2/view/upload/UploadW2lVideoFc.tsx
index fa68aee4a9..c8ea117c31 100644
--- a/fakeyou/src/v2/view/upload/UploadW2lVideoFc.tsx
+++ b/fakeyou/src/v2/view/upload/UploadW2lVideoFc.tsx
@@ -5,6 +5,8 @@ import { SessionWrapper } from '../../../session/SessionWrapper';
 import { W2lTemplateUploadJob } from '../../../jobs/W2lTemplateUploadJobs';
 import { useHistory, Link } from "react-router-dom";
 import { v4 as uuidv4 } from 'uuid';
+import { BackLink } from '../_common/BackLink';
+import { FrontendUrlConfig } from '../../../common/FrontendUrlConfig';
 
 interface W2lTemplateUploadJobResponsePayload {
   success: boolean,
@@ -142,11 +144,7 @@ function UploadW2lVideoFc(props: Props) {
       <br />
       <br />
 
-      <Link
-        to="/upload"
-        className="button is-link is-fullwidth is-outlined"
-        onClick={() => {}}
-        >&lt; Back to upload type selection</Link>
+      <BackLink link={FrontendUrlConfig.contributePage()} text="Back to contribute page" />
 
       <br />
       <br />