Browse Source

Reverting back to fb2720ddac

master^2
Gowrisankar J g 4 years ago
parent
commit
62466d63e2
40 changed files with 209 additions and 817 deletions
  1. 10
      Angular-UrbanBazaar/angular.json
  2. 300
      Angular-UrbanBazaar/package-lock.json
  3. 9
      Angular-UrbanBazaar/package.json
  4. 9
      Angular-UrbanBazaar/proxy.config.json
  5. 28
      Angular-UrbanBazaar/src/app/app.module.ts
  6. 32
      Angular-UrbanBazaar/src/app/auth/login/login.component.html
  7. 21
      Angular-UrbanBazaar/src/app/auth/login/login.component.ts
  8. 84
      Angular-UrbanBazaar/src/app/auth/sign-up/sign-up.component.html
  9. 28
      Angular-UrbanBazaar/src/app/auth/sign-up/sign-up.component.ts
  10. 27
      Angular-UrbanBazaar/src/app/components/cart/cart.component.ts
  11. 29
      Angular-UrbanBazaar/src/app/components/home/home.component.html
  12. 9
      Angular-UrbanBazaar/src/app/components/home/home.component.ts
  13. 6
      Angular-UrbanBazaar/src/app/components/page-nav-bar/page-nav-bar.component.html
  14. 3
      Angular-UrbanBazaar/src/app/components/page-nav-bar/page-nav-bar.component.ts
  15. 0
      Angular-UrbanBazaar/src/app/components/user-add/user-add.component.css
  16. 1
      Angular-UrbanBazaar/src/app/components/user-add/user-add.component.html
  17. 25
      Angular-UrbanBazaar/src/app/components/user-add/user-add.component.spec.ts
  18. 15
      Angular-UrbanBazaar/src/app/components/user-add/user-add.component.ts
  19. 63
      Angular-UrbanBazaar/src/app/components/user-profile-details/user-profile-details.component.html
  20. 44
      Angular-UrbanBazaar/src/app/components/user-profile-details/user-profile-details.component.ts
  21. 2
      Angular-UrbanBazaar/src/app/models/member-user.ts
  22. 57
      Angular-UrbanBazaar/src/app/services/member-user.service.ts
  23. 2
      Angular-UrbanBazaar/src/app/services/orders.service.ts
  24. 2
      Angular-UrbanBazaar/src/app/services/product-category.service.ts
  25. 2
      Angular-UrbanBazaar/src/app/services/product.service.ts
  26. 84
      Angular-UrbanBazaar/src/app/services/user.service.ts
  27. 5
      UB_CartServiceProxy/src/main/java/com/example/urbanbazaar/controller/CartController.java
  28. 4
      UB_CartServiceProxy/src/main/resources/application.properties
  29. 4
      UB_OrderServiceProxy/src/main/resources/application.properties
  30. 2
      UB_ProductServiceProxy/src/main/java/com/example/urbanbazaar/controller/ProductCategoryController.java
  31. 2
      UB_ProductServiceProxy/src/main/java/com/example/urbanbazaar/controller/ProductController.java
  32. 4
      UB_ProductServiceProxy/src/main/resources/application.properties
  33. 23
      UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/controller/MemberUserController.java
  34. 39
      UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/controller/UserController.java
  35. 21
      UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/model/MemberUser.java
  36. 3
      UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/model/User.java
  37. 5
      UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/repository/MemberUserRepository.java
  38. 2
      UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/repository/UserRepository.java
  39. 4
      UB_UserServiceProxy/src/main/resources/application.properties
  40. 16
      grocery_db_tables.sql

10
Angular-UrbanBazaar/angular.json

@ -69,14 +69,12 @@
"builder": "@angular-devkit/build-angular:dev-server",
"configurations": {
"production": {
"browserTarget": "Angular-UrbanBazaar:build:production"
, "proxyConfig": "proxy.config.json"
"browserTarget": "Angular-UrbanBazaar:build:production",
"proxyConfig": "proxy.config.json"
},
"development": {
"browserTarget": "Angular-UrbanBazaar:build:development"
, "proxyConfig": "proxy.config.json"
"browserTarget": "Angular-UrbanBazaar:build:development",
"proxyConfig": "proxy.config.json"
}
},
"defaultConfiguration": "development"

300
Angular-UrbanBazaar/package-lock.json

@ -149,42 +149,14 @@
}
},
"@angular-devkit/schematics": {
"version": "12.2.6",
"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.2.6.tgz",
"integrity": "sha512-CmDNOdJg08p5QrV8dNdg3O5ErYM1hJT06PLnVZzTWkShAL0y/3zxXAP/Wwdg0vAvt9Kh38jvMtC3YTCOThR/hA==",
"version": "12.1.4",
"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.1.4.tgz",
"integrity": "sha512-yD3y3pK/K5piOgvALFoCCiPp4H8emNa3yZL+vlpEpewVLpF1MM55LeTxc0PI5s0uqtOGVnvcbA5wYgMm3YsUEA==",
"dev": true,
"requires": {
"@angular-devkit/core": "12.2.6",
"@angular-devkit/core": "12.1.4",
"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": {
@ -213,156 +185,41 @@
}
},
"@angular/cli": {
"version": "12.2.6",
"resolved": "https://registry.npmjs.org/@angular/cli/-/cli-12.2.6.tgz",
"integrity": "sha512-nBCynOi5OVVAXA4ktsVhWP+UyWjjR/7+TlEjNgEfcbtlwkE+HIki+oHETAtXKdn5nPvNum3OXPLZPLX2B8MiRA==",
"version": "12.1.4",
"resolved": "https://registry.npmjs.org/@angular/cli/-/cli-12.1.4.tgz",
"integrity": "sha512-LpyhyqWe3bFcuH3MrXeYoIPI1htjwG1b5ehETfq4qsMvNmuFON6QI+F7EWEpX7lItVQc2bES+ogasTZsZue/uw==",
"dev": true,
"requires": {
"@angular-devkit/architect": "0.1202.6",
"@angular-devkit/core": "12.2.6",
"@angular-devkit/schematics": "12.2.6",
"@schematics/angular": "12.2.6",
"@angular-devkit/architect": "0.1201.4",
"@angular-devkit/core": "12.1.4",
"@angular-devkit/schematics": "12.1.4",
"@schematics/angular": "12.1.4",
"@yarnpkg/lockfile": "1.1.0",
"ansi-colors": "4.1.1",
"debug": "4.3.2",
"debug": "4.3.1",
"ini": "2.0.0",
"inquirer": "8.1.2",
"inquirer": "8.1.1",
"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.5",
"pacote": "11.3.4",
"resolve": "1.20.0",
"semver": "7.3.5",
"symbol-observable": "4.0.0",
"uuid": "8.3.2"
},
"dependencies": {
"@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": {
"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==",
"debug": {
"version": "4.3.1",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
"integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
"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"
}
}
"ms": "2.1.2"
}
},
"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",
@ -514,21 +371,6 @@
"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",
@ -1942,42 +1784,14 @@
}
},
"@schematics/angular": {
"version": "12.2.6",
"resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-12.2.6.tgz",
"integrity": "sha512-53yVIB43jPpqitJXT5IxPm9Kq1P8AyRgzrCIKAl4mESsPsOIFR6ZCpuNRlaumEinHnbMpgzZ2M+RlialzAOS6w==",
"version": "12.1.4",
"resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-12.1.4.tgz",
"integrity": "sha512-xGqgGI6GWk4EFdKis8FmSESxoLgjnLQbaRE1t1KZCkSKJzqkOj0R9wiDrtZfcrbPxIkLL+3fAk2ThwwPznT6yw==",
"dev": true,
"requires": {
"@angular-devkit/core": "12.2.6",
"@angular-devkit/schematics": "12.2.6",
"@angular-devkit/core": "12.1.4",
"@angular-devkit/schematics": "12.1.4",
"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": {
@ -2809,11 +2623,6 @@
"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",
@ -3285,25 +3094,6 @@
"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",
@ -6712,7 +6502,8 @@
"lodash": {
"version": "4.17.21",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
"dev": true
},
"lodash.debounce": {
"version": "4.0.8",
@ -7787,12 +7578,12 @@
"dev": true
},
"pacote": {
"version": "11.3.5",
"resolved": "https://registry.npmjs.org/pacote/-/pacote-11.3.5.tgz",
"integrity": "sha512-fT375Yczn4zi+6Hkk2TBe1x1sP8FgFsEIZ2/iWaXY2r/NkhDJfxbcn5paz1+RTFCyNf+dPnaoBDJoAxXSU8Bkg==",
"version": "11.3.4",
"resolved": "https://registry.npmjs.org/pacote/-/pacote-11.3.4.tgz",
"integrity": "sha512-RfahPCunM9GI7ryJV/zY0bWQiokZyLqaSNHXtbNSoLb7bwTvBbJBEyCJ01KWs4j1Gj7GmX8crYXQ1sNX6P2VKA==",
"dev": true,
"requires": {
"@npmcli/git": "^2.1.0",
"@npmcli/git": "^2.0.1",
"@npmcli/installed-package-contents": "^1.0.6",
"@npmcli/promise-spawn": "^1.2.0",
"@npmcli/run-script": "^1.8.2",
@ -9771,21 +9562,6 @@
}
}
},
"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",
@ -10146,11 +9922,6 @@
}
}
},
"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",
@ -10434,11 +10205,6 @@
"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",
@ -10679,9 +10445,9 @@
}
},
"socks-proxy-agent": {
"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==",
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.0.0.tgz",
"integrity": "sha512-FIgZbQWlnjVEQvMkylz64/rUggGtrKstPnx8OZyYFG0tAFR8CSBtpXxSwbFLHyeXFn/cunFL7MpuSOvDSOPo9g==",
"dev": true,
"requires": {
"agent-base": "^6.0.2",

9
Angular-UrbanBazaar/package.json

@ -17,20 +17,17 @@
"@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",
"compat": "^1.0.4",
"rxjs": "^6.6.7",
"rxjs-compat": "^6.6.7",
"rxjs": "~6.6.0",
"tslib": "^2.2.0",
"zone.js": "~0.11.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "~12.1.1",
"@angular/cli": "^12.2.6",
"@angular-devkit/build-angular": "^12.1.4",
"@angular/cli": "~12.1.1",
"@angular/compiler-cli": "~12.1.1",
"@types/jasmine": "~3.6.0",
"@types/node": "^12.11.1",

9
Angular-UrbanBazaar/proxy.config.json

@ -1,19 +1,18 @@
{
"/products":{
"target":"http://10.3.117.7:8007",
"target":"http://10.3.117.7:8002",
"secure":false
},
"/user":{
"target":"http://10.3.117.7:8008",
"target":"http://10.3.117.7:8006",
"secure":false
},
"/orders":{
"target":"http://10.3.117.7:8009",
"target":"http://10.3.117.7:8003",
"secure":false
},
"/cart":{
"target":"http://10.3.117.7:8010",
"target":"http://10.3.117.7:8004",
"secure":false
}
}

28
Angular-UrbanBazaar/src/app/app.module.ts

@ -6,6 +6,7 @@ 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';
@ -18,38 +19,18 @@ 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,
@ -62,10 +43,7 @@ children: [
MatInputModule,
MatCardModule,
MatButtonModule,
BrowserAnimationsModule,AppRoutingModule,
RouterModule.forRoot(appRoutes,{ useHash: true }),
FormsModule,
HttpModule,
BrowserAnimationsModule
],
providers: [],
bootstrap: [AppComponent]

32
Angular-UrbanBazaar/src/app/auth/login/login.component.html

@ -1,12 +1,11 @@
<!-- <p>login works!</p> -->
<body>
<div fxLayout="column" fxLayoutAlign="space-around center" class="login-main">
<mat-card >
&nbsp;&nbsp; &nbsp;&nbsp; &nbsp;&nbsp; &nbsp;&nbsp; &nbsp;&nbsp;
<h2 style="color:darkblue;">
&nbsp; &nbsp;&nbsp; &nbsp;&nbsp; &nbsp;&nbsp; Welcome to Urban Bazaar !!!
</h2>
<div style="text-align:center;"><img src="/assets/Images/Logo.png" alt="Logo"></div>
<br><br>
<h1 style="text-align: center;">Urban Bazaar</h1>
<div fxLayout="row" fxLayoutAlign="center center" class="login-main">
<mat-card >
<mat-card-header>
<mat-card-title>Login Page</mat-card-title>
</mat-card-header>
@ -20,24 +19,9 @@
[formControl]="password">
</mat-form-field>
</mat-card-content>
<!-- <div style="text-align:left;">
<a [routerLink]="['signup']">SignUp</a>
</div> -->
<mat-card-actions align="end">
<button mat-raised-button color="primary" (click)="signup()">Signup</button>
<p style="color: darkblue;" >OR &nbsp;</p>
<button mat-raised-button color="primary" (click)="userLogin()">Login</button>
</mat-card-actions>
</mat-card>
<!-- </div>
<div style="text-align:center;">
<a [routerLink]="['signup']">SignUp</a>
</div> -->
<!-- <div style="text-align:center;">
<a [routerLink]="['user-profile-details']">user details</a>
</div>
<div style="text-align:center;">
<a [routerLink]="['memberlist']">memberlist</a>
</div>
</body> -->
</body>

21
Angular-UrbanBazaar/src/app/auth/login/login.component.ts

@ -18,11 +18,9 @@ export class LoginComponent implements OnInit {
responseMessage : string = "";
temp : Observable<User>;
// temp : User;
// temps : Observable<string>;
// userList : Observable<User[]>;
signup(){
this.router.navigateByUrl('/signup')
}
temps : Observable<string>;
userList : Observable<User[]>;
constructor(private _userService : UserService, private router : Router) {}
userLogin() {
@ -34,14 +32,17 @@ signup(){
this.temp = this._userService.findUserByUsername(this.username.value);
this.temp.subscribe(v => {
if(v.userpassword == this.password.value)
{ this.temp.subscribe(v => this._userService.currentUser = v);
this.router.navigateByUrl('/home');
alert("Login Successfull !!")}
this.responseMessage = "Login success !!";
else
alert("Login falied !!");
this.responseMessage = "Password Incorrect.";
});
if(this.responseMessage == "Login success !!") {
this.temp.subscribe(v => this._userService.currentUser = v);
this.router.navigateByUrl('/home');
}
else
alert(this.responseMessage);
}
ngOnInit(): void {

84
Angular-UrbanBazaar/src/app/auth/sign-up/sign-up.component.html

@ -1,83 +1 @@
<!-- <div >
<app-page-nav-bar></app-page-nav-bar>
</div> -->
<p style="text-align:center;">Please provide your details to signup with Urban Bazaar</p>
<form #signupForm="ngForm" style="text-align:center;" (ngSubmit)="signup(signupForm)">
User UserEmail:
<input type="text" name="useremail" [(ngModel)]="user.useremail" required #useremail="ngModel" />
<br/><br/>
<div *ngIf="useremail.invalid && signupForm.submitted && !isFormSubmitted">
<h6 style="color: red">Please Enter User Email Id...</h6>
</div>
<br/>
User Password :
<input type="password" name="userpassword" [(ngModel)]="user.userpassword" required #userpassword="ngModel" />
<br/><br/>
<div *ngIf="userpassword.invalid && signupForm.submitted && !isFormSubmitted">
<h6 style="color: red">Please Enter User Password...</h6>
</div>
<br/>
User First Name :
<input type="text" name="userfirstname" [(ngModel)]="user.userfirstname" required #userfirstname="ngModel" />
<br/><br/>
<div *ngIf="userfirstname.invalid && signupForm.submitted && !isFormSubmitted">
<h6 style="color: red">Please Enter User First Name...</h6>
</div>
<br/>
User Last Name :
<input type="text" name="userlastname" [(ngModel)]="user.userlastname"
required #userlastname="ngModel" />
<br/><br/>
<div *ngIf="userlastname.invalid && signupForm.submitted && !isFormSubmitted">
<h6 style="color: red">Please Enter User Last Name...</h6>
</div>
<br/>
User City :
<input type="text" name="usercity" [(ngModel)]="user.usercity" required #usercity="ngModel" />
<br/><br/>
<div *ngIf="usercity.invalid && signupForm.submitted && !isFormSubmitted">
<h6 style="color: red">Please Enter UserCity...</h6>
</div>
<br/>
User State :
<input type="text" name="userstate" [(ngModel)]="user.userstate" required #userstate="ngModel" />
<br/><br/>
<div *ngIf="userstate.invalid && signupForm.submitted && !isFormSubmitted">
<h6 style="color: red">Please Enter UserState...</h6>
</div>
<br/>
User Zip :
<input type="text" name="userzip" [(ngModel)]="user.userzip" required #userzip="ngModel" />
<br/><br/>
<div *ngIf="userzip.invalid && signupForm.submitted && !isFormSubmitted">
<h6 style="color: red">Please Enter User Zip...</h6>
</div>
<br/>
User Phone Number :
<input type="text" name="userphone" [(ngModel)]="user.userphone" required #userphone="ngModel" />
<br/><br/>
<div *ngIf="userphone.invalid && signupForm.submitted && !isFormSubmitted">
<h6 style="color: red">Please Enter User Number...</h6>
</div>
<br/>
User Address :
<input type="text" name="useraddress" [(ngModel)]="user.useraddress" required #useraddress="ngModel" />
<br/><br/>
<div *ngIf="useraddress.invalid && signupForm.submitted && !isFormSubmitted">
<h6 style="color: red">Please Enter User Address...</h6>
</div>
<br/>
User Address2 :
<input type="text" name="useraddress2" [(ngModel)]="user.useraddress2" required #useraddress2="ngModel" />
<br/><br/>
<div *ngIf="useraddress2.invalid && signupForm.submitted && !isFormSubmitted">
<h6 style="color: red">Please Enter User Address2...</h6>
</div>
<br/>
<input type="Submit" value="Submit" />
</form>
<!-- <div style="text-align:center;">
<a [routerLink]="['user-show']">UserDetails</a>
</div> -->
<p>sign-up works!</p>

28
Angular-UrbanBazaar/src/app/auth/sign-up/sign-up.component.ts

@ -1,8 +1,4 @@
import { Component, OnInit } from '@angular/core';
import { NgForm } from '@angular/forms';
import { Observable } from 'rxjs';
import { User } from 'src/app/models/user';
import { UserService } from 'src/app/services/user.service';
@Component({
selector: 'app-sign-up',
@ -11,31 +7,9 @@ import { UserService } from 'src/app/services/user.service';
})
export class SignUpComponent implements OnInit {
user :User;
tys :string="t"
temp : Observable<User>;
isFormSubmitted : boolean;
public signup(signupForm : NgForm) {
if (signupForm.invalid) {
alert("Kindly enter all details")
return;
}
this.isFormSubmitted=true;
this._userservice.addUser(this.user).subscribe(x => { this.tys="y"; alert("Signup Successful")
if(this.tys=="t")
alert("not")});
}
constructor(private _userservice:UserService) {
this.user=new User();
this.isFormSubmitted=false;
}
constructor() { }
ngOnInit(): void {
}
}

27
Angular-UrbanBazaar/src/app/components/cart/cart.component.ts

@ -13,25 +13,28 @@ export class CartComponent implements OnInit {
public cartdetails:any =[];
public grandTotal!: number;
user : User;
constructor(private cartservice:CartService) {
// this.cartdetails = this.cartservice.showAllOrder();
constructor(private cartservice : CartService) {
this.user = JSON.parse(localStorage.getItem('currentUser'));
this.cartdetails = this.cartservice.showCartForUser(this.user.userid);
}
ngOnInit(): void {
this.cartservice.getProducts()
.subscribe(res=>{
this.cartdetails = res;
this.grandTotal = this.cartservice.getTotalPrice();
})
this.user = JSON.parse(localStorage.getItem('currentUser'));
this.cartdetails = this.cartservice.showCartForUser(this.user.userid);
}
removeItem(item:any){
this.cartservice.removeCartItem(item);
public removeItem(cart_id : number){
this.cartservice.deleteCartItemForUserId(cart_id);
}
public addCartItem(cartItem : Cart) {
this.cartservice.addCartItem(cartItem)
}
emptyCart()
{
this.cartservice.removeAllCart();
public emptyCart() {
this.cartservice.removeAllCartForUserId(this.user.userid);
}
}

29
Angular-UrbanBazaar/src/app/components/home/home.component.html

@ -1,17 +1,5 @@
<body>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
&nbsp;&nbsp;&nbsp;
&nbsp;&nbsp;&nbsp;
<button style="shape-outside: circle();color:forestgreen; background-color: white; border-color: forestgreen;" class="EditProfile" (click)=EditProfile()>Edit Profile</button>
&nbsp;&nbsp;&nbsp;
&nbsp;&nbsp;&nbsp;
&nbsp;&nbsp;&nbsp;
&nbsp;&nbsp;&nbsp;
<button style="shape-outside: circle();color: forestgreen; background-color: white; border-color: forestgreen;" class="Members List of Curent User" (click)=Members()>Members List of Curent User</button>
<br/><br/>
<form class="form-inline my-2 my-lg-0">
<input class="form-control mr-sm-2" type="text"
[(ngModel)]="searchValue" id="searchValue" [ngModelOptions]="{standalone: true}"
@ -30,21 +18,4 @@
<p><button class="AddToCart" (click)=addCart(i)>Add to Cart</button></p>
</div>
</div>
</body>
<!-- <div >
<app-page-nav-bar></app-page-nav-bar>
</div> -->
<!-- <button type="button" style="text-align:center;background-color:dimgray;" cls="btn" (click)="btnClick();">EditProfile</button> -->
<!-- <div style="text-align:center;">
<a [routerLink]="['/home', {outlets: {'member': ['memberlist']}}]">Members List of Curent User</a>
</div>
<router-outlet name="member"></router-outlet> -->
<!--
<div style="text-align:center;">
<a [routerLink]="['/home', {outlets: {'user': ['user-profile-details']}}]">EditProfile</a>
</div>
<router-outlet name="user"></router-outlet> -->

9
Angular-UrbanBazaar/src/app/components/home/home.component.ts

@ -28,7 +28,7 @@ export class HomeComponent implements OnInit {
}
addCart(item:any){
this.cartservice.addtoCart(item);
this.cartservice.addCartItem(item);
}
searchProduct() {
@ -41,12 +41,7 @@ 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;

6
Angular-UrbanBazaar/src/app/components/page-nav-bar/page-nav-bar.component.html

@ -8,11 +8,9 @@
<ul class="navbar-nav mr-auto">
<li class="nav-item active">
<a class="nav-link" href="/home">Home <span class="sr-only">(current)</span></a>
</li>
</li>
<li class="nav-item active">
<a class="nav-link" href="/profile"> Profile <span class="sr-only">(current)</span></a>
<a class="nav-link" href="/profile"> Profile <span class="sr-only">(current)</span></a>
</li>
<!-- Dropdown -->
<!-- <li class="nav-item dropdown" dropdown>

3
Angular-UrbanBazaar/src/app/components/page-nav-bar/page-nav-bar.component.ts

@ -3,7 +3,6 @@ import { Observable } from 'rxjs';
import { ProductService } from 'src/app/services/product.service';
import { Product } from 'src/app/models/product';
import { Router } from '@angular/router';
import { UserService } from 'src/app/services/user.service';
@Component({
selector: 'app-page-nav-bar',
@ -15,7 +14,7 @@ export class PageNavBarComponent implements OnInit {
searchValue: string = "";
products : Observable<Product[]>
constructor(private _productService : ProductService, private router: Router) { }
constructor(private _productService : ProductService, private router: Router) { }
clickme() {
alert('searchValue: '+this.searchValue);

0
Angular-UrbanBazaar/src/app/components/user-add/user-add.component.css

1
Angular-UrbanBazaar/src/app/components/user-add/user-add.component.html

@ -0,0 +1 @@
<p>user-add works!</p>

25
Angular-UrbanBazaar/src/app/components/user-add/user-add.component.spec.ts

@ -0,0 +1,25 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { UserAddComponent } from './user-add.component';
describe('UserAddComponent', () => {
let component: UserAddComponent;
let fixture: ComponentFixture<UserAddComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ UserAddComponent ]
})
.compileComponents();
});
beforeEach(() => {
fixture = TestBed.createComponent(UserAddComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

15
Angular-UrbanBazaar/src/app/components/user-add/user-add.component.ts

@ -0,0 +1,15 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-user-add',
templateUrl: './user-add.component.html',
styleUrls: ['./user-add.component.css']
})
export class UserAddComponent implements OnInit {
constructor() { }
ngOnInit(): void {
}
}

63
Angular-UrbanBazaar/src/app/components/user-profile-details/user-profile-details.component.html

@ -1,4 +1,4 @@
<!-- <p>user-profile-details works!</p>
<p>user-profile-details works!</p>
<body>
<div>
@ -33,63 +33,4 @@
Any changes will reflect in your Seller account also.
</div>
<br><br><br>
</body> -->
<body>
<!-- <div style="text-align:center;">
<a [routerLink]="['changepass']">Change Password</a> <br/>
<br/> -->
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<button style="text-align:center;background-color:dimgray;"class="btn" (click)="enable()">Edit</button> <br>
<form #updateForm="ngForm" style="text-align:center;" (ngSubmit)="update(updateForm)">
Personal Information
<br/>
Name:&nbsp;&nbsp;
<input type="text" name="userfirstName" [(ngModel)]="user.userfirstname" value="{{user.userfirstname}}" [disabled]='toggleButton'> &nbsp;&nbsp;
<input type="text" name="userlastName"[(ngModel)]="user.userlastname" value="{{user.userlastname}}" [disabled]='toggleButton'>
<br/><br/>
Mobile Number:&nbsp;&nbsp;
<input type="number" name="userphone"[(ngModel)]="user.userphone" value="{{user.userphone}}" [disabled]='toggleButton'>
<br/><br/>
Address1:&nbsp;&nbsp;
<input type="text"name="useraddress"[(ngModel)]="user.useraddress" value="{{user.useraddress}}"[disabled]='toggleButton'>
<br/><br/>
Address2:&nbsp;&nbsp;
<input type="text"name="useraddress2"[(ngModel)]="user.useraddress2" value="{{user.useraddress2}}"[disabled]='toggleButton'>
<br/><br/>
City:&nbsp;&nbsp;
<input type="text"name="usercity"[(ngModel)]="user.usercity" value="{{user.usercity}}"[disabled]='toggleButton'>
<br/><br/>
State:&nbsp;&nbsp;
<input type="text"name="userstate" [(ngModel)]="user.userstate" value="{{user.userstate}}"[disabled]='toggleButton'>
<br/><br/>
Zip:&nbsp;&nbsp;
<input type="text"name="userzip" [(ngModel)]="user.userzip" value="{{user.userzip}}"[disabled]='toggleButton'>
<br/><br/>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <input type="submit" style="text-align:center;background-color:dimgray;"name="Save"/>
</form>
<br>
<h4>FAQs</h4>
<b>What happens when I update my email address (or mobile number)?</b> <br>
Your login email id (or mobile number) changes, likewise. You'll receive all your account related communication on your updated email address (or mobile number). <br><br>
<b>When will my UrbanBazaar account be updated with the new email address (or mobile number)?</b> <br>
It happens as soon as you confirm the verification code sent to your email (or mobile) and save the changes. <br><br>
<b>What happens to my existing UrbanBazaar account when I update my email address (or mobile number)?</b> <br>
Updating your email address (or mobile number) doesn't invalidate your account. Your account remains fully functional.
You'll continue seeing your Order history, saved information and personal details. <br><br>
<b>Does my Seller account get affected when I update my email address?</b> <br>
UrbanBazaar has a 'single sign-on' policy.
Any changes will reflect in your Seller account also.
<!-- </div> -->
<br><br><br>
</body>
</body>

44
Angular-UrbanBazaar/src/app/components/user-profile-details/user-profile-details.component.ts

@ -1,5 +1,4 @@
import { Component, OnInit } from '@angular/core';
import { NgForm } from '@angular/forms';
import { Observable } from 'rxjs';
import { User } from 'src/app/models/user';
import { UserService } from 'src/app/services/user.service';
@ -12,38 +11,31 @@ import { UserService } from 'src/app/services/user.service';
export class UserProfileDetailsComponent implements OnInit {
currentUser : Observable<User>;
user : User;
public toggleButton: boolean ;
// /isFormSubmitted : boolean;
constructor(private _userService : UserService) {
this.user=new User()
this.toggleButton=true
this.currentUser = this._userService.searchUser(this._userService.currentUser.userid);
this.currentUser.subscribe((userold: User)=> this.user = userold);
this.currentUser = this._userService.searchUser(100);
this.currentUser.subscribe((user: User) => {this.user = user});
// this.user = this._userService.currentUser;
}
public editUserName() {
alert("editUserName pressed !");
}
update(vendorForm : NgForm) {
if (vendorForm.invalid) {
return;
}
// this.isFormSubmitted=true;
this._userService.updateUser(this.user).subscribe(x => { })
alert("Record Updated")
public editEmail() {
alert("editEmail pressed !");
}
enable(){
this.toggleButton = false
}
public editPassword() {
alert("editPassword pressed !");
}
public editPhone() {
alert("editPhone pressed !");
}
disable(){
this.toggleButton = true
}
ngOnInit(): void {
this.user = this._userService.currentUser;
}
}

2
Angular-UrbanBazaar/src/app/models/member-user.ts

@ -5,6 +5,6 @@ export class MemberUser {
public totalitems : number;
public memberphone : string;
public membertotalamount : number;
public memberdoornumber: number;
constructor() {}
}

57
Angular-UrbanBazaar/src/app/services/member-user.service.ts

@ -1,64 +1,23 @@
// import { HttpClient } from '@angular/common/http';
import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs';
import { MemberUser } from '../models/member-user';
import 'rxjs/add/operator/map';
import { Http ,Response} from '@angular/http';
@Injectable({
providedIn: 'root'
})
export class MemberUserService {
private _url : String = "http://localhost:8008/user/";
private _url : String = "http://localhost:4405/user";
constructor(private _http : Http) { }
// public showMembersByUser(id : number) : Observable<MemberUser[]> {
// return this._http.get<MemberUser[]>(this._url+"/showUserMembers/"+id);
// }
// public addMemberToUser(member : MemberUser) {
// this._http.post(this._url+"/addMember", member);
// }
constructor(private _http : HttpClient) { }
showAllMemberUsers() : Observable<MemberUser[]> {
return this._http.get(this._url+"showAllMembers").map((res : Response) => res.json());
}
addMemberUser(member: MemberUser) : Observable<any> {
return this._http.post(this._url+"addMember/",member).map((res: Response)=> null);
}
searchMemberUser(memberid : number) : Observable<MemberUser> {
return this._http.get(this._url+"showAllMembers/" +memberid).map((res : Response) => res.json());
}
searchMembersbyUser(userid : number) : Observable<MemberUser[]> {
return this._http.get(this._url+"showUserMembers/" +userid).map((res : Response) => res.json());
}
deleteMemberUser(memberid : number) : Observable<any> {
return this._http.delete(this._url+"deleteMember/" +memberid).map((res : Response) => null);
public showMembersByUser(id : number) : Observable<MemberUser[]> {
return this._http.get<MemberUser[]>(this._url+"/showUserMembers/"+id);
}
updateMemberUser(member :MemberUser) : Observable<any> {
return this._http.put(this._url+"updateMember/",member).map((res: Response)=> null);
}
// private _url : String = "http://localhost:8001/user";
// constructor(private _http : HttpClient) { }
// public showMembersByUser(id : number) : Observable<MemberUser[]> {
// return this._http.get<MemberUser[]>(this._url+"/showUserMembers/"+id);
// }
// public addMemberToUser(member : MemberUser) {
// this._http.post(this._url+"/addMember", member);
// }
public addMemberToUser(member : MemberUser) {
this._http.post(this._url+"/addMember", member);
}
}

2
Angular-UrbanBazaar/src/app/services/orders.service.ts

@ -8,7 +8,7 @@ import { Orders } from '../models/orders';
})
export class OrdersService {
private _url : String = "http://localhost:8009/orders";
private _url : String = "http://localhost:4405/orders";
constructor(private _http : HttpClient) { }

2
Angular-UrbanBazaar/src/app/services/product-category.service.ts

@ -8,7 +8,7 @@ import { ProductCategory } from '../models/product-category';
})
export class ProductCategoryService {
private _url : String = "http://localhost:8007/products";
private _url : String = "http://localhost:4405/products";
constructor(private _http : HttpClient) { }

2
Angular-UrbanBazaar/src/app/services/product.service.ts

@ -8,7 +8,7 @@ import {map} from 'rxjs/operators';
providedIn: 'root'
})
export class ProductService {
private _url : String = "http://localhost:8007/products";
private _url : String = "http://localhost:4405/products";
search : string;
constructor(private _http : HttpClient) { }

84
Angular-UrbanBazaar/src/app/services/user.service.ts

@ -1,81 +1,37 @@
// import { HttpClient } from '@angular/common/http';
import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { Http,Response } from '@angular/http';
// import { Observable } from 'rxjs';
import { Observable } from 'rxjs';
import { Login } from '../models/login';
import { User } from '../models/user';
import 'rxjs/add/operator/map';
import { Observable } from 'rxjs';
@Injectable({
providedIn: 'root'
})
export class UserService {
// private _url : string = "http://localhost:9000";
private _url : String = "http://localhost:4405/user";
currentUser : User;
constructor(private _http : Http) { }
// public showAllUsers() : Observable<User[]> {
// return this._http.get<User[]>(this._url + "/showAllUsers");
// }
constructor(private _http : HttpClient) { }
// public searchUser(id : number) : Observable<User> {
// return this._http.get<User>(this._url+"/findUserById/"+id);
// }
public showAllUsers() : Observable<User[]> {
return this._http.get<User[]>(this._url + "/showAllUsers");
}
// public addUser(user : User) {
// this._http.post(this._url+"/addUser/", user);
currentUser:User
private _url:string ="http://localhost:8008/user/"
showAllUsers() : Observable<User[]> {
return this._http.get(this._url+"showAllUsers").map((res : Response) => res.json());
}
public searchUser(id : number) : Observable<User> {
return this._http.get<User>(this._url+"/findUserById/"+id);
}
addUser(user: User) : Observable<any> {
return this._http.post(this._url+"addUser/",user).map((res: Response)=> null).pipe();
}
// loginUser (user:User):Observable<any>{
// return this._http.post("http://localhost:8006/user/login/",user).map((res: Response)=>null);
// }
searchUser(userid : number) : Observable<User> {
return this._http.get(this._url+"findUserById/" +userid).map((res : Response) => res.json());
}
updateUser(user : User) : Observable<any> {
return this._http.put(this._url+"update/",user).map((res: Response)=> null);
}
// findUserByUsername(name : string) : Observable<User> {
// return this._http.get("http://localhost:8006/user/findUserByName/"+name).map((res : Response) => res.json());
// }
public addUser(user : User) {
this._http.post(this._url+"/addUser", user);
}
public loginUser(user : Login) : Observable<string> {
return this._http.post(this._url+"login/",user).map((res: Response)=>null);
}
public userLogin(user : Login) : Observable<string> {
return this._http.post<string>(this._url+"/login", user);
}
public findUserByUsername(name : string) : Observable<User> {
return this._http.get(this._url+"findUserByName/"+name).map((res : Response) => res.json());
}
// private _url : String = "http://localhost:8001/user";
// currentUser : User;
// constructor(private _http : HttpClient) { }
// public showAllUsers() : Observable<User[]> {
// return this._http.get<User[]>(this._url + "/showAllUsers");
// }
// public searchUser(id : number) : Observable<User> {
// return this._http.get<User>(this._url+"/findUserById/"+id);
// }
// public addUser(user : User) {
// this._http.post(this._url+"/addUser", user);
// }
public findUserByUsername(name : string) : Observable<User> {
return this._http.get<User>(this._url+"/findUserByName/"+name);
}
}

5
UB_CartServiceProxy/src/main/java/com/example/urbanbazaar/controller/CartController.java

@ -3,11 +3,7 @@ package com.example.urbanbazaar.controller;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
//<<<<<<< HEAD
import org.springframework.web.bind.annotation.CrossOrigin;
//=======
import org.springframework.web.bind.annotation.DeleteMapping;
//>>>>>>> fb2720ddac9edea8fcd3eac8052c4a5bac31e6f0
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@ -15,7 +11,6 @@ import org.springframework.web.bind.annotation.RestController;
import com.example.urbanbazaar.model.Cart;
import com.example.urbanbazaar.repository.CartRepository;
@CrossOrigin(origins = "http://localhost:63871")
@RestController
public class CartController {

4
UB_CartServiceProxy/src/main/resources/application.properties

@ -1,6 +1,6 @@
server.port=8010
server.port=8004
spring.datasource.url=jdbc:mysql://10.3.117.21:3306/grocery_db?createDatabaseIfNotExist=true
spring.datasource.url=jdbc:mysql://10.3.117.7:3306/grocery_db?createDatabaseIfNotExist=true
spring.datasource.username=testuser
spring.datasource.password=Password123

4
UB_OrderServiceProxy/src/main/resources/application.properties

@ -1,6 +1,6 @@
server.port=8009
server.port=8003
spring.datasource.url=jdbc:mysql://10.3.117.21:3306/grocery_db?createDatabaseIfNotExist=true
spring.datasource.url=jdbc:mysql://10.3.117.7:3306/grocery_db?createDatabaseIfNotExist=true
spring.datasource.username=testuser
spring.datasource.password=Password123

2
UB_ProductServiceProxy/src/main/java/com/example/urbanbazaar/controller/ProductCategoryController.java

@ -3,13 +3,11 @@ package com.example.urbanbazaar.controller;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import com.example.urbanbazaar.model.ProductCategory;
import com.example.urbanbazaar.repository.ProductCategoryRepository;
@CrossOrigin(origins = "http://localhost:63871")
@RestController
public class ProductCategoryController {

2
UB_ProductServiceProxy/src/main/java/com/example/urbanbazaar/controller/ProductController.java

@ -6,7 +6,6 @@ import java.util.NoSuchElementException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@ -14,7 +13,6 @@ import org.springframework.web.bind.annotation.RestController;
import com.example.urbanbazaar.model.Product;
import com.example.urbanbazaar.repository.ProductRepository;
@CrossOrigin(origins = "http://localhost:63871")
@RestController
public class ProductController {

4
UB_ProductServiceProxy/src/main/resources/application.properties

@ -1,6 +1,6 @@
server.port=8007
server.port=8002
spring.datasource.url=jdbc:mysql://10.3.117.21:3306/grocery_db?createDatabaseIfNotExist=true
spring.datasource.url=jdbc:mysql://10.3.117.7:3306/grocery_db?createDatabaseIfNotExist=true
spring.datasource.username=testuser
spring.datasource.password=Password123

23
UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/controller/MemberUserController.java

@ -3,19 +3,14 @@ package com.example.urbanbazaar.controller;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import com.example.urbanbazaar.model.MemberUser;
import com.example.urbanbazaar.repository.MemberUserRepository;
//@CrossOrigin(origins = "http://localhost:4405")
@CrossOrigin(origins = "http://localhost:63871")
@RestController
public class MemberUserController {
@ -32,26 +27,10 @@ public class MemberUserController {
public List<MemberUser> showMembers() {
return repo.findAll();
}
@GetMapping("/searchMember/{memberid}")
public MemberUser searchMemberUser(@PathVariable int memberid) {
return repo.findById(memberid).get();
}
@GetMapping("/showUserMembers/{userId}")
public List<MemberUser> showMembersByUser(@PathVariable int userId) {
return repo.findByuserid(userId);
}
@DeleteMapping("/deleteMember/{memberid}")
public void deleteMemberById(@PathVariable int memberid ) {
repo.deleteById(memberid);
}
@PutMapping("/updateMember/")
public void update(@RequestBody MemberUser user) {
MemberUser oldu=repo.findById(user.getMemberid()).get();
oldu.setMembername(user.getMembername());
oldu.setMemberphone(user.getMemberphone());
// oldu.setAddress(user.getAddress());
repo.save(oldu);
}
}

39
UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/controller/UserController.java

@ -2,17 +2,12 @@ package com.example.urbanbazaar.controller;
import java.util.List;
import javax.transaction.Transactional;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.servlet.function.EntityResponse;
@ -20,30 +15,17 @@ import org.springframework.web.servlet.function.EntityResponse;
import com.example.urbanbazaar.model.User;
import com.example.urbanbazaar.model.UserLogin;
import com.example.urbanbazaar.repository.UserRepository;
//@CrossOrigin(origins = "http://localhost:4405")
@CrossOrigin(origins = "http://localhost:63871")
@RestController
@Service
@Transactional
public class UserController {
@Autowired
private UserRepository repo;
@PostMapping("/addUser")
public ResponseEntity<String> addUser(@RequestBody User user) {
String tempusername =user.getUserfirstname();
if(tempusername !=null && !"".equals(tempusername)) {
User usero=repo.findByuserfirstname(tempusername);
if (usero!=null) {
return new ResponseEntity<String>("user with "+tempusername+ " already exists", HttpStatus.BAD_REQUEST);
// throw new Exception();
}
}
repo.save(user);
return new ResponseEntity<String>("Registration success !!", HttpStatus.OK);}
public void addUser(@RequestBody User user) {
repo.save(user);
}
@GetMapping("/showAllUsers")
public List<User> showUsers() {
@ -59,7 +41,7 @@ public class UserController {
public User findUserByName(@PathVariable String name) {
return repo.findByuserfirstname(name);
}
@PostMapping("/login")
public ResponseEntity<String> userLogin(@RequestBody UserLogin user) {
User currentUser = repo.findByuserfirstname(user.getUserfirstname());
@ -69,17 +51,4 @@ public class UserController {
return new ResponseEntity<String>("Password mismatch.", HttpStatus.BAD_REQUEST);
return new ResponseEntity<String>("Login success !!", HttpStatus.OK);
}
@PutMapping("/update/")
public void update(@RequestBody User user) {
User oldu=repo.findById(user.getUserid()).get();
oldu.setUserfirstname(user.getUserfirstname());
oldu.setUserlastname(user.getUserlastname());
oldu.setUseraddress(user.getUseraddress());
oldu.setUseraddress2(user.getUseraddress2());
oldu.setUsercity(user.getUsercity());
oldu.setUserphone(user.getUserphone());
oldu.setUserstate(user.getUserstate());
oldu.setUserzip(user.getUserzip());
repo.save(oldu);
}
}

21
UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/model/MemberUser.java

@ -8,23 +8,14 @@ import javax.persistence.Table;
@Table(name = "members")
public class MemberUser {
private int userid;
@Id
private int userid;
private int memberid;
private String membername;
private int totalitems;
private String memberphone;
private float membertotalamount;
private int memberdoornumber;
public int getMemberdoornumber() {
return memberdoornumber;
}
public void setMemberdoornumber(int memberdoornumber) {
this.memberdoornumber = memberdoornumber;
}
public int getUserid() {
return userid;
}
@ -72,19 +63,17 @@ public class MemberUser {
public void setMembertotalamount(float membertotalamount) {
this.membertotalamount = membertotalamount;
}
public MemberUser(int userid, int memberid, String membername, int totalitems, String memberphone,
float membertotalamount, int memberdoornumber) {
super();
float membertotalamount) {
this.userid = userid;
this.memberid = memberid;
this.membername = membername;
this.totalitems = totalitems;
this.memberphone = memberphone;
this.membertotalamount = membertotalamount;
this.memberdoornumber = memberdoornumber;
}
public MemberUser() {
}

3
UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/model/User.java

@ -4,7 +4,6 @@ import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.GenerationType;
@Entity
@Table(name = "users")
@ -23,7 +22,7 @@ public class User {
private String useraddress2;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@GeneratedValue
public int getUserid() {
return userid;
}

5
UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/repository/MemberUserRepository.java

@ -3,11 +3,10 @@ package com.example.urbanbazaar.repository;
import java.util.List;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import com.example.urbanbazaar.model.MemberUser;
public interface MemberUserRepository extends JpaRepository<MemberUser, Integer> {
@Query(value="select * from members where members.UserId = ?1",nativeQuery=true)
public List<MemberUser> findByuserid(int userId);
public List<MemberUser> findByuserid(int userId);
}

2
UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/repository/UserRepository.java

@ -7,7 +7,7 @@ import com.example.urbanbazaar.model.User;
public interface UserRepository extends JpaRepository<User, Integer> {
// @Query(value="select * from user where UserFirstName=?1" , nativeQuery=true)
public User findByuserfirstname(String username);
}

4
UB_UserServiceProxy/src/main/resources/application.properties

@ -1,6 +1,6 @@
server.port=8008
server.port=8001
spring.datasource.url=jdbc:mysql://10.3.117.21:3306/grocery_db?createDatabaseIfNotExist=true
spring.datasource.url=jdbc:mysql://10.3.117.7:3306/grocery_db?createDatabaseIfNotExist=true
spring.datasource.username=testuser
spring.datasource.password=Password123

16
grocery_db_tables.sql

@ -53,7 +53,6 @@ INSERT INTO `productcategories` (`CategoryID`, `CategoryName`) VALUES
select * from productcategories;
-----------------------------------------------------------------------------------------
-- Product Table Schema
create table Product(
@ -110,7 +109,6 @@ insert into product values (1007, "Eggs - Regular (12)", 76, 0.150,
select * from product;
-----------------------------------------------------------------------------------------
-- Orders Table Schema
CREATE TABLE IF NOT EXISTS `orders` (
@ -140,12 +138,10 @@ insert into orders values(1001,1,12.5,'indra nagar','panchshill nagar','bhilai',
SELECT * FROM orders;
-----------------------------------------------------------------------------------------
-- Members Table Schema
create table `members`(
`UserID` int(11) NOT NULL,
`MemberID` int(11) not null AUTO_INCREMENT,
`UserID` int(11) NOT NULL,
`MemberID` int(11) not null AUTO_INCREMENT,
`MemberName` varchar(20) not null,
`MemberDoorNumber` int(4) not null,
`TotalItems` int(3) not null default 0,
@ -155,15 +151,15 @@ create table `members`(
FOREIGN KEY (`UserID`) REFERENCES users(`UserID`)
);
INSERT INTO members VALUES(100, 1, "Abhishek", 501, 0, "1234512345", 0);
INSERT INTO members VALUES(100, 2, "Meera", 502, 5, "12345234567", 1200);
INSERT INTO members VALUES(100, 3, "Shyam", 503, 10, "1234598745", 800);
INSERT INTO members VALUES(100, 1, "Abhishek", 501, 0,"1234512345", 0);
INSERT INTO members VALUES(100, 2, "Meera", 502, 5,"12345234567", 1200);
INSERT INTO members VALUES(100, 3, "Shyam", 503, 10,"1234598745", 800);
select * from members;
-- Cart Table Schema
CREATE TABLE IF NOT EXISTS `cart` (
`CartID` int NOT NULL AUTO_INCREMENT,
`CartID` int NOT NULL AUTO_INCREMENT,
`UserID` int NOT NULL,
`OrderID` int NOT NULL,
`ProductName` varchar(50) NOT NULL,

Loading…
Cancel
Save