diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e10e727 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/.metadata/ diff --git a/Angular-UrbanBazaar/angular.json b/Angular-UrbanBazaar/angular.json index 063ac34..9a07b0e 100644 --- a/Angular-UrbanBazaar/angular.json +++ b/Angular-UrbanBazaar/angular.json @@ -70,9 +70,13 @@ "configurations": { "production": { "browserTarget": "Angular-UrbanBazaar:build:production" + , "proxyConfig": "proxy.config.json" + }, "development": { "browserTarget": "Angular-UrbanBazaar:build:development" + , "proxyConfig": "proxy.config.json" + } }, "defaultConfiguration": "development" diff --git a/Angular-UrbanBazaar/debug.log b/Angular-UrbanBazaar/debug.log new file mode 100644 index 0000000..6c0f224 --- /dev/null +++ b/Angular-UrbanBazaar/debug.log @@ -0,0 +1,2 @@ +[0919/155655.703:ERROR:registration_protocol_win.cc(102)] CreateFile: The system cannot find the file specified. (0x2) +[0919/155714.431:ERROR:registration_protocol_win.cc(102)] CreateFile: The system cannot find the file specified. (0x2) diff --git a/Angular-UrbanBazaar/package-lock.json b/Angular-UrbanBazaar/package-lock.json index 521b158..e1d4425 100644 --- a/Angular-UrbanBazaar/package-lock.json +++ b/Angular-UrbanBazaar/package-lock.json @@ -149,14 +149,42 @@ } }, "@angular-devkit/schematics": { - "version": "12.1.4", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.1.4.tgz", - "integrity": "sha512-yD3y3pK/K5piOgvALFoCCiPp4H8emNa3yZL+vlpEpewVLpF1MM55LeTxc0PI5s0uqtOGVnvcbA5wYgMm3YsUEA==", + "version": "12.2.6", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.2.6.tgz", + "integrity": "sha512-CmDNOdJg08p5QrV8dNdg3O5ErYM1hJT06PLnVZzTWkShAL0y/3zxXAP/Wwdg0vAvt9Kh38jvMtC3YTCOThR/hA==", "dev": true, "requires": { - "@angular-devkit/core": "12.1.4", + "@angular-devkit/core": "12.2.6", "ora": "5.4.1", "rxjs": "6.6.7" + }, + "dependencies": { + "@angular-devkit/core": { + "version": "12.2.6", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-12.2.6.tgz", + "integrity": "sha512-E+OhY34Vmwyy1/PaX/nzao40XM70wOr7Urh00sAtV8sPLXMLeW0gHk4DUchCKohxQkrIL0AxYt1aeUVgIc7bSA==", + "dev": true, + "requires": { + "ajv": "8.6.2", + "ajv-formats": "2.1.0", + "fast-json-stable-stringify": "2.1.0", + "magic-string": "0.25.7", + "rxjs": "6.6.7", + "source-map": "0.7.3" + } + }, + "ajv": { + "version": "8.6.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.2.tgz", + "integrity": "sha512-9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + } + } } }, "@angular/animations": { @@ -185,41 +213,156 @@ } }, "@angular/cli": { - "version": "12.1.4", - "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-12.1.4.tgz", - "integrity": "sha512-LpyhyqWe3bFcuH3MrXeYoIPI1htjwG1b5ehETfq4qsMvNmuFON6QI+F7EWEpX7lItVQc2bES+ogasTZsZue/uw==", + "version": "12.2.6", + "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-12.2.6.tgz", + "integrity": "sha512-nBCynOi5OVVAXA4ktsVhWP+UyWjjR/7+TlEjNgEfcbtlwkE+HIki+oHETAtXKdn5nPvNum3OXPLZPLX2B8MiRA==", "dev": true, "requires": { - "@angular-devkit/architect": "0.1201.4", - "@angular-devkit/core": "12.1.4", - "@angular-devkit/schematics": "12.1.4", - "@schematics/angular": "12.1.4", + "@angular-devkit/architect": "0.1202.6", + "@angular-devkit/core": "12.2.6", + "@angular-devkit/schematics": "12.2.6", + "@schematics/angular": "12.2.6", "@yarnpkg/lockfile": "1.1.0", "ansi-colors": "4.1.1", - "debug": "4.3.1", + "debug": "4.3.2", "ini": "2.0.0", - "inquirer": "8.1.1", + "inquirer": "8.1.2", "jsonc-parser": "3.0.0", "npm-package-arg": "8.1.5", "npm-pick-manifest": "6.1.1", "open": "8.2.1", "ora": "5.4.1", - "pacote": "11.3.4", + "pacote": "11.3.5", "resolve": "1.20.0", "semver": "7.3.5", "symbol-observable": "4.0.0", "uuid": "8.3.2" }, "dependencies": { - "debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "@angular-devkit/architect": { + "version": "0.1202.6", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1202.6.tgz", + "integrity": "sha512-DQHK5VGfPof1TuSmRmt2Usw2BuNVLzxKSSy7+tEJbYzqf8N/wQO+1M67ye8qf8gAU88xGo378dD9++DFc/PJZA==", + "dev": true, + "requires": { + "@angular-devkit/core": "12.2.6", + "rxjs": "6.6.7" + } + }, + "@angular-devkit/core": { + "version": "12.2.6", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-12.2.6.tgz", + "integrity": "sha512-E+OhY34Vmwyy1/PaX/nzao40XM70wOr7Urh00sAtV8sPLXMLeW0gHk4DUchCKohxQkrIL0AxYt1aeUVgIc7bSA==", + "dev": true, + "requires": { + "ajv": "8.6.2", + "ajv-formats": "2.1.0", + "fast-json-stable-stringify": "2.1.0", + "magic-string": "0.25.7", + "rxjs": "6.6.7", + "source-map": "0.7.3" + } + }, + "ajv": { + "version": "8.6.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.2.tgz", + "integrity": "sha512-9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + } + }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "requires": { - "ms": "2.1.2" + "color-convert": "^2.0.1" } }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.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==", + "dev": true, + "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==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "inquirer": { + "version": "8.1.2", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.1.2.tgz", + "integrity": "sha512-DHLKJwLPNgkfwNmsuEUKSejJFbkv0FMO9SMiQbjI3n5NQuCrSIBqP66ggqyz2a6t2qEolKrMjhQ3+W/xXgUQ+Q==", + "dev": true, + "requires": { + "ansi-escapes": "^4.2.1", + "chalk": "^4.1.1", + "cli-cursor": "^3.1.0", + "cli-width": "^3.0.0", + "external-editor": "^3.0.3", + "figures": "^3.0.0", + "lodash": "^4.17.21", + "mute-stream": "0.0.8", + "ora": "^5.3.0", + "run-async": "^2.4.0", + "rxjs": "^7.2.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0", + "through": "^2.3.6" + }, + "dependencies": { + "rxjs": { + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.3.0.tgz", + "integrity": "sha512-p2yuGIg9S1epc3vrjKf6iVb3RCaAYjYskkO+jHIaV0IjOPlJop4UnodOoFb2xeNwlguqLYvGw1b1McillYb5Gw==", + "dev": true, + "requires": { + "tslib": "~2.1.0" + } + } + } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "tslib": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", + "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==", + "dev": true + }, "uuid": { "version": "8.3.2", "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", @@ -371,6 +514,21 @@ "tslib": "^2.2.0" } }, + "@angular/http": { + "version": "7.2.16", + "resolved": "https://registry.npmjs.org/@angular/http/-/http-7.2.16.tgz", + "integrity": "sha512-yvjbNyzFSmmz4UTjCdy5M8mk0cZqf9TvSf8yN5UVIwtw4joyuUdlgJCuin0qSbQOKIf/JjHoofpO2JkPCGSNww==", + "requires": { + "tslib": "^1.9.0" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + } + } + }, "@angular/material": { "version": "12.2.6", "resolved": "https://registry.npmjs.org/@angular/material/-/material-12.2.6.tgz", @@ -1784,14 +1942,42 @@ } }, "@schematics/angular": { - "version": "12.1.4", - "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-12.1.4.tgz", - "integrity": "sha512-xGqgGI6GWk4EFdKis8FmSESxoLgjnLQbaRE1t1KZCkSKJzqkOj0R9wiDrtZfcrbPxIkLL+3fAk2ThwwPznT6yw==", + "version": "12.2.6", + "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-12.2.6.tgz", + "integrity": "sha512-53yVIB43jPpqitJXT5IxPm9Kq1P8AyRgzrCIKAl4mESsPsOIFR6ZCpuNRlaumEinHnbMpgzZ2M+RlialzAOS6w==", "dev": true, "requires": { - "@angular-devkit/core": "12.1.4", - "@angular-devkit/schematics": "12.1.4", + "@angular-devkit/core": "12.2.6", + "@angular-devkit/schematics": "12.2.6", "jsonc-parser": "3.0.0" + }, + "dependencies": { + "@angular-devkit/core": { + "version": "12.2.6", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-12.2.6.tgz", + "integrity": "sha512-E+OhY34Vmwyy1/PaX/nzao40XM70wOr7Urh00sAtV8sPLXMLeW0gHk4DUchCKohxQkrIL0AxYt1aeUVgIc7bSA==", + "dev": true, + "requires": { + "ajv": "8.6.2", + "ajv-formats": "2.1.0", + "fast-json-stable-stringify": "2.1.0", + "magic-string": "0.25.7", + "rxjs": "6.6.7", + "source-map": "0.7.3" + } + }, + "ajv": { + "version": "8.6.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.2.tgz", + "integrity": "sha512-9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + } + } } }, "@tootallnate/once": { @@ -2633,6 +2819,11 @@ "readable-stream": "^3.4.0" } }, + "bluebird": { + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", + "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" + }, "body-parser": { "version": "1.19.0", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", @@ -3104,6 +3295,25 @@ "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", "dev": true }, + "compat": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/compat/-/compat-1.0.4.tgz", + "integrity": "sha1-bEmRBiKzRhKJH1rY7UYqc7H4hlM=", + "requires": { + "bluebird": "^3.2.2", + "lodash": "^4.2.1", + "read-dir-files": "0.0.x", + "rimraf": "1.0.x", + "shell-quote": "^1.4.3" + }, + "dependencies": { + "rimraf": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-1.0.9.tgz", + "integrity": "sha1-vkgB/3bCum8cUMeOlwDrHSHyOfE=" + } + } + }, "component-emitter": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", @@ -6519,8 +6729,7 @@ "lodash": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, "lodash.debounce": { "version": "4.0.8", @@ -7602,12 +7811,12 @@ "dev": true }, "pacote": { - "version": "11.3.4", - "resolved": "https://registry.npmjs.org/pacote/-/pacote-11.3.4.tgz", - "integrity": "sha512-RfahPCunM9GI7ryJV/zY0bWQiokZyLqaSNHXtbNSoLb7bwTvBbJBEyCJ01KWs4j1Gj7GmX8crYXQ1sNX6P2VKA==", + "version": "11.3.5", + "resolved": "https://registry.npmjs.org/pacote/-/pacote-11.3.5.tgz", + "integrity": "sha512-fT375Yczn4zi+6Hkk2TBe1x1sP8FgFsEIZ2/iWaXY2r/NkhDJfxbcn5paz1+RTFCyNf+dPnaoBDJoAxXSU8Bkg==", "dev": true, "requires": { - "@npmcli/git": "^2.0.1", + "@npmcli/git": "^2.1.0", "@npmcli/installed-package-contents": "^1.0.6", "@npmcli/promise-spawn": "^1.2.0", "@npmcli/run-script": "^1.8.2", @@ -9586,6 +9795,21 @@ } } }, + "read-dir-files": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/read-dir-files/-/read-dir-files-0.0.2.tgz", + "integrity": "sha1-bh4uFE+10OZcZGi6/rSJBP+44wQ=", + "requires": { + "async": "0.1.x" + }, + "dependencies": { + "async": { + "version": "0.1.22", + "resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz", + "integrity": "sha1-D8GqoIig4+8Ovi2IMbqw3PiEUGE=" + } + } + }, "read-package-json-fast": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz", @@ -9946,6 +10170,11 @@ } } }, + "rxjs-compat": { + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs-compat/-/rxjs-compat-6.6.7.tgz", + "integrity": "sha512-szN4fK+TqBPOFBcBcsR0g2cmTTUF/vaFEOZNuSdfU8/pGFnNmmn2u8SystYXG1QMrjOPBc6XTKHMVfENDf6hHw==" + }, "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", @@ -10229,6 +10458,11 @@ "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", "dev": true }, + "shell-quote": { + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz", + "integrity": "sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==" + }, "signal-exit": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", @@ -10469,9 +10703,9 @@ } }, "socks-proxy-agent": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.0.0.tgz", - "integrity": "sha512-FIgZbQWlnjVEQvMkylz64/rUggGtrKstPnx8OZyYFG0tAFR8CSBtpXxSwbFLHyeXFn/cunFL7MpuSOvDSOPo9g==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.1.0.tgz", + "integrity": "sha512-57e7lwCN4Tzt3mXz25VxOErJKXlPfXmkMLnk310v/jwW20jWRVcgsOit+xNkN3eIEdB47GwnfAEBLacZ/wVIKg==", "dev": true, "requires": { "agent-base": "^6.0.2", diff --git a/Angular-UrbanBazaar/package.json b/Angular-UrbanBazaar/package.json index b2facac..71d4c3e 100644 --- a/Angular-UrbanBazaar/package.json +++ b/Angular-UrbanBazaar/package.json @@ -17,17 +17,20 @@ "@angular/core": "~12.1.1", "@angular/flex-layout": "^12.0.0-beta.35", "@angular/forms": "~12.1.1", + "@angular/http": "^7.2.16", "@angular/material": "^12.2.6", "@angular/platform-browser": "~12.1.1", "@angular/platform-browser-dynamic": "~12.1.1", "@angular/router": "~12.1.1", - "rxjs": "~6.6.0", + "compat": "^1.0.4", + "rxjs": "^6.6.7", + "rxjs-compat": "^6.6.7", "tslib": "^2.2.0", "zone.js": "~0.11.4" }, "devDependencies": { "@angular-devkit/build-angular": "~12.1.1", - "@angular/cli": "~12.1.1", + "@angular/cli": "^12.2.6", "@angular/compiler-cli": "~12.1.1", "@types/jasmine": "~3.6.0", "@types/node": "^12.11.1", diff --git a/Angular-UrbanBazaar/proxy.config.json b/Angular-UrbanBazaar/proxy.config.json new file mode 100644 index 0000000..deccd64 --- /dev/null +++ b/Angular-UrbanBazaar/proxy.config.json @@ -0,0 +1,19 @@ +{ + "/products":{ + "target":"http://10.3.117.7:8007", + "secure":false + }, + "/user":{ + "target":"http://10.3.117.7:8008", + "secure":false + }, + "/orders":{ + "target":"http://10.3.117.7:8009", + "secure":false + }, + "/cart":{ + "target":"http://10.3.117.7:8010", + "secure":false + } + +} \ No newline at end of file diff --git a/Angular-UrbanBazaar/src/app/app.module.ts b/Angular-UrbanBazaar/src/app/app.module.ts index 69c5843..8b54043 100644 --- a/Angular-UrbanBazaar/src/app/app.module.ts +++ b/Angular-UrbanBazaar/src/app/app.module.ts @@ -6,7 +6,6 @@ import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { HttpClientModule } from '@angular/common/http'; import { UserShowComponent } from './components/user-show/user-show.component'; -import { UserAddComponent } from './components/user-add/user-add.component'; import { UserProfileDetailsComponent } from './components/user-profile-details/user-profile-details.component'; import { PageNavBarComponent } from './components/page-nav-bar/page-nav-bar.component'; import { HomeComponent } from './components/home/home.component'; @@ -19,18 +18,38 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { FlexLayoutModule } from '@angular/flex-layout'; import { LoginComponent } from './auth/login/login.component'; import { SignUpComponent } from './auth/sign-up/sign-up.component'; +import { RouterModule, Routes } from '@angular/router'; +import { HttpModule } from '@angular/http'; +import { MemberlistComponent } from './components/memberlist/memberlist.component'; +const appRoutes : Routes = +[ + {path:'',component:LoginComponent}, + {path:'login',component:LoginComponent}, + {path:'signup',component:SignUpComponent}, + {path:'user-profile-details',component:UserProfileDetailsComponent}, + {path:'memberlist',component:MemberlistComponent}, + {path:'home',component:HomeComponent, +children: [ + {path:'user-profile-details',component:UserProfileDetailsComponent,outlet:'user'}, + {path:'memberlist',component:MemberlistComponent,outlet:'member'} + +] +} + + + ] @NgModule({ declarations: [ AppComponent, UserShowComponent, - UserAddComponent, UserProfileDetailsComponent, PageNavBarComponent, HomeComponent, CartComponent, LoginComponent, SignUpComponent, + MemberlistComponent, ], imports: [ BrowserModule, @@ -43,7 +62,10 @@ import { SignUpComponent } from './auth/sign-up/sign-up.component'; MatInputModule, MatCardModule, MatButtonModule, - BrowserAnimationsModule + BrowserAnimationsModule,AppRoutingModule, + RouterModule.forRoot(appRoutes,{ useHash: true }), + FormsModule, + HttpModule, ], providers: [], bootstrap: [AppComponent] diff --git a/Angular-UrbanBazaar/src/app/auth/login/login.component.html b/Angular-UrbanBazaar/src/app/auth/login/login.component.html index 427c145..37bef85 100644 --- a/Angular-UrbanBazaar/src/app/auth/login/login.component.html +++ b/Angular-UrbanBazaar/src/app/auth/login/login.component.html @@ -1,11 +1,12 @@ - - -

-

Urban Bazaar

- -
- +
+ + + + + + + + \ No newline at end of file diff --git a/Angular-UrbanBazaar/src/app/components/home/home.component.ts b/Angular-UrbanBazaar/src/app/components/home/home.component.ts index daaa1cc..d7a030e 100644 --- a/Angular-UrbanBazaar/src/app/components/home/home.component.ts +++ b/Angular-UrbanBazaar/src/app/components/home/home.component.ts @@ -41,7 +41,12 @@ export class HomeComponent implements OnInit { this.Searchedproducts = this.products.filter(p => p.productname.toLocaleLowerCase().includes(this.searchValue)); } } - + EditProfile(){ + this.router.navigateByUrl('/user-profile-details') + } + Members(){ + this.router.navigateByUrl('/memberlist') + } ngOnInit(): void { this.productservice.showAllProduct().subscribe(res=>{ this.products = res; diff --git a/Angular-UrbanBazaar/src/app/components/user-add/user-add.component.css b/Angular-UrbanBazaar/src/app/components/memberlist/memberlist.component.css similarity index 100% rename from Angular-UrbanBazaar/src/app/components/user-add/user-add.component.css rename to Angular-UrbanBazaar/src/app/components/memberlist/memberlist.component.css diff --git a/Angular-UrbanBazaar/src/app/components/memberlist/memberlist.component.html b/Angular-UrbanBazaar/src/app/components/memberlist/memberlist.component.html new file mode 100644 index 0000000..dd7e464 --- /dev/null +++ b/Angular-UrbanBazaar/src/app/components/memberlist/memberlist.component.html @@ -0,0 +1,82 @@ + + + + + +
+ UserId: + +
+
+ Member Name:   + +

+
+
Please Enter Membername...
+
+
+ Member Door Number :   + +

+
+
Please Enter MemberDoorNumber...
+
+
+ Member Phone Number:   + +

+
+
Please Enter Mobile number...
+
+
+ + + + +                     +
+                                                                                                              Members Information +
+ +
+
+ + Member Name:   + +

+ Mobile Number:   + +

+ + +

+ +
+
+ + + \ No newline at end of file diff --git a/Angular-UrbanBazaar/src/app/components/user-add/user-add.component.spec.ts b/Angular-UrbanBazaar/src/app/components/memberlist/memberlist.component.spec.ts similarity index 54% rename from Angular-UrbanBazaar/src/app/components/user-add/user-add.component.spec.ts rename to Angular-UrbanBazaar/src/app/components/memberlist/memberlist.component.spec.ts index 74a02a1..eb0cfb7 100644 --- a/Angular-UrbanBazaar/src/app/components/user-add/user-add.component.spec.ts +++ b/Angular-UrbanBazaar/src/app/components/memberlist/memberlist.component.spec.ts @@ -1,20 +1,20 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { UserAddComponent } from './user-add.component'; +import { MemberlistComponent } from './memberlist.component'; -describe('UserAddComponent', () => { - let component: UserAddComponent; - let fixture: ComponentFixture; +describe('MemberlistComponent', () => { + let component: MemberlistComponent; + let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ UserAddComponent ] + declarations: [ MemberlistComponent ] }) .compileComponents(); }); beforeEach(() => { - fixture = TestBed.createComponent(UserAddComponent); + fixture = TestBed.createComponent(MemberlistComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/Angular-UrbanBazaar/src/app/components/memberlist/memberlist.component.ts b/Angular-UrbanBazaar/src/app/components/memberlist/memberlist.component.ts new file mode 100644 index 0000000..4915fb4 --- /dev/null +++ b/Angular-UrbanBazaar/src/app/components/memberlist/memberlist.component.ts @@ -0,0 +1,89 @@ +import { Component, OnInit } from '@angular/core'; +import { NgForm } from '@angular/forms'; +import { Observable } from 'rxjs'; +import { MemberUser } from 'src/app/models/member-user'; +import { MemberUserService } from 'src/app/services/member-user.service'; +import { UserService } from 'src/app/services/user.service'; + +@Component({ + selector: 'app-memberlist', + templateUrl: './memberlist.component.html', + styleUrls: ['./memberlist.component.css'] +}) +export class MemberlistComponent implements OnInit { + + currentUser : Observable; + member : MemberUser; + userid :number =this._userservice.currentUser.userid + public toggleButton: boolean ; + mem :MemberUser + isFormSubmitted : boolean; + public add(addmemForm : NgForm) { + this.mem.userid=this._userservice.currentUser.userid + if (addmemForm.invalid) { + alert("Kindly enter all details") + return; + } + this.isFormSubmitted=true; + + this._memberService.addMemberUser(this.mem).subscribe(x => { alert("Member added Successfuly") + + }) + + // .subscribe(x => {alert("Sign up Successfull")}); + + + } + + public delete(updateForm : NgForm,v: MemberUser) { + + this._memberService.deleteMemberUser(v.memberid).subscribe(x => { alert("Member deleted Successfuly") + + }) + } + + constructor(private _memberService : MemberUserService,private _userservice:UserService) { + this.member=new MemberUser() + this.mem=new MemberUser(); + this.isFormSubmitted=false; + + this.toggleButton=true + this.currentUser = this._memberService.searchMembersbyUser(this._userservice.currentUser.userid); + this.currentUser.subscribe(); + } + + + update(updateForm : NgForm ,v:MemberUser) { + + if (updateForm.invalid) { + return; + } + // console.log(v) + this._memberService.updateMemberUser(v).subscribe(x=>{ + alert("Member Id: "+v.memberid+" with MemberName "+v.membername+" is updated") }) + // alert("Record Updated")}) + + } + // addMember(updateForm : NgForm ,v:MemberUser) { + + // if (updateForm.invalid) { + // return; + // } + // // console.log(v) + // this._memberService.addMemberUser(v).subscribe(x=>{ + // alert("Member Id: "+v.memberid+" with MemberName "+v.membername+" is updated") }) + // // alert("Record Updated")}) + + // } + + enable(){ + this.toggleButton = false + } + + disable(){ + this.toggleButton = true + } + ngOnInit(): void { + } + +} diff --git a/Angular-UrbanBazaar/src/app/components/page-nav-bar/page-nav-bar.component.html b/Angular-UrbanBazaar/src/app/components/page-nav-bar/page-nav-bar.component.html index 1fd04d8..d253576 100644 --- a/Angular-UrbanBazaar/src/app/components/page-nav-bar/page-nav-bar.component.html +++ b/Angular-UrbanBazaar/src/app/components/page-nav-bar/page-nav-bar.component.html @@ -8,9 +8,11 @@