From 765e7a72299591606e5c49cdb59e6ffcd89a7bee Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Sat, 4 Jul 2020 02:58:50 -0400 Subject: [PATCH] reorder speakers --- vocodes/src/App.tsx | 10 +++---- vocodes/src/{ => model}/Speakers.ts | 28 +++++++++---------- vocodes/src/model/utterance.ts | 2 +- vocodes/src/modes/history/MiniAvatar.tsx | 2 +- vocodes/src/modes/speak/Form.tsx | 2 +- vocodes/src/modes/speak/SpeakComponent.tsx | 2 +- vocodes/src/modes/speak/SpeakerDropdown.tsx | 2 +- vocodes/src/modes/speak/extras/Avatar.tsx | 2 +- .../modes/speak/extras/ExtrasComponent.tsx | 2 +- .../src/modes/speak/extras/SpeakerInfo.tsx | 2 +- 10 files changed, 27 insertions(+), 27 deletions(-) rename vocodes/src/{ => model}/Speakers.ts (95%) diff --git a/vocodes/src/App.tsx b/vocodes/src/App.tsx index fd1e4790bf..b4b74688f9 100644 --- a/vocodes/src/App.tsx +++ b/vocodes/src/App.tsx @@ -1,16 +1,16 @@ import './App.scss'; import React from 'react'; +import { AboutComponent } from './modes/about/AboutComponent'; +import { ExtrasMode } from './modes/speak/extras/ExtrasComponent'; import { Footer } from './navigation/Footer'; +import { HistoryComponent } from './modes/history/HistoryComponent'; import { Mode } from './AppMode'; import { SpeakComponent } from './modes/speak/SpeakComponent'; +import { Speaker, SPEAKERS } from './model/Speakers'; +import { Spectrogram } from './modes/speak/extras/Spectrogram'; import { TermsComponent } from './modes/terms/TermsComponent'; import { TopNav } from './navigation/TopNav'; -import { AboutComponent } from './modes/about/AboutComponent'; -import { Speaker, SPEAKERS } from './Speakers'; -import { ExtrasMode } from './modes/speak/extras/ExtrasComponent'; -import { Spectrogram } from './modes/speak/extras/Spectrogram'; import { Utterance } from './model/utterance'; -import { HistoryComponent } from './modes/history/HistoryComponent'; interface Props {} diff --git a/vocodes/src/Speakers.ts b/vocodes/src/model/Speakers.ts similarity index 95% rename from vocodes/src/Speakers.ts rename to vocodes/src/model/Speakers.ts index c67901f101..bfa9d6e8c9 100644 --- a/vocodes/src/Speakers.ts +++ b/vocodes/src/model/Speakers.ts @@ -38,12 +38,6 @@ class Speaker { } const SPEAKERS : Speaker[] = [ - Speaker.fromJson({ - name: "Donald Trump", - slug: "donald-trump", - description: "The 45th President of the United States.", - avatarUrl: "donald-trump.jpg", - }), Speaker.fromJson({ name: "Christopher Lee", slug: "christopher-lee", @@ -62,6 +56,12 @@ const SPEAKERS : Speaker[] = [ description: "Voice actor and comedian.", avatarUrl: "gilbert-gottfried.jpg", }), + Speaker.fromJson({ + name: "Donald Trump", + slug: "donald-trump", + description: "The 45th President of the United States.", + avatarUrl: "donald-trump.jpg", + }), Speaker.fromJson({ name: "Ronald Reagan", slug: "ronald-reagan", @@ -80,12 +80,6 @@ const SPEAKERS : Speaker[] = [ description: "Celebrity doctor.", avatarUrl: "dr-phil-mcgraw.jpg", }), - Speaker.fromJson({ - name: "Barack Obama", - slug: "barack-obama", - description: "The 44th President of the United States.", - avatarUrl: "barack-obama.jpg", - }), Speaker.fromJson({ name: "Bill Gates", slug: "bill-gates", @@ -111,13 +105,19 @@ const SPEAKERS : Speaker[] = [ avatarUrl: "bill-clinton.jpg", }), Speaker.fromJson({ - name: "Betty White (Beta)", + name: "Barack Obama (needs more training)", + slug: "barack-obama", + description: "The 44th President of the United States.", + avatarUrl: "barack-obama.jpg", + }), + Speaker.fromJson({ + name: "Betty White (needs more training)", slug: "betty-white", description: "This model needs more training.", avatarUrl: "betty-white.jpg", }), Speaker.fromJson({ - name: "Arnold Schwarzenegger (multi-speaker model*)", + name: "Arnold Schwarzenegger (needs more training)", slug: "arnold-schwarzenegger", description: "Terminator.", avatarUrl: "arnold-schwarzenegger.jpg", diff --git a/vocodes/src/model/utterance.ts b/vocodes/src/model/utterance.ts index 269f13b4cc..3987bac74b 100644 --- a/vocodes/src/model/utterance.ts +++ b/vocodes/src/model/utterance.ts @@ -1,4 +1,4 @@ -import { Speaker } from "../Speakers"; +import { Speaker } from "./Speakers"; class Utterance { static counter: number = 0; diff --git a/vocodes/src/modes/history/MiniAvatar.tsx b/vocodes/src/modes/history/MiniAvatar.tsx index 4dbc23cd53..98b5cb8f36 100644 --- a/vocodes/src/modes/history/MiniAvatar.tsx +++ b/vocodes/src/modes/history/MiniAvatar.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { Speaker } from '../../Speakers'; +import { Speaker } from '../../model/Speakers'; interface Props { speaker: Speaker; diff --git a/vocodes/src/modes/speak/Form.tsx b/vocodes/src/modes/speak/Form.tsx index e6de17a24b..43a2e550ed 100644 --- a/vocodes/src/modes/speak/Form.tsx +++ b/vocodes/src/modes/speak/Form.tsx @@ -1,7 +1,7 @@ import Howl from 'howler'; import React from 'react'; import { SpeakRequest } from './SpeakRequest'; -import { Speaker } from '../../Speakers'; +import { Speaker } from '../../model/Speakers'; import { createColorMap, linearScale } from "@colormap/core"; import { MAGMA } from "@colormap/presets"; import { Spectrogram } from './extras/Spectrogram'; diff --git a/vocodes/src/modes/speak/SpeakComponent.tsx b/vocodes/src/modes/speak/SpeakComponent.tsx index 4f65b1170a..df6baedb34 100644 --- a/vocodes/src/modes/speak/SpeakComponent.tsx +++ b/vocodes/src/modes/speak/SpeakComponent.tsx @@ -3,7 +3,7 @@ import { Form } from './Form'; import { StatusText } from './StatusText'; import { getRandomInt } from '../../Utils'; import { SpeakerDropdown } from './SpeakerDropdown'; -import { Speaker } from '../../Speakers'; +import { Speaker } from '../../model/Speakers'; import { ExtrasComponent, ExtrasMode } from './extras/ExtrasComponent'; import { Spectrogram } from './extras/Spectrogram'; import { SpectrogramMode } from '../../App'; diff --git a/vocodes/src/modes/speak/SpeakerDropdown.tsx b/vocodes/src/modes/speak/SpeakerDropdown.tsx index dd5162fb33..651de54b7b 100644 --- a/vocodes/src/modes/speak/SpeakerDropdown.tsx +++ b/vocodes/src/modes/speak/SpeakerDropdown.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { Speaker, SPEAKERS } from '../../Speakers'; +import { Speaker, SPEAKERS } from '../../model/Speakers'; interface Props { currentSpeaker: Speaker; diff --git a/vocodes/src/modes/speak/extras/Avatar.tsx b/vocodes/src/modes/speak/extras/Avatar.tsx index e7cabad5b3..a03c1b314e 100644 --- a/vocodes/src/modes/speak/extras/Avatar.tsx +++ b/vocodes/src/modes/speak/extras/Avatar.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { Speaker } from '../../../Speakers'; +import { Speaker } from '../../../model/Speakers'; interface Props { currentSpeaker: Speaker; diff --git a/vocodes/src/modes/speak/extras/ExtrasComponent.tsx b/vocodes/src/modes/speak/extras/ExtrasComponent.tsx index 418e496d92..ded315df22 100644 --- a/vocodes/src/modes/speak/extras/ExtrasComponent.tsx +++ b/vocodes/src/modes/speak/extras/ExtrasComponent.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { Speaker } from '../../../Speakers'; +import { Speaker } from '../../../model/Speakers'; import { SpeakerInfo } from './SpeakerInfo'; import { Spectrogram } from './Spectrogram'; import { SpectrogramComponent } from './SpectrogramComponent'; diff --git a/vocodes/src/modes/speak/extras/SpeakerInfo.tsx b/vocodes/src/modes/speak/extras/SpeakerInfo.tsx index b790835f9d..0c5fd60167 100644 --- a/vocodes/src/modes/speak/extras/SpeakerInfo.tsx +++ b/vocodes/src/modes/speak/extras/SpeakerInfo.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { Speaker } from '../../../Speakers'; +import { Speaker } from '../../../model/Speakers'; import { Avatar } from './Avatar'; interface Props {