+
+
diff --git a/src/components/index.ts b/src/components/index.ts
index 96915eb9..82829526 100644
--- a/src/components/index.ts
+++ b/src/components/index.ts
@@ -37,6 +37,7 @@ export function configure(config: FrameworkConfiguration) {
PLATFORM.moduleName('./icons/icon-chevron-forward.html'),
PLATFORM.moduleName('./icons/icon-menu.html'),
PLATFORM.moduleName('./icons/icon-image.html'),
- PLATFORM.moduleName('./icons/icon-save.html')
+ PLATFORM.moduleName('./icons/icon-save.html'),
+ PLATFORM.moduleName('./icons/icon-repeat.html')
]);
}
diff --git a/src/converters/amount-format.ts b/src/converters/amount-format.ts
index 1668dd68..6d4f21ef 100644
--- a/src/converters/amount-format.ts
+++ b/src/converters/amount-format.ts
@@ -20,7 +20,6 @@ export class AmountFormatValueConverter {
const newValue = +parseFloat((Number(value) * multiplier * unitMultiplier).toString()).toFixed(2);
- console.log(value, multiplier, unit, system, unitMultiplier, newUnit, newValue);
const fraction = convertToFraction(newValue);
if (preferCl && newUnit === Unit.ML && system === MessuarementSystem.Metric) {
diff --git a/src/domain/entities/ingredient.ts b/src/domain/entities/ingredient.ts
index b999dd4e..5c915601 100644
--- a/src/domain/entities/ingredient.ts
+++ b/src/domain/entities/ingredient.ts
@@ -17,6 +17,10 @@ export class ManageIngredientModel extends Ingredient {
public isActive: boolean;
}
+export type IngredientSubstitutionModel = Ingredient & {
+ substitutions: string[];
+};
+
export class CreatedIngredientModel extends Ingredient {
public usedInCocktailNames: string[];
}
diff --git a/src/locales/en/translation.json b/src/locales/en/translation.json
index 066275d9..176f84e8 100644
--- a/src/locales/en/translation.json
+++ b/src/locales/en/translation.json
@@ -131,7 +131,9 @@
"create-ingredient-list": "Create Bar",
"edit-ingredient-list": "Edit Bar",
"backups-title": "My Backups",
- "backups-subtitle": "Manage backups"
+ "backups-subtitle": "Manage backups",
+ "ingredient-substitutions-title": "Common Ingredient Substitutions",
+ "ingredient-substitutions-subtitle": "Ingredient Substitutions used in Drinkable"
},
"alcohol-level": {
"title": "Alcohol Level",
@@ -185,5 +187,6 @@
"backup-name-placeholder": "Backup {{date}}",
"paste-backup-content-title": "Paste Backup Content",
"paste-backup-content": "Paste the content of your backup file here to restore it",
- "android-storage-limitations": "Due to Android 11 storage limitations, backups cannot be loaded if the app was reinstalled or backup was modified externally"
+ "android-storage-limitations": "Due to Android 11 storage limitations, backups cannot be loaded if the app was reinstalled or backup was modified externally",
+ "general-substitutions-paragraph": "Alot of ingredients can almost always be substituted by other ingredients. Drinkable provides the following substitutes"
}
diff --git a/src/modules/user/backups/backup-drawer.ts b/src/modules/user/backups/backup-drawer.ts
index 81306be6..945dfb67 100644
--- a/src/modules/user/backups/backup-drawer.ts
+++ b/src/modules/user/backups/backup-drawer.ts
@@ -51,7 +51,6 @@ export class BackupDrawer {
if (this.name == null || this.name === '') {
this.name = this.placeholder;
}
- console.log(this.name);
const backupBuilder = new BackupEntityBuilder(this._localStorageService)
.withTags()
diff --git a/src/modules/user/backups/load-backup-dialog.ts b/src/modules/user/backups/load-backup-dialog.ts
index 7010b4c9..2cfdf285 100644
--- a/src/modules/user/backups/load-backup-dialog.ts
+++ b/src/modules/user/backups/load-backup-dialog.ts
@@ -29,10 +29,8 @@ export class LoadBackupDialog {
private IsValidJsonString(str: string): boolean {
try {
const json = JSON.parse(str);
- console.log(json);
return typeof json === 'object';
} catch (e) {
- console.log(e);
return false;
}
}
@@ -53,7 +51,6 @@ export class LoadBackupDialog {
this._dialogContoller.ok();
} catch (error) {
- console.log(error);
this.errorMessage = (error as Error).message;
}
}
diff --git a/src/modules/user/backups/restore-backup-dialog.ts b/src/modules/user/backups/restore-backup-dialog.ts
index e838ca00..29cdc92f 100644
--- a/src/modules/user/backups/restore-backup-dialog.ts
+++ b/src/modules/user/backups/restore-backup-dialog.ts
@@ -67,7 +67,6 @@ export class RestoreBackupDialog {
this._dialogController.ok();
} catch (error) {
- console.log(error);
this.errorMessage = (error as Error).message;
}
}
diff --git a/src/modules/user/ingredient-substitutions/ingredient-substitutions.html b/src/modules/user/ingredient-substitutions/ingredient-substitutions.html
new file mode 100644
index 00000000..87a7449d
--- /dev/null
+++ b/src/modules/user/ingredient-substitutions/ingredient-substitutions.html
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+ | ${item.name} |
+ |
+
+ ${substitution}
+ |
+
+
+
+
+
+
diff --git a/src/modules/user/ingredient-substitutions/ingredient-substitutions.ts b/src/modules/user/ingredient-substitutions/ingredient-substitutions.ts
new file mode 100644
index 00000000..e642da5d
--- /dev/null
+++ b/src/modules/user/ingredient-substitutions/ingredient-substitutions.ts
@@ -0,0 +1,14 @@
+import { autoinject } from 'aurelia-framework';
+import { IngredientSubstitutionModel } from 'domain/entities/ingredient';
+import { IngredientService } from 'services/ingredient-service';
+
+@autoinject()
+export class IngredientSubstitutes {
+ public ingredients: IngredientSubstitutionModel[] = [];
+
+ constructor(private ingredientService: IngredientService) {}
+
+ activate() {
+ this.ingredients = this.ingredientService.getIngredinetWithsubstitutions();
+ }
+}
diff --git a/src/modules/user/user-page.ts b/src/modules/user/user-page.ts
index 914f9b1e..59fbaa53 100644
--- a/src/modules/user/user-page.ts
+++ b/src/modules/user/user-page.ts
@@ -24,6 +24,7 @@ export class UserPage {
iconView: './../../components/icons/icon-bookmark.html',
route: 'user-tags'
},
+
{
title: 'shopping-list.title',
subtitle: 'shopping-list.subtitle',
@@ -39,6 +40,12 @@ export class UserPage {
iconView: './../../components/icons/icon-settings.html',
route: 'settings'
},
+ {
+ title: 'user.ingredient-substitutions-title',
+ subtitle: 'user.ingredient-substitutions-subtitle',
+ iconView: './../../components/icons/icon-repeat.html',
+ route: 'ingredient-substitutions'
+ },
{
title: 'user.contact-title',
subtitle: 'user.contact-subtitle',
diff --git a/src/modules/user/user-router.ts b/src/modules/user/user-router.ts
index d49f1a64..b3666fbd 100644
--- a/src/modules/user/user-router.ts
+++ b/src/modules/user/user-router.ts
@@ -34,6 +34,13 @@ export class UserRouter {
nav: false,
title: 'user.tags-title'
},
+ {
+ route: ['ingredient-substitutions'],
+ name: 'ingredient-substitutions',
+ moduleId: PLATFORM.moduleName('modules/user/ingredient-substitutions/ingredient-substitutions'),
+ nav: false,
+ title: 'user.ingredient-substitutions-title'
+ },
{
route: ['shopping-lists'],
name: 'user-shopping-lists',
diff --git a/src/services/ingredient-service.ts b/src/services/ingredient-service.ts
index ca6218e0..e42102fe 100644
--- a/src/services/ingredient-service.ts
+++ b/src/services/ingredient-service.ts
@@ -1,7 +1,12 @@
import { inject } from 'aurelia-framework';
import { I18N } from 'aurelia-i18n';
import { Cocktail, ExtendedIngredientGroup, IngredientGroup } from 'domain/entities/cocktail';
-import { CreatedIngredientModel, Ingredient, ManageIngredientModel } from 'domain/entities/ingredient';
+import {
+ CreatedIngredientModel,
+ Ingredient,
+ IngredientSubstitutionModel,
+ ManageIngredientModel
+} from 'domain/entities/ingredient';
import { SpiritType } from 'domain/enums/spirit-type';
import { getStaticIngredients } from 'data/ingredient-data';
import { LocalStorageService } from './local-storage-service';
@@ -122,6 +127,21 @@ export class IngredientService {
}));
}
+ public getIngredinetWithsubstitutions(): IngredientSubstitutionModel[] {
+ const ingredientWithSubstitutes = this.getIngredients().filter(
+ x => x.replacementIds != null && x.replacementIds.length > 0
+ );
+
+ const data = ingredientWithSubstitutes.map(x => {
+ return {
+ ...x,
+ substitutions: this.getSubstitutes(x)
+ };
+ });
+
+ return data;
+ }
+
public async createIngredient(request: CreateIngredientRequest) {
const ingredient = new Ingredient();
ingredient.name = request.name;
@@ -191,8 +211,8 @@ export class IngredientService {
return 'x-' + this._highestId;
}
- private getSubstituteNames(ingredient: Ingredient): string {
- const names = [];
+ private getSubstitutes(ingredient: Ingredient): string[] {
+ const names: string[] = [];
ingredient?.replacementIds?.forEach(x => {
const translation = this._ingredients.find(y => y.id === x).translation;
@@ -201,7 +221,10 @@ export class IngredientService {
}
});
- return names.join(', ');
+ return names;
+ }
+ private getSubstituteNames(ingredient: Ingredient): string {
+ return this.getSubstitutes(ingredient).join(', ');
}
private ingredientIsInStorage(currentIngredients: string[], ingredientId: string) {