From 63c3da2af27fcfb1a9893ade03543e3a30949c8d Mon Sep 17 00:00:00 2001
From: Ruben Beltran del Rio <ruben@unlimited.pizza>
Date: Mon, 12 Apr 2021 15:42:43 +0200
Subject: Allow for conditional reply

---
 src/components/header/header.svelte                       | 5 ++++-
 src/components/language_selector/language_selector.svelte | 6 +++---
 src/pages/t/[id].svelte                                   | 6 ------
 src/pages/t/[topic_id].svelte                             | 6 ++++++
 4 files changed, 13 insertions(+), 10 deletions(-)
 delete mode 100644 src/pages/t/[id].svelte
 create mode 100644 src/pages/t/[topic_id].svelte

(limited to 'src')

diff --git a/src/components/header/header.svelte b/src/components/header/header.svelte
index ed91526..c68a685 100644
--- a/src/components/header/header.svelte
+++ b/src/components/header/header.svelte
@@ -1,6 +1,7 @@
 <script>
   import { _ } from 'svelte-i18n';
 
+  import { params } from '@roxi/routify';
   import { version } from '$/config/config';
 </script>
 
@@ -8,7 +9,9 @@
   <ul>
     <li><strong><a href="/" aria-label="{$_('header.long_version', { values: { version } })}">{$_('header.short_version', { values: { version } })}</a></strong></li>
     <li><a href="/new" aria-label="{$_('header.action.new.title')}">{@html $_('header.action.new.display')}</a></li>
-    <li><a href="/reply" aria-label="{$_('header.action.reply.title')}">{@html $_('header.action.reply.display')}</a></li>
+    {#if $params.topic_id}
+      <li><a href="/reply/{$params.topic_id}" aria-label="{$_('header.action.reply.title')}">{@html $_('header.action.reply.display')}</a></li>
+    {/if}
     <li><a href="/search" aria-label="{$_('header.action.search.title')}">{@html $_('header.action.search.display')}</a></li>
     <li><a href="/logout" aria-label="{$_('header.action.log_out.title')}">{@html $_('header.action.log_out.display')}</a></li>
   </ul>
diff --git a/src/components/language_selector/language_selector.svelte b/src/components/language_selector/language_selector.svelte
index 67c0814..3ac4894 100644
--- a/src/components/language_selector/language_selector.svelte
+++ b/src/components/language_selector/language_selector.svelte
@@ -3,9 +3,9 @@
   import { getLangNameFromCode } from 'language-name-map';
 
   $: namedLocales = $locales
-    .map((locale) => ({
-      code: locale,
-      ...getLangNameFromCode(locale)
+    .map((code) => ({
+      code,
+      ...getLangNameFromCode(code)
     }))
     .sort((a, b) => a.native - b.native);
 
diff --git a/src/pages/t/[id].svelte b/src/pages/t/[id].svelte
deleted file mode 100644
index e13fd04..0000000
--- a/src/pages/t/[id].svelte
+++ /dev/null
@@ -1,6 +0,0 @@
-<script>
-  import Topic from '$/components/topic/topic.svelte';
-  export let id;
-</script>
-
-<Topic id={id}/>
diff --git a/src/pages/t/[topic_id].svelte b/src/pages/t/[topic_id].svelte
new file mode 100644
index 0000000..8ead8f3
--- /dev/null
+++ b/src/pages/t/[topic_id].svelte
@@ -0,0 +1,6 @@
+<script>
+  import Topic from '$/components/topic/topic.svelte';
+  export let topic_id;
+</script>
+
+<Topic id={topic_id}/>
-- 
cgit