Skip to content

Commit decdacc

Browse files
UbuntuUbuntu
authored andcommitted
Merge branch 'release/1.1.0'
2 parents 8a10084 + 4ab8d03 commit decdacc

File tree

116 files changed

+5605
-1154
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+5605
-1154
lines changed

.env

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ API_URL=https://best.api.ever.com
44
REACT_APP_GOOGLE_ANALYTICS=tempval
55
RECAPTCHA_SITE_KEY="6LeUO3ApAAAAAOC7F4v0qTsSwIR9mZu33SWjAAtM"
66
VERSION=1.1.0
7+
REACT_APP_GOOGLE_CLIENT_ID=163513393872-4i7m0ccmt4vq2db5j3qe8k4q30ecskvo.apps.googleusercontent.com

__mocks__/@components/FileUploader.component.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
import * as React from 'react';
22
import { Component, useState} from 'react';
33
import Upload,{ UploadChangeParam, UploadFile, UploadProps } from 'antd/es/upload';
4-
import ImageNew, { ImageCreate } from '@/models/media/image.model';
4+
import ImageNew, {ImageAssigment, ImageCreate} from '@/models/media/image.model';
55
import Audio, { AudioCreate } from '@/models/media/audio.model';
66

77
interface Props{
88
children: JSX.Element[] | JSX.Element;
99
edgeSwipe?: boolean;
1010
onChange: (uploadParams: UploadChangeParam<UploadFile<any>>) => void;
1111
uploadTo:'image' | 'audio';
12-
greyFilterForImage?: boolean;
12+
enableGrayscale?: boolean;
13+
imageType?: ImageAssigment;
1314
onSuccessUpload?:(value: ImageNew | Audio, file?: UploadFile)=>void;
1415
}
1516

16-
const FileUploaderMock: React.FC<Props> = ({ onSuccessUpload, uploadTo, greyFilterForImage = false, children, onChange }) => {
17+
const FileUploaderMock: React.FC<Props> = ({ onSuccessUpload, uploadTo, enableGrayscale = false, imageType, children, onChange }) => {
1718

1819
const handleFileChange = (e: UploadChangeParam<UploadFile>) => {
1920
let file = e.file;

__mocks__/@react-pdf/renderer.tsx

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
export const Font = {
2+
register: jest.fn(),
3+
};
4+
5+
export const Document = ({ children }: { children: React.ReactNode }) => <div>{children}</div>;
6+
export const Page = ({ children }: { children: React.ReactNode }) => <div>{children}</div>;
7+
export const View = ({ children }: { children: React.ReactNode }) => <div>{children}</div>;
8+
export const Text = ({ children }: { children: React.ReactNode }) => <p>{children}</p>;
9+
export const Image = ({ source }: { source: string }) => <img src={source} alt="mocked image"/>;
10+
export const StyleSheet = {
11+
create: (styles: Record<string, any>) => styles,
12+
};
13+
export const Svg = ({ children }: { children: React.ReactNode }) => <svg>{children}</svg>;
14+
export const Rect = (props: any) => <rect {...props} />;

__mocks__/fontFileMock.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export default '';

config/webpack.plugins.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
1+
const webpack = require("webpack");
12
const HtmlWebpackPlugin = require('html-webpack-plugin');
2-
3+
const NodePolyfillPlugin = require("node-polyfill-webpack-plugin")
34
module.exports = [
5+
new NodePolyfillPlugin(),
6+
new webpack.ProvidePlugin({
7+
Buffer: ['buffer', 'Buffer'],
8+
process: 'process/browser'
9+
}),
410
new HtmlWebpackPlugin({
511
template: './public/index.html',
612
manifest: "./public/manifest.json",

jest.config.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@ const jestConfig: JestConfigWithTsJest = {
66
roots: ["<rootDir>"],
77
moduleNameMapper: {
88
"\\.(css|less|sass|scss)$": "identity-obj-proxy",
9+
'\\.(woff|woff2)$': '<rootDir>/__mocks__/fontFileMock.ts',
910
"^antd/es/(.*)$": "<rootDir>/node_modules/antd/lib/$1",
1011
"^@assets/(.*)$": "<rootDir>/src/assets/$1",
1112
"^antd/es/date-picker/locale/uk_UA$": "<rootDir>/__mocks__/antd/es/date/localeprovider.tsx",
1213
"^@stores/root-store$": "<rootDir>/__mocks__/@stores/root-store.tsx",
14+
"^@react-pdf/renderer$": "<rootDir>/__mocks__/@react-pdf/renderer.tsx",
1315
"^@components/FileUploader/FileUploader.component$": "<rootDir>/__mocks__/@components/FileUploader.component.tsx",
1416
"^@/(.*)$": "<rootDir>/src/$1",
1517
"^@app/(.*)$": "<rootDir>/src/app/$1",

0 commit comments

Comments
 (0)