urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-11-27 18:34:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'matilde/soto-to-dojo'

Browse Source 
* matilde/soto-to-dojo:
  soto: mounts at ~dojo

Signed-off-by: Jared Tobin <jared@tlon.io>
This commit is contained in:
Jared Tobin 2019-11-23 20:03:12 +08:00
commit 7db6f443e6
No known key found for this signature in database
GPG Key ID: 0E4647D58F8A69E4
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/arvo/app/soto.hoon
View File

@ -74,11 +74,11 @@
|= old=(unit state)
^- (quip move _this)
=/ launcha=poke
[%launch-action [%soto /sototile '/~soto/js/tile.js']]
[%launch-action [%soto /sototile '/~dojo/js/tile.js']]
?~ old
:_ this
:~
[ost.bol %connect / [~ /'~soto'] %soto]
[ost.bol %connect / [~ /'~dojo'] %soto]
[ost.bol %poke /soto [our.bol %launch] launcha]
==
[~ this(sta u.old)]
@ -144,26 +144,26 @@
::
:: styling
::
[%'~soto' %css %index ~]
[%'~dojo' %css %index ~]
:_ this
[ost.bol %http-response (css-response:app style)]~
::
:: javascript
::
[%'~soto' %js %index ~]
[%'~dojo' %js %index ~]
:_ this
[ost.bol %http-response (js-response:app script)]~
::
:: images
::
[%'~soto' %img *]
[%'~dojo' %img *]
=/ img (as-octs:mimes:html (~(got by soto-png) `@ta`name))
:_ this
[ost.bol %http-response (png-response:app img)]~
::
:: index page
::
[%'~soto' *]
[%'~dojo' *]
:_ this
[ost.bol %http-response (html-response:app index)]~
==

4
pkg/arvo/app/soto/index.html
View File

@ -5,12 +5,12 @@
<meta charset="utf-8" />
<meta name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
<link rel="stylesheet" href="/~soto/css/index.css" />
<link rel="stylesheet" href="/~dojo/css/index.css" />
</head>
<body class="bg-black">
<div id="root" />
<script src="/~/channel/channel.js"></script>
<script src="/~modulo/session.js"></script>
<script src="/~soto/js/index.js"></script>
<script src="/~dojo/js/index.js"></script>
</body>
</html>

2
pkg/interface/soto/src/js/components/root.js
View File

@ -20,7 +20,7 @@ export class Root extends Component {
<BrowserRouter>
<div style={{height: "100vh"}}>
<HeaderBar/>
<Route exact path="/~soto" render={ () => {
<Route exact path="/~dojo" render={ () => {
return (
<div className="pa3 bg-black mono gray3 w-100"
style={{lineHeight: "1.4", height: "calc(100% - 48px)", cursor: "text"}}>

4
pkg/interface/soto/tile/tile.js
View File

@ -8,12 +8,12 @@ export default class sotoTile extends Component {
render() {
return (
<div className="w-100 h-100 relative" style={{background: "#1a1a1a"}}>
<a className="w-100 h-100 db no-underline" href="/~soto">
<a className="w-100 h-100 db no-underline" href="/~dojo">
<p className="gray label-regular b absolute"
style={{ left: 8, top: 4 }}>
Dojo
</p>
<img src="~soto/img/Tile.png"
<img src="~dojo/img/Tile.png"
className="absolute"
style={{ left: 30, top: 30, height: "174px", width: "174px"}}
/>