psmattas/resolver
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Resolved Conlfict] Merge origin next to local.

Browse Source
This commit is contained in:
Qolzam
2018-04-04 10:37:03 +07:00
parent 9cd2672395 e23073534f
commit 74265a5ec1
14 changed files with 21 additions and 8418 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/api/FileAPI.ts
View File

@@ -1,14 +1,3 @@
// - Interface declaration
interface FileReaderEventTarget extends EventTarget {
result: string
}
interface FileReaderEvent extends Event {
target: FileReaderEventTarget
getMessage (): string
}
// - Get file Extension
const getExtension = (fileName: string) => {
let re: RegExp = /(?:\.([^.]+))?$/
@@ -36,9 +25,9 @@ const constraintImage = (file: File,fileName: string, maxWidth?: number, maxHeig
if (file.type.match(/image.*/)) {
// Load the image
let reader = new FileReader()
reader.onload = function (readerEvent: FileReaderEvent) {
reader.onload = (readerEvent: any) => {
let image = new Image()
image.onload = function (imageEvent: Event) {
image.onload = (imageEvent: Event) => {
// Resize the image
let canvas: HTMLCanvasElement = document.createElement('canvas')

2
src/components/circle/CircleComponent.tsx
View File

@@ -389,4 +389,4 @@ const mapStateToProps = (state: Map<string, any>, ownProps: ICircleComponentProp
}
// - Connect component to redux store
export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(CircleComponent as any) as any)
export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles as any)(CircleComponent as any) as any)

2
src/components/editProfile/EditProfileComponent.tsx
View File

@@ -576,4 +576,4 @@ const mapStateToProps = (state: Map<string, any>, ownProps: IEditProfileComponen
}
// - Connect component to redux store
export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(EditProfileComponent as any) as any)
export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles as any)(EditProfileComponent as any) as any)

2
src/components/img/ImgComponent.tsx
View File

@@ -131,4 +131,4 @@ const mapStateToProps = (state: Map<string, any>, ownProps: IImgComponentProps)
}
// - Connect component to redux store
export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(ImgComponent as any)as any)
export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles as any)(ImgComponent as any)as any)

2
src/components/notifyItem/NotifyItemComponent.tsx
View File

@@ -167,4 +167,4 @@ const mapStateToProps = (state: any, ownProps: INotifyItemComponentProps) => {
}
// - Connect component to redux store
export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(NotifyItemComponent as any) as any )
export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles as any)(NotifyItemComponent as any) as any )

2
src/components/sendFeedback/SendFeedbackComponent.tsx
View File

@@ -256,4 +256,4 @@ const mapStateToProps = (state: Map<string, any>, ownProps: ISendFeedbackCompone
}
// - Connect component to redux store
export default connect(mapStateToProps, mapDispatchToProps)((withStyles(styles)(SendFeedbackComponent as any)) as any)
export default connect(mapStateToProps, mapDispatchToProps)((withStyles(styles as any)(SendFeedbackComponent as any)) as any)

2
src/components/userBox/UserBoxComponent.tsx
View File

@@ -475,4 +475,4 @@ const mapStateToProps = (state: Map<string, any>, ownProps: IUserBoxComponentPro
}
// - Connect component to redux store
export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(UserBoxComponent as any) as any)
export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles as any)(UserBoxComponent as any) as any)

2
src/containers/emailVerification/EmailVerificationComponent.tsx
View File

@@ -149,4 +149,4 @@ const mapStateToProps = (state: any, ownProps: IEmailVerificationComponentProps)
}
// - Connect component to redux store
export default withRouter<any>(connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(EmailVerificationComponent as any) as any)) as typeof EmailVerificationComponent
export default withRouter<any>(connect(mapStateToProps, mapDispatchToProps)(withStyles(styles as any)(EmailVerificationComponent as any) as any)) as typeof EmailVerificationComponent

2
src/containers/resetPassword/ResetPasswordComponent.tsx
View File

@@ -184,4 +184,4 @@ const mapStateToProps = (state: any, ownProps: IResetPasswordComponentProps) =>
}
// - Connect component to redux store
export default withRouter<any>(connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(ResetPasswordComponent as any) as any)) as typeof ResetPasswordComponent
export default withRouter<any>(connect(mapStateToProps, mapDispatchToProps)(withStyles(styles as any)(ResetPasswordComponent as any) as any)) as typeof ResetPasswordComponent

2
src/containers/setting/SettingComponent.tsx
View File

@@ -230,4 +230,4 @@ const mapStateToProps = (state: any, ownProps: ISettingComponentProps) => {
}
// - Connect component to redux store
export default withRouter(connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(SettingComponent as any) as any) as any)
export default withRouter(connect(mapStateToProps, mapDispatchToProps)(withStyles(styles as any)(SettingComponent as any) as any) as any)

2
src/containers/signup/SignupComponent.tsx
View File

@@ -292,4 +292,4 @@ const mapStateToProps = (state: any, ownProps: ISignupComponentProps) => {
}
// - Connect component to redux store
export default withRouter(connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(SignupComponent as any) as any) as any)
export default withRouter(connect(mapStateToProps, mapDispatchToProps)(withStyles(styles as any)(SignupComponent as any) as any) as any)