Skip to content

Commit

Permalink
avoid reverting stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
ildyria committed Nov 13, 2024
1 parent ca0b7af commit b3c05b9
Show file tree
Hide file tree
Showing 9 changed files with 50 additions and 35 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/CICD.yml
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ jobs:
if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`

- name: Attest
uses: actions/attest-build-provenance@1c608d11d69870c2092266b3f9a6f3abbf17002c # v1.4.3
uses: actions/attest-build-provenance@ef244123eb79f2f7a7e75d99086184180e6d0018 # v1.4.4
with:
# Path to the artifact serving as the subject of the attestation. Must
# specify exactly one of "subject-path" or "subject-digest". May contain a
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
uses: github/codeql-action/init@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -60,7 +60,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
uses: github/codeql-action/autobuild@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
Expand All @@ -73,6 +73,6 @@ jobs:
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
uses: github/codeql-action/analyze@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
with:
category: "/language:${{matrix.language}}"
2 changes: 1 addition & 1 deletion .github/workflows/scorecard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@83a02f7883b12e0e4e1a146174f5e2292a01e601 # v2.16.4
uses: github/codeql-action/upload-sarif@4f3212b61783c3c68e8309a0f18a699764811cda # v2.16.4
with:
sarif_file: results.sarif
24 changes: 12 additions & 12 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 13 additions & 13 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@types/photoswipe": "^4.1.6",
"@types/qrcode": "^1.5.5",
"@types/sprintf-js": "^1.1.4",
"@vitejs/plugin-vue": "^5.1.4",
"@vitejs/plugin-vue": "^5.1.5",
"sass": "^1.80.6",
"vue-tsc": "^2.1.8"
},
Expand All @@ -43,7 +43,7 @@
"leaflet-rotatedmarker": "^0.2.0",
"leaflet.markercluster": "^1.5.3",
"pinia": "^2.1.7",
"postcss": "^8.4.33",
"postcss": "^8.4.49",
"prettier": "^3.2.4",
"primeicons": "^7.0.0",
"primevue": "^4.0.0-rc.2",
Expand All @@ -54,7 +54,7 @@
"tinygesture": "^3.0.0",
"ts-loader": "^9.5.1",
"typescript": "^5.3.3",
"vite": "^5.4.6",
"vite": "^5.4.11",
"vite-plugin-commonjs": "^0.10.1",
"vue": "^3.2.37",
"vue-collapsed": "^1.3.3",
Expand Down
14 changes: 13 additions & 1 deletion resources/js/components/headers/AlbumsHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ import AlbumCreateTagDialog from "@/components/forms/album/AlbumCreateTagDialog.
import { computed, ComputedRef, ref } from "vue";
import { onKeyStroke } from "@vueuse/core";
import { useLycheeStateStore } from "@/stores/LycheeState";
import { shouldIgnoreKeystroke } from "@/utils/keybindings-utils";
import { isTouchDevice, shouldIgnoreKeystroke } from "@/utils/keybindings-utils";
import { storeToRefs } from "pinia";
import BackLinkButton from "./BackLinkButton.vue";
import { useContextMenuAlbumsAdd } from "@/composables/contextMenus/contextMenuAlbumsAdd";
Expand Down Expand Up @@ -284,6 +284,18 @@ const menu = computed(() =>
callback: openAddMenu,
if: props.rights.can_upload,
},
{
icon: "pi pi-eye-slash",
type: "fn",
callback: () => (lycheeStore.are_nsfw_visible = false),
if: isTouchDevice() && lycheeStore.are_nsfw_visible,
},
{
icon: "pi pi-eye",
type: "fn",
callback: () => (lycheeStore.are_nsfw_visible = true),
if: isTouchDevice() && !lycheeStore.are_nsfw_visible,
},
].filter((item) => item.if),
) as ComputedRef<MenuRight[]>;
Expand Down
1 change: 0 additions & 1 deletion resources/js/composables/album/splitter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ export function useSplitter() {
sum += ret[idx].data.length;
}

console.log(ret);
return ret;
}

Expand Down
4 changes: 4 additions & 0 deletions resources/js/utils/keybindings-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,7 @@ export function disableCtrlA(): void {
false,
);
}

export function isTouchDevice(): boolean {
return "ontouchstart" in document.documentElement || navigator.maxTouchPoints > 0;
}

0 comments on commit b3c05b9

Please sign in to comment.