git ssb

2+

mixmix / ticktack



Commit 26d61ca780b49f14cec3dc071c03f71b4b3da905

Merge branch 'master' of github.com:ticktackim/ticktack-workplan into dark-beta

mix irving committed on 5/15/2018, 11:50:46 PM
Parent: ae6f77f69dca59cc49c1bff30752c7b54b8f8e3c
Parent: 9f5c802ae0f19a653aa744af250402e6fb042fda

Files changed

README.mdchanged
app/html/header.jschanged
app/html/header.mcsschanged
app/html/sideNav/sideNav.mcsschanged
app/obs/pluginsOk.jschanged
README.mdView
@@ -1,7 +1,7 @@
11 # Ticktack
22
3-A decentralized social platform enable people to share knowledge and exchange value, with p2p messaging encrypted feature.
3 +A decentralized social platform enables people to share knowledge and exchange value, with an end to end encrypted messaging feature.
44
55 You can find [installers for Linux, Mac, and Windows on the Releases page](https://github.com/ticktackim/ticktack-workplan/releases).
66
77 #### Please read the [Code of Conduct](https://github.com/ticktackim/ticktack-network/wiki/Code-of-Conduct) and [Reminder](https://github.com/ticktackim/ticktack-network/wiki/REMINDER) before your installation.
app/html/header.jsView
@@ -3,8 +3,11 @@
33 const path = require('path')
44 const { remote } = require('electron')
55
66 exports.gives = nest('app.html.header')
7 +exports.needs = nest({
8 + 'app.obs.pluginsOk': 'first'
9 +})
710
811 const SETTINGS_PAGES = [
912 'settings',
1013 'userEdit'
@@ -46,11 +49,19 @@
4649 src: when(isSettings, assetPath('settings_on.png'), assetPath('settings.png')),
4750 'ev-click': () => push({page: 'settings'})
4851 })
4952 ]),
50- h('i.notifications.fa', {
51- className: when(isNotifications, 'fa-bell', 'fa-bell-o'),
52- 'ev-click': () => push({page: 'statsShow'})
53 + computed(api.app.obs.pluginsOk(), ok => {
54 + return h('i.notifications.fa', {
55 + classList: [
56 + when(isNotifications, 'fa-bell', 'fa-bell-o'),
57 + when(!ok, '-disabled')
58 + ],
59 + 'ev-click': () => {
60 + if (!ok) return
61 + push({page: 'statsShow'})
62 + }
63 + })
5364 })
5465 ])
5566 ])
5667 })
app/html/header.mcssView
@@ -37,10 +37,16 @@
3737 display: flex
3838 margin: 0 2rem
3939 }
4040
41 + i { font-size: 1.4rem }
4142 i.notifications { color: #7da9ea }
4243 i.fa-bell.notifications { color: #fff }
44 + i.fa-bell-o { color: #7da9ea }
45 + i.-disabled {
46 + filter: opacity(.4)
47 + cursor: not-allowed
48 + }
4349
4450 (a) {
4551 color: #222
4652 margin-right: 1rem
app/html/sideNav/sideNav.mcssView
@@ -53,8 +53,9 @@
5353 filter: saturate(0)
5454 opacity: .5
5555 :hover {
5656 cursor: not-allowed
57 + background: initial
5758 }
5859 }
5960
6061 div.spacer {
app/obs/pluginsOk.jsView
@@ -1,29 +1,32 @@
11 const nest = require('depnest')
2-const { h, onceTrue, Value } = require('mutant')
2 +const { onceTrue, Value } = require('mutant')
33
44 exports.gives = nest('app.obs.pluginsOk')
55
66 exports.needs = nest({
77 'sbot.obs.connection': 'first'
88 })
99
1010 exports.create = (api) => {
11 + // TODO - differentiate and enable / disable based on channel || ticktack plugin missing
1112 var ok = Value()
1213
1314 return nest('app.obs.pluginsOk', function pluginsOk () {
14- if (ok() == undefined) checkForTrouble()
15 + if (ok() === null) checkForTrouble()
1516
1617 return ok
1718 })
1819
1920 function checkForTrouble () {
2021 onceTrue(
2122 api.sbot.obs.connection,
2223 sbot => {
23- if (!sbot.channel) ok.set(false) // TODO could build a list of missing plugins + effects
24 + if (!sbot.channel) console.log('> channel plugin missing!')
25 + if (!sbot.tickack) console.log('> ticktack plugin missing!')
26 +
27 + if (!sbot.channel || !sbot.ticktack) ok.set(false) // TODO could build a list of missing plugins + effects
2428 else ok.set(true)
2529 }
2630 )
2731 }
2832 }
29-

Built with git-ssb-web