fix sharing errors

This commit is contained in:
Hayden 2021-12-05 13:35:16 -09:00
parent b2673d75bf
commit 5454d2c8b8
2 changed files with 25 additions and 34 deletions

View file

@ -10,21 +10,11 @@ services:
ports: ports:
- 9091:3000 - 9091:3000
environment: environment:
- GLOBAL_MIDDLEWARE=auth # - GLOBAL_MIDDLEWARE=auth
# - SUB_PATH=/mealie/ # - SUB_PATH=/mealie/
- ALLOW_SIGNUP=true - ALLOW_SIGNUP=true
- API_URL=http://mealie-api:80 - API_URL=http://mealie-api:80
# =====================================
# Email Configuration
# - SMTP_HOST=
# - SMTP_PORT=587
# - SMTP_FROM_NAME=Mealie
# - SMTP_TLS=true
# - SMTP_FROM_EMAIL=
# - SMTP_USER=
# - SMTP_PASSWORD=
# ===================================== # =====================================
# Light Mode Config # Light Mode Config
- THEME_LIGHT_PRIMARY=#E58325 - THEME_LIGHT_PRIMARY=#E58325
@ -53,19 +43,34 @@ services:
ports: ports:
- 9092:80 - 9092:80
environment: environment:
DB_ENGINE: postgres # Optional: 'sqlite', 'postgres' DB_ENGINE: sqlite # Optional: 'sqlite', 'postgres'
# =====================================
# Postgres Config
POSTGRES_USER: mealie POSTGRES_USER: mealie
POSTGRES_PASSWORD: mealie POSTGRES_PASSWORD: mealie
POSTGRES_SERVER: postgres POSTGRES_SERVER: postgres
POSTGRES_PORT: 5432 POSTGRES_PORT: 5432
POSTGRES_DB: mealie POSTGRES_DB: mealie
# =====================================
# Web Concurrency
WORKERS_PER_CORE: 0.5 WORKERS_PER_CORE: 0.5
MAX_WORKERS: 1 MAX_WORKERS: 1
WEB_CONCURRENCY: 1 WEB_CONCURRENCY: 1
postgres:
container_name: postgres # =====================================
image: postgres # Email Configuration
restart: always # - SMTP_HOST=
environment: # - SMTP_PORT=587
POSTGRES_PASSWORD: mealie # - SMTP_FROM_NAME=Mealie
POSTGRES_USER: mealie # - SMTP_TLS=true
# - SMTP_FROM_EMAIL=
# - SMTP_USER=
# - SMTP_PASSWORD=
# postgres:
# container_name: postgres
# image: postgres
# restart: always
# environment:
# POSTGRES_PASSWORD: mealie
# POSTGRES_USER: mealie

View file

@ -50,8 +50,7 @@
<v-divider></v-divider> <v-divider></v-divider>
<!-- Editors --> <!-- Editors -->
<LazyRecipeJsonEditor v-if="jsonEditor" v-model="recipe" class="mt-10" :options="jsonEditorOptions" /> <div>
<div v-else>
<v-card-text <v-card-text
:class="{ :class="{
'px-2': $vuetify.breakpoint.smAndDown, 'px-2': $vuetify.breakpoint.smAndDown,
@ -187,12 +186,6 @@
class="mt-10" class="mt-10"
:edit="form" :edit="form"
/> />
<RecipeAssets
v-if="recipe.settings.showAssets"
v-model="recipe.assets"
:edit="form"
:slug="recipe.slug"
/>
</div> </div>
</v-col> </v-col>
<v-divider v-if="$vuetify.breakpoint.mdAndUp" class="my-divider" :vertical="true"></v-divider> <v-divider v-if="$vuetify.breakpoint.mdAndUp" class="my-divider" :vertical="true"></v-divider>
@ -291,7 +284,6 @@ import RecipeChips from "~/components/Domain/Recipe/RecipeChips.vue";
import RecipeIngredients from "~/components/Domain/Recipe/RecipeIngredients.vue"; import RecipeIngredients from "~/components/Domain/Recipe/RecipeIngredients.vue";
import RecipeRating from "~/components/Domain/Recipe/RecipeRating.vue"; import RecipeRating from "~/components/Domain/Recipe/RecipeRating.vue";
import RecipeTimeCard from "~/components/Domain/Recipe/RecipeTimeCard.vue"; import RecipeTimeCard from "~/components/Domain/Recipe/RecipeTimeCard.vue";
import RecipeAssets from "~/components/Domain/Recipe/RecipeAssets.vue";
import RecipeNutrition from "~/components/Domain/Recipe/RecipeNutrition.vue"; import RecipeNutrition from "~/components/Domain/Recipe/RecipeNutrition.vue";
import RecipeInstructions from "~/components/Domain/Recipe/RecipeInstructions.vue"; import RecipeInstructions from "~/components/Domain/Recipe/RecipeInstructions.vue";
import RecipeNotes from "~/components/Domain/Recipe/RecipeNotes.vue"; import RecipeNotes from "~/components/Domain/Recipe/RecipeNotes.vue";
@ -299,7 +291,6 @@ import RecipePrintView from "~/components/Domain/Recipe/RecipePrintView.vue";
export default defineComponent({ export default defineComponent({
components: { components: {
RecipeAssets,
RecipeChips, RecipeChips,
RecipeIngredients, RecipeIngredients,
RecipeInstructions, RecipeInstructions,
@ -390,10 +381,5 @@ export default defineComponent({
return this.$vuetify.breakpoint.xs ? "200" : "400"; return this.$vuetify.breakpoint.xs ? "200" : "400";
}, },
}, },
methods: {
printRecipe() {
window.print();
},
},
}); });
</script> </script>