From bae03fb4423c481c3f34cff61bdd9336a9aa2ee5 Mon Sep 17 00:00:00 2001 From: matias mella Date: Tue, 20 Jul 2021 17:44:43 -0400 Subject: [PATCH 1/2] modificacion de visual --- frontend/package-lock.json | 240 +++++++++++------- frontend/package.json | 3 + frontend/src/app/app-routing.module.ts | 7 +- frontend/src/app/app.component.html | 5 +- frontend/src/app/app.module.ts | 8 +- .../agregar-res/agregar-res.component.html | 17 +- .../agregar-res/agregar-res.component.ts | 6 +- .../agregar-usuario.component.html | 35 +++ .../agregar-usuario.component.scss | 0 .../agregar-usuario.component.ts | 49 ++++ .../components/public/public.component.html | 23 +- .../app/components/public/public.component.ts | 1 + frontend/src/app/restaurantes.service.ts | 24 +- frontend/src/index.html | 1 + frontend/src/polyfills.ts | 4 + frontend/src/styles.scss | 3 + 16 files changed, 321 insertions(+), 105 deletions(-) create mode 100644 frontend/src/app/components/agregar-usuario/agregar-usuario.component.html create mode 100644 frontend/src/app/components/agregar-usuario/agregar-usuario.component.scss create mode 100644 frontend/src/app/components/agregar-usuario/agregar-usuario.component.ts diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 767818a..c55487d 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -331,6 +331,115 @@ "tslib": "^2.1.0" } }, + "@angular/localize": { + "version": "12.0.5", + "resolved": "https://registry.npmjs.org/@angular/localize/-/localize-12.0.5.tgz", + "integrity": "sha512-CRyXsNJYV7TJBsbG/Sn6lW9qMQCa+lw5SSNKHvnmfCTyd5p3DV8AdjOYkyWM5tfB4wg/aOc4C1ynDom4TmKv+w==", + "requires": { + "@babel/core": "7.8.3", + "glob": "7.1.7", + "yargs": "^16.2.0" + }, + "dependencies": { + "@babel/core": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.8.3.tgz", + "integrity": "sha512-4XFkf8AwyrEG7Ziu3L2L0Cv+WyY47Tcsp70JFmpftbAA1K7YL/sgE9jh9HyNj08Y/U50ItUchpN0w6HxAoX1rA==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.8.3", + "@babel/helpers": "^7.8.3", + "@babel/parser": "^7.8.3", + "@babel/template": "^7.8.3", + "@babel/traverse": "^7.8.3", + "@babel/types": "^7.8.3", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.1", + "json5": "^2.1.0", + "lodash": "^4.17.13", + "resolve": "^1.3.2", + "semver": "^5.4.1", + "source-map": "^0.5.0" + } + }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "requires": { + "color-convert": "^2.0.1" + } + }, + "cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "requires": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + }, + "wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + } + }, + "y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==" + }, + "yargs": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "requires": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + } + }, + "yargs-parser": { + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==" + } + } + }, "@angular/platform-browser": { "version": "12.0.5", "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-12.0.5.tgz", @@ -382,7 +491,6 @@ "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz", "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==", - "dev": true, "requires": { "@babel/highlight": "^7.14.5" } @@ -434,7 +542,6 @@ "version": "7.14.3", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.3.tgz", "integrity": "sha512-bn0S6flG/j0xtQdz3hsjJ624h3W0r3llttBMfyHX3YrZ/KtLYr15bjA0FXkgW7FpvrDuTuElXeVjiKlYRpnOFA==", - "dev": true, "requires": { "@babel/types": "^7.14.2", "jsesc": "^2.5.1", @@ -444,8 +551,7 @@ "source-map": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" } } }, @@ -549,7 +655,6 @@ "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz", "integrity": "sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==", - "dev": true, "requires": { "@babel/helper-get-function-arity": "^7.14.5", "@babel/template": "^7.14.5", @@ -560,7 +665,6 @@ "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz", "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==", - "dev": true, "requires": { "@babel/code-frame": "^7.14.5", "@babel/parser": "^7.14.5", @@ -573,7 +677,6 @@ "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz", "integrity": "sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg==", - "dev": true, "requires": { "@babel/types": "^7.14.5" } @@ -582,7 +685,6 @@ "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz", "integrity": "sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ==", - "dev": true, "requires": { "@babel/types": "^7.14.5" } @@ -694,7 +796,6 @@ "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz", "integrity": "sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==", - "dev": true, "requires": { "@babel/types": "^7.14.5" } @@ -702,8 +803,7 @@ "@babel/helper-validator-identifier": { "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz", - "integrity": "sha512-5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg==", - "dev": true + "integrity": "sha512-5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg==" }, "@babel/helper-validator-option": { "version": "7.14.5", @@ -740,7 +840,6 @@ "version": "7.14.6", "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.6.tgz", "integrity": "sha512-yesp1ENQBiLI+iYHSJdoZKUtRpfTlL1grDIX9NRlAVppljLw/4tTyYupIB7uIYmC3stW/imAv8EqaKaS/ibmeA==", - "dev": true, "requires": { "@babel/template": "^7.14.5", "@babel/traverse": "^7.14.5", @@ -751,7 +850,6 @@ "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz", "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==", - "dev": true, "requires": { "@babel/code-frame": "^7.14.5", "@babel/parser": "^7.14.5", @@ -764,7 +862,6 @@ "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz", "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==", - "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.14.5", "chalk": "^2.0.0", @@ -774,8 +871,7 @@ "@babel/parser": { "version": "7.14.7", "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.7.tgz", - "integrity": "sha512-X67Z5y+VBJuHB/RjwECp8kSl5uYi0BvRbNeWqkaJCVh+LiTPl19WBUfG627psSgp9rSf6ojuXghQM3ha6qHHdA==", - "dev": true + "integrity": "sha512-X67Z5y+VBJuHB/RjwECp8kSl5uYi0BvRbNeWqkaJCVh+LiTPl19WBUfG627psSgp9rSf6ojuXghQM3ha6qHHdA==" }, "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { "version": "7.14.5", @@ -1521,7 +1617,6 @@ "version": "7.12.13", "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz", "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==", - "dev": true, "requires": { "@babel/code-frame": "^7.12.13", "@babel/parser": "^7.12.13", @@ -1532,7 +1627,6 @@ "version": "7.14.7", "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.7.tgz", "integrity": "sha512-9vDr5NzHu27wgwejuKL7kIOm4bwEtaPQ4Z6cpCmjSuaRqpH/7xc4qcGEscwMqlkwgcXl6MvqoAjZkQ24uSdIZQ==", - "dev": true, "requires": { "@babel/code-frame": "^7.14.5", "@babel/generator": "^7.14.5", @@ -1549,7 +1643,6 @@ "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.5.tgz", "integrity": "sha512-y3rlP+/G25OIX3mYKKIOlQRcqj7YgrvHxOLbVmyLJ9bPmi5ttvUmpydVjcFjZphOktWuA7ovbx91ECloWTfjIA==", - "dev": true, "requires": { "@babel/types": "^7.14.5", "jsesc": "^2.5.1", @@ -1559,8 +1652,7 @@ "source-map": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" } } }, @@ -1568,7 +1660,6 @@ "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.5.tgz", "integrity": "sha512-M/NzBpEL95I5Hh4dwhin5JlE7EzO5PHMAuzjxss3tiOBD46KfQvVedN/3jEPZvdRvtsK2222XfdHogNIttFgcg==", - "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.14.5", "to-fast-properties": "^2.0.0" @@ -1605,6 +1696,14 @@ "schema-utils": "^2.7.0" } }, + "@ng-bootstrap/ng-bootstrap": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-10.0.0.tgz", + "integrity": "sha512-Sz+QaxjuyJYJ+zyUbf0TevgcgVesCPQiiFiggEzxKjzY5R+Hvq3YgryLdXf2r/ryePL+C3FXCcmmKpTM5bfczQ==", + "requires": { + "tslib": "^2.1.0" + } + }, "@ngtools/webpack": { "version": "12.0.5", "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-12.0.5.tgz", @@ -2147,14 +2246,12 @@ "ansi-regex": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", - "dev": true + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" }, "ansi-styles": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, "requires": { "color-convert": "^1.9.0" } @@ -2446,8 +2543,7 @@ "balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" }, "base": { "version": "0.11.2", @@ -2621,11 +2717,15 @@ "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=", "dev": true }, + "bootstrap": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.0.tgz", + "integrity": "sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw==" + }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -2793,7 +2893,6 @@ "version": "2.4.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, "requires": { "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", @@ -2978,7 +3077,6 @@ "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, "requires": { "color-name": "1.1.3" } @@ -2986,8 +3084,7 @@ "color-name": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" }, "colord": { "version": "2.1.0", @@ -3078,8 +3175,7 @@ "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, "connect": { "version": "3.7.0", @@ -3141,7 +3237,6 @@ "version": "1.8.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz", "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==", - "dev": true, "requires": { "safe-buffer": "~5.1.1" } @@ -3818,7 +3913,6 @@ "version": "4.3.2", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", - "dev": true, "requires": { "ms": "2.1.2" } @@ -4136,8 +4230,7 @@ "emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" }, "emojis-list": { "version": "3.0.0", @@ -4286,8 +4379,7 @@ "escalade": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", - "dev": true + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==" }, "escape-html": { "version": "1.0.3", @@ -4298,8 +4390,7 @@ "escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, "eslint-scope": { "version": "5.1.1", @@ -4812,8 +4903,7 @@ "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "fsevents": { "version": "2.3.2", @@ -4825,8 +4915,7 @@ "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, "gauge": { "version": "2.7.4", @@ -4884,14 +4973,12 @@ "gensync": { "version": "1.0.0-beta.2", "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", - "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", - "dev": true + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==" }, "get-caller-file": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" }, "get-intrinsic": { "version": "1.1.1", @@ -4932,7 +5019,6 @@ "version": "7.1.7", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", - "dev": true, "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -4960,8 +5046,7 @@ "globals": { "version": "11.12.0", "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", - "dev": true + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==" }, "globby": { "version": "11.0.4", @@ -5029,7 +5114,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, "requires": { "function-bind": "^1.1.1" } @@ -5037,8 +5121,7 @@ "has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" }, "has-symbols": { "version": "1.0.2", @@ -5525,7 +5608,6 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dev": true, "requires": { "once": "^1.3.0", "wrappy": "1" @@ -5534,8 +5616,7 @@ "inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "ini": { "version": "2.0.0", @@ -5725,7 +5806,6 @@ "version": "2.4.0", "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz", "integrity": "sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==", - "dev": true, "requires": { "has": "^1.0.3" } @@ -5796,8 +5876,7 @@ "is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" }, "is-glob": { "version": "4.0.1", @@ -6064,8 +6143,7 @@ "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" }, "jsbn": { "version": "0.1.1", @@ -6076,8 +6154,7 @@ "jsesc": { "version": "2.5.2", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", - "dev": true + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==" }, "json-parse-better-errors": { "version": "1.0.2", @@ -6119,7 +6196,6 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", - "dev": true, "requires": { "minimist": "^1.2.5" } @@ -6841,7 +6917,6 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "dev": true, "requires": { "brace-expansion": "^1.1.7" } @@ -6849,8 +6924,7 @@ "minimist": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", - "dev": true + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" }, "minipass": { "version": "3.1.3", @@ -6959,8 +7033,7 @@ "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "multicast-dns": { "version": "6.2.3", @@ -7349,7 +7422,6 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, "requires": { "wrappy": "1" } @@ -7643,8 +7715,7 @@ "path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "dev": true + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, "path-is-inside": { "version": "1.0.2", @@ -7661,8 +7732,7 @@ "path-parse": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "dev": true + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" }, "path-to-regexp": { "version": "0.1.7", @@ -9704,8 +9774,7 @@ "require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", - "dev": true + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" }, "require-from-string": { "version": "2.0.2", @@ -9729,7 +9798,6 @@ "version": "1.20.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz", "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==", - "dev": true, "requires": { "is-core-module": "^2.2.0", "path-parse": "^1.0.6" @@ -9893,8 +9961,7 @@ "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, "safe-regex": { "version": "1.1.0", @@ -10621,7 +10688,6 @@ "version": "4.2.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", - "dev": true, "requires": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -10649,7 +10715,6 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dev": true, "requires": { "ansi-regex": "^5.0.0" } @@ -10765,7 +10830,6 @@ "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, "requires": { "has-flag": "^3.0.0" } @@ -10977,8 +11041,7 @@ "to-fast-properties": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=", - "dev": true + "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=" }, "to-object-path": { "version": "0.3.0", @@ -12031,8 +12094,7 @@ "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, "ws": { "version": "6.2.2", diff --git a/frontend/package.json b/frontend/package.json index e11f8ef..b3954cc 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -15,10 +15,13 @@ "@angular/compiler": "~12.0.1", "@angular/core": "~12.0.1", "@angular/forms": "~12.0.1", + "@angular/localize": "~12.0.1", "@angular/platform-browser": "~12.0.1", "@angular/platform-browser-dynamic": "~12.0.1", "@angular/router": "~12.0.1", "@auth0/auth0-angular": "^1.5.1", + "@ng-bootstrap/ng-bootstrap": "^10.0.0", + "bootstrap": "^4.5.0", "rxjs": "~6.6.0", "tslib": "^2.1.0", "zone.js": "~0.11.4" diff --git a/frontend/src/app/app-routing.module.ts b/frontend/src/app/app-routing.module.ts index 62f93b6..2e1cbf2 100644 --- a/frontend/src/app/app-routing.module.ts +++ b/frontend/src/app/app-routing.module.ts @@ -2,15 +2,18 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import {PublicComponent} from "./components/public/public.component"; import {PrivateComponent} from "./components/private/private.component"; -//import {AuthGuard} from "./guards/auth.guard"; -import { AuthGuard } from '@auth0/auth0-angular'; +import {AuthGuard} from "./guards/auth.guard"; + +//import { AuthGuard } from '@auth0/auth0-angular'; import {AgregarResComponent} from "./components/agregar-res/agregar-res.component"; +import {AgregarUsuarioComponent} from "./components/agregar-usuario/agregar-usuario.component"; const routes: Routes = [ { path: 'public', component:PublicComponent}, { path: 'private', component:PrivateComponent, canActivate: [AuthGuard]}, {path: 'agregar.res', component:AgregarResComponent, canActivate:[AuthGuard]}, + {path: 'agregar.usu', component:AgregarUsuarioComponent, canActivate:[AuthGuard]}, {path: '**', pathMatch: 'full', redirectTo: 'public'} ]; diff --git a/frontend/src/app/app.component.html b/frontend/src/app/app.component.html index 18618ef..3491052 100644 --- a/frontend/src/app/app.component.html +++ b/frontend/src/app/app.component.html @@ -10,7 +10,10 @@ public
  • - agregar.res + agregar.res +
    • +
  • + agregar.usu
  • private diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts index 0af38e9..f9f5e80 100644 --- a/frontend/src/app/app.module.ts +++ b/frontend/src/app/app.module.ts @@ -8,13 +8,16 @@ import { AuthModule, AuthHttpInterceptor } from '@auth0/auth0-angular'; import { PublicComponent } from './components/public/public.component'; import { PrivateComponent } from './components/private/private.component'; import { AgregarResComponent } from './components/agregar-res/agregar-res.component'; +import { AgregarUsuarioComponent } from './components/agregar-usuario/agregar-usuario.component'; +import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; @NgModule({ declarations: [ AppComponent, PublicComponent, PrivateComponent, - AgregarResComponent + AgregarResComponent, + AgregarUsuarioComponent ], imports: [ BrowserModule, @@ -45,7 +48,8 @@ import { AgregarResComponent } from './components/agregar-res/agregar-res.compon HttpClientModule, - FormsModule + FormsModule, + NgbModule ], providers: [ { provide: HTTP_INTERCEPTORS, useClass: AuthHttpInterceptor, multi: true } diff --git a/frontend/src/app/components/agregar-res/agregar-res.component.html b/frontend/src/app/components/agregar-res/agregar-res.component.html index ee4c720..b6b5060 100644 --- a/frontend/src/app/components/agregar-res/agregar-res.component.html +++ b/frontend/src/app/components/agregar-res/agregar-res.component.html @@ -1,28 +1,33 @@ +
    +
    + - + - - + +
    idnombrecreacionmodificacionidnombre
    {{r.id}} {{r.nombre}}{{r['created_at']}}{{r['updated_at']}}
    +
    +

    nombre:

    -

    -

    -

    +

    +

    +

    diff --git a/frontend/src/app/components/agregar-res/agregar-res.component.ts b/frontend/src/app/components/agregar-res/agregar-res.component.ts index 1dc1a6f..f874f69 100644 --- a/frontend/src/app/components/agregar-res/agregar-res.component.ts +++ b/frontend/src/app/components/agregar-res/agregar-res.component.ts @@ -28,9 +28,9 @@ export class AgregarResComponent implements OnInit { this.restaurantServ.agregar(this.agre).subscribe(this.recuperartodos) } eliminarRes(id:any){ - console.log(id); - this.restaurantServ.eliminar(id).subscribe() - + if(confirm("Esta seguro de eliminar este registro?")) { + this.restaurantServ.eliminar(id).subscribe() + } } modificarRes(id:any){ console.log(id,this.agre) diff --git a/frontend/src/app/components/agregar-usuario/agregar-usuario.component.html b/frontend/src/app/components/agregar-usuario/agregar-usuario.component.html new file mode 100644 index 0000000..433a3d1 --- /dev/null +++ b/frontend/src/app/components/agregar-usuario/agregar-usuario.component.html @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + +
    idnombrecreacionmodificacionroles
    {{r.id}}{{r.nombre}}{{r['created_at']}}{{r['updated_at']}}{{r.roles}}
    +
    +

    + nombre: +

    +

    email:

    +

    nombre de usuario:

    +

    Contraseña:

    +

    roles:

    +

    restaurante:

    + +

    +

    +
    +
    +

    nombre:

    +

    roles:

    +

    +
    diff --git a/frontend/src/app/components/agregar-usuario/agregar-usuario.component.scss b/frontend/src/app/components/agregar-usuario/agregar-usuario.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/frontend/src/app/components/agregar-usuario/agregar-usuario.component.ts b/frontend/src/app/components/agregar-usuario/agregar-usuario.component.ts new file mode 100644 index 0000000..470abc4 --- /dev/null +++ b/frontend/src/app/components/agregar-usuario/agregar-usuario.component.ts @@ -0,0 +1,49 @@ +import { Component, OnInit } from '@angular/core'; +import {RestaurantesService} from "../../restaurantes.service"; + + +@Component({ + selector: 'app-agregar-usuario', + templateUrl: './agregar-usuario.component.html', + styleUrls: ['./agregar-usuario.component.scss'] +}) +export class AgregarUsuarioComponent implements OnInit { + + usuarios: any; + + agreU={ + nombre:null, + email:null, + username:null, + password:null, + roles:['admin'], + restaurant:null + } + modi={ + nombre: null, + roles:['productor'] + } + + constructor(private restaurantServ : RestaurantesService) { } + + ngOnInit(): void { + this.recuperarUsuarios(); + } + recuperarUsuarios(){ + this.restaurantServ.mostrarUsuarios().subscribe(result => this.usuarios = result) + } + AgregarUsu(){ + this.restaurantServ.agregarUsu(this.agreU).subscribe(this.recuperarUsuarios) + } + eliminarUsu(id:any){ + if(confirm("Esta seguro de eliminar este registro?")){ + this.restaurantServ.eliminarUsu(id).subscribe(); + + } + + } + modificarUsu(id:any){ + this.restaurantServ.moficiarUsu(id,this.modi).subscribe(); + } + +} diff --git a/frontend/src/app/components/public/public.component.html b/frontend/src/app/components/public/public.component.html index 2e9e6a7..8b9e47d 100644 --- a/frontend/src/app/components/public/public.component.html +++ b/frontend/src/app/components/public/public.component.html @@ -1 +1,22 @@ -

    public works!

    + + +
    + Random first slide +
    +
    +

    First slide label

    +

    Nulla vitae elit libero, a pharetra augue mollis interdum.

    +
    +     + +
    + Random first slide +
    +
    +

    First slide label

    +

    fdsfdsfsdfdsfsdds.

    +
    +     +     + + diff --git a/frontend/src/app/components/public/public.component.ts b/frontend/src/app/components/public/public.component.ts index 5c48d49..89ee2a0 100644 --- a/frontend/src/app/components/public/public.component.ts +++ b/frontend/src/app/components/public/public.component.ts @@ -1,5 +1,6 @@ import { Component, OnInit } from '@angular/core'; + @Component({ selector: 'app-public', templateUrl: './public.component.html', diff --git a/frontend/src/app/restaurantes.service.ts b/frontend/src/app/restaurantes.service.ts index ee5276e..0927ef1 100644 --- a/frontend/src/app/restaurantes.service.ts +++ b/frontend/src/app/restaurantes.service.ts @@ -9,12 +9,13 @@ export class RestaurantesService { url='https://api.unified.restaurant/api/v1'; + constructor(private http: HttpClient) { } mostrarTodosRes(){ return this.http.get(`${this.url}/restaurantes`); } - + //CRUD DE RESTAURANTE agregar(AgreRestaurant:any){ const headers: HttpHeaders = new HttpHeaders({ 'Content-Type': 'application/json' @@ -31,5 +32,26 @@ export class RestaurantesService { return this.http.put(`${this.url}/restaurantes/${codigo}`, JSON.stringify(ModificarRes),{ headers: headers }); } + //CRUD DE USUARIOS + mostrarUsuarios(){ + return this.http.get(`${this.url}/users`); + } + agregarUsu(AgregarUsuario:any){ + const headers: HttpHeaders = new HttpHeaders({ + 'Content-Type': 'application/json' + }); + return this.http.post(`${this.url}/users`, JSON.stringify(AgregarUsuario),{ headers: headers }); + } + eliminarUsu(codigo:any){ + return this.http.delete(`${this.url}/users/${codigo}`) + } + moficiarUsu(codigo:any,Usuariomodificado:any){ + const headers: HttpHeaders = new HttpHeaders({ + 'Content-Type': 'application/json' + }); + return this.http.put(`${this.url}/users/${codigo}`, JSON.stringify(Usuariomodificado), { headers: headers }); + } + + } diff --git a/frontend/src/index.html b/frontend/src/index.html index 944cabb..6dcbbb2 100644 --- a/frontend/src/index.html +++ b/frontend/src/index.html @@ -7,6 +7,7 @@ + diff --git a/frontend/src/polyfills.ts b/frontend/src/polyfills.ts index 373f538..83dc6f4 100644 --- a/frontend/src/polyfills.ts +++ b/frontend/src/polyfills.ts @@ -1,3 +1,7 @@ +/*************************************************************************************************** + * Load `$localize` onto the global scope - used if i18n tags appear in Angular templates. + */ +import '@angular/localize/init'; /** * This file includes polyfills needed by Angular and is loaded before the app. * You can add your own extra polyfills to this file. diff --git a/frontend/src/styles.scss b/frontend/src/styles.scss index 90d4ee0..4bb3091 100644 --- a/frontend/src/styles.scss +++ b/frontend/src/styles.scss @@ -1 +1,4 @@ /* You can add global styles to this file, and also import other style files */ + +/* Importing Bootstrap SCSS file. */ +@import '~bootstrap/scss/bootstrap'; From a1585c597b7db5c30d483383d34f17f6d5a9d2f3 Mon Sep 17 00:00:00 2001 From: matias mella Date: Tue, 27 Jul 2021 00:00:36 -0400 Subject: [PATCH 2/2] nuevas vistas --- frontend/package.json | 2 +- frontend/src/app/app-routing.module.ts | 4 + frontend/src/app/app.component.html | 63 +- frontend/src/app/app.module.ts | 10 +- .../agregar-res/agregar-res.component.html | 23 +- .../agregar-res/agregar-res.component.ts | 21 +- .../agregar-usuario.component.html | 33 +- .../agregar-usuario.component.scss | 4 + .../agregar-usuario.component.ts | 11 + .../mesas-restarant.component.html | 33 + .../mesas-restarant.component.scss | 1 + .../mesas-restarant.component.ts | 15 + .../modal-usuario.component.html | 67 + .../modal-usuario.component.scss | 0 .../modal-usuario/modal-usuario.component.ts | 54 + .../app/components/modal/modal.component.html | 69 + .../app/components/modal/modal.component.scss | 0 .../app/components/modal/modal.component.ts | 57 + .../components/private/private.component.html | 23 +- .../components/private/private.component.ts | 17 +- .../components/public/public.component.html | 41 +- .../components/public/public.component.scss | 13 + .../sectores/sectores.component.html | 52 + .../sectores/sectores.component.scss | 0 .../components/sectores/sectores.component.ts | 43 + frontend/src/app/restaurantes.service.ts | 32 +- frontend/src/index.html | 5 + frontend/src/styles.scss | 21685 ++++++++++++++++ 28 files changed, 22263 insertions(+), 115 deletions(-) create mode 100644 frontend/src/app/components/mesas-restarant/mesas-restarant.component.html create mode 100644 frontend/src/app/components/mesas-restarant/mesas-restarant.component.scss create mode 100644 frontend/src/app/components/mesas-restarant/mesas-restarant.component.ts create mode 100644 frontend/src/app/components/modal-usuario/modal-usuario.component.html create mode 100644 frontend/src/app/components/modal-usuario/modal-usuario.component.scss create mode 100644 frontend/src/app/components/modal-usuario/modal-usuario.component.ts create mode 100644 frontend/src/app/components/modal/modal.component.html create mode 100644 frontend/src/app/components/modal/modal.component.scss create mode 100644 frontend/src/app/components/modal/modal.component.ts create mode 100644 frontend/src/app/components/sectores/sectores.component.html create mode 100644 frontend/src/app/components/sectores/sectores.component.scss create mode 100644 frontend/src/app/components/sectores/sectores.component.ts diff --git a/frontend/package.json b/frontend/package.json index b3954cc..e4b6eba 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -21,7 +21,7 @@ "@angular/router": "~12.0.1", "@auth0/auth0-angular": "^1.5.1", "@ng-bootstrap/ng-bootstrap": "^10.0.0", - "bootstrap": "^4.5.0", + "bootstrap": "^4.6.0", "rxjs": "~6.6.0", "tslib": "^2.1.0", "zone.js": "~0.11.4" diff --git a/frontend/src/app/app-routing.module.ts b/frontend/src/app/app-routing.module.ts index 2e1cbf2..6138331 100644 --- a/frontend/src/app/app-routing.module.ts +++ b/frontend/src/app/app-routing.module.ts @@ -7,6 +7,8 @@ import {AuthGuard} from "./guards/auth.guard"; //import { AuthGuard } from '@auth0/auth0-angular'; import {AgregarResComponent} from "./components/agregar-res/agregar-res.component"; import {AgregarUsuarioComponent} from "./components/agregar-usuario/agregar-usuario.component"; +import {MesasRestarantComponent} from "./components/mesas-restarant/mesas-restarant.component"; +import {SectoresComponent} from "./components/sectores/sectores.component"; const routes: Routes = [ @@ -14,6 +16,8 @@ const routes: Routes = [ { path: 'private', component:PrivateComponent, canActivate: [AuthGuard]}, {path: 'agregar.res', component:AgregarResComponent, canActivate:[AuthGuard]}, {path: 'agregar.usu', component:AgregarUsuarioComponent, canActivate:[AuthGuard]}, + {path: 'mesaRers', component:MesasRestarantComponent, canActivate:[AuthGuard]}, + {path: 'sectoresRes', component:SectoresComponent, canActivate:[AuthGuard]}, {path: '**', pathMatch: 'full', redirectTo: 'public'} ]; diff --git a/frontend/src/app/app.component.html b/frontend/src/app/app.component.html index 3491052..cd522da 100644 --- a/frontend/src/app/app.component.html +++ b/frontend/src/app/app.component.html @@ -1,37 +1,38 @@ - + +
    +
    + +
    +
    + diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts index f9f5e80..685c8a8 100644 --- a/frontend/src/app/app.module.ts +++ b/frontend/src/app/app.module.ts @@ -10,6 +10,10 @@ import { PrivateComponent } from './components/private/private.component'; import { AgregarResComponent } from './components/agregar-res/agregar-res.component'; import { AgregarUsuarioComponent } from './components/agregar-usuario/agregar-usuario.component'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; +import { ModalComponent } from './components/modal/modal.component'; +import { ModalUsuarioComponent } from './components/modal-usuario/modal-usuario.component'; +import { MesasRestarantComponent } from './components/mesas-restarant/mesas-restarant.component'; +import { SectoresComponent } from './components/sectores/sectores.component'; @NgModule({ declarations: [ @@ -17,7 +21,11 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; PublicComponent, PrivateComponent, AgregarResComponent, - AgregarUsuarioComponent + AgregarUsuarioComponent, + ModalComponent, + ModalUsuarioComponent, + MesasRestarantComponent, + SectoresComponent ], imports: [ BrowserModule, diff --git a/frontend/src/app/components/agregar-res/agregar-res.component.html b/frontend/src/app/components/agregar-res/agregar-res.component.html index b6b5060..018bde3 100644 --- a/frontend/src/app/components/agregar-res/agregar-res.component.html +++ b/frontend/src/app/components/agregar-res/agregar-res.component.html @@ -1,19 +1,17 @@
    - + +
    - + - - + + - - - @@ -21,16 +19,7 @@
    - -

    - nombre: -

    -

    -

    -

    - -
    - + diff --git a/frontend/src/app/components/agregar-res/agregar-res.component.ts b/frontend/src/app/components/agregar-res/agregar-res.component.ts index f874f69..74e99a8 100644 --- a/frontend/src/app/components/agregar-res/agregar-res.component.ts +++ b/frontend/src/app/components/agregar-res/agregar-res.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import {Component, OnInit, Output,EventEmitter} from '@angular/core'; import {RestaurantesService} from "../../restaurantes.service"; @Component({ @@ -9,6 +9,10 @@ import {RestaurantesService} from "../../restaurantes.service"; export class AgregarResComponent implements OnInit { restaurante: any; + idSelect:any; + nombreSelect:any; + + agre={ nombre:null @@ -22,24 +26,31 @@ export class AgregarResComponent implements OnInit { } recuperartodos(){ + console.log(this.restaurante); this.restaurantServ.mostrarTodosRes().subscribe(result => this.restaurante = result); } agregarRes(){ - this.restaurantServ.agregar(this.agre).subscribe(this.recuperartodos) + this.restaurantServ.agregar(this.agre).subscribe((respuesta)=>{ + this.recuperartodos(); + }); } eliminarRes(id:any){ if(confirm("Esta seguro de eliminar este registro?")) { this.restaurantServ.eliminar(id).subscribe() } } - modificarRes(id:any){ - console.log(id,this.agre) - this.restaurantServ.modificar(id,this.agre).subscribe(); + modificarResModal(id:any,nombre:any){ + this.idSelect= id; + this.nombreSelect= nombre; + } + + + hayregistro(){ return true; } diff --git a/frontend/src/app/components/agregar-usuario/agregar-usuario.component.html b/frontend/src/app/components/agregar-usuario/agregar-usuario.component.html index 433a3d1..dcbed4c 100644 --- a/frontend/src/app/components/agregar-usuario/agregar-usuario.component.html +++ b/frontend/src/app/components/agregar-usuario/agregar-usuario.component.html @@ -1,35 +1,20 @@ -
    idnombreidnombre
    {{r.id}}
    {{r.id}} {{r.nombre}}
    - +
    + - + - + - - - +
    idnombrecreacionmodificacionrolesidnombreroles
    {{r.id}} {{r.nombre}}{{r['created_at']}}{{r['updated_at']}}{{r.roles}} {{f}}
    -
    -

    - nombre: -

    -

    email:

    -

    nombre de usuario:

    -

    Contraseña:

    -

    roles:

    -

    restaurante:

    + -

    -

    -
    -
    -

    nombre:

    -

    roles:

    -

    -
    + diff --git a/frontend/src/app/components/agregar-usuario/agregar-usuario.component.scss b/frontend/src/app/components/agregar-usuario/agregar-usuario.component.scss index e69de29..9abed18 100644 --- a/frontend/src/app/components/agregar-usuario/agregar-usuario.component.scss +++ b/frontend/src/app/components/agregar-usuario/agregar-usuario.component.scss @@ -0,0 +1,4 @@ +.spam_magin{ + margin-right: 2px; + margin-left: 2px; +} diff --git a/frontend/src/app/components/agregar-usuario/agregar-usuario.component.ts b/frontend/src/app/components/agregar-usuario/agregar-usuario.component.ts index 470abc4..d5b84f8 100644 --- a/frontend/src/app/components/agregar-usuario/agregar-usuario.component.ts +++ b/frontend/src/app/components/agregar-usuario/agregar-usuario.component.ts @@ -10,6 +10,9 @@ import {RestaurantesService} from "../../restaurantes.service"; export class AgregarUsuarioComponent implements OnInit { usuarios: any; + idSelect:any; + nombreSelect:any; + agreU={ nombre:null, @@ -44,6 +47,14 @@ export class AgregarUsuarioComponent implements OnInit { } modificarUsu(id:any){ this.restaurantServ.moficiarUsu(id,this.modi).subscribe(); + } + modificarModelUsuario(id:any,nombre:any){ + this.idSelect=id; + this.nombreSelect=nombre; + + + + } } diff --git a/frontend/src/app/components/mesas-restarant/mesas-restarant.component.html b/frontend/src/app/components/mesas-restarant/mesas-restarant.component.html new file mode 100644 index 0000000..efb338c --- /dev/null +++ b/frontend/src/app/components/mesas-restarant/mesas-restarant.component.html @@ -0,0 +1,33 @@ +
    +
    +
    Mesa 1
    + +
      +
    • Cras justo odio
      • +
    • Dapibus ac facilisis in
      • +
    • Morbi leo risus
      • +
    • Porta ac consectetur ac
      • +
    • Vestibulum at eros
      • +
    + + Go somewhere +
    +
    +
    + Card image cap +
    +
    Card title
    +

    Some quick example text to build on the card title and make up the bulk of the card's content.

    +
    +
      +
    • Cras justo odio
      • +
    • Dapibus ac facilisis in
      • +
    • Vestibulum at eros
      • +
    +
    + Card link + Another link +
    +
    + + diff --git a/frontend/src/app/components/mesas-restarant/mesas-restarant.component.scss b/frontend/src/app/components/mesas-restarant/mesas-restarant.component.scss new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/frontend/src/app/components/mesas-restarant/mesas-restarant.component.scss @@ -0,0 +1 @@ + diff --git a/frontend/src/app/components/mesas-restarant/mesas-restarant.component.ts b/frontend/src/app/components/mesas-restarant/mesas-restarant.component.ts new file mode 100644 index 0000000..9958a08 --- /dev/null +++ b/frontend/src/app/components/mesas-restarant/mesas-restarant.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-mesas-restarant', + templateUrl: './mesas-restarant.component.html', + styleUrls: ['./mesas-restarant.component.scss'] +}) +export class MesasRestarantComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/frontend/src/app/components/modal-usuario/modal-usuario.component.html b/frontend/src/app/components/modal-usuario/modal-usuario.component.html new file mode 100644 index 0000000..5ecfb3b --- /dev/null +++ b/frontend/src/app/components/modal-usuario/modal-usuario.component.html @@ -0,0 +1,67 @@ + + + diff --git a/frontend/src/app/components/modal-usuario/modal-usuario.component.scss b/frontend/src/app/components/modal-usuario/modal-usuario.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/frontend/src/app/components/modal-usuario/modal-usuario.component.ts b/frontend/src/app/components/modal-usuario/modal-usuario.component.ts new file mode 100644 index 0000000..f8ec753 --- /dev/null +++ b/frontend/src/app/components/modal-usuario/modal-usuario.component.ts @@ -0,0 +1,54 @@ +import { Component, OnInit,Input } from '@angular/core'; +import {RestaurantesService} from "../../restaurantes.service"; + +@Component({ + selector: 'app-modal-usuario', + templateUrl: './modal-usuario.component.html', + styleUrls: ['./modal-usuario.component.scss'] +}) +export class ModalUsuarioComponent implements OnInit { + + usuarios: any; + + @Input()idModalUsu:any; + @Input()NombreModalusu:any; + + + agreU={ + nombre:null, + email:null, + username:null, + password:null, + roles:['admines'], + restaurant:null + } + modi={ + nombre: null, + roles:['productor'] + } + + constructor(private restaurantServ : RestaurantesService) { } + + ngOnInit(): void { + this.recuperarUsuarios(); + } + + recuperarUsuarios(){ + this.restaurantServ.mostrarUsuarios().subscribe(result => this.usuarios = result) + } + AgregarUsu(){ + this.restaurantServ.agregarUsu(this.agreU).subscribe(this.recuperarUsuarios) + } + eliminarUsu(id:any){ + if(confirm("Esta seguro de eliminar este registro?")){ + this.restaurantServ.eliminarUsu(id).subscribe(); + + } + + } + modificarUsu(id:any){ + this.restaurantServ.moficiarUsu(id,this.modi).subscribe(); + } + + +} diff --git a/frontend/src/app/components/modal/modal.component.html b/frontend/src/app/components/modal/modal.component.html new file mode 100644 index 0000000..b9b3974 --- /dev/null +++ b/frontend/src/app/components/modal/modal.component.html @@ -0,0 +1,69 @@ + + + + + + + + + + diff --git a/frontend/src/app/components/modal/modal.component.scss b/frontend/src/app/components/modal/modal.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/frontend/src/app/components/modal/modal.component.ts b/frontend/src/app/components/modal/modal.component.ts new file mode 100644 index 0000000..c33c2c4 --- /dev/null +++ b/frontend/src/app/components/modal/modal.component.ts @@ -0,0 +1,57 @@ +import {Component, Input, OnInit} from '@angular/core'; +import {RestaurantesService} from "../../restaurantes.service"; + +@Component({ + selector: 'app-modal', + templateUrl: './modal.component.html', + styleUrls: ['./modal.component.scss'] +}) +export class ModalComponent implements OnInit { + + @Input()idModalRes:any; + @Input()nombreSelect:any; + id:any; + restaurante:any; + + + + agre={ + nombre:null + + } + + + + constructor(private restaurantServ : RestaurantesService) { + this.id = this.idModalRes; + } + + ngOnInit(): void { + console.log(this.id); + this.recuperartodos(); + } + +recuperartodos(){ + console.log(this.restaurante); + this.restaurantServ.mostrarTodosRes().subscribe(result => this.restaurante = result); +} + + agregarRes(){ + + this.restaurantServ.agregar(this.agre).subscribe((respuesta)=>{ + this.recuperartodos(); + }); + } + modificarRes(id:any){ + console.log(id,this.agre) + + this.restaurantServ.modificar(id,this.agre).subscribe(); + } + eliminarRes(id:any){ + if(confirm("Esta seguro de eliminar este registro?")) { + this.restaurantServ.eliminar(id).subscribe() + } + } + + +} diff --git a/frontend/src/app/components/private/private.component.html b/frontend/src/app/components/private/private.component.html index a7b776c..92c5834 100644 --- a/frontend/src/app/components/private/private.component.html +++ b/frontend/src/app/components/private/private.component.html @@ -1,5 +1,18 @@ -
    -  
-    {{dato | json}}
-  
-
    +
    +{{user | json}}
+
    + + + + + + + + + + + + + + +
    idnombreroles
    {{r.id}}{{r.nombre}} {{f}}
    diff --git a/frontend/src/app/components/private/private.component.ts b/frontend/src/app/components/private/private.component.ts index e6c07e7..2661279 100644 --- a/frontend/src/app/components/private/private.component.ts +++ b/frontend/src/app/components/private/private.component.ts @@ -3,6 +3,7 @@ import {AuthService} from "@auth0/auth0-angular"; import { concatMap, tap, pluck } from 'rxjs/operators'; import { HttpClient } from '@angular/common/http'; +import {RestaurantesService} from "../../restaurantes.service"; @Component({ selector: 'app-private', @@ -11,21 +12,15 @@ import { HttpClient } from '@angular/common/http'; }) export class PrivateComponent implements OnInit { dato = {}; + usuarios: any; + algo:any; - constructor(public auth: AuthService, private http: HttpClient) { } + constructor(public auth: AuthService, private http: HttpClient, private restaurantServ : RestaurantesService) { } ngOnInit(): void { - this.auth.user$ - .pipe( - tap((user)=>console.log(user)), - concatMap((user)=> - this.http.get(`https://api.unified.restaurant/api/v1/users/${user?.sub}`) - ), - tap((userdato) =>(this.dato = userdato)) - ).subscribe(); - console.log(); - } + + } diff --git a/frontend/src/app/components/public/public.component.html b/frontend/src/app/components/public/public.component.html index 8b9e47d..e463b24 100644 --- a/frontend/src/app/components/public/public.component.html +++ b/frontend/src/app/components/public/public.component.html @@ -1,22 +1,27 @@ - - -
    - Random first slide +