diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index c43179e2..00000000 --- a/.dockerignore +++ /dev/null @@ -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 - diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 85d3a7f5..00000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -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 diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 49fe7b3e..00000000 --- a/.travis.yml +++ /dev/null @@ -1,16 +0,0 @@ -language: node_js -notifications: - email: false -sudo: false -node_js: - - "4.8.1" -cache: - directories: - - node_modules - -before_install: - - git clone https://github.com/EDCD/coriolis-data.git ../coriolis-data - -script: - - npm run lint - - npm test diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index b95ca63a..00000000 --- a/Dockerfile +++ /dev/null @@ -1,35 +0,0 @@ -### STAGE 1: Build ### -FROM node:9.11.1-alpine as builder -ARG branch=develop -ENV BRANCH=$branch -WORKDIR /src/app -RUN mkdir -p /src/app/coriolis -RUN mkdir -p /src/app/coriolis-data - -RUN apk add --update git - -COPY . /src/app/coriolis - -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 npm install --no-package-lock -RUN npm start - -# Set up coriolis -WORKDIR /src/app/coriolis -RUN git checkout ${BRANCH} -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 -COPY --from=builder /src/app/coriolis/build /usr/share/nginx/html -WORKDIR /usr/share/nginx/html -EXPOSE 80 -CMD ["nginx", "-c", "/etc/nginx/nginx.conf", "-g", "daemon off;"] diff --git a/README.md b/README.md index 9eea2b01..7aeb37d5 100755 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![Latest Release](https://img.shields.io/github/release/EDCD/coriolis.svg) [![Build Status](https://travis-ci.org/EDCD/coriolis.svg?branch=master)](https://travis-ci.org/EDCD/coriolis) [![Chat to us on Discord](https://img.shields.io/badge/Discord-EDCD%20%23coriolis-blue.svg?style=social)](https://discord.gg/0uwCh6R62aPRjk9w) +[![Chat to us on Discord](https://img.shields.io/badge/Discord-EDCD%20%23coriolis-blue.svg?style=social)](https://discord.gg/0uwCh6R62aPRjk9w) ## About @@ -8,53 +8,41 @@ Coriolis was created using assets and imagery from Elite: Dangerous, with the pe ## Contributing -Please [submit issues](https://github.com/EDCD/coriolis/issues), or better yet [pull requests](https://github.com/EDCD/coriolis/pulls) for any corrections or additions to the database or the code. - -### Translations - -Please use the OneSky translation site to suggest new translations: http://edcd-coriolis.oneskyapp.com -These will be merged regularly by the project manager. - -### Feature Requests, Suggestions & Bugs - -Chat to us on [Discord](https://discord.gg/0uwCh6R62aPRjk9w)! +- [Submit issues](https://github.com/EDCD/coriolis/issues) +- [Submit pull requests](https://github.com/EDCD/coriolis/pulls) targetting `develop` branch +- Chat to us on [Discord](https://discord.gg/0uwCh6R62aPRjk9w)! ## Development -See the [Developer's Guide](https://github.com/EDCD/coriolis/wiki/Developing-for-Coriolis) in the wiki. +To get a local instance of coriolis running, perform the following steps in a shell: +```sh +> git clone https://github.com/EDCD/coriolis.git +> git clone https://github.com/EDCD/coriolis-data.git +> cd ./coriolis-data +> npm install +> cd ../coriolis +> npm install +> npm start +``` -Also see [the documentation site.](https://coriolis.willb.info/) +You will then have a development server running on `localhost:3300`. ### Ship and Module Database See the [Data wiki](https://github.com/cmmcleod/coriolis-data/wiki) for details on structure, etc. -You can find hosted and compiled versions of these data-jsons under https://coriolis.io/data/ and https://beta.coriolis.io/data/. -You might want to load these as depedency instead of reyling on the npm-dependency. +## Deployment -## License +Follow the steps for [Development](#development) as above, but instead +of `npm start` you'll want to: -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/). +```sh +> npm run build +``` -The code (Javascript, CSS, HTML, and SVG files only) specificially for Coriolis.io is released under the MIT License. +this will result in a `build/` directory being created containing all the necessary files. -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. +After this you need to serve the files in some manner. +Either configure your webserver to make the actual `build/` directory +visible on the web, or alternatively copy it to somewhere to serve it +from. diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 7496605d..00000000 --- a/docker-compose.yml +++ /dev/null @@ -1,56 +0,0 @@ -version: '2.2' - -services: - coriolis_prod: - image: edcd/coriolis:master - build: - dockerfile: Dockerfile - args: - branch: master - restart: always - volumes: - - ./nginx.conf:/etc/nginx/nginx.conf - networks: - - web - labels: - - "traefik.docker.network=web" - - "traefik.enable=true" - - "traefik.basic.frontend.rule=Host:coriolis.io,coriolis.edcd.io" - - "traefik.basic.port=80" - - "traefik.basic.protocol=http" - - coriolis_dev: - image: edcd/coriolis:develop - build: - dockerfile: Dockerfile - args: - branch: develop - restart: always - volumes: - - ./nginx.conf:/etc/nginx/nginx.conf - networks: - - web - labels: - - "traefik.docker.network=web" - - "traefik.enable=true" - - "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 diff --git a/nginx.conf b/nginx.conf deleted file mode 100644 index 874aefa0..00000000 --- a/nginx.conf +++ /dev/null @@ -1,96 +0,0 @@ -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; - - # https://nginx.org/en/docs/http/ngx_http_gzip_module.html - # Enable gzip compression. - # Default: off - gzip off; - - # 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; - - # 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; - - # 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 *; - 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; - } - } -} diff --git a/src/app/Coriolis.jsx b/src/app/Coriolis.jsx index d540bdc1..5dcc2dfe 100644 --- a/src/app/Coriolis.jsx +++ b/src/app/Coriolis.jsx @@ -376,7 +376,6 @@ export default class Coriolis extends React.Component { */ render() { let currentMenu = this.state.currentMenu; - return
@@ -389,6 +388,7 @@ export default class Coriolis extends React.Component { {this.state.modal} {this.state.tooltip}
diff --git a/src/app/pages/Page.jsx b/src/app/pages/Page.jsx index a1910ce1..016cd7dc 100644 --- a/src/app/pages/Page.jsx +++ b/src/app/pages/Page.jsx @@ -61,6 +61,14 @@ export default class Page extends React.Component { */ componentDidMount() { document.title = this.state.title || 'Coriolis'; + try { + (window.adsbygoogle = window.adsbygoogle || []).push({ + google_ad_client: "ca-pub-3709458261881414", + enable_page_level_ads: true + }); + } catch (error) { + + } } /** diff --git a/src/app/stores/Persist.js b/src/app/stores/Persist.js index 03577952..b70988c5 100644 --- a/src/app/stores/Persist.js +++ b/src/app/stores/Persist.js @@ -13,7 +13,6 @@ const LS_KEY_STATE = 'state'; const LS_KEY_SIZE_RATIO = 'sizeRatio'; const LS_KEY_TOOLTIPS = 'tooltips'; const LS_KEY_ROLLS = 'matsPerGrade'; -const LS_KEY_ORBIS = 'orbis'; let LS; @@ -91,7 +90,6 @@ export class Persist extends EventEmitter { let moduleDiscount = _get(LS_KEY_MOD_DISCOUNT); let buildJson = _get(LS_KEY_BUILDS); - this.orbisCreds = _get(LS_KEY_ORBIS) || { email: '', password: '' }; this.onStorageChange = this.onStorageChange.bind(this); this.langCode = _getString(LS_KEY_LANG) || 'en'; this.insurance = insurance && Insurance[insurance.toLowerCase()] !== undefined ? insurance : 'standard'; @@ -155,10 +153,6 @@ export class Persist extends EventEmitter { this.matsPerGrade = JSON.parse(newValue); this.emit('matsPerGrade', this.matsPerGrade); break; - case LS_KEY_ORBIS: - this.orbisCreds = JSON.parse(newValue); - this.emit('orbis', this.orbisCreds); - break; } } catch (e) { // On JSON.Parse Error - don't sync or do anything @@ -184,24 +178,6 @@ export class Persist extends EventEmitter { this.emit('language', langCode); } - /** - * Get the current orbis.zone credentials - * @return {String} language code - */ - getOrbisCreds() { - return this.orbisCreds; - }; - - /** - * Update and save the orbis.zone credentials - * @param {Object} creds object with username and password properties. - */ - setOrbisCreds(creds) { - this.langCode = creds; - _put(LS_KEY_ORBIS, creds); - this.emit('orbis', creds); - } - /** * Show tooltips setting * @param {boolean} show Optional - update setting diff --git a/src/app/utils/ShortenUrl.js b/src/app/utils/ShortenUrl.js index 847fba6c..7f50aaec 100644 --- a/src/app/utils/ShortenUrl.js +++ b/src/app/utils/ShortenUrl.js @@ -51,7 +51,7 @@ function orbisShorten(url, success, error) { } } -const API_ORBIS = 'https://orbis.zone/api/builds/add'; +const API_ORBIS = 'https://api.orbis.zone/ships'; /** * Upload to Orbis * @param {object} ship The URL to shorten diff --git a/src/index.ejs b/src/index.ejs index 72d966b1..af1f263e 100644 --- a/src/index.ejs +++ b/src/index.ejs @@ -2,19 +2,14 @@ Coriolis EDCD Edition - - + + @@ -32,7 +27,7 @@ - + -
+
+
diff --git a/src/migrate.html b/src/migrate.html new file mode 100644 index 00000000..0c867137 --- /dev/null +++ b/src/migrate.html @@ -0,0 +1,104 @@ + + + + Coriolis EDCD Edition + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+

+ Please migrate to coriolis.io +

+ You are currently on coriolis..edcd.io This domain is + considered deprecated. To migrate your builds, copy the below text and + go to + this link, press ctrl + i and then paste in the data. (If you are on mobile, + you can go to the settings and hit import) +
+ +
+
+
+ + + +