use song language instead of country

BBN-Holding · Aug 17, 2024 · e916cd1 · e916cd1
1 parent 2d81775
commit e916cd1
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/pages/admin/review.ts b/pages/admin/review.ts
@@ -1,5 +1,5 @@
 import { API, createActionList, createBreadcrumb, createTagList, LoadingSpinner, Navigation, stupidErrorAlert } from "shared/mod.ts";
-import { BasicLabel, Body, Button, ButtonStyle, Color, Empty, Entry, Grid, Horizontal, isMobile, Label, Spacer, Vertical, WebGen } from "webgen/mod.ts";
+import { Body, Button, ButtonStyle, Color, Empty, Entry, Grid, Horizontal, isMobile, Label, Spacer, Vertical, WebGen } from "webgen/mod.ts";
 import "../../assets/css/main.css";
 import "../../assets/css/music.css";
 import { DynaNavigation } from "../../components/nav.ts";
@@ -120,7 +120,7 @@ sheetStack.setDefault(Vertical(
                 : LoadingSpinner()
         ).asRefComponent(),
         Vertical(
-            BasicLabel({ title: "", subtitle: "Drop History" }),
+            Label("Drop History", "h1").setTextAlign("center"),
             reviewState.$drop.map((drop) =>
                 drop
                     ? Vertical(

diff --git a/pages/music/data.ts b/pages/music/data.ts
@@ -16,8 +16,7 @@ export function uploadSongToDrop(songs: Reference<Song[]>, artists: ArtistRef[],
         _id: uploadId,
         title: cleanedUpTitle,
         artists,
-        // TODO: country should be real country
-        country: language,
+        language,
         instrumental: false,
         explicit: false,
         primaryGenre,
@@ -41,7 +40,7 @@ export function uploadSongToDrop(songs: Reference<Song[]>, artists: ArtistRef[],
             const song = await API.music.songs.create({
                 title: cleanedUpTitle,
                 artists,
-                country: language,
+                language,
                 instrumental: false,
                 explicit: false,
                 primaryGenre,

diff --git a/pages/music/views/table.ts b/pages/music/views/table.ts
@@ -1,9 +1,9 @@
+import { getSecondary, getYearList, ProfilePicture, sheetStack } from "shared/helper.ts";
 import { API, Progress, stupidErrorAlert, Table2 } from "shared/mod.ts";
 import { asRef, asState, Box, Button, Checkbox, Color, DropDownInput, Grid, Horizontal, IconButton, InlineTextInput, Label, MIcon, Reference, SheetDialog, Spacer, TextInput } from "webgen/mod.ts";
 import genres from "../../../data/genres.json" with { type: "json" };
 import language from "../../../data/language.json" with { type: "json" };
 import { Artist, ArtistRef, ArtistTypes, Song } from "../../../spec/music.ts";
-import { getSecondary, getYearList, ProfilePicture, sheetStack } from "../../shared/helper.ts";
 import "./table.css";
 
 export function ManageSongs(songs: Reference<Song[]>, uploadingSongs: Reference<{ [uploadId: string]: number }[]>, primaryGenre: string, artistList?: Artist[]) {
@@ -33,11 +33,10 @@ export function ManageSongs(songs: Reference<Song[]>, uploadingSongs: Reference<
                 .ref(data)
                 .addClass("low-level");
         })
-        //TODO: create real country.json
-        .addColumn("Country", (song) => {
-            const data = asRef(song.country);
-            data.listen((x, oldVal) => (oldVal != undefined) && songs.updateItem(song, { ...song, country: x }));
-            return DropDownInput("Country", Object.keys(language))
+        .addColumn("Language", (song) => {
+            const data = asRef(song.language);
+            data.listen((x, oldVal) => (oldVal != undefined) && songs.updateItem(song, { ...song, language: x }));
+            return DropDownInput("Language", Object.keys(language))
                 .setRender((key) => language[<keyof typeof language> key])
                 .ref(data)
                 .addClass("low-level");

diff --git a/spec/music.ts b/spec/music.ts
@@ -69,9 +69,9 @@ export const song = zod.object({
     primaryGenre: zod.string(),
     secondaryGenre: zod.string(),
     year: zod.number(),
-    country: zod.string(),
-    //TODO: Add in frontend mby
-    language: zod.string().optional(),
+    //add in frontend with additional info sheet
+    country: zod.string().optional(),
+    language: zod.string(),
     explicit: zod.boolean(),
     instrumental: zod.boolean(),
     file: zod.string({ required_error: "a Song is missing its file." }),