diff --git a/WORKLOG.md b/WORKLOG.md index c2c681e7..f3fbd3d1 100644 --- a/WORKLOG.md +++ b/WORKLOG.md @@ -1,9 +1,15 @@ # WORK WORK ## NOW -*SERVER* -* tx middleware - remove tx from methods that don't need it +*PRODUCTION* +* serde serialize privatise +* stripe prod +* account page +* graphs n shit +* acp init +* DO postgres +## SOON +*SERVER* * modules * troll life -> dmg * prince of peace @@ -11,11 +17,6 @@ * fuck magic * empower on ko -* serde serialize privatise - -## SOON -*OPS* - *$$$* * chatwheel * eth adapter @@ -39,9 +40,6 @@ the ready screen should totally be your constructs facing off against the other guy the chatwheel and a ready button -i'm also gonna put back in -if you click a vbox item and click inventory -it buys it *SERVER* * vbox drops chances diff --git a/client/assets/styles/game.css b/client/assets/styles/game.css index b28b6ef0..e7585321 100644 --- a/client/assets/styles/game.css +++ b/client/assets/styles/game.css @@ -303,12 +303,12 @@ border-top: 1px solid purple; } -.game .img { +.game .img, .faceoff .img { position: relative; height: 100%; } -.game .avatar { +.game .avatar, .faceoff .avatar { grid-area: avatar; width: 100%; height: 100%; diff --git a/client/assets/styles/instance.less b/client/assets/styles/instance.less index 2681567d..aebde113 100644 --- a/client/assets/styles/instance.less +++ b/client/assets/styles/instance.less @@ -379,6 +379,37 @@ opacity: 0.5; } + +.faceoff { + overflow: hidden; + display: grid; + grid-template-rows: min-content 1fr 1fr min-content ; + grid-template-areas: + "oppname" + "opponent" + "player" + "playername"; + + .ready { + background: black; + color: @green; + } + + h1 { + text-align: center; + } + + .opponent-name { + margin-bottom: 1em; + grid-area: oppname; + } + + .player-name { + margin-top: 1em; + grid-area: playername; + } +} + /* Mobile Nav*/ .instance-nav { display: none; } diff --git a/client/src/components/faceoff.jsx b/client/src/components/faceoff.jsx new file mode 100644 index 00000000..e7545c2e --- /dev/null +++ b/client/src/components/faceoff.jsx @@ -0,0 +1,82 @@ +const preact = require('preact'); +const { connect } = require('preact-redux'); + +const actions = require('../actions'); + +const { ConstructAvatar } = require('./construct'); + +const addState = connect( + function receiveState(state) { + const { + instance, + account, + } = state; + + + return { + instance, + account, + }; + }, +); + +function FaceoffConstruct(args) { + const { + construct + } = args; + + return ( +