Merge branch 'develop'

.eslintrc.json

@@ -88,6 +88,7 @@
   },
   "ignorePatterns": [
     "jest.config.js",
+    "scripts/**/*",
     "webpack.config.js",
     "dist/**/*",
     "public/**/*",

assets/sass/layout.scss

@@ -702,6 +702,7 @@ td.actions {
 
 	th {
 		border-bottom: 1px solid #39434a;
+		white-space: nowrap;
 	}
 
 	tr:nth-child(even) {
@@ -868,37 +869,7 @@ td.actions {
 	}
 
 	.content {
-		overflow: hidden;
-		white-space: nowrap;
-		padding: 8px;
-	}
-
-	.copy-button {
-		margin: 0;
-		padding: 0;
-		border-radius: 0;
-
-		.feather {
-			--icon-size: 20px;
-			margin: 8px;
-		}
-	}
-}
-
-.copyable-text {
-	display: flex;
-	flex-direction: row;
-	margin: 8px;
-
-	background-color: darken($backgroundColor, 2%);
-	border-radius: 5px;
-	overflow: hidden;
-
-	.title {
-		padding: 8px;
-	}
-
-	.content {
+		width: 0;
 		flex-grow: 1;
 		overflow: hidden;
 		white-space: nowrap;
@@ -948,3 +919,34 @@ td.actions {
 		background: $secondary;
 	}
 }
+
+.table-col-grow {
+	width: 100%;
+}
+
+.pagination {
+	ul {
+		display: flex;
+		flex-direction: row;
+		list-style: none;
+		padding: 8px;
+
+		justify-content: center;
+
+		li {
+			a, &.active, &.ellipsis {
+				display: block;
+				min-width: 40px;
+				height: 40px;
+				padding: 4px;
+
+				line-height: 32px;
+				text-align:center;
+
+				&:hover:not(.active):not(.ellipsis) {
+					background-color: #fff5;
+				}
+			}
+		}
+	}
+}

package.json

@@ -8,13 +8,13 @@
   "main": "dist/main.js",
   "scripts": {
     "test": "jest --verbose --runInBand",
-    "clean": "(test ! -d dist || rm -r dist)",
-    "prepareSources": "cp package.json src/",
+    "clean": "node scripts/clean.js",
+    "prepare-sources": "node scripts/prepare-sources.js",
     "compile": "yarn clean && tsc",
-    "build": "yarn prepareSources && yarn compile && webpack --mode production",
-    "dev": "yarn prepareSources && concurrently -k -n \"Typescript,Node,Webpack,Maildev\" -p \"[{name}]\" -c \"blue,green,red,yellow\" \"tsc --watch\" \"nodemon\" \"webpack --watch --mode development\" \"maildev\"",
+    "build": "yarn prepare-sources && yarn compile && webpack --mode production",
+    "dev": "yarn prepare-sources && concurrently -k -n \"Typescript,Node,Webpack,Maildev\" -p \"[{name}]\" -c \"blue,green,red,yellow\" \"tsc --watch\" \"nodemon\" \"webpack --watch --mode development\" \"maildev\"",
     "start": "yarn build && node",
-    "lint": "eslint . --ext .js,.jsx,.ts,.tsx"
+    "lint": "eslint ."
   },
   "devDependencies": {
     "@babel/core": "^7.9.0",
@@ -34,7 +34,7 @@
     "@typescript-eslint/eslint-plugin": "^4.3.0",
     "@typescript-eslint/parser": "^4.3.0",
     "babel-loader": "^8.1.0",
-    "concurrently": "^5.1.0",
+    "concurrently": "^6.0.0",
     "css-loader": "^5.0.0",
     "eslint": "^7.10.0",
     "feather-icons": "^4.28.0",
@@ -43,14 +43,14 @@
     "imagemin-gifsicle": "^7.0.0",
     "imagemin-mozjpeg": "^9.0.0",
     "imagemin-pngquant": "^9.0.0",
-    "imagemin-svgo": "^8.0.0",
+    "imagemin-svgo": "^9.0.0",
     "img-loader": "^3.0.1",
     "jest": "^26.1.0",
     "maildev": "^1.1.0",
     "mini-css-extract-plugin": "^1.2.1",
     "node-sass": "^5.0.0",
     "nodemon": "^2.0.3",
-    "sass-loader": "^10.0.1",
+    "sass-loader": "^11.0.1",
     "terser-webpack-plugin": "^5.0.3",
     "ts-jest": "^26.1.1",
     "ts-loader": "^8.0.4",

scripts/clean.js

@@ -0,0 +1,10 @@
+const fs = require('fs');
+
+[
+    'dist',
+].forEach(file => {
+    if (fs.existsSync(file)) {
+        console.log('Cleaning', file, '...');
+        fs.rmSync(file, {recursive: true});
+    }
+});

scripts/prepare-sources.js

@@ -0,0 +1,4 @@
+const fs = require('fs');
+const path = require('path');
+
+fs.copyFileSync('package.json', path.join('src', 'package.json'));