diff options
author | 2021-08-03 09:04:30 +0530 | |
---|---|---|
committer | 2021-08-03 05:51:51 +0000 | |
commit | a9c1abc6f11cb193388fad505c0304f1efe60a30 (patch) | |
tree | dfb685527f9dc44b6245213a0c3e437ecb272132 /src/containers | |
parent | Changed the cron for the ferdi build to run at 12:15 am UTC since the time de... (diff) | |
download | ferdium-app-a9c1abc6f11cb193388fad505c0304f1efe60a30.tar.gz ferdium-app-a9c1abc6f11cb193388fad505c0304f1efe60a30.tar.zst ferdium-app-a9c1abc6f11cb193388fad505c0304f1efe60a30.zip |
Removed straggling code related to 'popular services'.
Diffstat (limited to 'src/containers')
-rw-r--r-- | src/containers/auth/WelcomeScreen.js | 2 | ||||
-rw-r--r-- | src/containers/settings/RecipesScreen.js | 10 |
2 files changed, 3 insertions, 9 deletions
diff --git a/src/containers/auth/WelcomeScreen.js b/src/containers/auth/WelcomeScreen.js index 6f2d0eee6..bfcc880d0 100644 --- a/src/containers/auth/WelcomeScreen.js +++ b/src/containers/auth/WelcomeScreen.js | |||
@@ -15,7 +15,7 @@ export default @inject('stores', 'actions') @observer class LoginScreen extends | |||
15 | loginRoute={user.loginRoute} | 15 | loginRoute={user.loginRoute} |
16 | signupRoute={user.signupRoute} | 16 | signupRoute={user.signupRoute} |
17 | changeServerRoute={user.changeServerRoute} | 17 | changeServerRoute={user.changeServerRoute} |
18 | recipes={recipePreviews.featured} | 18 | recipes={recipePreviews.all} |
19 | /> | 19 | /> |
20 | ); | 20 | ); |
21 | } | 21 | } |
diff --git a/src/containers/settings/RecipesScreen.js b/src/containers/settings/RecipesScreen.js index dc1534ed7..93503fb0e 100644 --- a/src/containers/settings/RecipesScreen.js +++ b/src/containers/settings/RecipesScreen.js | |||
@@ -55,8 +55,6 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend | |||
55 | 55 | ||
56 | if (filter === 'all' && currentFilter !== 'all') { | 56 | if (filter === 'all' && currentFilter !== 'all') { |
57 | this.setState({ currentFilter: 'all' }); | 57 | this.setState({ currentFilter: 'all' }); |
58 | } else if (filter === 'featured' && currentFilter !== 'featured') { | ||
59 | this.setState({ currentFilter: 'featured' }); | ||
60 | } else if (filter === 'dev' && currentFilter !== 'dev') { | 58 | } else if (filter === 'dev' && currentFilter !== 'dev') { |
61 | this.setState({ currentFilter: 'dev' }); | 59 | this.setState({ currentFilter: 'dev' }); |
62 | } | 60 | } |
@@ -114,7 +112,7 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend | |||
114 | service: serviceActions, | 112 | service: serviceActions, |
115 | } = this.props.actions; | 113 | } = this.props.actions; |
116 | 114 | ||
117 | const { filter } = this.props.params; | 115 | const { filter } = { filter: 'all', ...this.props.params }; |
118 | let recipeFilter; | 116 | let recipeFilter; |
119 | 117 | ||
120 | if (filter === 'all') { | 118 | if (filter === 'all') { |
@@ -124,8 +122,6 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend | |||
124 | ]); | 122 | ]); |
125 | } else if (filter === 'dev') { | 123 | } else if (filter === 'dev') { |
126 | recipeFilter = communityRecipesStore.communityRecipes; | 124 | recipeFilter = communityRecipesStore.communityRecipes; |
127 | } else { | ||
128 | recipeFilter = recipePreviews.featured; | ||
129 | } | 125 | } |
130 | 126 | ||
131 | const allRecipes = this.state.needle ? this.prepareRecipes([ | 127 | const allRecipes = this.state.needle ? this.prepareRecipes([ |
@@ -140,8 +136,7 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend | |||
140 | 136 | ||
141 | const customWebsiteRecipe = recipePreviews.all.find((service) => service.id === CUSTOM_WEBSITE_RECIPE_ID); | 137 | const customWebsiteRecipe = recipePreviews.all.find((service) => service.id === CUSTOM_WEBSITE_RECIPE_ID); |
142 | 138 | ||
143 | const isLoading = recipePreviews.featuredRecipePreviewsRequest.isExecuting | 139 | const isLoading = recipePreviews.allRecipePreviewsRequest.isExecuting |
144 | || recipePreviews.allRecipePreviewsRequest.isExecuting | ||
145 | || recipes.installRecipeRequest.isExecuting | 140 | || recipes.installRecipeRequest.isExecuting |
146 | || recipePreviews.searchRecipePreviewsRequest.isExecuting; | 141 | || recipePreviews.searchRecipePreviewsRequest.isExecuting; |
147 | 142 | ||
@@ -154,7 +149,6 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend | |||
154 | customWebsiteRecipe={customWebsiteRecipe} | 149 | customWebsiteRecipe={customWebsiteRecipe} |
155 | isLoading={isLoading} | 150 | isLoading={isLoading} |
156 | addedServiceCount={services.all.length} | 151 | addedServiceCount={services.all.length} |
157 | hasLoadedRecipes={recipePreviews.featuredRecipePreviewsRequest.wasExecuted} | ||
158 | showAddServiceInterface={serviceActions.showAddServiceInterface} | 152 | showAddServiceInterface={serviceActions.showAddServiceInterface} |
159 | searchRecipes={(e) => this.searchRecipes(e)} | 153 | searchRecipes={(e) => this.searchRecipes(e)} |
160 | resetSearch={() => this.resetSearch()} | 154 | resetSearch={() => this.resetSearch()} |