Compare commits
13 Commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
70ee172128 | ||
![]() |
b9febc00f9 | ||
![]() |
0112e2f7ec | ||
![]() |
60736bab2a | ||
![]() |
fb7c4ee21a | ||
![]() |
e93c06cd00 | ||
![]() |
0a99345909 | ||
![]() |
3d08ff7cb4 | ||
![]() |
057ce73ba1 | ||
![]() |
66b07578c5 | ||
![]() |
de3b365563 | ||
![]() |
7bb8d8b27e | ||
![]() |
9008664606 |
@@ -351,6 +351,9 @@ pluginInstallWarn: "يرجى تنصيب إضافات ذات مصدر موثوق
|
|||||||
smtpHost: "المضيف"
|
smtpHost: "المضيف"
|
||||||
smtpUser: "اسم المستخدم"
|
smtpUser: "اسم المستخدم"
|
||||||
smtpPass: "الكلمة السرية"
|
smtpPass: "الكلمة السرية"
|
||||||
|
_sidebar:
|
||||||
|
icon: "الصورة الرمزية"
|
||||||
|
hide: "إخفاء"
|
||||||
_theme:
|
_theme:
|
||||||
explore: "استكشف قوالب المظهر"
|
explore: "استكشف قوالب المظهر"
|
||||||
install: "تنصيب قالب"
|
install: "تنصيب قالب"
|
||||||
|
@@ -556,6 +556,11 @@ testEmail: "Email-Versand testen"
|
|||||||
wordMute: "Wort-Stummschaltung"
|
wordMute: "Wort-Stummschaltung"
|
||||||
userSaysSomething: "{name} hat etwas gesagt."
|
userSaysSomething: "{name} hat etwas gesagt."
|
||||||
makeActive: "Aktivieren"
|
makeActive: "Aktivieren"
|
||||||
|
display: "Anzeige"
|
||||||
|
_sidebar:
|
||||||
|
full: "Voll"
|
||||||
|
icon: "Profilbild"
|
||||||
|
hide: "Ausblenden"
|
||||||
_wordMute:
|
_wordMute:
|
||||||
muteWords: "Wort stummschalten"
|
muteWords: "Wort stummschalten"
|
||||||
muteWordsDescription: "Mit Leerzeichen für eine \"UND\"-Verknüpfung trennen, durch Zeilenumbrüche für eine \"ODER\"-Verknüpfung trennen."
|
muteWordsDescription: "Mit Leerzeichen für eine \"UND\"-Verknüpfung trennen, durch Zeilenumbrüche für eine \"ODER\"-Verknüpfung trennen."
|
||||||
|
@@ -556,6 +556,11 @@ testEmail: "Test email delivery"
|
|||||||
wordMute: "Word mute"
|
wordMute: "Word mute"
|
||||||
userSaysSomething: "{name} said something"
|
userSaysSomething: "{name} said something"
|
||||||
makeActive: "Activate"
|
makeActive: "Activate"
|
||||||
|
display: "Display"
|
||||||
|
_sidebar:
|
||||||
|
full: "Full"
|
||||||
|
icon: "Avatar"
|
||||||
|
hide: "Hide"
|
||||||
_wordMute:
|
_wordMute:
|
||||||
muteWords: "Word to mute"
|
muteWords: "Word to mute"
|
||||||
muteWordsDescription: "Separate with spaces for AND condition. Separate with line breaks for OR."
|
muteWordsDescription: "Separate with spaces for AND condition. Separate with line breaks for OR."
|
||||||
|
@@ -556,6 +556,9 @@ testEmail: "Prueba de envío"
|
|||||||
wordMute: "Silenciar palabras"
|
wordMute: "Silenciar palabras"
|
||||||
userSaysSomething: "{name} dijo algo"
|
userSaysSomething: "{name} dijo algo"
|
||||||
makeActive: "Activar"
|
makeActive: "Activar"
|
||||||
|
_sidebar:
|
||||||
|
icon: "Avatar"
|
||||||
|
hide: "Ocultar"
|
||||||
_wordMute:
|
_wordMute:
|
||||||
muteWords: "Palabras que silenciar"
|
muteWords: "Palabras que silenciar"
|
||||||
muteWordsDescription: "Separar con espacios indica una declaracion And, separar con lineas nuevas indica una declaracion Or。"
|
muteWordsDescription: "Separar con espacios indica una declaracion And, separar con lineas nuevas indica una declaracion Or。"
|
||||||
|
@@ -543,6 +543,9 @@ emailConfig: "Configuration du serveur email"
|
|||||||
smtpHost: "Hôte"
|
smtpHost: "Hôte"
|
||||||
smtpUser: "Nom d’utilisateur·rice"
|
smtpUser: "Nom d’utilisateur·rice"
|
||||||
smtpPass: "Mot de passe"
|
smtpPass: "Mot de passe"
|
||||||
|
_sidebar:
|
||||||
|
icon: "Avatar"
|
||||||
|
hide: "Masquer"
|
||||||
_theme:
|
_theme:
|
||||||
explore: "Explorer les thèmes"
|
explore: "Explorer les thèmes"
|
||||||
install: "Installer un thème"
|
install: "Installer un thème"
|
||||||
|
@@ -556,6 +556,12 @@ testEmail: "配信テスト"
|
|||||||
wordMute: "ワードミュート"
|
wordMute: "ワードミュート"
|
||||||
userSaysSomething: "{name}が何かを言いました"
|
userSaysSomething: "{name}が何かを言いました"
|
||||||
makeActive: "アクティブにする"
|
makeActive: "アクティブにする"
|
||||||
|
display: "表示"
|
||||||
|
|
||||||
|
_sidebar:
|
||||||
|
full: "フル"
|
||||||
|
icon: "アイコン"
|
||||||
|
hide: "隠す"
|
||||||
|
|
||||||
_wordMute:
|
_wordMute:
|
||||||
muteWords: "ミュートするワード"
|
muteWords: "ミュートするワード"
|
||||||
|
@@ -356,6 +356,8 @@ invites: "来てや"
|
|||||||
smtpHost: "ホスト"
|
smtpHost: "ホスト"
|
||||||
smtpUser: "ユーザー名"
|
smtpUser: "ユーザー名"
|
||||||
smtpPass: "パスワード"
|
smtpPass: "パスワード"
|
||||||
|
_sidebar:
|
||||||
|
icon: "アイコン"
|
||||||
_theme:
|
_theme:
|
||||||
keys:
|
keys:
|
||||||
renote: "Renote"
|
renote: "Renote"
|
||||||
|
@@ -434,7 +434,7 @@ tags: "태그"
|
|||||||
docSource: "이 문서의 소스"
|
docSource: "이 문서의 소스"
|
||||||
createAccount: "계정 만들기"
|
createAccount: "계정 만들기"
|
||||||
existingAcount: "기존 계정"
|
existingAcount: "기존 계정"
|
||||||
regenerate: "다시 생성"
|
regenerate: "재생성"
|
||||||
fontSize: "글자 크기"
|
fontSize: "글자 크기"
|
||||||
noFollowRequests: "처리되지 않은 팔로우 요청이 없습니다"
|
noFollowRequests: "처리되지 않은 팔로우 요청이 없습니다"
|
||||||
openImageInNewTab: "새 탭에서 이미지 열기"
|
openImageInNewTab: "새 탭에서 이미지 열기"
|
||||||
@@ -533,12 +533,19 @@ generateAccessToken: "액세스 토큰 생성"
|
|||||||
permission: "권한"
|
permission: "권한"
|
||||||
enableAll: "전체 선택"
|
enableAll: "전체 선택"
|
||||||
disableAll: "전체 해제"
|
disableAll: "전체 해제"
|
||||||
|
edit: "편집"
|
||||||
|
useStarForReactionFallback: "알 수 없는 리액션 이모지 대신 ★ 사용"
|
||||||
|
email: "메일 주소"
|
||||||
|
smtpConfig: "SMTP 서버 설정"
|
||||||
smtpHost: "호스트"
|
smtpHost: "호스트"
|
||||||
smtpUser: "유저명"
|
smtpUser: "유저명"
|
||||||
smtpPass: "비밀번호"
|
smtpPass: "비밀번호"
|
||||||
emptyToDisableSmtpAuth: "SMTP 인증을 사용하지 않으려면 공란으로 비워둡니다."
|
emptyToDisableSmtpAuth: "SMTP 인증을 사용하지 않으려면 공란으로 비워둡니다."
|
||||||
smtpSecureInfo: "STARTTLS 사용 시에는 해제합니다."
|
smtpSecureInfo: "STARTTLS 사용 시에는 해제합니다."
|
||||||
wordMute: "단어 뮤트"
|
wordMute: "단어 뮤트"
|
||||||
|
_sidebar:
|
||||||
|
icon: "아바타"
|
||||||
|
hide: "숨기기"
|
||||||
_wordMute:
|
_wordMute:
|
||||||
muteWords: "뮤트할 단어"
|
muteWords: "뮤트할 단어"
|
||||||
_theme:
|
_theme:
|
||||||
|
@@ -556,6 +556,10 @@ testEmail: "邮件发送测试"
|
|||||||
wordMute: "文字屏蔽"
|
wordMute: "文字屏蔽"
|
||||||
userSaysSomething: "{name}说了什么"
|
userSaysSomething: "{name}说了什么"
|
||||||
makeActive: "激活"
|
makeActive: "激活"
|
||||||
|
display: "显示"
|
||||||
|
_sidebar:
|
||||||
|
icon: "头像"
|
||||||
|
hide: "隐藏"
|
||||||
_wordMute:
|
_wordMute:
|
||||||
muteWords: "禁用词"
|
muteWords: "禁用词"
|
||||||
muteWordsDescription: "使用空格分隔表示AND逻辑,使用换行符分隔表示OR逻辑。"
|
muteWordsDescription: "使用空格分隔表示AND逻辑,使用换行符分隔表示OR逻辑。"
|
||||||
|
@@ -409,6 +409,8 @@ deletedNote: "已删除的貼文"
|
|||||||
smtpHost: "主機"
|
smtpHost: "主機"
|
||||||
smtpUser: "使用名稱"
|
smtpUser: "使用名稱"
|
||||||
smtpPass: "密碼"
|
smtpPass: "密碼"
|
||||||
|
_sidebar:
|
||||||
|
icon: "頭像"
|
||||||
_theme:
|
_theme:
|
||||||
func: "函数"
|
func: "函数"
|
||||||
keys:
|
keys:
|
||||||
|
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "misskey",
|
"name": "misskey",
|
||||||
"author": "syuilo <syuilotan@yahoo.co.jp>",
|
"author": "syuilo <syuilotan@yahoo.co.jp>",
|
||||||
"version": "12.45.1",
|
"version": "12.46.0",
|
||||||
"codename": "indigo",
|
"codename": "indigo",
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
@@ -47,7 +47,7 @@
|
|||||||
"@koa/multer": "3.0.0",
|
"@koa/multer": "3.0.0",
|
||||||
"@koa/router": "9.0.1",
|
"@koa/router": "9.0.1",
|
||||||
"@sinonjs/fake-timers": "6.0.1",
|
"@sinonjs/fake-timers": "6.0.1",
|
||||||
"@syuilo/aiscript": "0.10.1",
|
"@syuilo/aiscript": "0.11.0",
|
||||||
"@types/bcryptjs": "2.4.2",
|
"@types/bcryptjs": "2.4.2",
|
||||||
"@types/bull": "3.14.0",
|
"@types/bull": "3.14.0",
|
||||||
"@types/cbor": "5.0.0",
|
"@types/cbor": "5.0.0",
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="mk-app" v-hotkey.global="keymap">
|
<div class="mk-app" v-hotkey.global="keymap">
|
||||||
<header class="header">
|
<header class="header" ref="header">
|
||||||
<div class="title" ref="title">
|
<div class="title" ref="title">
|
||||||
<transition :name="$store.state.device.animation ? 'header' : ''" mode="out-in" appear>
|
<transition :name="$store.state.device.animation ? 'header' : ''" mode="out-in" appear>
|
||||||
<button class="_button back" v-if="canBack" @click="back()"><fa :icon="faChevronLeft"/></button>
|
<button class="_button back" v-if="canBack" @click="back()"><fa :icon="faChevronLeft"/></button>
|
||||||
@@ -31,7 +31,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</header>
|
</header>
|
||||||
|
|
||||||
<x-sidebar ref="nav"/>
|
<x-sidebar ref="nav" @change-view-mode="calcHeaderWidth"/>
|
||||||
|
|
||||||
<div class="contents" ref="contents" :class="{ wallpaper }">
|
<div class="contents" ref="contents" :class="{ wallpaper }">
|
||||||
<main ref="main">
|
<main ref="main">
|
||||||
@@ -77,7 +77,7 @@
|
|||||||
</template>
|
</template>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="buttons">
|
<div class="buttons" :class="{ navHidden }">
|
||||||
<button class="button nav _button" @click="showNav" ref="navButton"><fa :icon="faBars"/><i v-if="navIndicated"><fa :icon="faCircle"/></i></button>
|
<button class="button nav _button" @click="showNav" ref="navButton"><fa :icon="faBars"/><i v-if="navIndicated"><fa :icon="faCircle"/></i></button>
|
||||||
<button v-if="$route.name === 'index'" class="button home _button" @click="top()"><fa :icon="faHome"/></button>
|
<button v-if="$route.name === 'index'" class="button home _button" @click="top()"><fa :icon="faHome"/></button>
|
||||||
<button v-else class="button home _button" @click="$router.push('/')"><fa :icon="faHome"/></button>
|
<button v-else class="button home _button" @click="$router.push('/')"><fa :icon="faHome"/></button>
|
||||||
@@ -85,7 +85,7 @@
|
|||||||
<button v-if="$store.getters.isSignedIn" class="button post _buttonPrimary" @click="post()"><fa :icon="faPencilAlt"/></button>
|
<button v-if="$store.getters.isSignedIn" class="button post _buttonPrimary" @click="post()"><fa :icon="faPencilAlt"/></button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<button v-if="$store.getters.isSignedIn" class="post _buttonPrimary" @click="post()"><fa :icon="faPencilAlt"/></button>
|
<button v-if="$store.getters.isSignedIn" class="post _buttonPrimary" :class="{ navHidden }" @click="post()"><fa :icon="faPencilAlt"/></button>
|
||||||
|
|
||||||
<stream-indicator v-if="$store.getters.isSignedIn"/>
|
<stream-indicator v-if="$store.getters.isSignedIn"/>
|
||||||
</div>
|
</div>
|
||||||
@@ -124,6 +124,7 @@ export default Vue.extend({
|
|||||||
isDesktop: window.innerWidth >= DESKTOP_THRESHOLD,
|
isDesktop: window.innerWidth >= DESKTOP_THRESHOLD,
|
||||||
canBack: false,
|
canBack: false,
|
||||||
menuDef: this.$store.getters.nav({}),
|
menuDef: this.$store.getters.nav({}),
|
||||||
|
navHidden: false,
|
||||||
wallpaper: localStorage.getItem('wallpaper') != null,
|
wallpaper: localStorage.getItem('wallpaper') != null,
|
||||||
faGripVertical, faChevronLeft, faComments, faHashtag, faBroadcastTower, faFireAlt, faEllipsisH, faPencilAlt, faBars, faTimes, faBell, faSearch, faUserCog, faCog, faUser, faHome, faStar, faCircle, faAt, faEnvelope, faListUl, faPlus, faUserClock, faLaugh, faUsers, faTachometerAlt, faExchangeAlt, faGlobe, faChartBar, faCloud, faServer, faProjectDiagram
|
faGripVertical, faChevronLeft, faComments, faHashtag, faBroadcastTower, faFireAlt, faEllipsisH, faPencilAlt, faBars, faTimes, faBell, faSearch, faUserCog, faCog, faUser, faHome, faStar, faCircle, faAt, faEnvelope, faListUl, faPlus, faUserClock, faLaugh, faUsers, faTachometerAlt, faExchangeAlt, faGlobe, faChartBar, faCloud, faServer, faProjectDiagram
|
||||||
};
|
};
|
||||||
@@ -225,22 +226,15 @@ export default Vue.extend({
|
|||||||
},
|
},
|
||||||
|
|
||||||
mounted() {
|
mounted() {
|
||||||
const adjustTitlePosition = () => {
|
this.adjustTitlePosition();
|
||||||
const left = this.$refs.main.getBoundingClientRect().left - this.$refs.nav.$el.offsetWidth;
|
|
||||||
if (left >= 0) {
|
|
||||||
this.$refs.title.style.left = left + 'px';
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
adjustTitlePosition();
|
|
||||||
|
|
||||||
const ro = new ResizeObserver((entries, observer) => {
|
const ro = new ResizeObserver((entries, observer) => {
|
||||||
adjustTitlePosition();
|
this.adjustTitlePosition();
|
||||||
});
|
});
|
||||||
|
|
||||||
ro.observe(this.$refs.contents);
|
ro.observe(this.$refs.contents);
|
||||||
|
|
||||||
window.addEventListener('resize', adjustTitlePosition, { passive: true });
|
window.addEventListener('resize', this.adjustTitlePosition, { passive: true });
|
||||||
|
|
||||||
if (!this.isDesktop) {
|
if (!this.isDesktop) {
|
||||||
window.addEventListener('resize', () => {
|
window.addEventListener('resize', () => {
|
||||||
@@ -250,9 +244,27 @@ export default Vue.extend({
|
|||||||
|
|
||||||
// widget follow
|
// widget follow
|
||||||
this.attachSticky();
|
this.attachSticky();
|
||||||
|
|
||||||
|
this.$nextTick(() => {
|
||||||
|
this.calcHeaderWidth();
|
||||||
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
methods: {
|
methods: {
|
||||||
|
adjustTitlePosition() {
|
||||||
|
const left = this.$refs.main.getBoundingClientRect().left - this.$refs.nav.$el.offsetWidth;
|
||||||
|
if (left >= 0) {
|
||||||
|
this.$refs.title.style.left = left + 'px';
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
calcHeaderWidth() {
|
||||||
|
const navWidth = this.$refs.nav.$el.offsetWidth;
|
||||||
|
this.navHidden = navWidth === 0;
|
||||||
|
this.$refs.header.style.width = `calc(100% - ${navWidth}px)`;
|
||||||
|
this.adjustTitlePosition();
|
||||||
|
},
|
||||||
|
|
||||||
showNav() {
|
showNav() {
|
||||||
this.$refs.nav.show();
|
this.$refs.nav.show();
|
||||||
},
|
},
|
||||||
@@ -373,12 +385,8 @@ export default Vue.extend({
|
|||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.mk-app {
|
.mk-app {
|
||||||
$header-height: 60px;
|
$header-height: 60px;
|
||||||
$nav-width: 250px; // TODO: どこかに集約したい
|
|
||||||
$nav-icon-only-width: 80px; // TODO: どこかに集約したい
|
|
||||||
$main-width: 670px;
|
$main-width: 670px;
|
||||||
$ui-font-size: 1em; // TODO: どこかに集約したい
|
$ui-font-size: 1em; // TODO: どこかに集約したい
|
||||||
$nav-icon-only-threshold: 1279px; // TODO: どこかに集約したい
|
|
||||||
$nav-hide-threshold: 650px; // TODO: どこかに集約したい
|
|
||||||
$header-sub-hide-threshold: 1090px;
|
$header-sub-hide-threshold: 1090px;
|
||||||
$left-widgets-hide-threshold: 1600px;
|
$left-widgets-hide-threshold: 1600px;
|
||||||
$right-widgets-hide-threshold: 1090px;
|
$right-widgets-hide-threshold: 1090px;
|
||||||
@@ -399,21 +407,13 @@ export default Vue.extend({
|
|||||||
top: 0;
|
top: 0;
|
||||||
right: 0;
|
right: 0;
|
||||||
height: $header-height;
|
height: $header-height;
|
||||||
width: calc(100% - #{$nav-width});
|
width: 100%;
|
||||||
//background-color: var(--panel);
|
//background-color: var(--panel);
|
||||||
-webkit-backdrop-filter: blur(32px);
|
-webkit-backdrop-filter: blur(32px);
|
||||||
backdrop-filter: blur(32px);
|
backdrop-filter: blur(32px);
|
||||||
background-color: var(--header);
|
background-color: var(--header);
|
||||||
border-bottom: solid 1px var(--divider);
|
border-bottom: solid 1px var(--divider);
|
||||||
|
|
||||||
@media (max-width: $nav-icon-only-threshold) {
|
|
||||||
width: calc(100% - #{$nav-icon-only-width});
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (max-width: $nav-hide-threshold) {
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
> .title {
|
> .title {
|
||||||
position: relative;
|
position: relative;
|
||||||
line-height: $header-height;
|
line-height: $header-height;
|
||||||
@@ -683,7 +683,7 @@ export default Vue.extend({
|
|||||||
}
|
}
|
||||||
|
|
||||||
> .post {
|
> .post {
|
||||||
display: none;
|
display: block;
|
||||||
position: fixed;
|
position: fixed;
|
||||||
z-index: 1000;
|
z-index: 1000;
|
||||||
bottom: 32px;
|
bottom: 32px;
|
||||||
@@ -694,8 +694,8 @@ export default Vue.extend({
|
|||||||
box-shadow: 0 3px 5px -1px rgba(0, 0, 0, 0.2), 0 6px 10px 0 rgba(0, 0, 0, 0.14), 0 1px 18px 0 rgba(0, 0, 0, 0.12);
|
box-shadow: 0 3px 5px -1px rgba(0, 0, 0, 0.2), 0 6px 10px 0 rgba(0, 0, 0, 0.14), 0 1px 18px 0 rgba(0, 0, 0, 0.12);
|
||||||
font-size: 22px;
|
font-size: 22px;
|
||||||
|
|
||||||
@media (min-width: ($nav-hide-threshold + 1px)) {
|
&.navHidden {
|
||||||
display: block;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (min-width: ($header-sub-hide-threshold + 1px)) {
|
@media (min-width: ($header-sub-hide-threshold + 1px)) {
|
||||||
@@ -717,7 +717,7 @@ export default Vue.extend({
|
|||||||
padding: 0 16px 16px 16px;
|
padding: 0 16px 16px 16px;
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (min-width: ($nav-hide-threshold + 1px)) {
|
&:not(.navHidden) {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -9,7 +9,7 @@
|
|||||||
</transition>
|
</transition>
|
||||||
|
|
||||||
<transition name="nav">
|
<transition name="nav">
|
||||||
<nav class="nav" v-show="showing">
|
<nav class="nav" :class="{ iconOnly, hidden }" v-show="showing">
|
||||||
<div>
|
<div>
|
||||||
<button class="item _button account" @click="openAccountMenu" v-if="$store.getters.isSignedIn">
|
<button class="item _button account" @click="openAccountMenu" v-if="$store.getters.isSignedIn">
|
||||||
<mk-avatar :user="$store.state.i" class="avatar"/><mk-acct class="text" :user="$store.state.i"/>
|
<mk-avatar :user="$store.state.i" class="avatar"/><mk-acct class="text" :user="$store.state.i"/>
|
||||||
@@ -62,6 +62,8 @@ export default Vue.extend({
|
|||||||
menuDef: this.$store.getters.nav({
|
menuDef: this.$store.getters.nav({
|
||||||
search: this.search
|
search: this.search
|
||||||
}),
|
}),
|
||||||
|
iconOnly: false,
|
||||||
|
hidden: false,
|
||||||
faGripVertical, faChevronLeft, faComments, faHashtag, faBroadcastTower, faFireAlt, faEllipsisH, faPencilAlt, faBars, faTimes, faBell, faSearch, faUserCog, faCog, faUser, faHome, faStar, faCircle, faAt, faEnvelope, faListUl, faPlus, faUserClock, faLaugh, faUsers, faTachometerAlt, faExchangeAlt, faGlobe, faChartBar, faCloud, faServer, faProjectDiagram
|
faGripVertical, faChevronLeft, faComments, faHashtag, faBroadcastTower, faFireAlt, faEllipsisH, faPencilAlt, faBars, faTimes, faBell, faSearch, faUserCog, faCog, faUser, faHome, faStar, faCircle, faAt, faEnvelope, faListUl, faPlus, faUserClock, faLaugh, faUsers, faTachometerAlt, faExchangeAlt, faGlobe, faChartBar, faCloud, faServer, faProjectDiagram
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
@@ -85,9 +87,35 @@ export default Vue.extend({
|
|||||||
$route(to, from) {
|
$route(to, from) {
|
||||||
this.showing = false;
|
this.showing = false;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
'$store.state.device.sidebarDisplay'() {
|
||||||
|
this.calcViewState();
|
||||||
|
},
|
||||||
|
|
||||||
|
iconOnly() {
|
||||||
|
this.$nextTick(() => {
|
||||||
|
this.$emit('change-view-mode');
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
|
hidden() {
|
||||||
|
this.$nextTick(() => {
|
||||||
|
this.$emit('change-view-mode');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
created() {
|
||||||
|
window.addEventListener('resize', this.calcViewState);
|
||||||
|
this.calcViewState();
|
||||||
},
|
},
|
||||||
|
|
||||||
methods: {
|
methods: {
|
||||||
|
calcViewState() {
|
||||||
|
this.iconOnly = (window.innerWidth <= 1279) || (this.$store.state.device.sidebarDisplay === 'icon');
|
||||||
|
this.hidden = (window.innerWidth <= 650) || (this.$store.state.device.sidebarDisplay === 'hide');
|
||||||
|
},
|
||||||
|
|
||||||
show() {
|
show() {
|
||||||
this.showing = true;
|
this.showing = true;
|
||||||
},
|
},
|
||||||
@@ -314,10 +342,8 @@ export default Vue.extend({
|
|||||||
|
|
||||||
.mvcprjjd {
|
.mvcprjjd {
|
||||||
$ui-font-size: 1em; // TODO: どこかに集約したい
|
$ui-font-size: 1em; // TODO: どこかに集約したい
|
||||||
$nav-width: 250px; // TODO: どこかに集約したい
|
$nav-width: 250px;
|
||||||
$nav-icon-only-width: 80px; // TODO: どこかに集約したい
|
$nav-icon-only-width: 80px;
|
||||||
$nav-icon-only-threshold: 1279px; // TODO: どこかに集約したい
|
|
||||||
$nav-hide-threshold: 650px; // TODO: どこかに集約したい
|
|
||||||
|
|
||||||
> .nav-back {
|
> .nav-back {
|
||||||
z-index: 1001;
|
z-index: 1001;
|
||||||
@@ -331,19 +357,66 @@ export default Vue.extend({
|
|||||||
width: $nav-width;
|
width: $nav-width;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
|
|
||||||
@media (max-width: $nav-icon-only-threshold) {
|
&.iconOnly {
|
||||||
flex: 0 0 $nav-icon-only-width;
|
flex: 0 0 $nav-icon-only-width;
|
||||||
width: $nav-icon-only-width;
|
width: $nav-icon-only-width;
|
||||||
|
|
||||||
|
&:not(.hidden) {
|
||||||
|
> div {
|
||||||
|
width: $nav-icon-only-width;
|
||||||
|
|
||||||
|
> .divider {
|
||||||
|
margin: 8px auto;
|
||||||
|
width: calc(100% - 32px);
|
||||||
|
}
|
||||||
|
|
||||||
|
> .item {
|
||||||
|
padding-left: 0;
|
||||||
|
width: 100%;
|
||||||
|
text-align: center;
|
||||||
|
font-size: $ui-font-size * 1.1;
|
||||||
|
line-height: 3.7rem;
|
||||||
|
|
||||||
|
> [data-icon],
|
||||||
|
> .avatar {
|
||||||
|
margin-right: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
> i {
|
||||||
|
left: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
> .text {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
&:first-child {
|
||||||
|
margin-bottom: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
&:last-child {
|
||||||
|
margin-top: 8px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (max-width: $nav-hide-threshold) {
|
&.hidden {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
top: 0;
|
top: 0;
|
||||||
left: 0;
|
left: 0;
|
||||||
z-index: 1001;
|
z-index: 1001;
|
||||||
|
|
||||||
|
> div {
|
||||||
|
> .index,
|
||||||
|
> .notifications {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (min-width: $nav-hide-threshold + 1px) {
|
&:not(.hidden) {
|
||||||
display: block !important;
|
display: block !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -365,25 +438,6 @@ export default Vue.extend({
|
|||||||
border-top: solid 1px var(--divider);
|
border-top: solid 1px var(--divider);
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (max-width: $nav-icon-only-threshold) and (min-width: $nav-hide-threshold + 1px) {
|
|
||||||
width: $nav-icon-only-width;
|
|
||||||
|
|
||||||
> .divider {
|
|
||||||
margin: 8px auto;
|
|
||||||
width: calc(100% - 32px);
|
|
||||||
}
|
|
||||||
|
|
||||||
> .item {
|
|
||||||
&:first-child {
|
|
||||||
margin-bottom: 8px;
|
|
||||||
}
|
|
||||||
|
|
||||||
&:last-child {
|
|
||||||
margin-top: 8px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
> .item {
|
> .item {
|
||||||
position: relative;
|
position: relative;
|
||||||
display: block;
|
display: block;
|
||||||
@@ -452,34 +506,6 @@ export default Vue.extend({
|
|||||||
margin-top: 16px;
|
margin-top: 16px;
|
||||||
border-top: solid 1px var(--divider);
|
border-top: solid 1px var(--divider);
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (max-width: $nav-icon-only-threshold) and (min-width: $nav-hide-threshold + 1px) {
|
|
||||||
padding-left: 0;
|
|
||||||
width: 100%;
|
|
||||||
text-align: center;
|
|
||||||
font-size: $ui-font-size * 1.2;
|
|
||||||
line-height: 3.7rem;
|
|
||||||
|
|
||||||
> [data-icon],
|
|
||||||
> .avatar {
|
|
||||||
margin-right: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
> i {
|
|
||||||
left: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
> .text {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (max-width: $nav-hide-threshold) {
|
|
||||||
> .index,
|
|
||||||
> .notifications {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -2,8 +2,8 @@
|
|||||||
<x-window ref="window" :width="400" :height="450" :no-padding="true" @closed="() => { $emit('closed'); destroyDom(); }" :with-ok-button="true" :ok-button-disabled="false" @ok="ok()" :can-close="false">
|
<x-window ref="window" :width="400" :height="450" :no-padding="true" @closed="() => { $emit('closed'); destroyDom(); }" :with-ok-button="true" :ok-button-disabled="false" @ok="ok()" :can-close="false">
|
||||||
<template #header>{{ title || $t('generateAccessToken') }}</template>
|
<template #header>{{ title || $t('generateAccessToken') }}</template>
|
||||||
<div class="ugkkpisj">
|
<div class="ugkkpisj">
|
||||||
<div>
|
<div v-if="information">
|
||||||
<mk-info warn v-if="information">{{ information }}</mk-info>
|
<mk-info warn>{{ information }}</mk-info>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<mk-input v-model="name">{{ $t('name') }}</mk-input>
|
<mk-input v-model="name">{{ $t('name') }}</mk-input>
|
||||||
|
@@ -19,14 +19,14 @@ import MkButton from './button.vue';
|
|||||||
import paging from '../../scripts/paging';
|
import paging from '../../scripts/paging';
|
||||||
|
|
||||||
export default Vue.extend({
|
export default Vue.extend({
|
||||||
mixins: [
|
|
||||||
paging({}),
|
|
||||||
],
|
|
||||||
|
|
||||||
components: {
|
components: {
|
||||||
MkButton
|
MkButton
|
||||||
},
|
},
|
||||||
|
|
||||||
|
mixins: [
|
||||||
|
paging({}),
|
||||||
|
],
|
||||||
|
|
||||||
props: {
|
props: {
|
||||||
pagination: {
|
pagination: {
|
||||||
required: true
|
required: true
|
||||||
|
@@ -42,6 +42,7 @@ export default Vue.extend({
|
|||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
toggle() {
|
toggle() {
|
||||||
|
if (this.disabled) return;
|
||||||
this.$emit('change', this.value);
|
this.$emit('change', this.value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -61,7 +62,10 @@ export default Vue.extend({
|
|||||||
|
|
||||||
&.disabled {
|
&.disabled {
|
||||||
opacity: 0.6;
|
opacity: 0.6;
|
||||||
cursor: not-allowed;
|
|
||||||
|
&, * {
|
||||||
|
cursor: not-allowed !important;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&.checked {
|
&.checked {
|
||||||
|
@@ -11,7 +11,7 @@
|
|||||||
<img v-if="announcement.imageUrl" :src="announcement.imageUrl"/>
|
<img v-if="announcement.imageUrl" :src="announcement.imageUrl"/>
|
||||||
</div>
|
</div>
|
||||||
<div class="_footer" v-if="$store.getters.isSignedIn && !announcement.isRead">
|
<div class="_footer" v-if="$store.getters.isSignedIn && !announcement.isRead">
|
||||||
<mk-button @click="read(announcement)" primary><fa :icon="faCheck"/> {{ $t('gotIt') }}</mk-button>
|
<mk-button @click="read(items, announcement, i)" primary><fa :icon="faCheck"/> {{ $t('gotIt') }}</mk-button>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
</mk-pagination>
|
</mk-pagination>
|
||||||
@@ -47,8 +47,12 @@ export default Vue.extend({
|
|||||||
},
|
},
|
||||||
|
|
||||||
methods: {
|
methods: {
|
||||||
read(announcement) {
|
// TODO: これは実質的に親コンポーネントから子コンポーネントのプロパティを変更してるのでなんとかしたい
|
||||||
announcement.isRead = true;
|
read(items, announcement, i) {
|
||||||
|
Vue.set(items, i, {
|
||||||
|
...announcement,
|
||||||
|
isRead: true,
|
||||||
|
});
|
||||||
this.$root.api('i/read-announcement', { announcementId: announcement.id });
|
this.$root.api('i/read-announcement', { announcementId: announcement.id });
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@@ -151,7 +151,7 @@ export default Vue.extend({
|
|||||||
},
|
},
|
||||||
|
|
||||||
onKeypress(e) {
|
onKeypress(e) {
|
||||||
if ((e.which == 10 || e.which == 13) && e.ctrlKey && this.canSend) {
|
if ((e.which == 10 || e.which == 13) && (e.ctrlKey || e.metaKey) && this.canSend) {
|
||||||
this.send();
|
this.send();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@@ -7,6 +7,12 @@
|
|||||||
<template #desc><button class="_textButton" @click="addItem">{{ $t('addItem') }}</button></template>
|
<template #desc><button class="_textButton" @click="addItem">{{ $t('addItem') }}</button></template>
|
||||||
</mk-textarea>
|
</mk-textarea>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="_content">
|
||||||
|
<div>{{ $t('display') }}</div>
|
||||||
|
<mk-radio v-model="sidebarDisplay" value="full">{{ $t('_sidebar.full') }}</mk-radio>
|
||||||
|
<mk-radio v-model="sidebarDisplay" value="icon">{{ $t('_sidebar.icon') }}</mk-radio>
|
||||||
|
<!-- <mk-radio v-model="sidebarDisplay" value="hide" disabled>{{ $t('_sidebar.hide') }}</mk-radio>--> <!-- TODO: サイドバーを完全に隠せるようにすると、別途ハンバーガーボタンのようなものをUIに表示する必要があり面倒 -->
|
||||||
|
</div>
|
||||||
<div class="_footer">
|
<div class="_footer">
|
||||||
<mk-button inline @click="save()" primary><fa :icon="faSave"/> {{ $t('save') }}</mk-button>
|
<mk-button inline @click="save()" primary><fa :icon="faSave"/> {{ $t('save') }}</mk-button>
|
||||||
<mk-button inline @click="reset()"><fa :icon="faRedo"/> {{ $t('default') }}</mk-button>
|
<mk-button inline @click="reset()"><fa :icon="faRedo"/> {{ $t('default') }}</mk-button>
|
||||||
@@ -19,12 +25,14 @@ import Vue from 'vue';
|
|||||||
import { faListUl, faSave, faRedo } from '@fortawesome/free-solid-svg-icons';
|
import { faListUl, faSave, faRedo } from '@fortawesome/free-solid-svg-icons';
|
||||||
import MkButton from '../../components/ui/button.vue';
|
import MkButton from '../../components/ui/button.vue';
|
||||||
import MkTextarea from '../../components/ui/textarea.vue';
|
import MkTextarea from '../../components/ui/textarea.vue';
|
||||||
|
import MkRadio from '../../components/ui/radio.vue';
|
||||||
import { defaultDeviceUserSettings } from '../../store';
|
import { defaultDeviceUserSettings } from '../../store';
|
||||||
|
|
||||||
export default Vue.extend({
|
export default Vue.extend({
|
||||||
components: {
|
components: {
|
||||||
MkButton,
|
MkButton,
|
||||||
MkTextarea,
|
MkTextarea,
|
||||||
|
MkRadio,
|
||||||
},
|
},
|
||||||
|
|
||||||
data() {
|
data() {
|
||||||
@@ -38,7 +46,12 @@ export default Vue.extend({
|
|||||||
computed: {
|
computed: {
|
||||||
splited(): string[] {
|
splited(): string[] {
|
||||||
return this.items.trim().split('\n').filter(x => x.trim() !== '');
|
return this.items.trim().split('\n').filter(x => x.trim() !== '');
|
||||||
}
|
},
|
||||||
|
|
||||||
|
sidebarDisplay: {
|
||||||
|
get() { return this.$store.state.device.sidebarDisplay; },
|
||||||
|
set(value) { this.$store.commit('device/set', { key: 'sidebarDisplay', value }); }
|
||||||
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
created() {
|
created() {
|
||||||
|
@@ -1,6 +1,7 @@
|
|||||||
import { utils, values } from '@syuilo/aiscript';
|
import { utils, values } from '@syuilo/aiscript';
|
||||||
import { jsToVal } from '@syuilo/aiscript/built/interpreter/util';
|
import { jsToVal } from '@syuilo/aiscript/built/interpreter/util';
|
||||||
|
|
||||||
|
// TODO: vue3に移行した折にはvmを渡す必要は無くなるはず
|
||||||
export function createAiScriptEnv(vm, opts) {
|
export function createAiScriptEnv(vm, opts) {
|
||||||
let apiRequests = 0;
|
let apiRequests = 0;
|
||||||
return {
|
return {
|
||||||
@@ -42,6 +43,7 @@ export function createAiScriptEnv(vm, opts) {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TODO: vue3に移行した折にはvmを渡す必要は無くなるはず
|
||||||
export function createPluginEnv(vm, opts) {
|
export function createPluginEnv(vm, opts) {
|
||||||
const config = new Map();
|
const config = new Map();
|
||||||
for (const [k, v] of Object.entries(opts.plugin.config || {})) {
|
for (const [k, v] of Object.entries(opts.plugin.config || {})) {
|
||||||
|
@@ -77,6 +77,7 @@ export const defaultDeviceSettings = {
|
|||||||
enableInfiniteScroll: true,
|
enableInfiniteScroll: true,
|
||||||
fixedWidgetsPosition: false,
|
fixedWidgetsPosition: false,
|
||||||
useBlurEffectForModal: true,
|
useBlurEffectForModal: true,
|
||||||
|
sidebarDisplay: 'full', // full, icon, hide
|
||||||
roomGraphicsQuality: 'medium',
|
roomGraphicsQuality: 'medium',
|
||||||
roomUseOrthographicCamera: true,
|
roomUseOrthographicCamera: true,
|
||||||
deckColumnAlign: 'left',
|
deckColumnAlign: 'left',
|
||||||
|
@@ -98,7 +98,10 @@ module.exports = {
|
|||||||
use: [{
|
use: [{
|
||||||
loader: 'vue-style-loader'
|
loader: 'vue-style-loader'
|
||||||
}, {
|
}, {
|
||||||
loader: 'css-loader'
|
loader: 'css-loader',
|
||||||
|
options: {
|
||||||
|
esModule: false, // TODO: trueにすると壊れる。Vue3移行の折にはtrueにできるかもしれない
|
||||||
|
}
|
||||||
}, postcss]
|
}, postcss]
|
||||||
}, {
|
}, {
|
||||||
test: /\.(eot|woff|woff2|svg|ttf)([?]?.*)$/,
|
test: /\.(eot|woff|woff2|svg|ttf)([?]?.*)$/,
|
||||||
|
@@ -192,10 +192,10 @@
|
|||||||
dependencies:
|
dependencies:
|
||||||
"@sinonjs/commons" "^1.7.0"
|
"@sinonjs/commons" "^1.7.0"
|
||||||
|
|
||||||
"@syuilo/aiscript@0.10.1":
|
"@syuilo/aiscript@0.11.0":
|
||||||
version "0.10.1"
|
version "0.11.0"
|
||||||
resolved "https://registry.yarnpkg.com/@syuilo/aiscript/-/aiscript-0.10.1.tgz#28d18d02caf5b31b8c83106a395d9b36747b7ed7"
|
resolved "https://registry.yarnpkg.com/@syuilo/aiscript/-/aiscript-0.11.0.tgz#8567da2efbf46e99db38ed80e6a4a4ae8f4bb567"
|
||||||
integrity sha512-qaMT0EUb3dverYwuOqhLPCcLMSR5sk7tVgRUxpSPfXxFl6x2GraO0pcLLkQL0FyQUj7oo8ss6blW7XUrIqBKOQ==
|
integrity sha512-aMe2ZwvliFRmdZ2n5ORmSnwqqlXEZ63syo8kEojXjt6VaoOVGmo+Z3qxU1ux6U6SMDMElHLc40aZXrkLL859/Q==
|
||||||
dependencies:
|
dependencies:
|
||||||
autobind-decorator "2.4.0"
|
autobind-decorator "2.4.0"
|
||||||
chalk "4.0.0"
|
chalk "4.0.0"
|
||||||
|
Reference in New Issue
Block a user