This commit is contained in:
ntr
2019-05-14 15:41:01 +10:00
parent a069249d98
commit 9af2e8717f
8 changed files with 69 additions and 42 deletions
+3 -2
View File
@@ -19,11 +19,12 @@ function renderBody(props) {
if (!account) {
return (
<main>
<section>
<LoginContainer />
</main>
</section>
);
}
if (game) {
return (
<GameContainer />
+4 -4
View File
@@ -28,7 +28,7 @@ function GamePanel(props) {
if (showLog) {
const logs = game.log.map((l, i) => (<div key={i}>{l}</div>)).reverse();
return (
<main className="game">
<section className="game">
<div className="instance-hdr">
<button
className="game-btn instance-btn instance-ui-btn left"
@@ -42,7 +42,7 @@ function GamePanel(props) {
<div className="logs">
{logs}
</div>
</main>
</section>
);
}
@@ -173,13 +173,13 @@ function GamePanel(props) {
const gameClasses = `game ${resolution ? 'resolving': ''}`;
return (
<main className={gameClasses} onClick={() => setActiveCryp(null)} >
<section className={gameClasses} onClick={() => setActiveCryp(null)} >
{header}
{timer}
{PlayerTeam(playerTeam, setActiveSkill)}
<TargetingArrows />
{otherTeams.map(OpponentTeam)}
</main>
</section>
);
}
+2 -5
View File
@@ -81,7 +81,7 @@ function InstanceComponent(args) {
);
return (
<main className="instance" >
<section className="instance" >
<div className="instance-hdr">
{navBtn}
{menuBtn}
@@ -95,11 +95,8 @@ function InstanceComponent(args) {
<InstanceCrypsContainer />
<EquipmentContainer />
<InfoContainer />
</main>
</section>
);
}
// Removed while WIP
module.exports = InstanceComponent;
+2 -2
View File
@@ -145,10 +145,10 @@ function Menu(args) {
}
return (
<main className="menu">
<section className="menu">
{instanceList()}
{crypList()}
</main>
</section>
);
}
+12 -9
View File
@@ -1,5 +1,4 @@
const preact = require('preact');
const jdenticon = require('jdenticon');
const logger = require('redux-diff-logger');
const { Provider } = require('preact-redux');
@@ -55,17 +54,21 @@ document.fonts.load('16pt "Jura"').then(() => {
// events.setGame(testGame);
// ws.clearGameStateTimeout();
// tells jdenticon to look for new svgs and render them
// so we don't have to setInnerHtml or manually call update
jdenticon.config = {
replaceMode: 'observe',
};
const Cryps = () => (
<section className='cryps' >
<main className="cryps" >
<Header />
<nav>
<h2>Team</h2>
<h2>Instances</h2>
<button>
six
</button>
<button>
grep
</button>
</nav>
<Body />
</section>
</main>
);
const Main = () => (