more work

initial watermelondb
2025-12-09 06:43:24 +00:00 · 2018-10-24 10:31:11 +11:00 · 2018-10-24 09:10:53 +11:00
61 changed files with 530 additions and 1269 deletions
--- a/.babelrc
+++ b/.babelrc
@@ -1,19 +1,29 @@
 {
  "presets": [
-    ["@babel/preset-env", {"modules": "commonjs"}],
+    [
+      "@babel/preset-env",
+      {
+        "modules": "commonjs"
+      }
+    ],
    "@babel/preset-react"
  ],
  "plugins": [
-    "@babel/plugin-syntax-dynamic-import",
-    "@babel/plugin-syntax-import-meta",
-    ["@babel/plugin-proposal-class-properties", { "loose": true }],
-    "@babel/plugin-proposal-json-strings",
    [
      "@babel/plugin-proposal-decorators",
      {
        "legacy": true
      }
    ],
+    "@babel/plugin-syntax-dynamic-import",
+    "@babel/plugin-syntax-import-meta",
+    [
+      "@babel/plugin-proposal-class-properties",
+      {
+        "loose": true
+      }
+    ],
+    "@babel/plugin-proposal-json-strings",
    "@babel/plugin-proposal-function-sent",
    "@babel/plugin-proposal-export-namespace-from",
    "@babel/plugin-proposal-numeric-separator",
@@ -27,6 +37,13 @@
        "proposal": "minimal"
      }
    ],
+    [
+      "@babel/plugin-transform-runtime",
+      {
+        "helpers": true,
+        "regenerator": true
+      }
+    ],
    "@babel/plugin-proposal-nullish-coalescing-operator",
    "@babel/plugin-proposal-do-expressions",
    "@babel/plugin-proposal-function-bind"
--- a/.docker/.dockerignore
+++ b/.docker/.dockerignore
@@ -0,0 +1,2 @@
+node_modules
+npm-debug.log
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -6,28 +6,29 @@ WORKDIR /src/app
 RUN mkdir -p /src/app/coriolis
 RUN mkdir -p /src/app/coriolis-data

-RUN apk add --update git
+COPY ./coriolis/ /src/app/coriolis
+COPY ./coriolis-data/ /src/app/coriolis-data

-COPY . /src/app/coriolis
+RUN apk update
+RUN apk add git

 RUN npm i -g npm

 # Set up coriolis-data
 WORKDIR /src/app/coriolis-data
-RUN git clone https://github.com/EDCD/coriolis-data.git .
-RUN git checkout ${BRANCH}
+RUN git fetch --all
 RUN npm install --no-package-lock
 RUN npm start

-# Set up coriolis
 WORKDIR /src/app/coriolis
+RUN git fetch --all
 RUN npm install --no-package-lock
 RUN npm run build


 ### STAGE 2: Production Environment ###
-FROM fholzer/nginx-brotli as web
-COPY nginx.conf /etc/nginx/nginx.conf
+FROM nginx:1.13.12-alpine as web
+COPY coriolis/.docker/nginx.conf /etc/nginx/nginx.conf
 COPY --from=builder /src/app/coriolis/build /usr/share/nginx/html
 WORKDIR /usr/share/nginx/html
 EXPOSE 80
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -10,8 +10,6 @@ services:
    - web
    labels:
    - "traefik.docker.network=web"
-    - "traefik.frontend.redirect.regex=^https:\/\/coriolis\.edcd\.io\/(.*)"
-    - "traefik.frontend.redirect.replacement=https://coriolis.io/$1"
    - "traefik.enable=true"
    - "traefik.basic.frontend.rule=Host:coriolis.io,coriolis.edcd.io"
    - "traefik.basic.port=80"
@@ -27,26 +25,10 @@ services:
    labels:
    - "traefik.docker.network=web"
    - "traefik.enable=true"
-    - "traefik.frontend.redirect.regex=^https:\/\/beta\.coriolis\.edcd\.io\/(.*)"
-    - "traefik.frontend.redirect.replacement=https://beta.coriolis.io/$1"
    - "traefik.basic.frontend.rule=Host:beta.coriolis.io,beta.coriolis.edcd.io"
    - "traefik.basic.port=80"
    - "traefik.basic.protocol=http"

-  coriolis_dw2:
-    image: edcd/coriolis:dw2
-    restart: always
-    volumes:
-      - ./nginx.conf:/etc/nginx/nginx.conf
-    networks:
-    - web
-    labels:
-    - "traefik.docker.network=web"
-    - "traefik.enable=true"
-    - "traefik.basic.frontend.rule=Host:dw2.coriolis.io"
-    - "traefik.basic.port=80"
-    - "traefik.basic.protocol=http"
-
 networks:
  web:
    external: true
--- a/.docker/nginx.conf
+++ b/.docker/nginx.conf
@@ -0,0 +1,45 @@
+worker_processes 1;
+user nobody nobody;
+error_log /tmp/error.log;
+pid /tmp/nginx.pid;
+
+events {
+
+	worker_connections 1024;
+}
+
+http {
+
+	include /etc/nginx/mime.types;
+	default_type application/octet-stream;
+	sendfile on;
+	client_body_temp_path /tmp/client_body;
+	fastcgi_temp_path /tmp/fastcgi_temp;
+	proxy_temp_path /tmp/proxy_temp;
+	scgi_temp_path /tmp/scgi_temp;
+	uwsgi_temp_path /tmp/uwsgi_temp;
+	access_log /tmp/access.log;
+	error_log /tmp/error.log;
+
+	keepalive_timeout 3000;
+	server {
+		listen 80;
+		listen [::]:80;
+        index index.html;
+		server_name localhost;
+		root /usr/share/nginx/html;
+		autoindex on;
+
+		location ~* \.(?:manifest|appcache|html?|xml|json|css|js|map|jpg|jpeg|gif|png|ico|svg|eot|ttf|woff|woff2)$ {
+			expires -1;
+			add_header Access-Control-Allow-Origin *;
+			add_header Access-Control-Allow-Credentials true;
+			add_header Access-Control-Allow-Methods 'GET, POST, OPTIONS';
+			add_header Access-Control-Allow-Headers 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type';
+			access_log off;
+		}
+		location / {
+			try_files $uri $uri/ /index.html =404;
+		}
+	}
+}
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,77 +0,0 @@
-node_modules
-npm-debug.log
-### Node template
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# Bower dependency directory (https://bower.io/)
-bower_components
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (https://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directories
-node_modules/
-jspm_packages/
-
-# TypeScript v1 declaration files
-typings/
-
-# Optional npm cache directory
-.npm
-
-# Optional eslint cache
-.eslintcache
-
-# Optional REPL history
-.node_repl_history
-
-# Output of 'npm pack'
-*.tgz
-
-# Yarn Integrity file
-.yarn-integrity
-
-# dotenv environment variables file
-.env
-
-# parcel-bundler cache (https://parceljs.org/)
-.cache
-
-# next.js build output
-.next
-
-# nuxt.js build output
-.nuxt
-
-# vuepress build output
-.vuepress/dist
-
-# Serverless directories
-.serverless
-
--- a/.esdoc.json
+++ b/.esdoc.json
@@ -35,7 +35,7 @@
          "title": "Coriolis",
          "description": "Coriolis Shipyard for Elite Dangerous",
          "repository": "https://github.com/EDCD/coriolis",
-          "site": "https://coriolis.io",
+          "site": "https://coriolis.edcd.io",
          "author": "https://github.com/edcd",
          "image": "./src/images/logo/192x192.png"
        }
@@ -81,7 +81,7 @@
          "title": "Coriolis",
          "description": "Coriolis Shipyard for Elite Dangerous",
          "repository": "https://github.com/EDCD/coriolis",
-          "site": "https://coriolis.io",
+          "site": "https://coriolis.edcd.io",
          "author": "https://github.com/edcd",
          "image": "./src/images/logo/192x192.png"
        }
@@ -100,4 +100,4 @@
      }
    }
  ]
-}
+}
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,13 +0,0 @@
-image: docker:stable
-services:
-  - docker:dind
-
-stages:
-  - Build image
-
-docker build:
-  stage: Build image
-  script:
-  - img build --build-arg branch=$CI_COMMIT_REF_NAME -t edcd/coriolis:$CI_COMMIT_REF_NAME .
-  - echo "$REGISTRY_PASSWORD" | img login --username "$REGISTRY_USER" --password-stdin
-  - img push edcd/coriolis:$CI_COMMIT_REF_NAME
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,24 +0,0 @@
-All Data and [associated JSON](https://github.com/EDCD/coriolis-data) files are intellectual property and copyright of Frontier Developments plc ('Frontier', 'Frontier Developments') and are subject to their
-[terms and conditions](https://www.frontierstore.net/terms-and-conditions/).
-
-The code (Javascript, CSS, HTML, and SVG files only) specificially for Coriolis.io is released under the MIT License.
-
-Copyright (c) 2015 Coriolis.io, Colin McLeod
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software (Javascript, CSS, HTML, and SVG files only), and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
--- a/nginx.conf
+++ b/nginx.conf
@@ -1,96 +1,59 @@
-worker_processes 1;
-user nobody nobody;
-error_log /tmp/error.log;
-pid /tmp/nginx.pid;
+worker_processes      2;
+error_log             ./nginx.error.log;
+worker_rlimit_nofile  8192;
+pid                   nginx.pid;

 events {
-
-	worker_connections 1024;
+  worker_connections  1024;
+  multi_accept        on;
 }

 http {

-    include /etc/nginx/mime.types;
-    default_type application/octet-stream;
-    sendfile on;
-    client_body_temp_path /tmp/client_body;
-    fastcgi_temp_path /tmp/fastcgi_temp;
-    proxy_temp_path /tmp/proxy_temp;
-    scgi_temp_path /tmp/scgi_temp;
-    uwsgi_temp_path /tmp/uwsgi_temp;
-    access_log /tmp/access.log;
-    error_log /tmp/error.log;
+  access_log  off;
+  charset UTF-8;

-    # https://nginx.org/en/docs/http/ngx_http_gzip_module.html
-    # Enable gzip compression.
-    # Default: off
-    gzip off;
+  types {
+    text/html                             html htm shtml;
+    text/css                              css;
+    text/xml                              xml rss;
+    image/gif                             gif;
+    image/jpeg                            jpeg jpg;
+    application/x-javascript              js;
+    text/plain                            txt;
+    image/png                             png;
+    image/svg+xml                         svg;
+    image/x-icon                          ico;
+    application/pdf                       pdf;
+    text/cache-manifest                   appcache;
+  }

-    # Compression level (1-9).
-    # 5 is a perfect compromise between size and CPU usage, offering about
-    # 75% reduction for most ASCII files (almost identical to level 9).
-    # Default: 1
-    gzip_comp_level 5;
+  gzip on;
+  gzip_vary on;
+  gzip_proxied any;
+  gzip_comp_level 6;
+  gzip_buffers 16 8k;
+  gzip_http_version 1.1;
+  gzip_types text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript;

-    # Don't compress anything that's already small and unlikely to shrink much
-    # if at all (the default is 20 bytes, which is bad as that usually leads to
-    # larger files after gzipping).
-    # Default: 20
-    gzip_min_length 256;
+  server {
+    listen       3301;
+    server_name  localhost;
+    root   ./build/;
+    index  index.html;

-    # Compress data even for clients that are connecting to us via proxies,
-    # identified by the "Via" header (required for CloudFront).
-    # Default: off
-    gzip_proxied any;
-
-    # Tell proxies to cache both the gzipped and regular version of a resource
-    # whenever the client's Accept-Encoding capabilities header varies;
-    # Avoids the issue where a non-gzip capable client (which is extremely rare
-    # today) would display gibberish if their proxy gave them the gzipped version.
-    # Default: off
-    gzip_vary on;
-
-    # Compress all output labeled with one of the following MIME-types.
-    # text/html is always compressed by gzip module.
-    # Default: text/html
-    gzip_types *;
-    brotli on;
-    # brotli_static on;
-    brotli_types *;
-    # This should be turned on if you are going to have pre-compressed copies (.gz) of
-    # static files available. If not it should be left off as it will cause extra I/O
-    # for the check. It is best if you enable this in a location{} block for
-    # a specific directory, or on an individual server{} level.
-    # gzip_static on;
-	keepalive_timeout 3000;
-	server {
-		listen 80;
-		listen [::]:80;
-        index index.html;
-		server_name localhost;
-		root /usr/share/nginx/html;
-		autoindex on;
-
-		location ~* \.(?:manifest|appcache|html?|xml|json|css|js|map|jpg|jpeg|gif|png|ico|svg|eot|ttf|woff|woff2)$ {
-			add_header Access-Control-Allow-Origin *;
-			add_header Access-Control-Allow-Credentials true;
-			add_header Access-Control-Allow-Methods 'GET, POST, OPTIONS';
-			add_header Access-Control-Allow-Headers 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type';
-			access_log off;
-		}
-		location /service-worker.js {
-		    expires -1;
-		    add_header Access-Control-Allow-Origin *;
+    location ~* \.(?:manifest|appcache|html?|xml|json|css|js|map|jpg|jpeg|gif|png|ico|svg|eot|ttf|woff|woff2)$ {
+            expires -1;
+            add_header Access-Control-Allow-Origin *;
            add_header Access-Control-Allow-Credentials true;
            add_header Access-Control-Allow-Methods 'GET, POST, OPTIONS';
            add_header Access-Control-Allow-Headers 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type';
-            access_log off;
-		}
-		location / {
-            try_files $uri $uri/ /index.html =404;
-		}
-		location /iframe.html {
-            try_files $uri $uri/ /iframe.html =404;
-        }
-	}
+            access_log  off;
+    }
+
+    location / {
+      try_files $uri $uri/ /index.html =404;
+    }
+  }
 }
+
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
    "type": "git",
    "url": "https://github.com/EDCD/coriolis"
  },
-  "homepage": "https://coriolis.io",
+  "homepage": "https://coriolis.edcd.io",
  "bugs": "https://github.com/EDCD/coriolis/issues",
  "private": true,
  "engine": "node >= 4.8.1",
@@ -56,8 +56,8 @@
  },
  "devDependencies": {
    "@babel/core": "^7.0.0",
-    "@babel/plugin-proposal-class-properties": "^7.0.0",
-    "@babel/plugin-proposal-decorators": "^7.0.0",
+    "@babel/plugin-proposal-class-properties": "^7.1.0",
+    "@babel/plugin-proposal-decorators": "^7.1.2",
    "@babel/plugin-proposal-do-expressions": "^7.0.0",
    "@babel/plugin-proposal-export-default-from": "^7.0.0",
    "@babel/plugin-proposal-export-namespace-from": "^7.0.0",
@@ -72,12 +72,12 @@
    "@babel/plugin-proposal-throw-expressions": "^7.0.0",
    "@babel/plugin-syntax-dynamic-import": "^7.0.0",
    "@babel/plugin-syntax-import-meta": "^7.0.0",
+    "@babel/plugin-transform-runtime": "^7.1.0",
    "@babel/preset-env": "^7.0.0",
    "@babel/preset-react": "^7.0.0",
    "appcache-webpack-plugin": "^1.4.0",
-    "babel-core": "^7.0.0-bridge.0",
    "babel-eslint": "^10.0.1",
-    "babel-jest": "^23.6.0",
+    "babel-jest": "^23.4.2",
    "babel-loader": "^8.0.0",
    "copy-webpack-plugin": "^4.5.2",
    "create-react-class": "^15.6.3",
@@ -118,11 +118,14 @@
    "webpack-cli": "^3.1.1",
    "webpack-dev-server": "^3.1.9",
    "webpack-notifier": "^1.6.0",
-    "workbox-webpack-plugin": "^3.6.1"
+    "workbox-webpack-plugin": "^3.6.1",
+    "worker-loader": "^2.0.0"
  },
-  "sideEffects": false,
  "dependencies": {
    "@babel/polyfill": "^7.0.0",
+    "@babel/runtime": "^7.1.2",
+    "@nozbe/watermelondb": "^0.6.2",
+    "babel-runtime": "^6.26.0",
    "browserify-zlib-next": "^1.0.1",
    "classnames": "^2.2.6",
    "coriolis-data": "../coriolis-data",
@@ -130,13 +133,13 @@
    "detect-browser": "^3.0.1",
    "fbemitter": "^2.1.1",
    "lodash": "^4.17.11",
+    "lokijs": "^1.5.5",
    "lz-string": "^1.4.4",
    "pako": "^1.0.6",
    "prop-types": "^15.6.2",
    "react": "^15.5.4",
    "react-dom": "^15.5.4",
    "react-extras": "^0.7.1",
-    "react-fuzzy": "^0.5.2",
    "react-ga": "^2.5.3",
    "react-number-editor": "Athanasius/react-number-editor.git#miggy",
    "recharts": "^1.2.0",
--- a/src/app/Coriolis.jsx
+++ b/src/app/Coriolis.jsx
@@ -1,12 +1,11 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import Router from './Router';
-import { register } from 'register-service-worker';
+import { register } from 'register-service-worker'
 import { EventEmitter } from 'fbemitter';
 import { getLanguage } from './i18n/Language';
 import Persist from './stores/Persist';

-import Announcement from './components/Announcement';
 import Header from './components/Header';
 import Tooltip from './components/Tooltip';
 import ModalExport from './components/ModalExport';
@@ -15,6 +14,7 @@ import ModalImport from './components/ModalImport';
 import ModalPermalink from './components/ModalPermalink';
 import * as CompanionApiUtils from './utils/CompanionApiUtils';
 import * as JournalUtils from './utils/JournalUtils';
+
 import AboutPage from './pages/AboutPage';
 import NotFoundPage from './pages/NotFoundPage';
 import OutfittingPage from './pages/OutfittingPage';
@@ -72,7 +72,7 @@ export default class Coriolis extends React.Component {
      route: {},
      sizeRatio: Persist.getSizeRatio()
    };
-    this._getAnnouncements();
+    this._getAnnouncements()
    Router('', (r) => this._setPage(ShipyardPage, r));
    Router('/import?', (r) => this._importBuild(r));
    Router('/import/:data', (r) => this._importBuild(r));
@@ -105,20 +105,18 @@ export default class Coriolis extends React.Component {
      }
      r.params.ship = ship.id;
      r.params.code = ship.toString();
-      this._setPage(OutfittingPage, r)
+      this._setPage(OutfittingPage, r);
    } catch (err) {
      this._onError('Failed to import ship', r.path, 0, 0, err);
    }
  }

-  async _getAnnouncements() {
-    try {
-      const announces = await request.get('https://orbis.zone/api/announcement')
-        .query({ showInCoriolis: true });
-      this.setState({ announcements: announces.body });
-    } catch (err) {
-      console.error(err)
-    }
+  _getAnnouncements() {
+    return request.get('https://orbis.zone/api/announcement')
+    .query({showInCoriolis: true})
+    .then(announces => {
+      this.setState({ announcements: announces.body })
+    })
  }

  /**
@@ -353,27 +351,27 @@ export default class Coriolis extends React.Component {
      const self = this;
      if (process.env.NODE_ENV === 'production') {
        register('/service-worker.js', {
-          ready(registration) {
-            console.log('Service worker is active.');
+          ready (registration) {
+            console.log('Service worker is active.')
          },
-          registered(registration) {
-            console.log('Service worker has been registered.');
+          registered (registration) {
+            console.log('Service worker has been registered.')
          },
-          cached(registration) {
-            console.log('Content has been cached for offline use.');
+          cached (registration) {
+            console.log('Content has been cached for offline use.')
          },
-          updatefound(registration) {
-            console.log('New content is downloading.');
+          updatefound (registration) {
+            console.log('New content is downloading.')
          },
-          updated(registration) {
+          updated (registration) {
            self.setState({ appCacheUpdate: true });
-            console.log('New content is available; please refresh.');
+            console.log('New content is available; please refresh.')
          },
-          offline() {
-            console.log('No internet connection found. App is running in offline mode.');
+          offline () {
+            console.log('No internet connection found. App is running in offline mode.')
          },
-          error(error) {
-            console.error('Error during service worker registration:', error);
+          error (error) {
+            console.error('Error during service worker registration:', error)
          }
        });
      }
@@ -396,11 +394,8 @@ export default class Coriolis extends React.Component {
    let currentMenu = this.state.currentMenu;

    return <div style={{ minHeight: '100%' }} onClick={this._closeMenu}
-                className={this.state.noTouch ? 'no-touch' : null}>
-      <Header announcements={this.state.announcements} appCacheUpdate={this.state.appCacheUpdate}
-              currentMenu={currentMenu}/>
-      <div className="announcement-container">{this.state.announcements.map(a => <Announcement
-        text={a.message}/>)}</div>
+      className={this.state.noTouch ? 'no-touch' : null}>
+      <Header announcements={this.state.announcements} appCacheUpdate={this.state.appCacheUpdate} currentMenu={currentMenu}/>
      {this.state.error ? this.state.error : this.state.page ? React.createElement(this.state.page, { currentMenu }) :
        <NotFoundPage/>}
      {this.state.modal}
@@ -408,12 +403,11 @@ export default class Coriolis extends React.Component {
      <footer>
        <div className="right cap">
          <a href="https://github.com/EDCD/coriolis" target="_blank" rel="noopener noreferrer"
-             title="Coriolis Github Project">{window.CORIOLIS_VERSION} - {window.CORIOLIS_DATE}</a>
+            title="Coriolis Github Project">{window.CORIOLIS_VERSION} - {window.CORIOLIS_DATE}</a>
          <br/>
          <a
            href={'https://github.com/EDCD/coriolis/compare/edcd:develop@{' + window.CORIOLIS_DATE + '}...edcd:develop'}
-            target="_blank" rel="noopener noreferrer" title={'Coriolis Commits since' + window.CORIOLIS_DATE}>Commits
-            since last release
+            target="_blank" rel="noopener noreferrer" title={'Coriolis Commits since' + window.CORIOLIS_DATE}>Commits since last release
            ({window.CORIOLIS_DATE})</a>
        </div>
      </footer>
--- a/src/app/Router.js
+++ b/src/app/Router.js
@@ -1,6 +1,5 @@
 import Persist from './stores/Persist';
 import ReactGA from 'react-ga';
-
 ReactGA.initialize('UA-55840909-18');
 let standalone = undefined;

--- a/src/app/components/Ad.jsx
+++ b/src/app/components/Ad.jsx
@@ -0,0 +1,34 @@
+import React, { Component, PropTypes } from 'react';
+
+export default class Ad extends Component {
+  static propTypes = {
+    client: PropTypes.string,
+    slot: PropTypes.string,
+    format: PropTypes.string,
+    wrapperDivStyle: PropTypes.object
+  };
+  constructor(props) {
+    super(props);
+  }
+  // This code is ran when the component mounts
+  componentDidMount() {
+
+  }
+
+  // an outer div for styling purposes
+  // changed class to ClassName
+  // changed style from string to an object
+
+  render() {
+    return (
+      <div style={this.props.wrapperDivStyle}>
+        <ins
+          className="adsbygoogle"
+          style={{ display: 'block' }}
+          data-ad-client={this.props.client}
+          data-ad-slot={this.props.slot}
+        />
+      </div>
+    );
+  }
+}
--- a/src/app/components/Announcement.jsx
+++ b/src/app/components/Announcement.jsx
@@ -25,7 +25,7 @@ export default class Announcement extends React.Component {
   * @return {React.Component} A href element
   */
  render() {
-    return <div className="announcement" >{this.props.text}</div>;
+    return <p>{this.props.text}</p>;
  }

 }
--- a/src/app/components/AvailableModulesMenu.jsx
+++ b/src/app/components/AvailableModulesMenu.jsx
@@ -5,7 +5,6 @@ import TranslatedComponent from './TranslatedComponent';
 import { stopCtxPropagation } from '../utils/UtilityFunctions';
 import cn from 'classnames';
 import { MountFixed, MountGimballed, MountTurret } from './SvgIcons';
-import FuzzySearch from 'react-fuzzy';

 const PRESS_THRESHOLD = 500; // mouse/touch down threshold

@@ -40,7 +39,7 @@ const GRPCAT = {
  'mc': 'projectiles',
  'axmc': 'experimental',
  'fc': 'projectiles',
-  'rfl': 'experimental',
+  'rfl':  'experimental',
  'pa': 'projectiles',
  'rg': 'projectiles',
  'mr': 'ordnance',
@@ -73,12 +72,7 @@ const GRPCAT = {
  'gfsb': 'guardian',
  'gmrp': 'guardian',
  'gsc': 'guardian',
-  'ghrp': 'guardian',
-
-  // Mining
-  'scl': 'mining',
-  'pwa': 'mining',
-  'sdm': 'mining'
+  'ghrp': 'guardian'
 };
 // Order here is the order in which items will be shown in the modules menu
 const CATEGORIES = {
@@ -95,7 +89,7 @@ const CATEGORIES = {
  'structural reinforcement': ['hr', 'mrp'],
  'dc': ['dc'],
  // Hardpoints
-  'lasers': ['pl', 'ul', 'bl'],
+  'lasers': ['pl', 'ul', 'bl', 'ml'],
  'projectiles': ['mc', 'c', 'fc', 'pa', 'rg'],
  'ordnance': ['mr', 'tp', 'nl'],
  // Utilities
@@ -107,9 +101,7 @@ const CATEGORIES = {
  'experimental': ['axmc', 'axmr', 'rfl', 'tbrfl', 'tbsc', 'tbem', 'xs', 'sfn', 'rcpl', 'dtl', 'rsl', 'mahr',],

  // Guardian
-  'guardian': ['gpp', 'gpd', 'gpc', 'ggc', 'gsrp', 'gfsb', 'ghrp', 'gmrp', 'gsc'],
-
-  'mining': ['ml', 'scl', 'pwa', 'sdm', 'abl'],
+  'guardian': ['gpp', 'gpd', 'gpc', 'ggc', 'gsrp', 'gfsb', 'ghrp', 'gmrp', 'gsc']
 };

 /**
@@ -141,7 +133,6 @@ export default class AvailableModulesMenu extends TranslatedComponent {
  constructor(props, context) {
    super(props);
    this._hideDiff = this._hideDiff.bind(this);
-    this._showSearch = this._showSearch.bind(this);
    this.state = this._initState(props, context);
    this.slotItems = [];// Array to hold <li> refs.
  }
@@ -168,7 +159,7 @@ export default class AvailableModulesMenu extends TranslatedComponent {
        onSelect(m);
      }
    );
-    let fuzzy = [];
+
    if (modules instanceof Array) {
      list = buildGroup(modules[0].grp, modules);
    } else {
@@ -176,11 +167,9 @@ export default class AvailableModulesMenu extends TranslatedComponent {
      // At present time slots with grouped options (Hardpoints and Internal) can be empty
      if (m) {
        let emptyId = 'empty';
-        if (this.firstSlotId == null) this.firstSlotId = emptyId;
+        if(this.firstSlotId == null) this.firstSlotId = emptyId;
        let keyDown = this._keyDown.bind(this, onSelect);
-        list.push(<div className='empty-c upp' key={emptyId} data-id={emptyId} onClick={onSelect.bind(null, null)}
-                       onKeyDown={keyDown} tabIndex="0"
-                       ref={slotItem => this.slotItems[emptyId] = slotItem}>{translate('empty')}</div>);
+        list.push(<div className='empty-c upp' key={emptyId} data-id={emptyId} onClick={onSelect.bind(null, null)} onKeyDown={keyDown} tabIndex="0" ref={slotItem => this.slotItems[emptyId] = slotItem} >{translate('empty')}</div>);
      }

      // Need to regroup the modules by our own categorisation
@@ -208,8 +197,7 @@ export default class AvailableModulesMenu extends TranslatedComponent {
              if (categories.length === 1) {
                // Show category header instead of group header
                if (m && grp == m.grp) {
-                  list.push(<div ref={(elem) => this.groupElem = elem} key={category}
-                                 className={'select-category upp'}>{translate(category)}</div>);
+                  list.push(<div ref={(elem) => this.groupElem = elem} key={category} className={'select-category upp'}>{translate(category)}</div>);
                } else {
                  list.push(<div key={category} className={'select-category upp'}>{translate(category)}</div>);
                }
@@ -220,32 +208,19 @@ export default class AvailableModulesMenu extends TranslatedComponent {
                  categoryHeader = true;
                }
                if (m && grp == m.grp) {
-                  list.push(<div ref={(elem) => this.groupElem = elem} key={grp}
-                                 className={'select-group cap'}>{translate(grp)}</div>);
+                  list.push(<div ref={(elem) => this.groupElem = elem} key={grp} className={'select-group cap'}>{translate(grp)}</div>);
                } else {
                  list.push(<div key={grp} className={'select-group cap'}>{translate(grp)}</div>);
                }
              }
              list.push(buildGroup(grp, modules[grp]));
-              for (const i of modules[grp]) {
-                let mount = '';
-                if (i.mount === 'F') {
-                  mount = 'Fixed';
-                } else if (i.mount === 'G') {
-                  mount = 'Gimballed';
-                } else if (i.mount === 'T') {
-                  mount = 'Turreted';
-                }
-                const fuzz = { grp, m: i, name: `${i.class}${i.rating}${mount ? ' '  + mount : ''} ${translate(grp)}` };
-                fuzzy.push(fuzz);
-              }
            }
          }
        }
      }
    }
    let trackingFocus = false;
-    return { list, currentGroup, fuzzy, trackingFocus };
+    return { list, currentGroup, trackingFocus };
  }

  /**
@@ -267,11 +242,9 @@ export default class AvailableModulesMenu extends TranslatedComponent {

    const sortedModules = modules.sort(this._moduleOrder);

+
    // Calculate the number of items per class.  Used so we don't have long lists with only a few items in each row
-    const tmp = sortedModules.map((v, i) => v['class']).reduce((count, cls) => {
-      count[cls] = ++count[cls] || 1;
-      return count;
-    }, {});
+    const tmp = sortedModules.map((v, i) => v['class']).reduce((count, cls) => { count[cls] = ++count[cls] || 1; return count; }, {});
    const itemsPerClass = Math.max.apply(null, Object.keys(tmp).map(key => tmp[key]));

    let itemsOnThisRow = 0;
@@ -324,29 +297,22 @@ export default class AvailableModulesMenu extends TranslatedComponent {
        };
      }

-      switch (m.mount) {
-        case 'F':
-          mount = <MountFixed className={'lg'}/>;
-          break;
-        case 'G':
-          mount = <MountGimballed className={'lg'}/>;
-          break;
-        case 'T':
-          mount = <MountTurret className={'lg'}/>;
-          break;
+      switch(m.mount) {
+        case 'F': mount = <MountFixed className={'lg'} />; break;
+        case 'G': mount = <MountGimballed className={'lg'}/>; break;
+        case 'T': mount = <MountTurret className={'lg'}/>; break;
      }
      if (m.name && m.name === prevName) {
        // elems.push(<br key={'b' + m.grp + i} />);
        itemsOnThisRow = 0;
      }
      if (itemsOnThisRow == 6 || i > 0 && sortedModules.length > 3 && itemsPerClass > 2 && m.class != prevClass && (m.rating != prevRating || m.mount)) {
-        elems.push(<br key={'b' + m.grp + i}/>);
+        elems.push(<br key={'b' + m.grp + i} />);
        itemsOnThisRow = 0;
      }
      let tbIdx = (classes.indexOf('disabled') < 0) ? 0 : undefined;
      elems.push(
-        <li key={m.id} data-id={m.id} className={classes} {...eventHandlers} tabIndex={tbIdx}
-            ref={slotItem => this.slotItems[m.id] = slotItem}>
+        <li key={m.id} data-id={m.id} className={classes} {...eventHandlers} tabIndex={tbIdx} ref={slotItem => this.slotItems[m.id] = slotItem}>
          {mount}
          {(mount ? ' ' : '') + m.class + m.rating + (m.missile ? '/' + m.missile : '') + (m.name ? ' ' + translate(m.name) : '')}
        </li>
@@ -374,40 +340,6 @@ export default class AvailableModulesMenu extends TranslatedComponent {
    }
  }

-  /**
-   * Generate tooltip content for the difference between the
-   * mounted module and the hovered modules
-   */
-  _showSearch() {
-    if (this.props.modules instanceof Array) {
-      return;
-    }
-    return (
-      <FuzzySearch
-        list={this.state.fuzzy}
-        keys={['grp', 'name']}
-        tokenize={true}
-        className={'input'}
-        width={'100%'}
-        style={{ padding: 0 }}
-        onSelect={e => this.props.onSelect.bind(null, e.m)()}
-        resultsTemplate={(props, state, styles, clickHandler) => {
-          return state.results.map((val, i) => {
-            return (
-              <div
-                key={i}
-                className={'lc'}
-                onClick={() => clickHandler(i)}
-              >
-                {val.name}
-              </div>
-            );
-          });
-        }}
-      />
-    );
-  }
-
  /**
   * Mouse over diff handler
   * @param  {Function} showDiff diff tooltip callback
@@ -473,7 +405,7 @@ export default class AvailableModulesMenu extends TranslatedComponent {
   * @param {Function}  select Select module callback
   * @param {SytheticEvent} event Event
   */
-  _keyUp(select, event) {
+  _keyUp(select,event) {
    // nothing here yet
  }

@@ -543,13 +475,12 @@ export default class AvailableModulesMenu extends TranslatedComponent {
      this.slotItems[this.firstSlotId].focus();
    }
  }
-
  /**
   * Handle focus if the component updates
   *
   */
  componentWillUnmount() {
-    if (this.props.slotDiv) {
+    if(this.props.slotDiv) {
      this.props.slotDiv.focus();
    }
  }
@@ -570,12 +501,11 @@ export default class AvailableModulesMenu extends TranslatedComponent {
  render() {
    return (
      <div ref={node => this.node = node}
-           className={cn('select', this.props.className)}
-           onScroll={this._hideDiff}
-           onClick={(e) => e.stopPropagation()}
-           onContextMenu={stopCtxPropagation}
+        className={cn('select', this.props.className)}
+        onScroll={this._hideDiff}
+        onClick={(e) => e.stopPropagation() }
+        onContextMenu={stopCtxPropagation}
      >
-        {this._showSearch()}
        {this.state.list}
      </div>
    );
--- a/src/app/components/Defence.jsx
+++ b/src/app/components/Defence.jsx
@@ -52,12 +52,12 @@ export default class Defence extends TranslatedComponent {
   * @return {React.Component} contents
   */
  render() {
-    const { opponent, sys, opponentWep } = this.props;
+    const { ship, sys, opponentWep } = this.props;
    const { language, tooltip, termtip } = this.context;
    const { formats, translate, units } = language;
    const { shield, armour, shielddamage, armourdamage } = this.state;

-    const pd = opponent.standard[4].m;
+    const pd = ship.standard[4].m;

    const shieldSourcesData = [];
    const effectiveShieldData = [];
--- a/src/app/components/HardpointSlot.jsx
+++ b/src/app/components/HardpointSlot.jsx
@@ -2,21 +2,12 @@ import React from 'react';
 import cn from 'classnames';
 import Slot from './Slot';
 import Persist from '../stores/Persist';
-import {
-  DamageAbsolute,
-  DamageKinetic,
-  DamageThermal,
-  DamageExplosive,
-  MountFixed,
-  MountGimballed,
-  MountTurret,
-  ListModifications,
-  Modified
-} from './SvgIcons';
+import { DamageAbsolute, DamageKinetic, DamageThermal, DamageExplosive, MountFixed, MountGimballed, MountTurret, ListModifications, Modified } from './SvgIcons';
 import { Modifications } from 'coriolis-data/dist';
 import { stopCtxPropagation } from '../utils/UtilityFunctions';
 import { blueprintTooltip } from '../utils/BlueprintFunctions';

+
 /**
 * Hardpoint / Utility Slot
 */
@@ -36,7 +27,7 @@ export default class HardpointSlot extends Slot {
   * @return {string}               Label
   */
  _getMaxClassLabel(translate) {
-    return translate(['U', 'S', 'M', 'L', 'H'][this.props.maxClass]);
+    return translate(['U','S','M','L','H'][this.props.maxClass]);
  }

  /**
@@ -75,76 +66,42 @@ export default class HardpointSlot extends Slot {
      return <div className={className} draggable='true' onDragStart={drag} onDragEnd={drop}>
        <div className={'cb'}>
          <div className={'l'}>
-            {m.mount && m.mount == 'F' ? <span onMouseOver={termtip.bind(null, 'fixed')}
-                                               onMouseOut={tooltip.bind(null, null)}><MountFixed/></span> : ''}
-            {m.mount && m.mount == 'G' ? <span onMouseOver={termtip.bind(null, 'gimballed')}
-                                               onMouseOut={tooltip.bind(null, null)}><MountGimballed/></span> : ''}
-            {m.mount && m.mount == 'T' ? <span onMouseOver={termtip.bind(null, 'turreted')}
-                                               onMouseOut={tooltip.bind(null, null)}><MountTurret/></span> : ''}
-            {m.getDamageDist() && m.getDamageDist().K ? <span onMouseOver={termtip.bind(null, 'kinetic')}
-                                                              onMouseOut={tooltip.bind(null, null)}><DamageKinetic/></span> : ''}
-            {m.getDamageDist() && m.getDamageDist().T ? <span onMouseOver={termtip.bind(null, 'thermal')}
-                                                              onMouseOut={tooltip.bind(null, null)}><DamageThermal/></span> : ''}
-            {m.getDamageDist() && m.getDamageDist().E ? <span onMouseOver={termtip.bind(null, 'explosive')}
-                                                              onMouseOut={tooltip.bind(null, null)}><DamageExplosive/></span> : ''}
-            {m.getDamageDist() && m.getDamageDist().A ? <span onMouseOver={termtip.bind(null, 'absolute')}
-                                                              onMouseOut={tooltip.bind(null, null)}><DamageAbsolute/></span> : ''}
-            {classRating} {translate(m.name || m.grp)}{m.mods && Object.keys(m.mods).length > 0 ? <span className='r'
-                                                                                                        onMouseOver={termtip.bind(null, modTT)}
-                                                                                                        onMouseOut={tooltip.bind(null, null)}><Modified/></span> : null}
+          {m.mount && m.mount == 'F' ? <span onMouseOver={termtip.bind(null, 'fixed')} onMouseOut={tooltip.bind(null, null)}><MountFixed /></span> : ''}
+          {m.mount && m.mount == 'G' ? <span onMouseOver={termtip.bind(null, 'gimballed')} onMouseOut={tooltip.bind(null, null)}><MountGimballed /></span> : ''}
+          {m.mount && m.mount == 'T' ? <span onMouseOver={termtip.bind(null, 'turreted')} onMouseOut={tooltip.bind(null, null)}><MountTurret /></span> : ''}
+          {m.getDamageDist() && m.getDamageDist().K ? <span onMouseOver={termtip.bind(null, 'kinetic')} onMouseOut={tooltip.bind(null, null)}><DamageKinetic /></span> : ''}
+          {m.getDamageDist() && m.getDamageDist().T ? <span onMouseOver={termtip.bind(null, 'thermal')} onMouseOut={tooltip.bind(null, null)}><DamageThermal /></span> : ''}
+          {m.getDamageDist() && m.getDamageDist().E ? <span onMouseOver={termtip.bind(null, 'explosive')} onMouseOut={tooltip.bind(null, null)}><DamageExplosive /></span> : ''}
+          {m.getDamageDist() && m.getDamageDist().A ? <span onMouseOver={termtip.bind(null, 'absolute')} onMouseOut={tooltip.bind(null, null)}><DamageAbsolute /></span> : ''}
+          {classRating} {translate(m.name || m.grp)}{ m.mods && Object.keys(m.mods).length > 0 ? <span className='r' onMouseOver={termtip.bind(null, modTT)} onMouseOut={tooltip.bind(null, null)}><Modified /></span> : null }
          </div>

          <div className={'r'}>{formats.round(m.getMass())}{u.T}</div>
        </div>
        <div className={'cb'}>
-          {m.getDps() ? <div className={'l'} onMouseOver={termtip.bind(null, m.getClip() ? 'dpssdps' : 'dps')}
-                             onMouseOut={tooltip.bind(null, null)}>{translate('DPS')}: {formats.round1(m.getDps())} {m.getClip() ?
-            <span>({formats.round1(m.getSDps())})</span> : null}</div> : null}
-          {m.getDamage() ? <div className={'l'} onMouseOver={termtip.bind(null, m.getDamage() ? 'shotdmg' : 'shotdmg')}
-                                onMouseOut={tooltip.bind(null, null)}>{translate('shotdmg')}: {formats.round1(m.getDamage())}</div> : null}
-          {m.getEps() ? <div className={'l'} onMouseOver={termtip.bind(null, m.getClip() ? 'epsseps' : 'eps')}
-                             onMouseOut={tooltip.bind(null, null)}>{translate('EPS')}: {formats.round1(m.getEps())}{u.MW} {m.getClip() ?
-            <span>({formats.round1((m.getClip() * m.getEps() / m.getRoF()) / ((m.getClip() / m.getRoF()) + m.getReload()))}{u.MW})</span> : null}</div> : null}
-          {m.getHps() ? <div className={'l'} onMouseOver={termtip.bind(null, m.getClip() ? 'hpsshps' : 'hps')}
-                             onMouseOut={tooltip.bind(null, null)}>{translate('HPS')}: {formats.round1(m.getHps())} {m.getClip() ?
-            <span>({formats.round1((m.getClip() * m.getHps() / m.getRoF()) / ((m.getClip() / m.getRoF()) + m.getReload()))})</span> : null}</div> : null}
-          {m.getDps() && m.getEps() ? <div className={'l'} onMouseOver={termtip.bind(null, 'dpe')}
-                                           onMouseOut={tooltip.bind(null, null)}>{translate('DPE')}: {formats.f1(m.getDps() / m.getEps())}</div> : null}
-          {m.getRoF() ? <div className={'l'} onMouseOver={termtip.bind(null, 'rof')}
-                             onMouseOut={tooltip.bind(null, null)}>{translate('ROF')}: {formats.f1(m.getRoF())}{u.ps}</div> : null}
-          {m.getRange() ? <div
-            className={'l'}>{translate('range', m.grp)} {formats.f1(m.getRange() / 1000)}{u.km}</div> : null}
-          {m.getScanTime() ? <div
-            className={'l'}>{translate('scantime')} {formats.f1(m.getScanTime())}{u.s}</div> : null}
-          {m.getFalloff() ? <div
-            className={'l'}>{translate('falloff')} {formats.round(m.getFalloff() / 1000)}{u.km}</div> : null}
-          {m.getShieldBoost() ? <div className={'l'}>+{formats.pct1(m.getShieldBoost())}</div> : null}
-          {m.getAmmo() ? <div
-            className={'l'}>{translate('ammunition')}: {formats.int(m.getClip())}/{formats.int(m.getAmmo())}</div> : null}
-          {m.getReload() ? <div className={'l'}>{translate('wep_reload')}: {formats.round(m.getReload())}{u.s}</div> : null}
-          {m.getShotSpeed() ? <div
-            className={'l'}>{translate('shotspeed')}: {formats.int(m.getShotSpeed())}{u.mps}</div> : null}
-          {m.getPiercing() ? <div className={'l'}>{translate('piercing')}: {formats.int(m.getPiercing())}</div> : null}
-          {m.getJitter() ? <div className={'l'}>{translate('jitter')}: {formats.f2(m.getJitter())}°</div> : null}
-          {m.getScanAngle() ? <div className={'l'}>{translate('scan angle')}: {formats.f2(m.getScanAngle())}°</div> : null}
-          {m.getScanRange() ? <div className={'l'}>{translate('scan range')}: {formats.int(m.getScanRange())}{u.m}</div> : null}
-          {m.getMaxAngle() ? <div className={'l'}>{translate('max angle')}: {formats.f2(m.getMaxAngle())}°</div> : null}
-          {showModuleResistances && m.getExplosiveResistance() ? <div
-            className='l'>{translate('explres')}: {formats.pct(m.getExplosiveResistance())}</div> : null}
-          {showModuleResistances && m.getKineticResistance() ? <div
-            className='l'>{translate('kinres')}: {formats.pct(m.getKineticResistance())}</div> : null}
-          {showModuleResistances && m.getThermalResistance() ? <div
-            className='l'>{translate('thermres')}: {formats.pct(m.getThermalResistance())}</div> : null}
-          {m.getIntegrity() ? <div className='l'>{translate('integrity')}: {formats.int(m.getIntegrity())}</div> : null}
-          {m && validMods.length > 0 ? <div className='r' tabIndex="0" ref={modButton => this.modButton = modButton}>
-            <button tabIndex="-1" onClick={this._toggleModifications.bind(this)} onContextMenu={stopCtxPropagation}
-                    onMouseOver={termtip.bind(null, 'modifications')} onMouseOut={tooltip.bind(null, null)}>
-              <ListModifications/></button>
-          </div> : null}
+          { m.getDps() ? <div className={'l'} onMouseOver={termtip.bind(null, m.getClip() ? 'dpssdps' : 'dps')} onMouseOut={tooltip.bind(null, null)}>{translate('DPS')}: {formats.round1(m.getDps())} { m.getClip() ? <span>({formats.round1(m.getSDps()) })</span> : null }</div> : null }
+          { m.getEps() ? <div className={'l'} onMouseOver={termtip.bind(null, m.getClip() ? 'epsseps' : 'eps')} onMouseOut={tooltip.bind(null, null)}>{translate('EPS')}: {formats.round1(m.getEps())}{u.MW} { m.getClip() ? <span>({formats.round1((m.getClip() * m.getEps() / m.getRoF()) / ((m.getClip() / m.getRoF()) + m.getReload())) }{u.MW})</span> : null }</div> : null }
+          { m.getHps() ? <div className={'l'} onMouseOver={termtip.bind(null, m.getClip() ? 'hpsshps' : 'hps')} onMouseOut={tooltip.bind(null, null)}>{translate('HPS')}: {formats.round1(m.getHps())} { m.getClip() ? <span>({formats.round1((m.getClip() * m.getHps() / m.getRoF()) / ((m.getClip() / m.getRoF()) + m.getReload())) })</span> : null }</div> : null }
+          { m.getDps() && m.getEps() ? <div className={'l'} onMouseOver={termtip.bind(null, 'dpe')} onMouseOut={tooltip.bind(null, null)}>{translate('DPE')}: {formats.f1(m.getDps() / m.getEps())}</div> : null }
+          { m.getRoF() ? <div className={'l'} onMouseOver={termtip.bind(null, 'rof')} onMouseOut={tooltip.bind(null, null)}>{translate('ROF')}: {formats.f1(m.getRoF())}{u.ps}</div> : null }
+          { m.getRange() ? <div className={'l'}>{translate('range', m.grp)} {formats.f1(m.getRange() / 1000)}{u.km}</div> : null }
+          { m.getScanTime() ? <div className={'l'}>{translate('scantime')} {formats.f1(m.getScanTime())}{u.s}</div> : null }
+          { m.getFalloff() ? <div className={'l'}>{translate('falloff')} {formats.round(m.getFalloff() / 1000)}{u.km}</div> : null }
+          { m.getShieldBoost() ? <div className={'l'}>+{formats.pct1(m.getShieldBoost())}</div> : null }
+          { m.getAmmo() ? <div className={'l'}>{translate('ammunition')}: {formats.int(m.getClip())}/{formats.int(m.getAmmo())}</div> : null }
+          { m.getReload() ? <div className={'l'}>{translate('reload')}: {formats.round(m.getReload())}{u.s}</div> : null }
+          { m.getShotSpeed() ? <div className={'l'}>{translate('shotspeed')}: {formats.int(m.getShotSpeed())}{u.mps}</div> : null }
+          { m.getPiercing() ? <div className={'l'}>{translate('piercing')}: {formats.int(m.getPiercing())}</div> : null }
+          { m.getJitter() ? <div className={'l'}>{translate('jitter')}: {formats.f2(m.getJitter())}°</div> : null }
+          { showModuleResistances && m.getExplosiveResistance() ? <div className='l'>{translate('explres')}: {formats.pct(m.getExplosiveResistance())}</div> : null }
+          { showModuleResistances && m.getKineticResistance() ? <div className='l'>{translate('kinres')}: {formats.pct(m.getKineticResistance())}</div> : null }
+          { showModuleResistances && m.getThermalResistance() ? <div className='l'>{translate('thermres')}: {formats.pct(m.getThermalResistance())}</div> : null }
+          { m.getIntegrity() ? <div className='l'>{translate('integrity')}: {formats.int(m.getIntegrity())}</div> : null }
+          { m && validMods.length > 0 ? <div className='r' tabIndex="0" ref={ modButton => this.modButton = modButton }><button tabIndex="-1" onClick={this._toggleModifications.bind(this)} onContextMenu={stopCtxPropagation} onMouseOver={termtip.bind(null, 'modifications')} onMouseOut={tooltip.bind(null, null)}><ListModifications /></button></div> : null }
        </div>
      </div>;
    } else {
-      return <div className={'empty'}>{translate('empty')}</div>;
+      return  <div className={'empty'}>{translate('empty')}</div>;
    }
  }

--- a/src/app/components/HardpointSlotSection.jsx
+++ b/src/app/components/HardpointSlotSection.jsx
@@ -153,15 +153,6 @@ export default class HardpointSlotSection extends SlotSection {
      <ul>
        <li className='lc' tabIndex='0' onClick={_fill.bind(this, 'nl', 'F')} onKeyDown={this._keyDown} ref={smRef => this.sectionRefArr['nl-F'] = smRef}>{translate('nl')}</li>
      </ul>
-      <div className='select-group cap'>{translate('ggc')}</div>
-      <ul>
-        <li className='lc' tabIndex='0' onClick={_fill.bind(this, 'ggc', 'F')} onKeyDown={this._keyDown} ref={smRef => this.sectionRefArr['ggc-F'] = smRef}>{translate('ggc')}</li>
-      </ul>
-      <div className='select-group cap'>{translate('rfl')}</div>
-      <ul>
-        <li className='c' tabIndex='0' onClick={_fill.bind(this, 'rfl', 'F')} onKeyDown={this._keyDown} ref={smRef => this.sectionRefArr['rfl-F'] = smRef}><MountFixed className='lg'/></li>
-        <li className='c' tabIndex='0' onClick={_fill.bind(this, 'rfl', 'T')} onKeyDown={this._keyDown} ref={smRef => this.sectionRefArr['rfl-T'] = smRef}><MountTurret className='lg'/></li>
-      </ul>
    </div>;
  }

--- a/src/app/components/Header.jsx
+++ b/src/app/components/Header.jsx
@@ -349,7 +349,7 @@ export default class Header extends TranslatedComponent {
  _getShipsMenu() {
    let shipList = [];

-    for (let s of this.shipOrder) {
+    for (let s in Ships) {
      shipList.push(<ActiveLink key={s} href={outfitURL(s)} className='block'>{Ships[s].properties.name}</ActiveLink>);
    }

--- a/src/app/components/ModalOrbis.jsx
+++ b/src/app/components/ModalOrbis.jsx
@@ -23,10 +23,8 @@ export default class ModalOrbis extends TranslatedComponent {
    this.state = {
      orbisCreds: Persist.getOrbisCreds(),
      orbisUrl: '...',
-      ship: this.props.ship,
      authenticatedStatus: 'Checking...'
    };
-    this.orbisCategory = this.orbisCategory.bind(this);
  }

  /**
@@ -90,17 +88,6 @@ export default class ModalOrbis extends TranslatedComponent {
    });
  }

-  /**
-   * Handler for changing category
-   * @param {SyntheticEvent} e React Event
-   */
-  orbisCategory(e) {
-    let ship = this.state.ship;
-    let cat = e.target.value;
-    ship.category = cat;
-    this.setState({ship});
-  }
-
  /**
   * Render the modal
   * @return {React.Component} Modal Content
@@ -119,17 +106,6 @@ export default class ModalOrbis extends TranslatedComponent {
      <br/><br/>
      <a className='button' href="https://orbis.zone/api/auth">Log in / signup to Orbis</a>
      <br/><br/>
-      <h3>Category</h3>
-      <select onChange={this.orbisCategory}>
-        <option value="">No Category</option>
-        <option>Combat</option>
-        <option>Mining</option>
-        <option>Trading</option>
-        <option>Exploration</option>
-        <option>Passenger Liner</option>
-        <option>PvP</option>
-      </select>
-      <br/><br/>
      <h3 >{translate('Orbis link')}</h3>
      <input value={this.state.orbisUrl} readOnly size={25} onFocus={ (e) => e.target.select() }/>
      <br/><br/>
--- a/src/app/components/ModalShoppingList.jsx
+++ b/src/app/components/ModalShoppingList.jsx
@@ -109,18 +109,17 @@ export default class ModalShoppingList extends TranslatedComponent {
   */
  sendToEDEng(event) {
    event.preventDefault();
-    let translate = this.context.language.translate;
    const target = event.target;
    target.disabled = this.state.blueprints.length > 0;
    if (this.state.blueprints.length === 0) {
-      target.innerText = translate('No modded components.');
+      target.innerText = 'No modded components.';
      target.disabled = true;
      setTimeout(() => {
-        target.innerText = translate('Send to EDEngineer');
+        target.innerText = 'Send to EDEngineer';
        target.disabled = false;
      }, 3000);
    } else {
-      target.innerText = translate('Sending...');
+      target.innerText = 'Sending...';
    }
    let countSent = 0;
    let countTotal = this.state.blueprints.length;
@@ -140,7 +139,7 @@ export default class ModalShoppingList extends TranslatedComponent {
          countSent++;
          if (countSent === countTotal) {
            target.disabled = false;
-            target.innerText = translate('Send to EDEngineer');
+            target.innerText = 'Send to EDEngineer';
          }
        });
    }
@@ -231,32 +230,32 @@ export default class ModalShoppingList extends TranslatedComponent {
    this.sendToEDEng = this.sendToEDEng.bind(this);
    return <div className='modal' onClick={ (e) => e.stopPropagation() }>
      <h2>{translate('PHRASE_SHOPPING_MATS')}</h2>
-      <label>{translate('Grade 1 rolls ')}</label>
+      <label>Grade 1 rolls </label>
      <input id={1} type={'number'} min={0} defaultValue={this.state.matsPerGrade[1]} onChange={this.changeHandler} />
      <br/>
-      <label>{translate('Grade 2 rolls ')}</label>
+      <label>Grade 2 rolls </label>
      <input id={2} type={'number'} min={0} defaultValue={this.state.matsPerGrade[2]} onChange={this.changeHandler} />
      <br/>
-      <label>{translate('Grade 3 rolls ')}</label>
+      <label>Grade 3 rolls </label>
      <input id={3} type={'number'} min={0} value={this.state.matsPerGrade[3]} onChange={this.changeHandler} />
      <br/>
-      <label>{translate('Grade 4 rolls ')}</label>
+      <label>Grade 4 rolls </label>
      <input id={4} type={'number'} min={0} value={this.state.matsPerGrade[4]} onChange={this.changeHandler} />
      <br/>
-      <label>{translate('Grade 5 rolls ')}</label>
+      <label>Grade 5 rolls </label>
      <input id={5} type={'number'} min={0} value={this.state.matsPerGrade[5]} onChange={this.changeHandler} />
      <div>
        <textarea className='cb json' readOnly value={this.state.matsList} />
      </div>
-      <label hidden={!compatible} className={'l cap'}>{translate('CMDR Name')}</label>
+      <label hidden={!compatible} className={'l cap'}>CMDR Name </label>
      <br/>
      <select hidden={!compatible} className={'cmdr-select l cap'} onChange={this.cmdrChangeHandler} defaultValue={this.state.cmdrName}>
        {this.state.cmdrs.map(e => <option key={e}>{e}</option>)}
      </select>
      <br/>
-      <p hidden={!this.state.failed} id={'failed'} className={'l'}>{translate('PHRASE_FAIL_EDENGINEER')}</p>
-      <p hidden={compatible} id={'browserbad'} className={'l'}>{translate('PHRASE_FIREFOX_EDENGINEER')}</p>
-      <button className={'l cb dismiss cap'} disabled={!!this.state.failed || !compatible} onClick={this.sendToEDEng}>{translate('Send to EDEngineer')}</button>
+      <p hidden={!this.state.failed} id={'failed'} className={'l'}>Failed to send to EDEngineer (Launch EDEngineer and make sure the API is started then refresh the page.)</p>
+      <p hidden={compatible} id={'browserbad'} className={'l'}>Sending to EDEngineer is not compatible with Firefox's security settings. Please try again with Chrome.</p>
+      <button className={'l cb dismiss cap'} disabled={!!this.state.failed || !compatible} onClick={this.sendToEDEng}>{translate('Send To EDEngineer')}</button>
      <button className={'r dismiss cap'} onClick={this.context.hideModal}>{translate('close')}</button>
    </div>;
  }
--- a/src/app/components/ModificationsMenu.jsx
+++ b/src/app/components/ModificationsMenu.jsx
@@ -478,7 +478,7 @@ export default class ModificationsMenu extends TranslatedComponent {
            <tbody>
              { showRolls ?
                <tr>
-                  <td tabIndex="0" className={ cn('section-menu button-inline-menu', { active: false }) }> { translate('mroll') }: </td>
+                  <td tabIndex="0" className={ cn('section-menu button-inline-menu', { active: false }) }> { translate('roll') }: </td>
                  <td tabIndex="0" className={ cn('section-menu button-inline-menu', { active: blueprintCv ===    0 }) } style={{ cursor: 'pointer' }} onClick={_rollWorst} onKeyDown={ this._keyDown } onMouseOver={termtip.bind(null, 'PHRASE_BLUEPRINT_WORST')} onMouseOut={tooltip.bind(null, null)}> { translate('0%') } </td>
                  <td tabIndex="0" className={ cn('section-menu button-inline-menu', { active: blueprintCv ===   50 })} style={{ cursor: 'pointer' }} onClick={_rollFifty} onKeyDown={ this._keyDown } onMouseOver={termtip.bind(null, 'PHRASE_BLUEPRINT_FIFTY')} onMouseOut={tooltip.bind(null, null)}> { translate('50%') } </td>
                  <td tabIndex="0" className={ cn('section-menu button-inline-menu', { active: blueprintCv ===  100 })} style={{ cursor: 'pointer' }} onClick={_rollFull} onKeyDown={ this._keyDown } onMouseOver={termtip.bind(null, 'PHRASE_BLUEPRINT_BEST')} onMouseOut={tooltip.bind(null, null)}> { translate('100%') } </td>
--- a/src/app/components/OutfittingSubpages.jsx
+++ b/src/app/components/OutfittingSubpages.jsx
@@ -174,7 +174,7 @@ export default class OutfittingSubpages extends TranslatedComponent {
              <th style={{ width:'25%' }} className={cn({ active: tab == 'power' })} onClick={this._showTab.bind(this, 'power')} >{translate('power and costs')}</th>
              <th style={{ width:'25%' }} className={cn({ active: tab == 'profiles' })} onClick={this._showTab.bind(this, 'profiles')} >{translate('profiles')}</th>
              <th style={{ width:'25%' }} className={cn({ active: tab == 'offence' })} onClick={this._showTab.bind(this, 'offence')} >{translate('offence')}</th>
-              <th style={{ width:'25%' }} className={cn({ active: tab == 'defence' })} onClick={this._showTab.bind(this, 'defence')} >{translate('tab_defence')}</th>
+              <th style={{ width:'25%' }} className={cn({ active: tab == 'defence' })} onClick={this._showTab.bind(this, 'defence')} >{translate('defence')}</th>
            </tr>
          </thead>
        </table>
--- a/src/app/components/ShipSummaryTable.jsx
+++ b/src/app/components/ShipSummaryTable.jsx
@@ -52,7 +52,6 @@ export default class ShipSummaryTable extends TranslatedComponent {
    const boostTooltip = canBoost ? 'TT_SUMMARY_BOOST' : canThrust ? 'TT_SUMMARY_BOOST_NONFUNCTIONAL' : 'TT_SUMMARY_SPEED_NONFUNCTIONAL';
    const sgMetrics = Calc.shieldMetrics(ship, pips.sys);
    const shipBoost = canBoost ?  Calc.calcBoost(ship) : 'No Boost';
-    const restingHeat = Math.sqrt(((ship.standard[0].m.pgen * ship.standard[0].m.eff) / ship.heatCapacity) / 0.2);
    const armourMetrics = Calc.armourMetrics(ship);
    let shieldColour = 'blue';
    if (shieldGenerator && shieldGenerator.m.grp === 'psg') {
@@ -79,14 +78,13 @@ export default class ShipSummaryTable extends TranslatedComponent {
                <th rowSpan={2}>{translate('TTD')}</th>
                {/* <th onMouseEnter={termtip.bind(null, 'heat per second')} onMouseLeave={hide} rowSpan={2}>{translate('HPS')}</th> */}
                <th rowSpan={2}>{translate('cargo')}</th>
-                <th rowSpan={2} onMouseEnter={termtip.bind(null, 'passenger capacity', { cap: 0 })} onMouseLeave={hide}>{translate('pax')}</th>
+                <th rowSpan={2}>{translate('pax')}</th>
                <th rowSpan={2}>{translate('fuel')}</th>
                <th colSpan={3}>{translate('mass')}</th>
                <th onMouseEnter={termtip.bind(null, 'hull hardness', { cap: 0 })} onMouseLeave={hide} rowSpan={2}>{translate('hrd')}</th>
                <th rowSpan={2}>{translate('crew')}</th>
                <th onMouseEnter={termtip.bind(null, 'mass lock factor', { cap: 0 })} onMouseLeave={hide} rowSpan={2}>{translate('MLF')}</th>
                <th onMouseEnter={termtip.bind(null, 'TT_SUMMARY_BOOST_TIME', { cap: 0 })} onMouseLeave={hide} rowSpan={2}>{translate('boost time')}</th>
-                <th rowSpan={2}>{translate('resting heat (Beta)')}</th>
              </tr>
              <tr>
                <th className='lft'>{translate('max')}</th>
@@ -124,7 +122,6 @@ export default class ShipSummaryTable extends TranslatedComponent {
                <td>{ship.crew}</td>
                <td>{ship.masslock}</td>
                <td>{shipBoost !== 'No Boost' ? formats.time(shipBoost) : 'No Boost'}</td>
-                <td>{formats.pct(restingHeat)}</td>
              </tr>
            </tbody>
          </table>
--- a/src/app/i18n/Language.jsx
+++ b/src/app/i18n/Language.jsx
@@ -7,12 +7,8 @@ import * as IT from './it';
 import * as RU from './ru';
 import * as PL from './pl';
 import * as PT from './pt';
-import * as CN from './cn';
 import * as d3 from 'd3';

-const owofy = require("owofy");
-
-
 let fallbackTerms = EN.terms;

 /**
@@ -31,7 +27,6 @@ export function getLanguage(langCode) {
    case 'ru': lang = RU; break;
    case 'pl': lang = PL; break;
    case 'pt': lang = PT; break;
-    case 'cn': lang = CN; break;
    default:
      lang = EN;
  }
@@ -42,14 +37,7 @@ export function getLanguage(langCode) {
  const round = function(x, n) { const ten_n = Math.pow(10,n); return Math.round(x * ten_n) / ten_n; };

  if(lang === EN) {
-    translate = (t, x) => {
-      if (currentTerms[t + '_' + x]) {
-        return owofy(currentTerms[t + '_' + x])
-      } else if (currentTerms[t]) {
-        return owofy(currentTerms[t])
-      }
-      return t;
-    };
+    translate = (t, x) => { return currentTerms[t + '_' + x] || currentTerms[t] || t; };
  } else {
    translate = (t, x) => { return currentTerms[t + '_' + x] || currentTerms[t] || fallbackTerms[t + '_' + x] || fallbackTerms[t] || t; };
  }
@@ -106,6 +94,5 @@ export const Languages = {
  fr: 'Français',
  ru: 'ру́сский',
  pl: 'polski',
-  pt: 'português',
-  cn: '中文'
+  pt: 'português'
 };
--- a/src/app/i18n/cn.js
+++ b/src/app/i18n/cn.js
@@ -1,16 +0,0 @@
-export const formats = {
-  decimal: '.',
-  thousands: ',',
-  grouping: [3],
-  currency: ['￥', ''],
-  dateTime: '%a %b %e %X %Y',
-  date: '%Y年%m月%d日',
-  time: '%H:%M:%S',
-  periods: ['AM', 'PM'],
-  days: ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'],
-  shortDays: ['周日', '周一', '周二', '周三', '周四', '周五', '周六'],
-  months: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
-  shortMonths: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月']
-};
-
-export { default as terms } from './cn.json';
--- a/src/app/i18n/cn.json
+++ b/src/app/i18n/cn.json
--- a/src/app/i18n/en.json
+++ b/src/app/i18n/en.json
--- a/src/app/model/Build.js
+++ b/src/app/model/Build.js
@@ -0,0 +1,12 @@
+import { Model } from '@nozbe/watermelondb';
+import { field } from '@nozbe/watermelondb/decorators';
+
+export default class Build extends Model {
+  static table = 'builds';
+
+  @field('title') title;
+
+  @field('code') code;
+
+  @field('ship_id') ship_id;
+}
--- a/src/app/model/index.js
+++ b/src/app/model/index.js
@@ -0,0 +1,22 @@
+import { Database } from '@nozbe/watermelondb';
+import LokiJSAdapter from '@nozbe/watermelondb/adapters/lokijs';
+
+import { coriolisSchema } from './schema';
+import Build from './Build';
+// import Post from './model/Post' // ⬅️ You'll import your Models here
+
+// First, create the adapter to the underlying database:
+const adapter = new LokiJSAdapter({
+  dbName: 'coriolis', // ⬅️ Give your database a name!
+  schema: coriolisSchema
+});
+
+// Then, make a Watermelon database from it!
+export const database = new Database({
+  adapter,
+  modelClasses: [
+    Build
+  ]
+});
+
+export const buildsCollection = database.collections.get('builds');
--- a/src/app/model/schema.js
+++ b/src/app/model/schema.js
@@ -0,0 +1,15 @@
+import {appSchema, tableSchema} from '@nozbe/watermelondb';
+
+export const coriolisSchema = appSchema({
+  version: 2,
+  tables: [
+    tableSchema({
+      name: 'builds',
+      columns: [
+        {name: 'title', type: 'string', isIndexed: true},
+        {name: 'code', type: 'string'},
+        {name: 'ship_id', type: 'string'}
+      ]
+    })
+  ]
+});
--- a/src/app/pages/AboutPage.jsx
+++ b/src/app/pages/AboutPage.jsx
@@ -103,7 +103,7 @@ export default class AboutPage extends Page {
            patreon.com/coriolis_elite
          </a>
          , which will be used to keep Coriolis up to date and the servers
-          running.
+          running. I also run ads, which are also used for development and hosting.
        </p>
        <form
          action="https://www.paypal.com/cgi-bin/webscr"
--- a/src/app/pages/OutfittingPage.jsx
+++ b/src/app/pages/OutfittingPage.jsx
@@ -38,6 +38,7 @@ import ModalExport from '../components/ModalExport';
 import ModalPermalink from '../components/ModalPermalink';
 import ModalShoppingList from '../components/ModalShoppingList';
 import ModalOrbis from '../components/ModalOrbis';
+import { autoBind } from 'react-extras';

 /**
 * Document Title Generator
@@ -62,14 +63,7 @@ export default class OutfittingPage extends Page {
    super(props, context);
    // window.Perf = Perf;
    this.state = this._initState(props, context);
-    this._keyDown = this._keyDown.bind(this);
-    this._exportBuild = this._exportBuild.bind(this);
-    this._pipsUpdated = this._pipsUpdated.bind(this);
-    this._boostUpdated = this._boostUpdated.bind(this);
-    this._cargoUpdated = this._cargoUpdated.bind(this);
-    this._fuelUpdated = this._fuelUpdated.bind(this);
-    this._opponentUpdated = this._opponentUpdated.bind(this);
-    this._engagementRangeUpdated = this._engagementRangeUpdated.bind(this);
+    autoBind(this);
    this._sectionMenuRefs = {};
  }

@@ -83,9 +77,9 @@ export default class OutfittingPage extends Page {
    let params = context.route.params;
    let shipId = params.ship;
    let code = params.code;
+    let savedCode = code;
    let buildName = params.bn;
    let data = Ships[shipId]; // Retrieve the basic ship properties, slots and defaults
-    let savedCode = Persist.getBuild(shipId, buildName);
    if (!data) {
      return { error: { message: 'Ship not found: ' + shipId } };
    }
@@ -144,6 +138,13 @@ export default class OutfittingPage extends Page {
    };
  }

+  async getBuild() {
+    const build = await Persist.getBuild(this.state.shipId, this.state.buildName);
+    if (build) {
+      this.setState({id: build.id, savedCode: build.code})
+    }
+  }
+
  /**
   * Handle build name change and update state
   * @param  {SyntheticEvent} event React Event
@@ -224,12 +225,9 @@ export default class OutfittingPage extends Page {
        const control = LZString.decompressFromBase64(
          Utils.fromUrlSafe(parts[4])
        ).split('/');
-        sys = parseFloat(control[0]);
-        eng = parseFloat(control[1]);
-        wep = parseFloat(control[2]);
-        if (sys + eng + wep > 6) {
-          sys = eng = wep = 2;
-        }
+        sys = parseFloat(control[0]) || sys;
+        eng = parseFloat(control[1]) || eng;
+        wep = parseFloat(control[2]) || wep;
        boost = control[3] == 1 ? true : false;
        fuel = parseFloat(control[4]) || fuel;
        cargo = parseInt(control[5]) || cargo;
@@ -420,13 +418,14 @@ export default class OutfittingPage extends Page {
  /**
   * Save the current build
   */
-  _saveBuild() {
-    const { ship, buildName, newBuildName, shipId } = this.state;
-
+  async _saveBuild() {
+    const { ship, buildName, newBuildName, shipId, id } = this.state;
+    this.getBuild();
    // If this is a stock ship the code won't be set, so ensure that we have it
    const code = this.state.code || ship.toString();

-    Persist.saveBuild(shipId, newBuildName, code);
+    const yes = await Persist.saveBuild(id, newBuildName, code, shipId);
+    console.log(yes)
    this._updateRoute(shipId, newBuildName, code);

    let opponent, opponentBuild, opponentSys, opponentEng, opponentWep;
@@ -663,6 +662,7 @@ export default class OutfittingPage extends Page {
   * Add listeners when about to mount
   */
  componentWillMount() {
+    this.getBuild()
    document.addEventListener('keydown', this._keyDown);
  }

--- a/src/app/pages/Page.jsx
+++ b/src/app/pages/Page.jsx
@@ -70,13 +70,6 @@ export default class Page extends React.Component {
    document.title = this.state.title || 'Coriolis';
  }

-  /**
-   * Update the window title upon mount
-   */
-  componentDidMount() {
-    document.title = this.state.title || 'Coriolis';
-  }
-
  /**
   * Updates the title upon change
   * @param  {Object} newProps  Incoming properties
--- a/src/app/pages/ShipyardPage.jsx
+++ b/src/app/pages/ShipyardPage.jsx
@@ -6,7 +6,6 @@ import Ship from '../shipyard/Ship';
 import * as ModuleUtils from '../shipyard/ModuleUtils';
 import { SizeMap } from '../shipyard/Constants';
 import Link from '../components/Link';
-const owofy = require("owofy");

 /**
 * Counts the hardpoints by class/size
@@ -62,7 +61,6 @@ function shipSummary(shipId, shipData) {
    id: shipId,
    hpCount: 0,
    intCount: 0,
-    beta: shipData.beta,
    maxCargo: 0,
    maxPassengers: 0,
    hp: [0, 0, 0, 0, 0], // Utility, Small, Medium, Large, Huge
@@ -170,21 +168,23 @@ export default class ShipyardPage extends Page {
   * @param  {Object} u           Localized unit map
   * @param  {Function} fInt      Localized integer formatter
   * @param  {Function} fRound    Localized round formatter
+   * @param  {Boolean} highlight  Should this row be highlighted
   * @return {React.Component}    Table Row
   */
-  _shipRowElement(s, translate, u, fInt, fRound) {
+  _shipRowElement(s, translate, u, fInt, fRound, highlight) {
    let noTouch = this.context.noTouch;

    return (
      <tr
        key={s.id}
-        style={{ height: "1.5em" }}
+        style={{ height: '1.5em' }}
        className={cn({
-          highlighted: noTouch && this.state.shipId === s.id
+          highlighted: noTouch && this.state.shipId === s.id,
+          alt: highlight
        })}
        onMouseEnter={noTouch && this._highlightShip.bind(this, s.id)}
      >
-        <td className="ri">{owofy(s.manufacturer)}</td>
+        <td className="ri">{s.manufacturer}</td>
        <td className="ri">{fInt(s.retailCost)}</td>
        <td className="ri cap">{translate(SizeMap[s.class])}</td>
        <td className="ri">{fInt(s.crew)}</td>
@@ -285,13 +285,27 @@ export default class ShipyardPage extends Page {
    let shipRows = new Array(shipSummaries.length);
    let detailRows = new Array(shipSummaries.length);

+    let lastShipSortValue = null;
+    let backgroundHighlight = false;
+
    for (let s of shipSummaries) {
+      let shipSortValue = s[shipPredicate];
+      if (shipPredicateIndex != undefined) {
+        shipSortValue = shipSortValue[shipPredicateIndex];
+      }
+
+      if (shipSortValue != lastShipSortValue) {
+        backgroundHighlight = !backgroundHighlight;
+        lastShipSortValue = shipSortValue;
+      }
+
      detailRows[i] = this._shipRowElement(
        s,
        translate,
        units,
        fInt,
        formats.f1,
+        backgroundHighlight
      );
      shipRows[i] = (
        <tr
@@ -299,16 +313,18 @@ export default class ShipyardPage extends Page {
          style={{ height: '1.5em' }}
          className={cn({
            highlighted: noTouch && this.state.shipId === s.id,
+            alt: backgroundHighlight
          })}
          onMouseEnter={noTouch && this._highlightShip.bind(this, s.id)}
        >
          <td className="le">
-            <Link href={'/outfit/' + s.id}>{owofy(s.name)} {s.beta === true ? '(Beta)' : null}</Link>
+            <Link href={'/outfit/' + s.id}>{s.name}</Link>
          </td>
        </tr>
      );
      i++;
    }
+
    return (
      <div className="page" style={{ fontSize: sizeRatio + 'em' }}>
        <div
@@ -435,10 +451,10 @@ export default class ShipyardPage extends Page {
                  <th className="sortable" onClick={sortShips('maxCargo')}>
                    {translate('cargo')}
                  </th>
-                  <th className="sortable" onClick={sortShips('maxPassengers')} onMouseEnter={termtip.bind(null, 'passenger capacity')}
-                    onMouseLeave={hide}>
+                  <th className="sortable" onClick={sortShips('maxPassengers')}>
                    {translate('pax')}
                  </th>
+
                  <th className="lft" colSpan={7}>
                    {translate('core module classes')}
                  </th>
@@ -595,7 +611,6 @@ export default class ShipyardPage extends Page {
                {detailRows}
              </tbody>
            </table>
-
          </div>
        </div>
      </div>
--- a/src/app/shipyard/Constants.js
+++ b/src/app/shipyard/Constants.js
@@ -94,10 +94,6 @@ export const ModuleGroupToName = {
  gsc: 'Guardian Shard Cannon',
  tbem: 'Enzyme Missile Rack',
  tbrfl: 'Remote Release Flechette Launcher',
-  pwa: 'Pulse Wave Analyser',
-  abl: 'Abrasion Blaster',
-  scl: 'Seismic Charge Launcher',
-  sdm: 'Sub-Surface Displacement Missile',
 };

 let GrpNameToCodeMap = {};
--- a/src/app/shipyard/Module.js
+++ b/src/app/shipyard/Module.js
@@ -41,7 +41,6 @@ export default class Module {
   * @return {object}     The value of the modification. If it is a numeric value then it is returned as an integer value scaled so that 1.23% == 123
   */
  getModValue(name, raw) {
-    let baseVal = this[name];
    let result = this.mods  && this.mods[name] ? this.mods[name] : null;

    if ((!raw) && this.blueprint && this.blueprint.special) {
@@ -52,8 +51,13 @@ export default class Module {
        const modification = Modifications.modifications[name];
        const multiplier = modification.type === 'percentage' ? 10000 : 100;
        if (name === 'explres' || name === 'kinres' || name === 'thermres' || name === 'causres') {
-          // Apply resistance modding mechanisms to special effects subsequently
-          result = result + modifierActions[name] * (1 - (this[name] + result / multiplier)) * 100;
+          // Resistance modifications in itself are additive, however their
+          // special effects are multiplicative. They affect the overall result
+          // by (special effect resistance) * (damage mult after modification),
+          // i. e. we need to apply the special effect as a multiplier to the
+          // overall result and then calculate the difference.
+          let baseMult = this[name] ? 1 - this[name] : 1;
+          result = (baseMult - (baseMult - result / multiplier) * (1 - modifierActions[name] / 100)) * multiplier;
        } else if (modification.method === 'additive') {
          result = result + modifierActions[name] * 100;
        } else if (modification.method === 'overwrite') {
@@ -71,6 +75,15 @@ export default class Module {
      }
    }

+    // Resistance modding for hull reinforcement packages has additional
+    // diminishing returns implemented. The mod value gets lowered by
+    // the amount of base resistance the hrp has.
+    if (!isNaN(result) && this.grp === 'hr' &&
+      (name === 'kinres' || name === 'thermres' || name === 'explres')) {
+      let baseRes = this[name];
+      result = result * (1 - baseRes);
+    }
+
    // Sanitise the resultant value to 4dp equivalent
    return isNaN(result) ? result : Math.round(result);
  }
@@ -95,11 +108,11 @@ export default class Module {
        // This special effect modifies the value being set, so we need to revert it prior to storing the value
        const modification = Modifications.modifications[name];
        if (name === 'explres' || name === 'kinres' || name === 'thermres' || name === 'causres') {
-          let res = (this[name] ? this[name] : 0) + value / 10000;
-          let experimental = modifierActions[name] / 100;
-          value = (experimental - res) / (experimental - 1) - this[name];
-          value *= 10000;
-          // value = ((baseMult - value / 10000) / (1 - modifierActions[name] / 100) - baseMult) * -10000;
+          // Resistance modifications in itself are additive but their
+          // experimentals are applied multiplicatively therefor we must handle
+          // them differently here (cf. documentation in getModValue).
+          let baseMult = (this[name] ? 1 - this[name] : 1);
+          value = ((baseMult - value / 10000) / (1 - modifierActions[name] / 100) - baseMult) * -10000;
        } else if (modification.method === 'additive') {
          value = value - modifierActions[name];
        } else if (modification.method === 'overwrite') {
@@ -164,10 +177,14 @@ export default class Module {
        baseValue = 0;
      }
      modValue = value - baseValue;
+      if (this.grp === 'hr' &&
+        (name === 'kinres' || name === 'thermres' || name === 'explres')) {
+        modValue = modValue / (1 - baseValue);
+      }
    } else if (name === 'shieldboost' || name === 'hullboost') {
      modValue = (1 + value) / (1 + baseValue) - 1;
    } else { // multiplicative
-      modValue = baseValue == 0 ? 0 : value / baseValue - 1;
+      modValue = value / baseValue - 1;
    }

    if (modification.type === 'percentage') {
@@ -703,7 +720,8 @@ export default class Module {
    let result = 0;
    if (this['maxmass']) {
      result = this['maxmass'];
-      if (result && modified) {
+      // max mass is only modified for non-shield boosters
+      if (result && modified && this.grp !== 'sg') {
        let mult = this.getModValue('optmass') / 10000;
        if (mult) { result = result * (1 + mult); }
      }
@@ -1072,31 +1090,4 @@ export default class Module {
  getHackTime(modified = true) {
    return this.get('hacktime', modified);
  }
-
-  /**
-   * Get the scan range for this module
-   * @param {Boolean} [modified=true] Whether to take modifications into account
-   * @return {string} the time for this module
-   */
-  getScanRange(modified = true) {
-    return this.get('scanrange', modified);
-  }
-
-  /**
-   * Get the scan angle for this module
-   * @param {Boolean} [modified=true] Whether to take modifications into account
-   * @return {string} the time for this module
-   */
-  getScanAngle(modified = true) {
-    return this.get('scanangle', modified);
-  }
-
-  /**
-   * Get the max angle for this module
-   * @param {Boolean} [modified=true] Whether to take modifications into account
-   * @return {string} the time for this module
-   */
-  getMaxAngle(modified = true) {
-    return this.get('maxangle', modified);
-  }
 }
--- a/src/app/shipyard/ModuleUtils.js
+++ b/src/app/shipyard/ModuleUtils.js
@@ -63,10 +63,7 @@ export function standard(type, id) {
  if (!isNaN(type)) {
    type = StandardArray[type];
  }
-  let s = Modules.standard[type].find(e => e.id === id);
-  if (!s) {
-    s = Modules.standard[type].find(e => (e.class == id.charAt(0) && e.rating == id.charAt(1)));
-  }
+  let s = Modules.standard[type].find(e => e.id == id || (e.class == id.charAt(0) && e.rating == id.charAt(1)));
  if (s) {
    s = new Module({ template: s });
  }
--- a/src/app/shipyard/Serializer.js
+++ b/src/app/shipyard/Serializer.js
@@ -85,12 +85,12 @@ export function toDetailedBuild(buildName, ship) {
      code = ship.toString();

  let data = {
-    $schema: 'https://coriolis.io/schemas/ship-loadout/4.json#',
+    $schema: 'https://coriolis.edcd.io/schemas/ship-loadout/4.json#',
    name: buildName,
    ship: ship.name,
    references: [{
      name: 'Coriolis.io',
-      url: 'https://coriolis.io' + outfitURL(ship.id, code, buildName),
+      url: 'https://coriolis.edcd.io' + outfitURL(ship.id, code, buildName),
      code,
      shipId: ship.id
    }],
--- a/src/app/shipyard/Ship.js
+++ b/src/app/shipyard/Ship.js
@@ -505,11 +505,6 @@ export default class Ship {
    if (isAbsolute) {
      m.setPretty(name, value, sentfromui);
    } else {
-      // Resistance modifiers scale with the base value
-      if (name == 'kinres' || name == 'thermres' || name == 'causres' || name == 'explres') {
-        let baseValue = m.get(name, false);
-        value = (1 - baseValue) * value;
-      }
      m.setModValue(name, value, sentfromui);
    }

@@ -1308,7 +1303,7 @@ export default class Ship {
    let fsd = this.standard[2].m;   // Frame Shift Drive;
    let { unladenMass, fuelCapacity } = this;
    this.unladenRange = this.calcUnladenRange(); // Includes fuel weight for jump
-    this.fullTankRange = Calc.jumpRange(unladenMass + fuelCapacity, fsd, fuelCapacity, this); // Full Tank
+    this.fullTankRange = Calc.jumpRange(unladenMass + fuelCapacity, fsd, this); // Full Tank
    this.ladenRange = this.calcLadenRange(); // Includes full tank and caro
    this.unladenFastestRange = Calc.totalJumpRange(unladenMass + this.fuelCapacity, fsd, fuelCapacity, this);
    this.ladenFastestRange = Calc.totalJumpRange(unladenMass + this.fuelCapacity + this.cargoCapacity, fsd, fuelCapacity, this);
@@ -1506,7 +1501,7 @@ export default class Ship {
            } else {
              buffer.writeInt32LE(slotMod.value, curpos);
            }
-            const modification = _.find(Modifications.modifications, function(o) { return o.id === slotMod.id; });
+            // const modification = _.find(Modifications.modifications, function(o) { return o.id === slotMod.id; });
            // console.log('ENCODE Slot ' + i + ': ' + modification.name + ' = ' + slotMod.value);
            curpos += 4;
          }
@@ -1519,7 +1514,6 @@ export default class Ship {
      }

      this.serialized.modifications = zlib.gzipSync(buffer).toString('base64');
-      // console.log(this.serialized.modifications)
    } else {
      this.serialized.modifications = null;
    }
--- a/src/app/shipyard/StatsFormatting.js
+++ b/src/app/shipyard/StatsFormatting.js
@@ -78,6 +78,5 @@ export const STATS_FORMATTING = {
  'thermres': { 'format': 'pct' },
  'wepcap': { 'format': 'round1', 'unit': 'MJ' },
  'weprate': { 'format': 'round1', 'unit': 'MW' },
-  'jumpboost': { 'format': 'round1', 'unit': 'LY' },
-  'proberadius': { 'format': 'pct1', 'unit': 'pct' },
+  'jumpboost': { 'format': 'round1', 'unit': 'LY' }
 };
--- a/src/app/stores/Persist.js
+++ b/src/app/stores/Persist.js
@@ -1,5 +1,7 @@
 import { EventEmitter } from 'fbemitter';
 import { Insurance } from '../shipyard/Constants';
+import { buildsCollection, database } from '../model';
+import {Q} from '@nozbe/watermelondb';

 const LS_KEY_BUILDS = 'builds';
 const LS_KEY_COMPARISONS = 'comparisons';
@@ -81,7 +83,7 @@ export class Persist extends EventEmitter {
      localStorage.setItem('test', 'test');
      localStorage.removeItem('test');
      LS = localStorage;
-    } catch(e) {
+    } catch (e) {
      LS = null;
    }

@@ -105,7 +107,7 @@ export class Persist extends EventEmitter {
    this.comparisons = comparisonJson && typeof comparisonJson == 'object' ? comparisonJson : {};
    this.costTab = _getString(LS_KEY_COST_TAB);
    this.outfittingTab = _getString(LS_KEY_OUTFITTING_TAB);
-    this.state =  _get(LS_KEY_STATE);
+    this.state = _get(LS_KEY_STATE);
    this.sizeRatio = _get(LS_KEY_SIZE_RATIO) || 1;
    this.matsPerGrade = matsPerGrade || {
      1: 2,
@@ -132,7 +134,7 @@ export class Persist extends EventEmitter {
    let newValue = e.newValue;

    try {
-      switch(e.key) {
+      switch (e.key) {
        case LS_KEY_BUILDS:
          this.builds = newValue ? JSON.parse(newValue) : {};
          this.emit('builds');
@@ -249,17 +251,27 @@ export class Persist extends EventEmitter {
  /**
   * Persist a ship build in local storage.
   *
-   * @param  {String} shipId The unique id for a model of ship
+   * @param {String} id The unique id for the ship or ''
+   * @param  {String} shipId The coriolis ship id
   * @param  {String} name   The name of the build
   * @param  {String} code   The serialized code
   */
-  saveBuild(shipId, name, code) {
-    if (!this.builds[shipId]) {
-      this.builds[shipId] = {};
+  async saveBuild(id, name, code, shipId) {
+    if (id) {
+      const build = await buildsCollection.find(id);
+      if (build) {
+        return build.update(newBuild => {
+          newBuild.title = name;
+          newBuild.body = code;
+        });
+      }
    }
-    this.builds[shipId][name] = code;
-    _put(LS_KEY_BUILDS, this.builds);
-    this.emit('builds');
+
+    return await buildsCollection.create(build => {
+      build.title = name;
+      build.ship_id = shipId;
+      build.body = code;
+    });
  }

  /**
@@ -270,11 +282,10 @@ export class Persist extends EventEmitter {
   * @param  {String} name   The name of the build
   * @return {String}        The serialized build string.
   */
-  getBuild(shipId, name) {
-    if (this.builds[shipId] && this.builds[shipId][name]) {
-      return this.builds[shipId][name];
-    }
-    return null;
+  async getBuild(shipId, name) {
+    const build = await buildsCollection.query(Q.where('ship_id', shipId), Q.where('title', name)).fetch();
+    console.log(build);
+    return build;
  }

  /**
@@ -283,7 +294,7 @@ export class Persist extends EventEmitter {
   * @return {Object | Array} Object if Ship Id is not provided
   */
  getBuilds(shipId) {
-    if(shipId && shipId.length > 0) {
+    if (shipId && shipId.length > 0) {
      return this.builds[shipId];
    }
    return this.builds;
@@ -362,7 +373,9 @@ export class Persist extends EventEmitter {
    }
    this.comparisons[name] = {
      facets,
-      builds: builds.map(b => { return { shipId: b.id || b.shipId, buildName: b.buildName }; })
+      builds: builds.map(b => {
+        return { shipId: b.id || b.shipId, buildName: b.buildName };
+      })
    };
    _put(LS_KEY_COMPARISONS, this.comparisons);
    this.emit('comparisons');
@@ -505,6 +518,7 @@ export class Persist extends EventEmitter {
    _put(LS_KEY_ROLLS, this.matsPerGrade);
    this.emit('matsPerGrade');
  }
+
  /**
   * Get the saved Mats per grade
   * @return {Object} # of rolls per grade
@@ -556,6 +570,7 @@ export class Persist extends EventEmitter {
    this.outfittingTab = tabName;
    _put(LS_KEY_OUTFITTING_TAB, tabName);
  }
+
  /**
   * Get the current outfitting tab
   * @return {string} the current outfitting tab
--- a/src/app/sw.js
+++ b/src/app/sw.js
@@ -2,21 +2,6 @@ console.log('Hello from sw.js');

 if (workbox) {
  console.log('Yay! Workbox is loaded 🎉');
-  workbox.precaching.precacheAndRoute(self.__precacheManifest);
-
-  workbox.routing.registerNavigationRoute('/index.html');
-
-  workbox.routing.registerRoute(
-    new RegExp('/(.*?)'),
-    workbox.strategies.staleWhileRevalidate({
-      plugins: [
-        new workbox.cacheableResponse.Plugin({
-          statuses: [0, 200]
-        })
-      ]
-    })
-  );
-
  workbox.routing.registerRoute(
    new RegExp('https://fonts.(?:googleapis|gstatic).com/(.*)'),
    workbox.strategies.cacheFirst({
@@ -55,3 +40,23 @@ self.addEventListener('message', event => {
      break;
  }
 });
+const OFFLINE_URL = '/';
+self.addEventListener('fetch', function(event) {
+  console.log('Handling fetch event for', event.request.url);
+
+  event.respondWith(
+    caches.match(event.request).then(function(response) {
+      if (response) {
+        return response;
+      }
+
+      return fetch(event.request)
+        .then(function(response) {
+          return response;
+        })
+        .catch(function(error) {
+          return caches.match(OFFLINE_URL);
+        });
+    })
+  );
+});
--- a/src/app/utils/CompanionApiUtils.js
+++ b/src/app/utils/CompanionApiUtils.js
@@ -30,8 +30,6 @@ export const SHIP_FD_NAME_TO_CORIOLIS_NAME = {
  'Hauler': 'hauler',
  'Independant_Trader': 'keelback',
  'Krait_MkII': 'krait_mkii',
-  'Mamba': 'mamba',
-  'Krait_Light': 'krait_phantom',
  'Orca': 'orca',
  'Python': 'python',
  'SideWinder': 'sidewinder',
--- a/src/app/utils/SlotFunctions.js
+++ b/src/app/utils/SlotFunctions.js
@@ -145,11 +145,11 @@ export function diffDetails(language, m, mm) {
  if (m.grp === 'pp') {
    let mPowerGeneration = m.pgen || 0;
    let mmPowerGeneration = mm ? mm.getPowerGeneration() : 0;
-    if (mPowerGeneration != mmPowerGeneration) propDiffs.push(<div key='pgen'>{translate('pgen')}: <span className={diffClass(mPowerGeneration, mmPowerGeneration)}>{diff(formats.round, mPowerGeneration, mmPowerGeneration)}{units.MW}</span></div>);
+    if (mPowerGeneration != mmPowerGeneration) propDiffs.push(<div key='pgen'>{translate('pgen')}: <span className={diffClass(mPowerGeneration, mmPowerGeneration)}>{diff(formats.round, mPowerGeneration, mmPowerGeneration)}{units.MJ}</span></div>);
  } else {
    let mPowerUsage = m.power || 0;
    let mmPowerUsage = mm ? mm.getPowerUsage() || 0 : 0;
-    if (mPowerUsage != mmPowerUsage) propDiffs.push(<div key='power'>{translate('power')}: <span className={diffClass(mPowerUsage, mmPowerUsage, true)}>{diff(formats.round, mPowerUsage, mmPowerUsage)}{units.MW}</span></div>);
+    if (mPowerUsage != mmPowerUsage) propDiffs.push(<div key='power'>{translate('power')}: <span className={diffClass(mPowerUsage, mmPowerUsage, true)}>{diff(formats.round, mPowerUsage, mmPowerUsage)}{units.MJ}</span></div>);
  }

  let mDps = m.damage * (m.rpshot || 1) * (m.rof || 1);
--- a/src/clippy.css
+++ b/src/clippy.css
@@ -1,61 +0,0 @@
-.clippy, .clippy-balloon {
-    position: fixed;
-    z-index: 1000;
-    cursor: pointer;
-}
-
-.clippy-balloon {
-
-    background: #FFC;
-    color: black;
-    padding: 8px;
-    border: 1px solid black;
-    border-radius: 5px;
-
-}
-
-.clippy-content {
-    max-width: 200px;
-    min-width: 120px;
-    font-family: "Microsoft Sans", sans-serif;
-    font-size: 10pt;
-}
-
-.clippy-tip {
-    width: 10px;
-    height: 16px;
-    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAgCAMAAAAlvKiEAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAAlQTFRF///MAAAA////52QwgAAAAAN0Uk5T//8A18oNQQAAAGxJREFUeNqs0kEOwCAIRFHn3//QTUU6xMyyxii+jQosrTPkyPEM6IN3FtzIRk1U4dFeKWQiH6pRRowMVKEmvronEynkwj0uZJgR22+YLopPSo9P34wJSamLSU7lSIWLJU7NkNomNlhqxUeAAQC+TQLZyEuJBwAAAABJRU5ErkJggg==) no-repeat;
-    position: absolute;
-}
-
-.clippy-top-left .clippy-tip {
-    top: 100%;
-    margin-top: 0px;
-    left: 100%;
-    margin-left: -50px;
-}
-
-.clippy-top-right .clippy-tip {
-    top: 100%;
-    margin-top: 0px;
-    left: 0;
-    margin-left: 50px;
-    background-position: -10px 0;
-
-}
-
-.clippy-bottom-right .clippy-tip {
-    top: 0;
-    margin-top: -16px;
-    left: 0;
-    margin-left: 50px;
-    background-position: -10px -16px;
-}
-
-.clippy-bottom-left .clippy-tip {
-    top: 0;
-    margin-top: -16px;
-    left: 100%;
-    margin-left: -50px;
-    background-position: 0px -16px;
-}
--- a/src/clippy.min.js
+++ b/src/clippy.min.js
--- a/src/iframe.html
+++ b/src/iframe.html
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <script src="xdLocalStoragePostMessageApi.min.js"></script>
-</head>
-<body>
-    This is the magical iframe
-</body>
-</html>
--- a/src/index.ejs
+++ b/src/index.ejs
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-<head>
+  <head>
    <title>Coriolis EDCD Edition</title>
    <meta charset="UTF-8">
    <link rel="stylesheet" href="<%= htmlWebpackPlugin.files.css[0] %>">
@@ -13,7 +13,7 @@
    <link rel="manifest" href="/manifest.json">
    <link rel="shortcut icon" href=/favicon2.ico>
    <link rel="icon" sizes="152x152 192x192" type="image/png"
-          href="/192x192.png">
+      href="/192x192.png">

    <!-- Apple/iOS headers -->
    <meta name="apple-mobile-web-app-capable" content="yes">
@@ -29,74 +29,46 @@
    <script>
      window.CORIOLIS_GAPI_KEY = '<%- htmlWebpackPlugin.options.gapiKey %>';
      window.CORIOLIS_VERSION = '<%- htmlWebpackPlugin.options.version %>';
-      window.CORIOLIS_DATE = '<%- htmlWebpackPlugin.options.date.toISOString().slice(0, 10) %>';
-      window.BUGSNAG_VERSION = '<%- htmlWebpackPlugin.options.version + '-' + htmlWebpackPlugin.options.date.toISOString() %>';
+      window.CORIOLIS_DATE = '<%- htmlWebpackPlugin.options.date.toISOString().slice(0, 10)  %>';
+      window.BUGSNAG_VERSION = '<%- htmlWebpackPlugin.options.version + '-' + htmlWebpackPlugin.options.date.toISOString()  %>';
    </script>
    <% if (htmlWebpackPlugin.options.uaTracking) { %>
+      <script>
+      window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
+      ga('create', '<%- htmlWebpackPlugin.options.uaTracking %>', 'auto');
+      ga('send', 'pageview');
+    </script>
+      <script async src='https://www.google-analytics.com/analytics.js'></script>
+      <% } %>
+
+        <!-- Piwik -->
+        <!-- <script type="text/javascript">
+      var _paq = _paq || [];
+      /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+      _paq.push(["setCookieDomain", "*.coriolis.edcd.io"]);
+      _paq.push(['trackPageView']);
+      _paq.push(['enableLinkTracking']);
+      (function() {
+        var u="//stats.isadankme.me/";
+        _paq.push(['setTrackerUrl', u+'piwik.php']);
+        _paq.push(['setSiteId', '4']);
+        var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+        g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
+      })();
+    </script>-->
+        <!-- End Piwik Code -->
+
+        <!-- Bugsnag -->
+        <script src="//d2wy8f7a9ursnm.cloudfront.net/v4/bugsnag.min.js"></script>
+        <script
+          src="//d2wy8f7a9ursnm.cloudfront.net/bugsnag-plugins/v1/bugsnag-react.min.js"></script>
        <script>
-          window.ga = window.ga || function() {(ga.q = ga.q || []).push(arguments);};
-          ga.l = +new Date;
-          ga('create', '<%- htmlWebpackPlugin.options.uaTracking %>', 'auto');
-          ga('send', 'pageview');
-        </script>
-        <script async src='https://www.google-analytics.com/analytics.js'></script>
-    <% } %>
-
-    <!-- Piwik -->
-    <!-- <script type="text/javascript">
-  var _paq = _paq || [];
-  /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-  _paq.push(["setCookieDomain", "*.coriolis.edcd.io"]);
-  _paq.push(['trackPageView']);
-  _paq.push(['enableLinkTracking']);
-  (function() {
-    var u="//stats.isadankme.me/";
-    _paq.push(['setTrackerUrl', u+'piwik.php']);
-    _paq.push(['setSiteId', '4']);
-    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
-  })();
-</script>-->
-    <!-- End Piwik Code -->
-
-    <!-- Bugsnag -->
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.js"></script>
-    <script src="https://d2wy8f7a9ursnm.cloudfront.net/v5.0.0/bugsnag.min.js"></script>
-    <script src="/clippy.min.js"></script>
-    <script type="text/javascript">
-      const advice = ['When all else fails, Put a docking computer in every slot. My name is Clippy.',
-        'Fly in a stright line and roll, your evasion increases by 200%!',
-        'Boost!!!',
-        'If you are running out of power, consider deactivating thrusters!',
-        'Make sure to set fire-groups for your SCBs!',
-        'If you find yourself dying often - git gud!',
-        'Remember, shield boosters increase skill!',
-        'Remember, B rated drives offer greater speed!',
-        'Point directly into the jet cone and full throttle for optimal FSD boost.',
-        'Raxxla can only be found in open play.',
-      'Try silent running when under focus to drop aggro, and reboot when your opponents lose sight of you!'];
-      clippy.load('Clippy', function(agent) {
-        // do anything with the loaded agent
-        agent.show();
-
-        setInterval(() => {
-          agent.animate();
-          const toSpeak = advice[Math.random() * advice.length >> 0];
-          agent.speak(toSpeak);
-        }, (20000));
-        setInterval(() => {
-          agent.animate();
-          agent.speak('@everyone FDL. :pray:');
-        }, (69000));
-      });
+      window.bugsnagClient = bugsnag('ba9fae819372850fb660755341fa6ef5', {appVersion: window.BUGSNAG_VERSION || undefined})
+      window.Bugsnag = window.bugsnagClient
    </script>
-    <script>
-      window.bugsnagClient = bugsnag('ba9fae819372850fb660755341fa6ef5', { appVersion: window.BUGSNAG_VERSION || undefined });
-      window.Bugsnag = window.bugsnagClient;
-    </script>
-</head>
-<body style="background-color:#000;">
-<section id="coriolis"></section>
+      </head>
+      <body style="background-color:#000;">
+        <section id="coriolis"></section>

-</body>
-</html>
+      </body>
+    </html>
--- a/src/less/app.less
+++ b/src/less/app.less
@@ -171,18 +171,3 @@ footer {
    text-align: right;
  }
 }
-
-.announcement-container {
-  display: flex;
-  align-items: center;
-  padding-top: 10px;
-  justify-content: center;
-  flex-flow: row wrap;
-}
-
-.announcement {
-  border: 1px @secondary solid;
-  padding: 10px;
-}
-
-@import "../../node_modules/clippy.js/build/clippy.css";
--- a/src/less/colors.less
+++ b/src/less/colors.less
@@ -6,8 +6,8 @@
 // Foreground colors
@fg: #CCC;
@muted: #999;
-@primary: #e64980; // Light Orange
-@secondary: #9775fa;  // Light blue
+@primary: #FF8C0D; // Light Orange
+@secondary: #1FB0FF;  // Light blue
@warning: #FF3B00;  // Dark Orange
@disabled: #555;    // Light grey
@success: #71a052;    // Green
--- a/src/less/select.less
+++ b/src/less/select.less
@@ -22,15 +22,6 @@ select {
  }
 }

-.react-fuzzy-search > * {
-  padding: 0 !important;
-  color: @primary;
-  & > input {
-    border: 1px solid @primary !important;
-    color: @primary-bg;
-  }
-}
-
 .cmdr-select {
  border: 1px solid @primary;
  padding: 0.5em 0.5em;
--- a/src/less/table.less
+++ b/src/less/table.less
@@ -55,7 +55,7 @@ tbody tr {
    background-color: @warning-bg;
  }

-  &:nth-child(odd){
+  &.alt {
    background-color: @alt-primary-bg;
  }
 }
--- a/src/schemas/ship-loadout/1.json
+++ b/src/schemas/ship-loadout/1.json
@@ -1,6 +1,6 @@
 {
  "$schema":            "http://json-schema.org/draft-04/schema#",
-  "id":                 "https://coriolis.io/schemas/ship-loadout/1.json#",
+  "id":                 "https://coriolis.edcd.io/schemas/ship-loadout/1.json#",
  "title":              "Ship Loadout",
  "type":               "object",
  "description":        "The details for a specific ship build/loadout. DEPRECATED in favor of Version 3",
--- a/src/schemas/ship-loadout/2.json
+++ b/src/schemas/ship-loadout/2.json
@@ -1,6 +1,6 @@
 {
  "$schema":            "http://json-schema.org/draft-04/schema#",
-  "id":                 "https://coriolis.io/schemas/ship-loadout/2.json#",
+  "id":                 "https://coriolis.edcd.io/schemas/ship-loadout/2.json#",
  "title":              "Ship Loadout",
  "type":               "object",
  "description":        "The details for a specific ship build/loadout. DEPRECATED in favor of Version 3",
--- a/src/schemas/ship-loadout/3.json
+++ b/src/schemas/ship-loadout/3.json
@@ -1,6 +1,6 @@
 {
  "$schema":            "http://json-schema.org/draft-04/schema#",
-  "id":                 "https://coriolis.io/schemas/ship-loadout/3.json#",
+  "id":                 "https://coriolis.edcd.io/schemas/ship-loadout/3.json#",
  "title":              "Ship Loadout",
  "type":               "object",
  "description":        "The details for a specific ship build/loadout",
--- a/src/schemas/ship-loadout/4.json
+++ b/src/schemas/ship-loadout/4.json
@@ -1,6 +1,6 @@
 {
  "$schema":            "http://json-schema.org/draft-04/schema#",
-  "id":                 "https://coriolis.io/schemas/ship-loadout/4.json#",
+  "id":                 "https://coriolis.edcd.io/schemas/ship-loadout/4.json#",
  "title":              "Ship Loadout",
  "type":               "object",
  "description":        "The details for a specific ship build/loadout",
--- a/src/xdLocalStoragePostMessageApi.min.js
+++ b/src/xdLocalStoragePostMessageApi.min.js
@@ -1 +0,0 @@
-"use strict";window.XdUtils=window.XdUtils||function(){function a(a,b){var c,d=b||{};for(c in a)a.hasOwnProperty(c)&&(d[c]=a[c]);return d}return{extend:a}}(),function(){function a(a,b){var c=XdUtils.extend(b,l);c.id=a,parent.postMessage(JSON.stringify(c),"*")}function b(b,c){a(b,{key:c,value:localStorage.getItem(c)})}function c(b,c,d){localStorage.setItem(c,d),a(b,{success:localStorage.getItem(c)===d})}function d(b,c){localStorage.removeItem(c),a(b,{})}function e(b,c){a(b,{key:localStorage.key(c)})}function f(b){a(b,{size:JSON.stringify(localStorage).length})}function g(b){a(b,{length:localStorage.length})}function h(b){localStorage.clear(),a(b,{})}function i(a){var i;try{i=JSON.parse(a.data)}catch(a){}i&&i.namespace===k&&("set"===i.action?c(i.id,i.key,i.value):"get"===i.action?b(i.id,i.key):"remove"===i.action?d(i.id,i.key):"key"===i.action?e(i.id,i.key):"size"===i.action?f(i.id):"length"===i.action?g(i.id):"clear"===i.action&&h(i.id))}function j(){var a={namespace:k,id:"iframe-ready"};parent.postMessage(JSON.stringify(a),"*")}var k="cross-domain-local-message",l={namespace:k};window.addEventListener?window.addEventListener("message",i,!1):window.attachEvent("onmessage",i),j()}();
--- a/webpack.config.dev.js
+++ b/webpack.config.dev.js
@@ -14,7 +14,7 @@ module.exports = {
  },
  mode: 'development',
  entry: {
-    main: './src/app/index.js',
+    main: './src/app/index.js'
  },
  resolve: {
    // When requiring, you don't need to add these extensions
@@ -22,15 +22,24 @@ module.exports = {
  },
  optimization: {
    minimize: false,
-    usedExports: true
+    splitChunks: {
+      chunks: 'all'
+    }
  },
  output: {
    path: path.join(__dirname, 'build'),
-    chunkFilename: '[name].bundle.js',
+    filename: 'app.js',
+    globalObject: 'this',
    publicPath: '/'
  },
+  node: {
+    fs: 'empty',
+    net: 'empty',
+    tls: 'empty',
+    'crypto': 'empty'
+  },
  plugins: [
-    new CopyWebpackPlugin(['src/.htaccess', 'src/iframe.html', 'src/xdLocalStoragePostMessageApi.min.js', 'src/clippy.min.js']),
+    new CopyWebpackPlugin(['src/.htaccess']),
    // new webpack.optimize.CommonsChunkPlugin({
    //   name: 'lib',
    //   filename: 'lib.js'
@@ -59,6 +68,7 @@ module.exports = {
        loader: ExtractTextPlugin.extract({ fallback: 'style-loader', use: 'css-loader!less-loader' })
      },
      { test: /\.(js|jsx)$/, loaders: ['babel-loader'], include: path.join(__dirname, 'src') },
+      { test: /\.worker\.js$/, use: { loader: 'worker-loader' } },
      { test: /\.woff(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff' },
      { test: /\.woff2(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff' },
      { test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/octet-stream' },
--- a/webpack.config.prod.js
+++ b/webpack.config.prod.js
@@ -4,35 +4,34 @@ const HtmlWebpackPlugin = require('html-webpack-plugin');
 const ExtractTextPlugin = require('extract-text-webpack-plugin');
 const { InjectManifest } = require('workbox-webpack-plugin');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
-const { BugsnagSourceMapUploaderPlugin, BugsnagBuildReporterPlugin } = require('webpack-bugsnag-plugins');
+const { BugsnagSourceMapUploaderPlugin } = require('webpack-bugsnag-plugins');
 const pkgJson = require('./package');
 const buildDate = new Date();

 module.exports = {
  devtool: 'source-map',
  entry: {
-    main: './src/app/index.js'
+    main: ['./src/app/index.js']
  },
  resolve: {
    extensions: ['.js', '.jsx', '.json', '.less']
  },
  output: {
    path: path.join(__dirname, 'build'),
-    chunkFilename: '[name].bundle.js',
+    filename: '[name].[hash].js',
    publicPath: '/',
    globalObject: 'this'
  },
+  node: { fs: 'empty' },
  mode: 'production',
  optimization: {
    minimize: true,
-    usedExports: true
+    splitChunks: {
+      chunks: 'all'
+    }
  },
  plugins: [
-    new CopyWebpackPlugin(['src/.htaccess', { from: 'src/schemas', to: 'schemas' }, {
-      from: 'src/images/logo/*',
-      flatten: true,
-      to: ''
-    }, 'src/iframe.html', 'src/xdLocalStoragePostMessageApi.min.js', 'src/clippy.min.js']),
+    new CopyWebpackPlugin(['src/.htaccess', { from: 'src/schemas', to: 'schemas' }, {from: 'src/images/logo/*', flatten: true, to: ''}]),
    // new webpack.optimize.CommonsChunkPlugin({
    //  name: 'lib',
    //  filename: 'lib.[chunkhash:6].js'
@@ -50,28 +49,21 @@ module.exports = {
      disable: false,
      allChunks: true
    }),
-    // new BugsnagBuildReporterPlugin({
-    //   apiKey: 'ba9fae819372850fb660755341fa6ef5',
-    //   appVersion: `${pkgJson.version}-${buildDate.toISOString()}`
-    // }, { /* opts */ }),
    // new BugsnagSourceMapUploaderPlugin({
    //   apiKey: 'ba9fae819372850fb660755341fa6ef5',
-    //   overwrite: true,
    //   appVersion: `${pkgJson.version}-${buildDate.toISOString()}`
    // }),
    new InjectManifest({
-      swSrc: './src/sw.js',
+      swSrc: './src/app/sw.js',
      importWorkboxFrom: 'cdn',
      swDest: 'service-worker.js'
    }),
  ],
  module: {
    rules: [
+      {test: /\.worker\.js$/, use: {loader: 'worker-loader'}},
      { test: /\.css$/, loader: ExtractTextPlugin.extract({ fallback: 'style-loader', use: 'css-loader' }) },
-      {
-        test: /\.less$/,
-        loader: ExtractTextPlugin.extract({ fallback: 'style-loader', use: 'css-loader!less-loader' })
-      },
+      { test: /\.less$/, loader: ExtractTextPlugin.extract({ fallback: 'style-loader', use: 'css-loader!less-loader' }) },
      { test: /\.(js|jsx)$/, loader: 'babel-loader?cacheDirectory=true', include: path.join(__dirname, 'src') },
      { test: /\.woff(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff' },
      { test: /\.woff2(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff' },
Author	SHA1	Message	Date
William Blythe	beb19a07ec	more work	2018-10-24 10:31:11 +11:00
William Blythe	98113e8807	initial watermelondb	2018-10-24 09:10:53 +11:00
				`@@ -1 +0,0 @@`
				"use strict";window.XdUtils=window.XdUtils\|\|function(){function a(a,b){var c,d=b\|\|{};for(c in a)a.hasOwnProperty(c)&&(d[c]=a[c]);return d}return{extend:a}}(),function(){function a(a,b){var c=XdUtils.extend(b,l);c.id=a,parent.postMessage(JSON.stringify(c),"")}function b(b,c){a(b,{key:c,value:localStorage.getItem(c)})}function c(b,c,d){localStorage.setItem(c,d),a(b,{success:localStorage.getItem(c)===d})}function d(b,c){localStorage.removeItem(c),a(b,{})}function e(b,c){a(b,{key:localStorage.key(c)})}function f(b){a(b,{size:JSON.stringify(localStorage).length})}function g(b){a(b,{length:localStorage.length})}function h(b){localStorage.clear(),a(b,{})}function i(a){var i;try{i=JSON.parse(a.data)}catch(a){}i&&i.namespace===k&&("set"===i.action?c(i.id,i.key,i.value):"get"===i.action?b(i.id,i.key):"remove"===i.action?d(i.id,i.key):"key"===i.action?e(i.id,i.key):"size"===i.action?f(i.id):"length"===i.action?g(i.id):"clear"===i.action&&h(i.id))}function j(){var a={namespace:k,id:"iframe-ready"};parent.postMessage(JSON.stringify(a),"")}var k="cross-domain-local-message",l={namespace:k};window.addEventListener?window.addEventListener("message",i,!1):window.attachEvent("onmessage",i),j()}();