diff --git a/package-lock.json b/package-lock.json
index bf60006df5f8e22435f49fd74c765a082bca3aab..5d95c18fd33caffddf9aa1e1f0becdc332b2c6ff 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -31,7 +31,7 @@
"zone.js": "~0.11.3"
},
"devDependencies": {
- "@angular-devkit/build-angular": "^0.1102.8",
+ "@angular-devkit/build-angular": "^0.1102.9",
"@angular/cli": "~11.2.4",
"@angular/compiler-cli": "~11.2.5",
"@schematics/angular": "~11.2.4",
@@ -85,15 +85,15 @@
"dev": true
},
"node_modules/@angular-devkit/build-angular": {
- "version": "0.1102.8",
- "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.1102.8.tgz",
- "integrity": "sha512-rSGSa5jK/Fsh7PbJz9FnxLQn7zA91yquwd+x4n/VNNqMGuAIAvicBi6SCGUD5LFjMbCjWtyAMqjyqFTpU3c3qw==",
+ "version": "0.1102.9",
+ "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.1102.9.tgz",
+ "integrity": "sha512-qwE5Jdt7lJOouOJ4JJfnuTislG8JgBOTW0iQDu7h6veetWrPBI1ouWF9E4ryELnRrGQTSCFm9xFT+2l0H0o6zA==",
"dev": true,
"dependencies": {
- "@angular-devkit/architect": "0.1102.8",
- "@angular-devkit/build-optimizer": "0.1102.8",
- "@angular-devkit/build-webpack": "0.1102.8",
- "@angular-devkit/core": "11.2.8",
+ "@angular-devkit/architect": "0.1102.9",
+ "@angular-devkit/build-optimizer": "0.1102.9",
+ "@angular-devkit/build-webpack": "0.1102.9",
+ "@angular-devkit/core": "11.2.9",
"@babel/core": "7.12.10",
"@babel/generator": "7.12.11",
"@babel/plugin-transform-async-to-generator": "7.12.1",
@@ -103,7 +103,7 @@
"@babel/template": "7.12.7",
"@discoveryjs/json-ext": "0.5.2",
"@jsdevtools/coverage-istanbul-loader": "3.0.5",
- "@ngtools/webpack": "11.2.8",
+ "@ngtools/webpack": "11.2.9",
"ansi-colors": "4.1.1",
"autoprefixer": "10.2.4",
"babel-loader": "8.2.2",
@@ -168,15 +168,49 @@
"node": ">= 10.13.0",
"npm": "^6.11.0 || ^7.5.6",
"yarn": ">= 1.13.0"
+ },
+ "peerDependencies": {
+ "@angular/compiler-cli": "^11.0.0 || ^11.2.0-next",
+ "@angular/localize": "^11.0.0 || ^11.2.0-next",
+ "@angular/service-worker": "^11.0.0 || ^11.2.0-next",
+ "karma": "^5.2.0 || ^6.0.0",
+ "ng-packagr": "^11.0.0 || ^11.2.0-next",
+ "protractor": "^7.0.0",
+ "tailwindcss": "^2.0.0",
+ "tslint": "^6.1.0",
+ "typescript": "~4.0.0 || ~4.1.0"
+ },
+ "peerDependenciesMeta": {
+ "@angular/localize": {
+ "optional": true
+ },
+ "@angular/service-worker": {
+ "optional": true
+ },
+ "karma": {
+ "optional": true
+ },
+ "ng-packagr": {
+ "optional": true
+ },
+ "protractor": {
+ "optional": true
+ },
+ "tailwindcss": {
+ "optional": true
+ },
+ "tslint": {
+ "optional": true
+ }
}
},
"node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/architect": {
- "version": "0.1102.8",
- "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.8.tgz",
- "integrity": "sha512-EMl81SRyTntjE9U9m4piGvlbs2PdmBTVl2LS8GK3fimunlIzebu9WhDwAmqZdm4HEXiYmiBcCbVaHkYTU8k0Kg==",
+ "version": "0.1102.9",
+ "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.9.tgz",
+ "integrity": "sha512-AU7i0VqWUwBc04oyT98Pp6sMDMp67JTZd/Cfrz5AM4MqrCZsDJMsTlWH26fAbESSLHgNst7H91Eq0cnC8rCmOQ==",
"dev": true,
"dependencies": {
- "@angular-devkit/core": "11.2.8",
+ "@angular-devkit/core": "11.2.9",
"rxjs": "6.6.3"
},
"engines": {
@@ -186,9 +220,9 @@
}
},
"node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/core": {
- "version": "11.2.8",
- "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.8.tgz",
- "integrity": "sha512-iNodaySWW1JrF+oGZCi0rYDJXO96T4K7H6BLz6xapSwFxkY+Xr4CBuTqEp2DKzAZ+sjYFmsItLmNedwOOBnwfA==",
+ "version": "11.2.9",
+ "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.9.tgz",
+ "integrity": "sha512-TqihgUEKjX4C1hSd8RgUyCwuezFRdput9Ctcq8c4VgOcseEnXq3BkCSJbXtUh4Fln8WPxM7WHM8HClcWya/41g==",
"dev": true,
"dependencies": {
"ajv": "6.12.6",
@@ -222,9 +256,9 @@
"dev": true
},
"node_modules/@angular-devkit/build-optimizer": {
- "version": "0.1102.8",
- "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.1102.8.tgz",
- "integrity": "sha512-a5IK3yc7XXHc3obdFc8rhm9neO9LHSJZ1AqusLq/2tmHhFBrLevG4ylG+n9ZnM+bh4PIoUwFN82dneH9C7IBpA==",
+ "version": "0.1102.9",
+ "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.1102.9.tgz",
+ "integrity": "sha512-Nlup25swf7pSfBytZCQs5zUl4RC3Z07RVkaJvIK7qG5gvoq4Ae1vPgBT24gzCcX43UqRd3ywsF1+8I3CGOD8VA==",
"dev": true,
"dependencies": {
"loader-utils": "2.0.0",
@@ -243,28 +277,32 @@
}
},
"node_modules/@angular-devkit/build-webpack": {
- "version": "0.1102.8",
- "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1102.8.tgz",
- "integrity": "sha512-iyFgrU3VPbUl7/JhxRljkqfvIIwzH5HJaYaObo3QVrvL9vAsRhVk6gQRYxGpSmeTwu64fBE5W3reL2uja7KEoA==",
+ "version": "0.1102.9",
+ "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1102.9.tgz",
+ "integrity": "sha512-RnLa5yDzoqQEAvpI9d4xX9s9FdWbDeMDN77CDg/CHFJ6MOtggzc/9GyH7wpynaSqtTCs1VmYeKtjPFhzkNIzuA==",
"dev": true,
"dependencies": {
- "@angular-devkit/architect": "0.1102.8",
- "@angular-devkit/core": "11.2.8",
+ "@angular-devkit/architect": "0.1102.9",
+ "@angular-devkit/core": "11.2.9",
"rxjs": "6.6.3"
},
"engines": {
"node": ">= 10.13.0",
"npm": "^6.11.0 || ^7.5.6",
"yarn": ">= 1.13.0"
+ },
+ "peerDependencies": {
+ "webpack": "^4.6.0",
+ "webpack-dev-server": "^3.1.4"
}
},
"node_modules/@angular-devkit/build-webpack/node_modules/@angular-devkit/architect": {
- "version": "0.1102.8",
- "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.8.tgz",
- "integrity": "sha512-EMl81SRyTntjE9U9m4piGvlbs2PdmBTVl2LS8GK3fimunlIzebu9WhDwAmqZdm4HEXiYmiBcCbVaHkYTU8k0Kg==",
+ "version": "0.1102.9",
+ "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.9.tgz",
+ "integrity": "sha512-AU7i0VqWUwBc04oyT98Pp6sMDMp67JTZd/Cfrz5AM4MqrCZsDJMsTlWH26fAbESSLHgNst7H91Eq0cnC8rCmOQ==",
"dev": true,
"dependencies": {
- "@angular-devkit/core": "11.2.8",
+ "@angular-devkit/core": "11.2.9",
"rxjs": "6.6.3"
},
"engines": {
@@ -274,9 +312,9 @@
}
},
"node_modules/@angular-devkit/build-webpack/node_modules/@angular-devkit/core": {
- "version": "11.2.8",
- "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.8.tgz",
- "integrity": "sha512-iNodaySWW1JrF+oGZCi0rYDJXO96T4K7H6BLz6xapSwFxkY+Xr4CBuTqEp2DKzAZ+sjYFmsItLmNedwOOBnwfA==",
+ "version": "11.2.9",
+ "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.9.tgz",
+ "integrity": "sha512-TqihgUEKjX4C1hSd8RgUyCwuezFRdput9Ctcq8c4VgOcseEnXq3BkCSJbXtUh4Fln8WPxM7WHM8HClcWya/41g==",
"dev": true,
"dependencies": {
"ajv": "6.12.6",
@@ -1773,12 +1811,12 @@
}
},
"node_modules/@ngtools/webpack": {
- "version": "11.2.8",
- "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-11.2.8.tgz",
- "integrity": "sha512-ONn/MLJF8ieXrvvmmnDwga1sredsfedAsCLNmRpyDdamQwzqIErHuMmQhP4kuTw2+9Lj3V1gQOHyxdayO0d91A==",
+ "version": "11.2.9",
+ "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-11.2.9.tgz",
+ "integrity": "sha512-UdWtJCfGfwQd+MSOyAXUE/o8IOQFwnWeh1twoyVh0XTx4I5dcZfj4r3qFLEUF05zFh25j8lUCbNQN9v4IJmA/A==",
"dev": true,
"dependencies": {
- "@angular-devkit/core": "11.2.8",
+ "@angular-devkit/core": "11.2.9",
"enhanced-resolve": "5.7.0",
"webpack-sources": "2.2.0"
},
@@ -1786,12 +1824,17 @@
"node": ">= 10.13.0",
"npm": "^6.11.0 || ^7.5.6",
"yarn": ">= 1.13.0"
+ },
+ "peerDependencies": {
+ "@angular/compiler-cli": "^11.0.0 || ^11.2.0-next",
+ "typescript": "~4.0.0 || ~4.1.0",
+ "webpack": "^4.0.0"
}
},
"node_modules/@ngtools/webpack/node_modules/@angular-devkit/core": {
- "version": "11.2.8",
- "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.8.tgz",
- "integrity": "sha512-iNodaySWW1JrF+oGZCi0rYDJXO96T4K7H6BLz6xapSwFxkY+Xr4CBuTqEp2DKzAZ+sjYFmsItLmNedwOOBnwfA==",
+ "version": "11.2.9",
+ "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.9.tgz",
+ "integrity": "sha512-TqihgUEKjX4C1hSd8RgUyCwuezFRdput9Ctcq8c4VgOcseEnXq3BkCSJbXtUh4Fln8WPxM7WHM8HClcWya/41g==",
"dev": true,
"dependencies": {
"ajv": "6.12.6",
@@ -18312,15 +18355,15 @@
}
},
"@angular-devkit/build-angular": {
- "version": "0.1102.8",
- "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.1102.8.tgz",
- "integrity": "sha512-rSGSa5jK/Fsh7PbJz9FnxLQn7zA91yquwd+x4n/VNNqMGuAIAvicBi6SCGUD5LFjMbCjWtyAMqjyqFTpU3c3qw==",
+ "version": "0.1102.9",
+ "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.1102.9.tgz",
+ "integrity": "sha512-qwE5Jdt7lJOouOJ4JJfnuTislG8JgBOTW0iQDu7h6veetWrPBI1ouWF9E4ryELnRrGQTSCFm9xFT+2l0H0o6zA==",
"dev": true,
"requires": {
- "@angular-devkit/architect": "0.1102.8",
- "@angular-devkit/build-optimizer": "0.1102.8",
- "@angular-devkit/build-webpack": "0.1102.8",
- "@angular-devkit/core": "11.2.8",
+ "@angular-devkit/architect": "0.1102.9",
+ "@angular-devkit/build-optimizer": "0.1102.9",
+ "@angular-devkit/build-webpack": "0.1102.9",
+ "@angular-devkit/core": "11.2.9",
"@babel/core": "7.12.10",
"@babel/generator": "7.12.11",
"@babel/plugin-transform-async-to-generator": "7.12.1",
@@ -18330,7 +18373,7 @@
"@babel/template": "7.12.7",
"@discoveryjs/json-ext": "0.5.2",
"@jsdevtools/coverage-istanbul-loader": "3.0.5",
- "@ngtools/webpack": "11.2.8",
+ "@ngtools/webpack": "11.2.9",
"ansi-colors": "4.1.1",
"autoprefixer": "10.2.4",
"babel-loader": "8.2.2",
@@ -18393,19 +18436,19 @@
},
"dependencies": {
"@angular-devkit/architect": {
- "version": "0.1102.8",
- "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.8.tgz",
- "integrity": "sha512-EMl81SRyTntjE9U9m4piGvlbs2PdmBTVl2LS8GK3fimunlIzebu9WhDwAmqZdm4HEXiYmiBcCbVaHkYTU8k0Kg==",
+ "version": "0.1102.9",
+ "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.9.tgz",
+ "integrity": "sha512-AU7i0VqWUwBc04oyT98Pp6sMDMp67JTZd/Cfrz5AM4MqrCZsDJMsTlWH26fAbESSLHgNst7H91Eq0cnC8rCmOQ==",
"dev": true,
"requires": {
- "@angular-devkit/core": "11.2.8",
+ "@angular-devkit/core": "11.2.9",
"rxjs": "6.6.3"
}
},
"@angular-devkit/core": {
- "version": "11.2.8",
- "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.8.tgz",
- "integrity": "sha512-iNodaySWW1JrF+oGZCi0rYDJXO96T4K7H6BLz6xapSwFxkY+Xr4CBuTqEp2DKzAZ+sjYFmsItLmNedwOOBnwfA==",
+ "version": "11.2.9",
+ "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.9.tgz",
+ "integrity": "sha512-TqihgUEKjX4C1hSd8RgUyCwuezFRdput9Ctcq8c4VgOcseEnXq3BkCSJbXtUh4Fln8WPxM7WHM8HClcWya/41g==",
"dev": true,
"requires": {
"ajv": "6.12.6",
@@ -18433,9 +18476,9 @@
}
},
"@angular-devkit/build-optimizer": {
- "version": "0.1102.8",
- "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.1102.8.tgz",
- "integrity": "sha512-a5IK3yc7XXHc3obdFc8rhm9neO9LHSJZ1AqusLq/2tmHhFBrLevG4ylG+n9ZnM+bh4PIoUwFN82dneH9C7IBpA==",
+ "version": "0.1102.9",
+ "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.1102.9.tgz",
+ "integrity": "sha512-Nlup25swf7pSfBytZCQs5zUl4RC3Z07RVkaJvIK7qG5gvoq4Ae1vPgBT24gzCcX43UqRd3ywsF1+8I3CGOD8VA==",
"dev": true,
"requires": {
"loader-utils": "2.0.0",
@@ -18446,30 +18489,30 @@
}
},
"@angular-devkit/build-webpack": {
- "version": "0.1102.8",
- "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1102.8.tgz",
- "integrity": "sha512-iyFgrU3VPbUl7/JhxRljkqfvIIwzH5HJaYaObo3QVrvL9vAsRhVk6gQRYxGpSmeTwu64fBE5W3reL2uja7KEoA==",
+ "version": "0.1102.9",
+ "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1102.9.tgz",
+ "integrity": "sha512-RnLa5yDzoqQEAvpI9d4xX9s9FdWbDeMDN77CDg/CHFJ6MOtggzc/9GyH7wpynaSqtTCs1VmYeKtjPFhzkNIzuA==",
"dev": true,
"requires": {
- "@angular-devkit/architect": "0.1102.8",
- "@angular-devkit/core": "11.2.8",
+ "@angular-devkit/architect": "0.1102.9",
+ "@angular-devkit/core": "11.2.9",
"rxjs": "6.6.3"
},
"dependencies": {
"@angular-devkit/architect": {
- "version": "0.1102.8",
- "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.8.tgz",
- "integrity": "sha512-EMl81SRyTntjE9U9m4piGvlbs2PdmBTVl2LS8GK3fimunlIzebu9WhDwAmqZdm4HEXiYmiBcCbVaHkYTU8k0Kg==",
+ "version": "0.1102.9",
+ "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.9.tgz",
+ "integrity": "sha512-AU7i0VqWUwBc04oyT98Pp6sMDMp67JTZd/Cfrz5AM4MqrCZsDJMsTlWH26fAbESSLHgNst7H91Eq0cnC8rCmOQ==",
"dev": true,
"requires": {
- "@angular-devkit/core": "11.2.8",
+ "@angular-devkit/core": "11.2.9",
"rxjs": "6.6.3"
}
},
"@angular-devkit/core": {
- "version": "11.2.8",
- "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.8.tgz",
- "integrity": "sha512-iNodaySWW1JrF+oGZCi0rYDJXO96T4K7H6BLz6xapSwFxkY+Xr4CBuTqEp2DKzAZ+sjYFmsItLmNedwOOBnwfA==",
+ "version": "11.2.9",
+ "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.9.tgz",
+ "integrity": "sha512-TqihgUEKjX4C1hSd8RgUyCwuezFRdput9Ctcq8c4VgOcseEnXq3BkCSJbXtUh4Fln8WPxM7WHM8HClcWya/41g==",
"dev": true,
"requires": {
"ajv": "6.12.6",
@@ -19878,20 +19921,20 @@
}
},
"@ngtools/webpack": {
- "version": "11.2.8",
- "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-11.2.8.tgz",
- "integrity": "sha512-ONn/MLJF8ieXrvvmmnDwga1sredsfedAsCLNmRpyDdamQwzqIErHuMmQhP4kuTw2+9Lj3V1gQOHyxdayO0d91A==",
+ "version": "11.2.9",
+ "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-11.2.9.tgz",
+ "integrity": "sha512-UdWtJCfGfwQd+MSOyAXUE/o8IOQFwnWeh1twoyVh0XTx4I5dcZfj4r3qFLEUF05zFh25j8lUCbNQN9v4IJmA/A==",
"dev": true,
"requires": {
- "@angular-devkit/core": "11.2.8",
+ "@angular-devkit/core": "11.2.9",
"enhanced-resolve": "5.7.0",
"webpack-sources": "2.2.0"
},
"dependencies": {
"@angular-devkit/core": {
- "version": "11.2.8",
- "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.8.tgz",
- "integrity": "sha512-iNodaySWW1JrF+oGZCi0rYDJXO96T4K7H6BLz6xapSwFxkY+Xr4CBuTqEp2DKzAZ+sjYFmsItLmNedwOOBnwfA==",
+ "version": "11.2.9",
+ "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.9.tgz",
+ "integrity": "sha512-TqihgUEKjX4C1hSd8RgUyCwuezFRdput9Ctcq8c4VgOcseEnXq3BkCSJbXtUh4Fln8WPxM7WHM8HClcWya/41g==",
"dev": true,
"requires": {
"ajv": "6.12.6",
diff --git a/package.json b/package.json
index be1dd1b3ff7515c323ae0443fae03422b9d8f263..c95c101a7df9741a6b7e1394ee48bdd494036118 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
"zone.js": "~0.11.3"
},
"devDependencies": {
- "@angular-devkit/build-angular": "^0.1102.8",
+ "@angular-devkit/build-angular": "^0.1102.9",
"@angular/cli": "~11.2.4",
"@angular/compiler-cli": "~11.2.5",
"@schematics/angular": "~11.2.4",
diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts
index 797510e8c2f2afca3bde4adf0e745508c26fb65e..eecc15e35822ce83346375539fdfa06381af09a0 100644
--- a/src/app/app.component.spec.ts
+++ b/src/app/app.component.spec.ts
@@ -1,3 +1,4 @@
+
import { TestBed } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
import { AppComponent } from './app.component';
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index fd2eebb6d5e460d52542f7921fb9aa7b6c3215da..9aa2cfd56f0796c5cf9ac022fcbad2b11daa1168 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -19,6 +19,7 @@ import { MatSelectModule } from '@angular/material/select';
import { MatAutocompleteModule } from '@angular/material/autocomplete';
import { MatDatepickerModule } from '@angular/material/datepicker';
import { MatNativeDateModule } from '@angular/material/core';
+import {MatIconModule} from '@angular/material/icon';
import { MatButtonToggleModule } from '@angular/material/button-toggle';
import { GraphicsPageModule } from './pages/graphics-page/graphics-page.module'
@@ -65,6 +66,7 @@ import { OverlayContainer } from '@angular/cdk/overlay';
MatDatepickerModule,
MatNativeDateModule,
GraphicsPageModule,
+ MatIconModule,
],
providers: [
{ provide: OverlayContainer },
diff --git a/src/app/pages/home/home.component.css b/src/app/pages/home/home.component.css
index 42ebfb546f107857b1826b6e4d6704d309893e59..a2a1b6d938e90a16e8173d76b5386ac2f51269de 100644
--- a/src/app/pages/home/home.component.css
+++ b/src/app/pages/home/home.component.css
@@ -13,7 +13,7 @@ mat-grid-list {
height: 80%;
cursor: pointer;
margin-top: 200px;
- margin-left: auto;
+
}
a {
diff --git a/src/app/toolbar/toolbar.component.css b/src/app/toolbar/toolbar.component.css
index cadb9a5248407326ff40364bf2d32b3f454b2a81..fe3b44ee0ffb6b1bc9e999350ef93c302e69bf26 100644
--- a/src/app/toolbar/toolbar.component.css
+++ b/src/app/toolbar/toolbar.component.css
@@ -1,39 +1,46 @@
mat-grid-list {
- width: 750px;
+ width: 800px;
margin-top: 20px;
+ margin-left: 90px;
}
-.mat-grid-tile {
- width: 80px;
-}
- /* Buttons */
+ /* Buttons */
+
+.logo{
+ transform: scale(1.3);
+
+}
.button-home {
background: url(../../assets/home_ico.png);
- width: 60px;
+ margin-left: 32px ;
+ width: 70px;
height: 70px;
+ color :black;
+ margin-top: 15px;
}
+
.button-home:hover {
transform: scale(1.2);
}
-.button-settings {
- background: url(../../assets/settings-5659.png);
- width: 64px;
- height: 64px;
- transform: scale(0.5);
- margin-left: -140px;
-}
-.button-settings:hover {
- transform: scale(0.7);
+
+.button-graphics, .button-search , .button-settings{
+ transform: scale(1.5);
+ color: black;
+ margin-top: 19px;
+
}
+.button-graphics :hover, .button-search :hover , .button-settings :hover {
+ transform: scale(1.7);
+}
/* Vertical separator */
@@ -41,15 +48,16 @@ mat-grid-list {
height: 30px;
border-left: 0.5px solid rgb(189, 189, 189);
float:right;
- margin-right: -30px;
+ margin-right: -15px;
}
/* Horizontal separator */
.underline {
border: 0.5px solid rgb(0,94,184);
- margin-top: -15px;
- width: 100%;
+ margin-top: -10px;
+ margin-left: 55px;
+ width: 800px;
}
diff --git a/src/app/toolbar/toolbar.component.html b/src/app/toolbar/toolbar.component.html
index ca3209b14c669b335662064a76a624d46e0194c0..e9874e0ee313a6c83faf782b5b4caec83fc07cd7 100644
--- a/src/app/toolbar/toolbar.component.html
+++ b/src/app/toolbar/toolbar.component.html
@@ -1,10 +1,13 @@
<!-- Toolbar -->
<div class="body">
- <mat-grid-list cols="4" rowHeight="120px">
- <mat-grid-tile><img class="img-logo" src="../assets/enedis_img.png" alt="Logo Enedis"></mat-grid-tile>
- <a routerLink=''><mat-grid-tile><button mat-icon-button title="Page d'accueil" class="button-home" ><div class="separator"></div> </button></mat-grid-tile></a>
- <a routerLink="/settings"><mat-grid-tile><button mat-icon-button title="Paramètres" class="button-settings" ></button></mat-grid-tile></a>
+ <mat-grid-list cols="6" rowHeight="120px">
+ <mat-grid-tile class="logo"><img class="img-logo" src="../assets/enedis_img.png" alt="Logo Enedis"></mat-grid-tile>
+ <mat-grid-tile><a routerLink=''><button mat-icon-button title="Page d'accueil" class="button-home" ><div class="separator"></div> </button></a></mat-grid-tile>
+ <mat-grid-tile> <a routerLink='/graphics'><button mat-icon-button title="Graphiques et statistiques" class="button-graphics" ><mat-icon>equalizer</mat-icon></button></a></mat-grid-tile>
+ <mat-grid-tile><a routerLink='/data-entry'><button mat-icon-button title="Saisie de données" class="button-search" ><mat-icon>control_point</mat-icon></button></a></mat-grid-tile>
+ <mat-grid-tile><a routerLink='/articles'><button mat-icon-button title="Recherche d'articles" class="button-search" ><mat-icon>search</mat-icon></button></a></mat-grid-tile>
+ <mat-grid-tile><a routerLink="/settings"><button mat-icon-button title="Paramètres" class="button-settings" ><mat-icon>settings</mat-icon></button></a></mat-grid-tile>
</mat-grid-list>
<div class="underline"></div>
</div>