Merge pull request #4 from slotovi4/dev

Update to 0.2.1 version
slotovi4 · Dec 4, 2020 · b4c434d · b4c434d
2 parents 16b2b8a + 140ebfe
commit b4c434d
Show file tree

Hide file tree

Showing 27 changed files with 759 additions and 473 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -4,6 +4,7 @@
 		"plugin:react/recommended",
 		"plugin:@typescript-eslint/recommended"
 	],
+	"ignorePatterns": "commitlint.config.js",
 	"plugins": [
 		"@typescript-eslint"
 	],
@@ -103,7 +104,13 @@
 			}
 		],
 		"prefer-arrow-callback": "error",
-		"prefer-destructuring": "error",
+		"prefer-destructuring": [
+			"error",
+			{
+				"array": false,
+				"object": true
+			}
+		],
 		"no-unused-expressions": "error",
 		"no-unused-labels": "error",
 		"curly": "error",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "perfect-pixel",
-	"version": "0.1.0",
+	"version": "0.2.1",
 	"description": "",
 	"private": true,
 	"main": "build/main.js",
@@ -19,26 +19,26 @@
 	},
 	"dependencies": {
 		"electron-is-dev": "^1.2.0",
-		"react": "^16.8.3",
-		"react-dom": "^16.8.3",
+		"react": "^17.0.1",
+		"react-dom": "^17.0.1",
 		"react-scripts-scss-ts": "2.17.1"
 	},
 	"devDependencies": {
 		"@bem-react/classname": "^1.5.8",
 		"@commitlint/cli": "^11.0.0",
 		"@commitlint/config-conventional": "^11.0.0",
-		"@types/jest": "^26.0.13",
-		"@types/node": "^14.10.1",
+		"@types/jest": "^26.0.16",
+		"@types/node": "^14.14.10",
 		"@types/react": "^17.0.0",
 		"@types/react-dom": "^17.0.0",
-		"@typescript-eslint/eslint-plugin": "^4.8.1",
-		"@typescript-eslint/parser": "^4.8.1",
+		"@typescript-eslint/eslint-plugin": "^4.9.0",
+		"@typescript-eslint/parser": "^4.9.0",
 		"electron": "^11.0.3",
 		"electron-builder": "^22.9.1",
 		"eslint": "^7.14.0",
-		"eslint-plugin-react": "^7.19.0",
+		"eslint-plugin-react": "^7.21.5",
 		"husky": "^4.3.0",
-		"lint-staged": "^10.5.1",
+		"lint-staged": "^10.5.3",
 		"typescript": "^4.1.2"
 	},
 	"husky": {

diff --git a/public/index.html b/public/index.html
@@ -2,19 +2,19 @@
 <html lang="en">
 
 <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-    <meta name="theme-color" content="#000000" />
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
-    <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
-    <title>React App</title>
+	<meta charset="utf-8" />
+	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
+	<meta name="theme-color" content="#000000" />
+	<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+	<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
+	<title>React App</title>
 </head>
 
 <body>
-    <noscript>
-        You need to enable JavaScript to run this app.
-    </noscript>
-    <main id="root"></main>
+	<noscript>
+		You need to enable JavaScript to run this app.
+	</noscript>
+	<main id="root"></main>
 </body>
 
 </html>
diff --git a/public/manifest.json b/public/manifest.json
@@ -1,15 +1,15 @@
 {
-    "short_name": "React App",
-    "name": "Create React App Sample",
-    "icons": [
-        {
-            "src": "favicon.ico",
-            "sizes": "64x64 32x32 24x24 16x16",
-            "type": "image/x-icon"
-        }
-    ],
-    "start_url": "./index.html",
-    "display": "standalone",
-    "theme_color": "#000000",
-    "background_color": "#ffffff"
+	"short_name": "React App",
+	"name": "Create React App Sample",
+	"icons": [
+		{
+			"src": "favicon.ico",
+			"sizes": "64x64 32x32 24x24 16x16",
+			"type": "image/x-icon"
+		}
+	],
+	"start_url": "./index.html",
+	"display": "standalone",
+	"theme_color": "#000000",
+	"background_color": "#ffffff"
 }
diff --git a/src/components/Home/Home.scss b/src/components/Home/Home.scss
@@ -41,42 +41,11 @@
 
 	&-CloseButton {
 		margin-left: 20px;
-		width: 20px;
-		height: 20px;
-		line-height: 20px;
-		background-color: red;
-		border: none;
-		border-radius: 4px;
-		cursor: pointer;
-	}
-
-	&-RangeSection {
-		margin-left: 20px;
-
-		&-Title {
-			font-size: 12px;
-		}
-
-		&-Container {
-			display: flex;
-			align-items: center;
-			font-size: 12px;
-		}
+		line-height: 16px;
 	}
 
-	&-CheckBoxSection {
+	&-Section {
 		margin-left: 20px;
-		display: flex;
-
-		&-Input {
-			cursor: pointer;
-			margin-right: 5px;
-		}
-
-		&-Label {
-			cursor: pointer;
-			font-size: 12px;
-		}
 	}
 
 	&-ScaleSection {
@@ -91,15 +60,6 @@
 
 		&-Button {
 			margin-right: 5px;
-			padding: 2px 6px;
-			font-size: 10px;
-			cursor: pointer;
-			border: none;
-			border-radius: 3px;
-
-			&_active {
-				background-color: #0075ff;
-			}
 		}
 	}
 }