Cutlery/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2025-07-09 03:04:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mealie-next' into fix/add-url-to-opengraph-scraper

Browse Source
This commit is contained in:
boc-the-git 2023-12-11 15:52:12 +11:00 committed by GitHub
commit e5f278fdbb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.devcontainer/devcontainer.json
View File

@ -41,7 +41,8 @@
// Use 'forwardPorts' to make a list of ports inside the container available locally. // Use 'forwardPorts' to make a list of ports inside the container available locally.
"forwardPorts": [ "forwardPorts": [
3000, 3000,
9000 9000,
24678 // used by nuxt when hot-reloading using polling
], ],
// Use 'onCreateCommand' to run commands at the end of container creation. // Use 'onCreateCommand' to run commands at the end of container creation.
// Use 'postCreateCommand' to run commands after the container is created. // Use 'postCreateCommand' to run commands after the container is created.

4
.vscode/settings.json vendored
View File

@ -14,8 +14,8 @@
"webp" "webp"
], ],
"editor.codeActionsOnSave": { "editor.codeActionsOnSave": {
"source.fixAll.eslint": true, "source.fixAll.eslint": "explicit",
"source.organizeImports": false "source.organizeImports": "never"
}, },
"editor.formatOnSave": true, "editor.formatOnSave": true,
"eslint.workingDirectories": [ "eslint.workingDirectories": [

4
frontend/pages/admin/site-settings.vue
View File

@ -216,6 +216,7 @@ interface CheckApp extends CheckAppConfig {
} }
export default defineComponent({ export default defineComponent({
components: { AppLoader },
layout: "admin", layout: "admin",
setup() { setup() {
// ========================================================== // ==========================================================
@ -465,8 +466,7 @@ export default defineComponent({
return { return {
title: this.$t("settings.site-settings") as string, title: this.$t("settings.site-settings") as string,
}; };
}, }
components: { AppLoader }
}); });
</script> </script>