From 51959acf3ed9f9963b9ecb5879b29493308e979c Mon Sep 17 00:00:00 2001
From: Stefan Malzner <stefan@adlk.io>
Date: Tue, 21 Nov 2017 11:53:55 +0100
Subject: Add service request to recipe dashboard

---
 .../settings/recipes/RecipesDashboard.js           | 57 +++++++++++++---------
 .../settings/settings/EditSettingsForm.js          |  4 +-
 src/i18n/locales/en-US.json                        |  1 +
 src/index.js                                       |  2 +-
 src/styles/recipes.scss                            |  4 ++
 5 files changed, 43 insertions(+), 25 deletions(-)

(limited to 'src')

diff --git a/src/components/settings/recipes/RecipesDashboard.js b/src/components/settings/recipes/RecipesDashboard.js
index 02ea04e35..b6ade5da4 100644
--- a/src/components/settings/recipes/RecipesDashboard.js
+++ b/src/components/settings/recipes/RecipesDashboard.js
@@ -9,6 +9,7 @@ import Infobox from '../../ui/Infobox';
 import RecipeItem from './RecipeItem';
 import Loader from '../../ui/Loader';
 import Appear from '../../ui/effects/Appear';
+import { FRANZ_SERVICE_REQUEST } from '../../../config';
 
 const messages = defineMessages({
   headline: {
@@ -35,6 +36,10 @@ const messages = defineMessages({
     id: 'settings.recipes.servicesSuccessfulAddedInfo',
     defaultMessage: '!!!Service successfully added',
   },
+  missingService: {
+    id: 'settings.recipes.missingService',
+    defaultMessage: '!!!Missing a service?',
+  },
 });
 
 @observer
@@ -96,33 +101,39 @@ export default class RecipesDashboard extends Component {
               </Infobox>
             </Appear>
           )}
-          {!searchNeedle && (
-            <div className="recipes__navigation">
-              <Link
-                to="/settings/recipes"
-                className="badge"
-                activeClassName="badge--primary"
-              >
-                {intl.formatMessage(messages.mostPopularRecipes)}
-              </Link>
+          {/* {!searchNeedle && ( */}
+          <div className="recipes__navigation">
+            <Link
+              to="/settings/recipes"
+              className="badge"
+              activeClassName={`${!searchNeedle ? 'badge--primary' : ''}`}
+              onClick={() => resetSearch()}
+            >
+              {intl.formatMessage(messages.mostPopularRecipes)}
+            </Link>
+            <Link
+              to="/settings/recipes/all"
+              className="badge"
+              activeClassName={`${!searchNeedle ? 'badge--primary' : ''}`}
+              onClick={() => resetSearch()}
+            >
+              {intl.formatMessage(messages.allRecipes)}
+            </Link>
+            {devRecipesCount > 0 && (
               <Link
-                to="/settings/recipes/all"
+                to="/settings/recipes/dev"
                 className="badge"
-                activeClassName="badge--primary"
+                activeClassName={`${!searchNeedle ? 'badge--primary' : ''}`}
+                onClick={() => resetSearch()}
               >
-                {intl.formatMessage(messages.allRecipes)}
+                {intl.formatMessage(messages.devRecipes)} ({devRecipesCount})
               </Link>
-              {devRecipesCount > 0 && (
-                <Link
-                  to="/settings/recipes/dev"
-                  className="badge"
-                  activeClassName="badge--primary"
-                >
-                  {intl.formatMessage(messages.devRecipes)} ({devRecipesCount})
-                </Link>
-              )}
-            </div>
-          )}
+            )}
+            <a href={FRANZ_SERVICE_REQUEST} target="_blank" className="link recipes__service-request">
+              {intl.formatMessage(messages.missingService)} <i className="mdi mdi-open-in-new" />
+            </a>
+          </div>
+          {/* )} */}
           {isLoading ? (
             <Loader />
           ) : (
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 941f2149e..4ce9b7ab2 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -9,6 +9,8 @@ import Button from '../../ui/Button';
 import Toggle from '../../ui/Toggle';
 import Select from '../../ui/Select';
 
+import { FRANZ_TRANSLATION } from '../../../config';
+
 const messages = defineMessages({
   headline: {
     id: 'settings.app.headline',
@@ -145,7 +147,7 @@ export default class EditSettingsForm extends Component {
             <h2 id="language">{intl.formatMessage(messages.headlineLanguage)}</h2>
             <Select field={form.$('locale')} showLabel={false} />
             <a
-              href="http://i18n.meetfranz.com"
+              href={FRANZ_TRANSLATION}
               target="_blank"
               className="link"
             >
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index b062d5548..8de5e5e02 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -97,6 +97,7 @@
   "settings.recipes.dev": "Development",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Service successfully added",
+  "settings.recipes.missingService": "Missing a service?",
   "settings.service.form.saveButton": "Save service",
   "settings.service.form.deleteButton": "Delete service",
   "settings.service.form.availableServices": "Available services",
diff --git a/src/index.js b/src/index.js
index efb3be737..1eff3f4f8 100644
--- a/src/index.js
+++ b/src/index.js
@@ -44,7 +44,7 @@ app.disableHardwareAcceleration();
 // Initialize Settings
 const settings = new Settings();
 
-const createWindow = async () => {
+const createWindow = () => {
   // Remember window size
   const mainWindowState = windowStateKeeper({
     defaultWidth: 800,
diff --git a/src/styles/recipes.scss b/src/styles/recipes.scss
index 017aa4fe2..1b519a5e5 100644
--- a/src/styles/recipes.scss
+++ b/src/styles/recipes.scss
@@ -29,6 +29,10 @@
       pointer-events: none;
     }
   }
+
+  &__service-request {
+    float: right;
+  }
 }
 
 .recipe-teaser {
-- 
cgit v1.2.3-54-g00ecf