diff --git a/docs/docs/getting-started/api-usage.md b/docs/docs/getting-started/api-usage.md index 95abfd6a1..b90e2d26e 100644 --- a/docs/docs/getting-started/api-usage.md +++ b/docs/docs/getting-started/api-usage.md @@ -2,7 +2,7 @@ ## Getting a Token -Currently Mealie doesn't support creating a long-live token. You can however get a token from the API. This example was pulled from the automatic API documentation provided by Mealie. +Mealie supports long-live api tokens in the user frontend. In you profile section you can use the ### Curl ```bash diff --git a/docs/docs/getting-started/install.md b/docs/docs/getting-started/install.md index cdcc72462..e1beec48d 100644 --- a/docs/docs/getting-started/install.md +++ b/docs/docs/getting-started/install.md @@ -7,7 +7,6 @@ To deploy mealie on your local network it is highly recommended to use docker to [Mealie on Dockerhub](https://hub.docker.com/r/hkotel/mealie) - linux/amd64 - - linux/arm/v7 - linux/arm64 @@ -76,20 +75,21 @@ services: ## Env Variables -| Variables | Default | Description | -| ----------------- | ------------------ | ----------------------------------------------------------------------------------- | -| DEFAULT_GROUP | Home | The default group for users | -| DEFAULT_EMAIL | changeme@email.com | The default username for the superuser | -| DB_ENGINE | sqlite | Optional: 'sqlite', 'postgres' | -| POSTGRES_USER | mealie | Postgres database user | -| POSTGRES_PASSWORD | mealie | Postgres database password | -| POSTGRES_SERVER | postgres | Postgres database server address | -| POSTGRES_PORT | 5432 | Postgres database port | -| POSTGRES_DB | mealie | Postgres database name | -| TOKEN_TIME | 2 | The time in hours that a login/auth token is valid | -| API_PORT | 9000 | The port exposed by backend API. **do not change this if you're running in docker** | -| API_DOCS | True | Turns on/off access to the API documentation locally. | -| TZ | UTC | Must be set to get correct date/time on the server | +| Variables | Default | Description | +| ----------------- | --------------------- | ----------------------------------------------------------------------------------- | +| DEFAULT_GROUP | Home | The default group for users | +| DEFAULT_EMAIL | changeme@email.com | The default username for the superuser | +| BASE_URL | http://localhost:8080 | Used for Notifications | +| DB_ENGINE | sqlite | Optional: 'sqlite', 'postgres' | +| POSTGRES_USER | mealie | Postgres database user | +| POSTGRES_PASSWORD | mealie | Postgres database password | +| POSTGRES_SERVER | postgres | Postgres database server address | +| POSTGRES_PORT | 5432 | Postgres database port | +| POSTGRES_DB | mealie | Postgres database name | +| TOKEN_TIME | 2 | The time in hours that a login/auth token is valid | +| API_PORT | 9000 | The port exposed by backend API. **do not change this if you're running in docker** | +| API_DOCS | True | Turns on/off access to the API documentation locally. | +| TZ | UTC | Must be set to get correct date/time on the server | !!! tip "Fatal Python error: init_interp_main: can't initialize time" diff --git a/docs/docs/overrides/api.html b/docs/docs/overrides/api.html index 58276d551..f37cd25fe 100644 --- a/docs/docs/overrides/api.html +++ b/docs/docs/overrides/api.html @@ -14,7 +14,7 @@
diff --git a/frontend/src/components/Recipe/ContextMenu.vue b/frontend/src/components/Recipe/ContextMenu.vue index 99725d9fd..872421a81 100644 --- a/frontend/src/components/Recipe/ContextMenu.vue +++ b/frontend/src/components/Recipe/ContextMenu.vue @@ -110,15 +110,19 @@ export default { this.$refs.deleteRecipieConfirm.open(); break; case "share": - if (navigator.share){ - navigator.share({ - title: this.name, - text: this.recipeText, - url: this.recipeURL, - }) - .then(() => console.log('Successful share')) - .catch((error) => console.log('WebShareAPI not supported', error)) - } else this.updateClipboard(); + if (navigator.share) { + navigator + .share({ + title: this.name, + text: this.recipeText, + url: this.recipeURL, + }) + .then(() => console.log("Successful share")) + .catch(error => { + console.log("WebShareAPI not supported", error); + this.updateClipboard(); + }); + } else this.updateClipboard(); break; case "edit": this.$router.push(`/recipe/${this.slug}` + "?edit=true"); @@ -138,10 +142,13 @@ export default { updateClipboard() { const copyText = this.recipeURL; navigator.clipboard.writeText(copyText).then( - () => { console.log("Copied to Clipboard", copyText); - utils.notify.success("Copied to Clipboard");}, - () => console.log("Copied Failed", copyText)); + () => { + console.log("Copied to Clipboard", copyText); + utils.notify.success("Copied to Clipboard"); + }, + () => console.log("Copied Failed", copyText) + ); }, }, -} +}; diff --git a/frontend/src/locales/messages/en-US.json b/frontend/src/locales/messages/en-US.json index 0859b6d62..e7d407333 100644 --- a/frontend/src/locales/messages/en-US.json +++ b/frontend/src/locales/messages/en-US.json @@ -215,7 +215,7 @@ "ingredient": "Ingredient", "ingredients": "Ingredients", "instructions": "Instructions", - "share-recipe-message": "I wanted to share you my {0} recipe.", + "share-recipe-message": "I wanted to share my {0} recipe with you.", "key-name-required": "Key Name Required", "landscape-view-coming-soon": "Landscape View (Coming Soon)", "milligrams": "milligrams",