Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(frontend): ドライブアップロード時に画像にウォーターマークを適用する機能 #15136

Open
wants to merge 49 commits into
base: develop
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
a0fc59b
watermark wip
u1-liquid Dec 16, 2024
ba147c0
wip
kakkokari-gtyih Dec 16, 2024
4fc3916
fix
kakkokari-gtyih Dec 16, 2024
32ee4d8
wip
kakkokari-gtyih Dec 16, 2024
de93d68
fix
kakkokari-gtyih Dec 16, 2024
fa3da43
fix
kakkokari-gtyih Dec 16, 2024
0aa91e2
lint
kakkokari-gtyih Dec 16, 2024
8428930
fix
kakkokari-gtyih Dec 16, 2024
d5ca458
:art:
kakkokari-gtyih Dec 16, 2024
d2b2422
fix
kakkokari-gtyih Dec 16, 2024
47ef78a
:art:
kakkokari-gtyih Dec 16, 2024
8f3241a
とりあえず出るようにした
kakkokari-gtyih Dec 16, 2024
7d80c21
repeatのrotateに対応
kakkokari-gtyih Dec 16, 2024
00a5b5b
refactor
kakkokari-gtyih Dec 16, 2024
7988289
selectFileの調整
kakkokari-gtyih Dec 16, 2024
dc197da
wip
kakkokari-gtyih Dec 16, 2024
83b795d
lint
kakkokari-gtyih Dec 16, 2024
29d30ea
Update MkWatermarkEditorDialog.anchor.vue
kakkokari-gtyih Dec 16, 2024
4c26e59
Update MkWatermarkEditorDialog.anchor.vue
kakkokari-gtyih Dec 16, 2024
e63e955
remove unused file
kakkokari-gtyih Dec 16, 2024
ff9af2c
Merge branch 'feat-12250' of https://github.com/kakkokari-gtyih/missk…
kakkokari-gtyih Dec 16, 2024
76f6219
paddingのUIを追加
kakkokari-gtyih Dec 17, 2024
9599fb7
fix
kakkokari-gtyih Dec 17, 2024
3deed56
fix: padding指定時のtop座標計算を修正
kakkokari-gtyih Dec 17, 2024
5657899
lint
kakkokari-gtyih Dec 17, 2024
307d7e0
fix
kakkokari-gtyih Dec 17, 2024
5b14cb0
保存処理
kakkokari-gtyih Dec 17, 2024
0075162
lint
kakkokari-gtyih Dec 17, 2024
c29dd51
enhance: 回転させた際の面積確保を無効化できるように
kakkokari-gtyih Dec 17, 2024
1a3e96b
type fixes
kakkokari-gtyih Dec 17, 2024
88e0b52
promiseがコールバックを待たないのを修正
kakkokari-gtyih Dec 17, 2024
579c570
翻訳の抜け
kakkokari-gtyih Dec 17, 2024
2ea0205
fix
kakkokari-gtyih Dec 17, 2024
7c015b7
処理一生終わらない問題を修正
kakkokari-gtyih Dec 17, 2024
9fd07c0
fix: 画像のアスペクト比によらず一定の大きさで表示できるように
kakkokari-gtyih Dec 19, 2024
499a6d3
UX調整
kakkokari-gtyih Dec 19, 2024
a1bb95d
Merge branch 'develop' into feat-12250
kakkokari-gtyih Dec 19, 2024
fabe1a1
fix
kakkokari-gtyih Dec 19, 2024
d1eadbd
設定が不十分な場合はウォーターマークをかけられないように
kakkokari-gtyih Dec 19, 2024
7a9a71f
canPreview -> canApplyWatermark
kakkokari-gtyih Dec 19, 2024
d33c9ba
fix
kakkokari-gtyih Dec 19, 2024
2a0253f
fix
kakkokari-gtyih Dec 19, 2024
34a5906
fix
kakkokari-gtyih Dec 19, 2024
6ba3d6b
Update Changelog
kakkokari-gtyih Dec 19, 2024
db8e1f9
Update Changelog
kakkokari-gtyih Dec 19, 2024
0527331
localeの整理
kakkokari-gtyih Dec 19, 2024
29f0bc4
fix code review
kakkokari-gtyih Dec 20, 2024
53b1b32
fix
kakkokari-gtyih Dec 20, 2024
0b23beb
fix: opacityは不透明度だったので修正
kakkokari-gtyih Dec 20, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix
kakkokari-gtyih committed Dec 16, 2024
commit 84289303b30ca098f63630619c51c83eff9167ad
2 changes: 1 addition & 1 deletion packages/frontend/src/store.ts
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ import { hemisphere } from '@@/js/intl-const.js';
import lightTheme from '@@/themes/l-light.json5';
import darkTheme from '@@/themes/d-green-lime.json5';
import type { SoundType } from '@/scripts/sound.js';
import type { WatermarkConfig } from './scripts/watermark.js';
import type { WatermarkConfig } from '@/scripts/watermark.js';
import { DEFAULT_DEVICE_KIND, type DeviceKind } from '@/scripts/device-kind.js';
import { miLocalStorage } from '@/local-storage.js';
import { Storage } from '@/pizzax.js';