From 5335f758c0266a5ea05a58df37c3e0ea61d777f3 Mon Sep 17 00:00:00 2001 From: Junyi Du Date: Mon, 4 Jul 2022 15:28:08 +0800 Subject: [PATCH] chore: discord -> forum --- CODE_OF_CONDUCT.md | 2 +- README.md | 4 +++- src/main/frontend/components/header.cljs | 6 +++--- src/main/frontend/components/onboarding.cljs | 8 ++++---- src/main/frontend/components/widgets.cljs | 4 ++-- src/main/frontend/core.cljs | 2 +- src/main/frontend/dicts.cljc | 4 +++- 7 files changed, 17 insertions(+), 13 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index b438fa031..dab84a14a 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -13,4 +13,4 @@ This Code of Conduct applies within all community spaces, and also applies when - Please respect each other. Do not dismiss, abuse, harass, attack, insult, or discriminate against others. - Likewise, any spamming, trolling, flaming, baiting or other attention-stealing behavior is not welcome. - Respect that people have differences of opinion and that every design or implementation choice carries a trade-off and numerous costs. There is seldom a right answer. -- If you feel being harassed or made uncomfortable by a community member, please report the incident(s) either by contacting the moderators on the [Discord](https://discord.gg/KpN4eHY) channel, Tienson Qin (@tiensonqin) on GitHub, or the official [Twitter](https://twitter.com/logseq). We will work with you to resolve the issue promptly. +- If you feel being harassed or made uncomfortable by a community member, please report the incident(s) either by contacting the moderators on the [Forum](https://discuss.logseq.com), [Discord](https://discord.gg/KpN4eHY) channel, Tienson Qin (@tiensonqin) on GitHub, or the official [Twitter](https://twitter.com/logseq). We will work with you to resolve the issue promptly. diff --git a/README.md b/README.md index 6f0d3d76a..1b465876b 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ [![latest release version](https://img.shields.io/github/v/release/logseq/logseq)](https://github.com/logseq/logseq/releases) [![License](https://img.shields.io/github/license/logseq/logseq?color=blue)](https://github.com/logseq/logseq/blob/master/LICENSE.md) [![Twitter follow](https://img.shields.io/badge/follow-%40logseq-blue.svg?style=flat&logo=twitter)](https://twitter.com/logseq) +[![forum](https://img.shields.io/badge/forum-Logseq-blue.svg?style=flat&logo=discourse)](https://discuss.logseq.com) [![discord](https://img.shields.io/discord/725182569297215569?label=discord&logo=Discord&color=blue)](https://discord.gg/KpN4eHY) [![total](https://opencollective.com/logseq/tiers/badge.svg?color=blue)](https://opencollective.com/logseq) @@ -68,7 +69,8 @@ Logseq is also made possible by the following projects: - Our blog: https://logseq.com/blog - Please be sure to visit our [About page](https://logseq.com/blog/about) for the latest updates of the app - Twitter: https://twitter.com/logseq -- Discord: https://discord.gg/KpN4eHY - Where we answer questions, discuss workflows and share tips +- Forum: https://discuss.logseq.com - Where we answer questions, discuss workflows and share tips +- Discord: https://discord.gg/KpN4eHY - 中文 Discord：https://discord.gg/xYqcrXWymg - Github: https://github.com/logseq/logseq - everyone is encouraged to report issues! diff --git a/src/main/frontend/components/header.cljs b/src/main/frontend/components/header.cljs index d0e701576..4a179df1f 100644 --- a/src/main/frontend/components/header.cljs +++ b/src/main/frontend/components/header.cljs @@ -172,10 +172,10 @@ {:title [:div.flex-row.flex.justify-between.items-center [:span (t :join-community)]] - :options {:href "https://discord.gg/KpN4eHY" - :title (t :discord-title) + :options {:href "https://discuss.logseq.com" + :title (t :discourse-title) :target "_blank"} - :icon (ui/icon "brand-discord")}] + :icon (ui/icon "brand-discord")}] ;; TODO we need a discourse brand (concat page-menu-and-hr) (remove nil?)) {}))) diff --git a/src/main/frontend/components/onboarding.cljs b/src/main/frontend/components/onboarding.cljs index 08417e348..e00708022 100644 --- a/src/main/frontend/components/onboarding.cljs +++ b/src/main/frontend/components/onboarding.cljs @@ -12,9 +12,9 @@ (defn help [] [:div.help.cp__sidebar-help-docs - (let [discord-with-icon [:div.flex-row.inline-flex.items-center - [:span.mr-1 (t :help/community)] - (ui/icon "brand-discord" {:style {:font-size 20}})] + (let [discourse-with-icon [:div.flex-row.inline-flex.items-center + [:span.mr-1 (t :help/forum-community)] + (ui/icon "brand-discord" {:style {:font-size 20}})] ;; TODO we need a discourse brand list [{:title "Usage" :children [[[:a @@ -29,7 +29,7 @@ {:title "Community" :children [[(t :help/awesome-logseq) "https://github.com/logseq/awesome-logseq"] [(t :help/blog) "https://blog.logseq.com"] - [discord-with-icon "https://discord.gg/KpN4eHY"]]} + [discourse-with-icon "https://discuss.logseq.com"]]} {:title "Development" :children [[(t :help/roadmap) "https://trello.com/b/8txSM12G/roadmap"] diff --git a/src/main/frontend/components/widgets.cljs b/src/main/frontend/components/widgets.cljs index 6a9185725..dcdfd3df3 100644 --- a/src/main/frontend/components/widgets.cljs +++ b/src/main/frontend/components/widgets.cljs @@ -39,9 +39,9 @@ [:li.mt-8 [:div.font-bold.mb-2 "I need some help"] - [:p "👋 Join our discord group to chat with the makers and our helpful community members."] + [:p "👋 Join our Forum to chat with the makers and our helpful community members."] (ui/button "Join the community" - :href "https://discord.gg/KpN4eHY" + :href "https://discuss.logseq.com" :target "_blank")]]] [:div.cp__widgets-open-local-directory [:div.select-file-wrap.cursor diff --git a/src/main/frontend/core.cljs b/src/main/frontend/core.cljs index 85b0a4006..32eef7d45 100644 --- a/src/main/frontend/core.cljs +++ b/src/main/frontend/core.cljs @@ -31,7 +31,7 @@ " Welcome to Logseq! If you encounter any problem, feel free to file an issue on GitHub (https://github.com/logseq/logseq) - or join our Discord server (https://discord.gg/KpN4eHY). + or join our forum (https://discuss.logseq.com). .____ | | ____ ____ ______ ____ ______ | | / _ \\ / ___\\/ ___// __ \\/ ____/ diff --git a/src/main/frontend/dicts.cljc b/src/main/frontend/dicts.cljc index 2ce25127a..e43ae3fac 100644 --- a/src/main/frontend/dicts.cljc +++ b/src/main/frontend/dicts.cljc @@ -26,6 +26,7 @@ :help/privacy "Privacy policy" :help/terms "Terms" :help/community "Discord community" + :help/forum-community "Forum community" :help/awesome-logseq "Awesome Logseq" :help/shortcuts "Keyboard shortcuts" :help/shortcuts-triggers "Triggers" @@ -251,7 +252,8 @@ :import "Import" :join-community "Join the community" :sponsor-us "Sponsor Us" - :discord-title "Our discord group!" + :discourse-title "Our forum!" + :discord-title "Our discord group!" ;; unused :help-shortcut-title "Click to check shortcuts and other tips" :loading "Loading" :cloning "Cloning"