+ What happens when I update my email address (or mobile number)?
+ 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).
+ When will my UrbanBazaar account be updated with the new email address (or mobile number)?
+ It happens as soon as you confirm the verification code sent to your email (or mobile) and save the changes.
+ What happens to my existing UrbanBazaar account when I update my email address (or mobile number)?
+ 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.
+ Does my Seller account get affected when I update my email address?
+ UrbanBazaar has a 'single sign-on' policy.
+ Any changes will reflect in your Seller account also.
+
+
+
\ No newline at end of file
diff --git a/Angular-UrbanBazaar/src/app/components/user-profile-details/user-profile-details.component.ts b/Angular-UrbanBazaar/src/app/components/user-profile-details/user-profile-details.component.ts
index 533068f..04d26ba 100644
--- a/Angular-UrbanBazaar/src/app/components/user-profile-details/user-profile-details.component.ts
+++ b/Angular-UrbanBazaar/src/app/components/user-profile-details/user-profile-details.component.ts
@@ -1,4 +1,5 @@
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';
@@ -11,31 +12,38 @@ import { UserService } from 'src/app/services/user.service';
export class UserProfileDetailsComponent implements OnInit {
currentUser : Observable;
user : User;
+ public toggleButton: boolean ;
+ // /isFormSubmitted : boolean;
- constructor(private _userService : UserService) {
- this.currentUser = this._userService.searchUser(100);
- this.currentUser.subscribe((user: User) => {this.user = user});
- // this.user = this._userService.currentUser;
- }
-
- public editUserName() {
- alert("editUserName pressed !");
- }
- public editEmail() {
- alert("editEmail pressed !");
+ 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);
}
-
- public editPassword() {
- alert("editPassword pressed !");
+
+
+ update(vendorForm : NgForm) {
+
+ if (vendorForm.invalid) {
+ return;
+ }
+
+ // this.isFormSubmitted=true;
+ this._userService.updateUser(this.user).subscribe(x => { })
+ alert("Record Updated")
}
- public editPhone() {
- alert("editPhone pressed !");
- }
+
+ enable(){
+ this.toggleButton = false
+ }
+ disable(){
+ this.toggleButton = true
+ }
ngOnInit(): void {
- this.user = this._userService.currentUser;
}
}
diff --git a/Angular-UrbanBazaar/src/app/models/member-user.ts b/Angular-UrbanBazaar/src/app/models/member-user.ts
index 56469ff..8e5f8b2 100644
--- a/Angular-UrbanBazaar/src/app/models/member-user.ts
+++ b/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() {}
}
diff --git a/Angular-UrbanBazaar/src/app/services/member-user.service.ts b/Angular-UrbanBazaar/src/app/services/member-user.service.ts
index e7ba94e..92edf41 100644
--- a/Angular-UrbanBazaar/src/app/services/member-user.service.ts
+++ b/Angular-UrbanBazaar/src/app/services/member-user.service.ts
@@ -1,23 +1,64 @@
-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:8001/user";
+
+
+
+ private _url : String = "http://localhost:8008/user/";
- constructor(private _http : HttpClient) { }
+ constructor(private _http : Http) { }
- public showMembersByUser(id : number) : Observable {
- return this._http.get(this._url+"/showUserMembers/"+id);
- }
+ // public showMembersByUser(id : number) : Observable {
+ // return this._http.get(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);
+ showAllMemberUsers() : Observable {
+ return this._http.get(this._url+"showAllMembers").map((res : Response) => res.json());
+ }
+
+ addMemberUser(member: MemberUser) : Observable {
+ return this._http.post(this._url+"addMember/",member).map((res: Response)=> null);
+ }
+ searchMemberUser(memberid : number) : Observable {
+ return this._http.get(this._url+"showAllMembers/" +memberid).map((res : Response) => res.json());
+ }
+ searchMembersbyUser(userid : number) : Observable {
+ return this._http.get(this._url+"showUserMembers/" +userid).map((res : Response) => res.json());
+ }
+ deleteMemberUser(memberid : number) : Observable {
+ return this._http.delete(this._url+"deleteMember/" +memberid).map((res : Response) => null);
}
+ updateMemberUser(member :MemberUser) : Observable {
+ 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 {
+ // return this._http.get(this._url+"/showUserMembers/"+id);
+ // }
+
+ // public addMemberToUser(member : MemberUser) {
+ // this._http.post(this._url+"/addMember", member);
+ // }
}
diff --git a/Angular-UrbanBazaar/src/app/services/orders.service.ts b/Angular-UrbanBazaar/src/app/services/orders.service.ts
index 749f7ea..0759004 100644
--- a/Angular-UrbanBazaar/src/app/services/orders.service.ts
+++ b/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:8003/orders";
+ private _url : String = "http://localhost:8009/orders";
constructor(private _http : HttpClient) { }
diff --git a/Angular-UrbanBazaar/src/app/services/product-category.service.ts b/Angular-UrbanBazaar/src/app/services/product-category.service.ts
index c250024..99fdbd5 100644
--- a/Angular-UrbanBazaar/src/app/services/product-category.service.ts
+++ b/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:8002/products";
+ private _url : String = "http://localhost:8007/products";
constructor(private _http : HttpClient) { }
diff --git a/Angular-UrbanBazaar/src/app/services/product.service.ts b/Angular-UrbanBazaar/src/app/services/product.service.ts
index 435bbde..2dca25c 100644
--- a/Angular-UrbanBazaar/src/app/services/product.service.ts
+++ b/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:8002/products";
+ private _url : String = "http://localhost:8007/products";
search : string;
constructor(private _http : HttpClient) { }
diff --git a/Angular-UrbanBazaar/src/app/services/user.service.ts b/Angular-UrbanBazaar/src/app/services/user.service.ts
index 083caae..50d4a3d 100644
--- a/Angular-UrbanBazaar/src/app/services/user.service.ts
+++ b/Angular-UrbanBazaar/src/app/services/user.service.ts
@@ -1,37 +1,81 @@
-import { HttpClient } from '@angular/common/http';
+// import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs';
+import { Http,Response } from '@angular/http';
+// 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:8001/user";
- currentUser : User;
+
+// private _url : string = "http://localhost:9000";
- constructor(private _http : HttpClient) { }
+constructor(private _http : Http) { }
+
+// public showAllUsers() : Observable {
+// return this._http.get(this._url + "/showAllUsers");
+// }
- public showAllUsers() : Observable {
- return this._http.get(this._url + "/showAllUsers");
- }
+// public searchUser(id : number) : Observable {
+// return this._http.get(this._url+"/findUserById/"+id);
+// }
- public searchUser(id : number) : Observable {
- return this._http.get(this._url+"/findUserById/"+id);
- }
+// public addUser(user : User) {
+// this._http.post(this._url+"/addUser/", user);
+currentUser:User
+ private _url:string ="http://localhost:8008/user/"
+showAllUsers() : Observable {
+ return this._http.get(this._url+"showAllUsers").map((res : Response) => res.json());
+}
- public addUser(user : User) {
- this._http.post(this._url+"/addUser", user);
- }
+addUser(user: User) : Observable {
+ return this._http.post(this._url+"addUser/",user).map((res: Response)=> null).pipe();
+}
+// loginUser (user:User):Observable{
+// return this._http.post("http://localhost:8006/user/login/",user).map((res: Response)=>null);
+// }
+searchUser(userid : number) : Observable {
+ return this._http.get(this._url+"findUserById/" +userid).map((res : Response) => res.json());
+}
+updateUser(user : User) : Observable {
+ return this._http.put(this._url+"update/",user).map((res: Response)=> null);
+}
+// findUserByUsername(name : string) : Observable {
+// return this._http.get("http://localhost:8006/user/findUserByName/"+name).map((res : Response) => res.json());
+// }
- public userLogin(user : Login) : Observable {
- return this._http.post(this._url+"/login", user);
- }
+public loginUser(user : Login) : Observable {
+ return this._http.post(this._url+"login/",user).map((res: Response)=>null);
+}
- public findUserByUsername(name : string) : Observable {
- return this._http.get(this._url+"/findUserByName/"+name);
- }
+public findUserByUsername(name : string) : Observable {
+ 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 {
+ // return this._http.get(this._url + "/showAllUsers");
+ // }
+
+ // public searchUser(id : number) : Observable {
+ // return this._http.get(this._url+"/findUserById/"+id);
+ // }
+
+ // public addUser(user : User) {
+ // this._http.post(this._url+"/addUser", user);
+ // }
+
+
}
diff --git a/Angular-UrbanBazaar/src/assets/Images/Logo.png b/Angular-UrbanBazaar/src/assets/Images/Logo.png
new file mode 100644
index 0000000..ef8d9bc
Binary files /dev/null and b/Angular-UrbanBazaar/src/assets/Images/Logo.png differ
diff --git a/Angular-UrbanBazaar/src/assets/Images/download.jpg b/Angular-UrbanBazaar/src/assets/Images/download.jpg
new file mode 100644
index 0000000..2fe4533
Binary files /dev/null and b/Angular-UrbanBazaar/src/assets/Images/download.jpg differ
diff --git a/UB_CartServiceProxy/src/main/java/com/example/urbanbazaar/controller/CartController.java b/UB_CartServiceProxy/src/main/java/com/example/urbanbazaar/controller/CartController.java
index 3766983..a41ba74 100644
--- a/UB_CartServiceProxy/src/main/java/com/example/urbanbazaar/controller/CartController.java
+++ b/UB_CartServiceProxy/src/main/java/com/example/urbanbazaar/controller/CartController.java
@@ -3,11 +3,13 @@ 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.Cart;
import com.example.urbanbazaar.repository.CartRepository;
+@CrossOrigin(origins = "http://localhost:63871")
@RestController
public class CartController {
diff --git a/UB_CartServiceProxy/src/main/resources/application.properties b/UB_CartServiceProxy/src/main/resources/application.properties
index e8daca0..3a5e5ef 100644
--- a/UB_CartServiceProxy/src/main/resources/application.properties
+++ b/UB_CartServiceProxy/src/main/resources/application.properties
@@ -1,6 +1,6 @@
-server.port=8004
+server.port=8010
-spring.datasource.url=jdbc:mysql://10.3.117.7:3306/grocery_db?createDatabaseIfNotExist=true
+spring.datasource.url=jdbc:mysql://10.3.117.21:3306/grocery_db?createDatabaseIfNotExist=true
spring.datasource.username=testuser
spring.datasource.password=Password123
diff --git a/UB_OrderServiceProxy/src/main/resources/application.properties b/UB_OrderServiceProxy/src/main/resources/application.properties
index 2220e0b..b0c53bd 100644
--- a/UB_OrderServiceProxy/src/main/resources/application.properties
+++ b/UB_OrderServiceProxy/src/main/resources/application.properties
@@ -1,6 +1,6 @@
-server.port=8003
+server.port=8009
-spring.datasource.url=jdbc:mysql://10.3.117.7:3306/grocery_db?createDatabaseIfNotExist=true
+spring.datasource.url=jdbc:mysql://10.3.117.21:3306/grocery_db?createDatabaseIfNotExist=true
spring.datasource.username=testuser
spring.datasource.password=Password123
diff --git a/UB_ProductServiceProxy/src/main/java/com/example/urbanbazaar/controller/ProductCategoryController.java b/UB_ProductServiceProxy/src/main/java/com/example/urbanbazaar/controller/ProductCategoryController.java
index afc7361..734f31c 100644
--- a/UB_ProductServiceProxy/src/main/java/com/example/urbanbazaar/controller/ProductCategoryController.java
+++ b/UB_ProductServiceProxy/src/main/java/com/example/urbanbazaar/controller/ProductCategoryController.java
@@ -3,11 +3,13 @@ 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 {
diff --git a/UB_ProductServiceProxy/src/main/java/com/example/urbanbazaar/controller/ProductController.java b/UB_ProductServiceProxy/src/main/java/com/example/urbanbazaar/controller/ProductController.java
index cc0b639..3388341 100644
--- a/UB_ProductServiceProxy/src/main/java/com/example/urbanbazaar/controller/ProductController.java
+++ b/UB_ProductServiceProxy/src/main/java/com/example/urbanbazaar/controller/ProductController.java
@@ -6,6 +6,7 @@ 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;
@@ -13,6 +14,7 @@ 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 {
diff --git a/UB_ProductServiceProxy/src/main/resources/application.properties b/UB_ProductServiceProxy/src/main/resources/application.properties
index 37d11d7..238be34 100644
--- a/UB_ProductServiceProxy/src/main/resources/application.properties
+++ b/UB_ProductServiceProxy/src/main/resources/application.properties
@@ -1,6 +1,6 @@
-server.port=8002
+server.port=8007
-spring.datasource.url=jdbc:mysql://10.3.117.7:3306/grocery_db?createDatabaseIfNotExist=true
+spring.datasource.url=jdbc:mysql://10.3.117.21:3306/grocery_db?createDatabaseIfNotExist=true
spring.datasource.username=testuser
spring.datasource.password=Password123
diff --git a/UB_UserServiceProxy/bin/.gitignore b/UB_UserServiceProxy/bin/.gitignore
new file mode 100644
index 0000000..549e00a
--- /dev/null
+++ b/UB_UserServiceProxy/bin/.gitignore
@@ -0,0 +1,33 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
diff --git a/UB_UserServiceProxy/bin/.mvn/wrapper/MavenWrapperDownloader.class b/UB_UserServiceProxy/bin/.mvn/wrapper/MavenWrapperDownloader.class
new file mode 100644
index 0000000..3075e87
Binary files /dev/null and b/UB_UserServiceProxy/bin/.mvn/wrapper/MavenWrapperDownloader.class differ
diff --git a/UB_UserServiceProxy/bin/.mvn/wrapper/maven-wrapper.jar b/UB_UserServiceProxy/bin/.mvn/wrapper/maven-wrapper.jar
new file mode 100644
index 0000000..2cc7d4a
Binary files /dev/null and b/UB_UserServiceProxy/bin/.mvn/wrapper/maven-wrapper.jar differ
diff --git a/UB_UserServiceProxy/bin/.mvn/wrapper/maven-wrapper.properties b/UB_UserServiceProxy/bin/.mvn/wrapper/maven-wrapper.properties
new file mode 100644
index 0000000..abd303b
--- /dev/null
+++ b/UB_UserServiceProxy/bin/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.2/apache-maven-3.8.2-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
diff --git a/UB_UserServiceProxy/bin/mvnw b/UB_UserServiceProxy/bin/mvnw
new file mode 100644
index 0000000..a16b543
--- /dev/null
+++ b/UB_UserServiceProxy/bin/mvnw
@@ -0,0 +1,310 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+# JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+# M2_HOME - location of maven2's installed home dir
+# MAVEN_OPTS - parameters passed to the Java VM when running Maven
+# e.g. to debug Maven itself, use
+# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+ if [ -f /etc/mavenrc ] ; then
+ . /etc/mavenrc
+ fi
+
+ if [ -f "$HOME/.mavenrc" ] ; then
+ . "$HOME/.mavenrc"
+ fi
+
+fi
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+ MINGW*) mingw=true;;
+ Darwin*) darwin=true
+ # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+ # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+ if [ -z "$JAVA_HOME" ]; then
+ if [ -x "/usr/libexec/java_home" ]; then
+ export JAVA_HOME="`/usr/libexec/java_home`"
+ else
+ export JAVA_HOME="/Library/Java/Home"
+ fi
+ fi
+ ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+ if [ -r /etc/gentoo-release ] ; then
+ JAVA_HOME=`java-config --jre-home`
+ fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+ ## resolve links - $0 may be a link to maven's home
+ PRG="$0"
+
+ # need this for relative symlinks
+ while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG="`dirname "$PRG"`/$link"
+ fi
+ done
+
+ saveddir=`pwd`
+
+ M2_HOME=`dirname "$PRG"`/..
+
+ # make it fully qualified
+ M2_HOME=`cd "$M2_HOME" && pwd`
+
+ cd "$saveddir"
+ # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --unix "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME="`(cd "$M2_HOME"; pwd)`"
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+ javaExecutable="`which javac`"
+ if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+ # readlink(1) is not available as standard on Solaris 10.
+ readLink=`which readlink`
+ if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+ if $darwin ; then
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+ else
+ javaExecutable="`readlink -f \"$javaExecutable\"`"
+ fi
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+ JAVA_HOME="$javaHome"
+ export JAVA_HOME
+ fi
+ fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD="`which java`"
+ fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly." >&2
+ echo " We cannot execute $JAVACMD" >&2
+ exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+ echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+ if [ -z "$1" ]
+ then
+ echo "Path not specified to find_maven_basedir"
+ return 1
+ fi
+
+ basedir="$1"
+ wdir="$1"
+ while [ "$wdir" != '/' ] ; do
+ if [ -d "$wdir"/.mvn ] ; then
+ basedir=$wdir
+ break
+ fi
+ # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+ if [ -d "${wdir}" ]; then
+ wdir=`cd "$wdir/.."; pwd`
+ fi
+ # end of workaround
+ done
+ echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+ if [ -f "$1" ]; then
+ echo "$(tr -s '\n' ' ' < "$1")"
+ fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+ exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found .mvn/wrapper/maven-wrapper.jar"
+ fi
+else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+ fi
+ if [ -n "$MVNW_REPOURL" ]; then
+ jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ else
+ jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ fi
+ while IFS="=" read key value; do
+ case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+ esac
+ done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Downloading from: $jarUrl"
+ fi
+ wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+ if $cygwin; then
+ wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+ fi
+
+ if command -v wget > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found wget ... using wget"
+ fi
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ wget "$jarUrl" -O "$wrapperJarPath"
+ else
+ wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
+ fi
+ elif command -v curl > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found curl ... using curl"
+ fi
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ curl -o "$wrapperJarPath" "$jarUrl" -f
+ else
+ curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+ fi
+
+ else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Falling back to using Java to download"
+ fi
+ javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+ # For Cygwin, switch paths to Windows format before running javac
+ if $cygwin; then
+ javaClass=`cygpath --path --windows "$javaClass"`
+ fi
+ if [ -e "$javaClass" ]; then
+ if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Compiling MavenWrapperDownloader.java ..."
+ fi
+ # Compiling the Java class
+ ("$JAVA_HOME/bin/javac" "$javaClass")
+ fi
+ if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ # Running the downloader
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Running MavenWrapperDownloader.java ..."
+ fi
+ ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+ fi
+ fi
+ fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+ echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --path --windows "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+ [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+ MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+ $MAVEN_OPTS \
+ -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+ "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+ ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/UB_UserServiceProxy/bin/mvnw.cmd b/UB_UserServiceProxy/bin/mvnw.cmd
new file mode 100644
index 0000000..c8d4337
--- /dev/null
+++ b/UB_UserServiceProxy/bin/mvnw.cmd
@@ -0,0 +1,182 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+@REM
+@REM https://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+
+FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+ IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Found %WRAPPER_JAR%
+ )
+) else (
+ if not "%MVNW_REPOURL%" == "" (
+ SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ )
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Couldn't find %WRAPPER_JAR%, downloading it ...
+ echo Downloading from: %DOWNLOAD_URL%
+ )
+
+ powershell -Command "&{"^
+ "$webclient = new-object System.Net.WebClient;"^
+ "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+ "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+ "}"^
+ "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+ "}"
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Finished downloading %WRAPPER_JAR%
+ )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%
diff --git a/UB_UserServiceProxy/bin/pom.xml b/UB_UserServiceProxy/bin/pom.xml
new file mode 100644
index 0000000..391d8d6
--- /dev/null
+++ b/UB_UserServiceProxy/bin/pom.xml
@@ -0,0 +1,56 @@
+
+
+ 4.0.0
+
+ org.springframework.boot
+ spring-boot-starter-parent
+ 2.5.4
+
+
+ com.example
+ UB_UserServiceProxy
+ 0.0.1-SNAPSHOT
+ UB_UserServiceProxy
+ UrbanBazaar - Online Grocery Shop
+
+ 1.8
+
+
+
+ org.springframework.boot
+ spring-boot-starter-data-jpa
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+
+ org.springframework.boot
+ spring-boot-devtools
+ runtime
+ true
+
+
+ mysql
+ mysql-connector-java
+ runtime
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+
+
+
diff --git a/UB_UserServiceProxy/bin/src/main/java/com/example/urbanbazaar/ServletInitializer.class b/UB_UserServiceProxy/bin/src/main/java/com/example/urbanbazaar/ServletInitializer.class
new file mode 100644
index 0000000..d8a86f8
Binary files /dev/null and b/UB_UserServiceProxy/bin/src/main/java/com/example/urbanbazaar/ServletInitializer.class differ
diff --git a/UB_UserServiceProxy/bin/src/main/java/com/example/urbanbazaar/UbUserServiceProxyApplication.class b/UB_UserServiceProxy/bin/src/main/java/com/example/urbanbazaar/UbUserServiceProxyApplication.class
new file mode 100644
index 0000000..93755c0
Binary files /dev/null and b/UB_UserServiceProxy/bin/src/main/java/com/example/urbanbazaar/UbUserServiceProxyApplication.class differ
diff --git a/UB_UserServiceProxy/bin/src/main/java/com/example/urbanbazaar/controller/MemberUserController.class b/UB_UserServiceProxy/bin/src/main/java/com/example/urbanbazaar/controller/MemberUserController.class
new file mode 100644
index 0000000..2d186bf
Binary files /dev/null and b/UB_UserServiceProxy/bin/src/main/java/com/example/urbanbazaar/controller/MemberUserController.class differ
diff --git a/UB_UserServiceProxy/bin/src/main/java/com/example/urbanbazaar/controller/UserController.class b/UB_UserServiceProxy/bin/src/main/java/com/example/urbanbazaar/controller/UserController.class
new file mode 100644
index 0000000..5e4e783
Binary files /dev/null and b/UB_UserServiceProxy/bin/src/main/java/com/example/urbanbazaar/controller/UserController.class differ
diff --git a/UB_UserServiceProxy/bin/src/main/java/com/example/urbanbazaar/model/MemberUser.class b/UB_UserServiceProxy/bin/src/main/java/com/example/urbanbazaar/model/MemberUser.class
new file mode 100644
index 0000000..873b82f
Binary files /dev/null and b/UB_UserServiceProxy/bin/src/main/java/com/example/urbanbazaar/model/MemberUser.class differ
diff --git a/UB_UserServiceProxy/bin/src/main/java/com/example/urbanbazaar/model/User.class b/UB_UserServiceProxy/bin/src/main/java/com/example/urbanbazaar/model/User.class
new file mode 100644
index 0000000..701a456
Binary files /dev/null and b/UB_UserServiceProxy/bin/src/main/java/com/example/urbanbazaar/model/User.class differ
diff --git a/UB_UserServiceProxy/bin/src/main/java/com/example/urbanbazaar/model/UserLogin.class b/UB_UserServiceProxy/bin/src/main/java/com/example/urbanbazaar/model/UserLogin.class
new file mode 100644
index 0000000..7194a74
Binary files /dev/null and b/UB_UserServiceProxy/bin/src/main/java/com/example/urbanbazaar/model/UserLogin.class differ
diff --git a/UB_UserServiceProxy/bin/src/main/java/com/example/urbanbazaar/repository/MemberUserRepository.class b/UB_UserServiceProxy/bin/src/main/java/com/example/urbanbazaar/repository/MemberUserRepository.class
new file mode 100644
index 0000000..bcc9d2d
Binary files /dev/null and b/UB_UserServiceProxy/bin/src/main/java/com/example/urbanbazaar/repository/MemberUserRepository.class differ
diff --git a/UB_UserServiceProxy/bin/src/main/java/com/example/urbanbazaar/repository/UserRepository.class b/UB_UserServiceProxy/bin/src/main/java/com/example/urbanbazaar/repository/UserRepository.class
new file mode 100644
index 0000000..cce83b0
Binary files /dev/null and b/UB_UserServiceProxy/bin/src/main/java/com/example/urbanbazaar/repository/UserRepository.class differ
diff --git a/UB_UserServiceProxy/bin/src/main/resources/application.properties b/UB_UserServiceProxy/bin/src/main/resources/application.properties
new file mode 100644
index 0000000..83b07d7
--- /dev/null
+++ b/UB_UserServiceProxy/bin/src/main/resources/application.properties
@@ -0,0 +1,12 @@
+server.port=8001
+
+spring.datasource.url=jdbc:mysql://10.3.117.7:3306/grocery_db?createDatabaseIfNotExist=true
+spring.datasource.username=testuser
+spring.datasource.password=Password123
+
+server.servlet.context-path=/user
+spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
+
+spring.jpa.hibernate.ddl-auto=update
+spring.jackson.serialization.fail-on-empty-beans=false
+spring.jpa.properties.hibernate.format_sql=true
\ No newline at end of file
diff --git a/UB_UserServiceProxy/bin/src/test/java/com/example/urbanbazaar/UbUserServiceProxyApplicationTests.class b/UB_UserServiceProxy/bin/src/test/java/com/example/urbanbazaar/UbUserServiceProxyApplicationTests.class
new file mode 100644
index 0000000..312236f
Binary files /dev/null and b/UB_UserServiceProxy/bin/src/test/java/com/example/urbanbazaar/UbUserServiceProxyApplicationTests.class differ
diff --git a/UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/controller/MemberUserController.java b/UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/controller/MemberUserController.java
index 96d26e8..8a7841c 100644
--- a/UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/controller/MemberUserController.java
+++ b/UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/controller/MemberUserController.java
@@ -3,14 +3,19 @@ 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 {
@@ -27,10 +32,26 @@ public class MemberUserController {
public List showMembers() {
return repo.findAll();
}
+ @GetMapping("/searchMember/{memberid}")
+ public MemberUser searchMemberUser(@PathVariable int memberid) {
+ return repo.findById(memberid).get();
+ }
@GetMapping("/showUserMembers/{userId}")
public List 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);
+
+ }
}
diff --git a/UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/controller/UserController.java b/UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/controller/UserController.java
index 835536b..6fc1c70 100644
--- a/UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/controller/UserController.java
+++ b/UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/controller/UserController.java
@@ -2,12 +2,17 @@ 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;
@@ -15,17 +20,30 @@ 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 void addUser(@RequestBody User user) {
- repo.save(user);
- }
+ public ResponseEntity addUser(@RequestBody User user) {
+ String tempusername =user.getUserfirstname();
+ if(tempusername !=null && !"".equals(tempusername)) {
+ User usero=repo.findByuserfirstname(tempusername);
+ if (usero!=null) {
+ return new ResponseEntity("user with "+tempusername+ " already exists", HttpStatus.BAD_REQUEST);
+// throw new Exception();
+ }
+
+ }
+ repo.save(user);
+ return new ResponseEntity("Registration success !!", HttpStatus.OK);}
@GetMapping("/showAllUsers")
public List showUsers() {
@@ -41,7 +59,7 @@ public class UserController {
public User findUserByName(@PathVariable String name) {
return repo.findByuserfirstname(name);
}
-
+
@PostMapping("/login")
public ResponseEntity userLogin(@RequestBody UserLogin user) {
User currentUser = repo.findByuserfirstname(user.getUserfirstname());
@@ -51,4 +69,17 @@ public class UserController {
return new ResponseEntity("Password mismatch.", HttpStatus.BAD_REQUEST);
return new ResponseEntity("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);
+ }
}
diff --git a/UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/model/MemberUser.java b/UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/model/MemberUser.java
index ca2a7d4..9e73f6b 100644
--- a/UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/model/MemberUser.java
+++ b/UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/model/MemberUser.java
@@ -8,14 +8,23 @@ import javax.persistence.Table;
@Table(name = "members")
public class MemberUser {
- @Id
+
private int userid;
+ @Id
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;
}
@@ -63,17 +72,19 @@ 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) {
+ float membertotalamount, int memberdoornumber) {
+ super();
this.userid = userid;
this.memberid = memberid;
this.membername = membername;
this.totalitems = totalitems;
this.memberphone = memberphone;
this.membertotalamount = membertotalamount;
+ this.memberdoornumber = memberdoornumber;
}
-
+
public MemberUser() {
}
diff --git a/UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/model/User.java b/UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/model/User.java
index 5f5eea8..169288a 100644
--- a/UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/model/User.java
+++ b/UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/model/User.java
@@ -4,6 +4,7 @@ import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
+import javax.persistence.GenerationType;
@Entity
@Table(name = "users")
@@ -22,7 +23,7 @@ public class User {
private String useraddress2;
@Id
- @GeneratedValue
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
public int getUserid() {
return userid;
}
diff --git a/UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/repository/MemberUserRepository.java b/UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/repository/MemberUserRepository.java
index 610d660..66cc203 100644
--- a/UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/repository/MemberUserRepository.java
+++ b/UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/repository/MemberUserRepository.java
@@ -3,10 +3,11 @@ 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 {
-
- public List findByuserid(int userId);
+ @Query(value="select * from members where members.UserId = ?1",nativeQuery=true)
+ public List findByuserid(int userId);
}
diff --git a/UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/repository/UserRepository.java b/UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/repository/UserRepository.java
index 6a2ed7a..c159c3d 100644
--- a/UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/repository/UserRepository.java
+++ b/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 {
- // @Query(value="select * from user where UserFirstName=?1" , nativeQuery=true)
+
public User findByuserfirstname(String username);
}
diff --git a/UB_UserServiceProxy/src/main/resources/application.properties b/UB_UserServiceProxy/src/main/resources/application.properties
index 83b07d7..eb13526 100644
--- a/UB_UserServiceProxy/src/main/resources/application.properties
+++ b/UB_UserServiceProxy/src/main/resources/application.properties
@@ -1,6 +1,6 @@
-server.port=8001
+server.port=8008
-spring.datasource.url=jdbc:mysql://10.3.117.7:3306/grocery_db?createDatabaseIfNotExist=true
+spring.datasource.url=jdbc:mysql://10.3.117.21:3306/grocery_db?createDatabaseIfNotExist=true
spring.datasource.username=testuser
spring.datasource.password=Password123