Skip to content

Commit

Permalink
Merge branch 'release/v1.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
mwarman committed Nov 7, 2018
2 parents d2c48a7 + b3398f7 commit f868cce
Show file tree
Hide file tree
Showing 5 changed files with 1,458 additions and 247 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Start with nginx alpine
FROM nginx:1.14-alpine
FROM nginx:1.15-alpine
# Copy nginx configuration file(s)
COPY etc/nginx/*.conf /etc/nginx/conf.d/
# Remove default nginx configuration file
Expand Down
13 changes: 8 additions & 5 deletions etc/nginx/spa.conf
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
# Basic NGINX configuration for a Single-Page Application (SPA)
server {
listen 80;
server_name localhost;
listen 80 default_server;
listen [::]:80 default_server;

# HSTS - Add HSTS header to all responses
add_header Strict-Transport-Security "max-age=600; includeSubDomains" always;

location / {
root /usr/share/nginx/html;
index index.html index.htm;
root /usr/share/nginx/html;
index index.html index.htm;

# This try_files statement facilitates SPA framework routing
try_files $uri $uri/ /index.html;
try_files $uri $uri/ /index.html;
}
}
26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "skeleton-ui-react",
"version": "0.6.1",
"version": "1.0.0",
"description": "React SPA Starter Project",
"main": "index.js",
"repository": "[email protected]:leanstacks/skeleton-ui-react.git",
Expand All @@ -16,7 +16,7 @@
},
"dependencies": {},
"devDependencies": {
"@fortawesome/fontawesome-free": "^5.1.0",
"@fortawesome/fontawesome-free": "^5.5.0",
"axios": "^0.18.0",
"babel-cli": "^6.26.0",
"babel-core": "^6.26.3",
Expand All @@ -26,38 +26,38 @@
"babel-polyfill": "^6.26.0",
"babel-preset-env": "^1.7.0",
"babel-preset-react": "^6.24.1",
"bootstrap": "4.1.1",
"bootstrap": "4.1.3",
"clean-webpack-plugin": "^0.1.17",
"copy-webpack-plugin": "^4.3.1",
"css-loader": "^0.28.7",
"dotenv": "^4.0.0",
"enzyme": "^3.3.0",
"enzyme-adapter-react-16": "^1.1.1",
"enzyme": "^3.7.0",
"enzyme-adapter-react-16": "^1.6.0",
"enzyme-to-json": "^3.3.4",
"extract-text-webpack-plugin": "^3.0.2",
"file-loader": "^1.1.6",
"history": "^4.7.2",
"html-webpack-plugin": "^2.30.1",
"jest": "^23.3.0",
"jest-localstorage-mock": "^2.2.0",
"jest": "^23.6.0",
"jest-localstorage-mock": "^2.3.0",
"jquery": "^3.3.1",
"lodash": "^4.17.10",
"lodash": "^4.17.11",
"moment": "^2.22.2",
"node-sass": "^4.7.2",
"numeral": "^2.0.6",
"popper.js": "^1.14.3",
"raf": "^3.4.0",
"react": "^16.4.1",
"react-dom": "^16.4.1",
"react-redux": "^5.0.7",
"react": "^16.6.1",
"react-dom": "^16.6.1",
"react-redux": "^5.1.0",
"react-router-dom": "^4.3.1",
"redux": "^4.0.0",
"redux": "^4.0.1",
"redux-mock-store": "^1.5.3",
"redux-thunk": "^2.3.0",
"sass-loader": "^6.0.6",
"style-loader": "^0.19.0",
"url-loader": "^0.6.2",
"validator": "^10.4.0",
"validator": "^10.8.0",
"webpack": "^3.9.1",
"webpack-dev-server": "^2.9.5",
"webpack-merge": "^4.1.1"
Expand Down
22 changes: 11 additions & 11 deletions public/assets/data/technologies/technologies.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"id": "adbe711c-9698-41f7-bf86-ae3e41ba49eb",
"name": "React",
"type": "application",
"version": "16.4.1",
"version": "16.6.1",
"license": "MIT",
"licenseUrl": "https://spdx.org/licenses/MIT.html",
"description": "React is a structural framework for dynamic web apps.",
Expand All @@ -13,7 +13,7 @@
"id": "0360ff87-0f87-411e-8231-797806583067",
"name": "Redux",
"type": "application",
"version": "4.0.0",
"version": "4.0.1",
"license": "MIT",
"licenseUrl": "https://spdx.org/licenses/MIT.html",
"description": "Redux is a predictable state container for JavaScript apps.",
Expand Down Expand Up @@ -43,7 +43,7 @@
"id": "3b5968c7-6109-428b-bc2b-62652d8c6d8d",
"name": "Bootstrap",
"type": "application",
"version": "4.1.1",
"version": "4.1.3",
"license": "MIT",
"licenseUrl": "https://spdx.org/licenses/MIT.html",
"description": "Bootstrap is an open source toolkit for developing with HTML, CSS, and JS.",
Expand All @@ -53,7 +53,7 @@
"id": "7d09624e-0256-4fe5-9b9f-bf76683536a1",
"name": "Font Awesome",
"type": "application",
"version": "5.1.0",
"version": "5.5.0",
"license": "Multiple",
"licenseUrl": "https://fontawesome.com/license",
"description": "Font Awesome is an icon toolkit.",
Expand All @@ -63,7 +63,7 @@
"id": "8f2d877d-d17a-4b3c-bbc3-690f460a57e0",
"name": "Lodash",
"type": "application",
"version": "4.17.10",
"version": "4.17.11",
"license": "MIT",
"licenseUrl": "https://spdx.org/licenses/MIT.html",
"description": "A modern JavaScript utility library delivering modularity, performance & extras.",
Expand Down Expand Up @@ -93,7 +93,7 @@
"id": "482ffcac-9db2-40d2-a971-fbaf93707d5a",
"name": "Validator",
"type": "application",
"version": "10.4.0",
"version": "10.8.0",
"license": "MIT",
"licenseUrl": "https://spdx.org/licenses/MIT.html",
"description": "A javascript library of validators and sanitizers.",
Expand Down Expand Up @@ -123,23 +123,23 @@
"id": "126d771c-b606-4c10-866b-4385e44b15d3",
"name": "Node.js",
"type": "build",
"version": "8.11.3",
"version": "8.12.0",
"description": "Node.js is a JavaScript runtime.",
"url": "https://nodejs.org/"
},
{
"id": "079dd1b7-f5b1-4c32-a0af-c7ea65e94976",
"name": "NPM",
"type": "build",
"version": "5.6.0",
"version": "6.4.1",
"description": "npm is the Node.js package manager.",
"url": "https://www.npmjs.com/"
},
{
"id": "6cab5852-7750-4af3-b5dc-59220f2ca03e",
"name": "Yarn",
"type": "build",
"version": "1.7.0",
"version": "1.12.1",
"license": "BSD 2-Clause",
"licenseUrl": "https://spdx.org/licenses/BSD-2-Clause.html",
"description": "Yarn is an alternative to the npm client.",
Expand All @@ -149,7 +149,7 @@
"id": "8218cb49-7830-4d88-8df5-4c1ad4d4df4f",
"name": "Jest",
"type": "test",
"version": "23.3.0",
"version": "23.6.0",
"license": "MIT",
"licenseUrl": "https://spdx.org/licenses/MIT.html",
"description": "Jest is used by Facebook to test all JavaScript code including React applications.",
Expand All @@ -159,7 +159,7 @@
"id": "f62dd51f-ceae-4051-bbf1-931161ee54fc",
"name": "Enzyme",
"type": "test",
"version": "3.3.0",
"version": "3.7.0",
"license": "MIT",
"licenseUrl": "https://spdx.org/licenses/MIT.html",
"description": "Enzyme is a JavaScript Testing utility for React that makes it easier to assert, manipulate, and traverse your React Components' output.",
Expand Down
Loading

0 comments on commit f868cce

Please sign in to comment.