From 2105e4964b16d365a8b20bfeaca60468364b9267 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 20 Apr 2018 12:38:31 +0900
Subject: [PATCH] :v:
---
locales/en.yml | 1 +
locales/fr.yml | 1 +
locales/ja.yml | 1 +
.../views/components/ui.header.account.vue | 17 +++++++++++++++--
src/models/favorite.ts | 1 +
5 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/locales/en.yml b/locales/en.yml
index 33b46e1b9f..db7ad786b9 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -367,6 +367,7 @@ desktop/views/components/settings.profile.vue:
desktop/views/components/ui.header.account.vue:
profile: "Your profile"
drive: "Drive"
+ favorites: "Favorites"
customize: "Customize"
settings: "Settings"
signout: "Sign out"
diff --git a/locales/fr.yml b/locales/fr.yml
index a475b65d41..09e5b3878c 100644
--- a/locales/fr.yml
+++ b/locales/fr.yml
@@ -367,6 +367,7 @@ desktop/views/components/settings.profile.vue:
desktop/views/components/ui.header.account.vue:
profile: "Votre profil"
drive: "Drive"
+ favorites: "Favorites"
customize: "Modifications"
settings: "Réglages"
signout: "Déconnexion"
diff --git a/locales/ja.yml b/locales/ja.yml
index 9cbdb79937..2401bf1fc1 100644
--- a/locales/ja.yml
+++ b/locales/ja.yml
@@ -367,6 +367,7 @@ desktop/views/components/settings.profile.vue:
desktop/views/components/ui.header.account.vue:
profile: "プロフィール"
drive: "ドライブ"
+ favorites: "お気に入り"
customize: "カスタマイズ"
settings: "設定"
signout: "サインアウト"
diff --git a/src/client/app/desktop/views/components/ui.header.account.vue b/src/client/app/desktop/views/components/ui.header.account.vue
index 01cca472db..ce7fab22cf 100644
--- a/src/client/app/desktop/views/components/ui.header.account.vue
+++ b/src/client/app/desktop/views/components/ui.header.account.vue
@@ -13,6 +13,9 @@
<li @click="drive">
<p>%fa:cloud%<span>%i18n:@drive%</span>%fa:angle-right%</p>
</li>
+ <li>
+ <router-link to="/i/favorites">%fa:star%<span>%i18n:@favorites%</span>%fa:angle-right%</router-link>
+ </li>
</ul>
<ul>
<li>
@@ -24,7 +27,7 @@
</ul>
<ul>
<li @click="signout">
- <p>%fa:power-off%<span>%i18n:@signout%</span></p>
+ <p class="signout">%fa:power-off%<span>%i18n:@signout%</span></p>
</li>
</ul>
<ul>
@@ -209,7 +212,7 @@ root(isDark)
pointer-events none
> span:first-child
- padding-left 16px
+ padding-left 22px
> [data-fa]:first-child
margin-right 6px
@@ -233,6 +236,16 @@ root(isDark)
&:active
background darken($theme-color, 10%)
+ &.signout
+ $color = #e64137
+
+ &:hover, &:active
+ background $color
+ color #fff
+
+ &:active
+ background darken($color, 10%)
+
.zoom-in-top-enter-active,
.zoom-in-top-leave-active {
transform-origin: center -16px;
diff --git a/src/models/favorite.ts b/src/models/favorite.ts
index b2c5828088..5387b29457 100644
--- a/src/models/favorite.ts
+++ b/src/models/favorite.ts
@@ -2,6 +2,7 @@ import * as mongo from 'mongodb';
import db from '../db/mongodb';
const Favorite = db.get<IFavorite>('favorites');
+Favorite.createIndex(['userId', 'noteId'], { unique: true });
export default Favorite;
export type IFavorite = {