Commit d07e0d2417f507c7cffdae3ae46476122eaba98b
style fixups for gatherings
mix irving committed on 6/23/2018, 12:06:06 AMParent: b225d0b1ab0b783efe601a6f555fca63197f5c7e
Files changed
| app/page/public.js | changed |
| message/html/layout/default.js | changed |
| message/html/layout/default.mcss | changed |
| package-lock.json | changed |
| package.json | changed |
| app/page/public.js | |||
|---|---|---|---|
| @@ -1,11 +1,11 @@ | |||
| 1 | 1 … | const nest = require('depnest') | |
| 2 | 2 … | const { h } = require('mutant') | |
| 3 | 3 … | const pull = require('pull-stream') | |
| 4 | 4 … | const Scroller = require('pull-scroll') | |
| 5 … | +const next = require('pull-next-query') | ||
| 6 … | +const merge = require('lodash/merge') | ||
| 5 | 7 … | ||
| 6 | -const next = require('../../junk/next-stepper') | ||
| 7 | - | ||
| 8 | 8 … | exports.gives = nest({ | |
| 9 | 9 … | 'app.html.menuItem': true, | |
| 10 | 10 … | 'app.page.public': true | |
| 11 | 11 … | }) | |
| @@ -13,9 +13,10 @@ | |||
| 13 | 13 … | exports.needs = nest({ | |
| 14 | 14 … | 'app.html.filter': 'first', | |
| 15 | 15 … | 'app.html.scroller': 'first', | |
| 16 | 16 … | 'app.sync.goTo': 'first', | |
| 17 | - 'feed.pull.public': 'first', | ||
| 17 … | + // 'feed.pull.public': 'first', | ||
| 18 … | + 'sbot.pull.stream': 'first', | ||
| 18 | 19 … | 'message.html.compose': 'first', | |
| 19 | 20 … | 'message.html.render': 'first' | |
| 20 | 21 … | }) | |
| 21 | 22 … | ||
| @@ -40,8 +41,16 @@ | |||
| 40 | 41 … | }) | |
| 41 | 42 … | const { filterMenu, filterDownThrough, filterUpThrough, resetFeed } = api.app.html.filter(draw) | |
| 42 | 43 … | const { container, content } = api.app.html.scroller({ prepend: [composer, filterMenu] }) | |
| 43 | 44 … | ||
| 45 … | + const createStream = (opts) => api.sbot.pull.stream(server => { | ||
| 46 … | + const _opts = merge({}, opts, { | ||
| 47 … | + query: [{$filter: { timestamp: {$gt: 0} }}] | ||
| 48 … | + }) | ||
| 49 … | + | ||
| 50 … | + return next(server.query.read, _opts, ['timestamp']) | ||
| 51 … | + }) | ||
| 52 … | + | ||
| 44 | 53 … | // TODO : build a pull-stream which has seperate state + rendering | |
| 45 | 54 … | function draw () { | |
| 46 | 55 … | resetFeed({ container, content }) | |
| 47 | 56 … | ||
| @@ -51,15 +60,15 @@ | |||
| 51 | 60 … | } | |
| 52 | 61 … | ||
| 53 | 62 … | // TODO - change to use ssb-query, streamed by publish time | |
| 54 | 63 … | pull( | |
| 55 | - next(api.feed.pull.public, {old: false, limit: 100, live: true}, ['timestamp']), | ||
| 64 … | + createStream({old: false, limit: 100, live: true}), | ||
| 56 | 65 … | filterUpThrough(), | |
| 57 | 66 … | Scroller(container, content, render, true, false) | |
| 58 | 67 … | ) | |
| 59 | 68 … | ||
| 60 | 69 … | pull( | |
| 61 | - next(api.feed.pull.public, {reverse: true, limit: 100, live: false}, ['timestamp']), | ||
| 70 … | + createStream({reverse: true, limit: 100, live: false}), | ||
| 62 | 71 … | filterDownThrough(), | |
| 63 | 72 … | Scroller(container, content, render, false, false) | |
| 64 | 73 … | ) | |
| 65 | 74 … | } | |
| message/html/layout/default.js | ||
|---|---|---|
| @@ -26,11 +26,9 @@ | ||
| 26 | 26 … | |
| 27 | 27 … | var rawMessage = Value(null) |
| 28 | 28 … | |
| 29 | 29 … | return h('Message -default', { |
| 30 | - attributes: { | |
| 31 | - tabindex: '0' // needed to be able to navigate and show focus() | |
| 32 | - } | |
| 30 … | + attributes: { tabindex: '0' } // needed to be able to navigate and show focus() | |
| 33 | 31 … | }, [ |
| 34 | 32 … | h('section.avatar', {}, api.about.html.avatar(msg.value.author)), |
| 35 | 33 … | h('section.top', [ |
| 36 | 34 … | h('div.author', {}, author(msg)), |
| message/html/layout/default.mcss | ||
|---|---|---|
| @@ -39,15 +39,8 @@ | ||
| 39 | 39 … | a { |
| 40 | 40 … | $textSubtle |
| 41 | 41 … | margin-left: .5rem |
| 42 | 42 … | } |
| 43 | - | |
| 44 | - /* this is for private message_meta, TODO find a better home */ | |
| 45 | - (img) { | |
| 46 | - height: 1.8rem | |
| 47 | - width: 1.8rem | |
| 48 | - margin: 0 .2rem -.2rem | |
| 49 | - } | |
| 50 | 43 … | } |
| 51 | 44 … | } |
| 52 | 45 … | |
| 53 | 46 … | section.content { |
| @@ -116,9 +109,8 @@ | ||
| 116 | 109 … | } |
| 117 | 110 … | } |
| 118 | 111 … | } |
| 119 | 112 … | |
| 120 | - | |
| 121 | 113 … | footer.backlinks { |
| 122 | 114 … | grid-row: 5 / span 1 |
| 123 | 115 … | |
| 124 | 116 … | grid-column: 2 / 3 |
| package-lock.json | ||
|---|---|---|
| The diff is too large to show. Use a local git client to view these changes. Old file size: 360559 bytes New file size: 359889 bytes |
| package.json | ||
|---|---|---|
| @@ -62,9 +62,9 @@ | ||
| 62 | 62 … | "patch-inbox": "^1.1.3", |
| 63 | 63 … | "patch-settings": "^1.1.1", |
| 64 | 64 … | "patch-suggest": "^2.0.2", |
| 65 | 65 … | "patchbay-book": "^1.0.6", |
| 66 | - "patchbay-gatherings": "^2.0.0", | |
| 66 … | + "patchbay-gatherings": "^2.0.1", | |
| 67 | 67 … | "patchbay-poll": "^1.0.5", |
| 68 | 68 … | "patchcore": "^1.27.1", |
| 69 | 69 … | "pull-abortable": "^4.1.1", |
| 70 | 70 … | "pull-cat": "^1.1.11", |
Built with git-ssb-web