From 7cc194bb2a99beda665ea276dbd39fed01a04c8a Mon Sep 17 00:00:00 2001
From: Gabe Kangas <gabek@real-ity.com>
Date: Tue, 2 Feb 2021 23:59:33 -0800
Subject: [PATCH] Remove username as a property. Simplify field names

---
 web/pages/components/config/constants.tsx      | 18 +++++-------------
 .../config/edit-instance-details.tsx           | 16 ----------------
 2 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/web/pages/components/config/constants.tsx b/web/pages/components/config/constants.tsx
index 4553f72d8..1701f58bc 100644
--- a/web/pages/components/config/constants.tsx
+++ b/web/pages/components/config/constants.tsx
@@ -54,19 +54,11 @@ export async function postConfigUpdateToAPI(args: ApiPostArgs) {
 }
 
 // Some default props to help build out a TextField
-export const TEXTFIELD_PROPS_USERNAME = {
-  apiPath: API_USERNAME,
-  configPath: 'instanceDetails',
-  maxLength: TEXT_MAXLENGTH,
-  placeholder: 'username',
-  label: 'User name',
-  tip: 'Who are you? What name do you want viewers to know you?',
-};
 export const TEXTFIELD_PROPS_SERVER_TITLE = {
   apiPath: API_SERVER_TITLE,
   maxLength: TEXT_MAXLENGTH,
   placeholder: 'Owncast site name', // like "gothland"
-  label: 'Server Name',
+  label: 'Name',
   tip: 'The name of your Owncast server',
 };
 export const TEXTFIELD_PROPS_STREAM_TITLE = {
@@ -79,9 +71,9 @@ export const TEXTFIELD_PROPS_STREAM_TITLE = {
 export const TEXTFIELD_PROPS_SERVER_SUMMARY = {
   apiPath: API_SERVER_SUMMARY,
   maxLength: 500,
-  placeholder: 'Summary',
-  label: 'Summary',
-  tip: 'A brief blurb about what your stream is about.',
+  placeholder: '',
+  label: 'About',
+  tip: 'A brief blurb about you, your server, or what your stream is about.',
 };
 export const TEXTFIELD_PROPS_LOGO = {
   apiPath: API_LOGO,
@@ -133,7 +125,7 @@ export const TEXTFIELD_PROPS_INSTANCE_URL = {
   maxLength: 255,
   placeholder: 'https://owncast.mysite.com',
   label: 'Instance URL',
-  tip: 'Please provide the url to your Owncast site if you enable this Directory setting.',
+  tip: 'The full url to your Owncast server.',
 };
 // MISC FIELDS
 export const FIELD_PROPS_TAGS = {
diff --git a/web/pages/components/config/edit-instance-details.tsx b/web/pages/components/config/edit-instance-details.tsx
index 177c6fd4a..d928318e5 100644
--- a/web/pages/components/config/edit-instance-details.tsx
+++ b/web/pages/components/config/edit-instance-details.tsx
@@ -7,10 +7,8 @@ import TextFieldWithSubmit, {
 import { ServerStatusContext } from '../../../utils/server-status-context';
 import {
   postConfigUpdateToAPI,
-  TEXTFIELD_PROPS_USERNAME,
   TEXTFIELD_PROPS_INSTANCE_URL,
   TEXTFIELD_PROPS_SERVER_TITLE,
-  TEXTFIELD_PROPS_STREAM_TITLE,
   TEXTFIELD_PROPS_SERVER_SUMMARY,
   TEXTFIELD_PROPS_LOGO,
   API_YP_SWITCH,
@@ -75,20 +73,6 @@ export default function EditInstanceDetails() {
           initialValue={instanceDetails.title}
           onChange={handleFieldChange}
         />
-        <TextFieldWithSubmit
-          fieldName="streamTitle"
-          {...TEXTFIELD_PROPS_STREAM_TITLE}
-          value={formDataValues.streamTitle}
-          initialValue={instanceDetails.streamTitle}
-          onChange={handleFieldChange}
-        />
-        <TextFieldWithSubmit
-          fieldName="name"
-          {...TEXTFIELD_PROPS_USERNAME}
-          value={formDataValues.name}
-          initialValue={instanceDetails.name}
-          onChange={handleFieldChange}
-        />
         <TextFieldWithSubmit
           fieldName="summary"
           {...TEXTFIELD_PROPS_SERVER_SUMMARY}