git ssb - Merge remote-tracking branch 'origin/master' into _master3

Commit 3287f6b02c40d45d8b653ff1fbbc5f699072519c

Merge remote-tracking branch 'origin/master' into _master3

Dominic Tarr committed on 8/16/2017, 7:34:00 AM
Parent: 9bf270081d898c0ec622f792b7f8e6e340f7a102
Parent: ec8cfe66cd3dbfa8ddc119bae4546fb25f8c8fd5

Files changed

app/html/link.js	changed
app/html/link.mcss	changed
app/html/thread-card.js	changed
app/html/thread-card.mcss	added
app/page/channel.js	changed
app/page/error.js	changed
app/page/groupFind.js	changed
app/page/groupIndex.js	changed
app/page/groupNew.js	changed
app/page/groupShow.js	changed
app/page/home.js	changed
app/page/home.mcss	changed
app/page/settings.js	changed
app/page/threadNew.js	changed
app/page/threadShow.js	changed
app/page/userFind.js	changed
app/page/userShow.js	changed
app/page/userShow.mcss	added
styles/global.mcss	changed
styles/button.mcss	added
styles/markdown.mcss	added
translations/sync.js	changed

app/html/link.jsView
		@@ -9,9 +9,10 @@
9	9
10	10	exports.create = (api) => {
11	11	return nest('app.html.link', (location, body) => {
12	12	return h('Link', {
13		- 'ev-click': () => api.history.sync.push(location)
	13	+ 'ev-click': () => api.history.sync.push(location),
	14	+ className: typeof body === 'string' ? '-string' : ''
14	15	}, body)
15	16	})
16	17	}
17	18

app/html/link.mcssView
		@@ -1,6 +1,10 @@
1	1	Link {
2	2	color: blue
3		- :hover {
4		- text-decoration: underline
	3	+
	4	+ -string {
	5	+ :hover {
	6	+ text-decoration: underline
	7	+ }
5	8	}
6	9	}
	10	+

app/html/thread-card.jsView
		@@ -88,9 +88,9 @@
88	88	const onClick = opts.onClick \|\| function () { api.history.sync.push(thread) }
89	89	const id = `${thread.key}-${JSON.stringify(opts)}`
90	90	// id is only here to help morphdom morph accurately
91	91
92		- return h('div.thread', { 'ev-click': onClick, id }, [
	92	+ return h('ThreadCard', { 'ev-click': onClick, id }, [
93	93	h('div.context', threadIcon(thread)),
94	94	h('div.content', [
95	95	subjectEl,
96	96	replySample ? h('div.reply', [

app/html/thread-card.mcssView
		@@ -1,0 +1,42 @@
	1	+ThreadCard {
	2	+ display: flex
	3	+ align-items: center
	4	+
	5	+ margin-bottom: .5rem
	6	+
	7	+ div.context {
	8	+ display: flex
	9	+ margin-right: 1rem
	10	+
	11	+ img {
	12	+ $smallAvatar
	13	+ margin-right: .5rem
	14	+ }
	15	+ }
	16	+
	17	+ div.content {
	18	+ flex-grow: 1
	19	+ background: #fff
	20	+ padding: 1rem
	21	+ border: 1px solid #ddd
	22	+ border-radius: 2px
	23	+
	24	+ div.subject {
	25	+ font-size: 1.2rem
	26	+ margin-bottom: .3rem
	27	+
	28	+ $largeMarkdown
	29	+ }
	30	+ div.reply {
	31	+ display: flex
	32	+ color: #444
	33	+
	34	+ div.replySymbol {
	35	+ margin-left: .7rem
	36	+ margin-right: .3rem
	37	+ }
	38	+
	39	+ $smallMarkdown
	40	+ }
	41	+ }
	42	+}

app/page/channel.jsView
		@@ -5,9 +5,8 @@
5	5
6	6	exports.gives = nest('app.page.channel')
7	7
8	8	exports.needs = nest({
9		- 'app.html.nav': 'first',
10	9	'app.html.threadCard': 'first',
11	10	'history.sync.push': 'first',
12	11	'state.obs.channel': 'first',
13	12	'translations.sync.strings': 'first',
		@@ -73,4 +72,5 @@
73	72	})
74	73	}
75	74
76	75
	76	+

app/page/error.jsView
		@@ -3,10 +3,9 @@
3	3
4	4	exports.gives = nest('app.page.error')
5	5
6	6	exports.needs = nest({
7		- 'translations.sync.strings': 'first',
8		- 'app.html.nav': 'first'
	7	+ 'translations.sync.strings': 'first'
9	8	})
10	9
11	10	exports.create = (api) => {
12	11	var strings = api.translations.sync.strings()
		@@ -15,11 +14,12 @@
15	14
16	15	function error (location) {
17	16	return h('Page -error', {title: strings.error}, [
18	17	strings.errorNotFound,
19		- location.error
	18	+ h('pre', [JSON.stringify(location, null, 2)])
20	19	])
21	20	}
22	21	}
23	22
24	23
25	24
	25	+

app/page/groupFind.jsView
		@@ -4,9 +4,8 @@
4	4	exports.gives = nest('app.page.groupFind')
5	5
6	6	exports.needs = nest({
7	7	'translations.sync.strings': 'first',
8		- 'app.html.nav': 'first'
9	8	})
10	9
11	10	exports.create = (api) => {
12	11	var strings = api.translations.sync.strings()
		@@ -19,4 +18,5 @@
19	18	}
20	19	}
21	20
22	21
	22	+

app/page/groupIndex.jsView
		@@ -3,10 +3,9 @@
3	3
4	4	exports.gives = nest('app.page.groupIndex')
5	5
6	6	exports.needs = nest({
7		- 'translations.sync.strings': 'first',
8		- 'app.html.nav': 'first'
	7	+ 'translations.sync.strings': 'first'
9	8	})
10	9
11	10	exports.create = (api) => {
12	11	var strings = api.translations.sync.strings()
		@@ -20,4 +19,5 @@
20	19	}
21	20
22	21
23	22
	23	+

app/page/groupNew.jsView
		@@ -3,9 +3,8 @@
3	3
4	4	exports.gives = nest('app.page.groupNew')
5	5
6	6	exports.needs = nest({
7		- 'app.html.nav': 'first',
8	7	'translations.sync.strings': 'first'
9	8	})
10	9
11	10	exports.create = (api) => {
		@@ -18,4 +17,5 @@
18	17	}
19	18	}
20	19
21	20
	21	+

app/page/groupShow.jsView
		@@ -4,9 +4,8 @@
4	4	exports.gives = nest('app.page.groupShow')
5	5
6	6	exports.needs = nest({
7	7	'translations.sync.strings': 'first',
8		- 'app.html.nav': 'first'
9	8	})
10	9
11	10	exports.create = (api) => {
12	11	var strings = api.translations.sync.strings()
		@@ -24,4 +23,5 @@
24	23
25	24
26	25
27	26
	27	+

app/page/home.jsView
		@@ -7,9 +7,8 @@
7	7
8	8	exports.gives = nest('app.page.home')
9	9
10	10	exports.needs = nest({
11		- 'app.html.nav': 'first',
12	11	'history.sync.push': 'first',
13	12	'keys.sync.id': 'first',
14	13	'translations.sync.strings': 'first',
15	14	'state.obs.threads': 'first',
		@@ -30,9 +29,8 @@
30	29	return nest('app.page.home', function (location) {
31	30	// location here can expected to be: { page: 'home'}
32	31	var strings = api.translations.sync.strings()
33	32
34		- var container = h('div.container', [])
35	33
36	34	// function filterForThread (thread) {
37	35	// if(thread.value.private)
38	36	// return {private: toRecpGroup(thread)}
		@@ -69,8 +67,9 @@
69	67	morePlease = true
70	68	requestIdleCallback(threadsObs.more)
71	69	}
72	70
	71	+ var container = h('div.container', [])
73	72	var threadsHtmlObs = More(
74	73	threadsObsDebounced,
75	74	function render (threads) {
76	75
		@@ -106,21 +105,19 @@
106	105	h('div.container', [
107	106	//private section
108	107	h('section.updates -directMessage', [
109	108	h('div.threads',
110		- groupedThreads
111		- .map(function (thread) {
	109	+ groupedThreads.map(thread => {
	110	+ const channel = thread.value.content.channel
	111	+ const onClick = channel
	112	+ ? (ev) => api.history.sync.push({ channel })
	113	+ : null // threadCard will install default onClick
112	114
113		- const channel = thread.value.content.channel
114		- const onClick = channel
115		- ? (ev) => api.history.sync.push({ channel })
116		- : null // threadCard will install default onClick
117		-
118		- return api.app.html.threadCard(thread, { onClick })
	115	+ return api.app.html.threadCard(thread, { onClick })
119	116	})
120	117	)
121		- ]),
122		- ])
	118	+ ])
	119	+ ])
123	120	)
124	121
125	122	return container
126	123	}
		@@ -132,4 +129,5 @@
132	129	})
133	130	}
134	131
135	132
	133	+

app/page/home.mcssView
		@@ -9,9 +9,9 @@
9	9	-directMessage {
10	10	$homePageSection
11	11
12	12	div.threads {
13		- div.thread {
	13	+ div.ThreadCard {
14	14	div.content {
15	15	div.subject {
16	16	display: flex
17	17
		@@ -33,9 +33,9 @@
33	33	-channel {
34	34	$homePageSection
35	35
36	36	div.threads {
37		- div.thread {
	37	+ div.ThreadCard {
38	38	div.context {
39	39	background: #fff
40	40	min-width: 8rem
41	41	padding: .1rem .3rem
		@@ -73,48 +73,7 @@
73	73	margin-bottom: .4rem
74	74	}
75	75
76	76	div.threads {
77		- div.thread {
78		- display: flex
79		- align-items: center
80		-
81		- margin-bottom: .5rem
82		-
83		- div.context {
84		- display: flex
85		- margin-right: 1rem
86		-
87		- img {
88		- $smallAvatar
89		- margin-right: .5rem
90		- }
91		- }
92		-
93		- div.content {
94		- flex-grow: 1
95		- background: #fff
96		- padding: 1rem
97		- border: 1px solid #ddd
98		- border-radius: 2px
99		-
100		- div.subject {
101		- font-size: 1.2rem
102		- margin-bottom: .3rem
103		-
104		- $largeMarkdown
105		- }
106		- div.reply {
107		- display: flex
108		- color: #444
109		-
110		- div.replySymbol {
111		- margin-left: .7rem
112		- margin-right: .3rem
113		- }
114		-
115		- $smallMarkdown
116		- }
117		- }
118		- }
	77	+ div.ThreadCard {}
119	78	}
120	79	}

app/page/settings.jsView
		@@ -4,9 +4,8 @@
4	4	exports.gives = nest('app.page.settings')
5	5
6	6	exports.needs = nest({
7	7	'translations.sync.strings': 'first',
8		- 'app.html.nav': 'first'
9	8	})
10	9
11	10	exports.create = (api) => {
12	11	return nest('app.page.settings', settings)
		@@ -19,4 +18,5 @@
19	18	}
20	19	}
21	20
22	21
	22	+

app/page/threadNew.jsView
		@@ -6,9 +6,8 @@
6	6	exports.needs = nest({
7	7	'translations.sync.strings': 'first',
8	8	'about.html.image': 'first',
9	9	'about.obs.name': 'first',
10		- 'app.html.nav': 'first',
11	10	'app.html.thread': 'first',
12	11	})
13	12
14	13	exports.create = (api) => {
		@@ -28,4 +27,5 @@
28	27	}
29	28
30	29
31	30
	31	+

app/page/threadShow.jsView
		@@ -6,9 +6,8 @@
6	6	exports.gives = nest('app.page.threadShow')
7	7
8	8	exports.needs = nest({
9	9	'translations.sync.strings': 'first',
10		- 'app.html.nav': 'first',
11	10	'app.html.thread': 'first',
12	11	'message.html.compose': 'first'
13	12	})
14	13
		@@ -41,4 +40,5 @@
41	40	])
42	41	}
43	42	}
44	43
	44	+

app/page/userFind.jsView
		@@ -4,9 +4,8 @@
4	4	exports.gives = nest('app.page.userFind')
5	5
6	6	exports.needs = nest({
7	7	'translations.sync.strings': 'first',
8		- 'app.html.nav': 'first'
9	8	})
10	9
11	10	exports.create = (api) => {
12	11	var strings = api.translations.sync.strings()
		@@ -21,4 +20,5 @@
21	20	}
22	21
23	22
24	23
	24	+

app/page/userShow.jsView
		@@ -1,16 +1,25 @@
1	1	const nest = require('depnest')
2		-const { h } = require('mutant')
	2	+const { h, Array: MutantArray, computed, when, map } = require('mutant')
	3	+const pull = require('pull-stream')
	4	+const get = require('lodash/get')
3	5
4	6	exports.gives = nest('app.page.userShow')
5	7
6	8	exports.needs = nest({
7	9	'translations.sync.strings': 'first',
8	10	'app.html.link': 'first',
9		- 'app.html.nav': 'first',
	11	+ 'app.html.threadCard': 'first',
10	12	'about.html.image': 'first',
11	13	'about.obs.name': 'first',
	14	+ 'contact.async.follow': 'first',
	15	+ 'contact.async.unfollow': 'first',
	16	+ 'contact.obs.followers': 'first',
	17	+ 'feed.pull.private': 'first',
	18	+ 'feed.pull.rollup': 'first',
12	19	'keys.sync.id': 'first',
	20	+ 'state.obs.threads': 'first',
	21	+ 'translations.sync.strings': 'first',
13	22	})
14	23
15	24	exports.create = (api) => {
16	25	var strings = api.translations.sync.strings()
		@@ -19,23 +28,79 @@
19	28
20	29	function userShow (location) {
21	30
22	31	const { feed } = location
23		- const Link = api.app.html.link
24	32	const myId = api.keys.sync.id()
25	33	var name = api.about.html.name(feed)
26	34
27		- return h('Page -userShow', {title: api.about.obs.name(feed)}, [
28		- api.about.html.image(feed),
29		- h('div', strings.followButton),
30		- h('div', strings.friendsInCommon),
31		- feed !== myId
32		- ? Link({ page: 'threadNew', feed }, strings.newThread)
33		- : '',
34		- h('div', strings.userConvesationsWith, name),
35		- h('div', name, strings.userIsInGroups),
	35	+ const strings = api.translations.sync.strings()
	36	+
	37	+ const { followers } = api.contact.obs
	38	+
	39	+ const youFollowThem = computed(followers(feed), followers => followers.has(myId))
	40	+ const theyFollowYou = computed(followers(myId), followers => followers.has(feed))
	41	+ const youAreFriends = computed([youFollowThem, theyFollowYou], (a, b) => a && b)
	42	+
	43	+ const ourRelationship = computed(
	44	+ [youAreFriends, youFollowThem, theyFollowYou],
	45	+ (youAreFriends, youFollowThem, theyFollowYou) => {
	46	+ if (youAreFriends) return strings.userShow.state.friends
	47	+ if (theyFollowYou) return strings.userShow.state.theyFollow
	48	+ if (youFollowThem) return strings.userShow.state.youFollow
	49	+ }
	50	+ )
	51	+ const { unfollow, follow } = api.contact.async
	52	+ const followButton = when(followers(myId).sync,
	53	+ when(youFollowThem,
	54	+ h('Button -subtle', { 'ev-click': () => unfollow(feed) }, strings.userShow.action.unfollow),
	55	+ h('Button -primary', { 'ev-click': () => follow(feed) }, strings.userShow.action.follow)
	56	+ ),
	57	+ h('Button', { disabled: 'disabled' }, strings.loading )
	58	+ )
	59	+
	60	+
	61	+ const threads = MutantArray()
	62	+ pull(
	63	+ // next(api.feed.pull.private, {reverse: true, limit: 100, live: false}, ['value', 'timestamp']),
	64	+ // api.feed.pull.private({reverse: true, limit: 100, live: false}),
	65	+ api.feed.pull.private({reverse: true, live: false}),
	66	+ pull.filter(msg => {
	67	+ const recps = get(msg, 'value.content.recps')
	68	+ if (!recps) return
	69	+
	70	+ return recps
	71	+ .map(r => typeof r === 'object' ? r.link : r)
	72	+ .includes(feed)
	73	+ }),
	74	+ api.feed.pull.rollup(),
	75	+ pull.drain(threads.push)
	76	+ // Scroller(container, content, render, false, false)
	77	+ )
	78	+
	79	+ const Link = api.app.html.link
	80	+
	81	+ return h('Page -userShow', {title: strings.userShow}, [
	82	+ h('div.container', [
	83	+ api.about.html.image(feed),
	84	+ feed !== myId
	85	+ ? h('div.friendship', [
	86	+ h('div.state', ourRelationship),
	87	+ followButton
	88	+ ]) : '',
	89	+ h('div', '...friends in common'),
	90	+ h('div', '...groups this person is in'),
	91	+ feed !== myId
	92	+ ? Link({ page: 'threadNew', feed }, h('Button -primary', strings.userShow.action.directMessage))
	93	+ : '',
	94	+ h('div.threads', map(threads, api.app.html.threadCard))
	95	+ ])
36	96	])
37	97	}
38	98	}
39	99
40	100
41	101
	102	+
	103	+
	104	+
	105	+
	106	+

app/page/userShow.mcssView
		@@ -1,0 +1,17 @@
	1	+Page -userShow {
	2	+ div.container {
	3	+
	4	+ div.friendship {
	5	+ display: flex
	6	+ align-items: center
	7	+
	8	+ margin-bottom: 1rem
	9	+
	10	+ div.state { flex-basis: 12rem }
	11	+ div.Button {}
	12	+ }
	13	+
	14	+
	15	+ }
	16	+}
	17	+

styles/global.mcssView
		@@ -17,16 +17,7 @@
17	17	img {
18	18	max-width: 100%
19	19	}
20	20
21		-Markdown {
22		- word-break: break-word
23		-
24		- (img) {
25		- margin: .5rem 0
26		- border-radius: .5rem
27		- }
28		-}
29		-
30	21	button {
31	22	width: 100%
32	23	}

styles/button.mcssView
		@@ -1,0 +1,27 @@
	1	+Button {
	2	+ font-family: arial
	3	+ text-align: center
	4	+
	5	+ cursor: pointer
	6	+
	7	+ padding: .2rem 2rem
	8	+ min-width: 4rem
	9	+ border: 1px #b9b9b9 solid
	10	+
	11	+ -subtle {
	12	+ color: #b9b9b9
	13	+ :hover {
	14	+ color: #222
	15	+ }
	16	+ }
	17	+ -primary {
	18	+ $primaryColor
	19	+
	20	+ :hover {
	21	+ opacity: .9
	22	+ }
	23	+
	24	+ border: none
	25	+ }
	26	+}
	27	+

styles/markdown.mcssView
		@@ -1,0 +1,10 @@
	1	+Markdown {
	2	+ word-break: break-word
	3	+
	4	+ (img) {
	5	+ margin: .5rem 0
	6	+ border-radius: .5rem
	7	+ }
	8	+}
	9	+
	10	+

translations/sync.jsView
		@@ -1,31 +1,57 @@
	1	+const nest = require('depnest')
1	2
2		-exports.gives = {translations: {sync: {strings: true}}}
	3	+exports.gives = nest('translations.sync.strings')
3	4
4		-exports.create = function () {
5		- return {translations: {sync: {strings: function () {
6		- return {
7		- showMore: "Show More",
8		- channels: "Channels",
9		- home: "Home",
10		- directMessages: "Direct Messages",
11		- replySymbol: "> ",
12		- error: "Error",
13		- errorNotFound: "The page wasn't found",
14		- groupNew: "New Group",
15		- groupFind: 'Find Group',
16		- groupIndex: "Group Index",
17		- //stub: should not be shown on released software!
18		- stub: "this page is a stub",
19		- settings: "Settings",
20		- threadNew: 'New Thread',
21		- threadShow: "Direct Messages",
	5	+exports.create = (api) => {
	6	+ return nest('translations.sync.strings', () => en)
	7	+}
	8	+
	9	+const en = {
	10	+ loading: 'Loading...',
	11	+ showMore: 'Show More',
	12	+ channels: 'Channels',
	13	+ directMessages: 'Direct Messages',
	14	+ replySymbol: '> ',
	15	+ home: "Home",
	16	+ error: "Error",
	17	+ errorNotFound: "The page wasn't found",
	18	+ groupNew: "New Group",
	19	+ groupFind: 'Find Group',
	20	+ groupIndex: "Group Index",
	21	+ //stub: should not be shown on released software!
	22	+ stub: "this page is a stub",
	23	+ settings: "Settings",
	24	+ threadNew: 'New Thread',
	25	+ threadShow: "Direct Messages",
	26	+ userShow: {
	27	+ action: {
	28	+ follow: 'Follow',
	29	+ unfollow: 'Unfollow',
	30	+ directMessage: 'New Direct Message'
	31	+ },
	32	+ state: {
	33	+ friends: 'You are friends',
	34	+ youFollow: 'You follow them',
	35	+ theyFollow: 'They follow you',
22	36	userFind: "Find User",
23	37	userIsInGroups: "is in groups:",
24	38	userConversationsWith: 'conversations you\'ve had with',
25	39	follow: "Follow",
26	40	friendsInCommon: 'friends in common'
27	41	}
28		- }}}}
	42	+ }
29	43	}
30	44
31	45
	46	+
	47	+
	48	+
	49	+
	50	+
	51	+
	52	+
	53	+
	54	+
	55	+
	56	+
	57	+

Built with git-ssb-web

mixmix / ticktack

Commit 3287f6b02c40d45d8b653ff1fbbc5f699072519c

Merge remote-tracking branch 'origin/master' into _master3

Files changed