From b9d81ba313abcbb0b9c68acea7a150fc94952c84 Mon Sep 17 00:00:00 2001
From: Sander Vocke <sandervocke@gmail.com>
Date: Tue, 21 Jul 2020 15:22:09 +0200
Subject: [PATCH] Simplify app.

---
 client/src/App.tsx | 148 +--------------------------------------------
 server/.gitignore  |   1 +
 2 files changed, 3 insertions(+), 146 deletions(-)

diff --git a/client/src/App.tsx b/client/src/App.tsx
index ba27f1d..d8262f8 100644
--- a/client/src/App.tsx
+++ b/client/src/App.tsx
@@ -1,23 +1,12 @@
 import React, { useState, useEffect } from 'react';
 
-import { Button, Paper } from '@material-ui/core';
+import { Paper } from '@material-ui/core';
 
 import * as serverApi from './api';
-import EditSongDialog, { SongProperties } from './components/EditSongDialog';
-import EditArtistDialog, { ArtistProperties } from './components/EditArtistDialog';
 import AppBar, { ActiveTab as AppBarActiveTab } from './components/AppBar';
 import ItemList from './components/ItemList';
 import ItemListItem from './components/ItemListItem';
-import { SongDisplayItem, LoadingSongDisplayItem, DisplayItem } from './types/DisplayItem';
-
-interface SongEntry {
-
-}
-
-interface ArtistEntry {
-  name: String,
-  id: Number,
-}
+import { SongDisplayItem } from './types/DisplayItem';
 
 interface SongItemProps {
   id: Number,
@@ -82,147 +71,14 @@ function SongList() {
 }
 
 function App() {
-  const [songs, setSongs] = useState<SongEntry[]>([]);
-  const [artists, setArtists] = useState<ArtistEntry[]>([]);
-  const [editSongDialogOpen, setEditSongDialogOpen] = useState<boolean>(false);
-  const [songDialogProperties, setSongDialogProperties] = useState<SongProperties>({
-    title: "",
-    artistId: -1,
-  });
-  const [editArtistDialogOpen, setEditArtistDialogOpen] = useState<boolean>(false);
-  const [artistDialogProperties, setArtistDialogProperties] = useState<ArtistProperties>({
-    name: ""
-  });
-
-  const updateSongs = () => {
-    return fetch(serverApi.QuerySongsEndpoint)
-    // .then((response: any) => response.json())
-    // .then((result: serverApi.ListSongsResponse) => {
-    //   setSongs(result.map((item: serverApi.ListSongsResponseItem) => {
-    //     return {
-    //       title: item.title,
-    //       artistName: item.artistName
-    //     };
-    //   }));
-    // });
-  }
-
-  const fetchArtists = () => {
-    return fetch(serverApi.QueryArtistsEndpoint)
-    // .then((response: any) => response.json())
-    // .then((result: serverApi.ListArtistsResponse) => {
-    //   return result.map((item: serverApi.ListArtistsResponseItem) => {
-    //     return {
-    //       name: item.name,
-    //       id: item.id,
-    //     };
-    //   });
-    // });
-  }
-
-  const updateArtists = () => {
-    return fetchArtists()
-    // .then((artists: any[]) => {
-    //     setArtists(artists);
-    // });
-  }
-
-  const createSong = (p: SongProperties) => {
-    if (!p.artistId) {
-      throw "Undefined artist ID for song to be created.";
-    }
-    const request: serverApi.CreateSongRequest = {
-      title: p.title,
-      artistIds: [p.artistId],
-    }
-    const requestOpts = {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify(request)
-    };
-    return fetch(serverApi.CreateSongEndpoint, requestOpts)
-  }
-
-  const createArtist = (p: ArtistProperties) => {
-    const request: serverApi.CreateArtistRequest = {
-      name: p.name,
-    }
-    const requestOpts = {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify(request)
-    };
-    return fetch(serverApi.CreateArtistEndpoint, requestOpts)
-  }
-
-  const openCreateSongDialog = () => {
-    setSongDialogProperties({
-      title: "",
-      artistId: -1,
-    });
-    setEditSongDialogOpen(true);
-  }
-
-  const onSubmitCreateSongDialog = () => {
-    createSong(songDialogProperties)
-      .then(updateSongs)
-      .then(() => { setEditSongDialogOpen(false); })
-  }
-
-  const openCreateArtistDialog = () => {
-    setArtistDialogProperties({
-      name: "",
-    });
-    setEditArtistDialogOpen(true);
-  }
-
-  const onSubmitCreateArtistDialog = () => {
-    createArtist(artistDialogProperties)
-      .then(updateArtists)
-      .then(() => { setEditArtistDialogOpen(false); })
-  }
-
-  useEffect(() => { updateSongs(); }, []);
-  useEffect(() => { updateArtists(); }, []);
-
-  const testSong: SongDisplayItem = {
-    title: "My Song",
-    artistNames: ["First dude", "Second dude"]
-  };
-
-  const testLoadingSong: LoadingSongDisplayItem = {
-    loadingSong: true
-  };
-
   const [appBarActiveTab, setAppBarActiveTab] = React.useState(AppBarActiveTab.Songs);
 
   return (
     <div style={{ maxWidth: '100%' }}>
       <AppBar activeTab={appBarActiveTab} onActiveTabChange={setAppBarActiveTab} />
       <Paper>
-        {/* <ItemList items={[testSong, testLoadingSong]}>
-          <ItemListItem item={testSong} />
-          <ItemListItem item={testLoadingSong} />
-        </ItemList> */}
         {(appBarActiveTab === AppBarActiveTab.Songs) && <SongList />}
       </Paper>
-      <Button variant="contained" onClick={openCreateSongDialog}>Create Song</Button>
-      <Button variant="contained" onClick={openCreateArtistDialog}>Create Artist</Button>
-      <EditSongDialog
-        dialogOpen={editSongDialogOpen}
-        onClose={() => { setEditSongDialogOpen(false); }}
-        onChangeSongProperties={(props: SongProperties) => setSongDialogProperties(props)}
-        songProperties={songDialogProperties}
-        onSubmit={onSubmitCreateSongDialog}
-        artists={artists}
-      />
-      <EditArtistDialog
-        dialogOpen={editArtistDialogOpen}
-        onClose={() => { setEditArtistDialogOpen(false); }}
-        onChangeArtistProperties={(props: ArtistProperties) => setArtistDialogProperties(props)}
-        artistProperties={artistDialogProperties}
-        onSubmit={onSubmitCreateArtistDialog}
-      />
     </div>
   );
 }
diff --git a/server/.gitignore b/server/.gitignore
index 4d29575..9e3efd4 100644
--- a/server/.gitignore
+++ b/server/.gitignore
@@ -21,3 +21,4 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+db_dev.sqlite3