Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

refactor: better image upload UI (#696)

Guilherme Oenning91e2636fafef
diff --git a/public/components/common/Button.scss b/public/components/common/Button.scss
index e0e977144..5d5f0643e 100644
--- a/public/components/common/Button.scss
+++ b/public/components/common/Button.scss
@@ -50,7 +50,7 @@
&.m-danger {
color: $red;
border: 1px solid $gray-light;
- background-color: transparent;
+ background-color: $white;
&:hover {
color: $white;
diff --git a/public/components/common/form/ImageUploader.scss b/public/components/common/form/ImageUploader.scss
index a790207ba..be157e2e9 100644
--- a/public/components/common/form/ImageUploader.scss
+++ b/public/components/common/form/ImageUploader.scss
@@ -4,12 +4,28 @@
input[type='file'] {
display: none;
}
+
+ .c-form-field-wrapper {
+ .c-button {
+ font-size: $font-size-big;
+ padding: 4px 8px;
+ }
+ }
- img.preview {
- background-color: $white;
- padding: 10px;
- border: 1px solid rgba(34, 36, 38, 0.15);
- border-radius: 3px;
- margin-right: 10px;
+ .preview {
+ position: relative;
+ display: inline-block;
+ img {
+ padding: 5px;
+ border: 1px solid $gray-light;
+ }
+ .c-button {
+ font-weight: 600;
+ position: absolute;
+ top: -12px;
+ right: -12px;
+ border-radius: 50%;
+ padding: 4px 6px;
+ }
}
}
\ No newline at end of file
diff --git a/public/components/common/form/ImageUploader.tsx b/public/components/common/form/ImageUploader.tsx
index f9f766aaf..d4136dde0 100644
--- a/public/components/common/form/ImageUploader.tsx
+++ b/public/components/common/form/ImageUploader.tsx
@@ -3,31 +3,24 @@ import "./ImageUploader.scss";
import React from "react";
import { ValidationContext } from "./Form";
import { DisplayError, hasError } from "./DisplayError";
-import { classSet, fileToBase64 } from "@fider/services";
+import { classSet, fileToBase64, uploadedImageURL } from "@fider/services";
import { Button, ButtonClickEvent } from "@fider/components";
+import { FaRegImage } from "react-icons/fa";
+import { ImageUpload } from "@fider/models";
interface ImageUploaderProps {
field: string;
label?: string;
- defaultImageURL?: string;
+ bkey?: string;
disabled?: boolean;
previewMaxWidth: number;
- onChange(state: ImageUploaderState, previewURL?: string): void;
+ onChange(state: ImageUpload, previewURL?: string): void;
}
-interface ImageUploaderState extends ImageUploadState {
+interface ImageUploaderState extends ImageUpload {
previewURL?: string;
}
-export interface ImageUploadState {
- upload?: {
- fileName?: string;
- content?: string;
- contentType?: string;
- };
- remove: boolean;
-}
-
export class ImageUploader extends React.Component<ImageUploaderProps, ImageUploaderState> {
private fileSelector?: HTMLInputElement | null;
constructor(props: ImageUploaderProps) {
@@ -35,7 +28,7 @@ export class ImageUploader extends React.Component<ImageUploaderProps, ImageUplo
this.state = {
upload: undefined,
remove: false,
- previewURL: this.props.defaultImageURL
+ previewURL: uploadedImageURL(this.props.bkey, this.props.previewMaxWidth)
};
}
@@ -45,6 +38,7 @@ export class ImageUploader extends React.Component<ImageUploaderProps, ImageUplo
const base64 = await fileToBase64(file);
this.setState(
{
+ bkey: this.props.bkey,
upload: {
fileName: file.name,
content: base64,
@@ -64,6 +58,7 @@ export class ImageUploader extends React.Component<ImageUploaderProps, ImageUplo
public removeFile = async (e: ButtonClickEvent) => {
this.setState(
{
+ bkey: this.props.bkey,
remove: true,
upload: undefined,
previewURL: undefined
@@ -82,7 +77,7 @@ export class ImageUploader extends React.Component<ImageUploaderProps, ImageUplo
public render() {
const isUploading = !!this.state.upload;
- const hasFile = (!this.state.remove && this.props.defaultImageURL) || isUploading;
+ const hasFile = (!this.state.remove && this.props.bkey) || isUploading;
const imgStyles: React.CSSProperties = {
maxWidth: `${this.props.previewMaxWidth}px`
@@ -99,19 +94,27 @@ export class ImageUploader extends React.Component<ImageUploaderProps, ImageUplo
})}
>
<label htmlFor={`input-${this.props.field}`}>{this.props.label}</label>
- {hasFile && <img className="preview" src={this.state.previewURL} style={imgStyles} />}
+
+ {hasFile && (
+ <div className="preview">
+ <img src={this.state.previewURL} style={imgStyles} />
+ {!this.props.disabled && (
+ <Button onClick={this.removeFile} color="danger">
+ X
+ </Button>
+ )}
+ </div>
+ )}
+
<input ref={e => (this.fileSelector = e)} type="file" onChange={this.fileChanged} />
<DisplayError fields={[this.props.field]} error={ctx.error} />
- <div className="c-form-field-wrapper">
- <Button size="tiny" onClick={this.selectFile} disabled={this.props.disabled}>
- {hasFile ? "Change" : "Upload"}
- </Button>
- {hasFile && (
- <Button onClick={this.removeFile} size="tiny" disabled={this.props.disabled}>
- Remove
+ {!hasFile && (
+ <div className="c-form-field-wrapper">
+ <Button onClick={this.selectFile} disabled={this.props.disabled}>
+ <FaRegImage />
</Button>
- )}
- </div>
+ </div>
+ )}
{this.props.children}
</div>
)}
diff --git a/public/models/settings.ts b/public/models/settings.ts
index a111a1459..176e645ce 100644
--- a/public/models/settings.ts
+++ b/public/models/settings.ts
@@ -47,3 +47,13 @@ export interface OAuthConfig {
jsonUserNamePath: string;
jsonUserEmailPath: string;
}
+
+export interface ImageUpload {
+ bkey?: string;
+ upload?: {
+ fileName?: string;
+ content?: string;
+ contentType?: string;
+ };
+ remove: boolean;
+}
diff --git a/public/pages/Administration/components/OAuthForm.tsx b/public/pages/Administration/components/OAuthForm.tsx
index dffd85816..bea8c9b36 100644
--- a/public/pages/Administration/components/OAuthForm.tsx
+++ b/public/pages/Administration/components/OAuthForm.tsx
@@ -1,18 +1,7 @@
import React from "react";
-import { OAuthConfig, OAuthConfigStatus } from "@fider/models";
+import { OAuthConfig, OAuthConfigStatus, ImageUpload } from "@fider/models";
import { Failure, Fider, actions } from "@fider/services";
-import {
- Form,
- Button,
- Input,
- Heading,
- SocialSignInButton,
- Field,
- ImageUploadState,
- ImageUploader,
- Toggle,
- OAuthProviderLogoURL
-} from "@fider/components";
+import { Form, Button, Input, Heading, SocialSignInButton, Field, ImageUploader, Toggle } from "@fider/components";
interface OAuthFormProps {
config?: OAuthConfig;
@@ -33,8 +22,8 @@ export interface OAuthFormState {
jsonUserIDPath: string;
jsonUserNamePath: string;
jsonUserEmailPath: string;
- logoURL?: string;
- logo?: ImageUploadState;
+ logoBlobKey?: string;
+ logo?: ImageUpload;
error?: Failure;
}
@@ -55,7 +44,7 @@ export class OAuthForm extends React.Component<OAuthFormProps, OAuthFormState> {
jsonUserIDPath: this.props.config ? this.props.config.jsonUserIDPath : "",
jsonUserNamePath: this.props.config ? this.props.config.jsonUserNamePath : "",
jsonUserEmailPath: this.props.config ? this.props.config.jsonUserEmailPath : "",
- logoURL: this.props.config ? OAuthProviderLogoURL(this.props.config.logoBlobKey) : ""
+ logoBlobKey: this.props.config ? this.props.config.logoBlobKey : ""
};
}
@@ -90,8 +79,8 @@ export class OAuthForm extends React.Component<OAuthFormProps, OAuthFormState> {
this.setState({ displayName });
};
- private setLogo = (logo: ImageUploadState, previewURL: string) => {
- this.setState({ logo, logoURL: previewURL });
+ private setLogo = (logo: ImageUpload, previewURL: string) => {
+ this.setState({ logo });
};
private setStatus = async (enabled: boolean) => {
@@ -158,7 +147,7 @@ export class OAuthForm extends React.Component<OAuthFormProps, OAuthFormState> {
<ImageUploader
label="Logo"
field="logo"
- defaultImageURL={this.state.logoURL}
+ bkey={this.state.logoBlobKey}
previewMaxWidth={80}
disabled={!Fider.session.user.isAdministrator}
onChange={this.setLogo}
diff --git a/public/pages/Administration/pages/GeneralSettings.page.tsx b/public/pages/Administration/pages/GeneralSettings.page.tsx
index 772feeef0..12596d79e 100644
--- a/public/pages/Administration/pages/GeneralSettings.page.tsx
+++ b/public/pages/Administration/pages/GeneralSettings.page.tsx
@@ -2,22 +2,14 @@ import "./GeneralSettings.page.scss";
import React from "react";
-import {
- Button,
- ButtonClickEvent,
- TextArea,
- Form,
- Input,
- ImageUploader,
- ImageUploadState,
- TenantLogoURL
-} from "@fider/components/common";
+import { Button, ButtonClickEvent, TextArea, Form, Input, ImageUploader } from "@fider/components/common";
import { actions, Failure, fileToBase64, Fider } from "@fider/services";
import { FaCogs } from "react-icons/fa";
import { AdminBasePage } from "../components/AdminBasePage";
+import { ImageUpload } from "@fider/models";
interface GeneralSettingsPageState {
- logo?: ImageUploadState;
+ logo?: ImageUpload;
title: string;
invitation: string;
welcomeMessage: string;
@@ -114,7 +106,7 @@ export default class GeneralSettingsPage extends AdminBasePage<{}, GeneralSettin
this.setState({ invitation });
};
- private setLogo = (logo: ImageUploadState): void => {
+ private setLogo = (logo: ImageUpload): void => {
this.setState({ logo });
};
@@ -152,7 +144,7 @@ export default class GeneralSettingsPage extends AdminBasePage<{}, GeneralSettin
<ImageUploader
label="Logo"
field="logo"
- defaultImageURL={TenantLogoURL(200)}
+ bkey={Fider.session.tenant.logoBlobKey}
previewMaxWidth={200}
disabled={!Fider.session.user.isAdministrator}
onChange={this.setLogo}
diff --git a/public/services/actions/tenant.ts b/public/services/actions/tenant.ts
index 32aa860c3..f8f18692b 100644
--- a/public/services/actions/tenant.ts
+++ b/public/services/actions/tenant.ts
@@ -1,6 +1,5 @@
import { http, Result } from "@fider/services/http";
-import { UserRole, OAuthConfig } from "@fider/models";
-import { ImageUploadState } from "@fider/components";
+import { UserRole, OAuthConfig, ImageUpload } from "@fider/models";
export interface CheckAvailabilityResponse {
message: string;
@@ -24,14 +23,7 @@ export const createTenant = async (request: CreateTenantRequest): Promise<Result
};
export interface UpdateTenantSettingsRequest {
- logo?: {
- upload?: {
- fileName?: string;
- content?: string;
- contentType?: string;
- };
- remove: boolean;
- };
+ logo?: ImageUpload;
title: string;
invitation: string;
welcomeMessage: string;
@@ -100,7 +92,7 @@ export interface CreateEditOAuthConfigRequest {
jsonUserIDPath: string;
jsonUserNamePath: string;
jsonUserEmailPath: string;
- logo?: ImageUploadState;
+ logo?: ImageUpload;
}
export const saveOAuthConfig = async (request: CreateEditOAuthConfigRequest): Promise<Result> => {
diff --git a/public/services/utils.ts b/public/services/utils.ts
index 1b13db208..a982e241d 100644
--- a/public/services/utils.ts
+++ b/public/services/utils.ts
@@ -123,7 +123,7 @@ export const isCookieEnabled = (): boolean => {
}
};
-export const uploadedImageURL = (bkey: string, size: number): string | undefined => {
+export const uploadedImageURL = (bkey: string | undefined, size: number): string | undefined => {
if (bkey) {
return `${Fider.settings.tenantAssetsURL}/images/${bkey}?size=${size}`;
}