diff --git a/bookstore-api/.idea/workspace.xml b/bookstore-api/.idea/workspace.xml index e0e36e1..9db61b3 100644 --- a/bookstore-api/.idea/workspace.xml +++ b/bookstore-api/.idea/workspace.xml @@ -930,12 +930,12 @@ - + - diff --git a/store-front/src/app/components/my-profile/my-profile.component.html b/store-front/src/app/components/my-profile/my-profile.component.html index d36662d..bc01105 100644 --- a/store-front/src/app/components/my-profile/my-profile.component.html +++ b/store-front/src/app/components/my-profile/my-profile.component.html @@ -85,31 +85,31 @@ - + - + default - ... + {{{userPayment.cardName}}} - - - + -
-
User info updated.
- + +
User info updated.
+
* Give a name for your card:
- +

@@ -118,29 +118,29 @@
- +
- +
- +
- +
- -
@@ -148,7 +148,7 @@
- +
@@ -163,7 +163,7 @@
- @@ -172,12 +172,12 @@
- +
- +
@@ -190,7 +190,7 @@
- @@ -209,7 +209,7 @@
- @@ -233,7 +233,7 @@
- +
diff --git a/store-front/src/app/components/my-profile/my-profile.component.ts b/store-front/src/app/components/my-profile/my-profile.component.ts index 75bd110..8854645 100644 --- a/store-front/src/app/components/my-profile/my-profile.component.ts +++ b/store-front/src/app/components/my-profile/my-profile.component.ts @@ -28,6 +28,7 @@ export class MyProfileComponent implements OnInit { private recoverEmail:string; private user: User = new User(); + constructor (private loginService: LoginService, private userService: UserService, private router: Router){ } diff --git a/store-front/src/app/models/user-billing.ts b/store-front/src/app/models/user-billing.ts new file mode 100644 index 0000000..1881c72 --- /dev/null +++ b/store-front/src/app/models/user-billing.ts @@ -0,0 +1,10 @@ +export class UserBilling { + public id: number; + public userBillingName: string; + public userBillingStreet1: string; + public userBillingStreet2: string; + public userBillingCity: string; + public userBillingState: string; + public userBillingCountry: string; + public userBillingZipcode: string; +} diff --git a/store-front/src/app/models/user-payment.ts b/store-front/src/app/models/user-payment.ts new file mode 100644 index 0000000..fda368c --- /dev/null +++ b/store-front/src/app/models/user-payment.ts @@ -0,0 +1,14 @@ +import {UserBilling} from './user-billing'; + +export class UserPayment { + public id: number; + public type: string; + public cardName: string; + public cardNumber: string; + public expiryMonth: number; + public expiryYear: number; + public cvc: number; + public holderName: string; + public defaultPayment: boolean; + public userBilling: UserBilling; +} diff --git a/store-front/src/app/models/user.ts b/store-front/src/app/models/user.ts index b29d61a..b21549d 100644 --- a/store-front/src/app/models/user.ts +++ b/store-front/src/app/models/user.ts @@ -1,7 +1,13 @@ +import {UserPayment} from './user-payment'; + export class User { public id: number; public firstName: string; public lastName: string; public username: string; public password: string; + public email: string; + public phone: string; + public enabled: boolean; + public userPaymentList: UserPayment[]; }