fix logout issue

web/.env.example

@@ -1,4 +1,6 @@
 DATABASE_URL="postgresql://kycnot:kycnot@localhost:3399/kycnot?schema=public"
 REDIS_URL="redis://localhost:6379"
 SOURCE_CODE_URL="https://github.com"
-SITE_URL="https://localhost:4321"
+SITE_URL="https://localhost:4321"
+ONION_ADDRESS="http://kycnotmezdiftahfmc34pqbpicxlnx3jbf5p7jypge7gdvduu7i6qjqd.onion"
+I2P_ADDRESS="http://nti3rj4j4disjcm2kvp4eno7otcejbbxv3ggxwr5tpfk4jucah7q.b32.i2p"

web/astro.config.mjs

@@ -74,6 +74,18 @@ export default defineConfig({
         url: true,
         optional: false,
       }),
+      I2P_ADDRESS: envField.string({
+        context: 'server',
+        access: 'public',
+        url: true,
+        optional: false,
+      }),
+      ONION_ADDRESS: envField.string({
+        context: 'server',
+        access: 'public',
+        url: true,
+        optional: false,
+      }),
 
       REDIS_URL: envField.string({
         context: 'server',

web/src/components/Captcha.astro

@@ -1,6 +1,7 @@
 ---
 import { Icon } from 'astro-icon/components'
 import { isInputError, type ActionAccept, type ActionClient } from 'astro:actions'
+import { Image } from 'astro:assets'
 
 import { CAPTCHA_LENGTH, generateCaptcha } from '../lib/captcha'
 import { cn } from '../lib/cn'

web/src/components/DonationAddress.astro

@@ -1,6 +1,6 @@
 ---
 import { Icon } from 'astro-icon/components'
-import QRCode from 'qrcode'
+import * as QRCode from 'qrcode'
 
 import { cn } from '../lib/cn'
 
@@ -26,7 +26,7 @@ function getAddressURI(address: string, cryptoName: string) {
 }
 
 const qrCodeDataURL = await QRCode.toDataURL(getAddressURI(address, cryptoName), {
-  width: 128,
+  width: 256,
   margin: 1,
   color: {
     dark: '#ffffff',
@@ -41,13 +41,18 @@ const qrCodeDataURL = await QRCode.toDataURL(getAddressURI(address, cryptoName),
       <Icon name={cryptoIcon} class="size-6 text-white" />
       <span class="font-title text-base font-semibold text-white">{cryptoName}</span>
     </div>
-    <p class="px-7 font-mono text-base leading-snug tracking-wide break-all text-white">
+    <p
-      <span
+      class="cursor-pointer px-7 font-mono text-base leading-snug tracking-wide break-all text-white select-all"
-        class="cursor-pointer select-all"
+    >
-        set:html={address.length > 12
+      {
-          ? `<span class="font-bold mr-0.5 text-green-500">${address.substring(0, 6)}</span>${address.substring(6, address.length - 6)}<span class="font-bold ml-0.5 text-green-500">${address.substring(address.length - 6)}</span>`
+        address.length > 12
-          : `<span class="font-bold">${address}</span>`}
+          ? [
-      />
+              <span class="mr-0.5 font-bold text-green-500">{address.substring(0, 6)}</span>,
+              address.substring(6, address.length - 6),
+              <span class="ml-0.5 font-bold text-green-500">{address.substring(address.length - 6)}</span>,
+            ]
+          : address
+      }
     </p>
   </div>
   <img
@@ -55,6 +60,6 @@ const qrCodeDataURL = await QRCode.toDataURL(getAddressURI(address, cryptoName),
     alt={`${cryptoName} QR code`}
     width="128"
     height="128"
-    class="mr-4 hidden size-36 rounded sm:block"
+    class="mr-4 hidden size-32 rounded sm:block"
   />
 </div>

web/src/components/Footer.astro

@@ -1,6 +1,6 @@
 ---
 import { Icon } from 'astro-icon/components'
-import { SOURCE_CODE_URL } from 'astro:env/server'
+import { SOURCE_CODE_URL, I2P_ADDRESS, ONION_ADDRESS } from 'astro:env/server'
 
 import { cn } from '../lib/cn'
 
@@ -11,10 +11,22 @@ type Props = HTMLAttributes<'footer'>
 const links = [
   {
     href: SOURCE_CODE_URL,
-    label: 'Source Code',
+    label: 'Code',
     icon: 'ri:git-repository-line',
     external: true,
   },
+  {
+    href: ONION_ADDRESS,
+    label: 'Tor',
+    icon: 'onion',
+    external: true,
+  },
+  {
+    href: I2P_ADDRESS,
+    label: 'I2P',
+    icon: 'i2p',
+    external: true,
+  },
   {
     href: '/about',
     label: 'About',

web/src/components/Header.astro

@@ -159,17 +159,15 @@ const splashText = showSplashText ? sample(splashTexts) : null
                 <Icon name="ri:user-shared-2-line" class="size-4" />
               </a>
             ) : (
-              DEPLOYMENT_MODE !== 'production' && (
+              <a
-                <a
+                href="/account/logout"
-                  href="/account/logout"
+                data-astro-prefetch="tap"
-                  data-astro-prefetch="tap"
+                class="xs:px-3 2xs:px-2 last:xs:-mr-3 last:2xs:-mr-2 flex h-full items-center px-1 text-sm text-stone-100 transition-colors last:-mr-1 hover:text-stone-200"
-                  class="xs:px-3 2xs:px-2 last:xs:-mr-3 last:2xs:-mr-2 flex h-full items-center px-1 text-sm text-stone-100 transition-colors last:-mr-1 hover:text-stone-200"
+                transition:name="header-logout-link"
-                  transition:name="header-logout-link"
+                aria-label="Logout"
-                  aria-label="Logout"
+              >
-                >
+                <Icon name="ri:logout-box-r-line" class="size-4" />
-                  <Icon name="ri:logout-box-r-line" class="size-4" />
+              </a>
-                </a>
-              )
             )}
           </>
         ) : (

web/src/pages/about.mdx

@@ -202,12 +202,10 @@ If you like this project, you can **support** it through these methods:
 
 ## Contact
 
-You can contact via direct chat or via email.
+You can contact via direct chat:
 
 - [SimpleX Chat](https://simplex.chat/contact#/?v=2&smp=smp%3A%2F%2F0YuTwO05YJWS8rkjn9eLJDjQhFKvIYd8d4xG8X1blIU%3D%40smp8.simplex.im%2FcgKHYUYnpAIVoGb9lxb0qEMEpvYIvc1O%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAIW_JSq8wOsLKG4Xv4O54uT2D_l8MJBYKQIFj1FjZpnU%253D%26srv%3Dbeccx4yfxxbvyhqypaavemqurytl6hozr47wfc7uuecacjqdvwpw2xid.onion)
 
-- If you use ProtonMail or Tutanota, you can have E2E encrypted communications with us directly. We also offer a [PGP Key](/pgp). Otherwise, we recommend reaching out via SimpleX chat for encrypted communications.
-
 
 ## Disclaimer
 

web/src/pages/admin/users/index.astro

@@ -336,6 +336,14 @@ const makeSortUrl = (slug: NonNullable<(typeof filters)['sort-by']>) => {
                       >
                         <Icon name="ri:edit-line" class="size-4" />
                       </Tooltip>
+                      <Tooltip
+                        as="a"
+                        href={`/u/${user.name}`}
+                        class="inline-flex items-center rounded-md border border-green-500/50 bg-green-500/20 px-1 py-1 text-xs text-green-400 transition-colors hover:bg-green-500/30"
+                        text="Public profile"
+                      >
+                        <Icon name="ri:global-line" class="size-4" />
+                      </Tooltip>
                     </div>
                   </td>
                 </tr>