diff --git a/src/app/admin/_commonCard.scss b/src/app/admin/_commonCard.scss deleted file mode 100644 index 6d6e553..0000000 --- a/src/app/admin/_commonCard.scss +++ /dev/null @@ -1,115 +0,0 @@ -.common_card{ - position: relative; - width: 25vw; - height: 100%; - border-radius: 10px; - margin: 10px; - z-index: 1; - - &:before{ - content: ''; - width: 100%; - height: 100%; - position: absolute; - box-shadow: 0 0 10px 1px var(--dark-grey); - filter: brightness(200%); - z-index: -1; - border-radius: 10px; - } -} - -.card_header{ - position: relative; - width: 100%; - height: 50px; - display: flex; - justify-content: space-between; - align-items: center; - z-index: 1; - - &:before{ - content: ''; - position: absolute; - width: 100%; - height: 100%; - background-color: var(--grey); - filter: brightness(150%); - z-index: -1; - border-radius: 10px 10px 0 0; - - } - - h4{ - font-size: 18px; - color: var(--dark-grey); - margin: 0 20px; - } - - button{ - width: 30px; - height: 30px; - padding: 0; - border-radius: 30px; - font-weight: 800; - font-size: 20px; - margin: 0 20px; - } -} -.card_upfold{ - overflow: auto; - list-style: none; - height: 300px; - - h5{ - font-size: 16px; - color: var(--dark-grey); - padding: 5px 0; - } - p{ - font-size: 14px; - color: var(--grey); - padding: 5px 0; - } - - .cardList{ - position: relative; - margin: 20px; - cursor: pointer; - z-index: 0; - - &:before{ - content: ''; - position: absolute; - width: 100%; - height: 100%; - background-color: var(--grey); - filter: brightness(160%); - z-index: -1; - transform: scale(105%); - border-radius: 10px; - border: 1px solid var(--grey); - - } - } -} - -::-webkit-scrollbar { - width: 5px; - border-radius: 10px; - background: var(--dark-grey); - } - - ::-webkit-scrollbar-track { - background: white; - border-radius: 10px; - } - - ::-webkit-scrollbar-thumb { - border-radius: 10px; - background: var(--grey); - } - - ::-webkit-scrollbar-thumb:hover { - border-radius: 10px; - background: var(--dark-grey); - } \ No newline at end of file diff --git a/src/app/admin/admin.component.scss b/src/app/admin/admin.component.scss index 53a94a6..206f4b4 100644 --- a/src/app/admin/admin.component.scss +++ b/src/app/admin/admin.component.scss @@ -86,7 +86,7 @@ .malls{ display: grid; - grid-template-columns: repeat(3, 1fr); + grid-template-columns: repeat(2, 1fr); :nth-child(n){ margin: 30px; diff --git a/src/app/admin/malls/malls.component.html b/src/app/admin/malls/malls.component.html index 0b75819..89407db 100644 --- a/src/app/admin/malls/malls.component.html +++ b/src/app/admin/malls/malls.component.html @@ -1,4 +1,4 @@ -
+

Malls

@@ -7,20 +7,22 @@
+
  • - +
    {{malls.mall_name}}

    {{malls.description}}

    -
    - Outlets: {{malls.outlet.length}} - Outlets: 0 - Rating: {{malls.rating}} - Location: {{malls.mall_address}} -
    -
    +
    + Id: {{malls.mall_id}} + Outlets: {{malls.outlet.length}} + Outlets: 0 + Rating: {{malls.rating}} + {{malls.mall_address}} +
    +
  • diff --git a/src/app/admin/malls/malls.component.scss b/src/app/admin/malls/malls.component.scss index 57c5bf7..256392c 100644 --- a/src/app/admin/malls/malls.component.scss +++ b/src/app/admin/malls/malls.component.scss @@ -1,16 +1,10 @@ -@import '../commonCard'; - -.common_card { - width: 100%; -} - .card_header { div { display: flex; align-items: center; input { - width: 150px; + width: 200px; height: 32px; border: none; border-radius: 10px; @@ -22,66 +16,96 @@ } -.mallList { - display: flex; - align-items: center; - position: relative; - margin: 20px; - - &:before { - content: ''; - position: absolute; - width: 100%; - height: 100%; - background-color: var(--grey); - filter: brightness(160%); - z-index: -1; - border-radius: 10px; - border: 1px solid var(--grey); - } - - img { - width: 100px; - height: 100px; - border-radius: 10px; - } +.card_upfold{ + overflow: auto; + list-style: none; + height: 300px; - .upfold-content { - padding: 0 10px; + .mallList { + display: flex; + align-items: center; position: relative; + margin: 20px; - p { - text-overflow: ellipsis; - white-space: nowrap; - overflow: hidden; - width: 300px; + &:before { + content: ''; + position: absolute; + width: 100%; + height: 100%; + background-color: var(--grey); + filter: brightness(160%); + z-index: -1; + border-radius: 10px; + border: 1px solid var(--grey); } - .rating { - i { + .mall-img { + width: 100px; + height: 100px; + border-radius: 10px; + } - color: var(--grey); + .editsvg{ + border: 2px solid var(--brand-blue); + border-radius: 50px; + padding: 4px; + margin: 20px; + width: 30px; + transform: scale(100%); + transition: 0.2s transform ease-in; + cursor: pointer; + margin-right: 30px; + + &:hover{ + transform: scale(110%); + transition: 0.2s all ease-in; } } - div { - display: flex; - align-items: center; + .upfold-content { + padding: 0 10px; + position: relative; + width: 100%; + width: 90%; + h5{ + font-size: 16px; + color: var(--dark-grey); + padding: 5px 0; + } + + p { + font-size: 14px; + color: var(--grey); + overflow: hidden; + width: 300px; + height: 55px; + width: 400px; + font-weight: 500; + } + } + + div{ span { - margin: 10px 0; + width: 100%; margin-right: 10px; color: var(--grey); + font-size: 15px; + font-weight: 500; + display: inline-flex; - img { - width: 10px; - height: 10px; + img{ + display: block; + width: 15px; + margin-left: 5px; } } + } } } + .popUp { position: fixed; width: 100%; diff --git a/src/app/admin/malls/malls.component.ts b/src/app/admin/malls/malls.component.ts index 3ce9df6..adf4245 100644 --- a/src/app/admin/malls/malls.component.ts +++ b/src/app/admin/malls/malls.component.ts @@ -106,6 +106,7 @@ export class MallsComponent implements OnInit { arrayofMalls.push(data.mall) }) this.allMalls = arrayofMalls; + console.log(arrayofMalls) this.tempMalls = arrayofMalls; localStorage.allMalls = JSON.stringify(arrayofMalls) diff --git a/src/app/admin/notificaiton/notificaiton.component.html b/src/app/admin/notificaiton/notificaiton.component.html index 78b8495..8bf59b4 100644 --- a/src/app/admin/notificaiton/notificaiton.component.html +++ b/src/app/admin/notificaiton/notificaiton.component.html @@ -1,4 +1,4 @@ -
    +

    Notification

    diff --git a/src/app/admin/notificaiton/notificaiton.component.scss b/src/app/admin/notificaiton/notificaiton.component.scss index 585e86f..e929762 100644 --- a/src/app/admin/notificaiton/notificaiton.component.scss +++ b/src/app/admin/notificaiton/notificaiton.component.scss @@ -1 +1,37 @@ -@import '../commonCard' \ No newline at end of file +.card_upfold{ + overflow: auto; + list-style: none; + height: 300px; + + h5{ + font-size: 16px; + color: var(--dark-grey); + padding: 5px 0; + } + p{ + font-size: 14px; + color: var(--grey); + padding: 5px 0; + } + + .cardList{ + position: relative; + margin: 20px; + cursor: pointer; + z-index: 0; + + &:before{ + content: ''; + position: absolute; + width: 100%; + height: 100%; + background-color: var(--grey); + filter: brightness(160%); + z-index: -1; + transform: scale(105%); + border-radius: 10px; + border: 1px solid var(--grey); + + } + } +} \ No newline at end of file diff --git a/src/app/admin/queries/queries.component.html b/src/app/admin/queries/queries.component.html index 2eb6e69..7670804 100644 --- a/src/app/admin/queries/queries.component.html +++ b/src/app/admin/queries/queries.component.html @@ -1,4 +1,4 @@ -
    +

    Queries

    diff --git a/src/app/admin/queries/queries.component.scss b/src/app/admin/queries/queries.component.scss index 283b85a..e929762 100644 --- a/src/app/admin/queries/queries.component.scss +++ b/src/app/admin/queries/queries.component.scss @@ -1 +1,37 @@ -@import "../commonCard"; \ No newline at end of file +.card_upfold{ + overflow: auto; + list-style: none; + height: 300px; + + h5{ + font-size: 16px; + color: var(--dark-grey); + padding: 5px 0; + } + p{ + font-size: 14px; + color: var(--grey); + padding: 5px 0; + } + + .cardList{ + position: relative; + margin: 20px; + cursor: pointer; + z-index: 0; + + &:before{ + content: ''; + position: absolute; + width: 100%; + height: 100%; + background-color: var(--grey); + filter: brightness(160%); + z-index: -1; + transform: scale(105%); + border-radius: 10px; + border: 1px solid var(--grey); + + } + } +} \ No newline at end of file diff --git a/src/app/admin/support-tickets/support-tickets.component.html b/src/app/admin/support-tickets/support-tickets.component.html index 67370f2..952bb8b 100644 --- a/src/app/admin/support-tickets/support-tickets.component.html +++ b/src/app/admin/support-tickets/support-tickets.component.html @@ -1,4 +1,4 @@ -
    +

    Support Ticket

    diff --git a/src/app/admin/support-tickets/support-tickets.component.scss b/src/app/admin/support-tickets/support-tickets.component.scss index 585e86f..e929762 100644 --- a/src/app/admin/support-tickets/support-tickets.component.scss +++ b/src/app/admin/support-tickets/support-tickets.component.scss @@ -1 +1,37 @@ -@import '../commonCard' \ No newline at end of file +.card_upfold{ + overflow: auto; + list-style: none; + height: 300px; + + h5{ + font-size: 16px; + color: var(--dark-grey); + padding: 5px 0; + } + p{ + font-size: 14px; + color: var(--grey); + padding: 5px 0; + } + + .cardList{ + position: relative; + margin: 20px; + cursor: pointer; + z-index: 0; + + &:before{ + content: ''; + position: absolute; + width: 100%; + height: 100%; + background-color: var(--grey); + filter: brightness(160%); + z-index: -1; + transform: scale(105%); + border-radius: 10px; + border: 1px solid var(--grey); + + } + } +} \ No newline at end of file diff --git a/src/app/admin/vendors/vendors.component.html b/src/app/admin/vendors/vendors.component.html index 3a18dac..e8612f2 100644 --- a/src/app/admin/vendors/vendors.component.html +++ b/src/app/admin/vendors/vendors.component.html @@ -1,24 +1,18 @@ -
    +

    Vendors

    -
    -
  • - +
  • +
    -
    {{vendor.vendorName}}
    -
    - Outlets: {{vendor.outlets.length}} - Outlets: 0 - Rating: {{vendor.ratings}} - Location: {{vendor.vendorAddress}} -
    - +
    Id:{{vendor.vendor_Id}} {{vendor.vendorName}}
    + Ph: {{vendor.vendorOfficeNo}}
  • diff --git a/src/app/admin/vendors/vendors.component.scss b/src/app/admin/vendors/vendors.component.scss index 57c5bf7..b91c516 100644 --- a/src/app/admin/vendors/vendors.component.scss +++ b/src/app/admin/vendors/vendors.component.scss @@ -1,7 +1,21 @@ -@import '../commonCard'; - -.common_card { +.card { + position: relative; width: 100%; + height: 100%; + border-radius: 10px; + margin: 10px; + z-index: 0; + + &:before{ + content: ''; + width: 100%; + height: 100%; + position: absolute; + box-shadow: 0 0 10px 1px var(--dark-grey); + filter: brightness(200%); + z-index: -1; + border-radius: 10px; + } } .card_header { @@ -10,7 +24,7 @@ align-items: center; input { - width: 150px; + width: 200px; height: 32px; border: none; border-radius: 10px; @@ -22,7 +36,7 @@ } -.mallList { +.vendorList { display: flex; align-items: center; position: relative; diff --git a/src/app/admin/vendors/vendors.component.ts b/src/app/admin/vendors/vendors.component.ts index affbd52..a8c0e09 100644 --- a/src/app/admin/vendors/vendors.component.ts +++ b/src/app/admin/vendors/vendors.component.ts @@ -11,14 +11,15 @@ export class VendorsComponent implements OnInit { constructor(private vendorService: VendorService) { } vendors: any + ngOnInit() { - this.getVendorInfo() + this.getVendorInfo(); } getVendorInfo() { this.vendorService.getAllVendors().then(vendors => { this.vendors = vendors - console.log(vendors) + console.log(this.vendors) }, () => { console.log("Error Getting Vendors") }) diff --git a/src/assets/edit.svg b/src/assets/edit.svg new file mode 100644 index 0000000..792d2a7 --- /dev/null +++ b/src/assets/edit.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/location.svg b/src/assets/location.svg new file mode 100644 index 0000000..2305685 --- /dev/null +++ b/src/assets/location.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/outlet.svg b/src/assets/outlet.svg new file mode 100644 index 0000000..9fa1fc6 --- /dev/null +++ b/src/assets/outlet.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/star.svg b/src/assets/star.svg index 8236a7b..f6888ca 100644 --- a/src/assets/star.svg +++ b/src/assets/star.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/styles.scss b/src/styles.scss index 681fc2b..6b9b090 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -249,3 +249,90 @@ button { } } } + +.card{ + position: relative; + width: 100%; + height: 100%; + border-radius: 10px; + margin: 10px; + z-index: 1; + + &:before{ + content: ''; + width: 100%; + height: 100%; + position: absolute; + box-shadow: 0 0 10px 1px var(--dark-grey); + filter: brightness(200%); + z-index: -1; + border-radius: 10px; + } + + .card_header{ + position: relative; + width: 100%; + height: 50px; + display: flex; + justify-content: space-between; + align-items: center; + z-index: 1; + + &:before{ + content: ''; + position: absolute; + width: 100%; + height: 100%; + background-color: var(--grey); + filter: brightness(150%); + z-index: -1; + border-radius: 10px 10px 0 0; + + } + + h4{ + font-size: 18px; + color: var(--dark-grey); + margin: 0 20px; + } + + button{ + width: 30px; + height: 30px; + padding: 0; + border-radius: 30px; + font-weight: 800; + font-size: 20px; + margin: 0 20px; + transform: scale(100%); + transition: 0.2s all ease-in; + + &:hover{ + transform: scale(110%); + transition: 0.2s all ease-in; + } + + } + } +} + +::-webkit-scrollbar { + width: 5px; + border-radius: 10px; + background: var(--dark-grey); + } + + ::-webkit-scrollbar-track { + background: white; + border-radius: 10px; + } + + ::-webkit-scrollbar-thumb { + border-radius: 10px; + background: var(--grey); + } + + ::-webkit-scrollbar-thumb:hover { + border-radius: 10px; + background: var(--dark-grey); + } \ No newline at end of file