koffing 0.4.0 → 0.5.0

package/src/components/BoardInput/BoardInput.css.js

@@ -0,0 +1,14 @@
+import {makeStyles} from '@material-ui/core/styles';
+
+export default makeStyles((theme) => ({
+  root: {
+    marginTop: 0,
+    overflow: 'hidden'
+  },
+  textArea: {
+    fontFamily: "monospace",
+    fontSize: "1em",
+    backgroundColor: theme.palette.secondary.main,
+    padding: theme.spacing()
+  }
+}))

package/src/components/BoardInput/BoardInput.js

@@ -0,0 +1,36 @@
+import React from 'react';
+import PropTypes from "prop-types";
+import TextField from "@material-ui/core/TextField";
+import useStyles from "./BoardInput.css";
+
+function BoardInput({value, onChange}) {
+  const classes = useStyles();
+
+  return <TextField
+    autoComplete="off"
+    autoCorrect="off"
+    autoCapitalize="off"
+    spellCheck="false"
+    multiline
+    className={classes.root}
+    rows="12"
+    rowsMax="24"
+    autoFocus={true}
+    placeholder="Place here your Showdown teams"
+    // defaultValue={exampleTeam}
+    fullWidth
+    margin="normal"
+    value={value}
+    inputProps={{
+      className: classes.textArea
+    }}
+    onChange={onChange}
+  />
+}
+
+BoardInput.propTypes = {
+  value: PropTypes.string.isRequired,
+  onChange: PropTypes.func
+}
+
+export default BoardInput;

package/src/components/BoardInput/index.js

@@ -0,0 +1,3 @@
+import BoardInput from './BoardInput';
+
+export default BoardInput;

package/src/components/BoardOutput/BoardOutput.css.js

@@ -0,0 +1,17 @@
+import {makeStyles} from '@material-ui/core/styles';
+
+export default makeStyles((theme) => ({
+  root: {
+    padding: theme.spacing() * 2,
+    color: theme.palette.text.secondary
+  },
+  qrContainer: {
+    padding: theme.spacing() * 2,
+    textAlign: "center",
+    backgroundColor: "#dde0f6"
+  },
+  jsonContainer: {
+    padding: theme.spacing() * 2,
+    backgroundColor: "#fafafa"
+  }
+}))

package/src/components/BoardOutput/BoardOutput.js

@@ -0,0 +1,36 @@
+import React from "react";
+import PropTypes from "prop-types";
+import Paper from "@material-ui/core/Paper";
+import QRCode from "qrcode.react";
+import Code from "../Code";
+import useStyles from "./BoardOutput.css";
+import logo from "../../img/koffing.png";
+
+const qrIconSettings = {
+  src: logo,
+  height: 48,
+  width: 48,
+  excavate: true
+}
+
+function BoardOutput({qrValue, jsonValue}) {
+  const classes = useStyles();
+
+  return (
+    <Paper className={classes.root} elevation={1}>
+      <Paper className={classes.qrContainer}>
+        <QRCode value={qrValue} size={320} renderAs="canvas" imageSettings={qrIconSettings}/>
+      </Paper>
+      <Paper className={classes.jsonContainer}>
+        <Code code={jsonValue} language={'json'}/>
+      </Paper>
+    </Paper>
+  );
+}
+
+BoardOutput.propTypes = {
+  qrValue: PropTypes.string.isRequired,
+  jsonValue: PropTypes.string.isRequired
+}
+
+export default BoardOutput;

package/src/components/BoardOutput/index.js

@@ -0,0 +1,3 @@
+import BoardOutput from './BoardOutput';
+
+export default BoardOutput;

package/src/components/Code/Code.css.js

@@ -0,0 +1,10 @@
+export default {
+  root: {
+    margin: '6px 0'
+  },
+  pre: {
+    margin: 0,
+    border: 'none !important',
+    color: '#008008'
+  }
+}

package/src/components/Code/Code.js

@@ -0,0 +1,28 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import StyledComponent from "../StyledComponent";
+import styles from "./Code.css";
+
+class Code extends StyledComponent {
+  static propTypes = Object.assign({}, super.propTypes, {
+    language: PropTypes.string.isRequired,
+    code: PropTypes.string.isRequired,
+  })
+
+  render() {
+    const formattedCode = this.props.code;
+    const codeClassName = `language-${this.props.language}`;
+    const {classes} = this.props;
+    return (
+      <div className={classes.root}>
+        <pre className={classes.pre}>
+          <code className={codeClassName}>
+              <div dangerouslySetInnerHTML={{__html: formattedCode}}/>
+          </code>
+        </pre>
+      </div>
+    );
+  }
+}
+
+export default Code.styled(styles);

package/src/components/Code/index.js

@@ -0,0 +1,3 @@
+import Code from './Code';
+
+export default Code;

package/src/components/StyledComponent.js

@@ -0,0 +1,24 @@
+import {Component} from 'react';
+import PropTypes from 'prop-types';
+import {withStyles} from '@material-ui/core/styles';
+// eslint-disable-next-line no-unused-vars
+import {StyledComponentProps} from '@material-ui/styles/withStyles'
+
+/**
+ * @link https://material-ui.com/es/styles/basics/#higher-order-component-api
+ */
+class StyledComponent extends Component {
+    static propTypes = {
+        classes: PropTypes.object.isRequired
+    }
+
+    /**
+     * @param {object} styles
+     * @returns {React.ComponentType<any & StyledComponentProps<T>>}
+     */
+    static styled(styles) {
+        return withStyles(styles)(this);
+    }
+}
+
+export default StyledComponent;

package/src/components/ThemedApp.js

@@ -0,0 +1,25 @@
+import React from 'react';
+import {createMuiTheme, MuiThemeProvider} from '@material-ui/core/styles';
+import App from "./App";
+
+const theme = createMuiTheme({
+  typography: {
+    fontFamily: '"Exo 2","Helvetica Neue",Arial,sans-serif',
+  },
+  palette: {
+    primary: {main: '#6B71B8'},
+    secondary: {main: '#F6F79D'},
+  },
+});
+
+
+const ThemedApp = () => (
+  <div className="koffing-app-container">
+    {/*<CssBaseline/>*//* MUI adds the reset at the end, which is not what we want*/}
+    <MuiThemeProvider theme={theme}>
+      <App/>
+    </MuiThemeProvider>
+  </div>
+);
+
+export default ThemedApp;

package/src/core/Koffing.js

@@ -0,0 +1,71 @@
+import Pokemon from "./Pokemon";
+import PokemonTeam from "./PokemonTeam";
+import PokemonTeamSet from "./PokemonTeamSet";
+import ShowdownParser from "./ShowdownParser";
+
+class Koffing {
+    /**
+     * Converts from Showdown to a PokemonTeamSet object.
+     *
+     * @param {String|Pokemon|PokemonTeam|PokemonTeamSet|ShowdownParser} data Showdown code or object
+     * @returns {PokemonTeamSet}
+     */
+    static parse(data) {
+        if (
+            data instanceof PokemonTeamSet
+            || data instanceof PokemonTeam
+            || data instanceof Pokemon
+        ) {
+            return data;
+        }
+        if (data instanceof ShowdownParser) {
+            return data.parse();
+        }
+        return (new ShowdownParser(data)).parse();
+    }
+
+    /**
+     * Prettifies and sanitizes the given Showdown code.
+     *
+     * @param {String|Pokemon|PokemonTeam|PokemonTeamSet|ShowdownParser} data Showdown code or object
+     * @returns {String}
+     */
+    static format(data) {
+        return this.parse(data).toShowdown();
+    }
+
+    /**
+     * Converts from Showdown to JSON code.
+     *
+     * @param {String|Pokemon|PokemonTeam|PokemonTeamSet|ShowdownParser} data Showdown code or object
+     * @returns {String}
+     */
+    static toJson(data) {
+        return this.parse(data).toJson();
+    }
+
+    /**
+     * Converts from JSON to Showdown code.
+     *
+     * @param {String|Object|Pokemon|PokemonTeam|PokemonTeamSet|ShowdownParser} data JSON code or object
+     * @returns {String}
+     */
+    static toShowdown(data) {
+        if (
+            data instanceof PokemonTeamSet
+            || data instanceof PokemonTeam
+            || data instanceof Pokemon
+        ) {
+            return data.toShowdown();
+        }
+        if (data instanceof ShowdownParser) {
+            return data.parse().format();
+        }
+        if (typeof data === 'string' || data instanceof String) {
+            data = JSON.parse(data);
+        }
+        return PokemonTeamSet.fromObject(JSON.parse(data)).toShowdown();
+    }
+}
+
+export default Koffing;

package/src/{Pokemon.js → core/Pokemon.js}

@@ -1,5 +1,3 @@
-"use strict";
-
 class Pokemon {
     constructor() {
         /**
@@ -34,6 +32,10 @@ class Pokemon {
          * @type {Number}
          */
         this.happiness = undefined;
+        /** 
+         * @type {String}
+         */
+        this.teratype = undefined;
         /**
          * @type {String}
          */
@@ -66,6 +68,7 @@ class Pokemon {
         p.level = obj.level;
         p.shiny = obj.shiny;
         p.happiness = obj.happiness;
+        p.teratype = obj.teratype;
         p.nature = obj.nature;
         p.evs = obj.evs;
         p.ivs = obj.ivs;
@@ -119,6 +122,10 @@ class Pokemon {
         if (!isNaN(this.happiness)) {
             str += `Happiness: ${this.happiness}\n`;
         }
+        
+        if (this.teratype) {
+          str += `Tera Type: ${this.teratype}\n`;
+        }
 
         if (this.nature) {
             str += `${this.nature} Nature\n`;

package/src/{PokemonTeam.js → core/PokemonTeam.js}

@@ -1,5 +1,3 @@
-"use strict";
-
 import Pokemon from "./Pokemon";
 
 class PokemonTeam {

package/src/{PokemonTeamSet.js → core/PokemonTeamSet.js}

@@ -1,5 +1,3 @@
-"use strict";
-
 import PokemonTeam from "./PokemonTeam";
 
 class PokemonTeamSet {

package/src/{ShowdownParser.js → core/ShowdownParser.js}

@@ -1,8 +1,6 @@
-"use strict";
-
-import Pokemon from "Pokemon";
-import PokemonTeam from "PokemonTeam";
-import PokemonTeamSet from "PokemonTeamSet";
+import Pokemon from "./Pokemon";
+import PokemonTeam from "./PokemonTeam";
+import PokemonTeamSet from "./PokemonTeamSet";
 
 /**
  * Ported from Pokemon Showdown Client's exportTeam/importTeam functions.
@@ -17,7 +15,7 @@ class ShowdownParser {
         /**
          * @type {String}
          */
-        this.code = code + "";
+        this.code = code.trim() + "";
     }
 
     /**
@@ -190,7 +188,7 @@ class ShowdownParser {
     _parseKeyValuePairs(line, pokemon) {
         const rg = ShowdownParser.regexes;
 
-        return ['ability', 'level', 'shiny', 'happiness', 'nature'].some(
+        return ['ability', 'level', 'shiny', 'happiness', 'teratype', 'nature'].some(
             function (key) {
                 if (line.match(rg[key])) {
                     pokemon[key] = rg[key].exec(line)[1].trim();
@@ -272,10 +270,11 @@ ShowdownParser.regexes = {
     level: /^Level:\s?([0-9]{1,3})$/i,
     shiny: /^Shiny:\s?(Yes|No)$/i,
     happiness: /^Happiness:\s?([0-9]{1,3})$/i,
+    teratype: /^Tera Type:\s?(.*)$/i,
     eivs: /^([EI]Vs):\s?(.*)$/i,
     eivs_value: /^([0-9]+)\s+(hp|atk|def|spa|spd|spe)$/i,
     nature: /^(.*)\s+Nature$/,
     move: /^[-~]\s?(.*)$/i
 };
 
-export default ShowdownParser;
+export default ShowdownParser;

package/src/core/index.js

@@ -0,0 +1,7 @@
+import Koffing from "./Koffing";
+import ShowdownParser from "./ShowdownParser";
+
+export {
+    Koffing,
+    ShowdownParser
+};

package/src/index.css

@@ -0,0 +1,42 @@
+html {
+  box-sizing: border-box;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+*, *::before, *::after {
+  box-sizing: inherit;
+}
+
+body {
+  margin: 0;
+  background-color: #fafafa;
+}
+
+@media print {
+  body {
+    background-color: #fff;
+  }
+}
+
+a {
+  color: #6B71B8;
+}
+
+.koffing-sprite {
+  animation-name: koffing-animation;
+  animation-duration: 700ms;
+  animation-iteration-count: infinite;
+  animation-direction: alternate;
+  animation-timing-function: ease-in-out;
+}
+
+/* Standard syntax */
+@keyframes koffing-animation {
+  0% {
+    transform: translate(0px, 0px);
+  }
+  100% {
+    transform: translate(-2px, -3px);
+  }
+}

package/src/index.js

@@ -1,76 +1,17 @@
-"use strict";
+import React from 'react';
+import ReactDOM from 'react-dom';
+import './index.css';
+import ThemedApp from './components/ThemedApp';
+import * as serviceWorker from './serviceWorker';
 
-import Pokemon from "Pokemon";
-import PokemonTeam from "PokemonTeam";
-import PokemonTeamSet from "PokemonTeamSet";
-import ShowdownParser from "ShowdownParser";
+ReactDOM.render(
+  <React.StrictMode>
+    <ThemedApp/>
+  </React.StrictMode>,
+  document.getElementById('root')
+);
 
-class Koffing {
-    /**
-     * Converts from Showdown to a PokemonTeamSet object.
-     *
-     * @param {String|Pokemon|PokemonTeam|PokemonTeamSet|ShowdownParser} data Showdown code or object
-     * @returns {PokemonTeamSet}
-     */
-    static parse(data) {
-        if (
-            data instanceof PokemonTeamSet
-            || data instanceof PokemonTeam
-            || data instanceof Pokemon
-        ) {
-            return data;
-        }
-        if (data instanceof ShowdownParser) {
-            return data.parse();
-        }
-        return (new ShowdownParser(data)).parse();
-    }
-
-    /**
-     * Prettifies and sanitizes the given Showdown code.
-     *
-     * @param {String|Pokemon|PokemonTeam|PokemonTeamSet|ShowdownParser} data Showdown code or object
-     * @returns {String}
-     */
-    static format(data) {
-        return this.parse(data).toShowdown();
-    }
-
-    /**
-     * Converts from Showdown to JSON code.
-     *
-     * @param {String|Pokemon|PokemonTeam|PokemonTeamSet|ShowdownParser} data Showdown code or object
-     * @returns {String}
-     */
-    static toJson(data) {
-        return this.parse(data).toJson();
-    }
-
-    /**
-     * Converts from JSON to Showdown code.
-     *
-     * @param {String|Object|Pokemon|PokemonTeam|PokemonTeamSet|ShowdownParser} data JSON code or object
-     * @returns {String}
-     */
-    static toShowdown(data) {
-        if (
-            data instanceof PokemonTeamSet
-            || data instanceof PokemonTeam
-            || data instanceof Pokemon
-        ) {
-            return data.toShowdown();
-        }
-        if (data instanceof ShowdownParser) {
-            return data.parse().format();
-        }
-        if (typeof value === 'string' || value instanceof String) {
-            data = JSON.parse(data);
-        }
-        return PokemonTeamSet.fromObject(JSON.parse(data)).toShowdown();
-    }
-}
-
-export {
-    Koffing,
-    ShowdownParser
-};
+// If you want your app to work offline and load faster, you can change
+// unregister() to register() below. Note this comes with some pitfalls.
+// Learn more about service workers: https://bit.ly/CRA-PWA
+serviceWorker.unregister();

package/src/serviceWorker.js

@@ -0,0 +1,141 @@
+// This optional code is used to register a service worker.
+// register() is not called by default.
+
+// This lets the app load faster on subsequent visits in production, and gives
+// it offline capabilities. However, it also means that developers (and users)
+// will only see deployed updates on subsequent visits to a page, after all the
+// existing tabs open on the page have been closed, since previously cached
+// teams are updated in the background.
+
+// To learn more about the benefits of this model and instructions on how to
+// opt-in, read https://bit.ly/CRA-PWA
+
+const isLocalhost = Boolean(
+  window.location.hostname === 'localhost' ||
+    // [::1] is the IPv6 localhost address.
+    window.location.hostname === '[::1]' ||
+    // 127.0.0.0/8 are considered localhost for IPv4.
+    window.location.hostname.match(
+      /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/
+    )
+);
+
+export function register(config) {
+  if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) {
+    // The URL constructor is available in all browsers that support SW.
+    const publicUrl = new URL(process.env.PUBLIC_URL, window.location.href);
+    if (publicUrl.origin !== window.location.origin) {
+      // Our service worker won't work if PUBLIC_URL is on a different origin
+      // from what our page is served on. This might happen if a CDN is used to
+      // serve assets; see https://github.com/facebook/create-react-app/issues/2374
+      return;
+    }
+
+    window.addEventListener('load', () => {
+      const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`;
+
+      if (isLocalhost) {
+        // This is running on localhost. Let's check if a service worker still exists or not.
+        checkValidServiceWorker(swUrl, config);
+
+        // Add some additional logging to localhost, pointing developers to the
+        // service worker/PWA documentation.
+        navigator.serviceWorker.ready.then(() => {
+          console.log(
+            'This web app is being served cache-first by a service ' +
+              'worker. To learn more, visit https://bit.ly/CRA-PWA'
+          );
+        });
+      } else {
+        // Is not localhost. Just register service worker
+        registerValidSW(swUrl, config);
+      }
+    });
+  }
+}
+
+function registerValidSW(swUrl, config) {
+  navigator.serviceWorker
+    .register(swUrl)
+    .then(registration => {
+      registration.onupdatefound = () => {
+        const installingWorker = registration.installing;
+        if (installingWorker == null) {
+          return;
+        }
+        installingWorker.onstatechange = () => {
+          if (installingWorker.state === 'installed') {
+            if (navigator.serviceWorker.controller) {
+              // At this point, the updated precached content has been fetched,
+              // but the previous service worker will still serve the older
+              // content until all client tabs are closed.
+              console.log(
+                'New content is available and will be used when all ' +
+                  'tabs for this page are closed. See https://bit.ly/CRA-PWA.'
+              );
+
+              // Execute callback
+              if (config && config.onUpdate) {
+                config.onUpdate(registration);
+              }
+            } else {
+              // At this point, everything has been precached.
+              // It's the perfect time to display a
+              // "Content is cached for offline use." message.
+              console.log('Content is cached for offline use.');
+
+              // Execute callback
+              if (config && config.onSuccess) {
+                config.onSuccess(registration);
+              }
+            }
+          }
+        };
+      };
+    })
+    .catch(error => {
+      console.error('Error during service worker registration:', error);
+    });
+}
+
+function checkValidServiceWorker(swUrl, config) {
+  // Check if the service worker can be found. If it can't reload the page.
+  fetch(swUrl, {
+    headers: { 'Service-Worker': 'script' },
+  })
+    .then(response => {
+      // Ensure service worker exists, and that we really are getting a JS file.
+      const contentType = response.headers.get('content-type');
+      if (
+        response.status === 404 ||
+        (contentType != null && contentType.indexOf('javascript') === -1)
+      ) {
+        // No service worker found. Probably a different app. Reload the page.
+        navigator.serviceWorker.ready.then(registration => {
+          registration.unregister().then(() => {
+            window.location.reload();
+          });
+        });
+      } else {
+        // Service worker found. Proceed as normal.
+        registerValidSW(swUrl, config);
+      }
+    })
+    .catch(() => {
+      console.log(
+        'No internet connection found. App is running in offline mode.'
+      );
+    });
+}
+
+export function unregister() {
+  if ('serviceWorker' in navigator) {
+    navigator.serviceWorker.ready
+      .then(registration => {
+        registration.unregister();
+      })
+      .catch(error => {
+        console.error(error.message);
+      });
+  }
+}

package/src/setupTests.js

@@ -0,0 +1,5 @@
+// jest-dom adds custom jest matchers for asserting on DOM nodes.
+// allows you to do things like:
+// expect(element).toHaveTextContent(/react/i)
+// learn more: https://github.com/testing-library/jest-dom
+import '@testing-library/jest-dom/extend-expect';