Compare commits
No commits in common. "7a498393f8a70afe9ebca3fa366c0c8b841fce4b" and "8aa4f6882accef549e198b54be1cf579a522884c" have entirely different histories.
7a498393f8
...
8aa4f6882a
6246
package-lock.json
generated
6246
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
27
package.json
27
package.json
|
|
@ -8,29 +8,28 @@
|
|||
"lint": "vue-cli-service lint"
|
||||
},
|
||||
"dependencies": {
|
||||
"@primer/css": "^14.4.0",
|
||||
"@primer/css": "^14.1.0",
|
||||
"bulma": "^0.7.5",
|
||||
"event-source-polyfill": "0.0.16",
|
||||
"isomorphic-fetch": "^2.2.1",
|
||||
"lodash": "^4.17.20",
|
||||
"micropub-helper": "^1.6.1",
|
||||
"moment": "^2.27.0",
|
||||
"lodash": "latest",
|
||||
"micropub-helper": "^1.4.0",
|
||||
"moment": "^2.22.2",
|
||||
"node-sass": "^4.14.1",
|
||||
"rel-parser": "github:grantcodes/rel-scraper",
|
||||
"rel-scraper": "github:grantcodes/rel-scraper",
|
||||
"sass-loader": "^7.3.1",
|
||||
"sass-loader": "^7.2.0",
|
||||
"tailwindcss": "1.1.4",
|
||||
"vue": "^2.6.11",
|
||||
"vue-router": "^3.4.3",
|
||||
"vuex": "^3.5.1"
|
||||
"vue": "^2.5.17",
|
||||
"vue-router": "^3.0.1",
|
||||
"vuex": "^3.0.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@vue/cli-plugin-babel": "^3.12.1",
|
||||
"@vue/cli-plugin-eslint": "^3.12.1",
|
||||
"@vue/cli-service": "^3.12.1",
|
||||
"@vue/cli-plugin-babel": "^3.10.0",
|
||||
"@vue/cli-plugin-eslint": "^3.0.0-rc.10",
|
||||
"@vue/cli-service": "^3.10.0",
|
||||
"postcss-node-sass": "^2.1.8",
|
||||
"postcss-scss": "^2.1.1",
|
||||
"vue-template-compiler": "^2.6.11"
|
||||
"postcss-scss": "^2.0.0",
|
||||
"vue-template-compiler": "^2.5.17"
|
||||
},
|
||||
"eslintConfig": {
|
||||
"root": true,
|
||||
|
|
|
|||
|
|
@ -1,43 +0,0 @@
|
|||
<template>
|
||||
<div>
|
||||
<div v-for="(target, i) in targets" :key="i" style="display: inline-block; margin: 0 3px 3px 0">
|
||||
<label>
|
||||
<input type="checkbox" class="is-hidden cb-target" v-model="selected" :value="target.uid"/>
|
||||
<span class="tag is-light" v-text="target.name"></span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
export default {
|
||||
name: 'destination-buttons',
|
||||
data() {
|
||||
return {
|
||||
selected: [],
|
||||
}
|
||||
},
|
||||
props: {
|
||||
value: [],
|
||||
targets: {}
|
||||
},
|
||||
mounted() {
|
||||
this.selected = this.value
|
||||
},
|
||||
watch: {
|
||||
selected(newSelection) {
|
||||
this.$emit('input', newSelection)
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<style scoped>
|
||||
|
||||
.tag {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.cb-target:checked + .tag {
|
||||
background-color: #23d160;
|
||||
color: #fff;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -79,13 +79,7 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="field">
|
||||
Categories: <entry-categories v-model="categories"/>
|
||||
</div>
|
||||
<div class="field">
|
||||
Syndication: <syndication-buttons v-model="selected" :targets="targets"/>
|
||||
</div>
|
||||
<div class="field">
|
||||
Destination: <destination-buttons v-model="selectedDestinations" :targets="destinations"/>
|
||||
<syndication-buttons v-model="selected" :targets="targets"/>
|
||||
</div>
|
||||
<div class="field">
|
||||
<div class="control">
|
||||
|
|
@ -101,17 +95,11 @@
|
|||
|
||||
<script>
|
||||
import moment from 'moment'
|
||||
import DestinationButtons from "@/components/DestinationButtons";
|
||||
import EntryCategories from "@/components/EntryCategories";
|
||||
import SyndicationButtons from "@/components/SyndicationButtons";
|
||||
|
||||
export default {
|
||||
name: "Entry",
|
||||
components: {
|
||||
DestinationButtons,
|
||||
EntryCategories,
|
||||
SyndicationButtons
|
||||
},
|
||||
components: {SyndicationButtons},
|
||||
props: ['item'],
|
||||
|
||||
data() {
|
||||
|
|
@ -123,10 +111,7 @@ export default {
|
|||
bookmarkTitle: '',
|
||||
bookmarkDescription: '',
|
||||
targets: [],
|
||||
selected: [],
|
||||
destinations: [],
|
||||
selectedDestinations: [],
|
||||
categories: []
|
||||
selected: []
|
||||
}
|
||||
},
|
||||
|
||||
|
|
@ -175,8 +160,6 @@ export default {
|
|||
this.selected = []
|
||||
this.$store.dispatch('fetchSyndicationTargets')
|
||||
.then(res => this.targets = res['syndicate-to'])
|
||||
this.$store.dispatch('fetchDestinations')
|
||||
.then(res => this.destinations = res['destination'])
|
||||
},
|
||||
bookmark() {
|
||||
this.$store.dispatch('micropubPost', {
|
||||
|
|
@ -185,17 +168,13 @@ export default {
|
|||
'bookmark-of': [this.currentItem.url],
|
||||
'name': [this.bookmarkTitle],
|
||||
'content': [this.bookmarkDescription ],
|
||||
'category': this.categories,
|
||||
'mp-syndicate-to': this.selected,
|
||||
'mp-destination': this.selectedDestinations
|
||||
'mp-syndicate-to': this.selected
|
||||
},
|
||||
}).then(() => {
|
||||
this.bookmarkTitle = '';
|
||||
this.bookmarkDescription = '';
|
||||
this.selected = []
|
||||
this.selectedDestinations = []
|
||||
this.bookmarking = false
|
||||
this.categories = []
|
||||
})
|
||||
},
|
||||
hasRef(key) {
|
||||
|
|
|
|||
|
|
@ -1,38 +0,0 @@
|
|||
<template>
|
||||
<div>
|
||||
<input type="text" class="input" v-model="categories">
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
name: "EntryCategories",
|
||||
props: {
|
||||
'value': {
|
||||
type: Array,
|
||||
default: []
|
||||
}
|
||||
},
|
||||
|
||||
data() {
|
||||
return {
|
||||
categories: ''
|
||||
}
|
||||
},
|
||||
|
||||
mounted() {
|
||||
this.categories = this.value.join(" ")
|
||||
},
|
||||
|
||||
watch: {
|
||||
categories() {
|
||||
let words = this.categories.split(/\s+/).filter(value => value.length !== 0)
|
||||
this.$emit('input', words)
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
</style>
|
||||
|
|
@ -12,16 +12,8 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="field">
|
||||
Categories: <entry-categories v-model="categories" />
|
||||
</div>
|
||||
<div class="field">
|
||||
Syndication:
|
||||
<syndication-buttons v-model="selectedTargets" :targets="targets"/>
|
||||
</div>
|
||||
<div class="field">
|
||||
Destinations:
|
||||
<destination-buttons v-model="selectedDestinations" :targets="destinations"/>
|
||||
</div>
|
||||
<div class="level">
|
||||
<div class="level-left">
|
||||
<div class="level-item">
|
||||
|
|
@ -44,32 +36,22 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import DestinationButtons from "@/components/DestinationButtons";
|
||||
import EntryCategories from "@/components/EntryCategories";
|
||||
import SyndicationButtons from "@/components/SyndicationButtons";
|
||||
|
||||
export default {
|
||||
name: "NewPost",
|
||||
components:{
|
||||
DestinationButtons,
|
||||
EntryCategories,
|
||||
SyndicationButtons,
|
||||
SyndicationButtons
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
newPost: '',
|
||||
targets: [],
|
||||
selectedTargets: [],
|
||||
destinations: [],
|
||||
selectedDestinations: [],
|
||||
categories: []
|
||||
selectedTargets: []
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.$store.dispatch('fetchSyndicationTargets')
|
||||
.then(res => this.targets = res['syndicate-to'])
|
||||
this.$store.dispatch('fetchDestinations')
|
||||
.then(res => this.destinations = res['destination'])
|
||||
},
|
||||
methods: {
|
||||
post() {
|
||||
|
|
@ -77,15 +59,10 @@
|
|||
'type': ['h-entry'],
|
||||
'properties': {
|
||||
'content': [this.newPost],
|
||||
'category': this.categories,
|
||||
'mp-syndicate-to': this.selectedTargets,
|
||||
'mp-destination': this.selectedDestinations,
|
||||
},
|
||||
}).then(() => {
|
||||
this.newPost = ''
|
||||
this.categories = []
|
||||
this.selectedTargets = []
|
||||
this.selectedDestinations = []
|
||||
this.newPost = '';
|
||||
this.$emit('close')
|
||||
})
|
||||
},
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ export default {
|
|||
},
|
||||
watch: {
|
||||
selected(newSelection) {
|
||||
this.$emit('input', newSelection)
|
||||
this.$emit('update', newSelection)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
47
src/store.js
47
src/store.js
|
|
@ -18,7 +18,7 @@ export default new Vuex.Store({
|
|||
microsubEndpoint: '/microsub',
|
||||
channelCreatorIsOpen: false,
|
||||
eventSource: null,
|
||||
globalTimeline: {items: [{name: 'Testing the global timeline'}]}
|
||||
globalTimeline: {items: [{name:'Testing the global timeline'}]}
|
||||
};
|
||||
let loginData = JSON.parse(window.localStorage.getItem('login_data'))
|
||||
if (loginData) {
|
||||
|
|
@ -108,39 +108,12 @@ export default new Vuex.Store({
|
|||
state.eventSource.addEventListener('new item in channel', evt => {
|
||||
// eslint-disable-next-line
|
||||
console.log(evt)
|
||||
let msg = JSON.parse(evt.data)
|
||||
let channel = _.find(state.channels, item => item.uid === msg.uid)
|
||||
let d = JSON.parse(evt.data)
|
||||
let channel = _.find(state.channels, item => item.uid === d.uid)
|
||||
if (channel) {
|
||||
channel.unread = msg.unread
|
||||
channel.unread = d.unread
|
||||
}
|
||||
})
|
||||
|
||||
state.eventSource.addEventListener('new channel', evt => {
|
||||
// eslint-disable-next-line
|
||||
console.log(evt)
|
||||
let msg = JSON.parse(evt.data)
|
||||
let channel = _.find(state.channels, it => it.uid === msg.channel.uid)
|
||||
if (!channel) {
|
||||
state.channels.push(msg.channel)
|
||||
}
|
||||
})
|
||||
|
||||
state.eventSource.addEventListener('update channel', evt => {
|
||||
// eslint-disable-next-line
|
||||
console.log(evt)
|
||||
let msg = JSON.parse(evt.data)
|
||||
let channel = _.find(state.channels, it => it.uid === msg.channel.uid)
|
||||
if (channel) {
|
||||
channel.name = msg.channel.name
|
||||
}
|
||||
})
|
||||
|
||||
state.eventSource.addEventListener('delete channel', evt => {
|
||||
// eslint-disable-next-line
|
||||
console.log(evt)
|
||||
let msg = JSON.parse(evt.data)
|
||||
state.channels = _.remove(state.channels, it => it.uid === msg.uid)
|
||||
})
|
||||
}
|
||||
},
|
||||
|
||||
|
|
@ -193,7 +166,7 @@ export default new Vuex.Store({
|
|||
markRead(x, {channel, entry}) {
|
||||
let entries = '';
|
||||
if (Array.isArray(entry)) {
|
||||
entries = _(entry).map(uid => '&entry[]=' + encodeURIComponent(uid)).join("")
|
||||
entries = _(entry).map(uid => '&entry[]='+encodeURIComponent(uid)).join("")
|
||||
} else {
|
||||
entries = '&entry=' + encodeURIComponent(entry)
|
||||
}
|
||||
|
|
@ -205,18 +178,12 @@ export default new Vuex.Store({
|
|||
}
|
||||
})
|
||||
},
|
||||
configQuery: function (key) {
|
||||
fetchSyndicationTargets() {
|
||||
let micropub = new Micropub({
|
||||
token: this.state.access_token,
|
||||
micropubEndpoint: this.state.micropubEndpoint
|
||||
})
|
||||
return micropub.query(key)
|
||||
},
|
||||
fetchSyndicationTargets() {
|
||||
return this.configQuery('syndicate-to')
|
||||
},
|
||||
fetchDestinations() {
|
||||
return this.configQuery('destination');
|
||||
return micropub.query('syndicate-to')
|
||||
},
|
||||
micropubPost(_, mf2post) {
|
||||
let micropub = new Micropub({
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user