Merge remote-tracking branch 'Muriwolf/swapee' into swapee

2 files changed, 35 insertions, 36 deletions

diff --git a/src/components/AppHeader.svelte b/src/components/AppHeader.svelte
index 42536e62..147ba834 100644
--- a/src/components/AppHeader.svelte
+++ b/src/components/AppHeader.svelte
@@ -48,7 +48,7 @@
       {#if user}
         <a href={`/${user.username}`}>
           <button
-            class="bg-white dark:bg-black p-2 rounded-full w-12 h-12 md:w-16 md:h-16 drop-shadow-xl border border-black/10 {$page
+            class="bg-white dark:!bg-black p-2 rounded-full w-12 h-12 md:w-16 md:h-16 drop-shadow-xl border border-black/10 {$page
               .url.pathname === `/${user.username}`
               ? 'opacity-100'
               : 'opacity-70 hover:opacity-80'}"
@@ -57,7 +57,7 @@
         </a>
         <a href={`/${user.username}/buy`}>
           <button
-            class="bg-white dark:bg-black p-2 rounded-full w-12 h-12 md:w-16 md:h-16 drop-shadow-xl border border-black/10 {$page
+            class="bg-white dark:!bg-black p-2 rounded-full w-12 h-12 md:w-16 md:h-16 drop-shadow-xl border border-black/10 {$page
               .url.pathname === `/${user.username}/buy`
               ? 'opacity-100'
               : 'opacity-70 hover:opacity-80'}"
@@ -66,7 +66,7 @@
         </a>
         <a href={`/${user.username}/receive`}>
           <button
-            class="bg-white dark:bg-black p-2 rounded-full w-12 h-12 md:w-16 md:h-16 drop-shadow-xl border border-black/10 {$page
+            class="bg-white dark:!bg-black p-2 rounded-full w-12 h-12 md:w-16 md:h-16 drop-shadow-xl border border-black/10 {$page
               .url.pathname === `/${user.username}/receive`
               ? 'opacity-100'
               : 'opacity-70 hover:opacity-80'}"
@@ -75,7 +75,7 @@
         </a>
         <a href={`/${user.username}/payments`}>
           <button
-            class="bg-white dark:bg-black p-2 rounded-full w-12 h-12 md:w-16 md:h-16 drop-shadow-xl border border-black/10 {$page
+            class="bg-white dark:!bg-black p-2 rounded-full w-12 h-12 md:w-16 md:h-16 drop-shadow-xl border border-black/10 {$page
               .url.pathname === `/${user.username}/payments`
               ? 'opacity-100'
               : 'opacity-70 hover:opacity-80'} relative"
@@ -96,7 +96,7 @@
         </a>
         <a href={`/send`}>
           <button
-            class="bg-white dark:bg-black p-2 rounded-full w-12 h-12 md:w-16 md:h-16 drop-shadow-xl border border-black/10 {$page
+            class="bg-white dark:!bg-black p-2 rounded-full w-12 h-12 md:w-16 md:h-16 drop-shadow-xl border border-black/10 {$page
               .url.pathname === `/send`
               ? 'opacity-100'
               : 'opacity-70 hover:opacity-80'}"
@@ -106,7 +106,7 @@
         <div class="relative">
           <OutClick on:outclick={() => (showMenu = false)}>
             <button
-              class="bg-white dark:bg-black p-2 rounded-full w-12 h-12 md:w-16 md:h-16 drop-shadow-xl border border-black/10 {$page
+              class="bg-white dark:!bg-black p-2 rounded-full w-12 h-12 md:w-16 md:h-16 drop-shadow-xl border border-black/10 {$page
                 .url.pathname === `/${user.username}` ||
               $page.url.pathname === `/${user.username}/settings` ||
               $page.url.pathname === `/support`
@@ -121,7 +121,7 @@
             <div
               class="{showMenu
                 ? 'block'
-                : 'hidden'} absolute top-14 right-0 bg-white dark:bg-black dark:border-2 dark:border-gray-50 rounded-3xl p-8 shadow-xl z-50"
+                : 'hidden'} absolute top-14 right-0 bg-white dark:!bg-black dark:border-2 dark:border-gray-50 rounded-3xl p-8 shadow-xl z-50"
             >
               <ul class="space-y-5 w-48">
                 {#each menuButtons as { href, icon, key }}
@@ -145,7 +145,7 @@
         </div>
       {:else}
         <a href={`/login?redirect=${$page.url.pathname}`}>
-          <button class="bg-white dark:bg-black px-5 py-2 rounded-xl font-semibold text-sm"
+          <button class="bg-white dark:!bg-black px-5 py-2 rounded-xl font-semibold text-sm"
             >{$t("nav.signIn")}</button
           >
         </a>
diff --git a/src/components/Footer.svelte b/src/components/Footer.svelte
index 12977900..bfeac41a 100644
--- a/src/components/Footer.svelte
+++ b/src/components/Footer.svelte
@@ -1,7 +1,10 @@
 <script>
-  import Icon from "$comp/Icon.svelte";
-  import LocaleSelector from "$comp/LocaleSelector.svelte";
-  import { t } from "$lib/translations";
+	import Icon from "$comp/Icon.svelte";
+	import LocaleSelector from "$comp/LocaleSelector.svelte";
+	import { t } from "$lib/translations";
+
+	const date = new Date()
+	const currentYear = date.getFullYear()
 
 	const followLinks = [
 		{ url: 'https://twitter.com/swapeewallet', titleID: 'twitter' },
@@ -9,53 +12,49 @@
 		{ url: 'https://linktr.ee/swapee.me', titleID: 'linktree' }
 	];
 
-  const companyLinks = [
-    { url: "/docs", titleID: "documentation" },
-    { url: "/support", titleID: "support" },
-  ];
+	const companyLinks = [
+		{ url: "/docs", titleID: "documentation" },
+		{ url: "/support", titleID: "support" },
+	];
 </script>
 <footer class="pt-16 bg-black">
 	<div class="max-w-[1296px] mx-auto px-8">
-		<!-- footer_top -->
-		<div class="footer_top pb-4">
+		<div class="footer_top border-b-[1] border-gray-800 pb-4">
 			<div class="flex-col md:flex-row flex md:items-center justify-between">
 				<div class="flex-1 mb-12 sm:mb-5">
-					<a href="#" class="footer_logo"><img src="images/footer-logo.png" alt="" /></a>
-					<p class="text-gray-200 mt-10">Copyright © 2023. Swapee.me</p>
+					<a href="#" ><img src="images/footer-logo.png" alt="swapee logo" class="max-w-36" /></a>
+					<p class="text-gray-200 mt-10">Copyright © {currentYear ?? 2024}. Swapee.me</p>
 					<p class="text-gray-200 mt-3">All rights reserved.</p>
 					<a href="#" class="btn_language inline-block mt-6 font-bold !text-white hover:!text-black">English</a>
 				</div>
-				<div
-					class="flex-1 footer_top_right flex items-center justify-start md:justify-center "
-				>
+				<div class="flex-1 flex items-center justify-start md:justify-center">
 					<div class="flex max-sm:flex-col md:justify-end gap-x-6">
 						<div class="flex-1 xl:mb-0 mb-4 md:pr-0 sm:pr-5">
 							<h6 class="!text-white/80 mb-0">Business enquiries</h6>
-							<a href="mailto:[email protected]">[email protected]</a>
+							<a href="mailto:[email protected]" class="text-swapee-purple hover:underline">[email protected]</a>
 						</div>
 						<div class="flex-1 xs:pr-5 mb-4 md:pr-0 sm:pr-5">
 							<h6 class="!text-white/80 mb-0">Support enquiries</h6>
-							<a href="mailto:[email protected]">[email protected]</a>
+							<a href="mailto:[email protected]" class="text-swapee-purple hover:underline">[email protected]</a>
 						</div>
 					</div>
 				</div>
 			</div>
 
-			<!-- footer_bottom -->
-			<div class="footer_bottom pt-4 pb-2">
-				<ul class="list-unstyled mb-0 ps-0">
-					<li class="pb-3 ">
-						<a href="/docs" class="!text-white/80 opacity-100 hover:!text-swapee-purple/100 font-semibold">Documentation</a>
+			<div class="footer_bottom flex justify-end pt-4 pb-2">
+				<ul class="flex flex-wrap justify-center mb-0 ps-0">
+					<li class="pb-3 ml-[0.9375rem]">
+						<a href="/docs" class="!text-white/80 opacity-100 hover:!text-swapee-purple/100 font-semibold py-[6px] px-[10px]">Documentation</a>
+					</li>
+					<li class="pb-3 ml-[0.9375rem]">
+						<a href="/privacy" class="!text-white/80 opacity-100 hover:!text-swapee-purple/100 font-semibold py-[6px] px-[10px]">Privacy Policy</a>
 					</li>
-					<li class="pb-3">
-						<a href="/privacy" class="!text-white/80 opacity-100 hover:!text-swapee-purple/100 font-semibold">Privacy Policy</a>
+          			<li class="pb-3 ml-[0.9375rem]">
+						<a href="/support" class="!text-white/80 opacity-100 hover:!text-swapee-purple/100 font-semibold py-[6px] px-[10px]">Support</a>
 					</li>
-          <li class="pb-3">
-						<a href="/support" class="!text-white/80 opacity-100 hover:!text-swapee-purple/100 font-semibold">Support</a>
+					<li class="pb-3 ml-[0.9375rem]">
+						<a href="/sitemap" class="!text-white/80 opacity-100 hover:!text-swapee-purple/100 font-semibold py-[6px] px-[10px]">Sitemap</a>
 					</li>
-					<li class="pb-3">
-								  <a href="/sitemap" class="!text-white/80 opacity-100 hover:!text-swapee-purple/100 font-semibold">Sitemap</a>
-							  </li>
 				</ul>
 			</div>
 		</div>