From f81d1b0eea497e392b81f5217d023a66e01ea9b3 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shpuld@gmail.com>
Date: Fri, 23 Jun 2017 17:43:34 +0300
Subject: [PATCH 1/9] Fix long names overflowing and messing everything (now
just overflowing parts not drawn), fix non-square avatars not drawn as
squares.
---
.../user_card_content/user_card_content.vue | 34 +++++++++++--------
1 file changed, 20 insertions(+), 14 deletions(-)
diff --git a/src/components/user_card_content/user_card_content.vue b/src/components/user_card_content/user_card_content.vue
index ff1b108c..37435ec2 100644
--- a/src/components/user_card_content/user_card_content.vue
+++ b/src/components/user_card_content/user_card_content.vue
@@ -5,8 +5,10 @@
<div class='container'>
<img :src="user.profile_image_url">
<span class="glyphicon glyphicon-user"></span>
- <div class='user-name'>{{user.name}}</div>
- <div class='user-screen-name'>@{{user.screen_name}}</div>
+ <div class="name-and-screen-name">
+ <div class='user-name'>{{user.name}}</div>
+ <div class='user-screen-name'>@{{user.screen_name}}</div>
+ </div>
</div>
<div v-if="isOtherUser" class="user-interactions">
<div v-if="user.follows_you && loggedIn" class="following base06">
@@ -135,33 +137,37 @@
align-content: flex-start;
justify-content: center;
max-height: 60px;
+ overflow: hidden;
}
img {
- border: 2px solid;
- border-radius: 5px;
- flex: 1 0 100%;
- max-width: 48px;
- max-height: 48px;
+ border: 2px solid;
+ border-radius: 5px;
+ flex: 1 0 100%;
+ width: 48px;
+ height: 48px;
+ object-fit: cover;
}
text-shadow: 0px 1px 1.5px rgba(0, 0, 0, 1.0);
- .user-name{
- margin-top: 0.0em;
+ .name-and-screen-name {
+ display: block;
+ margin-top: 0.0em;
margin-left: 0.6em;
- flex: 0 0 auto;
- align-self: flex-start;
+ text-align: left;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
+
+ .user-name{
}
.user-screen-name {
- margin-top: 0.0em;
- margin-left: 0.6em;
font-weight: lighter;
font-size: 15px;
padding-right: 0.1em;
flex: 0 0 auto;
- align-self: flex-start;
}
.user-interactions {
From 7d59051fc5e93585d8d9858ac989d9ebf7aa3cf9 Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Sun, 2 Jul 2017 12:25:34 +0200
Subject: [PATCH 2/9] Add logout button.
---
src/App.js | 3 +++
src/App.vue | 1 +
src/modules/users.js | 8 ++++++++
static/font/config.json | 6 ++++++
static/font/css/fontello-codes.css | 1 +
static/font/css/fontello-embedded.css | 13 +++++++------
static/font/css/fontello-ie7-codes.css | 1 +
static/font/css/fontello-ie7.css | 1 +
static/font/css/fontello.css | 15 ++++++++-------
static/font/demo.html | 13 +++++++------
static/font/font/fontello.eot | Bin 9052 -> 9340 bytes
static/font/font/fontello.svg | 2 ++
static/font/font/fontello.ttf | Bin 8884 -> 9172 bytes
static/font/font/fontello.woff | Bin 5524 -> 5728 bytes
static/font/font/fontello.woff2 | Bin 4720 -> 4916 bytes
15 files changed, 45 insertions(+), 19 deletions(-)
diff --git a/src/App.js b/src/App.js
index a2d891f7..1da3ff7c 100644
--- a/src/App.js
+++ b/src/App.js
@@ -29,6 +29,9 @@ export default {
},
scrollToTop () {
window.scrollTo(0, 0)
+ },
+ logout () {
+ this.$store.dispatch('logout')
}
}
}
diff --git a/src/App.vue b/src/App.vue
index 79eded08..48cf9ea6 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -8,6 +8,7 @@
<div class='item right'>
<user-finder></user-finder>
<router-link :to="{ name: 'settings'}"><i class="icon-cog"></i></router-link>
+ <a href="#" v-if="currentUser" @click.prevent="logout"><i class="icon-logout" title="Logout" ></i></a>
</div>
</div>
</nav>
diff --git a/src/modules/users.js b/src/modules/users.js
index b68f67e6..98ac8f7e 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -26,6 +26,9 @@ export const mutations = {
setCurrentUser (state, user) {
state.currentUser = merge(state.currentUser || {}, user)
},
+ clearCurrentUser (state) {
+ state.currentUser = false
+ },
beginLogin (state) {
state.loggingIn = true
},
@@ -66,6 +69,11 @@ const users = {
store.commit('setUserForStatus', status)
})
},
+ logout (store) {
+ store.commit('clearCurrentUser')
+ store.dispatch('stopFetching', 'friends')
+ store.commit('setBackendInteractor', backendInteractorService())
+ },
loginUser (store, userCredentials) {
return new Promise((resolve, reject) => {
const commit = store.commit
diff --git a/static/font/config.json b/static/font/config.json
index 7c58cada..98ece6ad 100644
--- a/static/font/config.json
+++ b/static/font/config.json
@@ -89,6 +89,12 @@
"css": "menu",
"code": 61641,
"src": "fontawesome"
+ },
+ {
+ "uid": "0d20938846444af8deb1920dc85a29fb",
+ "css": "logout",
+ "code": 59400,
+ "src": "fontawesome"
}
]
}
\ No newline at end of file
diff --git a/static/font/css/fontello-codes.css b/static/font/css/fontello-codes.css
index 3e658de9..8831e4ee 100644
--- a/static/font/css/fontello-codes.css
+++ b/static/font/css/fontello-codes.css
@@ -7,6 +7,7 @@
.icon-eye-off:before { content: '\e805'; } /* '' */
.icon-plus-squared:before { content: '\e806'; } /* '' */
.icon-cog:before { content: '\e807'; } /* '' */
+.icon-logout:before { content: '\e808'; } /* '' */
.icon-spin3:before { content: '\e832'; } /* '' */
.icon-spin4:before { content: '\e834'; } /* '' */
.icon-menu:before { content: '\f0c9'; } /* '' */
diff --git a/static/font/css/fontello-embedded.css b/static/font/css/fontello-embedded.css
index 7dedc03f..f9d38315 100644
--- a/static/font/css/fontello-embedded.css
+++ b/static/font/css/fontello-embedded.css
@@ -1,15 +1,15 @@
@font-face {
font-family: 'fontello';
- src: url('../font/fontello.eot?46746090');
- src: url('../font/fontello.eot?46746090#iefix') format('embedded-opentype'),
- url('../font/fontello.svg?46746090#fontello') format('svg');
+ src: url('../font/fontello.eot?34768509');
+ src: url('../font/fontello.eot?34768509#iefix') format('embedded-opentype'),
+ url('../font/fontello.svg?34768509#fontello') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'fontello';
- src: url('data:application/octet-stream;base64,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') format('woff'),
- url('data:application/octet-stream;base64,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') format('truetype');
+ src: url('data:application/octet-stream;base64,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') format('woff'),
+ url('data:application/octet-stream;base64,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') format('truetype');
}
/* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */
/* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */
@@ -17,7 +17,7 @@
@media screen and (-webkit-min-device-pixel-ratio:0) {
@font-face {
font-family: 'fontello';
- src: url('../font/fontello.svg?46746090#fontello') format('svg');
+ src: url('../font/fontello.svg?34768509#fontello') format('svg');
}
}
*/
@@ -60,6 +60,7 @@
.icon-eye-off:before { content: '\e805'; } /* '' */
.icon-plus-squared:before { content: '\e806'; } /* '' */
.icon-cog:before { content: '\e807'; } /* '' */
+.icon-logout:before { content: '\e808'; } /* '' */
.icon-spin3:before { content: '\e832'; } /* '' */
.icon-spin4:before { content: '\e834'; } /* '' */
.icon-menu:before { content: '\f0c9'; } /* '' */
diff --git a/static/font/css/fontello-ie7-codes.css b/static/font/css/fontello-ie7-codes.css
index dfab853a..3c915b3c 100644
--- a/static/font/css/fontello-ie7-codes.css
+++ b/static/font/css/fontello-ie7-codes.css
@@ -7,6 +7,7 @@
.icon-eye-off { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-plus-squared { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-cog { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
+.icon-logout { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-spin3 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-spin4 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-menu { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
diff --git a/static/font/css/fontello-ie7.css b/static/font/css/fontello-ie7.css
index 3e93ecd2..2fe2a707 100644
--- a/static/font/css/fontello-ie7.css
+++ b/static/font/css/fontello-ie7.css
@@ -18,6 +18,7 @@
.icon-eye-off { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-plus-squared { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-cog { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
+.icon-logout { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-spin3 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-spin4 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-menu { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
diff --git a/static/font/css/fontello.css b/static/font/css/fontello.css
index 81250ae3..0c0d2930 100644
--- a/static/font/css/fontello.css
+++ b/static/font/css/fontello.css
@@ -1,11 +1,11 @@
@font-face {
font-family: 'fontello';
- src: url('../font/fontello.eot?79576261');
- src: url('../font/fontello.eot?79576261#iefix') format('embedded-opentype'),
- url('../font/fontello.woff2?79576261') format('woff2'),
- url('../font/fontello.woff?79576261') format('woff'),
- url('../font/fontello.ttf?79576261') format('truetype'),
- url('../font/fontello.svg?79576261#fontello') format('svg');
+ src: url('../font/fontello.eot?64848116');
+ src: url('../font/fontello.eot?64848116#iefix') format('embedded-opentype'),
+ url('../font/fontello.woff2?64848116') format('woff2'),
+ url('../font/fontello.woff?64848116') format('woff'),
+ url('../font/fontello.ttf?64848116') format('truetype'),
+ url('../font/fontello.svg?64848116#fontello') format('svg');
font-weight: normal;
font-style: normal;
}
@@ -15,7 +15,7 @@
@media screen and (-webkit-min-device-pixel-ratio:0) {
@font-face {
font-family: 'fontello';
- src: url('../font/fontello.svg?79576261#fontello') format('svg');
+ src: url('../font/fontello.svg?64848116#fontello') format('svg');
}
}
*/
@@ -63,6 +63,7 @@
.icon-eye-off:before { content: '\e805'; } /* '' */
.icon-plus-squared:before { content: '\e806'; } /* '' */
.icon-cog:before { content: '\e807'; } /* '' */
+.icon-logout:before { content: '\e808'; } /* '' */
.icon-spin3:before { content: '\e832'; } /* '' */
.icon-spin4:before { content: '\e834'; } /* '' */
.icon-menu:before { content: '\f0c9'; } /* '' */
diff --git a/static/font/demo.html b/static/font/demo.html
index 02fb5d79..2c5503c0 100644
--- a/static/font/demo.html
+++ b/static/font/demo.html
@@ -229,11 +229,11 @@ body {
}
@font-face {
font-family: 'fontello';
- src: url('./font/fontello.eot?13861244');
- src: url('./font/fontello.eot?13861244#iefix') format('embedded-opentype'),
- url('./font/fontello.woff?13861244') format('woff'),
- url('./font/fontello.ttf?13861244') format('truetype'),
- url('./font/fontello.svg?13861244#fontello') format('svg');
+ src: url('./font/fontello.eot?1253892');
+ src: url('./font/fontello.eot?1253892#iefix') format('embedded-opentype'),
+ url('./font/fontello.woff?1253892') format('woff'),
+ url('./font/fontello.ttf?1253892') format('truetype'),
+ url('./font/fontello.svg?1253892#fontello') format('svg');
font-weight: normal;
font-style: normal;
}
@@ -313,12 +313,13 @@ body {
<div title="Code: 0xe807" class="the-icons span3"><i class="demo-icon icon-cog"></i> <span class="i-name">icon-cog</span><span class="i-code">0xe807</span></div>
</div>
<div class="row">
+ <div title="Code: 0xe808" class="the-icons span3"><i class="demo-icon icon-logout"></i> <span class="i-name">icon-logout</span><span class="i-code">0xe808</span></div>
<div title="Code: 0xe832" class="the-icons span3"><i class="demo-icon icon-spin3 animate-spin"></i> <span class="i-name">icon-spin3</span><span class="i-code">0xe832</span></div>
<div title="Code: 0xe834" class="the-icons span3"><i class="demo-icon icon-spin4 animate-spin"></i> <span class="i-name">icon-spin4</span><span class="i-code">0xe834</span></div>
<div title="Code: 0xf0c9" class="the-icons span3"><i class="demo-icon icon-menu"></i> <span class="i-name">icon-menu</span><span class="i-code">0xf0c9</span></div>
- <div title="Code: 0xf112" class="the-icons span3"><i class="demo-icon icon-reply"></i> <span class="i-name">icon-reply</span><span class="i-code">0xf112</span></div>
</div>
<div class="row">
+ <div title="Code: 0xf112" class="the-icons span3"><i class="demo-icon icon-reply"></i> <span class="i-name">icon-reply</span><span class="i-code">0xf112</span></div>
<div title="Code: 0xf1e5" class="the-icons span3"><i class="demo-icon icon-binoculars"></i> <span class="i-name">icon-binoculars</span><span class="i-code">0xf1e5</span></div>
<div title="Code: 0xf234" class="the-icons span3"><i class="demo-icon icon-user-plus"></i> <span class="i-name">icon-user-plus</span><span class="i-code">0xf234</span></div>
</div>
diff --git a/static/font/font/fontello.eot b/static/font/font/fontello.eot
index 4573d823ee90add72c1083909b69f2f0b3b20c1c..52fbefa9b7ff67e42482179ffc0c9fea260a79f7 100644
GIT binary patch
delta 793
zcmX|9T}V@57=FL+JLfxRJIAx>&d#Vz$L5q$GTfXOW-UiQh!+MSNw8XTPSCkSuF#5%
zD2R$^ox7l#;e~V&;e-mhs|ynYgN!b`3&X3*u!}@y?;OR)!+W0ReZKd+59cf&-8{~(
z)B$|*=Xh99r`&V7$eoGH0Hg;1dK2lmd99Bs$fp5lf8t`+%a@AZ06cH7?;S8x>D#&c
zeaM#q6f+ecHBomWpT#PthQ|jIUxQx&1Qoz>a4;F~*K%zFfU6t(;XxFndG;Oo4diu$
z>FikhrQWSg6!3)*8O|i)HAi+XB40)BOUK7d(yZb_It~QyNIacfc(l6~c@r-9!OV<i
zufMq21z_L|cxj$bnk$DJaan)2l_#gkD{GUa_T+(J7vLeV?WZQJb_|&Z0Y*@F;$Z-*
zvUQgR6)*fh);z5h9q8oN8ZACxqV<Du+q>;y7|<%R#0j}{5fvNOmNH7iS3_k0F8}j=
z8Gs?ys>*;0tSe=J2Jj30C4i$aEj*Sc0Ji?HA^H{?AOf9{Lpq^^90N{8%EdH@jEZas
z1O`liG^V1Q(6c4NP6A_a3NTT(;olM18)%TkU5x?Va1f11eqViSWhmTES`4>mTWaw8
zxKybdo?uH2CAvhoufAh~ps|C5!fnCUP}uMggCr@gAj>n+SS>+X*StK!}9vW;x}Q
za;5lDsWvt=!_YR2YK1f_`)HM@*#r`cl3UT3T~=(oLXt_SzBq;#1uBy!O(`zgb;qQk
zeRk+%QZuNnxJd0#=v1Ha>N)q6dd6|!Hz=(1OTg0A@z?*VCA->)(~7tPByXK_HM@I6
vRlFyz^De$FJwaFLvpWk<T?#|na|7d5S_?)*;=`F#=0es|J^KqCo?7)UOmC>R
delta 506
zcmez4amS4<Mwx+Oi_%0kGnU97t!5J)y6bBg7#IT>7#PBma}x`64O@-_`70P0n8K3F
zN)*_x{(Hv2AT|dmuaH)dp4&BXLL`vChk=2+AU(0T04Od1<WB+89O*fgX)6pCrZO<F
z0J(ft8L5dWe6IJ(7#M_XfC6S2Kmqns%x{7G5+GkCBe$f&{8rfiKR|&QKmnVa{NzNj
zH&SPT{3}4dLT+M30izxdH<14Y#Lr92O+7PLR-S=DSOn<6vjzFZB~PcH;$UD9eFBtU
zS5TB%@YGQo=r|>v$qN{x8Fx<p!<eo)kAV>=%fK*$ff>xw0n%JRPtF6nGY2Rx0EEm8
z3@_Lx_b?fA%Q3*=<Wo%YKrL*GKQb{20TuFqOkvmoCV?KD#FFf81k?w_44gpP1cE_k
ze>e%j3_!Pk1Zo9gkoJ#HA((-ef#DNSJqR=KF)(c2!ZMG2a~SV3HW{<lACd9=HeVUI
znO}fxx*Bn|2u4qq5HV-upBx~fI=NCrN3e^PhqZ|H1X~fiEZAfGn|FzDGXoVI6PKI(
QOx$6zu7ttn7zqU)0A6@|00000
diff --git a/static/font/font/fontello.svg b/static/font/font/fontello.svg
index 98105a87..43e9bee4 100644
--- a/static/font/font/fontello.svg
+++ b/static/font/font/fontello.svg
@@ -22,6 +22,8 @@
<glyph glyph-name="cog" unicode="" d="M571 350q0 59-41 101t-101 42-101-42-42-101 42-101 101-42 101 42 41 101z m286 61v-124q0-7-4-13t-11-7l-104-16q-10-30-21-51 19-27 59-77 6-6 6-13t-5-13q-15-21-55-61t-53-39q-7 0-14 5l-77 60q-25-13-51-21-9-76-16-104-4-16-20-16h-124q-8 0-14 5t-6 12l-16 103q-27 9-50 21l-79-60q-6-5-14-5-8 0-14 6-70 64-92 94-4 5-4 13 0 6 5 12 8 12 28 37t30 40q-15 28-23 55l-102 15q-7 1-11 7t-5 13v124q0 7 5 13t10 7l104 16q8 25 22 51-23 32-60 77-6 7-6 14 0 5 5 12 15 20 55 60t53 40q7 0 15-5l77-60q24 13 50 21 9 76 17 104 3 16 20 16h124q7 0 13-5t7-12l15-103q28-9 51-20l79 59q5 5 13 5 7 0 14-5 72-67 92-95 4-5 4-12 0-7-4-13-9-12-29-37t-30-40q15-28 23-54l102-16q7-1 12-7t4-13z" horiz-adv-x="857.1" />
+<glyph glyph-name="logout" unicode="" d="M357 46q0-2 1-11t0-14-2-14-5-11-12-3h-178q-67 0-114 47t-47 114v392q0 67 47 114t114 47h178q8 0 13-5t5-13q0-2 1-11t0-15-2-13-5-11-12-3h-178q-37 0-63-26t-27-64v-392q0-37 27-63t63-27h174t6 0 7-2 4-3 4-5 1-8z m518 304q0-14-11-25l-303-304q-11-10-25-10t-25 10-11 25v161h-250q-14 0-25 11t-11 25v214q0 15 11 25t25 11h250v161q0 14 11 25t25 10 25-10l303-304q11-10 11-25z" horiz-adv-x="928.6" />
+
<glyph glyph-name="spin3" unicode="" d="M494 850c-266 0-483-210-494-472-1-19 13-20 13-20l84 0c16 0 19 10 19 18 10 199 176 358 378 358 107 0 205-45 273-118l-58-57c-11-12-11-27 5-31l247-50c21-5 46 11 37 44l-58 227c-2 9-16 22-29 13l-65-60c-89 91-214 148-352 148z m409-508c-16 0-19-10-19-18-10-199-176-358-377-358-108 0-205 45-274 118l59 57c10 12 10 27-5 31l-248 50c-21 5-46-11-37-44l58-227c2-9 16-22 30-13l64 60c89-91 214-148 353-148 265 0 482 210 493 473 1 18-13 19-13 19l-84 0z" horiz-adv-x="1000" />
<glyph glyph-name="spin4" unicode="" d="M498 850c-114 0-228-39-320-116l0 0c173 140 428 130 588-31 134-134 164-332 89-495-10-29-5-50 12-68 21-20 61-23 84 0 3 3 12 15 15 24 71 180 33 393-112 539-99 98-228 147-356 147z m-409-274c-14 0-29-5-39-16-3-3-13-15-15-24-71-180-34-393 112-539 185-185 479-195 676-31l0 0c-173-140-428-130-589 31-134 134-163 333-89 495 11 29 6 50-12 68-11 11-27 17-44 16z" horiz-adv-x="1001" />
diff --git a/static/font/font/fontello.ttf b/static/font/font/fontello.ttf
index c3bfb92a75c11ad37663d94cf3958bc27e785fa0..2548731d5f15813084fefd38a1953b47167f04d5 100644
GIT binary patch
delta 791
zcmYLHT}YEr7=F(Aez$Lan`@p?nabvrQZn3}7iO)72;zl-ND?f^oD+2JBUflaMifLB
zp?m}(R0>^0SK)+y=&mj*3Jfy3=&lT}BEz60X73ykhllq(&-=d5d0#loUGKYRgEJQZ
z)(2o9l}%cg2Dw4}KEQ`l=kj&xYVj-Je@6Mb5i66uJ~ul^{1aeUndGEJx`+5OMLjb<
zJ(Bty{s_n}z<p#iog6mj+GSu@FXf}7BxtXtZ^W+<uOH3kr#j9LZ2uvF9z<+BmrB-j
z?O7qdPCSrJPFbwQMFaWB5OovDZ2HaZeYM1!X~4HuZZd!Q;nf~MkOv-FXVTW%u_hWe
z*gN;@6nkv<v&{YlFiHaRkalj(6rHr=0%S~(?x7<A>$?4gg`4W||4<P)<zy&Op+Sd(
zIt{o`0Tb>*j8`zniyd>?*B+2kC-jmLDGrLQWt1LUkCZ{p`2MO4vcZP83^K&VS{Y=G
zA5>og+)MHuZ3fu>EsgQ#XhaOhV@G|AGu922D_m8wP$aHMV~{0CGP0$iRmO)(MCykm
z;Us8@UJ=|KIuL5ql)X(MpKvpiX~954TV*8L!CFO?e@AKz22`!mC;Z{o8qRzgQv(g1
zGmHv5StQyXZi_^Pp9z-cG=i=##S@A6lI~=zOhXYCtzTBT%DHM3-x<|n%M`-g64eH4
zF%ELCVmf4&h_h?)gi|*hYK5k=NJDXo8fC7tX45FHIDPI#VSaG?*rF-8qqxGID9jrV
z)asX2_gtslhkwG5N*@HP7pI^6i}sMWoq6nA-Vj@`pL$!W`V^OPL)lb&)J^R!Rh52$
hr?BNUBq~z{tygK+i<qX4=Q6pod3#tKD%=#cuD?S(p4|Wd
delta 517
zcmYLEJxE(o7(Fj9c`x<7CYo3SQqy2{5Tn>16iSdfh--xs6bF5z`5E%`5`$PMxai`f
z+(I4NKo`m65(f+J{?H5sT^yW@WKd91$RMrfB^0@w``vTScfX&bvF*{dmrGv&<pY3t
z!nQ=;tK~iNBH)TA7V;78`0qK;_MLttCDQil`r0J<E?|hXH7}?)lYeFOrn8?@#ettm
zz)k9Vmq}Wme50oeKp;k8FhfB<R4>W%<Xss%zc_Rf|94MegF-Ajm$2F{+RNle<PqCi
z6iUBokl#9d*0Phoe{{S6f~_2|Eav9(m2Zb$;Mp1dEs;x#%1AGV>x{0~rj%duqmu3^
zK%oh2K&`)`j7{9Jz%jGbn|V~As>?IwO<x#~he>eJbHf7-I=pzop9V}kg^#8t$6Yl!
z<1+kay~9rZ=IU}nO^m%}O@e<=ecOQ3_v)Yl*1>h40anCyr2*E)4f7p1T}r0ApqIAH
zP3`&MN^Nr5AG?F0R-IPI6Xo3hC`E8c@ylYcTmA_~TUI@$C+FGMa(YL7X@4ouYN$*I
Shr)6=^j@xn21?tZi1`2&@O9w;
diff --git a/static/font/font/fontello.woff b/static/font/font/fontello.woff
index dced1f8cfc587ca9b2675c7e394735b6ca184c57..fbbf748fe9ce25e70c1f50e36d290cca965eeaf3 100644
GIT binary patch
delta 3567
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
delta 3398
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
XG|fjexll!;L*rAUh-}6pYt(-L^<p}T
diff --git a/static/font/font/fontello.woff2 b/static/font/font/fontello.woff2
index b91fcbd7df8be7d294abe9dcc97a2c4a08ed536e..89c497872bce4444e54ce70b1d4d4c6c7fec8cd2 100644
GIT binary patch
literal 4916
zcmV-46U*#(Pew8T0RR91024F-4*&oF03*}@020~&0RR9100000000000000000000
z0000SR0dW6gk%UH36^jX2nwD+ngRhf0we=K3nBmnAO(d@2Z1*Xfd(6EAVoz@-;`@)
z{~r!GxjO3yLs*2OM4e19CY-2;8*HM79Yq)#MMsGFS1E$<I8NPab=`Y%zV5e)W9)@J
zhs99NOW9N}sV+;6=006&G{#}Ey(_j2rS$*X?|t`~nM?2>k01{MKsUso|Em1Fe2oH>
zz`hketpZ_kwcl^QAvT?K5pheR?RamWp3U7J(ugLZGo2xcr9`Um@OFED-SWT!3%q4f
zc-$7WAUen>&@997KtdHRRk-_r?Gw0Z3El+Jq+-TIk?Ir+sm@wwd)hgbADMPx8~=yc
z#9Du8JJELy;l-^F{Qql9sVE(u<|#kCs|k@&O9|U71tn8ayC`#}tF9*Om$}ymyOR8&
z45!=+c<t2rB@EE1<Z;xdkw`ADl1=Xdgl!#vKw74%u+o(6@&A@KJ2OY?s@0`*ArFtm
zW8}@>Y%YIhugvE1xV-{wXxXD~Lfg=DNAI#!S5@86N^ytcp|IE{JW67O2h!Pk+gnId
zs}l{zW;<L3u2Mv7q`&fMKmc96DaC1NV;h<dP70cp(QOGXGt!a99BM{Ug42?yg)-x+
z&3ExY0(KQY0q+kU`p^)=&PfgEMd!A~5N0a=$6WZ|9Zn3Mt8)NgI1M<UTAmo)%<@mc
zPgs4BI?F5E0J!nbT7qY_Hh$%&=YQ_!&wmk(@{EUtF)VR0z<=`?PLRkHDvi!yve+D;
z7F3$3`}0Hxp0UwD@T|ZV26VR=P!N#;1qlWeWEfCTU_e2I0R;_aBNTL)&FBXP{JVZ&
z!hb1P2lKFD3$zfn3kNl^8HsryiqFwE3aSN`<0MIM|G}Pri~Rp7(!8hqnNQU%N0^uY
zYUrRivctwXunq=o+=HMTJVY|-sfSU=;`>cR@~JP6x+X`H?a$GfYq~Wtw;3H?YDD{K
zV*4|xW^l?e<@d&oE$aIg^+M!(R117>Gok;){2(%Hp`TbQX)Vr4udIQPl7YE+l9Gp0
z6Cu1D3rU+1$pW&4w)+#5dIU|TWF1#24`PODhMgZuCr9vyW0gvsy`M$Y`eva^L0d6z
zHf1|SOB~zViDS`p$Y}Iz9*HO#^k8~H`TB7zm_RNRSbho>P>S^MC{zp63?2OwAy?rz
zUQX%JJSG=X*(?2^Nx0)Qy&jF4H}wiGM=&sm@T^If%dDUq$wJ(aQ^@S`OfwDKt&GcG
z86&SEUtlf7yS31in6DA!LT~iypV2ku(jDiqSXu3pqcZl`gi;ApZz6uIvXHQD=mND;
zJr0Gd4_E(0D4Kk0*vjhmgl)k*F5m9PD#~%XhE>^_$H%u@@$F86YTP6z(5s&n&fs3e
znae|2z(E3oFb~z-QY#y@GQoW_R?WEx51nnHPW$03PxxXsJjfnpKF6d4&Sb|KBZHl4
zV!ex0AYfxiptmRKZu$ZOoU7RIZp5*m35Er9gVLZ3Wxw6YJVtmA-Cp&#s(2VQSCc2m
zion2A!b%4cVvK|tClMw{lu0DUWD;izNidZpnO2(O9IG3xplO<-86cPi080VD8~~UH
z01E(M5dbU$0LuXwT|q5}5~)nexT!|<%aOU`lv3eQi7HZw9G{1$n$k?Vj$3(VuTwSW
z@=zJ+sWJcTw4(X}E$?+~nOcKnNFH5BJ(jVwo^!0=v*aB^s1aCkgnoer4z1d=S{F<1
zcp6mR7|mo%fWh*N6V%A|;<BeHn*-@6>t&i*Sy)|Hs~O1oY~pqI_S<Y1#n<awOpt}X
zDbn)X9Zw5E2;plzJrGTUldjgJ<*u5gTGOIxM^!>t5GWISPvlv>t@x9@EM}UyLb4c3
zA(&95E+=@1Hq8h<M<!-Lcoh#|%Ety*IZkt!N^=qU#U-P-znFwbZ0a_&%AG09_j&^x
z%<7x=GG+_qgM;K{lQ9FY43v@H0=_dhU%nP-CZ0TP>PMtXqy#Cp{LIsy<e*w$N2Wkc
z;3(OlFKE4COh1-lt7UV|LwLeVT0q}Q_M2s1zpaL>RBg~2PT}%ZdO8~~lwCxA-_6*)
zupO(qXlf01qv>|ka%yW;3=TZqNrP=Jr$?}Q{=s`m3rh6#kydoIf~Rmvt05OasHF-X
zFSx>n1<#t^w5-;im33_Q53Abn;D`UjEbyT1@S38Q?PX&@SI1nEPYh@xtU4QvIU5)%
z<ad`2nI%t5tH*QjxGc3aJUqiJ|H!a{f=e`BoY5i8dot!nXkuzL?IbXU*7(pD6=QSH
z#IOhYk93j|nUeH?)6gMi_;i5H0ugfnh<O0S0%$K=1c)U7#4-S41=M4!0I>#uSO-9C
zfDW=vfY<^+Yy%*6K>OG(K<oh^_5m1wFr-b#;_yn*b;>!S-SRk;IH5h{q^Mm`oI-~@
zI|1Z5U`a0OcZkcC4tW&;<TU`~rhccmUFnc_5kTGpFvG*}r`D)_D#{WDs1^LOdG=m1
zy|+0K_!9k0p5xNYSqcFD0RY5%fMVi8kID)0Ee$m+QVib<A1>iSOiV1A3Z<r}Ly}C6
zOw5njmK&Fwmzpltl?x>-2?WJtW?1cVlbb}$+jd?8#oPHD3Jg7Id0fCsOkJMvPmWIG
z$D0B+0g1_}c#xRRf&(ubhU3+EyOT|R2uf}shl&w!M;|PxKurz~CNu(bU#{h5gCK!6
zo4p{B(}sr}aoE<;UAWn7sxc-UYZe+3hzz#c-H4F%B8b-uGncU-DkE>s0@kO3Hf2)1
z#54?pd<6MWk;9`<csu~3g*V@ZKSJjSEoBOK5nee-;oRf!fkecZEVvz@-ZGWCA+kYV
z2~C@WL_&n=R9E=m{4af}NA78~Q%lVO%pN<lf})_+NCc<N+Lyy+fqjnGQU2sL-6r24
ziFnhv2O;a<nFE)!i=f|9e})~ALmhbJCV%Xt+N`#p3dxrJawZk)h9J@ln#Z!`R&>4v
z622$H!FX&h0!~~!lrXg_0YmLbQ()sckpv$sOBptrrMe2|m6UKl77WC}2W~(vce~AR
z)5I0xB4vQWb5D@oUQ00SueaopWtUyv?k1-|5ZbmOrcu~8s_5_xk|rufyRlr@0Y-3m
z;dkMAojaggH6GGt`k35Ao9PY`5J5^)E^RRSf{E&~KRs;}HHNV;{4STm2{-AbK`9m%
zj)N%E={(QVRX!gYS#sjElX5pHp~5^~0KqaXGaV&I@X%RgYS5#Yn9GQg5aZ(l<hHIN
zH{=f5O>Td6+?;15Lg+b=paJ;AD=*NrXWAsvX~e)TpJP%Ez$dY=g;6bRkY99uX0s0#
zFd%0C9T2W@dm8{*0Z_E{G*uT#M<QV<YU>K+R)wlT>%yzikkdFUpTbW5cKh8N82G32
zZ4yLWip<YH`l8aIxa$wN+OICEhR8d>o43f1YuEl?`2VHL=KH+giSjQ|PBM^IKNSCP
zksp$uPZTO&FH7ln*-pUUC4ZKr=;v+KBlAcUIrKyJ;brK4cm&UIrsJ>tfGk|qABlDT
zBdYkwDN+jlaiRsl-+u>^1NX}m*DRBK&Hv%~r%Dh${HW^MKZpK4bPbt>Slklig{MB?
zD?USWh8M<CuMI7noBB;TkTyB`O<E7tO?{g-HJba)8}~T2Fk5tJ5>e=DQ9TcFLwzV)
zFU<fFz>OA>60*&Or&DjwhL0y2U$fBanCb>gW&6hh+idtw>dai&mVgN@v?ivep|?^H
z=!<3PrI{eg++Y!68fAC>hF=!<@U?LVRHj3%&Yn&<dj6}et@^n*@^HOYTM9>?Cl<J@
z`|HuJm9upaSDSqV;vV0aab#cFy7T!Lu!H~leC2VU*FntiXvHXSILO$5AE=8zjV}4S
zRd&(1-MIPPo}t|Oy)n-os_Is?wX81IZr%F(Mf~>n`GNd~+)(d)w{sivZ{}t_-u~Qk
z>t5@ZwJz5i_jd;OV8-3GFJa#hcW_IW=*;E(eoR>X*~X2Jaog7|KjGu8wX7Bo@osWO
zofDP~%S~dedUb21uzIln?6(6Q!YzZGA#O<3CEEYCb)A`C^XbNo0`Bg0%ZGB^%wUOR
zh<lSG?7Y#tVOf=^y;ifl8Y&&PXX_Ac301cjF(j-c-mbnmZELG`Wc%vpcmW>7V<&R<
z_045fut&0trB^sIJ<2W+P8F9-CK^Q-{t;qAT4a3fp9?~4b|T>~(<FatIMla#`$|o3
z)ee@OS65bQl1W)xD-Gp3L$SHEZR5$6i~S?gxj)J-F7d2h`Ux6;M73O7-I&#!Q~s|I
z!7ik$O{q$%o!BqE_~*#-{M%1&$>}`Uw|d7)b@eR>UTy8THzmV>>k^Gg+9d!sS>!#k
z&ZM4{4I9+zR4moNp3Bs|6^y1zKdVS@1fIw@WVJY*tyxW(|43qgtWe_Yj7IQ@48{#=
zYnz$|GWMqJM~7m!=*p?v+cL$#3f`@IUs9yJuf0}O@ss4Kfwi6YNkkYRsuL>jiYtUK
zVrXpy1huA^tK$_eUS<EdwdO4I{?*zZNr=amF|tyY$Qn})ypKsR_TpiuP?<_5CQT+!
zZZDCzE7>`Gs_~<wHF+avXUa!)T{I~$iTrZ8;M~Zmk!8OoCBZ$a;h*_lu>A3v;irck
z7P-*F_j1p-etx92ad;Sf$adf=xNnd>f5`Sk-BaA#Y)jf{o_d;lQ)l6YI8Prtz_nbd
zr=NPZp#={YR3(KTa~^44`ju9{UYooaRx2X<00>Xc8q?YnJUa>3|2~`)NZO|=1?a`1
zKNcy*(da^SXMW2xMC+A)W`+N;!HbthT_qrnoCI|u;8!pa42rx4Z?J`G86f5>8Znfi
zt5j;~sIDCW#W#seLdFRqv~z#^de_sPYs!^27CIt+J#WL){o_SAYw%8fmN>WOnS%=p
z{~@ikiF-O4{o}8HofHi7yb8~khz9NT&}vC@RqQrAt#Ap4{4UQ+@cK$Aib7oaSu4w|
zQHh$!gh!}UmGudL_=X7VNQA(<0WXv-M6#ih@<5v(d8s+h5MN~`d>Le<PXiTYDobIE
z$jILJ5#kJ%b(;yr`%bV=%N6K9+|*>CHkuD6mAnCOM39_T&YGeuUR<70fQ9b}g)CoC
z{b_f=!gsDqI2X4Yi$=nsuM6pZpH^^|XBNuc-N5nsRKGyH?1^|(9(RT5b}5-yEjsXs
z9W*;EcSygsHW%l|$EqqzGXcMnS9H`mNMbsQQYB}!>U5qEh66LIN`*SPdPV*Q8#{pU
zE|iNFDhp*w-h^l8SF)*h1I;`v2hp@qMUa?<o)vN^w>Uw<j!eL68xgsK%yqhM`MFFY
zq+jYl^f9zq_rewBgmJi`u6(XyF6cKG*rKhD2EM0KP~g}=eC3KVp7KK3u_4^g1OrIZ
z-A2Zw=5mT`BCkXv65)&!7@~Co0{jLNI{@*n*b-Y!va{~6SfnsVINTA84vO9D5dF81
z3kQ0_QeKA_ZmM9l-H)l;OKTNKkAjk~%`s?=yz(+wHI-&4YdTLz)LWS}s<rLt)Y@uW
z5U_?`R<c?Y_)DMWz-pdb%=mo3)0W1DnyT`$d}%rrkNSeXaQTFA;XEDYWq4231-7X7
z&bF-wa~91bSlLk*wcCWndV%$f<yz~dW|M9{`Es#7kx5B6`2;PZeM4)pqfxYYN3RIe
z^V-Vd!tC^-riQwT@_cC`9xm~_x+V#zp*lJ@{%H%wcY*T6u4v-t8T`378GpU9y&d>#
zQj6wvItKt$421Q6(QFWfLl*KEVJh4z6z?{<?$KfZEZW!2sr6;Sf4@X;%}Po{sXiI5
zTm?NhlhVZjyfzF*`u#Oo&>{>wRBu8<jZySyoN9=Qx>K6Ou%yXUyPB>_d~HL(6F5p5
zfD6w(jkq})V@Db}t8NVn)a}tEp{7wr-9t^c67G=<#r_zynlqcm39;P4ywt|}hPKRs
zjal!XCskaqt$QfZ)-hFTr&SROp}X3wlFYb?u@~G<!iV$iqIIcOtgN;^N?%5WmJ@~*
zUt`zaxNrCFh;{DNlGSj3i1qE%83xqVy_?KfNnKN~4CZOZ87mb_5T?bvR!pBBy@oMI
zsARN&H>Gd_shmd=COY6ugwe=V2okTLbqR*cmn_^QcFd2q&sk2!+wxsly-Zn$&h+Zi
zBS4p>5|W%z6v}No$3yHR<s_0&T8XyDERD(;!=62Z0;J0zUSf>tj%%b^=qa@efR279
zH%6QUNhFg(DruyXK_*#blS6L!RIOYED5|^>nulda+}3ShUT4P+Lub_%=>(Cg@eDhy
zol%1k-gWNk_uOJw3Upj0dUoxp;!LXgcegRXx<=(I7L7QoJ4%%fJSy4MdWW_%?^OXX
z`QrD5h8HS)%+T+r@$&`JFKCv^<HT3JNa~=m4SsoiXTKoYh$v0q`3yr(K3*?B`Xzp>
mRUTff81Sy1qvTy2?k3nUl<DPP%_5nVFaM7aw~t^50002@^HZAu
literal 4720
zcmV-$5|8b7Pew8T0RR9101|Kj4*&oF03x&i01_Dh0RR9100000000000000000000
z0000SR0dW6gjNV336^jX2nw7$m@@%30we=G3m^alAO(d@2Z1gOfd(6aAF~lPY#cCx
zM^};k*9F{RvhX{Uc$k72mP%4{d8|-GK`0ubcOTKCQt{Dg`hH!OR51U&aeL_o3$2H4
zggs46goFO}efH!}bLQ>a{rgFh0Z=|<8D*b!z;aLr99tK_>dF9DsepQhip#XXO2@S)
zaMKd-1kt2o#>9Y96D*`UYn_?X{>bKGKmPB*C)WC;>&#v~gcr9y7_r+4zl4E=6mg<0
z=vkQqbDV`L&Gc9d6&iQRfJ=Je<lM>Oo#aUm$l~aNSV5?|ENYy59BR?l9+PFr1pa0d
z_>Ql=UTP;PY5LMM63OLlVM}-si5SDZutgo)NGsl*{@+?^XQl{>a0@JC>TBz3WajVf
zC4XiEvzL3#hWCP-;$CsDd`X!lphJawB><PIzN*?<GQLLE2w#J-*$!6$+G|861`5W$
z;%Ptt5!TyFX68!Ak-6>kT`Op(pxY8S&B)s>Upx)Jh(HA$2%qgZS2gd=Jy}^m9*_?!
z;L*s#A5olO=dcF!qK7Zco<pIAUznq-0XGCuyi%M40P|^J08Ho;<+I$vXJ8VXh-Ad`
zDsBUiV?V0_YDcw=HGh5icYpu(kJSjZ&dtIYo5<+~{3lOfps;WV;1ME1j07n%03E1I
z(B$0-8KBnjG!UpM$j*S?D+UzQF`!^!K*7O)LI48_9_A1VA<Qv`LInJ^p%4Rqr;tSE
zVI#%Z3Sqm*fSRq0k3Et5+MRC{K;S!0lJxp7M(?k2pC2NdPZ|Bsr|M5c#Jhi9I#L|j
zVeK6F2ek1373Sa}=uJ;O0v(G_-_Yd4FseOHjwah5qcd0cWpQ{jItr;4+mi{~|C34v
zr#oi!+PJXA`l-cwDe@_*2EK<g5xvEHBYOEFO4wGiH8&^v%4!%X8F-5)DR~Su5$fHs
zu-uGT3pfjP_a~To6sA+Wj*HEMxS^6E@WXU+ggH81KGiets~Tl})0-5u74v4@ZKr5S
zU>A1cQq&DHDm|OWf`A(XYGy%q{x}v)z(R-Qr?7x2_UH+q8YaX%`m2&FcZ@<#>5)7p
z7xEZ_zHk!OouStg!tiEPz~vYQh<etfAILgEw~~cZOHQWul!9%h!MJr}^(zxUsu;|%
z7EYVB(3&K#5m*@FUi~?`+FV+9o)krD&z$SVo(y0rk?@tn<5~-e^n!lSbZSo)B4-X)
ze^rVq-x?Wa^%aq^V4fUa@5Z9#I4zP^_RUj=*IV)R&K*^|RilQ1>rpV~US>A9Jj?>w
zNPviklK3=D1y?4FZ^mLc7xmD0EtEOK(HYE6W-Ws35%DdiR^Uu`oN<zLQ++z`A_a2R
z#*pB4Al3Wn3ur)9)Sh=ESqqvFTOcx+24$H2%1!2EB#)u5l=@b1$40%7JdG%rZ+Mze
z7?EZsq=gyM%9OM*OWK(u9V{T7%#$t_=69pQ>W*5_9(qB0fnXm1*be{>0Dyx4;1B>f
z3;>P*fTIAEk3sENBI9wHT&hv|a%ArqQ^p2VO&*Mgdwh<b2}m=UI%eH{dz-4ikdKv8
z&l>yB&J`0!xV+x5W!73G$^G(m&>bD~*Q3G;o)zyHMv1_SVf7O<aQwvXmvy>a_iSkM
z#%QKv4PbX4Cuk#@i>+r<HV5)3>t!~hh^&^>Xa;P^*1YT=el=!yif`Aqn4pDWlj`!^
zx@QZ(3Uyac4<zKqNx#;lwl8L>t!WW8i&~);Bnm|3NuIT^6@SRp{8b%XA(=l(A(-$~
zKOlLCHq9tsA``M;yom=0^RZ#r9j7_Mu0DzU>XKC6-<gCaHtjdG!ksDNp<clTv!<rK
zj@il_Iau$!q#1Z&&>HDA;DNdM`n5ncvE<p-{!GzgY=Wt*z3<t6&%s;ZXHEenK~KpY
z=7QQA*7V~mHfqh)H{lgmw1Byl^NVF(zORNlsm@Vr^a|In*t4_pY<7#tAG=AL7w*Q|
zT`)BkyU}zzs!dJF>te&R``##<%h@AYxA@?D!In_y*$1{pUn&d~u4x_Q0w^2u;VF!+
zuw`LjO>b(|*nL&U_T<y<$?KQSA5P<MDsQLVjhEZEmkm-G`;h6uNvO-G&0j5cI6
zm(G~WC(|165<D(v8#Ww0vpoOY)dF3dW#h>yUS)Gg=KWYrOpT_!2FBc4xH=RS^IOmU
zs{`bDOc$AwlH?5@fDUm`OanUvL>vY{905Qa1%1LgH70;C10XN}gauT?aDZq5K(qoN
z+CX)z9UwXY5S;*s<)CV|0w7ibAXWiTy*lsGd=rbVGj(Zk(x{s*kv(IH6S|c2<}8pD
zeb6EM6M!55?8#uWg~EE!A=fwnxfTGjuGu27{-8r{Z~$^605fdLo8_|@Uy4$c=U(FV
zTw<o_cYKtj$Oq=Y)d<9(p@1fwB~`^N0btDlz_=6bF9e}K%TVT7!qD72jD;EE^P|ut
zC@CcclBRLw5&?g8R(4W~gkCvM%9275KP`2=U14^Sh{f;fAyB-l*P+DFotBOZtS2VV
zjr%4>rttWtfa~Lsgq(~4iK%qh|1u0aUXAtKi8dbu-EXddauLvpT*xgzP1t7RTY>AY
zbEVvD03^_Miw7h!yYQeR8e2888Mj!>lL|AAwM&f-L<X<7yAToSK@g7zX6~Z_R7YN&
z1*Az<S8JyB5K}M=3J~N)#SXVp>2?E*8s2;teveKibd)*NM|cz@1=!sVFGz&pAO&s*
zsJF~TE{LqqS4h*A01+GJI+dkf`0<y%(5-N{+9`9pAG1eIFQF(14~KEuqI)@1?BDKq
z9bjF54HA)WfNbJTcq0fg{ReVj%*_N%QdGzh?lOT#VfIB$XzgnIC`7l^=hCPs7X*<W
z&@!5#x1w`8pvL<o8i;}ILBN%Z2V*Cf-N9fz5|r3jW;oUh>r#M?q_<s#vK7_19w_|L
zaNRc2Ofj@K)`cBl7>5^jgbaF@-!f_}Xp6*Ag_*X{JtQE5R6AYTXz~W`s&l^dgb~yf
z!a}g)A%zoW)|G)03k$Iz%6u%_{dBI^i-z}{INhYeMe?YSi0431rDdU=_%I$kflS)Q
z1Cuz!6e=Aee3^w@Hc_U9T$|nO@)gI;aYiDDo&*W{iC12r>2YO~NUsqB`@D_`1#spu
zEM#RA3myvc&d+T3!a@eb+;|0q+sj@JL^cHEtV*WnBk6EBL>0B_fQmkWqAi!A6A<)u
zqazHVwDPTX+wW$=z`Kxuq(S0rcy{*wiz<imZf~M`R9sXGk#~SM*CRjH*Z-gQ|Jiel
zhv_FLg4MH>lO&|$4+TG5<cEak<3y_0ixW3Kw(|&_T=HjWqG5Jt<)K+5f^0!QWJfPU
z|HC~z)tQ37@&ht=)v!Ox`Hy)2$SGC{|8b(Z!2iGf34Z@&N~#t~zZU%P{8NR90KTue
z_RrqG_g+J0AQra}dEu!K1j^6Q%;CAwq-#TS@lE}v+Lb&p@=fvp)lYq!JUNo}%^T}j
zbZ#c^n8cyb*P?kI;s!UMY=bNnsB5;0RnX4Mp{b<XGoizArq`^rmS5RoE$jYRxN|0S
zCu#a}XlE=YveM=Js+Perp?^aZ%OFbwQD&1>gq5rMbDDmcKOoRW@79?2b~*=o;mE1E
zuCB`P;>ar8*XfGj$n$rxz(xIEk9ZAorUv5bGWJ8<!_BGtw-+~@$~leg`Pb_$iT=C>
zVunUaM}U0_MiaifCgvEr;O|cP8PgimigyQwvTC>SpWR#0uj%Sg7wA^4`uz-k`}-V!
zPD@sBa=zPHEjc%{(jV`B?m2hh+C`m<4W=Evz^#~ROT&xZKE$=H>=Pe9m$MNQResjo
z{D9ltu=t3VS8r8IhIlu*;@)v<(_*s(t5kQEi7IUyPkg(pN3_z$8R7;tec~N&uWzsj
zsy=OQ7IL>VEFOC3W^9GhA?{6%sQ1QT)1nG-cXj#VNeh+ZZ?LmRyfRps@Tqa{2KAby
z<%1P#S$1AcagkXrW34JPmgtQImZGlahnLRx9g<!Cqxj4Mw|e0xXv}`iVqIlxdV6Nc
zzfuIdkiI&xBEEWjhwRLs3(NiQG_fPIch3g(+NIj!+Y`L%hVf8hsu9=6nc{T|fW5I*
zF(B`aA4qI!(rS~iBqRHBn*OaoBnb;&nbHb;p4O7y;dFMUx263fjry@vg|kyz!6#BV
zH>j>|YulB&EqMnz6tz;XrpaK3L?bJBi~fCSzUq<gYH{gL(jgsKEjGO-6=OhlUZlFp
zEfqzGp_2(ni>5@V;}y<dX8*Xe>ICyqwQfKf<gw+9^uz`7*2LZKV^WMgf7mHfC6RIQ
z6A2UkCE_+GIERn6eiUDqedxrrdeoLh;{)T#FBc0>9y)qx(Xa9M;2O0!{q*<3#g9)9
zKRwLz^G<u?wsDWQe(F$X>+mpmap&%<;C35(cJIz7YM$cWW?R!v^VHMan|doR$ay-p
z{aovrditps30m=R0Zn}HfpdTR!mo6OMqR>uSgQ;h{2)9rV@mFJgJ&k-+TVxc{qfs1
zD*<}3$d5uX4n*c6f%z@d7@54%8=2oQjhfh$=xIrz6~dySK&m8gp)oKF!nWo?w*?Jc
z2;sh>B0?8dJze0c2ux6gLiD($At448s7m?z_NBDvlka)9l}|_GY*!wj`fQ}emJq-A
zYUkBbNU~oL*C3L}LI*&o^pC&vR+nMpwj~eJz%`^a^ntU6Nxs`CghPY2r75^=%!4{Z
z)wPIgKWjj@9MWmvW?qFy5KsbLp8(L~P(|4iiqce}IW3*kG8?_lk8IxTW6)zx1V^WZ
za(HU2X6PKX2&=X_^%25l(7Bzj!kK-q!k87c0@H^pEjCPUVT818&qI|`j5T7H!$7Pv
zgzHlV7=iB=IMN+O@uw|=j-{M}A~($ST*tP)peJf7>yTw8YTezHpI<6XDs)#Q#OCcQ
zgrTXIa^$tI0<X9V8dhP%R3UQVrW=nPS(wjvS)yySZO(&eu$eNH($r>Ljo6p=U1S)c
z7@=7XXjEM9RfwSMHi5}JRBaj7rq=SyPt7E>>ZNXyeGFMxDzvl>isI~sxw*10g(gH8
zX~ft6dvXX0Slobe#*zhGF}YG>f#_R?j`Y-{8RN<tRIQhJB~pZi8mko;2#r)gfX6|i
z3=pN^lUX}u>pRS-P&F*VsHsA!RZv(RGKlG07_jxPP1?3RpnHo2zK>SAn#4q5O;Kq%
zXOEHBP>G3^flMLG5F5C?uEHX?m8&6xz?UO>pUf+P6lPh;JXsJgz48DC_PNDgRYkDv
zZ0p!Jb&<u9@2ZB{+n*50$!<$+Qy#WVlvot>_DIIa#s*BiDS`p32%?~xA)+)wx{NrL
zG?wLr7oR+i(u$*48ZV{-uj-G(do71luO;HZ;{N&BnaO>(eVyB;$O7LsHH8bU!qaC>
zZu}b+jN$j}>npOm|M#(}O(x;Hzi;n|_!~<5cD-*703HHJ>;E*_(0c@AE@Ky_B3pzq
zbzYk1%XJ;VqrGD3G}P*x`ExZAB6)gG(FMrDnn2Gj=(g6K03M95k<xnKSC_R#8Upke
zp}8gqutziSn4#LFq*=r`t~q$zszu1Vc<mSso`wN61aJkfOf(`_Rug2{gND~+4Jw-K
z(JY!ffDTPQpi4XTQ+lK`7d=mkTlUroTs>dIus@hVu?4z*9^a}OR2D~^-~kM^f^|(@
zO%0jx18uGqufoy!evp%=76#qEllYD;vJxx{zD8Qvp@;#))WDnYhafTq)Y5e#aoOut
z^~yTWNVLT~%Mswpvuj|eZ(s%#C<Y|q^;$}esg+DPE+*iEgJ$8j1QKtJbm{r>8y<cT
z+scdWD=bKQS@;8sm!5a%V4$lnLEmL7B^4*9)Z0#0a~zUFVKkJi(e}XGq7X#>>;ck5
z*CJjKEydQcdbKU|JnaGyfqs@Og@#H?$AF$8BgRaaGQ%u$aKNitjrC!UHK}qxiQ-fL
z&E8`ZWqZUZYeYH1E#8wc=dsS|KK*CKSng@E2Pyh?G`o%Q{#tDF0b{JUr-g4xkE8f>
zk`wZMo~z;jEWV2`KFY6=k0<ySW9-^%uzxaH7>_5s5efaQRR(@H^}c)x5aEIZtx>or
y6Em+3q7QDxR}0_E#hhEP;ehx3^@>_}@a*m#8#7Dv@^2)<Wc*!lbwB!85zGK4&<IKZ
From da3b604d9dd525c2f0114d2ae3090b137d9bb267 Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Thu, 27 Jul 2017 15:54:34 +0200
Subject: [PATCH 3/9] Fix too long words in profile.
---
src/components/user_card_content/user_card_content.vue | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/components/user_card_content/user_card_content.vue b/src/components/user_card_content/user_card_content.vue
index ff1b108c..2d361600 100644
--- a/src/components/user_card_content/user_card_content.vue
+++ b/src/components/user_card_content/user_card_content.vue
@@ -121,6 +121,8 @@
.profile-panel-body {
top: -0em;
padding-top: 4em;
+
+ word-wrap: break-word;
}
.user-info {
From 86773579ed924e0a8a38eac4812f1bc10e353870 Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Fri, 28 Jul 2017 11:19:56 +0200
Subject: [PATCH 4/9] Throttle getReplies so it isn't called that often.
---
src/components/conversation/conversation.js | 32 +++++++++++----------
1 file changed, 17 insertions(+), 15 deletions(-)
diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index 059028f9..701bfd93 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -1,4 +1,4 @@
-import { find, filter, sortBy } from 'lodash'
+import { find, filter, sortBy, throttle } from 'lodash'
import { statusType } from '../../modules/statuses.js'
import Status from '../status/status.vue'
@@ -7,6 +7,21 @@ const sortAndFilterConversation = (conversation) => {
return sortBy(conversation, 'id')
}
+const getReplies = function (id) {
+ let res = []
+ id = Number(id)
+ let i
+ for (i = 0; i < this.conversation.length; i++) {
+ if (Number(this.conversation[i].in_reply_to_status_id) === id) {
+ res.push({
+ name: `#${i}`,
+ id: this.conversation[i].id
+ })
+ }
+ }
+ return res
+}
+
const conversation = {
data () {
return {
@@ -58,20 +73,7 @@ const conversation = {
.then(() => this.fetchConversation())
}
},
- getReplies (id) {
- let res = []
- id = Number(id)
- let i
- for (i = 0; i < this.conversation.length; i++) {
- if (Number(this.conversation[i].in_reply_to_status_id) === id) {
- res.push({
- name: `#${i}`,
- id: this.conversation[i].id
- })
- }
- }
- return res
- },
+ getReplies: throttle(getReplies, 1000),
focused (id) {
if (this.statusoid.retweeted_status) {
return (id === this.statusoid.retweeted_status.id)
From 9e61ab577b98643e6c0c88785f365c554b3ab8b1 Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Fri, 28 Jul 2017 15:52:05 +0200
Subject: [PATCH 5/9] Revert "Throttle getReplies so it isn't called that
often."
This reverts commit 86773579ed924e0a8a38eac4812f1bc10e353870.
---
src/components/conversation/conversation.js | 32 ++++++++++-----------
1 file changed, 15 insertions(+), 17 deletions(-)
diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index 701bfd93..059028f9 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -1,4 +1,4 @@
-import { find, filter, sortBy, throttle } from 'lodash'
+import { find, filter, sortBy } from 'lodash'
import { statusType } from '../../modules/statuses.js'
import Status from '../status/status.vue'
@@ -7,21 +7,6 @@ const sortAndFilterConversation = (conversation) => {
return sortBy(conversation, 'id')
}
-const getReplies = function (id) {
- let res = []
- id = Number(id)
- let i
- for (i = 0; i < this.conversation.length; i++) {
- if (Number(this.conversation[i].in_reply_to_status_id) === id) {
- res.push({
- name: `#${i}`,
- id: this.conversation[i].id
- })
- }
- }
- return res
-}
-
const conversation = {
data () {
return {
@@ -73,7 +58,20 @@ const conversation = {
.then(() => this.fetchConversation())
}
},
- getReplies: throttle(getReplies, 1000),
+ getReplies (id) {
+ let res = []
+ id = Number(id)
+ let i
+ for (i = 0; i < this.conversation.length; i++) {
+ if (Number(this.conversation[i].in_reply_to_status_id) === id) {
+ res.push({
+ name: `#${i}`,
+ id: this.conversation[i].id
+ })
+ }
+ }
+ return res
+ },
focused (id) {
if (this.statusoid.retweeted_status) {
return (id === this.statusoid.retweeted_status.id)
From 32e20b2e025e20f38b4acdea55a13a647463a9f1 Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Sat, 29 Jul 2017 18:53:49 +0200
Subject: [PATCH 6/9] Only run through replies once.
---
src/components/conversation/conversation.js | 27 ++++++++++++---------
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index 059028f9..4ee6c32e 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -1,4 +1,4 @@
-import { find, filter, sortBy } from 'lodash'
+import { reduce, find, filter, sortBy } from 'lodash'
import { statusType } from '../../modules/statuses.js'
import Status from '../status/status.vue'
@@ -33,6 +33,19 @@ const conversation = {
const statuses = this.$store.state.statuses.allStatuses
const conversation = filter(statuses, { statusnet_conversation_id: conversationId })
return sortAndFilterConversation(conversation)
+ },
+ replies () {
+ return reduce(this.conversation, (result, {id, in_reply_to_status_id}) => {
+ const irid = Number(in_reply_to_status_id)
+ if (irid) {
+ result[irid] = result[irid] || []
+ result[irid].push({
+ name: `#${id}`,
+ id: id
+ })
+ }
+ return result
+ }, {})
}
},
components: {
@@ -59,18 +72,8 @@ const conversation = {
}
},
getReplies (id) {
- let res = []
id = Number(id)
- let i
- for (i = 0; i < this.conversation.length; i++) {
- if (Number(this.conversation[i].in_reply_to_status_id) === id) {
- res.push({
- name: `#${i}`,
- id: this.conversation[i].id
- })
- }
- }
- return res
+ return this.replies[id] || []
},
focused (id) {
if (this.statusoid.retweeted_status) {
From 9c5f001fd2bfd8a2d06e36f6dd1b7ac0c41e5cd2 Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Sat, 29 Jul 2017 19:10:09 +0200
Subject: [PATCH 7/9] Add back relative numbering.
---
src/components/conversation/conversation.js | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index 4ee6c32e..89fcfddb 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -35,15 +35,17 @@ const conversation = {
return sortAndFilterConversation(conversation)
},
replies () {
+ let i = 1
return reduce(this.conversation, (result, {id, in_reply_to_status_id}) => {
const irid = Number(in_reply_to_status_id)
if (irid) {
result[irid] = result[irid] || []
result[irid].push({
- name: `#${id}`,
+ name: `#${i}`,
id: id
})
}
+ i++
return result
}, {})
}
From b1d9cbaebdbdd27e521989d9eaef0f6a49426280 Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Mon, 31 Jul 2017 16:35:07 +0200
Subject: [PATCH 8/9] Add fetch polyfill.
---
package.json | 3 ++-
src/services/api/api.service.js | 1 +
yarn.lock | 4 ++++
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/package.json b/package.json
index d04c3e22..63fd490d 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,8 @@
"vue-router": "^2.5.3",
"vue-template-compiler": "^2.3.4",
"vue-timeago": "^3.1.2",
- "vuex": "^2.3.1"
+ "vuex": "^2.3.1",
+ "whatwg-fetch": "^2.0.3"
},
"devDependencies": {
"autoprefixer": "^6.4.0",
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index e848d076..9b51f19d 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -24,6 +24,7 @@ const QVITTER_USER_TIMELINE_URL = '/api/qvitter/statuses/user_timeline.json'
// const USER_URL = '/api/users/show.json'
import { each, map } from 'lodash'
+import 'whatwg-fetch'
const oldfetch = window.fetch
diff --git a/yarn.lock b/yarn.lock
index b0c3e63e..965f6f31 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5816,6 +5816,10 @@ webpack@^1.13.2:
watchpack "^0.2.1"
webpack-core "~0.6.9"
+whatwg-fetch@^2.0.3:
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz#9c84ec2dcf68187ff00bc64e1274b442176e1c84"
+
whet.extend@~0.9.9:
version "0.9.9"
resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1"
From 701112f043720c294241852f9aa0a0f1956cd71c Mon Sep 17 00:00:00 2001
From: eal <eal@waifu.club>
Date: Thu, 10 Aug 2017 19:17:40 +0300
Subject: [PATCH 9/9] Add follow notifications.
---
src/components/notifications/notifications.scss | 4 ++++
src/components/notifications/notifications.vue | 9 +++++++++
src/modules/statuses.js | 7 +++++++
3 files changed, 20 insertions(+)
diff --git a/src/components/notifications/notifications.scss b/src/components/notifications/notifications.scss
index f02ced8d..84dd36fa 100644
--- a/src/components/notifications/notifications.scss
+++ b/src/components/notifications/notifications.scss
@@ -49,6 +49,10 @@
color: $green;
}
+ .icon-user-plus.lit {
+ color: $blue;
+ }
+
.icon-reply.lit {
color: $blue;
}
diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue
index 6c0419a5..c9113bc4 100644
--- a/src/components/notifications/notifications.vue
+++ b/src/components/notifications/notifications.vue
@@ -36,6 +36,15 @@
</h1>
<status :compact="true" :statusoid="notification.status"></status>
</div>
+ <div v-if="notification.type === 'follow'">
+ <h1>
+ <span :title="'@'+notification.action.user.screen_name">{{ notification.action.user.name }}</span>
+ <i class="fa icon-user-plus lit"></i>
+ </h1>
+ <div>
+ <router-link :to="{ name: 'user-profile', params: { id: notification.action.user.id } }">@{{ notification.action.user.screen_name }}</router-link> followed you
+ </div>
+ </div>
</div>
</div>
</div>
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 084800fa..de5d7d23 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -105,6 +105,10 @@ export const statusType = (status) => {
return 'deletion'
}
+ if (status.text.match(/started following/)) {
+ return 'follow'
+ }
+
return 'unknown'
}
@@ -253,6 +257,9 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
favoriteStatus(favorite)
}
},
+ 'follow': (status) => {
+ addNotification({ type: 'follow', status: status, action: status })
+ },
'deletion': (deletion) => {
const uri = deletion.uri
updateMaxId(deletion)