Skip to content

Commit

Permalink
Serving correctly with resources executing
Browse files Browse the repository at this point in the history
  • Loading branch information
Jamie Burke committed May 9, 2017
1 parent 61f8474 commit 9e667b5
Show file tree
Hide file tree
Showing 8 changed files with 57 additions and 42 deletions.
16 changes: 7 additions & 9 deletions client.js
Expand Up @@ -8,21 +8,19 @@ function aphexCountdown() {
let differenceInMilliseconds = moment(then,"DD/MM/YYYY HH:mm:ss")
.diff( moment(now,"DD/MM/YYYY HH:mm:ss") );

let duration = moment.duration(differenceInMilliseconds);
let duration = moment.duration( Math.sqrt(differenceInMilliseconds)) ;

let i = 0;

$countdown.text(differenceInMilliseconds);
$countdown.text(duration);
setInterval(function() {
$countdown.text(differenceInMilliseconds--);
$countdown.text(duration--);
}, 100);
}

class TextScramble {
constructor(el) {
this.el = el;
// this.chars = '!<>-_\\/[]{}—=+*^?#________';
this.chars = '!<>-_\\/[]{}—=+*^?#___201';
this.chars = '!<>-_\\/[]{}—=+*^?#___20173';
this.update = this.update.bind(this)
}

Expand Down Expand Up @@ -78,7 +76,7 @@ class TextScramble {
}

function initScramblers() {
const labelScrambler = new TextScramble(document.getElementById('aphex-label'));
// const labelScrambler = new TextScramble(document.getElementById('aphex-label'));
const ntsScrambler = new TextScramble(document.getElementById('nts-label'));

let scramblerFrequency = 2000;
Expand Down Expand Up @@ -108,14 +106,14 @@ function initScramblers() {
? selectedIndex++
: selectedIndex--;

labelScrambler.setText( padWithDots(phrases[selectedIndex]));
// labelScrambler.setText( padWithDots(phrases[selectedIndex]));
ntsScrambler.setText("NTS");
};
scrambleText();
setInterval( scrambleText, scramblerFrequency);
}

$(document).on('ready', function () {
$(document).ready( function () {
aphexCountdown();
initScramblers();

Expand Down
43 changes: 25 additions & 18 deletions index.html
Expand Up @@ -12,30 +12,34 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta name="alexaVerifyID" content="0nB4V_obvRJ_aeYCgb4upBX4x7Y"/>

<link rel="stylesheet" href="https://ntslive.github.io/god-colony/style.css"/>
<!--<link rel="stylesheet" href="/style.css"/>-->
<!--<link rel="stylesheet" href="https://ntslive.github.io/god-colony/style.css"/>-->
<link rel="stylesheet" href="/public/css/style.css"/>

<title></title>
<meta name="description" content="">
<!--<title></title>-->
<!--<meta name="description" content="">-->

<meta name="twitter:card" content="summary_large_image" />
<meta name="twitter:site" content="@NTSLive" />
<!--<meta name="twitter:card" content="" />-->
<!--<meta name="twitter:site" content="@NTSLive" />-->

<meta property="og:site_name" content="NTS" />
<meta property="og:description" content="">
<meta property="og:title" content=""/>
<meta property="og:type" content=""/>
<meta property="og:url" content=""/>
<meta property="og:image" content=""/>
<meta property="og:image:width" content=""/>
<meta property="og:image:height" content=""/>
<meta property="og:video" content=""/>
<!--<meta property="og:site_name" content="NTS" />-->
<!--<meta property="og:description" content="">-->
<!--<meta property="og:title" content=""/>-->
<!--<meta property="og:type" content=""/>-->
<!--<meta property="og:url" content=""/>-->
<!--<meta property="og:image" content=""/>-->
<!--<meta property="og:image:width" content=""/>-->
<!--<meta property="og:image:height" content=""/>-->
<!--<meta property="og:video" content=""/>-->

<link rel="canonical" href=""/>

<script src="https://code.jquery.com/jquery-3.1.1.min.js" integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" crossorigin="anonymous" type="text/javascript"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.18.1/moment.min.js" type="text/javascript"></script>


<!--<script src="https://ntslive.github.io/god-colony/client.js" type="text/javascript"></script>-->
<script src="/client.js" type="text/javascript"></script>
<!--<script src="public/js/prod.js" type="text/javascript"></script>-->
<script src="client.js" type="text/javascript" defer></script>
</head>

<body>
Expand All @@ -46,8 +50,11 @@
<span id="countdown"></span><span id="countdown-padding" class="aphexDotPadding">....................................................</span>
</div>
<div>
<span id="aphex-label">APHEX TWIN</span><span class="aphexDotPadding">....................................................</span>
<span class="aphexDotPadding">....................................................</span>
</div>
<!--<div>-->
<!--<span id="aphex-label">APHEX TWIN</span><span class="aphexDotPadding">....................................................</span>-->
<!--</div>-->
<div>
<span id="nts-label">NTS</span><span class="aphexDotPadding">....................................................</span>
</div>
Expand All @@ -62,7 +69,7 @@
</div>
</div>

<img class="aphex-gif" src="/img/aphex/test.gif"/>
<img class="aphex-gif" src="/public/img/messy.gif"/>
</div>

</body>
Expand Down
15 changes: 10 additions & 5 deletions public/css/style.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion public/css/style.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added public/img/messy.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions public/js/prod.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 9e667b5

Please sign in to comment.