From 6918648ed6330e8a2b9e5990e848540de66822d7 Mon Sep 17 00:00:00 2001
From: LoveEevee <LoveEevee@users.noreply.github.com>
Date: Tue, 22 Dec 2020 20:05:56 +0300
Subject: [PATCH] Move privacy link, add categories.json to tools

---
 config.example.py                 |   6 +-
 public/src/js/customsongs.js      |   5 +-
 public/src/views/customsongs.html |   4 +-
 tools/categories.json             | 146 ++++++++++++++++++++++++++++++
 4 files changed, 156 insertions(+), 5 deletions(-)
 create mode 100644 tools/categories.json

diff --git a/config.example.py b/config.example.py
index a2cfbf5..f954121 100644
--- a/config.example.py
+++ b/config.example.py
@@ -1,11 +1,11 @@
 # The full URL base asset URL, with trailing slash.
-ASSETS_BASEURL = ''
+ASSETS_BASEURL = '/assets/'
 
 # The full URL base song URL, with trailing slash.
-SONGS_BASEURL = ''
+SONGS_BASEURL = '/songs/'
 
 # The email address to display in the "About Simulator" menu.
-EMAIL = 'taiko@example.com'
+EMAIL = None
 
 # Whether to use the user account system.
 ACCOUNTS = True
diff --git a/public/src/js/customsongs.js b/public/src/js/customsongs.js
index c9f0b6c..6edc60c 100644
--- a/public/src/js/customsongs.js
+++ b/public/src/js/customsongs.js
@@ -56,6 +56,7 @@ class CustomSongs{
 			this.items.push(this.linkPrivacy)
 		}else{
 			groupGdrive.style.display = "none"
+			this.linkPrivacy.parentNode.removeChild(this.linkPrivacy)
 		}
 		
 		this.endButton = this.getElement("view-end-button")
@@ -349,7 +350,9 @@ class CustomSongs{
 				}
 			}else if(name === "previous" || name === "next"){
 				selected.classList.remove("selected")
-				this.selected = this.mod(this.items.length, this.selected + (name === "next" ? 1 : -1))
+				do{
+					this.selected = this.mod(this.items.length, this.selected + (name === "next" ? 1 : -1))
+				}while(this.items[this.selected] === this.linkPrivacy && name !== "previous")
 				this.items[this.selected].classList.add("selected")
 				assets.sounds["se_ka"].play()
 			}else if(name === "back" || name === "backEsc"){
diff --git a/public/src/views/customsongs.html b/public/src/views/customsongs.html
index e4cc1eb..dec9b80 100644
--- a/public/src/views/customsongs.html
+++ b/public/src/views/customsongs.html
@@ -9,9 +9,11 @@
 			<div id="group-gdrive">
 				<div id="link-gdrivefolder" class="taibtn stroke-sub link-btn"></div>
 				<div id="link-gdriveaccount" class="taibtn stroke-sub link-btn"></div>
-				<div id="link-privacy" class="taibtn stroke-sub link-btn"></div>
 			</div>
 		</div>
+		<div class="left-buttons">
+			<div id="link-privacy" class="taibtn stroke-sub link-btn"></div>
+		</div>
 		<div class="view-end-button taibtn stroke-sub"></div>
 		<div class="view-outer shadow-outer" id="dropzone">
 			<div class="view">
diff --git a/tools/categories.json b/tools/categories.json
new file mode 100644
index 0000000..ed0d726
--- /dev/null
+++ b/tools/categories.json
@@ -0,0 +1,146 @@
+[{
+	"id": 1,
+	"title": "Pop",
+	"title_lang": {
+		"ja": "J-POP",
+		"en": "Pop",
+		"cn": "流行音乐",
+		"tw": "流行音樂",
+		"ko": "POP"
+	},
+	"song_skin": {
+		"sort": 1,
+		"background": "#219fbb",
+		"border": ["#7ec3d3", "#0b6773"],
+		"outline": "#005058",
+		"info_fill": "#004d68",
+		"bg_img": "bg_genre_0.png"
+	},
+	"aliases": null
+},{
+	"id": 2,
+	"title": "Anime",
+	"title_lang": {
+		"ja": "アニメ",
+		"en": "Anime",
+		"cn": "卡通动画音乐",
+		"tw": "卡通動畫音樂",
+		"ko": "애니메이션"
+	},
+	"song_skin": {
+		"sort": 2,
+		"background": "#ff9700",
+		"border": ["#ffdb8c", "#e75500"],
+		"outline": "#9c4100",
+		"info_fill": "#9c4002",
+		"bg_img": "bg_genre_1.png"
+	},
+	"aliases": null
+},{
+	"id": 3,
+	"title": "VOCALOID™ Music",
+	"title_lang": {
+		"ja": "ボーカロイド™曲",
+		"en": "VOCALOID™ Music"
+	},
+	"song_skin": {
+		"sort": 3,
+		"background": "#def2ef",
+		"border": ["#f7fbff", "#79919f"],
+		"outline": "#5a6584",
+		"info_fill": "#546184",
+		"bg_img": "bg_genre_2.png"
+	},
+	"aliases": [
+		"ボーカロイド曲",
+		"ボーカロイド",
+		"vocaloid music",
+		"vocaloid"
+	]
+},{
+	"id": 4,
+	"title": "Variety",
+	"title_lang": {
+		"ja": "バラエティ",
+		"en": "Variety",
+		"cn": "综合音乐",
+		"tw": "綜合音樂",
+		"ko": "버라이어티"
+	},
+	"song_skin": {
+		"sort": 4,
+		"background": "#8fd321",
+		"border": ["#f7fbff", "#587d0b"],
+		"outline": "#374c00",
+		"info_fill": "#3c6800",
+		"bg_img": "bg_genre_3.png"
+	},
+	"aliases": [
+		"バラエティー",
+		"どうよう",
+		"童謡・民謡",
+		"children",
+		"children/folk",
+		"children-folk"
+	]
+},{
+	"id": 5,
+	"title": "Classical",
+	"title_lang": {
+		"ja": "クラシック",
+		"en": "Classical",
+		"cn": "古典音乐",
+		"tw": "古典音樂",
+		"ko": "클래식"
+	},
+	"song_skin": {
+		"sort": 5,
+		"background": "#d1a016",
+		"border": ["#e7cf6b", "#9a6b00"],
+		"outline": "#734d00",
+		"info_fill": "#865800",
+		"bg_img": "bg_genre_4.png"
+	},
+	"aliases": [
+		"クラッシック",
+		"classic"
+	]
+},{
+	"id": 6,
+	"title": "Game Music",
+	"title_lang": {
+		"ja": "ゲームミュージック",
+		"en": "Game Music",
+		"cn": "游戏音乐",
+		"tw": "遊戲音樂",
+		"ko": "게임"
+	},
+	"song_skin": {
+		"sort": 6,
+		"background": "#9c72c0",
+		"border": ["#bda2ce", "#63407e"],
+		"outline": "#4b1c74",
+		"info_fill": "#4f2886",
+		"bg_img": "bg_genre_5.png"
+	},
+	"aliases": null
+},{
+	"id": 7,
+	"title": "NAMCO Original",
+	"title_lang": {
+		"ja": "ナムコオリジナル",
+		"en": "NAMCO Original",
+		"cn": "NAMCO原创音乐",
+		"tw": "NAMCO原創音樂",
+		"ko": "남코 오리지널"
+	},
+	"song_skin": {
+		"sort": 7,
+		"background": "#ff5716",
+		"border": ["#ffa66b", "#b53000"],
+		"outline": "#941c00",
+		"info_fill": "#961e00",
+		"bg_img": "bg_genre_6.png"
+	},
+	"aliases": null
+}]