Skip to content

Commit

Permalink
...
Browse files Browse the repository at this point in the history
  • Loading branch information
tong committed Nov 10, 2020
1 parent 936aa0f commit 4cfe5c8
Show file tree
Hide file tree
Showing 18 changed files with 122 additions and 25 deletions.
1 change: 0 additions & 1 deletion app.hxml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
-main App
Audioplayer
-cp sources
-lib om.core
-dce full
-debug
-D source-header=
Expand Down
Binary file removed content/disktree-cover.png
Binary file not shown.
Binary file added content/disktree-feature.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions content/disktree-feature.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
33 changes: 33 additions & 0 deletions content/draft/jonestown/index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
---
title: "Jonestown"
date: 2020-10-10
type: "project"
theme: "wb"
tags: ["music"]
description: ""
links: [
disktree.net/music/jonestown/jonestown-2.mp3,
disktree.net/music/jonestown/jonestown-3.mp3,
disktree.net/music/jonestown/jonestown-4.mp3,
disktree.net/music/jonestown/jonestown-5.mp3,
disktree.net/music/jonestown/jonestown-6.mp3,
disktree.net/music/jonestown/jonestown-7.mp3,
disktree.net/music/jonestown/jonestown-8.mp3,
disktree.net/music/jonestown/jonestown-10.mp3,
disktree.net/music/jonestown/jonestown-11.mp3,
disktree.net/music/jonestown/jonestown-13.mp3,
]
draft: true
---
{{< image src="jonestown_2.jpg" style="position:fixed;right:1rem;bottom:1rem;width:34%;" >}}
{{< background-image "jonestown_3.jpg" >}}
{{< audio src="https://disktree.net/music/jonestown/jonestown-2.mp3" >}}
{{< audio src="https://disktree.net/music/jonestown/jonestown-3.mp3" >}}
{{< audio src="https://disktree.net/music/jonestown/jonestown-4.mp3" >}}
{{< audio src="https://disktree.net/music/jonestown/jonestown-5.mp3" >}}
{{< audio src="https://disktree.net/music/jonestown/jonestown-6.mp3" >}}
{{< audio src="https://disktree.net/music/jonestown/jonestown-7.mp3" >}}
{{< audio src="https://disktree.net/music/jonestown/jonestown-8.mp3" >}}
{{< audio src="https://disktree.net/music/jonestown/jonestown-10.mp3" >}}
{{< audio src="https://disktree.net/music/jonestown/jonestown-11.mp3" >}}
{{< audio src="https://disktree.net/music/jonestown/jonestown-13.mp3" >}}
12 changes: 12 additions & 0 deletions content/draft/muzak.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
title: "Muzak"
date: 2018-06-20
tags: [speech,recognition]
description: ""
type: project
links: [
disktree.net/app/muzak
]
draft: true
---
{{< iframe src="https://disktree.net/app/muzak/" >}}
4 changes: 2 additions & 2 deletions content/project/84/index.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "84"
date: 1984-01-01
tags: ["music","mixtape"]
tags: [music,mixtape]
---
{{< background-image 84.jpg >}}
{{< background-audio "https://music.disktree.net/MIX/hutter_80_tapes_2.mp3" >}}
{{< background-audio "https://disktree.net/music/MIX/hutter_80_tapes_2.mp3" >}}
2 changes: 1 addition & 1 deletion content/project/atom-videoplayer/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ links: [
github.com/tong/atom-videoplayer
]
---
{{< image src="atom-videoplayer.png" >}}
{{< image src="atom-videoplayer-feature.png" >}}
4 changes: 2 additions & 2 deletions content/project/fadr/index.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "Fadr"
date: 2013-05-26T12:54:57+02:00
tags: [experiment,haxe]
date: 2013-05-26
tags: [light,haxe]
links: [
fadr.disktree.net,
chrome.google.com/webstore/detail/fadr/lionpbnnnifoojemhjailcbcnbdcibfe,
Expand Down
2 changes: 0 additions & 2 deletions content/project/fract/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@
title: "Fract"
date: 2002-01-01
tags: [music,tekno]
description: ""
links: [
disktree.net/music/setrat.ogg,
disktree.net/music/kontroverse2.ogg
]
draft: true
---
{{< background-image fractint-feature.jpg >}}
{{< audio src="http://disktree.net/music/setrat.ogg" >}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ links: [
github.com/disktree/fuxnews
]
---
{{<iframe src="https://disktree.net/app/fuxnews">}}
{{< iframe src="https://disktree.net/app/fuxnews" >}}
4 changes: 2 additions & 2 deletions content/project/letterspace.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ date: 2017-09-25
tags: [game,rtc,haxe]
description: "A fucking webrtc p2p multiplayer mesh network space."
links: [
disktree.net/app/letterspace
http://letterspace.disktree.net/
]
---
{{<iframe src="https://disktree.net/app/letterspace">}}
{{< iframe src="http://letterspace.disktree.net/" >}}
4 changes: 2 additions & 2 deletions content/project/strobe.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "Strobe"
date: 2016-09-11T12:54:57+02:00
tags: ["web","haxe"]
date: 2016-09-11
tags: [light,haxe]
links: [
strobe.disktree.net,
github.com/disktree/strobe
Expand Down
13 changes: 6 additions & 7 deletions layouts/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" height="100%" width="100%">
<style>
path {
stroke: #fff;
stroke: var(--f_med);
stroke-width: 2;
}
</style>
Expand All @@ -25,11 +25,10 @@
<!-- -->
{{ end }}


{{ define "scripts" }}
<script>
window.addEventListener('load', e => {
setTimeout(() => { window.location = '{{ .Site.BaseURL }}/project'; }, 20 );
});
</script>
<script>
window.addEventListener('load', e => {
setTimeout(() => { window.location = '{{ .Site.BaseURL }}/project'; }, 30 );
});
</script>
{{ end }}
38 changes: 36 additions & 2 deletions sources/App.hx
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import js.html.File;

import haxe.Json;
import js.Browser.console;
import js.Browser.document;
import js.Browser.window;
import js.html.File;
import js.html.IFrameElement;

using haxe.io.Path;

Expand All @@ -11,7 +14,7 @@ class App {

console.log("%cDISKTREE.NET", "color:#000");

document.addEventListener('DOMContentLoaded', e -> {
document.addEventListener( 'DOMContentLoaded', e -> {
var pageTheme = document.head.querySelector('meta[name="theme"]');
if( pageTheme == null ) {
var theme = Theme.loadLocal();
Expand Down Expand Up @@ -50,6 +53,37 @@ class App {
} );
}
});

/*
var iframe : IFrameElement = cast document.body.querySelector( 'main article iframe' );
if( iframe != null ) {
var source = null;
window.addEventListener( 'message', function(e){
console.debug(e);
var msg : Dynamic = try Json.parse( e.data ) catch(e:Dynamic) {
trace(e);
return;
}
console.debug(msg);
source = e.source;
//var title = document.body.querySelector( 'main .title' );
//title.textContent = msg.channel;
//e.source.posMessage( Json.stringify( { channel: 'sander-2', video: 1 } ) );
}, false );
window.addEventListener( 'keydown', e -> {
switch e.key {
case 'd':
trace(source);
if( source != null ) {
source.postMessage( Json.stringify( { channel: 'sander-2', video: 1 } ) );
}
//iframe.postMessage( { channel: 'sander-2', video: 1 } );
default:
}
});
}
*/
});
}
}
11 changes: 11 additions & 0 deletions static/img/upsidedowncross.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions style/component/project.less
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ nav.prev_next {
body > main > div.project {
display: grid;
grid-template-columns: 1fr; //repeat(4,1fr);
grid-template-rows: auto auto auto auto 1fr;
grid-template-rows: minmax(3rem,auto) minmax(5.5rem,auto) auto auto 1fr;
//align-items: center;
//gap: 0.5rem;
height: 100%;
Expand All @@ -82,7 +82,7 @@ body > main > div.project {
display: flex;
flex-direction: row;
flex-wrap: wrap;
margin-bottom: 0.5rem;
//margin-bottom: 0.5rem;
position: relative;
left: 2px;
>* {
Expand Down
2 changes: 1 addition & 1 deletion style/core.less
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ h1, h2, h3, h4, h5, h6 {

h1 {
font-size: var(--h1-size);
letter-spacing: -3px;
letter-spacing: -4px;
//line-height: 1em;
// padding-top: 0.1em;
//background: blue;
Expand Down

0 comments on commit 4cfe5c8

Please sign in to comment.