update to preact x

client/src/app.jsx

@@ -1,7 +1,7 @@
 const preact = require('preact');
 // const logger = require('redux-diff-logger');
 
-const { Provider } = require('preact-redux');
+const { Provider } = require('react-redux');
 const { createStore, combineReducers } = require('redux');
 
 const reducers = require('./reducers');

client/src/components/cryp.spawn.container.js

@@ -1,4 +1,4 @@
-const { connect } = require('preact-redux');
+const { connect } = require('react-redux');
 
 const CrypSpawnButton = require('./cryp.spawn.button');
 

client/src/components/game.container.jsx

@@ -1,4 +1,4 @@
-const { connect } = require('preact-redux');
+const { connect } = require('react-redux');
 
 const actions = require('../actions');
 

client/src/components/game.cryp.jsx

@@ -1,4 +1,4 @@
-const { connect } = require('preact-redux');
+const { connect } = require('react-redux');
 const preact = require('preact');
 const range = require('lodash/range');
 
@@ -106,7 +106,7 @@ function GameCryp(props) {
             <figure
                 className="img"
                 onClick={() => selectSkillTarget(cryp.id)} >
-                {crypAvatar(cryp.name)}
+                {crypAvatar(cryp.name, cryp.id)}
                 {combatTextEl}
                 {anim}
             </figure>

client/src/components/header.container.jsx

@@ -1,4 +1,4 @@
-const { connect } = require('preact-redux');
+const { connect } = require('react-redux');
 
 const Header = require('./header.component');
 

client/src/components/info.container.jsx

@@ -1,4 +1,4 @@
-const { connect } = require('preact-redux');
+const { connect } = require('react-redux');
 
 const actions = require('../actions');
 const Info = require('./info.component');

client/src/components/instance.component.jsx

@@ -1,5 +1,5 @@
 const preact = require('preact');
-const { connect } = require('preact-redux');
+const { connect } = require('react-redux');
 
 const Vbox = require('./vbox.component');
 const InfoContainer = require('./info.container');

client/src/components/instance.create.form.jsx

@@ -1,5 +1,5 @@
 const preact = require('preact');
-const { connect } = require('preact-redux');
+const { connect } = require('react-redux');
 const { Component } = require('preact');
 
 const addState = connect(

client/src/components/instance.cryps.jsx

@@ -1,4 +1,4 @@
-const { connect } = require('preact-redux');
+const { connect } = require('react-redux');
 const preact = require('preact');
 const range = require('lodash/range');
 
@@ -205,7 +205,7 @@ function Cryp(props) {
 
     return (
         <div key={cryp.id} className={crypClass} onClick={onClick} >
-            {instanceCryp(cryp.name)}
+            {instanceCryp(cryp.name, cryp.id)}
             <h2 className="name" >{cryp.name}</h2>
             <div className="skills" onMouseOver={e => hoverInfo(e, 'crypSkills')} >
                 {skills}

client/src/components/instance.equip.jsx

@@ -1,4 +1,4 @@
-const { connect } = require('preact-redux');
+const { connect } = require('react-redux');
 const preact = require('preact');
 const range = require('lodash/range');
 

client/src/components/list.jsx

@@ -1,4 +1,4 @@
-const { connect } = require('preact-redux');
+const { connect } = require('react-redux');
 const preact = require('preact');
 
 const { NULL_UUID } = require('./../utils');

client/src/components/login.container.jsx

@@ -1,4 +1,4 @@
-const { connect } = require('preact-redux');
+const { connect } = require('react-redux');
 
 const Login = require('./login.component');
 

client/src/components/main.jsx

@@ -1,6 +1,6 @@
 // eslint-disable-next-line
 const preact = require('preact');
-const { connect } = require('preact-redux');
+const { connect } = require('react-redux');
 
 const LoginContainer = require('./login.container');
 const GameContainer = require('./game.container');

client/src/components/menu.container.jsx

@@ -1,4 +1,4 @@
-const { connect } = require('preact-redux');
+const { connect } = require('react-redux');
 
 const Menu = require('./menu.component');
 const actions = require('./../actions');

client/src/components/nav.jsx

@@ -1,4 +1,4 @@
-const { connect } = require('preact-redux');
+const { connect } = require('react-redux');
 const preact = require('preact');
 const actions = require('../actions');
 

client/src/components/skill.btn.jsx

@@ -1,5 +1,5 @@
 const preact = require('preact');
-const { connect } = require('preact-redux');
+const { connect } = require('react-redux');
 
 const actions = require('../actions');
 

client/src/components/targeting.arrows.jsx

@@ -1,5 +1,5 @@
 const preact = require('preact');
-const { connect } = require('preact-redux');
+const { connect } = require('react-redux');
 
 const addState = connect(
     ({ game, account, resolution }) => ({ game, account, resolution })

client/src/components/team.jsx

@@ -1,5 +1,5 @@
 const preact = require('preact');
-const { connect } = require('preact-redux');
+const { connect } = require('react-redux');
 const range = require('lodash/range');
 
 const actions = require('./../actions');
@@ -94,7 +94,7 @@ function Team(args) {
                     className="menu-cryp"
                     style={ { 'border-color': borderColour || 'whitesmoke' } }
                     onClick={() => selectCryp(cryp.id)} >
-                    {crypAvatar(cryp.name)}
+                    {crypAvatar(cryp.name, cryp.id)}
                     <h2>{cryp.name}</h2>
                 </div>
             </div>

client/src/components/vbox.component.jsx

@@ -1,6 +1,6 @@
 const preact = require('preact');
 const range = require('lodash/range');
-const { connect } = require('preact-redux');
+const { connect } = require('react-redux');
 
 const shapes = require('./shapes');
 const { convertItem } = require('./../utils');

client/src/utils.jsx

@@ -1,4 +1,6 @@
 const preact = require('preact');
+const { useEffect } = require('preact/hooks');
+
 const get = require('lodash/get');
 const anime = require('animejs').default;
 
@@ -54,9 +56,12 @@ function requestAvatar(name) {
         .then(svg => svg);
 }
 
-function crypAvatar(name) {
+function crypAvatar(name, id) {
+    useEffect(() => animateCryp(id));
+
     return (
         <img
+            id={id}
             src={`/molecules/${genAvatar(name)}.svg`}
             height="500"
             onError={event => event.target.setAttribute('src', '/molecules/726.svg')}
@@ -64,12 +69,14 @@ function crypAvatar(name) {
     );
 }
 
-function instanceCryp(name) {
+function instanceCryp(name, id) {
+    useEffect(() => animateCryp(id));
+
     return (
         <div
             className="avatar"
+            id={id}
             style={{'background-image': `url(/molecules/${genAvatar(name)}.svg)`}}
-            onError={event => event.target.setAttribute('src', '/molecules/726.svg')}
         />
     );
 }
@@ -531,13 +538,14 @@ function convertItem(v) {
 }
 
 function animateCryp(id) {
+    const target = document.getElementById(id);
     return anime({
-        targets: `#${id}`,
+        targets: target,
         translateX: () => anime.random(-20, 20),
         translateY: () => anime.random(0, -40),
         rotate: () => anime.random(-15, 15),
-        duration: () => anime.random(5000, 6000),
-        delay: () => anime.random(0, 1000),
+        duration: () => anime.random(2000, 5000),
+        delay: () => anime.random(0, 2000),
         direction: 'alternate',
         easing: 'linear',
         loop: true,
@@ -545,6 +553,7 @@ function animateCryp(id) {
 }
 
 module.exports = {
+    animateCryp,
     stringSort,
     convertItem,
     numSort,