Skip to content

Commit 87a0299

Browse files
CitrinateCitrinate
committed
Adjust store table columns
1 parent 0b9d179 commit 87a0299

File tree

2 files changed

+50
-77
lines changed

2 files changed

+50
-77
lines changed

‎src/components/store_table.js‎

Lines changed: 45 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ export default class StoreTable extends Table {
9494
})
9595
],
9696
onclick: (event) => {
97-
this._SortRows({ event: event, columns: ["name", "supplemental_data"] });
97+
this._SortRows({ event: event, columns: ["name", "default_sort_order"] });
9898
}
9999
}),
100100
CreateElement("span", {
@@ -119,7 +119,7 @@ export default class StoreTable extends Table {
119119
]
120120
}),
121121
CreateElement("th", {
122-
class: "cs2s_table_store_type_stage_column",
122+
class: "cs2s_table_store_type_match_column",
123123
children: [
124124
CreateElement("span", {
125125
class: "cs2s_table_column",
@@ -131,41 +131,7 @@ export default class StoreTable extends Table {
131131
})
132132
],
133133
onclick: (event) => {
134-
this._SortRows({ event: event, columns: ["type", "name"]});
135-
}
136-
}),
137-
CreateElement("span", {
138-
class: "cs2s_table_column",
139-
id: "stage_column",
140-
text: "Stage",
141-
style: {
142-
"display": "none"
143-
},
144-
children: [
145-
CreateElement("div", {
146-
class: "cs2s_table_column_sort",
147-
})
148-
],
149-
onclick: (event) => {
150-
this._SortRows({ event: event, columns: ["supplemental_data"]});
151-
}
152-
})
153-
]
154-
}),
155-
CreateElement("th", {
156-
class: "cs2s_table_store_price_team_column",
157-
children: [
158-
CreateElement("span", {
159-
class: "cs2s_table_column",
160-
id: "price_column",
161-
text: "Price",
162-
children: [
163-
CreateElement("div", {
164-
class: "cs2s_table_column_sort",
165-
})
166-
],
167-
onclick: (event) => {
168-
this._SortRows({ event: event, columns: ["price", "name"]});
134+
this._SortRows({ event: event, columns: ["type", "name", "default_sort_order"]});
169135
}
170136
}),
171137
CreateElement("span", {
@@ -181,7 +147,7 @@ export default class StoreTable extends Table {
181147
})
182148
],
183149
onclick: (event) => {
184-
this._SortRows({ event: event, columns: ["team_1", "team_2", "supplemental_data"]});
150+
this._SortRows({ event: event, columns: ["supplemental_data"]});
185151
}
186152
}),
187153
CreateElement("span", {
@@ -193,7 +159,7 @@ export default class StoreTable extends Table {
193159
children: [
194160
CreateElement("input", {
195161
type: "search",
196-
placeholder: "Search",
162+
placeholder: "Team Search",
197163
oninput: (event) => {
198164
// auto resize input box to input size
199165
event.target.style.width = "0px";
@@ -208,6 +174,23 @@ export default class StoreTable extends Table {
208174
]
209175
})
210176
]
177+
}),
178+
CreateElement("th", {
179+
class: "cs2s_table_store_price_column",
180+
children: [
181+
CreateElement("span", {
182+
class: "cs2s_table_column",
183+
text: "Price",
184+
children: [
185+
CreateElement("div", {
186+
class: "cs2s_table_column_sort",
187+
})
188+
],
189+
onclick: (event) => {
190+
this._SortRows({ event: event, columns: ["price", "default_sort_order"]});
191+
}
192+
})
193+
]
211194
})
212195
]
213196
})
@@ -328,40 +311,34 @@ export default class StoreTable extends Table {
328311
}),
329312
(!item.requires_supplemental_data
330313
? CreateElement("td", {
331-
class: "cs2s_table_store_type_stage_column",
314+
class: "cs2s_table_store_type_match_column",
332315
text: item.type
333316
})
334317
: CreateElement("td", {
335-
class: "cs2s_table_store_type_stage_column",
336-
text: item.section_name
318+
class: "cs2s_table_store_type_match_column",
319+
html: `${item.section_name} — ${item.team_1} (${item.team_1_score}) — ${item.team_2} (${item.team_2_score})`
337320
})
338321
),
339-
(!item.requires_supplemental_data
340-
? CreateElement("td", {
341-
class: "cs2s_table_store_price_team_column",
342-
children: [
343-
item.discount && CreateElement("span", {
344-
class: "cs2s_table_store_discount",
345-
children: [
346-
CreateElement("span", {
347-
class: "cs2s_table_store_discount_percentage",
348-
text: `-${item.discount}%`
349-
}),
350-
CreateElement("span", {
351-
class: "cs2s_table_store_discount_original_price",
352-
text: this.#store.FormatCurrency(item.original_price)
353-
})
354-
]
355-
356-
}),
357-
this.#store.FormatCurrency(item.price)
358-
]
359-
})
360-
: CreateElement("td", {
361-
class: "cs2s_table_store_price_team_column",
362-
html: `${item.team_1} (${item.team_1_score}) — ${item.team_2} (${item.team_2_score})`
363-
})
364-
)
322+
CreateElement("td", {
323+
class: "cs2s_table_store_price_column",
324+
children: [
325+
item.discount && CreateElement("span", {
326+
class: "cs2s_table_store_discount",
327+
children: [
328+
CreateElement("span", {
329+
class: "cs2s_table_store_discount_percentage",
330+
text: `-${item.discount}%`
331+
}),
332+
CreateElement("span", {
333+
class: "cs2s_table_store_discount_original_price",
334+
text: this.#store.FormatCurrency(item.original_price)
335+
})
336+
]
337+
338+
}),
339+
this.#store.FormatCurrency(item.price)
340+
]
341+
})
365342
]
366343
});
367344

@@ -448,17 +425,13 @@ export default class StoreTable extends Table {
448425

449426
// Souvenir tab has unique columns
450427
if (newTab === StoreTable.TAB.TOURNAMENT_SOUVENIRS) {
451-
this._tableContainerElement.querySelector("#stage_column").style.display = "";
452428
this._tableContainerElement.querySelector("#teams_column").style.display = "";
453429
this._tableContainerElement.querySelector("#teams_search").style.display = "";
454430
this._tableContainerElement.querySelector("#type_column").style.display = "none";
455-
this._tableContainerElement.querySelector("#price_column").style.display = "none";
456431
} else {
457-
this._tableContainerElement.querySelector("#stage_column").style.display = "none";
458432
this._tableContainerElement.querySelector("#teams_column").style.display = "none";
459433
this._tableContainerElement.querySelector("#teams_search").style.display = "none";
460434
this._tableContainerElement.querySelector("#type_column").style.display = "";
461-
this._tableContainerElement.querySelector("#price_column").style.display = "";
462435
}
463436

464437
// Reset all sorting

‎src/css/style.css‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -711,12 +711,12 @@
711711
width: 475px;
712712
}
713713

714-
.cs2s_table_store_type_stage_column {
715-
width: 325px;
714+
.cs2s_table_store_type_match_column {
715+
width: 450px;
716716
}
717717

718-
.cs2s_table_store_price_team_column {
719-
width: 375px;
718+
.cs2s_table_store_price_column {
719+
width: 200px;
720720

721721
.cs2s_table_store_discount {
722722
margin-right: 4px;
@@ -1080,7 +1080,7 @@
10801080
padding-left: 22px;
10811081
font-family: inherit;
10821082
width: 100px;
1083-
min-width: 100px;
1083+
min-width: 120px;
10841084

10851085
&::-webkit-search-cancel-button {
10861086
-webkit-appearance: none;

0 commit comments

Comments
 (0)