diff --git a/Caddyfile b/Caddyfile
index bd5bdfb13e1b..35d7767249e8 100644
--- a/Caddyfile
+++ b/Caddyfile
@@ -29,7 +29,7 @@
handle {
header @static Cache-Control max-age=31536000
root * /app/dist
- try_files {path}.html {path} /index.html
+ try_files {path}.html {path} /
file_server
}
}
\ No newline at end of file
diff --git a/dev/ingredientScaler/index.js b/dev/ingredientScaler/index.js
deleted file mode 100644
index f7ba9fd9cd6f..000000000000
--- a/dev/ingredientScaler/index.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import { recipeIngredient } from "./recipeIngredient";
-import { recipeNumber } from "./recipeNumber";
-
-export const ingredientScaler = {
- process(ingredientArray, scale) {
- console.log(scale);
- let workingArray = ingredientArray.map(x =>
- ingredientScaler.markIngredient(x)
- );
- return workingArray.map(x => ingredientScaler.adjustIngredients(x, scale));
- },
-
- adjustIngredients(ingredient, scale) {
- var scaledQuantity = new recipeNumber(ingredient.quantity).multiply(scale);
- const newText = ingredient.text.replace(
- ingredient.quantity,
- scaledQuantity
- );
- return { ...ingredient, quantity: scaledQuantity, text: newText };
- },
-
- markIngredient(ingredient) {
- console.log(ingredient);
- const returnVar = ingredient.replace(
- /^([\d/?[^\s&]*)(?: |\s)(\w*)/g,
- (match, quantity, unit) => {
- return `${unit}${quantity},${match}`;
- }
- );
- const split = returnVar.split(",");
- const [unit, quantity, match] = split;
- console.log("Split", unit, quantity, match);
- const n = new recipeNumber(quantity);
- const i = new recipeIngredient(n, unit);
- const serializedQuantity = n.isFraction() ? n.toImproperFraction() : n;
- return {
- unit: i,
- quantity: serializedQuantity.toString(),
- text: match,
- };
- },
-};
diff --git a/dev/ingredientScaler/recipeIngredient.js b/dev/ingredientScaler/recipeIngredient.js
deleted file mode 100644
index 8bc3e2f1dcf7..000000000000
--- a/dev/ingredientScaler/recipeIngredient.js
+++ /dev/null
@@ -1,75 +0,0 @@
-export const recipeIngredient = function(quantity, unit) {
- this.quantity = quantity;
- this.unit = unit;
-};
-
-recipeIngredient.prototype.isSingular = function() {
- return this.quantity > 0 && this.quantity <= 1;
-};
-
-recipeIngredient.prototype.pluralize = function() {
- if (this.isSingular()) {
- return this.unit;
- } else {
- return `${this.unit}s`;
- }
-};
-
-recipeIngredient.prototype.getSingularUnit = function() {
- if (this.isSingular()) {
- return this.unit;
- } else {
- return this.unit.replace(/s$/, "");
- }
-};
-
-recipeIngredient.prototype.toString = function() {
- return `${this.quantity.toString()} ${this.pluralize()}`;
-};
-
-recipeIngredient.prototype.convertUnits = function() {
- const conversion = recipeIngredient.CONVERSIONS[this.unit] || {};
- if (conversion.min && this.quantity < conversion.min.value) {
- this.unit = conversion.min.next;
- this.quantity.multiply(conversion.to[this.unit]);
- } else if (conversion.max && this.quantity >= conversion.max.value) {
- this.unit = conversion.max.next;
- this.quantity.multiply(conversion.to[this.unit]);
- }
- return this;
-};
-
-recipeIngredient.CONVERSIONS = {
- cup: {
- to: {
- tablespoon: 16,
- },
- min: {
- value: 1 / 4,
- next: "tablespoon",
- },
- },
- tablespoon: {
- to: {
- teaspoon: 3,
- cup: 1 / 16,
- },
- min: {
- value: 1,
- next: "teaspoon",
- },
- max: {
- value: 4,
- next: "cup",
- },
- },
- teaspoon: {
- to: {
- tablespoon: 1 / 3,
- },
- max: {
- value: 3,
- next: "tablespoon",
- },
- },
-};
diff --git a/dev/ingredientScaler/recipeNumber.js b/dev/ingredientScaler/recipeNumber.js
deleted file mode 100644
index 74579aeb6378..000000000000
--- a/dev/ingredientScaler/recipeNumber.js
+++ /dev/null
@@ -1,166 +0,0 @@
-export const recipeNumber = function(number) {
- const match = number.match(
- /^(?:(\d+)|(?:(\d+)(?: | ))?(?:(\d+)\/(\d+))?)$/
- );
- if (!match || !match[0] || match[4] == "0") {
- throw `Invalid number: "${number}".`;
- }
- this.wholeNumber = +(match[1] || match[2]);
- this.numerator = +match[3];
- this.denominator = +match[4];
-};
-
-/**
- * Determines if the number is a fraction.
- * @this {recipeNumber}
- * @return {boolean} If the number is a fraction.
- */
-recipeNumber.prototype.isFraction = function() {
- return !!(this.numerator && this.denominator);
-};
-
-/**
- * Determines if the fraction is proper, which is defined as
- * the numerator being strictly less than the denominator.
- * @this {recipeNumber}
- * @return {boolean} If the fraction is proper.
- */
-recipeNumber.prototype.isProperFraction = function() {
- return this.numerator < this.denominator;
-};
-
-/**
- * Determines if the fraction is improper, which is defined as
- * the numerator being greater than or equal to the denominator.
- * @this {recipeNumber}
- * @return {boolean} If the fraction is improper.
- */
-recipeNumber.prototype.isImproperFraction = function() {
- return this.numerator >= this.denominator;
-};
-
-/**
- * Determines if the fraction is mixed, which is defined as
- * a whole number with a proper fraction.
- * @this {recipeNumber}
- * @return {boolean} If the fraction is mixed.
- */
-recipeNumber.prototype.isMixedFraction = function() {
- return this.isProperFraction() && !isNaN(this.wholeNumber);
-};
-
-/**
- * Simplifies fractions. Examples:
- * 3/2 = 1 1/2
- * 4/2 = 2
- * 1 3/2 = 2 1/2
- * 0/1 = 0
- * 1 0/1 = 1
- * @this {recipeNumber}
- * @return {recipeNumber} The instance.
- */
-recipeNumber.prototype.simplifyFraction = function() {
- if (this.isImproperFraction()) {
- this.wholeNumber |= 0;
- this.wholeNumber += Math.floor(this.numerator / this.denominator);
- const modulus = this.numerator % this.denominator;
- if (modulus) {
- this.numerator = modulus;
- } else {
- this.numerator = this.denominator = NaN;
- }
- } else if (this.numerator == 0) {
- this.wholeNumber |= 0;
- this.numerator = this.denominator = NaN;
- }
- return this;
-};
-
-/**
- * Reduces a fraction. Examples:
- * 2/6 = 1/3
- * 6/2 = 3/1
- * @this {recipeNumber}
- * @return {recipeNumber} The instance.
- */
-recipeNumber.prototype.reduceFraction = function() {
- if (this.isFraction()) {
- const gcd = recipeNumber.gcd(this.numerator, this.denominator);
- this.numerator /= gcd;
- this.denominator /= gcd;
- }
- return this;
-};
-
-/**
- * Converts proper fractions to improper fractions. Examples:
- * 1 1/2 = 3/2
- * 3/2 = 3/2
- * 1/2 = 1/2
- * 2 = 2
- *
- * @this {recipeNumber}
- * @return {recipeNumber} The instance.
- */
-recipeNumber.prototype.toImproperFraction = function() {
- if (!isNaN(this.wholeNumber)) {
- this.numerator |= 0;
- this.denominator = this.denominator || 1;
- this.numerator += this.wholeNumber * this.denominator;
- this.wholeNumber = NaN;
- }
- return this;
-};
-
-/**
- * Multiplies the number by some decimal value.
- * @param {number} multiplier The multiplier.
- * @this {recipeNumber}
- * @return {recipeNumber} The instance.
- */
-recipeNumber.prototype.multiply = function(multiplier) {
- this.toImproperFraction();
- this.numerator *= multiplier;
- return this.reduceFraction().simplifyFraction();
-};
-
-/**
- * Gets a string representation of the number.
- * @this {recipeNumber}
- * @return {string} The string representation of the number.
- */
-recipeNumber.prototype.toString = function() {
- let number = "";
- let fraction = "";
- if (!isNaN(this.wholeNumber)) {
- number += this.wholeNumber;
- }
- if (this.isFraction()) {
- fraction = `${this.numerator}/${this.denominator}`;
- }
- if (number && fraction) {
- number += ` ${fraction}`;
- }
- return number || fraction;
-};
-
-/**
- * Gets a numeric representation of the number.
- * @this {recipeNumber}
- * @return {number} The numeric representation of the number.
- */
-recipeNumber.prototype.valueOf = function() {
- let value = this.wholeNumber || 0;
- value += this.numerator / this.denominator || 0;
- return value;
-};
-
-/**
- * Euclid's algorithm to find the greatest common divisor of two numbers.
- * @param {number} a One number.
- * @param {number} b Another number.
- * @return {number} The GCD of the numbers.
- */
-recipeNumber.gcd = function gcd(a, b) {
- return b ? recipeNumber.gcd(b, a % b) : a;
-};
diff --git a/frontend/src/api/recipe.js b/frontend/src/api/recipe.js
index 7fbad58d3b51..932ad669a56b 100644
--- a/frontend/src/api/recipe.js
+++ b/frontend/src/api/recipe.js
@@ -36,7 +36,6 @@ export const recipeAPI = {
async requestDetails(recipeSlug) {
const response = await apiReq.getSafe(API_ROUTES.recipesRecipeSlug(recipeSlug));
- console.log(response);
return response;
},
diff --git a/frontend/src/api/users.js b/frontend/src/api/users.js
index 4e37009aa706..d354a6e6614b 100644
--- a/frontend/src/api/users.js
+++ b/frontend/src/api/users.js
@@ -1,20 +1,16 @@
import { API_ROUTES } from "./apiRoutes";
import { apiReq } from "./api-utils";
-import axios from "axios";
import i18n from "@/i18n.js";
export const userAPI = {
async login(formData) {
- let response = await apiReq.post(API_ROUTES.authToken, formData, null, function() {
+ let response = await apiReq.post(API_ROUTES.authToken, formData, null, () => {
return i18n.t("user.user-successfully-logged-in");
});
return response;
},
async refresh() {
- let response = await axios.get(API_ROUTES.authRefresh).catch(function(event) {
- console.log("Fetch failed", event);
- });
- return response.data ? response.data : false;
+ return apiReq.getSafe(API_ROUTES.authRefresh);
},
async allUsers() {
let response = await apiReq.get(API_ROUTES.users);
@@ -29,8 +25,7 @@ export const userAPI = {
);
},
async self() {
- let response = await apiReq.get(API_ROUTES.usersSelf);
- return response.data;
+ return apiReq.getSafe(API_ROUTES.usersSelf);
},
async byID(id) {
let response = await apiReq.get(API_ROUTES.usersId(id));
diff --git a/frontend/src/components/MealPlan/MealPlanNew.vue b/frontend/src/components/MealPlan/MealPlanNew.vue
index d52bd94c01ea..47740940d017 100644
--- a/frontend/src/components/MealPlan/MealPlanNew.vue
+++ b/frontend/src/components/MealPlan/MealPlanNew.vue
@@ -106,9 +106,6 @@ export default {
},
watch: {
- startDate(val) {
- console.log(val);
- },
dateDif() {
this.planDays = [];
for (let i = 0; i < this.dateDif; i++) {
diff --git a/frontend/src/components/Recipe/CardImage.vue b/frontend/src/components/Recipe/CardImage.vue
index c24cd8f9ffc8..95706c5e7f37 100644
--- a/frontend/src/components/Recipe/CardImage.vue
+++ b/frontend/src/components/Recipe/CardImage.vue
@@ -10,12 +10,10 @@
-
-
-
{{ $globals.icons.primary }}
+