mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-11-24 01:53:08 +02:00
wip
This commit is contained in:
parent
8ca58de2ba
commit
0d8c83f27c
6 changed files with 25 additions and 35 deletions
|
@ -6,7 +6,7 @@ export default (os: OS) => opts => {
|
||||||
const o = opts || {};
|
const o = opts || {};
|
||||||
if (o.renote) {
|
if (o.renote) {
|
||||||
const vm = os.new(RenoteFormWindow, {
|
const vm = os.new(RenoteFormWindow, {
|
||||||
renote: o.renote
|
note: o.renote
|
||||||
});
|
});
|
||||||
document.body.appendChild(vm.$el);
|
document.body.appendChild(vm.$el);
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<mk-window ref="window" is-modal width="450px" height="500px" @closed="$destroy">
|
<mk-window ref="window" is-modal width="450px" height="500px" @closed="$destroy">
|
||||||
<span slot="header">%fa:envelope R% %i18n:@title%</span>
|
<span slot="header">%fa:envelope R% %i18n:@title%</span>
|
||||||
|
|
||||||
<div data-id="c1136cec-1278-49b1-9ea7-412c1ef794f4" :data-darkmode="$store.state.device.darkmode">
|
<div class="slpqaxdoxhvglersgjukmvizkqbmbokc" :data-darkmode="$store.state.device.darkmode">
|
||||||
<div v-for="req in requests">
|
<div v-for="req in requests">
|
||||||
<router-link :key="req.id" :to="req.follower | userPage">{{ req.follower | userName }}</router-link>
|
<router-link :key="req.id" :to="req.follower | userPage">{{ req.follower | userName }}</router-link>
|
||||||
<span>
|
<span>
|
||||||
|
@ -63,10 +63,10 @@ root(isDark)
|
||||||
> span
|
> span
|
||||||
margin 0 0 0 auto
|
margin 0 0 0 auto
|
||||||
|
|
||||||
[data-id="c1136cec-1278-49b1-9ea7-412c1ef794f4"][data-darkmode]
|
.slpqaxdoxhvglersgjukmvizkqbmbokc[data-darkmode]
|
||||||
root(true)
|
root(true)
|
||||||
|
|
||||||
[data-id="c1136cec-1278-49b1-9ea7-412c1ef794f4"]:not([data-darkmode])
|
.slpqaxdoxhvglersgjukmvizkqbmbokc:not([data-darkmode])
|
||||||
root(false)
|
root(false)
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<mk-window ref="window" is-modal width="450px" height="500px" @closed="$destroy">
|
<mk-window ref="window" is-modal width="450px" height="500px" @closed="$destroy">
|
||||||
<span slot="header">%fa:list% %i18n:@title%</span>
|
<span slot="header">%fa:list% %i18n:@title%</span>
|
||||||
|
|
||||||
<div data-id="6e4caea3-d8f9-4ab7-96de-ab67fe8d5c82" :data-darkmode="$store.state.device.darkmode">
|
<div class="xkxvokkjlptzyewouewmceqcxhpgzprp" :data-darkmode="$store.state.device.darkmode">
|
||||||
<button class="ui" @click="add">%i18n:@create-list%</button>
|
<button class="ui" @click="add">%i18n:@create-list%</button>
|
||||||
<a v-for="list in lists" :key="list.id" @click="choice(list)">{{ list.title }}</a>
|
<a v-for="list in lists" :key="list.id" @click="choice(list)">{{ list.title }}</a>
|
||||||
</div>
|
</div>
|
||||||
|
@ -60,10 +60,10 @@ root(isDark)
|
||||||
border solid 1px isDark ? #1c2023 : #eee
|
border solid 1px isDark ? #1c2023 : #eee
|
||||||
border-radius 4px
|
border-radius 4px
|
||||||
|
|
||||||
[data-id="6e4caea3-d8f9-4ab7-96de-ab67fe8d5c82"][data-darkmode]
|
.xkxvokkjlptzyewouewmceqcxhpgzprp[data-darkmode]
|
||||||
root(true)
|
root(true)
|
||||||
|
|
||||||
[data-id="6e4caea3-d8f9-4ab7-96de-ab67fe8d5c82"]:not([data-darkmode])
|
.xkxvokkjlptzyewouewmceqcxhpgzprp:not([data-darkmode])
|
||||||
root(false)
|
root(false)
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|
|
@ -61,7 +61,6 @@ root(isDark)
|
||||||
min-width 330px
|
min-width 330px
|
||||||
max-width 330px
|
max-width 330px
|
||||||
height 100%
|
height 100%
|
||||||
margin-right 16px
|
|
||||||
background isDark ? #282C37 : #fff
|
background isDark ? #282C37 : #fff
|
||||||
border-radius 6px
|
border-radius 6px
|
||||||
box-shadow 0 2px 16px rgba(#000, 0.1)
|
box-shadow 0 2px 16px rgba(#000, 0.1)
|
||||||
|
|
|
@ -111,14 +111,6 @@ export default Vue.extend({
|
||||||
return this.isRenote ? this.note.renote : this.note;
|
return this.isRenote ? this.note.renote : this.note;
|
||||||
},
|
},
|
||||||
|
|
||||||
reactionsCount(): number {
|
|
||||||
return this.p.reactionCounts
|
|
||||||
? Object.keys(this.p.reactionCounts)
|
|
||||||
.map(key => this.p.reactionCounts[key])
|
|
||||||
.reduce((a, b) => a + b)
|
|
||||||
: 0;
|
|
||||||
},
|
|
||||||
|
|
||||||
urls(): string[] {
|
urls(): string[] {
|
||||||
if (this.p.text) {
|
if (this.p.text) {
|
||||||
const ast = parse(this.p.text);
|
const ast = parse(this.p.text);
|
||||||
|
@ -144,24 +136,6 @@ export default Vue.extend({
|
||||||
if (this.$store.getters.isSignedIn) {
|
if (this.$store.getters.isSignedIn) {
|
||||||
this.connection.on('_connected_', this.onStreamConnected);
|
this.connection.on('_connected_', this.onStreamConnected);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Draw map
|
|
||||||
if (this.p.geo) {
|
|
||||||
const shouldShowMap = this.$store.getters.isSignedIn ? this.$store.state.settings.showMaps : true;
|
|
||||||
if (shouldShowMap) {
|
|
||||||
(this as any).os.getGoogleMaps().then(maps => {
|
|
||||||
const uluru = new maps.LatLng(this.p.geo.coordinates[1], this.p.geo.coordinates[0]);
|
|
||||||
const map = new maps.Map(this.$refs.map, {
|
|
||||||
center: uluru,
|
|
||||||
zoom: 15
|
|
||||||
});
|
|
||||||
new maps.Marker({
|
|
||||||
position: uluru,
|
|
||||||
map: map
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
|
|
||||||
beforeDestroy() {
|
beforeDestroy() {
|
||||||
|
|
|
@ -1,12 +1,13 @@
|
||||||
<template>
|
<template>
|
||||||
<mk-ui :class="$style.root">
|
<mk-ui :class="$style.root">
|
||||||
<div class="qlvquzbjribqcaozciifydkngcwtyzje">
|
<div class="qlvquzbjribqcaozciifydkngcwtyzje" :data-darkmode="$store.state.device.darkmode">
|
||||||
<template v-for="column in columns">
|
<template v-for="column in columns">
|
||||||
<x-notifications-column v-if="column.type == 'notifications'" :key="column.id"/>
|
<x-notifications-column v-if="column.type == 'notifications'" :key="column.id"/>
|
||||||
<x-tl-column v-if="column.type == 'home'" :key="column.id" src="home"/>
|
<x-tl-column v-if="column.type == 'home'" :key="column.id" src="home"/>
|
||||||
<x-tl-column v-if="column.type == 'local'" :key="column.id" src="local"/>
|
<x-tl-column v-if="column.type == 'local'" :key="column.id" src="local"/>
|
||||||
<x-tl-column v-if="column.type == 'global'" :key="column.id" src="global"/>
|
<x-tl-column v-if="column.type == 'global'" :key="column.id" src="global"/>
|
||||||
</template>
|
</template>
|
||||||
|
<button>%fa:plus%</button>
|
||||||
</div>
|
</div>
|
||||||
</mk-ui>
|
</mk-ui>
|
||||||
</template>
|
</template>
|
||||||
|
@ -72,6 +73,22 @@ root(isDark)
|
||||||
padding 16px 0 16px 16px
|
padding 16px 0 16px 16px
|
||||||
overflow auto
|
overflow auto
|
||||||
|
|
||||||
|
> div
|
||||||
|
margin-right 16px
|
||||||
|
|
||||||
|
&:last-of-type
|
||||||
|
margin-right 0
|
||||||
|
|
||||||
|
> button
|
||||||
|
padding 0 16px
|
||||||
|
color isDark ? #93a0a5 : #888
|
||||||
|
|
||||||
|
&:hover
|
||||||
|
color isDark ? #b8c5ca : #777
|
||||||
|
|
||||||
|
&:active
|
||||||
|
color isDark ? #fff : #555
|
||||||
|
|
||||||
.qlvquzbjribqcaozciifydkngcwtyzje[data-darkmode]
|
.qlvquzbjribqcaozciifydkngcwtyzje[data-darkmode]
|
||||||
root(true)
|
root(true)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue