Skip to content

Commit 14e5d4f

Browse files
committed
final component updates
1 parent e9d60e2 commit 14e5d4f

File tree

6 files changed

+79
-210
lines changed

6 files changed

+79
-210
lines changed

src/App.vue

Lines changed: 72 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,8 @@
55
<div class="panel-heading">Cytonn Cafe</div>
66
<div class="panel-body">
77
<make-order><slot></slot></make-order>
8-
<display-current-order>
9-
<slot></slot>
10-
</display-current-order>
8+
119
<hr>
12-
<display-order><slot></slot></display-order>
1310
</div>
1411
</div>
1512

@@ -29,7 +26,6 @@
2926
import Vue from 'vue';
3027
3128
Vue.component('make-order', require('./components/make-order').default);
32-
Vue.component('display-order', require('./components/display-order').default);
3329
Vue.component('display-customers', require('./components/display-customers').default);
3430
Vue.component('display-current-order', require('./components/display-current-order').default);
3531
Vue.component('display-events', require('./components/display-events').default);
@@ -71,6 +67,77 @@
7167
background: transparent;
7268
border: 1px solid black;
7369
}
70+
71+
.p2 {
72+
margin-left: 180px;
73+
74+
}
75+
76+
.alert .panel-heading {
77+
background: yellow;
78+
}
79+
80+
.del {
81+
background: red;
82+
}
83+
84+
.p2 ul li {
85+
text-decoration: none;
86+
list-style: none;
87+
text-align: left;
88+
}
89+
90+
.p3 {
91+
margin-left: 10px;
92+
}
93+
94+
.p3 ul li {
95+
text-decoration: none;
96+
list-style: none;
97+
text-align: left;
98+
}
99+
100+
.row:after {
101+
content: "";
102+
display: table;
103+
clear: both;
104+
}
105+
106+
.panel-heading {
107+
background: #9dd85c;
108+
height: 30px;
109+
}
110+
111+
.panel-body {
112+
padding: 20px;
113+
}
114+
115+
table {
116+
border-collapse: collapse;
117+
margin: 0 auto;
118+
}
119+
120+
thead {
121+
color: red;
122+
}
123+
124+
table, th, td {
125+
border: 1px solid black;
126+
}
127+
128+
td {
129+
width: 200px;
130+
}
131+
132+
.button {
133+
width: 200px;
134+
height: 20px;
135+
margin: 10px auto;
136+
}
137+
138+
.hidden {
139+
visibility: hidden;
140+
}
74141
</style>
75142
// import makeorder from './components/make-order'
76143

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,18 @@
11
<template>
22
<div>
3-
Your Order: {{userName}} - {{foodOrder}} ::: Status == {{actionStatus}}
3+
Your Order: {{userName}} - {{foodOrder}} ::
44
</div>
55

66
</template>
77

88
<script>
99
export default {
1010
name: "display-current-order",
11-
props:['userName','foodOrder','actionStatus']
11+
props:['userName','foodOrder',]
1212
}
1313
</script>
1414

1515

1616
<style scoped>
17-
* {
18-
box-sizing: border-box;
19-
}
2017
21-
#app {
22-
font-family: 'Avenir', Helvetica, Arial, sans-serif;
23-
-webkit-font-smoothing: antialiased;
24-
-moz-osx-font-smoothing: grayscale;
25-
text-align: center;
26-
color: #2c3e50;
27-
margin-top: 60px;
28-
}
2918
</style>

src/components/display-customers.vue

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -32,23 +32,6 @@
3232
box-sizing: border-box;
3333
}
3434
35-
#app {
36-
font-family: 'Avenir', Helvetica, Arial, sans-serif;
37-
-webkit-font-smoothing: antialiased;
38-
-moz-osx-font-smoothing: grayscale;
39-
text-align: center;
40-
color: #2c3e50;
41-
margin-top: 60px;
42-
}
43-
44-
.panel {
45-
width: 900px;
46-
/*height: 200px;*/
47-
background: transparent;
48-
border: 1px solid black;
49-
margin: 0 auto;
50-
}
51-
5235
.panelDown {
5336
float: left;
5437
width: 450px;
@@ -67,19 +50,13 @@
6750
background: yellow;
6851
}
6952
70-
.del {
71-
background: red;
72-
}
7353
7454
.p2 ul li {
7555
text-decoration: none;
7656
list-style: none;
7757
text-align: left;
7858
}
7959
80-
.p3 {
81-
margin-left: 10px;
82-
}
8360
8461
.p3 ul li {
8562
text-decoration: none;
@@ -102,30 +79,4 @@
10279
padding: 20px;
10380
}
10481
105-
table {
106-
border-collapse: collapse;
107-
margin: 0 auto;
108-
}
109-
110-
thead {
111-
color: red;
112-
}
113-
114-
table, th, td {
115-
border: 1px solid black;
116-
}
117-
118-
td {
119-
width: 200px;
120-
}
121-
122-
.button {
123-
width: 200px;
124-
height: 20px;
125-
margin: 10px auto;
126-
}
127-
128-
.hidden {
129-
visibility: hidden;
130-
}
13182
</style>

src/components/display-events.vue

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
box-sizing: border-box;
3535
}
3636
37-
3837
.panelDown {
3938
float: left;
4039
width: 450px;
@@ -44,21 +43,10 @@
4443
border: 1px solid black;
4544
}
4645
47-
.p2 {
48-
margin-left: 180px;
49-
50-
}
51-
5246
.alert .panel-heading {
5347
background: yellow;
5448
}
5549
56-
.p2 ul li {
57-
text-decoration: none;
58-
list-style: none;
59-
text-align: left;
60-
}
61-
6250
.p3 {
6351
margin-left: 10px;
6452
}
@@ -78,21 +66,5 @@
7866
padding: 20px;
7967
}
8068
81-
table {
82-
border-collapse: collapse;
83-
margin: 0 auto;
84-
}
85-
86-
thead {
87-
color: red;
88-
}
89-
90-
table, th, td {
91-
border: 1px solid black;
92-
}
93-
94-
td {
95-
width: 200px;
96-
}
9769
9870
</style>

src/components/display-order.vue

Lines changed: 2 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,19 @@
11
<template>
22
<div>
33
<h4>Current Order List</h4>
4-
{{currentOrder}}
54
<table>
65
<thead>
76
<tr>
87
<td>CLIENT</td>
98
<td>ORDER</td>
10-
<td>ACTION</td>
119
<td>CHANGE</td>
1210
</tr>
1311
</thead>
1412
<tbody>
1513

16-
<tr v-bind:key="order.userName" v-for="(order, index) in foodOrders">
14+
<tr v-bind:key="order.userName" v-for="(order, index) in currentOrder">
1715
<td>{{order.userName}}</td>
1816
<td>{{order.foodOrder}}</td>
19-
<td>{{order.actionStatus}}</td>
2017
<td>
2118
<button class="button del" type="button" v-on:click="delToDoTask(index)">Order Delete
2219
</button>
@@ -51,7 +48,7 @@
5148
5249
delToDoTask(index) {
5350
54-
this.foodOrders.splice(index, 1);
51+
this.currentOrder.splice(index, 1);
5552
// this.foodOrders = this.foodOrders.filter(order => order.id !== taskObj.id);
5653
},
5754
}
@@ -64,41 +61,6 @@
6461
box-sizing: border-box;
6562
}
6663
67-
#app {
68-
font-family: 'Avenir', Helvetica, Arial, sans-serif;
69-
-webkit-font-smoothing: antialiased;
70-
-moz-osx-font-smoothing: grayscale;
71-
text-align: center;
72-
color: #2c3e50;
73-
margin-top: 60px;
74-
}
75-
76-
.panel {
77-
width: 900px;
78-
/*height: 200px;*/
79-
background: transparent;
80-
border: 1px solid black;
81-
margin: 0 auto;
82-
}
83-
84-
.panelDown {
85-
float: left;
86-
width: 450px;
87-
padding: 10px;
88-
margin-top: 20px;
89-
background: transparent;
90-
border: 1px solid black;
91-
}
92-
93-
.p2 {
94-
margin-left: 180px;
95-
96-
}
97-
98-
.alert .panel-heading {
99-
background: yellow;
100-
}
101-
10264
.del {
10365
background: red;
10466
}
@@ -109,30 +71,12 @@
10971
text-align: left;
11072
}
11173
112-
.p3 {
113-
margin-left: 10px;
114-
}
115-
11674
.p3 ul li {
11775
text-decoration: none;
11876
list-style: none;
11977
text-align: left;
12078
}
12179
122-
.row:after {
123-
content: "";
124-
display: table;
125-
clear: both;
126-
}
127-
128-
.panel-heading {
129-
background: #9dd85c;
130-
height: 30px;
131-
}
132-
133-
.panel-body {
134-
padding: 20px;
135-
}
13680
13781
table {
13882
border-collapse: collapse;
@@ -157,7 +101,4 @@
157101
margin: 10px auto;
158102
}
159103
160-
.hidden {
161-
visibility: hidden;
162-
}
163104
</style>

0 commit comments

Comments
 (0)