reorder speakers

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 {}
 

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",

vocodes/src/model/utterance.ts

@@ -1,4 +1,4 @@
-import { Speaker } from "../Speakers";
+import { Speaker } from "./Speakers";
 
 class Utterance {
   static counter: number = 0;

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;

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';

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';

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;

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;

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';

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 {