From 9ac3945baa265097603bd9d409d130bb82005394 Mon Sep 17 00:00:00 2001
From: secondl1ght <85003930+secondl1ght@users.noreply.github.com>
Date: Tue, 16 Aug 2022 10:56:47 -0600
Subject: move lang selector from app header into settings page

---
 src/components/AppHeader.svelte       | 4 +---
 src/routes/[username]/settings.svelte | 7 ++++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/components/AppHeader.svelte b/src/components/AppHeader.svelte
index 9ebf28bf..dd09d536 100644
--- a/src/components/AppHeader.svelte
+++ b/src/components/AppHeader.svelte
@@ -4,7 +4,7 @@
 	import OutClick from 'svelte-outclick';
 	import { user, newPayment, colorTheme } from '$lib/store';
 	import { goto } from '$app/navigation';
-	import { Icon, LocaleSelector } from '$comp';
+	import { Icon } from '$comp';
 
 	export let avatarPosition = 'left-[calc(50vw-48px)]';
 
@@ -30,7 +30,6 @@
 
 <header class="bg-gradient-to-r {$colorTheme} h-[175px] w-full relative">
 	<nav class="flex justify-end items-center space-x-4 p-5">
-    <LocaleSelector />
 		{#if $user}
 			<a href={`/${$user.username}/receive`}>
 				<button class="bg-white p-2 rounded-full w-12 h-12"
@@ -89,7 +88,6 @@
 				<button class="bg-white px-5 py-2 rounded-xl font-semibold text-sm">Sign in </button>
 			</a>
 		{/if}
->>>>>>> master
 	</nav>
 	<div
 		class="absolute top-[calc(175px-48px)] {avatarPosition} rounded-full border-4 border-white p-4 bg-gradient-to-r {$colorTheme} w-24 h-24"
diff --git a/src/routes/[username]/settings.svelte b/src/routes/[username]/settings.svelte
index 5abe58e0..11e0977a 100644
--- a/src/routes/[username]/settings.svelte
+++ b/src/routes/[username]/settings.svelte
@@ -1,5 +1,5 @@
 <script>
-	import { AppHeader, Icon, Toggle } from '$comp';
+	import { AppHeader, Icon, Toggle, LocaleSelector } from '$comp';
 	import { user, colorTheme } from '$lib/store';
 
 	let setting = 'account';
@@ -44,6 +44,11 @@
 		</div>
 
 		{#if setting === 'account'}
+		<div>
+      <label for="language" class="font-bold block mb-1">Language</label>
+  <LocaleSelector style='block py-3 w-full'/>
+    </div>
+
 			<div>
 				<label for="username" class="font-bold mb-1 block">Username</label>
 				<input
-- 
cgit v1.2.3