Revert "style: formatting"

This reverts commit f2f554074b.
This commit is contained in:
PandaDEV 2024-11-23 15:09:16 +10:00
parent f2f554074b
commit d0b551b3fd
No known key found for this signature in database
GPG key ID: 13EFF9BAF70EE75C
22 changed files with 1171 additions and 1493 deletions

View file

@ -1,214 +0,0 @@
name: "Release"
on:
push:
tags:
- "v*"
workflow_dispatch:
jobs:
prepare:
runs-on: ubuntu-latest
outputs:
version: ${{ steps.get_version.outputs.VERSION }}
steps:
- uses: actions/checkout@v4
- name: Get version
id: get_version
run: echo "VERSION=$(node -p "require('./src-tauri/tauri.conf.json').version")" >> $GITHUB_OUTPUT
build-macos:
needs: prepare
strategy:
matrix:
include:
- args: "--target aarch64-apple-darwin"
arch: "silicon"
- args: "--target x86_64-apple-darwin"
arch: "intel"
runs-on: macos-latest
env:
APPLE_ID: ${{ secrets.APPLE_ID }}
APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
steps:
- uses: actions/checkout@v4
- name: Redact Sensitive Information
run: |
function redact_output {
sed -e "s/${{ secrets.REDACT_PATTERN }}/REDACTED/g"
}
exec > >(redact_output) 2>&1
- uses: actions/setup-node@v4
with:
node-version: 20
- uses: dtolnay/rust-toolchain@stable
with:
targets: aarch64-apple-darwin,x86_64-apple-darwin
- uses: swatinem/rust-cache@v2
with:
workspaces: "src-tauri -> target"
cache-directories: "~/.cargo/registry/index/,~/.cargo/registry/cache/,~/.cargo/git/db/"
shared-key: "macos-rust-cache"
save-if: "true"
- uses: actions/cache@v4
with:
path: ~/.pnpm-store
key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-
- run: npm install -g pnpm && pnpm install
- name: Import Apple Developer Certificate
env:
APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
run: |
echo $APPLE_CERTIFICATE | base64 --decode > certificate.p12
security create-keychain -p "$KEYCHAIN_PASSWORD" build.keychain
security default-keychain -s build.keychain
security unlock-keychain -p "$KEYCHAIN_PASSWORD" build.keychain
security import certificate.p12 -k build.keychain -P "$APPLE_CERTIFICATE_PASSWORD" -T /usr/bin/codesign
security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$KEYCHAIN_PASSWORD" build.keychain
- uses: tauri-apps/tauri-action@v0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
with:
args: ${{ matrix.args }}
tagName: v${{ needs.prepare.outputs.version }}
releaseName: v${{ needs.prepare.outputs.version }}
releaseBody: "See the assets to download this version and install."
releaseDraft: true
prerelease: false
- name: Rename macOS Artifacts
run: |
mv src-tauri/target/${{ matrix.args == '--target aarch64-apple-darwin' && 'aarch64-apple-darwin' || 'x86_64-apple-darwin' }}/release/bundle/dmg/*.dmg src-tauri/target/${{ matrix.args == '--target aarch64-apple-darwin' && 'aarch64-apple-darwin' || 'x86_64-apple-darwin' }}/release/bundle/dmg/Qopy-${{ needs.prepare.outputs.version }}_${{ matrix.arch }}.dmg
mv src-tauri/target/${{ matrix.args == '--target aarch64-apple-darwin' && 'aarch64-apple-darwin' || 'x86_64-apple-darwin' }}/release/bundle/macos/*.app.tar.gz src-tauri/target/${{ matrix.args == '--target aarch64-apple-darwin' && 'aarch64-apple-darwin' || 'x86_64-apple-darwin' }}/release/bundle/macos/Qopy-${{ needs.prepare.outputs.version }}_${{ matrix.arch }}.app.tar.gz
mv src-tauri/target/${{ matrix.args == '--target aarch64-apple-darwin' && 'aarch64-apple-darwin' || 'x86_64-apple-darwin' }}/release/bundle/macos/*.app.tar.gz.sig src-tauri/target/${{ matrix.args == '--target aarch64-apple-darwin' && 'aarch64-apple-darwin' || 'x86_64-apple-darwin' }}/release/bundle/macos/Qopy-${{ needs.prepare.outputs.version }}_${{ matrix.arch }}.app.tar.gz.sig
build-windows:
needs: prepare
strategy:
matrix:
include:
- args: "--target x86_64-pc-windows-msvc"
arch: "x64"
- args: "--target aarch64-pc-windows-msvc"
arch: "arm64"
runs-on: windows-latest
env:
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 20
- uses: dtolnay/rust-toolchain@stable
with:
targets: x86_64-pc-windows-msvc,aarch64-pc-windows-msvc
- uses: swatinem/rust-cache@v2
with:
workspaces: "src-tauri -> target"
cache-directories: "~/.cargo/registry/index/,~/.cargo/registry/cache/,~/.cargo/git/db/"
shared-key: "windows-rust-cache"
save-if: "true"
- uses: actions/cache@v4
with:
path: ~/.pnpm-store
key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-
- run: npm install -g pnpm && pnpm install
- uses: tauri-apps/tauri-action@v0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
args: ${{ matrix.args }}
tagName: v${{ needs.prepare.outputs.version }}
releaseName: v${{ needs.prepare.outputs.version }}
releaseBody: "See the assets to download this version and install."
releaseDraft: true
prerelease: false
- name: Rename Windows Artifacts
run: |
mv src-tauri/target/release/bundle/msi/*.msi src-tauri/target/release/bundle/msi/Qopy-${{ needs.prepare.outputs.version }}_${{ matrix.arch }}.msi
mv src-tauri/target/release/bundle/msi/*.msi.sig src-tauri/target/release/bundle/msi/Qopy-${{ needs.prepare.outputs.version }}_${{ matrix.arch }}.msi.sig
build-linux:
needs: prepare
runs-on: ubuntu-latest
env:
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-node@v4
with:
node-version: 20
- uses: dtolnay/rust-toolchain@stable
- uses: swatinem/rust-cache@v2
with:
workspaces: "src-tauri -> target"
cache-directories: "~/.cargo/registry/index/,~/.cargo/registry/cache/,~/.cargo/git/db/"
shared-key: "linux-rust-cache"
save-if: "true"
- uses: actions/cache@v4
with:
path: ~/.pnpm-store
key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-
- name: Install dependencies
run: |
sudo apt update
sudo apt install -y libwebkit2gtk-4.1-dev build-essential curl wget file libssl-dev libayatana-appindicator3-dev librsvg2-dev libasound2-dev rpm
echo "PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig" >> $GITHUB_ENV
- run: npm install -g pnpm && pnpm install
- name: Generate Changelog
id: changelog
run: |
CHANGELOG=$(git log $(git describe --tags --abbrev=0)..HEAD --pretty=format:"- %s")
echo "CHANGELOG<<EOF" >> $GITHUB_ENV
echo "$CHANGELOG" >> $GITHUB_ENV
echo "EOF" >> $GITHUB_ENV
- uses: tauri-apps/tauri-action@v0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
args: --target x86_64-unknown-linux-gnu
tagName: v${{ needs.prepare.outputs.version }}
releaseName: v${{ needs.prepare.outputs.version }}
releaseBody: |
## Changelog
${{ env.CHANGELOG }}
See the assets to download this version and install.
releaseDraft: true
prerelease: false
- name: Rename Linux Artifacts
run: |
mv src-tauri/target/release/bundle/deb/*.deb src-tauri/target/release/bundle/deb/Qopy-${{ needs.prepare.outputs.version }}_amd64.deb
mv src-tauri/target/release/bundle/appimage/*.AppImage src-tauri/target/release/bundle/appimage/Qopy-${{ needs.prepare.outputs.version }}_amd64.AppImage
mv src-tauri/target/release/bundle/appimage/*.AppImage.sig src-tauri/target/release/bundle/appimage/Qopy-${{ needs.prepare.outputs.version }}_amd64.AppImage.sig
mv src-tauri/target/release/bundle/rpm/*.rpm src-tauri/target/release/bundle/rpm/Qopy-${{ needs.prepare.outputs.version }}_amd64.rpm
- name: Create Draft Release
uses: softprops/action-gh-release@v1
with:
draft: true
files: |
src-tauri/target/release/bundle/deb/*.deb
src-tauri/target/release/bundle/appimage/*.AppImage
src-tauri/target/release/bundle/appimage/*.AppImage.sig
src-tauri/target/release/bundle/rpm/*.rpm
body: |
## Changelog
${{ env.CHANGELOG }}
See the assets to download this version and install.
tag_name: v${{ needs.prepare.outputs.version }}
name: v${{ needs.prepare.outputs.version }}

View file

@ -1,39 +0,0 @@
# Rust
/target/
/src-tauri/target/
Cargo.lock
*.rs
# Node
node_modules/
.nuxt/
.output/
dist/
# Build
/build/
/out/
# Tauri
.tauri/
# System
.DS_Store
*.pem
# Debug
npm-debug.log*
yarn-debug.log*
yarn-error.log*
# Local env files
.env
.env.*
# IDE
.idea/
.vscode/
*.suo
*.ntvs*
*.njsproj
*.sln

View file

@ -1,10 +0,0 @@
{
"semi": true,
"singleQuote": false,
"tabWidth": 2,
"useTabs": true,
"printWidth": 100,
"trailingComma": "es5",
"vueIndentScriptAndStyle": true,
"plugins": ["prettier-plugin-vue"]
}

View file

@ -5,7 +5,7 @@ The hotkey for Qopy is Windows+V which is also the hotkey for the default clipbo
All the data of Qopy is stored inside of a SQLite database. The location for the file differs for windows and linux.
| Operating System | Path |
| ---------------- | ----------------------------------------------------- |
|------------------|-------------------------------------------------------|
| Windows | `C:\Users\USERNAME\AppData\Roaming\net.pandadev.qopy` |
| Linux | `` |

View file

@ -60,7 +60,6 @@ The fixed and simple clipboard manager for both Windows and Linux.
Qopy is a fixed clipboard manager designed as a simple alternative to the standard clipboard on Windows. It aims to provide a faster, more reliable experience while providing an extensive set of features compared to its Windows counterpart.
## 🚧 Roadmap
- [ ] [Setup guide](https://github.com/0PandaDEV/Qopy/blob/main/GET_STARTED.md)
- [ ] Settings https://github.com/0PandaDEV/Qopy/issues/2
- [ ] Metadata for copied items https://github.com/0PandaDEV/Qopy/issues/5
@ -73,7 +72,6 @@ Qopy is a fixed clipboard manager designed as a simple alternative to the standa
<sup>If you have ideas for features to include, please write a feature request [here](https://github.com/0pandadev/Qopy/issues).</sup>
## 📦 Preview
<img width="800px" src="https://github.com/user-attachments/assets/18e1f9e3-414c-46e2-9c51-61c6e63a06d2"/>
<img width="800px" src="https://github.com/user-attachments/assets/46ec4672-f156-4426-a2cb-3a40d00dbcd6"/>

28
app.vue
View file

@ -5,23 +5,23 @@
</template>
<script setup lang="ts">
import { app, window } from "@tauri-apps/api";
import { listen } from "@tauri-apps/api/event";
import { onMounted } from "vue";
import { listen } from '@tauri-apps/api/event'
import { app, window } from '@tauri-apps/api';
import { onMounted } from 'vue'
onMounted(async () => {
await listen("change_keybind", async () => {
await listen('change_keybind', async () => {
console.log("change_keybind");
await navigateTo("/keybind");
await navigateTo('/keybind')
await app.show();
await window.getCurrentWindow().show();
});
})
await listen("main_route", async () => {
await listen('main_route', async () => {
console.log("main_route");
await navigateTo("/");
});
});
await navigateTo('/')
})
})
</script>
<style lang="scss">
@ -53,16 +53,16 @@
margin: 0;
padding: 0;
box-sizing: border-box;
color: #e5dfd5;
color: #E5DFD5;
text-decoration: none;
font-family: SFRoundedRegular;
scroll-behavior: smooth;
scrollbar-width: thin;
user-select: none;
--os-handle-bg: #ada9a1;
--os-handle-bg-hover: #78756f;
--os-handle-bg-active: #78756f;
--os-handle-bg: #ADA9A1;
--os-handle-bg-hover: #78756F;
--os-handle-bg-active: #78756F;
}
html,

View file

@ -1,10 +1,10 @@
$primary: #2e2d2b;
$accent: #feb453;
$primary: #2E2D2B;
$accent: #FEB453;
$divider: #ffffff0d;
$text: #e5dfd5;
$text2: #ada9a1;
$mutedtext: #78756f;
$text: #E5DFD5;
$text2: #ADA9A1;
$mutedtext: #78756F;
.bg {
width: 750px;
@ -123,7 +123,7 @@ $mutedtext: #78756f;
background-color: $divider;
margin-left: 8px;
margin-right: 4px;
transition: all 0.2s;
transition: all .2s;
}
.actions {
@ -134,7 +134,7 @@ $mutedtext: #78756f;
gap: 8px;
border-radius: 7px;
background-color: transparent;
transition: all 0.2s;
transition: all .2s;
cursor: pointer;
}

View file

@ -13,7 +13,7 @@
pointer-events: none;
user-select: none;
z-index: 0;
background-image: url("/noise.png");
background-image: url('/noise.png');
background-repeat: repeat;
image-rendering: pixelated;
overflow: hidden;

View file

@ -1,31 +1,26 @@
{
"name": "nuxt-app",
"dependencies": {
"@tauri-apps/api": "2.1.1",
"@tauri-apps/cli": "2.1.0",
"@tauri-apps/plugin-autostart": "2.0.0",
"@tauri-apps/plugin-fs": "2.0.2",
"@tauri-apps/plugin-os": "2.0.0",
"@tauri-apps/plugin-sql": "2.0.1",
"nuxt": "3.14.1592",
"nuxt-build-cache": "0.1.1",
"overlayscrollbars": "2.10.0",
"overlayscrollbars-vue": "0.5.9",
"prettier": "^3.3.3",
"sass": "1.81.0",
"vue": "3.5.13"
},
"private": true,
"type": "module",
"scripts": {
"build": "tauri build",
"dev": "tauri dev",
"generate": "nuxt generate",
"preview": "nuxt preview",
"postinstall": "nuxt prepare",
"format": "prettier --write \"**/*.{js,ts,vue,scss,css,json,md}\""
"postinstall": "nuxt prepare"
},
"type": "module",
"devDependencies": {
"prettier-plugin-vue": "^1.1.6"
"dependencies": {
"@tauri-apps/api": "2.0.3",
"@tauri-apps/cli": "2.1.0",
"@tauri-apps/plugin-autostart": "2.0.0",
"@tauri-apps/plugin-fs": "2.0.2",
"@tauri-apps/plugin-os": "2.0.0",
"@tauri-apps/plugin-sql": "2.0.1",
"nuxt": "3.14.159",
"nuxt-build-cache": "0.1.1",
"overlayscrollbars": "2.10.0",
"overlayscrollbars-vue": "0.5.9",
"sass": "1.81.0",
"vue": "3.5.13"
}
}

View file

@ -1,23 +1,8 @@
<template>
<div
class="bg"
@keydown.down.prevent="selectNext"
@keydown.up.prevent="selectPrevious"
@keydown.enter.prevent="pasteSelectedItem"
@keydown.esc="hideApp"
tabindex="0"
>
<input
ref="searchInput"
v-model="searchQuery"
@input="searchHistory"
autocorrect="off"
autocapitalize="off"
spellcheck="false"
class="search"
type="text"
placeholder="Type to filter entries..."
/>
<div class="bg" @keydown.down.prevent="selectNext" @keydown.up.prevent="selectPrevious"
@keydown.enter.prevent="pasteSelectedItem" @keydown.esc="hideApp" tabindex="0">
<input ref="searchInput" v-model="searchQuery" @input="searchHistory" autocorrect="off" autocapitalize="off"
spellcheck="false" class="search" type="text" placeholder="Type to filter entries..." />
<div class="bottom-bar">
<div class="left">
<img class="logo" width="18px" src="../public/logo.png" alt="" />
@ -39,62 +24,29 @@
</div>
</div>
</div>
<OverlayScrollbarsComponent
class="results"
ref="resultsContainer"
:options="{ scrollbars: { autoHide: 'scroll' } }"
>
<OverlayScrollbarsComponent class="results" ref="resultsContainer"
:options="{ scrollbars: { autoHide: 'scroll' } }">
<template v-for="(group, groupIndex) in groupedHistory" :key="groupIndex">
<div class="time-separator">{{ group.label }}</div>
<div
v-for="(item, index) in group.items"
:key="item.id"
:class="['result clothoid-corner', { selected: isSelected(groupIndex, index) }]"
@click="selectItem(groupIndex, index)"
:ref="
(el) => {
if (isSelected(groupIndex, index)) selectedElement = el as HTMLElement;
<div v-for="(item, index) in group.items" :key="item.id" :class="[
'result clothoid-corner',
{ selected: isSelected(groupIndex, index) },
]" @click="selectItem(groupIndex, index)" :ref="(el) => {
if (isSelected(groupIndex, index))
selectedElement = el as HTMLElement;
}
"
>
">
<template v-if="item.content_type === 'image'">
<img
v-if="!imageLoading && !imageLoadError"
:src="getComputedImageUrl(item)"
alt="Image"
class="image"
@error="onImageError"
/>
<img
v-if="imageLoading || imageLoadError"
src="../public/icons/Image.svg"
class="icon"
/>
<img v-if="!imageLoading && !imageLoadError" :src="getComputedImageUrl(item)" alt="Image" class="image"
@error="onImageError" />
<img v-if="imageLoading || imageLoadError" src="../public/icons/Image.svg" class="icon" />
</template>
<img
v-else-if="hasFavicon(item.favicon ?? '')"
:src="getFaviconFromDb(item.favicon ?? '')"
alt="Favicon"
class="favicon"
/>
<img
src="../public/icons/File.svg"
class="icon"
v-else-if="item.content_type === 'files'"
/>
<img
src="../public/icons/Text.svg"
class="icon"
v-else-if="item.content_type === 'text'"
/>
<img
src="../public/icons/Code.svg"
class="icon"
v-else-if="item.content_type === 'code'"
/>
<span v-if="item.content_type === 'image'"
>Image ({{ item.dimensions || "Loading..." }})</span
>
<img v-else-if="hasFavicon(item.favicon ?? '')" :src="getFaviconFromDb(item.favicon ?? '')" alt="Favicon"
class="favicon" />
<img src="../public/icons/File.svg" class="icon" v-else-if="item.content_type === 'files'" />
<img src="../public/icons/Text.svg" class="icon" v-else-if="item.content_type === 'text'" />
<img src="../public/icons/Code.svg" class="icon" v-else-if="item.content_type === 'code'" />
<span v-if="item.content_type === 'image'">Image ({{ item.dimensions || "Loading..." }})</span>
<span v-else>{{ truncateContent(item.content) }}</span>
</div>
</template>
@ -103,12 +55,8 @@
<img :src="getComputedImageUrl(selectedItem)" alt="Image" class="image" />
</div>
<OverlayScrollbarsComponent v-else class="content">
<img
v-if="selectedItem?.content && isYoutubeWatchUrl(selectedItem.content)"
:src="getYoutubeThumbnail(selectedItem.content)"
alt="YouTube Thumbnail"
class="full-image"
/>
<img v-if="selectedItem?.content && isYoutubeWatchUrl(selectedItem.content)"
:src="getYoutubeThumbnail(selectedItem.content)" alt="YouTube Thumbnail" class="full-image" />
<span v-else>{{ selectedItem?.content || "" }}</span>
</OverlayScrollbarsComponent>
<Noise />
@ -116,16 +64,16 @@
</template>
<script setup lang="ts">
import { ref, computed, onMounted, watch, nextTick, shallowRef } from "vue";
import Database from "@tauri-apps/plugin-sql";
import type { OverlayScrollbarsComponent } from "overlayscrollbars-vue";
import { computed, nextTick, onMounted, ref, shallowRef, watch } from "vue";
import { OverlayScrollbarsComponent } from "overlayscrollbars-vue";
import "overlayscrollbars/overlayscrollbars.css";
import { app, window } from "@tauri-apps/api";
import { invoke } from "@tauri-apps/api/core";
import { listen } from "@tauri-apps/api/event";
import { enable, isEnabled } from "@tauri-apps/plugin-autostart";
import { readFile } from "@tauri-apps/plugin-fs";
import { platform } from "@tauri-apps/plugin-os";
import { invoke } from "@tauri-apps/api/core";
import { enable, isEnabled } from "@tauri-apps/plugin-autostart";
import { listen } from "@tauri-apps/api/event";
import { readFile } from "@tauri-apps/plugin-fs";
interface HistoryItem {
id: number;
@ -144,9 +92,11 @@
const db: Ref<Database | null> = ref(null);
const history: Ref<HistoryItem[]> = ref([]);
const chunkSize: number = 50;
let offset = 0;
let isLoading = false;
const resultsContainer: Ref<InstanceType<typeof OverlayScrollbarsComponent> | null> = ref(null);
let offset: number = 0;
let isLoading: boolean = false;
const resultsContainer: Ref<InstanceType<
typeof OverlayScrollbarsComponent
> | null> = ref(null);
const searchQuery: Ref<string> = ref("");
const selectedGroupIndex: Ref<number> = ref(0);
const selectedItemIndex: Ref<number> = ref(0);
@ -193,7 +143,10 @@
if (itemDate.toDateString() === today.toDateString()) {
groups[0].items.push(item);
} else if (itemDate.toDateString() === new Date(today.getTime() - 86400000).toDateString()) {
} else if (
itemDate.toDateString() ===
new Date(today.getTime() - 86400000).toDateString()
) {
groups[1].items.push(item);
} else if (itemYear === thisYear && itemWeek === thisWeek) {
groups[2].items.push(item);
@ -215,7 +168,10 @@
});
const isSelected = (groupIndex: number, itemIndex: number): boolean => {
return selectedGroupIndex.value === groupIndex && selectedItemIndex.value === itemIndex;
return (
selectedGroupIndex.value === groupIndex &&
selectedItemIndex.value === itemIndex
);
};
const searchHistory = async (): Promise<void> => {
@ -257,7 +213,8 @@
selectedItemIndex.value--;
} else if (selectedGroupIndex.value > 0) {
selectedGroupIndex.value--;
selectedItemIndex.value = groupedHistory.value[selectedGroupIndex.value].items.length - 1;
selectedItemIndex.value =
groupedHistory.value[selectedGroupIndex.value].items.length - 1;
}
scrollToSelectedItem();
};
@ -272,7 +229,7 @@
if (!selectedItem.value) return;
let content = selectedItem.value.content;
const contentType: string = selectedItem.value.content_type;
let contentType: String = selectedItem.value.content_type;
if (contentType === "image") {
try {
content = readFile(content).toString();
@ -292,7 +249,9 @@
const maxWidth = 284;
const charWidth = 9;
const maxChars = Math.floor(maxWidth / charWidth);
return content.length > maxChars ? `${content.slice(0, maxChars - 3)}...` : content;
return content.length > maxChars
? content.slice(0, maxChars - 3) + "..."
: content;
};
const hasFavicon = (str: string): boolean => {
@ -301,8 +260,9 @@
const isYoutubeWatchUrl = (url: string): boolean => {
return (
/^(https?:\/\/)?(www\.)?(youtube\.com|youtu\.be)\/watch\?v=[\w-]+/.test(url) ||
/^(https?:\/\/)?(www\.)?youtu\.be\/[\w-]+/.test(url)
/^(https?:\/\/)?(www\.)?(youtube\.com|youtu\.be)\/watch\?v=[\w-]+/.test(
url
) || /^(https?:\/\/)?(www\.)?youtu\.be\/[\w-]+/.test(url)
);
};
@ -452,7 +412,7 @@
});
};
const scrollToSelectedItem = (forceScrollTop = false): void => {
const scrollToSelectedItem = (forceScrollTop: boolean = false): void => {
nextTick(() => {
if (selectedElement.value && resultsContainer.value) {
const osInstance = resultsContainer.value.osInstance();
@ -527,7 +487,8 @@
const previousGroupIndex = selectedGroupIndex.value;
const previousItemIndex = selectedItemIndex.value;
const previousScroll =
resultsContainer.value?.osInstance()?.elements().viewport?.scrollTop || 0;
resultsContainer.value?.osInstance()?.elements().viewport?.scrollTop ||
0;
history.value = [];
offset = 0;
@ -562,7 +523,9 @@
os.value = platform();
});
watch([selectedGroupIndex, selectedItemIndex], () => scrollToSelectedItem(false));
watch([selectedGroupIndex, selectedItemIndex], () =>
scrollToSelectedItem(false)
);
</script>
<style scoped lang="scss">

View file

@ -47,53 +47,45 @@
</template>
<script setup lang="ts">
import { invoke } from "@tauri-apps/api/core";
import { platform } from "@tauri-apps/plugin-os";
import { onMounted, onUnmounted, reactive, ref } from "vue";
import { useRouter } from "vue-router";
import { invoke } from '@tauri-apps/api/core';
import { onMounted, onUnmounted, reactive, ref } from 'vue';
import { platform } from '@tauri-apps/plugin-os';
import { useRouter } from 'vue-router';
const activeModifiers = reactive<Set<string>>(new Set());
const isKeybindInputFocused = ref(false);
const keybind = ref<string[]>([]);
const keybindInput = ref<HTMLElement | null>(null);
const lastBlurTime = ref(0);
const os = ref("");
const os = ref('');
const router = useRouter();
const keyToDisplayMap: Record<string, string> = {
" ": "Space",
Alt: "Alt",
AltLeft: "Alt L",
AltRight: "Alt R",
ArrowDown: "↓",
ArrowLeft: "←",
ArrowRight: "→",
ArrowUp: "↑",
Control: "Ctrl",
ControlLeft: "Ctrl L",
ControlRight: "Ctrl R",
Enter: "↵",
Meta: "Meta",
MetaLeft: "Meta L",
MetaRight: "Meta R",
Shift: "⇧",
ShiftLeft: "⇧ L",
ShiftRight: "⇧ R",
' ': 'Space',
Alt: 'Alt',
AltLeft: 'Alt L',
AltRight: 'Alt R',
ArrowDown: '↓',
ArrowLeft: '←',
ArrowRight: '→',
ArrowUp: '↑',
Control: 'Ctrl',
ControlLeft: 'Ctrl L',
ControlRight: 'Ctrl R',
Enter: '↵',
Meta: 'Meta',
MetaLeft: 'Meta L',
MetaRight: 'Meta R',
Shift: '⇧',
ShiftLeft: '⇧ L',
ShiftRight: '⇧ R',
};
const modifierKeySet = new Set([
"Alt",
"AltLeft",
"AltRight",
"Control",
"ControlLeft",
"ControlRight",
"Meta",
"MetaLeft",
"MetaRight",
"Shift",
"ShiftLeft",
"ShiftRight",
'Alt', 'AltLeft', 'AltRight',
'Control', 'ControlLeft', 'ControlRight',
'Meta', 'MetaLeft', 'MetaRight',
'Shift', 'ShiftLeft', 'ShiftRight'
]);
const isModifier = (key: string): boolean => {
@ -106,7 +98,7 @@
const updateKeybind = () => {
const modifiers = Array.from(activeModifiers).sort();
const nonModifiers = keybind.value.filter((key) => !isModifier(key));
const nonModifiers = keybind.value.filter(key => !isModifier(key));
keybind.value = [...modifiers, ...nonModifiers];
};
@ -125,7 +117,7 @@
event.preventDefault();
const key = event.code;
if (key === "Escape") {
if (key === 'Escape') {
if (keybindInput.value) {
keybindInput.value.blur();
}
@ -135,7 +127,7 @@
if (isModifier(key)) {
activeModifiers.add(key);
} else if (!keybind.value.includes(key)) {
keybind.value = keybind.value.filter((k) => isModifier(k));
keybind.value = keybind.value.filter(k => isModifier(k));
keybind.value.push(key);
}
@ -143,43 +135,42 @@
};
const saveKeybind = async () => {
console.log("New:", keybind.value);
const oldKeybind = await invoke<string[]>("get_keybind");
console.log("Old:", oldKeybind);
await invoke("save_keybind", { keybind: keybind.value });
console.log('New:', keybind.value);
const oldKeybind = await invoke<string[]>('get_keybind');
console.log('Old:', oldKeybind);
await invoke('save_keybind', { keybind: keybind.value });
};
const handleGlobalKeyDown = (event: KeyboardEvent) => {
const now = Date.now();
if (
(os.value === "macos"
? (event.code === "MetaLeft" || event.code === "MetaRight") && event.key === "Enter"
: (event.code === "ControlLeft" || event.code === "ControlRight") &&
event.key === "Enter") &&
(os.value === 'macos'
? (event.code === 'MetaLeft' || event.code === 'MetaRight') && event.key === 'Enter'
: (event.code === 'ControlLeft' || event.code === 'ControlRight') && event.key === 'Enter') &&
!isKeybindInputFocused.value
) {
event.preventDefault();
saveKeybind();
} else if (
event.key === "Escape" &&
event.key === 'Escape' &&
!isKeybindInputFocused.value &&
now - lastBlurTime.value > 100
) {
event.preventDefault();
router.push("/");
router.push('/');
}
};
onMounted(() => {
os.value = platform();
window.addEventListener("keydown", handleGlobalKeyDown);
window.addEventListener('keydown', handleGlobalKeyDown);
});
onUnmounted(() => {
window.removeEventListener("keydown", handleGlobalKeyDown);
window.removeEventListener('keydown', handleGlobalKeyDown);
});
</script>
<style scoped lang="scss">
@use "~/assets/css/keybind.scss";
@use '~/assets/css/keybind.scss';
</style>

8
src-tauri/Cargo.lock generated
View file

@ -4508,9 +4508,9 @@ dependencies = [
[[package]]
name = "serde_json"
version = "1.0.133"
version = "1.0.132"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
dependencies = [
"itoa 1.0.11",
"memchr",
@ -6082,9 +6082,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
[[package]]
name = "url"
version = "2.5.4"
version = "2.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada"
dependencies = [
"form_urlencoded",
"idna",

View file

@ -10,7 +10,7 @@ rust-version = "1.70"
tauri-build = { version = "2.0.3", features = [] }
[dependencies]
tauri = { version = "2.1.1", features = [
tauri = { version = "2.0.1", features = [
"macos-private-api",
"tray-icon",
"image-png",
@ -27,17 +27,17 @@ tauri-plugin-global-shortcut = "2.0.1"
sqlx = { version = "0.8.2", features = ["runtime-tokio-native-tls", "sqlite"] }
serde = { version = "1.0.215", features = ["derive"] }
tokio = { version = "1.41.1", features = ["full"] }
serde_json = "1.0.133"
serde_json = "1.0.132"
rdev = "0.5.3"
rand = "0.8.5"
rand = "0.8"
base64 = "0.22.1"
image = "0.25.5"
reqwest = { version = "0.12.9", features = ["blocking"] }
url = "2.5.4"
url = "2.5.3"
regex = "1.11.1"
sha2 = "0.10.8"
lazy_static = "1.5.0"
time = "0.3.36"
sha2 = "0.10.6"
lazy_static = "1.4.0"
time = "0.3"
global-hotkey = "0.6.3"
[features]

View file

@ -2,7 +2,9 @@
"$schema": "../gen/schemas/desktop-schema.json",
"identifier": "default",
"description": "enables the default permissions",
"windows": ["main"],
"windows": [
"main"
],
"permissions": [
"core:path:default",
"core:event:default",

View file

@ -6,7 +6,6 @@
mod api;
mod utils;
use tauri::window::{Effect, EffectState, EffectsBuilder};
use tauri::Manager;
use tauri::WebviewUrl;
use tauri::WebviewWindow;
@ -46,9 +45,7 @@ fn main() {
.visible(false)
.decorations(false)
.transparent(true)
.always_on_top(true)
.content_protected(true)
.visible_on_all_workspaces(true)
.always_on_top(false)
.build()?
};
@ -71,13 +68,6 @@ fn main() {
api::updater::check_for_updates(app_handle).await;
});
main_window.set_effects(
EffectsBuilder::new()
.effect(Effect::Popover)
.state(EffectState::Active)
.build(),
)?;
Ok(())
})
.on_window_event(|_app, _event| {

View file

@ -1,6 +1,6 @@
{
"productName": "Qopy",
"version": "0.2.1",
"version": "0.2.0",
"identifier": "net.pandadev.qopy",
"build": {
"frontendDist": "../dist",
@ -51,7 +51,9 @@
"plugins": {
"updater": {
"pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDExNDIzNjA1QjE0NjU1OTkKUldTWlZVYXhCVFpDRWNvNmt0UE5lQmZkblEyZGZiZ2tHelJvT2YvNVpLU1RIM1RKZFQrb2tzWWwK",
"endpoints": ["https://qopy.pandadev.net/"]
"endpoints": [
"https://qopy.pandadev.net/"
]
}
},
"$schema": "../node_modules/@tauri-apps/cli/schema.json"