diff --git a/Angular-UrbanBazaar/src/app/components/cart/cart.component.ts b/Angular-UrbanBazaar/src/app/components/cart/cart.component.ts index 9295a9c..e676180 100644 --- a/Angular-UrbanBazaar/src/app/components/cart/cart.component.ts +++ b/Angular-UrbanBazaar/src/app/components/cart/cart.component.ts @@ -16,17 +16,19 @@ export class CartComponent implements OnInit { user : User; constructor(private cartservice : CartService) { - this.user = JSON.parse(localStorage.getItem('currentUser')); - this.cartdetails = this.cartservice.showCartForUser(this.user.userid); + //this.user = JSON.parse(localStorage.getItem('currentUser')); + //this.cartdetails = this.cartservice.showCartForUser(this.user.userid); + this.cartservice.showCart().subscribe(v=> this.cartdetails=v); } ngOnInit(): void { - this.user = JSON.parse(localStorage.getItem('currentUser')); - this.cartdetails = this.cartservice.showCartForUser(this.user.userid); + // this.user = JSON.parse(localStorage.getItem('currentUser')); + // this.cartdetails = this.cartservice.showCartForUser(this.user.userid); + this.cartservice.showCart().subscribe(v=> this.cartdetails=v); } public removeItem(cart_id : number){ - this.cartservice.deleteCartItemForUserId(cart_id); + // this.cartservice.deleteCartItemForUserId(cart_id); } public addCartItem(cartItem : Cart) { @@ -34,7 +36,7 @@ export class CartComponent implements OnInit { } public emptyCart() { - this.cartservice.removeAllCartForUserId(this.user.userid); + // this.cartservice.removeAllCartForUserId(this.user.userid); } } diff --git a/Angular-UrbanBazaar/src/app/components/home/home.component.ts b/Angular-UrbanBazaar/src/app/components/home/home.component.ts index 12b3125..a8946d2 100644 --- a/Angular-UrbanBazaar/src/app/components/home/home.component.ts +++ b/Angular-UrbanBazaar/src/app/components/home/home.component.ts @@ -28,7 +28,9 @@ export class HomeComponent implements OnInit { } addCart(item:any){ - this.cartservice.addCartItem(item); + this.cartservice.addCartItem(item); + console.log(this.cartservice.addCartItem(item)) + console.log(item) } searchProduct() { diff --git a/Angular-UrbanBazaar/src/app/models/cart.ts b/Angular-UrbanBazaar/src/app/models/cart.ts index e9568b2..851db93 100644 --- a/Angular-UrbanBazaar/src/app/models/cart.ts +++ b/Angular-UrbanBazaar/src/app/models/cart.ts @@ -1,10 +1,22 @@ export class Cart { - public cartid : number; - public userid : number; - public orderid : number; + // public cartid : number; + // public userid : number; + // public orderid : number; + // public productname : string; + // public productprice : number; + // public quantity : number; + + + public productid : number; public productname : string; public productprice : number; - public quantity : number; + public productweight : number; + public productshortdesc : string; + public productlongdesc : string; + public productimage : string; + public userid : number; + public productcategoryid : number; + // public quantity : number; constructor() {} } diff --git a/Angular-UrbanBazaar/src/app/services/cart.service.ts b/Angular-UrbanBazaar/src/app/services/cart.service.ts index 56dcc78..6cb76cb 100644 --- a/Angular-UrbanBazaar/src/app/services/cart.service.ts +++ b/Angular-UrbanBazaar/src/app/services/cart.service.ts @@ -9,64 +9,70 @@ import { Cart } from '../models/cart'; }) export class CartService { - private _url : String = "http://localhost:4405/cart"; + private _url : String = "http://localhost:8004/cart"; constructor(private _http : HttpClient) { } - // public showAllOrder():Observable - // { - // return this._http.get(this._url+"/showCart"); - // } + public addCartItem(item:Cart) + { + this._http.post(this._url+"/addCartItem",item); + // console.log(item); + } - public cartListItem: any=[] - public productList = new BehaviorSubject([]) + public showCart():Observable + { + return this._http.get(this._url+"/showCart"); + } + + // public cartListItem: any=[] + // public productList = new BehaviorSubject([]) // public addOrder(cart:Cart) // { // this._http.post(this._url+"/addCart",cart) // } - getProducts() - { - return this.productList.asObservable(); - } + // getProducts() + // { + // return this.productList.asObservable(); + // } - setProduct(product:any) - { - this.cartListItem.push(...product); - this.productList.next(product); - } + // setProduct(product:any) + // { + // this.cartListItem.push(...product); + // this.productList.next(product); + // } - addtoCart(product:any) - { - this.cartListItem.push(product); - this.productList.next(this.cartListItem) - this.getTotalPrice(); - // console.log(this.cartListItem); - } + // addtoCart(product:any) + // { + // this.cartListItem.push(product); + // this.productList.next(this.cartListItem) + // this.getTotalPrice(); + // // console.log(this.cartListItem); + // } - getTotalPrice():number{ - let grandTotal=0; - this.cartListItem.map((a:any)=>{ - grandTotal+=a.productprice; - }) - return grandTotal; - } + // getTotalPrice():number{ + // let grandTotal=0; + // this.cartListItem.map((a:any)=>{ + // grandTotal+=a.productprice; + // }) + // return grandTotal; + // } - removeCartItem(product:any) - { - this.cartListItem.map((a:any,index:any)=>{ - if(product.productid === a.productid) - { - this.cartListItem.splice(index,1); - } - }) - this.productList.next(this.cartListItem); - } + // removeCartItem(product:any) + // { + // this.cartListItem.map((a:any,index:any)=>{ + // if(product.productid === a.productid) + // { + // this.cartListItem.splice(index,1); + // } + // }) + // this.productList.next(this.cartListItem); + // } - removeAllCart() - { - this.cartListItem=[] - this.productList.next(this.cartListItem); - } + // removeAllCart() + // { + // this.cartListItem=[] + // this.productList.next(this.cartListItem); + // } diff --git a/Angular-UrbanBazaar/src/app/services/member-user.service.ts b/Angular-UrbanBazaar/src/app/services/member-user.service.ts index a5e6fe7..99aeecc 100644 --- a/Angular-UrbanBazaar/src/app/services/member-user.service.ts +++ b/Angular-UrbanBazaar/src/app/services/member-user.service.ts @@ -8,7 +8,7 @@ import { MemberUser } from '../models/member-user'; }) export class MemberUserService { - private _url : String = "http://localhost:4405/user"; + private _url : String = "http://localhost:4200/user"; constructor(private _http : HttpClient) { } diff --git a/Angular-UrbanBazaar/src/app/services/orders.service.ts b/Angular-UrbanBazaar/src/app/services/orders.service.ts index 5c84bbf..749f7ea 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:4405/orders"; + private _url : String = "http://localhost:8003/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 f6730a7..609b740 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:4405/products"; + private _url : String = "http://localhost:4200/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 b47ae52..435bbde 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:4405/products"; + private _url : String = "http://localhost:8002/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 eba6ae2..9076cc5 100644 --- a/Angular-UrbanBazaar/src/app/services/user.service.ts +++ b/Angular-UrbanBazaar/src/app/services/user.service.ts @@ -9,7 +9,7 @@ import { User } from '../models/user'; }) export class UserService { - private _url : String = "http://localhost:4405/user"; + private _url : String = "http://localhost:8006/user"; currentUser : User; constructor(private _http : HttpClient) { } diff --git a/UB_CartServiceProxy/bin/.gitignore b/UB_CartServiceProxy/bin/.gitignore new file mode 100644 index 0000000..549e00a --- /dev/null +++ b/UB_CartServiceProxy/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_CartServiceProxy/bin/.mvn/wrapper/MavenWrapperDownloader.class b/UB_CartServiceProxy/bin/.mvn/wrapper/MavenWrapperDownloader.class new file mode 100644 index 0000000..860ca68 Binary files /dev/null and b/UB_CartServiceProxy/bin/.mvn/wrapper/MavenWrapperDownloader.class differ diff --git a/UB_CartServiceProxy/bin/.mvn/wrapper/maven-wrapper.jar b/UB_CartServiceProxy/bin/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000..2cc7d4a Binary files /dev/null and b/UB_CartServiceProxy/bin/.mvn/wrapper/maven-wrapper.jar differ diff --git a/UB_CartServiceProxy/bin/.mvn/wrapper/maven-wrapper.properties b/UB_CartServiceProxy/bin/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..abd303b --- /dev/null +++ b/UB_CartServiceProxy/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_CartServiceProxy/bin/mvnw b/UB_CartServiceProxy/bin/mvnw new file mode 100644 index 0000000..a16b543 --- /dev/null +++ b/UB_CartServiceProxy/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_CartServiceProxy/bin/mvnw.cmd b/UB_CartServiceProxy/bin/mvnw.cmd new file mode 100644 index 0000000..c8d4337 --- /dev/null +++ b/UB_CartServiceProxy/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_CartServiceProxy/bin/pom.xml b/UB_CartServiceProxy/bin/pom.xml new file mode 100644 index 0000000..3dd5b8d --- /dev/null +++ b/UB_CartServiceProxy/bin/pom.xml @@ -0,0 +1,56 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.5.4 + + + com.example + UB_CartServiceProxy + 0.0.1-SNAPSHOT + UB_CartServiceProxy + 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_CartServiceProxy/bin/src/main/java/com/example/urbanbazaar/ServletInitializer.class b/UB_CartServiceProxy/bin/src/main/java/com/example/urbanbazaar/ServletInitializer.class new file mode 100644 index 0000000..fe1424e Binary files /dev/null and b/UB_CartServiceProxy/bin/src/main/java/com/example/urbanbazaar/ServletInitializer.class differ diff --git a/UB_CartServiceProxy/bin/src/main/java/com/example/urbanbazaar/UbCartServiceProxyApplication.class b/UB_CartServiceProxy/bin/src/main/java/com/example/urbanbazaar/UbCartServiceProxyApplication.class new file mode 100644 index 0000000..0059b23 Binary files /dev/null and b/UB_CartServiceProxy/bin/src/main/java/com/example/urbanbazaar/UbCartServiceProxyApplication.class differ diff --git a/UB_CartServiceProxy/bin/src/main/java/com/example/urbanbazaar/controller/CartController.class b/UB_CartServiceProxy/bin/src/main/java/com/example/urbanbazaar/controller/CartController.class new file mode 100644 index 0000000..aa46fa4 Binary files /dev/null and b/UB_CartServiceProxy/bin/src/main/java/com/example/urbanbazaar/controller/CartController.class differ diff --git a/UB_CartServiceProxy/bin/src/main/java/com/example/urbanbazaar/model/Cart.class b/UB_CartServiceProxy/bin/src/main/java/com/example/urbanbazaar/model/Cart.class new file mode 100644 index 0000000..b317631 Binary files /dev/null and b/UB_CartServiceProxy/bin/src/main/java/com/example/urbanbazaar/model/Cart.class differ diff --git a/UB_CartServiceProxy/bin/src/main/java/com/example/urbanbazaar/repository/CartRepository.class b/UB_CartServiceProxy/bin/src/main/java/com/example/urbanbazaar/repository/CartRepository.class new file mode 100644 index 0000000..775e900 Binary files /dev/null and b/UB_CartServiceProxy/bin/src/main/java/com/example/urbanbazaar/repository/CartRepository.class differ diff --git a/UB_CartServiceProxy/bin/src/main/resources/application.properties b/UB_CartServiceProxy/bin/src/main/resources/application.properties new file mode 100644 index 0000000..e8daca0 --- /dev/null +++ b/UB_CartServiceProxy/bin/src/main/resources/application.properties @@ -0,0 +1,11 @@ +server.port=8004 + +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=/cart +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect + +spring.jpa.hibernate.ddl-auto=update +spring.jackson.serialization.fail-on-empty-beans=false diff --git a/UB_CartServiceProxy/bin/src/test/java/com/example/urbanbazaar/UbCartServiceProxyApplicationTests.class b/UB_CartServiceProxy/bin/src/test/java/com/example/urbanbazaar/UbCartServiceProxyApplicationTests.class new file mode 100644 index 0000000..cc15cec Binary files /dev/null and b/UB_CartServiceProxy/bin/src/test/java/com/example/urbanbazaar/UbCartServiceProxyApplicationTests.class 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 395e943..908a541 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 @@ -26,6 +26,7 @@ public class CartController { @PostMapping("/addCartItem") public void addCartItemForUserId(@RequestBody Cart cartItem) { repo.save(cartItem); +// System.out.println(cartItem); } @DeleteMapping("/deleteCartItem/{cart_id}") @@ -33,6 +34,12 @@ public class CartController { repo.deleteById(cart_id); } + @GetMapping("/showCart") + public List showCart() + { + return repo.findAll(); + } + @DeleteMapping("/deleteAllCartItemsForUser/{userId}") public void removeCartItemsForUser(int userId){ repo.deleteAllCartItems(userId); diff --git a/UB_CartServiceProxy/src/main/java/com/example/urbanbazaar/model/Cart.java b/UB_CartServiceProxy/src/main/java/com/example/urbanbazaar/model/Cart.java index 5f0dc24..91ee786 100644 --- a/UB_CartServiceProxy/src/main/java/com/example/urbanbazaar/model/Cart.java +++ b/UB_CartServiceProxy/src/main/java/com/example/urbanbazaar/model/Cart.java @@ -7,39 +7,109 @@ import javax.persistence.Table; @Entity @Table(name = "cart") public class Cart { - + +// private int cartid; +// private int userid; +// private int orderid; +// private String productname; +// private int productprice; +// private int quantity; +// +// public Cart() {} +// +// public int getCartid() { +// return cartid; +// } +// +// public void setCartid(int cartid) { +// this.cartid = cartid; +// } +// +// public int getUserid() { +// return userid; +// } +// +// public void setUserid(int userid) { +// this.userid = userid; +// } +// +// public int getOrderid() { +// return orderid; +// } +// +// public void setOrderid(int orderid) { +// this.orderid = orderid; +// } +// +// public String getProductname() { +// return productname; +// } +// +// public void setProductname(String productname) { +// this.productname = productname; +// } +// +// public int getProductprice() { +// return productprice; +// } +// +// public void setProductprice(int productprice) { +// this.productprice = productprice; +// } +// +// public int getQuantity() { +// return quantity; +// } +// +// public void setQuantity(int quantity) { +// this.quantity = quantity; +// } +// +// public Cart(int cartid, int userid, int orderid, String productname, int quantity) { +// super(); +// this.cartid = cartid; +// this.userid = userid; +// this.orderid = orderid; +// this.productname = productname; +// this.quantity = quantity; +// } @Id - private int cartid; + private int productid; private int userid; - private int orderid; private String productname; - private int productprice; - private int quantity; - - public Cart() {} + private float productprice; + private int productcategoryid; - public int getCartid() { - return cartid; + public Cart(int productid, int userid, String productname, float productprice, int productcategoryid) { + super(); + this.productid = productid; + this.userid = userid; + this.productname = productname; + this.productprice = productprice; + this.productcategoryid = productcategoryid; } - public void setCartid(int cartid) { - this.cartid = cartid; + @Override + public String toString() { + return "Cart [productid=" + productid + ", userid=" + userid + ", productname=" + productname + + ", productprice=" + productprice + ", productweight=" + ", productcategoryid=" + productcategoryid + + "]"; } - public int getUserid() { - return userid; + public int getProductid() { + return productid; } - public void setUserid(int userid) { - this.userid = userid; + public void setProductid(int productid) { + this.productid = productid; } - public int getOrderid() { - return orderid; + public int getUserid() { + return userid; } - public void setOrderid(int orderid) { - this.orderid = orderid; + public void setUserid(int userid) { + this.userid = userid; } public String getProductname() { @@ -49,30 +119,25 @@ public class Cart { public void setProductname(String productname) { this.productname = productname; } - - public int getProductprice() { + + public float getProductprice() { return productprice; } - public void setProductprice(int productprice) { + public void setProductprice(float productprice) { this.productprice = productprice; } - public int getQuantity() { - return quantity; + public int getProductcategoryid() { + return productcategoryid; } - public void setQuantity(int quantity) { - this.quantity = quantity; + public void setProductcategoryid(int productcategoryid) { + this.productcategoryid = productcategoryid; } - public Cart(int cartid, int userid, int orderid, String productname, int quantity) { - super(); - this.cartid = cartid; - this.userid = userid; - this.orderid = orderid; - this.productname = productname; - this.quantity = quantity; + public Cart() { + } } diff --git a/UB_CartServiceProxy/src/main/resources/application.properties b/UB_CartServiceProxy/src/main/resources/application.properties index e8daca0..5c29a20 100644 --- a/UB_CartServiceProxy/src/main/resources/application.properties +++ b/UB_CartServiceProxy/src/main/resources/application.properties @@ -1,6 +1,6 @@ server.port=8004 -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..31a6db8 100644 --- a/UB_OrderServiceProxy/src/main/resources/application.properties +++ b/UB_OrderServiceProxy/src/main/resources/application.properties @@ -1,6 +1,6 @@ server.port=8003 -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/resources/application.properties b/UB_ProductServiceProxy/src/main/resources/application.properties index 37d11d7..da1dee7 100644 --- a/UB_ProductServiceProxy/src/main/resources/application.properties +++ b/UB_ProductServiceProxy/src/main/resources/application.properties @@ -1,6 +1,6 @@ server.port=8002 -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/src/main/java/com/example/urbanbazaar/repository/UserRepository.java b/UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/repository/UserRepository.java index 6a2ed7a..8103054 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 @@ -9,5 +9,7 @@ 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..481c4ae 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=8006 -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/grocery_db_tables.sql b/grocery_db_tables.sql index c46ee33..3d92adf 100644 --- a/grocery_db_tables.sql +++ b/grocery_db_tables.sql @@ -151,29 +151,39 @@ create table `members`( FOREIGN KEY (`UserID`) REFERENCES users(`UserID`) ); -INSERT INTO members VALUES(100, 1, "Abhishek", 0,"1234512345", 0); -INSERT INTO members VALUES(100, 2, "Meera", 5,"12345234567", 1200); -INSERT INTO members VALUES(100, 3, "Shyam", 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, - `UserID` int NOT NULL, - `OrderID` int NOT NULL, - `ProductName` varchar(50) NOT NULL, - `ProductPrice` int(5) NOT NULL, - `Quantity` int NOT NULL, - PRIMARY KEY (`CartID`), - FOREIGN KEY (`UserID`) REFERENCES users(`UserID`) + -- `CartID` int NOT NULL AUTO_INCREMENT, +-- `UserID` int NOT NULL, +-- `OrderID` int NOT NULL, +-- `ProductName` varchar(50) NOT NULL, +-- `ProductPrice` int(5) NOT NULL, +-- `Quantity` int NOT NULL, +-- PRIMARY KEY (`CartID`), +-- FOREIGN KEY (`UserID`) REFERENCES users(`UserID`) + `ProductID` int(12) NOT NULL AUTO_INCREMENT, + `UserID` int NOT NULL, + `ProductName` varchar(100) NOT NULL, + `ProductPrice` float NOT NULL, + `ProductCategoryID` int(11) DEFAULT NULL, + PRIMARY KEY (`ProductID`), + FOREIGN KEY (`ProductCategoryID`) REFERENCES productcategories(`CategoryID`), + FOREIGN KEY (`UserID`) REFERENCES users(`UserID`) ); - +insert into cart values (1001,100,"Potato", 30,2); + select * from cart; ALTER TABLE cart AUTO_INCREMENT = 1000; ----------------------------------------------------------------------------------------- -drop user 'testuser'; +drop user if exists 'testuser'; + CREATE USER 'testuser' IDENTIFIED BY 'Password123'; grant all privileges on grocery_db.* to 'testuser'@'%' with grant option;