Merge pull request #2 from factorio-item-browser/feature/load-from-savegame

feature/load-from-savegame

Author: BluePsyduck

.env.development

@@ -1,8 +1,11 @@
 # The lifetime of items in the cache, in seconds.
 CACHE_LIFETIME=60
 
-# The URI to the Portal API server.
-PORTAL_API_URI=http://localhost:8070
+# The link to the project's discord server.
+DISCORD_LINK=https://discord.gg/
 
 # The interval for checking the setting status when data is unavailable.
 INTERVAL_CHECK_SETTING_STATUS=60
+
+# The URI to the Portal API server.
+PORTAL_API_URI=http://localhost:8070

.eslintrc

@@ -2,15 +2,18 @@
     "parser": "babel-eslint",
     "extends": [
         "eslint:recommended",
-        "plugin:react/recommended"
+        "plugin:react/recommended",
+        "plugin:jest/recommended"
     ],
     "plugins": [
         "react",
-        "prettier"
+        "prettier",
+        "jest"
     ],
     "env": {
         "browser": true,
-        "es6": true
+        "es6": true,
+        "jest/globals": true
     },
     "globals": {
         "process": true

.travis.yml

@@ -0,0 +1,11 @@
+language: node_js
+node_js:
+  - 14
+
+install:
+  - npm install
+
+script:
+  - jest
+  - eslint src --ext js,jsx
+  - webpack --mode production

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 1.1.0 - 2020-06-12
+
+### Added
+
+- Link to the Discord server to the footer.
+
+### Changed
+
+- Adding a setting now requires a savegame to be selected, not the mod-list.json file anymore.
+- Arrangement of boxes and explanations on settings/new page.
+
 ## 1.0.0 - 2020-05-22
 
 - Initial release of the portal frontend project.

Makefile

@@ -1,22 +1,25 @@
-.PHONY: help build check fix install start update
+.PHONY: help build fix install start test update
 
 help: ## Show this help.
 	@fgrep -h "##" $(MAKEFILE_LIST) | fgrep -v fgrep | sed -e 's/\\$$//' | sed -e 's/##//'
 
 build: ## Installs the dependencies of the project.
-	npm run build
+	npm run --silent build
 
 check: ## Checks the source for eslint or code style violations.
-	npm run check
+	npm run --silent check
 
 fix: ## Tries to fix code style issues.
-	npm run fix
+	npm run --silent fix
 
 install: ## Installs the dependencies of the project.
 	npm install
 
 start: ## Starts the development server with hot reloading.
 	npm start
 
+test: ## Runs the tests of the project.
+	npm run --silent test
+
 update: ## Installs the dependencies of the project.
 	npm update