Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
stanf0rd committed Dec 26, 2018
2 parents be3ad6a + 428e6a6 commit de0e655
Show file tree
Hide file tree
Showing 172 changed files with 3,620 additions and 1,156 deletions.
76 changes: 38 additions & 38 deletions package-lock.json

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

11 changes: 8 additions & 3 deletions src/app.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
import Router from './modules/router';
import MainApp from './applications/menu/menu_app';
import MainApp from './applications/main/main_app';
import Terminal from './applications/terminal/terminal_app';
import Snake from './applications/snake/game_app';
import Game from './applications/frame/game_app';

import '../static/favicon.ico';
import './style.pcss';

new Router(document.body, MainApp)
.registerApp('terminal', Terminal)
.registerApp('snake', Snake)
.registerApp('test', Game, 'https://www.innogames.com/games/all-games/')
.start();


if ('serviceWorker' in navigator) {
navigator.serviceWorker
.register('./sw.js')
.catch(err => console.error({ err }));
}
Loading

1 comment on commit de0e655

@vercel
Copy link

@vercel vercel bot commented on de0e655 Dec 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now could not deploy this pull request since the now.json file does not contain valid JSON.

Click here to see the contents of `now.json`
{
  "alias": ["wave"],

}


For more information on now.json visit https://zeit.co/docs/features/configuration#now.json.

Please sign in to comment.