Skip to content

Commit acf764f

Browse files
yancey1204yancey1204
committed
change the meteor version
1 parent 45ef7ab commit acf764f

File tree

9 files changed

+130
-116
lines changed

9 files changed

+130
-116
lines changed

‎.meteor/release

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[email protected]
1+
[email protected].1

‎.meteor/versions

+83-83
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,48 @@
1-
[email protected].4
2-
[email protected].6
3-
[email protected].7
4-
[email protected].10
1+
[email protected].5
2+
[email protected].7
3+
[email protected].8
4+
[email protected].11
55
aldeed:[email protected]
66
aldeed:[email protected]
77
aldeed:[email protected]
88
aldeed:[email protected]
99
aldeed:[email protected]
10-
[email protected].2
11-
[email protected].5
12-
[email protected].6
13-
babel-compiler@6.5.2
14-
[email protected].6
15-
[email protected].6
16-
[email protected].6
17-
[email protected].5
18-
[email protected].2
19-
[email protected].6
20-
[email protected].6
21-
[email protected].2
22-
[email protected].4
23-
[email protected].6
24-
[email protected].2
10+
[email protected].3
11+
[email protected].6
12+
[email protected].7
13+
babel-compiler@6.6.1
14+
[email protected].7
15+
[email protected].7
16+
[email protected].7
17+
[email protected].6
18+
[email protected].3
19+
[email protected].7
20+
[email protected].7
21+
[email protected].3
22+
[email protected].5
23+
[email protected].7
24+
[email protected].3
2525
d3js:[email protected]
26-
[email protected].3
27-
[email protected].3
28-
[email protected].3
29-
[email protected].2
30-
[email protected].4
31-
[email protected].10
32-
[email protected].3
33-
[email protected].1
34-
[email protected].8
35-
[email protected].9
36-
[email protected].10
37-
[email protected].8
38-
[email protected].9
39-
[email protected].6
40-
[email protected].2
41-
[email protected].7
42-
[email protected].7
43-
[email protected].3
44-
[email protected].5
45-
[email protected].5
26+
[email protected].4
27+
[email protected].4
28+
[email protected].4
29+
[email protected].3
30+
[email protected].5
31+
[email protected].11
32+
[email protected].4
33+
[email protected].2
34+
[email protected].9
35+
[email protected].10
36+
[email protected].11
37+
[email protected].9
38+
[email protected].10
39+
[email protected].7
40+
[email protected].3
41+
[email protected].8
42+
[email protected].8
43+
[email protected].4
44+
[email protected].6
45+
[email protected].6
4646
iron:[email protected]
4747
iron:[email protected]
4848
iron:[email protected]
@@ -51,52 +51,52 @@ iron:[email protected]
5151
iron:[email protected]
5252
iron:[email protected]
5353
iron:[email protected]
54-
[email protected].6
55-
[email protected].8
56-
[email protected].6
57-
[email protected].16
58-
[email protected].7
59-
[email protected].10
54+
[email protected].7
55+
[email protected].10
56+
[email protected].7
57+
[email protected].17
58+
[email protected].8
59+
[email protected].11
6060
mdg:[email protected]
61-
[email protected].12
62-
[email protected].2
63-
[email protected].9
64-
[email protected].9
65-
[email protected].12
66-
[email protected].2
67-
[email protected].10
68-
[email protected].1
69-
[email protected].1
70-
[email protected].5
71-
[email protected].2
61+
[email protected].13
62+
[email protected].3
63+
[email protected].10
64+
[email protected].10
65+
[email protected].13
66+
[email protected].3
67+
[email protected].11
68+
[email protected].2
69+
[email protected].2
70+
[email protected].6
71+
[email protected].3
7272
[email protected]_2
73-
[email protected].41
73+
[email protected].42
7474
nvd3:[email protected]
75-
[email protected].9
76-
[email protected].5
77-
[email protected].5
75+
[email protected].10
76+
[email protected].6
77+
[email protected].6
7878
raix:[email protected]
79-
[email protected].7
80-
[email protected].2
81-
[email protected].5
82-
[email protected].7
83-
[email protected].6
84-
[email protected].5
85-
[email protected].8
86-
[email protected].7
87-
[email protected].3
88-
[email protected].5
89-
[email protected].9
90-
[email protected].9
91-
[email protected].6
92-
[email protected].4
93-
[email protected].4
94-
[email protected].7
95-
[email protected].2
96-
[email protected].11
79+
[email protected].8
80+
[email protected].3
81+
[email protected].6
82+
[email protected].8
83+
[email protected].7
84+
[email protected].6
85+
[email protected].9
86+
[email protected].8
87+
[email protected].4
88+
[email protected].6
89+
[email protected].10
90+
[email protected].10
91+
[email protected].7
92+
[email protected].5
93+
[email protected].5
94+
[email protected].8
95+
[email protected].3
96+
[email protected].12
9797
twbs:[email protected]
98-
[email protected].9
99-
[email protected].6
100-
[email protected].7
101-
[email protected].6
102-
[email protected].7
98+
[email protected].10
99+
[email protected].7
100+
[email protected].8
101+
[email protected].7
102+
[email protected].8

‎client/stylesheets/biding.css

+13-4
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,15 @@
77
}
88
.biding-top{
99
width: 100%;
10-
height: 20rem;
10+
height: 40rem;
1111
}
1212

1313
.biding-down{
1414
width: 100%;
15-
height: 10rem;
15+
height: 15rem;
16+
padding: 15px;
17+
font-family: Consolas, monaco, monospace;
18+
font-weight: 600;
1619
}
1720

1821
.biding-top img{
@@ -21,12 +24,18 @@
2124
}
2225
.biding-graph{
2326
width: 100%;
24-
height: 30rem;
27+
height: 55rem;
2528
border: solid 0.5px;
2629
}
2730
.biding-input-buttion{
28-
margin-top: 1rem;
31+
margin-top: 3rem;
2932
}
3033
.biding .col-md-4{
3134
padding: 0;
35+
}
36+
.bidPrice .price-detail{
37+
font-family: Consolas, monaco, monospace;
38+
font-weight: bold;
39+
padding: 1rem;
40+
margin: 0;
3241
}

‎client/views/templates/bidPrice.html

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<template name="bidPrice">
22
<li>
3-
<h6>
3+
<p class="price-detail">
44
<span class="consumer">{{customerName}}</span>
55
<span class="date">on {{submitted}}</span>
6-
</h6>
7-
<p>{{price}}</p>
6+
<br/>
7+
{{price}}
8+
</p>
89
</li>
910
</template>

‎client/views/templates/bidgraph.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template name="bidgraph">
22
<div id="chart">
3-
<svg style="height:370px;width:350px"/>
3+
<svg style="height:370px;width:350px; margin-top: 10rem;"/>
44
</div>
55
</template>

‎client/views/templates/bidgraph.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,13 @@ Template.bidgraph.rendered = function() {
4343
console.log(auction.bidPrices);
4444
var bidXY = [];
4545
for(var i = 0; i < auction.bidPrices.length; i++){
46-
bidXY.push({ x:i+1, y:auction.bidPrices[i].price });
46+
bidXY.push({ x:i+1, y:auction.bidPrices[i].price });chart
4747
console.log(auction.bidPrices[i].price);
4848
}
4949

5050
var bidData = [{values: bidXY, key: 'Trendency', col: '#2ca02c'}]
5151
d3.select('#chart svg').datum(bidData).call(chart);
52+
chart.yDomain([0,auction.bidPrices[auction.bidPrices.length-1].price]);
5253
chart.update();
5354
}
5455
});

‎client/views/templates/biding.html

+4-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@
22
<div class="biding">
33
<div class="col-md-4">
44
<div class="biding-item-image biding-top">
5-
<img src="{{item.image}}">
5+
<!-- <img src="{{item.image}}"> -->
6+
<div style="background-image: url({{item.image}});background-size: cover;
7+
height: 100%;"></div>
68
</div>
9+
710
<div class="biding-item-detail biding-down">
811
<div>ID: Lot-{{item._id}}</div>
912
<div>Name: {{item.name}}</div>

‎client/views/templates/biding.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ Template.biding.helpers({
88
bidPrices: function(){
99
var auction = Auctions.findOne({ itemId: this.itemId });
1010
if(auction){
11-
if(auction.bidPrices.length <= 4){
11+
if(auction.bidPrices.length <= 8){
1212
return auction.bidPrices;
1313
}else{
14-
prices = auction.bidPrices.slice(auction.bidPrices.length-4,auction.bidPrices.length);
14+
prices = auction.bidPrices.slice(auction.bidPrices.length-8,auction.bidPrices.length);
1515
return prices;
1616
}
1717
}
@@ -46,8 +46,8 @@ Template.biding.events({
4646
if( !isNum(newBidPrice) ){
4747
alert("You should put in a Integer!");
4848
$(e.target).find('[name=price]').val('');
49-
}else if( Number(newBidPrice) < Number(largestPrice)){
50-
alert("Your biding price is lower than current largest price!");
49+
}else if( Number(newBidPrice) <= Number(largestPrice)){
50+
alert("Your biding price should larger than current largest price!");
5151
$(e.target).find('[name=price]').val('');
5252
}else{
5353
var bidItem = {

0 commit comments

Comments
 (0)