aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar Stefan Malzner <stefan@adlk.io>2017-11-21 11:53:55 +0100
committerLibravatar Stefan Malzner <stefan@adlk.io>2017-11-21 11:53:55 +0100
commit51959acf3ed9f9963b9ecb5879b29493308e979c (patch)
tree64685eff8799cbf917fc9c0104508f8c7cee5d5e /src
parentMerge branch 'develop' into feature/add-service-request (diff)
downloadferdium-app-51959acf3ed9f9963b9ecb5879b29493308e979c.tar.gz
ferdium-app-51959acf3ed9f9963b9ecb5879b29493308e979c.tar.zst
ferdium-app-51959acf3ed9f9963b9ecb5879b29493308e979c.zip
Add service request to recipe dashboard
Diffstat (limited to 'src')
-rw-r--r--src/components/settings/recipes/RecipesDashboard.js57
-rw-r--r--src/components/settings/settings/EditSettingsForm.js4
-rw-r--r--src/i18n/locales/en-US.json1
-rw-r--r--src/index.js2
-rw-r--r--src/styles/recipes.scss4
5 files changed, 43 insertions, 25 deletions
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';
9import RecipeItem from './RecipeItem'; 9import RecipeItem from './RecipeItem';
10import Loader from '../../ui/Loader'; 10import Loader from '../../ui/Loader';
11import Appear from '../../ui/effects/Appear'; 11import Appear from '../../ui/effects/Appear';
12import { FRANZ_SERVICE_REQUEST } from '../../../config';
12 13
13const messages = defineMessages({ 14const messages = defineMessages({
14 headline: { 15 headline: {
@@ -35,6 +36,10 @@ const messages = defineMessages({
35 id: 'settings.recipes.servicesSuccessfulAddedInfo', 36 id: 'settings.recipes.servicesSuccessfulAddedInfo',
36 defaultMessage: '!!!Service successfully added', 37 defaultMessage: '!!!Service successfully added',
37 }, 38 },
39 missingService: {
40 id: 'settings.recipes.missingService',
41 defaultMessage: '!!!Missing a service?',
42 },
38}); 43});
39 44
40@observer 45@observer
@@ -96,33 +101,39 @@ export default class RecipesDashboard extends Component {
96 </Infobox> 101 </Infobox>
97 </Appear> 102 </Appear>
98 )} 103 )}
99 {!searchNeedle && ( 104 {/* {!searchNeedle && ( */}
100 <div className="recipes__navigation"> 105 <div className="recipes__navigation">
101 <Link 106 <Link
102 to="/settings/recipes" 107 to="/settings/recipes"
103 className="badge" 108 className="badge"
104 activeClassName="badge--primary" 109 activeClassName={`${!searchNeedle ? 'badge--primary' : ''}`}
105 > 110 onClick={() => resetSearch()}
106 {intl.formatMessage(messages.mostPopularRecipes)} 111 >
107 </Link> 112 {intl.formatMessage(messages.mostPopularRecipes)}
113 </Link>
114 <Link
115 to="/settings/recipes/all"
116 className="badge"
117 activeClassName={`${!searchNeedle ? 'badge--primary' : ''}`}
118 onClick={() => resetSearch()}
119 >
120 {intl.formatMessage(messages.allRecipes)}
121 </Link>
122 {devRecipesCount > 0 && (
108 <Link 123 <Link
109 to="/settings/recipes/all" 124 to="/settings/recipes/dev"
110 className="badge" 125 className="badge"
111 activeClassName="badge--primary" 126 activeClassName={`${!searchNeedle ? 'badge--primary' : ''}`}
127 onClick={() => resetSearch()}
112 > 128 >
113 {intl.formatMessage(messages.allRecipes)} 129 {intl.formatMessage(messages.devRecipes)} ({devRecipesCount})
114 </Link> 130 </Link>
115 {devRecipesCount > 0 && ( 131 )}
116 <Link 132 <a href={FRANZ_SERVICE_REQUEST} target="_blank" className="link recipes__service-request">
117 to="/settings/recipes/dev" 133 {intl.formatMessage(messages.missingService)} <i className="mdi mdi-open-in-new" />
118 className="badge" 134 </a>
119 activeClassName="badge--primary" 135 </div>
120 > 136 {/* )} */}
121 {intl.formatMessage(messages.devRecipes)} ({devRecipesCount})
122 </Link>
123 )}
124 </div>
125 )}
126 {isLoading ? ( 137 {isLoading ? (
127 <Loader /> 138 <Loader />
128 ) : ( 139 ) : (
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';
9import Toggle from '../../ui/Toggle'; 9import Toggle from '../../ui/Toggle';
10import Select from '../../ui/Select'; 10import Select from '../../ui/Select';
11 11
12import { FRANZ_TRANSLATION } from '../../../config';
13
12const messages = defineMessages({ 14const messages = defineMessages({
13 headline: { 15 headline: {
14 id: 'settings.app.headline', 16 id: 'settings.app.headline',
@@ -145,7 +147,7 @@ export default class EditSettingsForm extends Component {
145 <h2 id="language">{intl.formatMessage(messages.headlineLanguage)}</h2> 147 <h2 id="language">{intl.formatMessage(messages.headlineLanguage)}</h2>
146 <Select field={form.$('locale')} showLabel={false} /> 148 <Select field={form.$('locale')} showLabel={false} />
147 <a 149 <a
148 href="http://i18n.meetfranz.com" 150 href={FRANZ_TRANSLATION}
149 target="_blank" 151 target="_blank"
150 className="link" 152 className="link"
151 > 153 >
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 @@
97 "settings.recipes.dev": "Development", 97 "settings.recipes.dev": "Development",
98 "settings.recipes.nothingFound": "Sorry, but no service matched your search term.", 98 "settings.recipes.nothingFound": "Sorry, but no service matched your search term.",
99 "settings.recipes.servicesSuccessfulAddedInfo": "Service successfully added", 99 "settings.recipes.servicesSuccessfulAddedInfo": "Service successfully added",
100 "settings.recipes.missingService": "Missing a service?",
100 "settings.service.form.saveButton": "Save service", 101 "settings.service.form.saveButton": "Save service",
101 "settings.service.form.deleteButton": "Delete service", 102 "settings.service.form.deleteButton": "Delete service",
102 "settings.service.form.availableServices": "Available services", 103 "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();
44// Initialize Settings 44// Initialize Settings
45const settings = new Settings(); 45const settings = new Settings();
46 46
47const createWindow = async () => { 47const createWindow = () => {
48 // Remember window size 48 // Remember window size
49 const mainWindowState = windowStateKeeper({ 49 const mainWindowState = windowStateKeeper({
50 defaultWidth: 800, 50 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 @@
29 pointer-events: none; 29 pointer-events: none;
30 } 30 }
31 } 31 }
32
33 &__service-request {
34 float: right;
35 }
32} 36}
33 37
34.recipe-teaser { 38.recipe-teaser {