From faf88ff82026ff0faa4b1d352acce433ad850bde Mon Sep 17 00:00:00 2001 From: Hayden <64056131+hay-kot@users.noreply.github.com> Date: Sat, 26 Feb 2022 11:20:49 -0900 Subject: [PATCH] add wake-lock support and toggle support (#1006) * add wake-lock support and toggle support * add note in change-log * bump dependencies * update discord webhooks --- .github/workflows/backend-docker-nightly.yml | 2 +- .github/workflows/frontend-docker-nightly.yml | 9 +++ docs/docs/changelog/v1.0.0.md | 1 + frontend/pages/recipe/_slug/index.vue | 58 +++++++++++++++++-- poetry.lock | 19 +++--- pyproject.toml | 6 +- 6 files changed, 74 insertions(+), 21 deletions(-) diff --git a/.github/workflows/backend-docker-nightly.yml b/.github/workflows/backend-docker-nightly.yml index e40318764..d5ef32022 100644 --- a/.github/workflows/backend-docker-nightly.yml +++ b/.github/workflows/backend-docker-nightly.yml @@ -55,4 +55,4 @@ jobs: DISCORD_WEBHOOK: ${{ secrets.DISCORD_NIGHTLY_WEBHOOK }} uses: Ilshidur/action-discord@0.3.2 with: - args: "🚀 A New Nighlty Build of Mealie is ready" + args: "🚀 A New build of mealie:api-nightly is available" diff --git a/.github/workflows/frontend-docker-nightly.yml b/.github/workflows/frontend-docker-nightly.yml index 1bc15cd3c..399aa26bc 100644 --- a/.github/workflows/frontend-docker-nightly.yml +++ b/.github/workflows/frontend-docker-nightly.yml @@ -48,3 +48,12 @@ jobs: docker build --push --no-cache \ --tag hkotel/mealie:frontend-nightly \ --platform linux/amd64,linux/arm64 . + # + # Build Discord Notification + # + - name: Discord notification + env: + DISCORD_WEBHOOK: ${{ secrets.DISCORD_NIGHTLY_WEBHOOK }} + uses: Ilshidur/action-discord@0.3.2 + with: + args: "🚀 A New build of mealie:frontend-nightly is available" diff --git a/docs/docs/changelog/v1.0.0.md b/docs/docs/changelog/v1.0.0.md index 3b755f647..5958e742c 100644 --- a/docs/docs/changelog/v1.0.0.md +++ b/docs/docs/changelog/v1.0.0.md @@ -76,6 +76,7 @@ #### 🍴 Recipe General +- Recipe Pages not implement a screen lock on supported devices to keep the screen from going to sleep. - Recipes are now only viewable by group members - Recipes can be shared with share links - Shared recipes can now render previews for the recipe on sites like Twitter, Facebook, and Discord. diff --git a/frontend/pages/recipe/_slug/index.vue b/frontend/pages/recipe/_slug/index.vue index aeecf2ab2..1e5ddd4a9 100644 --- a/frontend/pages/recipe/_slug/index.vue +++ b/frontend/pages/recipe/_slug/index.vue @@ -7,7 +7,7 @@ - +
@@ -424,12 +424,19 @@ +
+ +
@@ -451,7 +458,8 @@ import { // @ts-ignore vue-markdown has no types import VueMarkdown from "@adapttive/vue-markdown"; import draggable from "vuedraggable"; -import { invoke, until } from "@vueuse/core"; +import { invoke, until, useWakeLock } from "@vueuse/core"; +import { onUnmounted } from "vue-demi"; import RecipeCategoryTagSelector from "@/components/Domain/Recipe/RecipeCategoryTagSelector.vue"; import RecipeDialogBulkAdd from "@/components/Domain/Recipe//RecipeDialogBulkAdd.vue"; import { useUserApi, useStaticRoutes } from "~/composables/api"; @@ -522,19 +530,53 @@ export default defineComponent({ const slug = route.value.params.slug; const api = useUserApi(); + // =============================================================== + // Screen Lock + + const { isSupported, isActive, request, release } = useWakeLock(); + + const wakeLock = computed({ + get: () => isActive, + set: () => { + if (isActive.value) { + unlockScreen(); + } else { + lockScreen(); + } + }, + }); + + async function lockScreen() { + if (isSupported) { + console.log("Wake Lock Requested"); + await request("screen"); + } + } + + async function unlockScreen() { + if (isSupported || isActive) { + console.log("Wake Lock Released"); + await release(); + } + } + // =============================================================== // Edit on Navigate const edit = useRouteQuery("edit", ""); onMounted(() => { - console.log("edit", edit.value); + lockScreen(); + if (edit.value) { - console.log("edit", edit.value); state.form = edit.value === "true"; } }); + onUnmounted(() => { + unlockScreen(); + }); + // =============================================================== // Check Before Leaving @@ -747,6 +789,12 @@ export default defineComponent({ useMeta(metaData); return { + // Wake Lock + isActive, + lockScreen, + unlockScreen, + wakeLock, + // originalRecipe, createApiExtra, apiNewKey, diff --git a/poetry.lock b/poetry.lock index 38775b3de..c1e073727 100644 --- a/poetry.lock +++ b/poetry.lock @@ -358,7 +358,7 @@ cli = ["requests"] [[package]] name = "fastapi" -version = "0.71.0" +version = "0.74.1" description = "FastAPI framework, high performance, easy to learn, fast to code, ready for production" category = "main" optional = false @@ -1171,7 +1171,7 @@ rdflib = ">=5.0.0" [[package]] name = "recipe-scrapers" -version = "13.10.1" +version = "13.18.1" description = "Python package, scraping recipes from all over the internet" category = "main" optional = false @@ -1488,7 +1488,7 @@ pgsql = ["psycopg2-binary"] [metadata] lock-version = "1.1" python-versions = "^3.10" -content-hash = "94bda5d85d0fd3f5fb0c3ce59ff7cf515eaa3210c4533862e1c8bd22eecec8dd" +content-hash = "4c1c1e4eb5026c44d36ede6f44f2675e037d7adaaba9b4ea298e76422e3d3d68" [metadata.files] aiofiles = [ @@ -1707,8 +1707,8 @@ extruct = [ {file = "extruct-0.13.0.tar.gz", hash = "sha256:50a5b5bac4c5e19ecf682bf63a28fde0b1bb57433df7057371f60b58c94a2c64"}, ] fastapi = [ - {file = "fastapi-0.71.0-py3-none-any.whl", hash = "sha256:a78eca6b084de9667f2d5f37e2ae297270e5a119cd01c2f04815795da92fc87f"}, - {file = "fastapi-0.71.0.tar.gz", hash = "sha256:2b5ac0ae89c80b40d1dd4b2ea0bb1f78d7c4affd3644d080bf050f084759fff2"}, + {file = "fastapi-0.74.1-py3-none-any.whl", hash = "sha256:b8ec8400623ef0b2ff558ebe06753b349f8e3a5dd38afea650800f2644ddba34"}, + {file = "fastapi-0.74.1.tar.gz", hash = "sha256:b58a2c46df14f62ebe6f24a9439927539ba1959b9be55ba0e2f516a683e5b9d4"}, ] fastapi-camelcase = [ {file = "fastapi_camelcase-1.0.5.tar.gz", hash = "sha256:2cee005fb1b75649491b9f7cfccc640b12f028eb88084565f7d8cf415192026a"}, @@ -1737,7 +1737,6 @@ greenlet = [ {file = "greenlet-1.1.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:97e5306482182170ade15c4b0d8386ded995a07d7cc2ca8f27958d34d6736497"}, {file = "greenlet-1.1.2-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e6a36bb9474218c7a5b27ae476035497a6990e21d04c279884eb10d9b290f1b1"}, {file = "greenlet-1.1.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:abb7a75ed8b968f3061327c433a0fbd17b729947b400747c334a9c29a9af6c58"}, - {file = "greenlet-1.1.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:b336501a05e13b616ef81ce329c0e09ac5ed8c732d9ba7e3e983fcc1a9e86965"}, {file = "greenlet-1.1.2-cp310-cp310-win_amd64.whl", hash = "sha256:14d4f3cd4e8b524ae9b8aa567858beed70c392fdec26dbdb0a8a418392e71708"}, {file = "greenlet-1.1.2-cp35-cp35m-macosx_10_14_x86_64.whl", hash = "sha256:17ff94e7a83aa8671a25bf5b59326ec26da379ace2ebc4411d690d80a7fbcf23"}, {file = "greenlet-1.1.2-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:9f3cba480d3deb69f6ee2c1825060177a22c7826431458c697df88e6aeb3caee"}, @@ -1750,7 +1749,6 @@ greenlet = [ {file = "greenlet-1.1.2-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f9d29ca8a77117315101425ec7ec2a47a22ccf59f5593378fc4077ac5b754fce"}, {file = "greenlet-1.1.2-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:21915eb821a6b3d9d8eefdaf57d6c345b970ad722f856cd71739493ce003ad08"}, {file = "greenlet-1.1.2-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:eff9d20417ff9dcb0d25e2defc2574d10b491bf2e693b4e491914738b7908168"}, - {file = "greenlet-1.1.2-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:b8c008de9d0daba7b6666aa5bbfdc23dcd78cafc33997c9b7741ff6353bafb7f"}, {file = "greenlet-1.1.2-cp36-cp36m-win32.whl", hash = "sha256:32ca72bbc673adbcfecb935bb3fb1b74e663d10a4b241aaa2f5a75fe1d1f90aa"}, {file = "greenlet-1.1.2-cp36-cp36m-win_amd64.whl", hash = "sha256:f0214eb2a23b85528310dad848ad2ac58e735612929c8072f6093f3585fd342d"}, {file = "greenlet-1.1.2-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:b92e29e58bef6d9cfd340c72b04d74c4b4e9f70c9fa7c78b674d1fec18896dc4"}, @@ -1759,7 +1757,6 @@ greenlet = [ {file = "greenlet-1.1.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1e12bdc622676ce47ae9abbf455c189e442afdde8818d9da983085df6312e7a1"}, {file = "greenlet-1.1.2-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8c790abda465726cfb8bb08bd4ca9a5d0a7bd77c7ac1ca1b839ad823b948ea28"}, {file = "greenlet-1.1.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f276df9830dba7a333544bd41070e8175762a7ac20350786b322b714b0e654f5"}, - {file = "greenlet-1.1.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:8c5d5b35f789a030ebb95bff352f1d27a93d81069f2adb3182d99882e095cefe"}, {file = "greenlet-1.1.2-cp37-cp37m-win32.whl", hash = "sha256:64e6175c2e53195278d7388c454e0b30997573f3f4bd63697f88d855f7a6a1fc"}, {file = "greenlet-1.1.2-cp37-cp37m-win_amd64.whl", hash = "sha256:b11548073a2213d950c3f671aa88e6f83cda6e2fb97a8b6317b1b5b33d850e06"}, {file = "greenlet-1.1.2-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:9633b3034d3d901f0a46b7939f8c4d64427dfba6bbc5a36b1a67364cf148a1b0"}, @@ -1768,7 +1765,6 @@ greenlet = [ {file = "greenlet-1.1.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e859fcb4cbe93504ea18008d1df98dee4f7766db66c435e4882ab35cf70cac43"}, {file = "greenlet-1.1.2-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:00e44c8afdbe5467e4f7b5851be223be68adb4272f44696ee71fe46b7036a711"}, {file = "greenlet-1.1.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ec8c433b3ab0419100bd45b47c9c8551248a5aee30ca5e9d399a0b57ac04651b"}, - {file = "greenlet-1.1.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:2bde6792f313f4e918caabc46532aa64aa27a0db05d75b20edfc5c6f46479de2"}, {file = "greenlet-1.1.2-cp38-cp38-win32.whl", hash = "sha256:288c6a76705dc54fba69fbcb59904ae4ad768b4c768839b8ca5fdadec6dd8cfd"}, {file = "greenlet-1.1.2-cp38-cp38-win_amd64.whl", hash = "sha256:8d2f1fb53a421b410751887eb4ff21386d119ef9cde3797bf5e7ed49fb51a3b3"}, {file = "greenlet-1.1.2-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:166eac03e48784a6a6e0e5f041cfebb1ab400b394db188c48b3a84737f505b67"}, @@ -1777,7 +1773,6 @@ greenlet = [ {file = "greenlet-1.1.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b1692f7d6bc45e3200844be0dba153612103db241691088626a33ff1f24a0d88"}, {file = "greenlet-1.1.2-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7227b47e73dedaa513cdebb98469705ef0d66eb5a1250144468e9c3097d6b59b"}, {file = "greenlet-1.1.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7ff61ff178250f9bb3cd89752df0f1dd0e27316a8bd1465351652b1b4a4cdfd3"}, - {file = "greenlet-1.1.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:0051c6f1f27cb756ffc0ffbac7d2cd48cb0362ac1736871399a739b2885134d3"}, {file = "greenlet-1.1.2-cp39-cp39-win32.whl", hash = "sha256:f70a9e237bb792c7cc7e44c531fd48f5897961701cdaa06cf22fc14965c496cf"}, {file = "greenlet-1.1.2-cp39-cp39-win_amd64.whl", hash = "sha256:013d61294b6cd8fe3242932c1c5e36e5d1db2c8afb58606c5a67efce62c1f5fd"}, {file = "greenlet-1.1.2.tar.gz", hash = "sha256:e30f5ea4ae2346e62cedde8794a56858a67b878dd79f7df76a0767e356b1744a"}, @@ -2379,8 +2374,8 @@ rdflib-jsonld = [ {file = "rdflib_jsonld-0.6.2-py2.py3-none-any.whl", hash = "sha256:011afe67672353ca9978ab9a4bee964dff91f14042f2d8a28c22a573779d2f8b"}, ] recipe-scrapers = [ - {file = "recipe_scrapers-13.10.1-py3-none-any.whl", hash = "sha256:6dbe178af1183002b32722ad6caef4227e925502cb6b8c2b40521632be39da7e"}, - {file = "recipe_scrapers-13.10.1.tar.gz", hash = "sha256:2d0e28e3cbd7d87549b0b1fa43b56ac581631ece2164a4de1f85043440281707"}, + {file = "recipe_scrapers-13.18.1-py3-none-any.whl", hash = "sha256:0923a413e36d66a7489ef414c36c5d1633bc69c2c860535ae7a0ed6d7d52743d"}, + {file = "recipe_scrapers-13.18.1.tar.gz", hash = "sha256:2172ebbba155332c1d26a94242d7f18c82313ec8aa74512d25b3678f138b8576"}, ] requests = [ {file = "requests-2.27.1-py2.py3-none-any.whl", hash = "sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d"}, diff --git a/pyproject.toml b/pyproject.toml index ccf4bd89a..83df7b36c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,7 +13,7 @@ python = "^3.10" aiofiles = "0.5.0" aniso8601 = "7.0.0" appdirs = "1.4.4" -fastapi = "^0.71.0" +fastapi = "^0.74.1" uvicorn = {extras = ["standard"], version = "^0.13.0"} APScheduler = "^3.8.1" SQLAlchemy = "^1.4.29" @@ -25,7 +25,7 @@ requests = "^2.25.1" PyYAML = "^5.3.1" extruct = "^0.13.0" python-multipart = "^0.0.5" -fastapi-camelcase = "^1.0.2" +fastapi-camelcase = "^1.0.5" bcrypt = "^3.2.0" python-jose = "^3.3.0" passlib = "^1.7.4" @@ -33,7 +33,7 @@ lxml = "^4.7.1" Pillow = "^8.2.0" pathvalidate = "^2.4.1" apprise = "^0.9.6" -recipe-scrapers = "^13.5.0" +recipe-scrapers = "^13.18.1" psycopg2-binary = {version = "^2.9.1", optional = true} gunicorn = "^20.1.0" emails = "^0.6"