From 33f7b246be054877d054dcc88e163820161efa4b Mon Sep 17 00:00:00 2001
From: Chen-I Lim <46905241+chenilim@users.noreply.github.com>
Date: Wed, 8 Sep 2021 16:34:02 -0700
Subject: [PATCH] Fix #1161. Add Give Feedback link. (#1162)

* Fix #1161. Add Give Feedback link.

* Pass version to feedback link

* npm run i18n-extract
---
 webapp/i18n/en.json                           |  6 +++--
 webapp/src/components/topBar.scss             | 15 ++++++++++---
 webapp/src/components/topBar.tsx              | 22 +++++++++++++++++++
 .../site/content/fwlink/feedback-boards.html  | 12 ++++++++++
 .../content/fwlink/feedback-focalboard.html   | 12 ++++++++++
 5 files changed, 62 insertions(+), 5 deletions(-)
 create mode 100644 website/site/content/fwlink/feedback-boards.html
 create mode 100644 website/site/content/fwlink/feedback-focalboard.html

diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index b06a6bdea..b4708363d 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -7,6 +7,7 @@
   "BoardComponent.no-property": "No {property}",
   "BoardComponent.no-property-title": "Items with an empty {property} property will go here. This column cannot be removed.",
   "BoardComponent.show": "Show",
+  "BoardPage.syncFailed": "Board may be deleted or access revoked.",
   "CardDetail.add-content": "Add content",
   "CardDetail.add-icon": "Add icon",
   "CardDetail.add-property": "+ Add a property",
@@ -100,6 +101,7 @@
   "Sidebar.import-archive": "Import archive",
   "Sidebar.invite-users": "Invite Users",
   "Sidebar.logout": "Log out",
+  "Sidebar.no-more-workspaces": "No more workspaces",
   "Sidebar.no-views-in-board": "No pages inside",
   "Sidebar.random-icons": "Random icons",
   "Sidebar.select-a-template": "Select a template",
@@ -110,7 +112,6 @@
   "Sidebar.untitled": "Untitled",
   "Sidebar.untitled-board": "(Untitled Board)",
   "Sidebar.untitled-view": "(Untitled View)",
-  "Sidebar.no-more-workspaces": "No more workspaces",
   "TableComponent.add-icon": "Add icon",
   "TableComponent.name": "Name",
   "TableComponent.plus-new": "+ New",
@@ -122,6 +123,7 @@
   "TableHeaderMenu.sort-ascending": "Sort ascending",
   "TableHeaderMenu.sort-descending": "Sort descending",
   "TableRow.open": "Open",
+  "TopBar.give-feedback": "Give Feedback",
   "ValueSelector.valueSelector": "Value selector",
   "ValueSelectorLabel.openMenu": "Open Menu",
   "View.AddView": "Add View",
@@ -165,4 +167,4 @@
   "login.register-button": "or create an account if you don't have one",
   "register.login-button": "or login if you already have an account",
   "register.signup-title": "Sign up for your account"
-}
+}
\ No newline at end of file
diff --git a/webapp/src/components/topBar.scss b/webapp/src/components/topBar.scss
index 548375771..cf6113dae 100644
--- a/webapp/src/components/topBar.scss
+++ b/webapp/src/components/topBar.scss
@@ -9,11 +9,20 @@
 
     a {
         display: flex;
-        padding: 2px 0;
+        align-items: center;
+        padding: 2px;
+    }
+
+    a.link {
+        font-size: 14px;
+        line-height: 14px;
+        padding: 2px 10px;
+        color: rgba(var(--center-channel-color-rgb), 0.7);
     }
 
     .HelpIcon {
         font-size: 20px;
+        color: rgba(var(--center-channel-color-rgb), 0.7);
     }
 
     .versionFrame {
@@ -24,14 +33,14 @@
 
     .version {
         font-size: 11px;
-        line-height: 11px;
+        line-height: 14px;
         font-weight: 500;
         color: rgba(var(--center-channel-color-rgb), 0.7);
     }
 
     .versionBadge {
         font-size: 10px;
-        line-height: 11px;
+        line-height: 14px;
         font-weight: 500;
         margin-left: 3px;
         color: rgba(var(--center-channel-color-rgb), 0.7);
diff --git a/webapp/src/components/topBar.tsx b/webapp/src/components/topBar.tsx
index 546b89204..28544b87c 100644
--- a/webapp/src/components/topBar.tsx
+++ b/webapp/src/components/topBar.tsx
@@ -4,16 +4,28 @@
 import React from 'react'
 
 import './topBar.scss'
+import {FormattedMessage} from 'react-intl'
+
 import HelpIcon from '../widgets/icons/help'
 import {Utils} from '../utils'
 import {Constants} from '../constants'
 
 const TopBar = React.memo((): JSX.Element => {
     if (Utils.isFocalboardPlugin()) {
+        const feedbackUrl = 'https://www.focalboard.com/fwlink/feedback-boards.html?v=' + Constants.versionString
         return (
             <div
                 className='TopBar'
             >
+                <a
+                    className='link'
+                    href={feedbackUrl}
+                >
+                    <FormattedMessage
+                        id='TopBar.give-feedback'
+                        defaultMessage='Give Feedback'
+                    />
+                </a>
                 <div className='versionFrame'>
                     <div className='version'>
                         {`v${Constants.versionString}`}
@@ -24,10 +36,20 @@ const TopBar = React.memo((): JSX.Element => {
         )
     }
 
+    const focalboardFeedbackUrl = 'https://www.focalboard.com/fwlink/feedback-focalboard.html?v=' + Constants.versionString
     return (
         <div
             className='TopBar'
         >
+            <a
+                className='link'
+                href={focalboardFeedbackUrl}
+            >
+                <FormattedMessage
+                    id='TopBar.give-feedback'
+                    defaultMessage='Give Feedback'
+                />
+            </a>
             <a
                 href='https://www.focalboard.com/guide/user?utm_source=webapp'
                 target='_blank'
diff --git a/website/site/content/fwlink/feedback-boards.html b/website/site/content/fwlink/feedback-boards.html
new file mode 100644
index 000000000..718933ade
--- /dev/null
+++ b/website/site/content/fwlink/feedback-boards.html
@@ -0,0 +1,12 @@
+<html>
+    <head>
+        <meta http-equiv="refresh" content="0;url=https://docs.google.com/forms/d/e/1FAIpQLSfNLwUsG6zazDYxt_fgCV-ThH5_R9ycPTTgRTJ1DVnXuuyD7Q/viewform" />
+        <title>Page Moved</title>
+        <script type="text/javascript">
+            window.location.replace("https://docs.google.com/forms/d/e/1FAIpQLSfNLwUsG6zazDYxt_fgCV-ThH5_R9ycPTTgRTJ1DVnXuuyD7Q/viewform");
+        </script>
+    </head>
+    <body>
+        This page has moved. Click <a href="https://docs.google.com/forms/d/e/1FAIpQLSfNLwUsG6zazDYxt_fgCV-ThH5_R9ycPTTgRTJ1DVnXuuyD7Q/viewform">here</a> to go to the new page.
+    </body>
+</html>
diff --git a/website/site/content/fwlink/feedback-focalboard.html b/website/site/content/fwlink/feedback-focalboard.html
new file mode 100644
index 000000000..5e9c463f4
--- /dev/null
+++ b/website/site/content/fwlink/feedback-focalboard.html
@@ -0,0 +1,12 @@
+<html>
+    <head>
+        <meta http-equiv="refresh" content="0;url=https://docs.google.com/forms/d/e/1FAIpQLSdTq7M69Pdlz71CwucaSEG0FCK1M_WRvIbZbPr2imfT2QvUCQ/viewform" />
+        <title>Page Moved</title>
+        <script type="text/javascript">
+            window.location.replace("https://docs.google.com/forms/d/e/1FAIpQLSdTq7M69Pdlz71CwucaSEG0FCK1M_WRvIbZbPr2imfT2QvUCQ/viewform");
+        </script>
+    </head>
+    <body>
+        This page has moved. Click <a href="https://docs.google.com/forms/d/e/1FAIpQLSdTq7M69Pdlz71CwucaSEG0FCK1M_WRvIbZbPr2imfT2QvUCQ/viewform">here</a> to go to the new page.
+    </body>
+</html>