From 09b68c19d2f3196a7b494b32f3762afbc0014c31 Mon Sep 17 00:00:00 2001 From: Fedor Katurov Date: Wed, 16 Oct 2019 11:35:25 +0700 Subject: [PATCH] fixed appearance for editor --- package-lock.json | 56 +++++++++++--------- package.json | 10 ++-- src/components/bars/SubmitBar/styles.scss | 2 +- src/components/editors/ImageEditor/index.tsx | 3 +- src/components/input/Button/index.tsx | 4 +- 5 files changed, 42 insertions(+), 33 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4cffdd1e..480e97d9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "@babel/cli": { - "version": "7.6.3", - "resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.6.3.tgz", - "integrity": "sha512-kWKOEeuylpa781yCeA5//eEx1u3WtLZqbi2VWXLKmb3QDPb5T2f7Yk311MK7bvvjR70dluAeiu4VXXsG1WwJsw==", + "version": "7.6.4", + "resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.6.4.tgz", + "integrity": "sha512-tqrDyvPryBM6xjIyKKUwr3s8CzmmYidwgdswd7Uc/Cv0ogZcuS1TYQTLx/eWKP3UbJ6JxZAiYlBZabXm/rtRsQ==", "dev": true, "requires": { "chokidar": "2.1.8", @@ -19,7 +19,15 @@ "mkdirp": "0.5.1", "output-file-sync": "2.0.1", "slash": "2.0.0", - "source-map": "0.6.1" + "source-map": "0.5.7" + }, + "dependencies": { + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } } }, "@babel/code-frame": { @@ -996,11 +1004,11 @@ "dev": true }, "@types/ramda": { - "version": "0.26.29", - "resolved": "https://registry.npmjs.org/@types/ramda/-/ramda-0.26.29.tgz", - "integrity": "sha512-j0rrDm19024J0X5wHl8ZK0mQas9TVvL7KQPocDEZU0nq/OUtmh0mBBBrfSIKGJZF1VLhtW6MGw+YRojUSY+5kg==", + "version": "0.26.33", + "resolved": "https://registry.npmjs.org/@types/ramda/-/ramda-0.26.33.tgz", + "integrity": "sha512-sUCQmKfAWmlbb6PpFqvndbGgTf0bCcmHLJqMYw8ErVS0UoZTTiz952aFedJhV+JERiVH7poh33358c7p0AAN8A==", "requires": { - "ts-toolbelt": "4.8.8" + "ts-toolbelt": "4.8.16" } }, "@types/react": { @@ -1013,9 +1021,9 @@ } }, "@types/react-router": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.1.tgz", - "integrity": "sha512-S7SlFAPb7ZKr6HHMW0kLHGcz8pyJSL0UdM+JtlWthDqKUWwr7E6oPXuHgkofDI8dKCm16slg8K8VCf5pZJquaA==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.2.tgz", + "integrity": "sha512-euC3SiwDg3NcjFdNmFL8uVuAFTpZJm0WMFUw+4eXMUnxa7M9RGFEG0szt0z+/Zgk4G2k9JBFhaEnY64RBiFmuw==", "dev": true, "requires": { "@types/history": "4.7.3", @@ -5169,9 +5177,9 @@ } }, "dotenv": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.1.0.tgz", - "integrity": "sha512-GUE3gqcDCaMltj2++g6bRQ5rBJWtkWTmqmD0fo1RnnMuUqHNCt2oTPeDnS9n6fKYvlhn7AeBkb38lymBtWBQdA==" + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz", + "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==" }, "dotenv-defaults": { "version": "1.0.2", @@ -12945,9 +12953,9 @@ } }, "terser": { - "version": "4.3.8", - "resolved": "https://registry.npmjs.org/terser/-/terser-4.3.8.tgz", - "integrity": "sha512-otmIRlRVmLChAWsnSFNO0Bfk6YySuBp6G9qrHiJwlLDd4mxe2ta4sjI7TzIR+W1nBMjilzrMcPOz9pSusgx3hQ==", + "version": "4.3.9", + "resolved": "https://registry.npmjs.org/terser/-/terser-4.3.9.tgz", + "integrity": "sha512-NFGMpHjlzmyOtPL+fDw3G7+6Ueh/sz4mkaUYa4lJCxOPTNzd0Uj0aZJOmsDYoSQyfuVoWDMSWTPU3huyOm2zdA==", "dev": true, "requires": { "commander": "2.20.1", @@ -12967,7 +12975,7 @@ "schema-utils": "1.0.0", "serialize-javascript": "1.9.1", "source-map": "0.6.1", - "terser": "4.3.8", + "terser": "4.3.9", "webpack-sources": "1.4.3", "worker-farm": "1.7.0" }, @@ -13355,9 +13363,9 @@ } }, "ts-toolbelt": { - "version": "4.8.8", - "resolved": "https://registry.npmjs.org/ts-toolbelt/-/ts-toolbelt-4.8.8.tgz", - "integrity": "sha512-5QLdemct/ssqyVgmEIK1KKY7Y39fX05kanAdnp+O529Jk7dFct+4kgasvMGXagBIvLCUviksDCZs2Lo2/fp6BQ==" + "version": "4.8.16", + "resolved": "https://registry.npmjs.org/ts-toolbelt/-/ts-toolbelt-4.8.16.tgz", + "integrity": "sha512-4xLaT2ENZ39jD+zVYgsuETHfFFnXk8unVOesBcmp0gLd57CHKIiLLtavzT+Ij1U5Z8041m1yfISDMBFG5y1zJw==" }, "tsconfig-paths": { "version": "3.9.0", @@ -13987,9 +13995,9 @@ } }, "webpack": { - "version": "4.41.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.41.0.tgz", - "integrity": "sha512-yNV98U4r7wX1VJAj5kyMsu36T8RPPQntcb5fJLOsMz/pt/WrKC0Vp1bAlqPLkA1LegSwQwf6P+kAbyhRKVQ72g==", + "version": "4.41.2", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.41.2.tgz", + "integrity": "sha512-Zhw69edTGfbz9/8JJoyRQ/pq8FYUoY0diOXqW0T6yhgdhCv6wr0hra5DwwWexNRns2Z2+gsnrNcbe9hbGBgk/A==", "dev": true, "requires": { "@webassemblyjs/ast": "1.8.5", diff --git a/package.json b/package.json index 76600f7f..a055da27 100644 --- a/package.json +++ b/package.json @@ -14,10 +14,10 @@ "url": "https://github.com/muerwre/my-empty-react-project" }, "devDependencies": { - "@babel/cli": "^7.6.3", + "@babel/cli": "^7.6.4", "@babel/preset-env": "^7.6.3", "@babel/types": "7.5.5", - "@types/react-router": "^5.0.3", + "@types/react-router": "^5.1.2", "autoresponsive-react": "^1.1.31", "awesome-typescript-loader": "^5.2.1", "babel-core": "^6.26.3", @@ -42,7 +42,7 @@ "ts-node": "^8.4.1", "typescript": "^3.6.4", "uglifyjs-webpack-plugin": "^1.3.0", - "webpack": "^4.41.0", + "webpack": "^4.41.2", "webpack-cli": "^3.3.9", "webpack-dev-server": "^3.8.2" }, @@ -51,7 +51,7 @@ "@hot-loader/react-dom": "^16.10.2", "@types/classnames": "^2.2.7", "@types/node": "^11.13.22", - "@types/ramda": "^0.26.29", + "@types/ramda": "^0.26.33", "@types/react": "16.8.23", "@typescript-eslint/eslint-plugin": "^1.13.0", "@typescript-eslint/parser": "^1.13.0", @@ -61,7 +61,7 @@ "clean-webpack-plugin": "^0.1.9", "connected-react-router": "^6.3.2", "date-fns": "^2.4.1", - "dotenv": "^8.1.0", + "dotenv": "^8.2.0", "dotenv-webpack": "^1.7.0", "eslint": "^5.16.0", "eslint-config-airbnb": "^17.1.1", diff --git a/src/components/bars/SubmitBar/styles.scss b/src/components/bars/SubmitBar/styles.scss index a2dc219f..83b9ce01 100644 --- a/src/components/bars/SubmitBar/styles.scss +++ b/src/components/bars/SubmitBar/styles.scss @@ -8,7 +8,7 @@ } } - @include tablet { + @media (max-width: $content_width + ($bar_height + $gap) * 2) { position: relative; right: 0; margin-left: $gap; diff --git a/src/components/editors/ImageEditor/index.tsx b/src/components/editors/ImageEditor/index.tsx index 77762732..45ff0bd5 100644 --- a/src/components/editors/ImageEditor/index.tsx +++ b/src/components/editors/ImageEditor/index.tsx @@ -1,10 +1,9 @@ -import React, { FC, ChangeEventHandler, DragEventHandler, useCallback, useMemo } from 'react'; +import React, { FC, useMemo } from 'react'; import { connect } from 'react-redux'; import { INode } from '~/redux/types'; import * as UPLOAD_ACTIONS from '~/redux/uploads/actions'; import { selectUploads } from '~/redux/uploads/selectors'; import { ImageGrid } from '~/components/editors/ImageGrid'; -import { IUploadStatus } from '~/redux/uploads/reducer'; const mapStateToProps = selectUploads; const mapDispatchToProps = { diff --git a/src/components/input/Button/index.tsx b/src/components/input/Button/index.tsx index 85deb8f5..af33a097 100644 --- a/src/components/input/Button/index.tsx +++ b/src/components/input/Button/index.tsx @@ -22,7 +22,7 @@ type IButtonProps = DetailedHTMLProps< iconOnly?: boolean; }; -export const Button: FC = ({ +const Button: FC = ({ className = '', size = 'normal', iconLeft, @@ -63,3 +63,5 @@ export const Button: FC = ({ iconRight && , ] ); + +export { Button };