diff --git a/resources/images/arrow-left-circle-fill.svg b/resources/images/arrow-left-circle-fill.svg new file mode 100644 index 0000000..2eebe62 --- /dev/null +++ b/resources/images/arrow-left-circle-fill.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/resources/images/arrow-right-circle-fill.svg b/resources/images/arrow-right-circle-fill.svg new file mode 100644 index 0000000..336a34e --- /dev/null +++ b/resources/images/arrow-right-circle-fill.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/resources/images/caret-down.svg b/resources/images/caret-down.svg new file mode 100644 index 0000000..026b0ff --- /dev/null +++ b/resources/images/caret-down.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/resources/images/cart-fill.svg b/resources/images/cart-fill.svg new file mode 100644 index 0000000..a2b95bf --- /dev/null +++ b/resources/images/cart-fill.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/resources/images/chevron-compact-down.svg b/resources/images/chevron-compact-down.svg new file mode 100644 index 0000000..fb1767e --- /dev/null +++ b/resources/images/chevron-compact-down.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/resources/images/chevron-down.svg b/resources/images/chevron-down.svg new file mode 100644 index 0000000..0f92df2 --- /dev/null +++ b/resources/images/chevron-down.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/images/circle.svg b/resources/images/circle.svg new file mode 100644 index 0000000..442a14e --- /dev/null +++ b/resources/images/circle.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/images/plus-square-fill.svg b/resources/images/plus-square-fill.svg new file mode 100644 index 0000000..0d5e15c --- /dev/null +++ b/resources/images/plus-square-fill.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/resources/images/plus.svg b/resources/images/plus.svg new file mode 100644 index 0000000..5b088c0 --- /dev/null +++ b/resources/images/plus.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/resources/js/panel/panel.vue b/resources/js/panel/panel.vue index c1ab6ab..b34bfd4 100644 --- a/resources/js/panel/panel.vue +++ b/resources/js/panel/panel.vue @@ -26,15 +26,40 @@
-
New
+
New

Pending Orders

+
+

Order History

+ + + + + + + + + + + +
DateIDNameStatus Quantity
{{order.updated_at}}{{order.id}}{{order.service.name}}{{order.status.charAt(0).toUpperCase() + + order.status.slice(1)}}{{order.quantity}}
+
@@ -42,12 +67,22 @@ diff --git a/resources/scss/_vars.scss b/resources/scss/_vars.scss index b4a22e8..fe504d5 100644 --- a/resources/scss/_vars.scss +++ b/resources/scss/_vars.scss @@ -13,7 +13,7 @@ $theme-colors: ( "brand-orange": #f67602, "grey": #e6ebf1, "light-grey": #e9e9e9, - "light2-grey": rgb(190,190,190), + "light2-grey": #bebebe, "light3-grey": rgb(245,245,245), "dark-grey": #212121, "faded-text": #425466, @@ -23,6 +23,7 @@ $theme-colors: ( "green": #63b521, "alt-blue-light": #e2f5ff, "alt-blue-medium": #2b96cc, + "text-blue-medium": #425466, "alt-red-light": #f3beb8, "alt-red-medium": #f09898, ); diff --git a/resources/scss/main.scss b/resources/scss/main.scss index aac9836..c98a514 100644 --- a/resources/scss/main.scss +++ b/resources/scss/main.scss @@ -153,7 +153,7 @@ div.hero-filter { div.hero-filter h2 { color: black; opacity: 0.7; - width: 10em; + max-width: 10em; font-size: 2.4em; position: absolute; top: 3em; @@ -415,7 +415,7 @@ section.faq-info .collapsibles { .faq-info .collapsible { text-align: center; - width: 25em; + width: 20em; &:not(.active) .content { display: none; } @@ -768,7 +768,7 @@ main.panel { opacity: 0; } -.recent-pane { +.recent-pane, .history-pane{ table { border-spacing: 4px; margin: auto; @@ -805,6 +805,59 @@ main.panel { td.canceled { color: vars.getColor('red-alert'); } +} + +.pending-pane { + .pending-heading { + position: relative; + border-bottom: 1px solid vars.getColor('light2-grey'); + // background-color: vars.getColor('light-grey'); + &:hover { + color: vars.darkenColor('text-blue-medium'); + } + } + .pending-content { + color: grey; + height: 0; + overflow: hidden; + } + + .selected .pending-content { + height: fit-content; + } + + li { + margin: 10px 0; + display: inline-block; + width: 15em; + } + img { + // border: 2px solid vars.getColor('light2-grey'); + padding: 4px; + // border-radius: 50%; + margin-top: 5px; + width: 25px; + display: inline-block; + margin-bottom: 3px; + margin-left: 2px; + position: absolute; + } +} + +.history-pane { + table { + overflow: scroll; + } + thead { + // display: block; + } +} + +.actions { + // height: 2em; + .new-order { + background-color: vars.getColor('light-blue'); + } }