Merge pull request #1 from peterjoseph/development

Reeve v1.2.0

changelog.md

@@ -2,6 +2,41 @@
 
 This file is a record of notable changes made to Reeve.
 
+## 1.2.0
+
+### Added
+
+-   Change Password Functionality
+-   Set Default Language
+-   User Profile Page
+-   S3 Bucket Image Uploads
+-   Signed Image Uploads
+-   Cloudfront image loading
+-   EmailVerified option to endpoint security
+-   HideComponent component based on user restriction rules
+-   Offline warning when connection to internet is lost
+-   Application version to request headers
+-   GDPR hard delete online account
+-   Workspace branding settings
+-   Settings Page
+-   Async load Redux states
+-   Updated NPM packages
+
+### Fixed
+
+-   Logo href links to homepage on authentication pages
+-   Reload user on email validation
+-   Firefox SVG image sizing issues
+-   Organized scss files
+-   Loading bar at top of screen
+-   Loading bar not visible during async page loading
+-   Improved react router implementation
+-   Improved "Page could not be found" component
+-   Select border radius
+-   Notification text translates on language change
+-   Hover link colors during client color change
+-   Duplicate sessions on page refresh
+
 ## 1.1.0
 
 ### Added

client/common/layouts/DefaultLayout.js

@@ -1,7 +1,6 @@
 import React, { Component, Fragment } from "react";
 import PropTypes from "prop-types";
 import { withRouter } from "react-router-dom";
-import { TransitionGroup, CSSTransition } from "react-transition-group";
 import { Offline } from "react-detect-offline";
 
 import Header from "client/modules/header";
@@ -16,16 +15,12 @@ class DefaultLayout extends Component {
 			<GlobalStyling>
 				<Fragment>
 					<Header key={history.location.key} />
-					<TransitionGroup component="main" className="page-main">
-						<CSSTransition key={history.location.path} timeout={500} classNames="fade" appear>
-							<div key={history.location.path}>
-								<Offline>
-									<AppOffline navMargin={true} />
-								</Offline>
-								{children}
-							</div>
-						</CSSTransition>
-					</TransitionGroup>
+					<div key={history.location.path}>
+						<Offline>
+							<AppOffline navMargin={true} />
+						</Offline>
+						{children}
+					</div>
 				</Fragment>
 			</GlobalStyling>
 		);

client/common/styles/entry.scss

@@ -9,5 +9,4 @@
 @import "modules/borders";
 @import "modules/alignment";
 @import "modules/images";
-@import "modules/animations";
 @import "modules/custom_components";

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "Reeve",
-	"version": "1.1.0",
+	"version": "1.2.0",
 	"engines": {
 		"node": "10.x"
 	},
@@ -48,7 +48,7 @@
 		"acorn": "^6.1.1",
 		"async": "^2.6.2",
 		"ava": "^1.4.1",
-		"aws-sdk": "^2.444.0",
+		"aws-sdk": "^2.445.0",
 		"babel-loader": "^8.0.5",
 		"babel-plugin-add-module-exports": "^1.0.2",
 		"babel-plugin-emotion": "^10.0.9",
@@ -68,7 +68,7 @@
 		"es6-promise": "^4.2.6",
 		"exports-loader": "^0.7.0",
 		"express": "^4.16.4",
-		"express-rate-limit": "^3.4.1",
+		"express-rate-limit": "^3.5.0",
 		"express-winston": "^3.1.0",
 		"file-loader": "^3.0.1",
 		"helmet": "^3.16.0",
@@ -102,7 +102,7 @@
 		"rc-switch": "^1.9.0",
 		"react": "^16.8.6",
 		"react-butterfiles": "^1.2.1",
-		"react-color": "^2.17.2",
+		"react-color": "^2.17.3",
 		"react-detect-offline": "^2.3.0",
 		"react-dom": "^16.8.6",
 		"react-ga": "^2.5.7",
@@ -117,14 +117,13 @@
 		"react-script-loader-hoc": "^1.2.2",
 		"react-stripe-elements": "^3.0.0",
 		"react-tooltip": "^3.10.0",
-		"react-transition-group": "^4.0.0",
 		"redis": "^2.8.0",
 		"redux": "^4.0.1",
 		"redux-immutable": "^4.0.0",
 		"redux-thunk": "^2.2.0",
 		"safe-regex": "^2.0.2",
 		"sass-loader": "^7.0.1",
-		"sequelize": "^5.7.6",
+		"sequelize": "^5.8.0",
 		"serialize-error": "^4.1.0",
 		"serve-favicon": "^2.5.0",
 		"stripe": "^6.31.1",

readme.md

@@ -18,6 +18,14 @@ cd Reeve
 npm install && npm start
 ```
 
+## Online Application Demo
+
+Heroku Demo [Master Branch] <http://demo.getreeve.com/signin>
+
+Heroku Demo [Development Branch] <http://demo-development.getreeve.com/signin>
+
+-   Some features such as stripe billing and email sending in the online demo versions have been disabled.
+
 ## Application Screenshots
 
 ![](https://i.imgur.com/c6cYmSl.png)
@@ -73,7 +81,15 @@ npm install && npm start
 
 ## Documentation
 
-Further documentation can be found in the ./documentation directory
+Further documentation can be found in the ./documentation directory of the repository.
+
+An online copy of the documentation can be found at <https://getreeve.com/documentation.html>
+
+## Feature Updates
+
+The following public trello board provides scope for some of the features that are planned in future versions of Reeve.
+
+<https://trello.com/b/pxdfRq4i>
 
 ## License
 

server/services/s3.js

@@ -56,7 +56,8 @@ async function presignedPutObject(contentType, bucket, signedUrlExpiryTime, acl,
 	try {
 		// Create file name to store object in bucket
 		const extension = mime.extension(contentType);
-		const key = `${config.s3.fileDestination}${Date.now().toString()}_${clientId}_${userId}.${extension}`;
+		const filePath = config.s3.fileDestination ? config.s3.fileDestination : "";
+		const key = `${filePath}${Date.now().toString()}_${clientId}_${userId}.${extension}`;
 
 		const url = await s3.getSignedUrl("putObject", {
 			Bucket: bucket,