diff --git a/pkg/arvo/app/chat-hook.hoon b/pkg/arvo/app/chat-hook.hoon index fe4180b68f..5abe2337cb 100644 --- a/pkg/arvo/app/chat-hook.hoon +++ b/pkg/arvo/app/chat-hook.hoon @@ -77,7 +77,7 @@ ?+ -.sign (on-agent:def wire sign) %watch-ack =^ cards state - (watch-ack:cc wire p.sign) + (watch-ack:cc wire p.sign) [cards this] :: %kick diff --git a/pkg/arvo/app/chat-view.hoon b/pkg/arvo/app/chat-view.hoon index 51a980dcae..3698e484e9 100644 --- a/pkg/arvo/app/chat-view.hoon +++ b/pkg/arvo/app/chat-view.hoon @@ -137,7 +137,7 @@ == == :: - ++ on-arvo + ++ on-arvo |= [=wire =sign-arvo] ^- (quip card _this) ?. ?=(%bound +<.sign-arvo) @@ -176,7 +176,7 @@ =/ pax t.t.t.t.site.url =/ envelopes (envelope-scry [(scot %ud start) (scot %ud end) pax]) %- json-response:gen - %- json-to-octs + %- json-to-octs %- update-to-json [%messages pax start end envelopes] :: diff --git a/pkg/arvo/app/chat/index.html b/pkg/arvo/app/chat/index.html index 97cb95e93e..37a78c767c 100644 --- a/pkg/arvo/app/chat/index.html +++ b/pkg/arvo/app/chat/index.html @@ -12,12 +12,12 @@ diff --git a/pkg/arvo/app/dojo.hoon b/pkg/arvo/app/dojo.hoon index 1dc3f528dc..fa34f7cce0 100644 --- a/pkg/arvo/app/dojo.hoon +++ b/pkg/arvo/app/dojo.hoon @@ -538,7 +538,7 @@ $poke %- he-card(poy ~) :* %pass - /poke + /poke %agent p.p.mad %poke @@ -1141,11 +1141,11 @@ :: If couldn't search (eg cursor not in appropriate position), do :: nothing. :: - ?: ?=(~ tl) + ?: ?=(~ tl) res :: If no options, ring the bell :: - ?: =([~ ~] tl) + ?: =([~ ~] tl) (he-diff %bel ~) :: If only one option, don't print unless the option is already :: typed in. diff --git a/pkg/arvo/app/group-store.hoon b/pkg/arvo/app/group-store.hoon index 6dd15cf781..16feb79879 100644 --- a/pkg/arvo/app/group-store.hoon +++ b/pkg/arvo/app/group-store.hoon @@ -1,4 +1,4 @@ -:: group-store: data store for groups of ships +:: group-store: data store for groups of ships :: /- *group-store /+ default-agent @@ -27,7 +27,7 @@ |_ =bowl:gall +* this . group-core +> - gc ~(. group-core bowl) + gc ~(. group-core bowl) def ~(. (default-agent this %|) bowl) :: ++ on-init on-init:def @@ -75,9 +75,9 @@ [%x *] ``noun+!>((~(get by groups) t.path)) == :: - ++ on-agent on-agent:def - ++ on-arvo on-arvo:def - ++ on-fail on-fail:def + ++ on-agent on-agent:def + ++ on-arvo on-arvo:def + ++ on-fail on-fail:def -- :: |_ bol=bowl:gall diff --git a/pkg/arvo/app/lens.hoon b/pkg/arvo/app/lens.hoon index 6aa2f6f664..45d9b81a1a 100644 --- a/pkg/arvo/app/lens.hoon +++ b/pkg/arvo/app/lens.hoon @@ -83,7 +83,7 @@ %+ give-simple-payload:app eyre-id.u.job.state [[200 ~] `(as-octt:mimes:html "\"Imported data\"")] :: - [%export ~] + [%export ~] ?+ -.sign (on-agent:def wire sign) %watch-ack ?~ p.sign diff --git a/pkg/arvo/app/publish.hoon b/pkg/arvo/app/publish.hoon index 51369cc426..d29ffe5bee 100644 --- a/pkg/arvo/app/publish.hoon +++ b/pkg/arvo/app/publish.hoon @@ -243,7 +243,7 @@ ++ write-file =, space:userlib |= [pax=path cay=cage] - ^- card + ^- card =. pax (weld our-beak pax) [%pass (weld /write-file pax) %arvo %c %info (foal pax cay)] :: diff --git a/pkg/arvo/app/weather.hoon b/pkg/arvo/app/weather.hoon index 75fbcf8c0b..c896a74fc1 100644 --- a/pkg/arvo/app/weather.hoon +++ b/pkg/arvo/app/weather.hoon @@ -101,7 +101,7 @@ =/ lismov [%pass /[(scot %da now.bol)] %arvo %i %request req out]~ ?~ timer :- [[%pass /timer %arvo %b %wait (add now.bol ~h3)] lismov] - %= state + %= state location str timer `(add now.bol ~h3) == diff --git a/pkg/arvo/lib/hood/kiln.hoon b/pkg/arvo/lib/hood/kiln.hoon index c51f271e40..5ffe8231af 100644 --- a/pkg/arvo/lib/hood/kiln.hoon +++ b/pkg/arvo/lib/hood/kiln.hoon @@ -312,11 +312,11 @@ ++ take-agent |= [=wire =sign:agent:gall] ?+ wire ~|([%kiln-bad-take-agent wire -.sign] !!) - [%kiln %fancy *] ?> ?=(%poke-ack -.sign) + [%kiln %fancy *] ?> ?=(%poke-ack -.sign) (take-coup-fancy t.t.wire p.sign) [%kiln %reload *] ?> ?=(%poke-ack -.sign) (take-coup-reload t.t.wire p.sign) - [%kiln %spam *] ?> ?=(%poke-ack -.sign) + [%kiln %spam *] ?> ?=(%poke-ack -.sign) (take-coup-spam t.t.wire p.sign) == :: diff --git a/pkg/arvo/lib/language-server/rune-snippet.hoon b/pkg/arvo/lib/language-server/rune-snippet.hoon index d15a883328..c7664faa97 100644 --- a/pkg/arvo/lib/language-server/rune-snippet.hoon +++ b/pkg/arvo/lib/language-server/rune-snippet.hoon @@ -117,7 +117,7 @@ :- "%_" """ $\{1:target} - $\{2:wing} $\{3:new-value} + $\{2:wing} $\{3:new-value} == """ :- "%." @@ -139,7 +139,7 @@ :- "%*" """ $\{1:target-wing} $\{2:from} - $\{3:wing} $\{4:new-value} + $\{3:wing} $\{4:new-value} == """ :- "%^" @@ -164,7 +164,7 @@ :- "%=" """ $\{1:target} - $\{2:wing} $\{3:new-value} + $\{2:wing} $\{3:new-value} == """ :: @@ -422,7 +422,7 @@ :- "?-" """ $\{1:case} - $\{2:type} $\{3:value} + $\{2:type} $\{3:value} == """ :- "?:" @@ -455,8 +455,8 @@ """ :- "?+" """ - $\{1:case} $\{2:else} - $\{3:type} $\{4:value} + $\{1:case} $\{2:else} + $\{3:type} $\{4:value} == """ :- "?&" diff --git a/pkg/arvo/lib/soto.hoon b/pkg/arvo/lib/soto.hoon index 5195a516b6..ef39e79ced 100644 --- a/pkg/arvo/lib/soto.hoon +++ b/pkg/arvo/lib/soto.hoon @@ -83,7 +83,7 @@ ++ wush |= [wid=@u tan=tang] ^- tape - %- of-wall:format + %- of-wall:format %+ turn (flop tan) |= =tank ~! wid diff --git a/pkg/arvo/mar/chat/action.hoon b/pkg/arvo/mar/chat/action.hoon index 74cbd5cbf6..7d1b7a9852 100644 --- a/pkg/arvo/mar/chat/action.hoon +++ b/pkg/arvo/mar/chat/action.hoon @@ -4,7 +4,7 @@ ++ grab |% ++ noun chat-action - ++ json + ++ json |= jon=^json (json-to-action jon) -- diff --git a/pkg/arvo/mar/chat/hook-action.hoon b/pkg/arvo/mar/chat/hook-action.hoon index 6ae4d43747..73d36fff35 100644 --- a/pkg/arvo/mar/chat/hook-action.hoon +++ b/pkg/arvo/mar/chat/hook-action.hoon @@ -19,7 +19,7 @@ ++ add-owned %- ot :~ [%path pa] - [%security sec] + [%security sec] [%allow-history bo] == :: diff --git a/pkg/arvo/mar/chat/view-action.hoon b/pkg/arvo/mar/chat/view-action.hoon index 3bba211cbd..a87889eda5 100644 --- a/pkg/arvo/mar/chat/view-action.hoon +++ b/pkg/arvo/mar/chat/view-action.hoon @@ -4,7 +4,7 @@ ++ grab |% ++ noun chat-view-action - ++ json + ++ json |= jon=^json (json-to-view-action jon) -- diff --git a/pkg/arvo/mar/invite/action.hoon b/pkg/arvo/mar/invite/action.hoon index 3f8ebc811a..5265671c21 100644 --- a/pkg/arvo/mar/invite/action.hoon +++ b/pkg/arvo/mar/invite/action.hoon @@ -4,7 +4,7 @@ ++ grab |% ++ noun invite-action - ++ json + ++ json |= jon=^json (json-to-action jon) -- diff --git a/pkg/arvo/mar/permission/action.hoon b/pkg/arvo/mar/permission/action.hoon index 869246e0d1..f316b3d71b 100644 --- a/pkg/arvo/mar/permission/action.hoon +++ b/pkg/arvo/mar/permission/action.hoon @@ -4,7 +4,7 @@ ++ grab |% ++ noun permission-action - ++ json + ++ json |= jon=^json =< (parse-permission-action jon) |% diff --git a/pkg/arvo/mar/permission/group-hook-action.hoon b/pkg/arvo/mar/permission/group-hook-action.hoon index efe9d31461..e80a0e38fe 100644 --- a/pkg/arvo/mar/permission/group-hook-action.hoon +++ b/pkg/arvo/mar/permission/group-hook-action.hoon @@ -4,7 +4,7 @@ ++ grab |% ++ noun permission-group-hook-action - ++ json + ++ json |= jon=^json (json-to-perm-group-hook-action jon) -- diff --git a/pkg/arvo/mar/publish/comment.hoon b/pkg/arvo/mar/publish/comment.hoon index 7a7d4ac711..15a809ba62 100644 --- a/pkg/arvo/mar/publish/comment.hoon +++ b/pkg/arvo/mar/publish/comment.hoon @@ -43,10 +43,10 @@ :* %+ rash creator.txs ;~(pfix (jest 'creator: ~') fed:ag) :: - %+ rash collection.txs + %+ rash collection.txs ;~(pfix (jest 'collection: ') (cook crip (star next))) :: - %+ rash post.txs + %+ rash post.txs ;~(pfix (jest 'post: ') (cook crip (star next))) :: %+ rash date-created.txs diff --git a/pkg/arvo/mar/publish/info.hoon b/pkg/arvo/mar/publish/info.hoon index c499b3928a..3cd60d0743 100644 --- a/pkg/arvo/mar/publish/info.hoon +++ b/pkg/arvo/mar/publish/info.hoon @@ -46,10 +46,10 @@ :* %+ rash owner.txs ;~(pfix (jest 'owner: ~') fed:ag) :: - %+ rash title.txs + %+ rash title.txs ;~(pfix (jest 'title: ') (cook crip (star next))) :: - %+ rash filename.txs + %+ rash filename.txs ;~(pfix (jest 'filename: ') (cook crip (star next))) :: %+ rash comments.txs diff --git a/pkg/arvo/mar/publish/rumor.hoon b/pkg/arvo/mar/publish/rumor.hoon index 07687aee8c..895368f202 100644 --- a/pkg/arvo/mar/publish/rumor.hoon +++ b/pkg/arvo/mar/publish/rumor.hoon @@ -13,14 +13,14 @@ %+ frond -.rum ?- -.rum %collection - %- pairs + %- pairs :~ [%coll s+col.rum] [%who (ship who.rum)] [%data (collection-build-to-json dat.rum)] == :: %post - %- pairs + %- pairs :~ [%coll s+col.rum] [%post s+pos.rum] [%who (ship who.rum)] @@ -28,7 +28,7 @@ == :: %comments - %- pairs + %- pairs :~ [%coll s+col.rum] [%post s+pos.rum] [%who (ship who.rum)] diff --git a/pkg/arvo/ren/publish/comments.hoon b/pkg/arvo/ren/publish/comments.hoon index 132ddf7151..a793df78cd 100644 --- a/pkg/arvo/ren/publish/comments.hoon +++ b/pkg/arvo/ren/publish/comments.hoon @@ -2,7 +2,7 @@ /+ publish /= result /^ (list comment:publish) - /; + /; |= comments=(map knot comment:publish) ^- (list [comment-info:publish @t]) %+ sort ~(val by comments) diff --git a/pkg/arvo/ren/publish/post.hoon b/pkg/arvo/ren/publish/post.hoon index 6ef6e4cc34..717facddc4 100644 --- a/pkg/arvo/ren/publish/post.hoon +++ b/pkg/arvo/ren/publish/post.hoon @@ -3,7 +3,7 @@ /= args /$ ,[beam *] /= result /^ [post-info:publish manx @t] - /; + /; |= $: post-front=(map knot cord) post-content=manx post-raw=wain diff --git a/pkg/arvo/sur/group-hook.hoon b/pkg/arvo/sur/group-hook.hoon index c224fd2b3c..be880b3cea 100644 --- a/pkg/arvo/sur/group-hook.hoon +++ b/pkg/arvo/sur/group-hook.hoon @@ -5,7 +5,7 @@ :: if ship is foreign, delete any local :: group at that path and mirror the :: foreign group at our local path - :: + :: [%remove =path] :: remove the path. == -- diff --git a/pkg/arvo/sys/vane/eyre.hoon b/pkg/arvo/sys/vane/eyre.hoon index 52b09a3bf2..709122af73 100644 --- a/pkg/arvo/sys/vane/eyre.hoon +++ b/pkg/arvo/sys/vane/eyre.hoon @@ -637,7 +637,7 @@ this.outstandingSubscriptions.set( id, { - err: connectionErrFunc, + err: connectionErrFunc, event: eventFunc, quit: quitFunc } diff --git a/pkg/arvo/tests/sys/hoon/list.hoon b/pkg/arvo/tests/sys/hoon/list.hoon index b85cf511be..cdff49dafb 100644 --- a/pkg/arvo/tests/sys/hoon/list.hoon +++ b/pkg/arvo/tests/sys/hoon/list.hoon @@ -141,8 +141,8 @@ ++ test-list-murn %+ expect-eq !> ~[6 10] - !> %+ murn `(list @)`~[2 3 4 5] - |= [x=@] + !> %+ murn `(list @)`~[2 3 4 5] + |= [x=@] ^- (unit) ?: =((mod x 2) 0) ~ (some (mul x 2)) diff --git a/pkg/arvo/tests/sys/vane/eyre.hoon b/pkg/arvo/tests/sys/vane/eyre.hoon index cf86182049..70d7fb809c 100644 --- a/pkg/arvo/tests/sys/vane/eyre.hoon +++ b/pkg/arvo/tests/sys/vane/eyre.hoon @@ -308,7 +308,7 @@ :~ :* duct=~[/http-blah] %give %response [%start [200 ['content-type' 'text/html']~] ~ %.n] == == == - + ;: weld results1 results2 diff --git a/pkg/interface/chat/gulpfile.js b/pkg/interface/chat/gulpfile.js index 08ae6f40c7..ba110acb72 100644 --- a/pkg/interface/chat/gulpfile.js +++ b/pkg/interface/chat/gulpfile.js @@ -144,7 +144,7 @@ gulp.task('urbit-copy', function () { gulp.task('js-bundle-dev', gulp.series('jsx-transform', 'js-imports')); gulp.task('tile-js-bundle-dev', gulp.series('tile-jsx-transform', 'tile-js-imports')); gulp.task('js-bundle-prod', gulp.series('jsx-transform', 'js-imports', 'js-minify')) -gulp.task('tile-js-bundle-prod', +gulp.task('tile-js-bundle-prod', gulp.series('tile-jsx-transform', 'tile-js-imports', 'tile-js-minify')); gulp.task('bundle-dev', diff --git a/pkg/interface/chat/src/js/api.js b/pkg/interface/chat/src/js/api.js index e690e5da20..8284fe9a03 100644 --- a/pkg/interface/chat/src/js/api.js +++ b/pkg/interface/chat/src/js/api.js @@ -14,7 +14,7 @@ class UrbitApi { add: this.groupAdd.bind(this), remove: this.groupRemove.bind(this) }; - + this.chat = { message: this.chatMessage.bind(this), read: this.chatRead.bind(this) @@ -25,7 +25,7 @@ class UrbitApi { delete: this.chatViewDelete.bind(this), join: this.chatViewJoin.bind(this), }; - + this.invite = { accept: this.inviteAccept.bind(this), decline: this.inviteDecline.bind(this), @@ -36,7 +36,7 @@ class UrbitApi { bind(path, method, ship = this.authTokens.ship, app, success, fail, quit) { this.bindPaths = _.uniq([...this.bindPaths, path]); - window.subscriptionId = window.urb.subscribe(ship, app, path, + window.subscriptionId = window.urb.subscribe(ship, app, path, (err) => { fail(err); }, @@ -59,7 +59,7 @@ class UrbitApi { window.urb.poke(ship, appl, mark, data, (json) => { resolve(json); - }, + }, (err) => { reject(err); }); @@ -142,7 +142,7 @@ class UrbitApi { } chatViewJoin(ship, path, askHistory) { - this.chatViewAction({ + this.chatViewAction({ join: { ship, path, 'ask-history': askHistory @@ -153,9 +153,9 @@ class UrbitApi { inviteAction(data) { this.action("invite-store", "json", data); } - + inviteInvite(path, ship) { - this.action("invite-hook", "json", + this.action("invite-hook", "json", { invite: { path: '/chat', @@ -180,7 +180,7 @@ class UrbitApi { } }); } - + inviteDecline(uid) { this.inviteAction({ decline: { diff --git a/pkg/interface/chat/src/js/components/lib/chat-input.js b/pkg/interface/chat/src/js/components/lib/chat-input.js index abcb79f7db..a0c7370251 100644 --- a/pkg/interface/chat/src/js/components/lib/chat-input.js +++ b/pkg/interface/chat/src/js/components/lib/chat-input.js @@ -64,7 +64,7 @@ export class ChatInput extends Component { } }); } - + bindShortcuts() { Mousetrap(this.textareaRef.current).bind('enter', e => { e.preventDefault(); @@ -173,7 +173,7 @@ export class ChatInput extends Component { const { props, state } = this; this.bindShortcuts(); - + return (
+
); } } diff --git a/pkg/interface/chat/src/js/components/lib/icons/sigil.js b/pkg/interface/chat/src/js/components/lib/icons/sigil.js index ff9bbf4558..bf170930d5 100644 --- a/pkg/interface/chat/src/js/components/lib/icons/sigil.js +++ b/pkg/interface/chat/src/js/components/lib/icons/sigil.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import { sigil, reactRenderer } from 'urbit-sigil-js'; - + export class Sigil extends Component { render() { const { props } = this; diff --git a/pkg/interface/chat/src/js/components/lib/message.js b/pkg/interface/chat/src/js/components/lib/message.js index ea5080a6b0..d3b00727be 100644 --- a/pkg/interface/chat/src/js/components/lib/message.js +++ b/pkg/interface/chat/src/js/components/lib/message.js @@ -14,8 +14,8 @@ export class Message extends Component { let letter = props.msg.letter; if ('code' in letter) { - let outputElement = - (!!letter.code.output && + let outputElement = + (!!letter.code.output && letter.code.output.length && letter.code.output.length > 0) ? ( 
@@ -70,7 +70,7 @@ export class Message extends Component {
         && (chatroom[0] === letter.text))) { // entire message is room name?
           return (
             
               {letter.text}
             
@@ -108,9 +108,9 @@ export class Message extends Component {
diff --git a/pkg/interface/chat/src/js/components/lib/sidebar-item.js b/pkg/interface/chat/src/js/components/lib/sidebar-item.js index f4d06df85c..9ec4dd2f17 100644 --- a/pkg/interface/chat/src/js/components/lib/sidebar-item.js +++ b/pkg/interface/chat/src/js/components/lib/sidebar-item.js @@ -37,7 +37,7 @@ export class SidebarItem extends Component { getLetter(lett) { if ('text' in lett) { - return lett.text; + return lett.text; } else if ('url' in lett) { return lett.url; } else if ('code' in lett) { @@ -50,8 +50,8 @@ export class SidebarItem extends Component { render() { const { props, state } = this; - let unreadElem = !!props.unread - ? "fw7 green2" + let unreadElem = !!props.unread + ? "fw7 green2" : ""; let title = props.title.substr(1); @@ -59,7 +59,7 @@ export class SidebarItem extends Component { let description = this.getLetter(props.description); let selectedCss = !!props.selected ? 'bg-gray5' : 'bg-white pointer'; - + return (
{ return ( - { return ( - Lowercase alphanumeric characters, dashes, and slashes only

- - + />
); diff --git a/pkg/interface/publish/src/js/components/lib/comments.js b/pkg/interface/publish/src/js/components/lib/comments.js index b2359188fe..fbd2ff7277 100644 --- a/pkg/interface/publish/src/js/components/lib/comments.js +++ b/pkg/interface/publish/src/js/components/lib/comments.js @@ -12,7 +12,7 @@ export class Comments extends Component { commentBody: '', awaiting: false, } - + this.toggleDisplay = this.toggleDisplay.bind(this); this.commentChange = this.commentChange.bind(this); this.postComment = this.postComment.bind(this); diff --git a/pkg/interface/publish/src/js/components/lib/header-menu.js b/pkg/interface/publish/src/js/components/lib/header-menu.js index 9cb9b621ad..e9605049d3 100644 --- a/pkg/interface/publish/src/js/components/lib/header-menu.js +++ b/pkg/interface/publish/src/js/components/lib/header-menu.js @@ -30,7 +30,7 @@ export class HeaderMenu extends Component {
- - - +
); } } diff --git a/pkg/interface/publish/src/js/components/lib/icons/sigil.js b/pkg/interface/publish/src/js/components/lib/icons/sigil.js index fc23c62d49..7ddda2779c 100644 --- a/pkg/interface/publish/src/js/components/lib/icons/sigil.js +++ b/pkg/interface/publish/src/js/components/lib/icons/sigil.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import { sigil, reactRenderer } from 'urbit-sigil-js'; - + export class Sigil extends Component { render() { const { props } = this; diff --git a/pkg/interface/publish/src/js/components/lib/next-prev.js b/pkg/interface/publish/src/js/components/lib/next-prev.js index 5e65bb3d9b..9c409b2eea 100644 --- a/pkg/interface/publish/src/js/components/lib/next-prev.js +++ b/pkg/interface/publish/src/js/components/lib/next-prev.js @@ -57,7 +57,7 @@ class Preview extends Component { let date = moment(previewProps.date).fromNow(); let authorDate = `${previewProps.author} • ${date}` - let collLink = "/~publish/" + + let collLink = "/~publish/" + previewProps.blogOwner + "/" + previewProps.collectionName; let postLink = collLink + "/" + previewProps.postName; diff --git a/pkg/interface/publish/src/js/components/lib/path-control.js b/pkg/interface/publish/src/js/components/lib/path-control.js index aebb413ac9..801ac66705 100644 --- a/pkg/interface/publish/src/js/components/lib/path-control.js +++ b/pkg/interface/publish/src/js/components/lib/path-control.js @@ -32,7 +32,7 @@ export class PathControl extends Component { (last.lastMatch === '/~publish/:ship/:blog')){ blog = (last.lastParams.ship.slice(1) == window.ship) ? _.get(this.props, `pubs["${last.lastParams.blog}"]`, false) - : _.get(this.props, + : _.get(this.props, `subs["${last.lastParams.ship.slice(1)}"]["${last.lastParams.blog}"]`, false); } } diff --git a/pkg/interface/publish/src/js/components/lib/post-body.js b/pkg/interface/publish/src/js/components/lib/post-body.js index 1cda77a287..41e69eb3ca 100644 --- a/pkg/interface/publish/src/js/components/lib/post-body.js +++ b/pkg/interface/publish/src/js/components/lib/post-body.js @@ -101,7 +101,7 @@ export class PostBody extends Component { let page = this.parseContent(this.props.body.c, this.props.body.gn, this.props.body.ga, - null); + null); return page; } } diff --git a/pkg/interface/publish/src/js/components/lib/post-preview.js b/pkg/interface/publish/src/js/components/lib/post-preview.js index c33d795724..d8d91caa1e 100644 --- a/pkg/interface/publish/src/js/components/lib/post-preview.js +++ b/pkg/interface/publish/src/js/components/lib/post-preview.js @@ -38,7 +38,7 @@ export class PostPreview extends Component { : `${this.props.post.numComments} comments`; let date = moment(this.props.post.date).fromNow(); let authorDate = `${this.props.post.author} • ${date}` - let collLink = "/~publish/" + + let collLink = "/~publish/" + this.props.post.blogOwner + "/" + this.props.post.collectionName; let postLink = collLink + "/" + this.props.post.postName; diff --git a/pkg/interface/publish/src/js/components/lib/recent-preview.js b/pkg/interface/publish/src/js/components/lib/recent-preview.js index b29938a7d0..851554387d 100644 --- a/pkg/interface/publish/src/js/components/lib/recent-preview.js +++ b/pkg/interface/publish/src/js/components/lib/recent-preview.js @@ -38,7 +38,7 @@ export class RecentPreview extends Component { : `${this.props.post.numComments} comments`; let date = moment(this.props.post.date).fromNow(); let authorDate = `~${this.props.post.author} • ${date}` - let collLink = "/~publish/~" + + let collLink = "/~publish/~" + this.props.post.blogOwner + "/" + this.props.post.collectionName; let postLink = collLink + "/" + this.props.post.postName; diff --git a/pkg/interface/publish/src/js/components/lib/seal-dict.js b/pkg/interface/publish/src/js/components/lib/seal-dict.js index d4a4d85ac0..7ea7679b5d 100644 --- a/pkg/interface/publish/src/js/components/lib/seal-dict.js +++ b/pkg/interface/publish/src/js/components/lib/seal-dict.js @@ -5,7 +5,7 @@ import _ from 'lodash'; const ReactSVGComponents = { svg: p => { return ( - @@ -15,7 +15,7 @@ const ReactSVGComponents = { }, circle: p => { return ( - { _.map(_.get(p, 'children', []), child => ReactSVGComponents[child.tag](child)) } @@ -23,8 +23,8 @@ const ReactSVGComponents = { }, rect: p => { return ( - { _.map(_.get(p, 'children', []), child => ReactSVGComponents[child.tag](child)) } @@ -33,7 +33,7 @@ const ReactSVGComponents = { path: p => { return ( { _.map(_.get(p, 'children', []), child => ReactSVGComponents[child.tag](child)) } @@ -42,7 +42,7 @@ const ReactSVGComponents = { g: p => { return ( { _.map(_.get(p, 'children', []), child => ReactSVGComponents[child.tag](child)) } @@ -51,7 +51,7 @@ const ReactSVGComponents = { polygon: p => { return ( { _.map(_.get(p, 'children', []), child => ReactSVGComponents[child.tag](child)) } @@ -60,7 +60,7 @@ const ReactSVGComponents = { line: p => { return ( { _.map(_.get(p, 'children', []), child => ReactSVGComponents[child.tag](child)) } @@ -69,7 +69,7 @@ const ReactSVGComponents = { polyline: p => { return ( { _.map(_.get(p, 'children', []), child => ReactSVGComponents[child.tag](child)) } diff --git a/pkg/interface/publish/src/js/components/new-blog.js b/pkg/interface/publish/src/js/components/new-blog.js index 6375fee72f..2190cb15f2 100644 --- a/pkg/interface/publish/src/js/components/new-blog.js +++ b/pkg/interface/publish/src/js/components/new-blog.js @@ -81,7 +81,7 @@ export class NewBlog extends Component { this.setState({ awaiting: blogId }); - + this.props.setSpinner(true); this.props.api.action("publish", "publish-action", makeBlog); @@ -92,7 +92,7 @@ export class NewBlog extends Component { if (this.state.awaiting) { if (this.props.pubs[this.state.awaiting]) { this.props.setSpinner(false); - + if (this.state.redirect === 'new-post') { this.props.history.push("/~publish/new-post", { @@ -125,7 +125,7 @@ export class NewBlog extends Component { .split(/[\s,]+/) .map(t => t.trim()); - let valid = tokens.reduce((valid, s) => + let valid = tokens.reduce((valid, s) => valid && (((s !== '~') && urbitOb.isValidPatp(s) && s.includes('~')) || (s === '')), true); @@ -167,7 +167,7 @@ export class NewBlog extends Component { className="header-2 b--none w-100" style={{resize:"none", height: this.titleHeight}} rows={1} - type="text" + type="text" name="blogName" placeholder="Add a Title" onChange={this.titleChange}> @@ -217,7 +217,7 @@ export class NewBlog extends Component { className="header-2 b--none w-100" style={{resize:"none", height: this.titleHeight}} rows={1} - type="text" + type="text" name="blogName" placeholder="Add a Title" onChange={this.titleChange}> diff --git a/pkg/interface/publish/src/js/components/new-post.js b/pkg/interface/publish/src/js/components/new-post.js index a4cbf0246e..4337d1ba72 100644 --- a/pkg/interface/publish/src/js/components/new-post.js +++ b/pkg/interface/publish/src/js/components/new-post.js @@ -63,7 +63,7 @@ class Error extends Component { } } } - + export class NewPost extends Component { constructor(props){ super(props); @@ -235,7 +235,7 @@ export class NewPost extends Component { post: this.state.posted.postId, } }; - + this.props.api.action("publish", "publish-action", del); } diff --git a/pkg/interface/publish/src/js/components/not-found.js b/pkg/interface/publish/src/js/components/not-found.js index 222d0c8e04..9d551f80d9 100644 --- a/pkg/interface/publish/src/js/components/not-found.js +++ b/pkg/interface/publish/src/js/components/not-found.js @@ -24,7 +24,7 @@ export class NotFound extends Component {
{back} -

Page Not Found

+

Page Not Found

diff --git a/pkg/interface/publish/src/js/components/post.js b/pkg/interface/publish/src/js/components/post.js index daa3a0d66c..9014d9de14 100644 --- a/pkg/interface/publish/src/js/components/post.js +++ b/pkg/interface/publish/src/js/components/post.js @@ -107,7 +107,7 @@ export class Post extends Component { editPost() { this.setState({mode: 'edit'}); } - + savePost() { if (this.state.title == this.state.titleOriginal && this.state.body == this.state.bodyOriginal) { @@ -126,7 +126,7 @@ export class Post extends Component { who: [], } }; - + let data = { "edit-post": { who: this.state.ship, @@ -157,7 +157,7 @@ export class Post extends Component { let postId = this.props.postId; if (ship !== window.ship) { - + let blog = _.get(this.props, `subs["${ship}"]["${blogId}"]`, false); if (blog) { @@ -455,7 +455,7 @@ export class Post extends Component {

{authorDate}

- -

{authorDate}

- - 0); let unread = (this.props.unread.length > 0); - + return (
diff --git a/pkg/interface/publish/src/js/components/recent.js b/pkg/interface/publish/src/js/components/recent.js index 8087749668..54742575fc 100644 --- a/pkg/interface/publish/src/js/components/recent.js +++ b/pkg/interface/publish/src/js/components/recent.js @@ -14,7 +14,7 @@ export class Recent extends Component { buildRecent() { var recent = []; var group = { - date: new Date(), + date: new Date(), posts: [], }; diff --git a/pkg/interface/publish/src/js/components/root.js b/pkg/interface/publish/src/js/components/root.js index 2d026480ab..4a3ec1d7d0 100644 --- a/pkg/interface/publish/src/js/components/root.js +++ b/pkg/interface/publish/src/js/components/root.js @@ -73,7 +73,7 @@ export class Root extends Component { diff --git a/pkg/interface/publish/src/js/components/subs.js b/pkg/interface/publish/src/js/components/subs.js index 86acaadff5..cd7ae92183 100644 --- a/pkg/interface/publish/src/js/components/subs.js +++ b/pkg/interface/publish/src/js/components/subs.js @@ -121,7 +121,7 @@ export class Subs extends Component {

{data.lastUpdated}

-

Unsubscribe @@ -148,12 +148,12 @@ export class Subs extends Component {

- Accept     - Reject diff --git a/pkg/interface/publish/src/js/lib/util.js b/pkg/interface/publish/src/js/lib/util.js index 9851f72832..6d61a41492 100644 --- a/pkg/interface/publish/src/js/lib/util.js +++ b/pkg/interface/publish/src/js/lib/util.js @@ -6,7 +6,7 @@ export function stringToSymbol(str) { ( (n >= 48) && (n <= 57) )) { result += str[i]; - } else if ( (n >= 65) && (n <= 90) ) + } else if ( (n >= 65) && (n <= 90) ) { result += String.fromCharCode(n + 32); } else { diff --git a/pkg/interface/publish/src/js/reducers/rumor.js b/pkg/interface/publish/src/js/reducers/rumor.js index e84eeb0d1c..97fa99966d 100644 --- a/pkg/interface/publish/src/js/reducers/rumor.js +++ b/pkg/interface/publish/src/js/reducers/rumor.js @@ -21,7 +21,7 @@ export class RumorReducer { if (json.who === window.ship) { if (json.post) { this.removePost(json, state); - delete state.pubs[json.coll].posts[json.post]; + delete state.pubs[json.coll].posts[json.post]; } else { let postIds = Object.keys(state.pubs[json.coll].posts); @@ -38,7 +38,7 @@ export class RumorReducer { } else { if (json.post) { this.removePost(json, state); - delete state.subs[json.who][json.coll].posts[json.post]; + delete state.subs[json.who][json.coll].posts[json.post]; } else { let postIds = Object.keys(state.subs[json.who][json.coll].posts); postIds.forEach((postId) => { @@ -74,7 +74,7 @@ export class RumorReducer { if (state.pubs[json.coll]) { let pinIdx = state.pubs[json.coll].order.pin.indexOf(json.post); let unpinIdx = state.pubs[json.coll].order.unpin.indexOf(json.post); - + if (pinIdx != -1) { _.pullAt(state.pubs[json.coll].order.pin, [pinIdx]); } @@ -84,11 +84,11 @@ export class RumorReducer { } } else { if (state.subs[json.who][json.coll]) { - let pinIdx = + let pinIdx = state.subs[json.who][json.coll].order.pin.indexOf(json.post); - let unpinIdx = + let unpinIdx = state.subs[json.who][json.coll].order.unpin.indexOf(json.post); - + if (pinIdx != -1) { _.pullAt(state.subs[json.who][json.coll].order.pin, [pinIdx]); } @@ -167,7 +167,7 @@ export class RumorReducer { return; } - this.insertLatest(json, state); + this.insertLatest(json, state); this.insertUnread(json, state); this.insertOrder(json, state); } diff --git a/pkg/interface/soto/gulpfile.js b/pkg/interface/soto/gulpfile.js index 9bdfb4ee5c..bab4878e33 100644 --- a/pkg/interface/soto/gulpfile.js +++ b/pkg/interface/soto/gulpfile.js @@ -146,7 +146,7 @@ gulp.task('urbit-copy', function () { gulp.task('js-bundle-dev', gulp.series('jsx-transform', 'js-imports')); gulp.task('tile-js-bundle-dev', gulp.series('tile-jsx-transform', 'tile-js-imports')); gulp.task('js-bundle-prod', gulp.series('jsx-transform', 'js-imports', 'js-minify')) -gulp.task('tile-js-bundle-prod', +gulp.task('tile-js-bundle-prod', gulp.series('tile-jsx-transform', 'tile-js-imports', 'tile-js-minify')); gulp.task('bundle-dev', diff --git a/pkg/interface/soto/src/css/custom.css b/pkg/interface/soto/src/css/custom.css index 0c493355c0..edb40b1f54 100644 --- a/pkg/interface/soto/src/css/custom.css +++ b/pkg/interface/soto/src/css/custom.css @@ -6,8 +6,8 @@ p, input { font-family: "Source Code Pro", monospace; } -textarea, select, input, button { - outline: none; +textarea, select, input, button { + outline: none; -webkit-appearance: none; border: none; background-color: #fff; diff --git a/pkg/interface/soto/src/js/api.js b/pkg/interface/soto/src/js/api.js index 695c4dec47..be552d575f 100644 --- a/pkg/interface/soto/src/js/api.js +++ b/pkg/interface/soto/src/js/api.js @@ -11,7 +11,7 @@ class UrbitApi { bind(path, method, ship = this.authTokens.ship, appl = "dojo", success, fail) { this.bindPaths = _.uniq([...this.bindPaths, path]); - window.subscriptionId = window.urb.subscribe(ship, appl, path, + window.subscriptionId = window.urb.subscribe(ship, appl, path, (err) => { fail(err); }, @@ -30,7 +30,7 @@ class UrbitApi { } soto(data) { - this.action("dojo", "sole-action", + this.action("dojo", "sole-action", {id: this.authTokens.dojoId, dat: data} ); } @@ -40,7 +40,7 @@ class UrbitApi { window.urb.poke(ship, appl, mark, data, (json) => { resolve(json); - }, + }, (err) => { reject(err); }); diff --git a/pkg/interface/soto/src/js/components/history.js b/pkg/interface/soto/src/js/components/history.js index 21e97381fe..d90f5a755a 100644 --- a/pkg/interface/soto/src/js/components/history.js +++ b/pkg/interface/soto/src/js/components/history.js @@ -4,7 +4,7 @@ export class History extends Component { constructor(props) { super(props); } - + render() { return (

{ e.preventDefault(); @@ -47,7 +47,7 @@ export class Input extends Component { } } - + // tab completion else if (e.key === "Tab") { api.soto({tab: this.props.cursor}); @@ -68,8 +68,8 @@ render() { {this.props.prompt} -
+
); } } diff --git a/pkg/interface/soto/src/js/components/lib/sole.js b/pkg/interface/soto/src/js/components/lib/sole.js index 8c26a1515b..f69e4000d5 100644 --- a/pkg/interface/soto/src/js/components/lib/sole.js +++ b/pkg/interface/soto/src/js/components/lib/sole.js @@ -12,11 +12,11 @@ export class Share { this.leg = leg; } - abet() { - return { buf:this.buf, - leg:this.leg.slice(), - ven:this.ven.slice() - }; + abet() { + return { buf:this.buf, + leg:this.leg.slice(), + ven:this.ven.slice() + }; } apply(ted){ @@ -59,7 +59,7 @@ export class Share { case 'ins': if ((at < dex.ins.at) || ((at === dex.ins.at) && !(cha <= dex.ins.cha))) { dex.ins.at++; - } + } else if (at >= dex.ins.at) { dex.ins.at = at; //NOTE possibly unpredictable behaviour dex.ins.at++; // for sole inserts that aren't tabs @@ -82,9 +82,9 @@ export class Share { switch (false) { case 'nop' !== ted: return ted; case !ted.map: - return ted.map( tad => { - const res = this.inverse(tad); - this.apply(tad); + return ted.map( tad => { + const res = this.inverse(tad); + this.apply(tad); return res; }).reverse(); default: switch (Object.keys(ted)[0]) { @@ -97,18 +97,18 @@ export class Share { } receive({ler,ted}){ - if (!(ler[1] === this.ven[1])) { + if (!(ler[1] === this.ven[1])) { throw `-out-of-sync.[${str(ler)} ${str(this.ven)}]`; } - this.leg = this.leg.slice((this.leg.length + ler[0]) - this.ven[0]); + this.leg = this.leg.slice((this.leg.length + ler[0]) - this.ven[0]); const dat = this.transmute(this.leg, ted); - this.ven[1]++; - this.apply(dat); + this.ven[1]++; + this.apply(dat); return dat; } - remit() { - throw 'stub'; + remit() { + throw 'stub'; } transmit(ted){ @@ -126,12 +126,12 @@ export class Share { transpose(ted,pos){ if (pos === undefined) { return this.transpose(this.leg, ted); - } + } else { let left; - return ((left = + return ((left = (this.transmute( - ted, {ins: {at: pos}})).ins) != null ? + ted, {ins: {at: pos}})).ins) != null ? left : { at:0 } ).at; } diff --git a/pkg/interface/soto/src/js/store.js b/pkg/interface/soto/src/js/store.js index b9a2e8d6be..d7a59a8ace 100644 --- a/pkg/interface/soto/src/js/store.js +++ b/pkg/interface/soto/src/js/store.js @@ -14,7 +14,7 @@ export class Store { this.sync = this.sync.bind(this); this.print = this.print.bind(this); } - + handleEvent(data) { // recursive handler if (data.data) { @@ -23,10 +23,10 @@ export class Store { var dojoReply = data; } // %mor sole-effects are nested, so throw back to handler - if (dojoReply.map) { + if (dojoReply.map) { return dojoReply.map(reply => this.handleEvent(reply)); } - + switch(Object.keys(dojoReply)[0]) { case 'txt': return this.print(dojoReply.txt); @@ -53,25 +53,25 @@ export class Store { default: console.log(dojoReply); } } - + doEdit(ted) { let detSend = buffer.transmit(ted); this.sync(ted); return api.soto({det: detSend}); } - + print(txt) { let textLog = this.state.txt; textLog.push(txt); return this.setState({ txt: textLog }); } - + sync(ted) { return this.setState({ input: buffer.buf, cursor: buffer.transpose(ted, this.state.cursor) }); } - + setStateHandler(setState) { this.setState = setState; } diff --git a/pkg/interface/timer/tile/api.js b/pkg/interface/timer/tile/api.js index 4098bf39bc..429a3959c7 100644 --- a/pkg/interface/timer/tile/api.js +++ b/pkg/interface/timer/tile/api.js @@ -1,7 +1,7 @@ class Api { bind(app, path, success, fail, ship) { - window.urb.subscribe(ship, app, path, + window.urb.subscribe(ship, app, path, (err) => { fail(err, app, path, ship); }, @@ -29,7 +29,7 @@ class Api { window.urb.poke(ship, appl, mark, data, (json) => { resolve(json); - }, + }, (err) => { reject(err); }); diff --git a/pkg/interface/timer/tile/components/flashing.js b/pkg/interface/timer/tile/components/flashing.js index 6a5c5674ad..e5666c2f4b 100644 --- a/pkg/interface/timer/tile/components/flashing.js +++ b/pkg/interface/timer/tile/components/flashing.js @@ -7,7 +7,7 @@ export default class Flashing extends Component { this.state = { color: "black" }; } - //memory cleanup + //memory cleanup componentWillUnmount() { this.alive = false; } @@ -19,7 +19,7 @@ export default class Flashing extends Component { else if(this.state.color == "white") { this.setState({color: "black"}) } } },400); - + return
{this.props.children}
diff --git a/pkg/interface/timer/tile/components/volume-icon.js b/pkg/interface/timer/tile/components/volume-icon.js index 1ad34420f9..4f45af91b6 100644 --- a/pkg/interface/timer/tile/components/volume-icon.js +++ b/pkg/interface/timer/tile/components/volume-icon.js @@ -18,7 +18,7 @@ export default class VolumeIcon extends Component { this.toggleSound()}}> Stop; } else if(this.state.mode == "alarm") { @@ -227,13 +227,13 @@ export default class TimerTile extends Component { interaction = Start; } - + return this.renderWrapper((
- +
- {this.state.mode == "running" ? this.formatTime(this.state.time) : + {this.state.mode == "running" ? this.formatTime(this.state.time) : this.state.mode == "alarm" ?
00:00 { - this.state.playSound + this.state.playSound ?