From a591a334ed6fd7f8ed936bf7e7edfcce08de035a Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 10 Jul 2020 00:20:26 +0900
Subject: [PATCH] refactor

---
 src/client/init.ts                            |  4 +--
 src/client/pages/preferences/theme.vue        |  2 +-
 src/client/{ => scripts}/theme.ts             | 28 +++++++++----------
 .../themes/{lavender.json5 => lilac.json5}    |  2 +-
 4 files changed, 18 insertions(+), 18 deletions(-)
 rename src/client/{ => scripts}/theme.ts (81%)
 rename src/client/themes/{lavender.json5 => lilac.json5} (93%)

diff --git a/src/client/init.ts b/src/client/init.ts
index a5c310dd6f..21f233cc91 100644
--- a/src/client/init.ts
+++ b/src/client/init.ts
@@ -18,7 +18,7 @@ import PostFormDialog from './components/post-form-dialog.vue';
 import Dialog from './components/dialog.vue';
 import Menu from './components/menu.vue';
 import { router } from './router';
-import { applyTheme, lightTheme } from './theme';
+import { applyTheme, lightTheme } from './scripts/theme';
 import { isDeviceDarkmode } from './scripts/is-device-darkmode';
 import createStore from './store';
 import { clientDb, get, count } from './db';
@@ -114,7 +114,7 @@ os.init(async () => {
 	}, false);
 
 	store.watch(state => state.device.darkMode, darkMode => {
-		import('./theme').then(({ builtinThemes }) => {
+		import('./scripts/theme').then(({ builtinThemes }) => {
 			const themes = builtinThemes.concat(store.state.device.themes);
 			applyTheme(themes.find(x => x.id === (darkMode ? store.state.device.darkTheme : store.state.device.lightTheme)));
 		});
diff --git a/src/client/pages/preferences/theme.vue b/src/client/pages/preferences/theme.vue
index 2111fa2248..246787fa58 100644
--- a/src/client/pages/preferences/theme.vue
+++ b/src/client/pages/preferences/theme.vue
@@ -87,7 +87,7 @@ import MkButton from '../../components/ui/button.vue';
 import MkSelect from '../../components/ui/select.vue';
 import MkSwitch from '../../components/ui/switch.vue';
 import MkTextarea from '../../components/ui/textarea.vue';
-import { Theme, builtinThemes, applyTheme, validateTheme } from '../../theme';
+import { Theme, builtinThemes, applyTheme, validateTheme } from '../../scripts/theme';
 import { selectFile } from '../../scripts/select-file';
 import { isDeviceDarkmode } from '../../scripts/is-device-darkmode';
 
diff --git a/src/client/theme.ts b/src/client/scripts/theme.ts
similarity index 81%
rename from src/client/theme.ts
rename to src/client/scripts/theme.ts
index 07981c36ff..d458df45f0 100644
--- a/src/client/theme.ts
+++ b/src/client/scripts/theme.ts
@@ -9,22 +9,22 @@ export type Theme = {
 	props: { [key: string]: string };
 };
 
-export const lightTheme: Theme = require('./themes/_light.json5');
-export const darkTheme: Theme = require('./themes/_dark.json5');
+export const lightTheme: Theme = require('../themes/_light.json5');
+export const darkTheme: Theme = require('../themes/_dark.json5');
 
 export const builtinThemes = [
-	require('./themes/white.json5'),
-	require('./themes/black.json5'),
-	require('./themes/lavender.json5'),
-	require('./themes/halloween.json5'),
-	require('./themes/city.json5'),
-	require('./themes/rainy.json5'),
-	require('./themes/urban.json5'),
-	require('./themes/cafe.json5'),
-	require('./themes/chocolate.json5'),
-	require('./themes/danboard.json5'),
-	require('./themes/olive.json5'),
-	require('./themes/ocean.json5'),
+	require('../themes/white.json5'),
+	require('../themes/black.json5'),
+	require('../themes/lilac.json5'),
+	require('../themes/halloween.json5'),
+	require('../themes/city.json5'),
+	require('../themes/rainy.json5'),
+	require('../themes/urban.json5'),
+	require('../themes/cafe.json5'),
+	require('../themes/chocolate.json5'),
+	require('../themes/danboard.json5'),
+	require('../themes/olive.json5'),
+	require('../themes/ocean.json5'),
 ] as Theme[];
 
 let timeout = null;
diff --git a/src/client/themes/lavender.json5 b/src/client/themes/lilac.json5
similarity index 93%
rename from src/client/themes/lavender.json5
rename to src/client/themes/lilac.json5
index faa4093612..44e2591512 100644
--- a/src/client/themes/lavender.json5
+++ b/src/client/themes/lilac.json5
@@ -1,7 +1,7 @@
 {
 	id: 'e9c8c01d-9c15-48d0-9b5c-3d00843b5b36',
 
-	name: 'Lavender',
+	name: 'Lilac',
 	author: 'syuilo',
 
 	base: 'light',