Skip to content

Commit b299bdb

Browse files
committed
update
1 parent 8fae3e3 commit b299bdb

File tree

4 files changed

+66
-51
lines changed

4 files changed

+66
-51
lines changed

projects/gd-matrix/index.html

+37-16
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,43 @@ <h1>Tracker</h1>
1414
<button id="add-button" onclick="addNumber()">Add</button>
1515
</div>
1616
<p id="added-numbers"></p>
17-
<table class="dozen">
18-
<thead>
19-
<tr>
20-
<th>1st Dozen</th>
21-
<th>2nd Dozen</th>
22-
<th>3rd Dozen</th>
23-
</tr>
24-
</thead>
25-
<tbody id="number-table">
26-
<tr>
27-
<td id="dozen1-count">0</td>
28-
<td id="dozen2-count">0</td>
29-
<td id="dozen3-count">0</td>
30-
</tr>
31-
</tbody>
32-
</table>
17+
<div style="display: flex;">
18+
<!-- Dozen matrix -->
19+
<table>
20+
<thead>
21+
<tr>
22+
<th>1D</th>
23+
<th>2D</th>
24+
<th>3D</th>
25+
</tr>
26+
</thead>
27+
<tbody id="dozen-table">
28+
<tr>
29+
<td id="dozen1-count">0</td>
30+
<td id="dozen2-count">0</td>
31+
<td id="dozen3-count">0</td>
32+
</tr>
33+
</tbody>
34+
</table>
35+
36+
<!-- Column matrix -->
37+
<table style="margin-left: 20px">
38+
<thead>
39+
<tr>
40+
<th>1C</th>
41+
<th>2C</th>
42+
<th>3C</th>
43+
</tr>
44+
</thead>
45+
<tbody id="column-table">
46+
<tr>
47+
<td id="column-count">0</td>
48+
<td id="column-count">0</td>
49+
<td id="column-count">0</td>
50+
</tr>
51+
</tbody>
52+
</table>
53+
</div>
3354

3455

3556
<script src="main.js"></script>

projects/gd-matrix/main.js

+19-13
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
11

2-
32
let addedNumbers = []; // array to store added numbers
43
let spins = 0;
54
let input = document.getElementById("number-input");
6-
let number = input.value;
75

86
function addNumber() {
7+
8+
// Number Input
9+
let number = input.value;
910
if (!number) {
1011
alert("Please enter a number between 1 and 36.");
1112
return;
1213
}
14+
1315
addedNumbers.unshift(number); // add number to the beginning of the array
1416
input.value = "";
1517
updateAddedNumbers();
16-
var dozen1Count = document.getElementById("dozen1-count");
17-
var dozen2Count = document.getElementById("dozen2-count");
18-
var dozen3Count = document.getElementById("dozen3-count");
18+
19+
let dozen1Count = document.getElementById("dozen1-count");
20+
let dozen2Count = document.getElementById("dozen2-count");
21+
let dozen3Count = document.getElementById("dozen3-count");
22+
1923
if (number <= 12 && number >= 1) {
2024
dozen1Count.innerHTML++;
2125
} else if (number <= 24 && number >= 12) {
@@ -24,33 +28,35 @@ function addNumber() {
2428
dozen3Count.innerHTML++;
2529
}
2630
spins++;
31+
2732
if (spins === 3) {
2833
spins = 0;
29-
var table = document.getElementById("number-table");
30-
var row = table.insertRow();
31-
var dozen1 = row.insertCell(0);
32-
var dozen2 = row.insertCell(1);
33-
var dozen3 = row.insertCell(2);
34+
let table = document.getElementById("dozen-table");
35+
let row = table.insertRow();
36+
let dozen1 = row.insertCell(0);
37+
let dozen2 = row.insertCell(1);
38+
let dozen3 = row.insertCell(2);
3439
dozen1.innerHTML = dozen1Count.innerHTML;
3540
dozen2.innerHTML = dozen2Count.innerHTML;
3641
dozen3.innerHTML = dozen3Count.innerHTML;
3742
dozen1Count.innerHTML = 0;
3843
dozen2Count.innerHTML = 0;
3944
dozen3Count.innerHTML = 0;
40-
}
4145

46+
}
4247

4348
}
4449

45-
50+
// Insert numbers by pressing 'Enter'
4651
input.addEventListener("keydown", function (e) {
4752
if (e.keyCode === 13) {
4853
addNumber(e);
4954
}
5055
});
5156

5257

58+
// Last numbers
5359
function updateAddedNumbers() {
54-
var addedNumbersElem = document.getElementById("added-numbers");
60+
let addedNumbersElem = document.getElementById("added-numbers");
5561
addedNumbersElem.innerHTML = addedNumbers.join(", "); // join array with commas
5662
}

projects/gd-matrix/style.css

+1-5
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,10 @@ button {
3030
}
3131

3232
table {
33-
width: 100%;
33+
width: 10%;
3434
border-collapse: collapse;
3535
}
3636

37-
table.dozen {
38-
width: 20%;
39-
}
40-
4137
th,
4238
td {
4339
border: 1px solid black;

yourPlayground.js

+9-17
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,13 @@
1-
function sum(a, b) {
2-
return a + b;
3-
}
4-
5-
function calculateFoodTotal (food, tip){
6-
const tipPercentage = tip / 100;
7-
const tipAmount = food * tipPercentage;
8-
const total = sum(food, tipAmount);
9-
10-
return total;
11-
}
12-
13-
// console.log(calculateFoodTotal(300, 20));
14-
15-
// Arrays
16-
17-
181

2+
const introducer = (name, role) => {
193

4+
const person = {
5+
name: name,
6+
role: role
7+
}
208

9+
const intro = `Hi, my name is ${person.name} and I am ${person.role} at Ennova Research SRL`;
10+
return intro
11+
}
2112

13+
console.log(introducer("Miraze", "Head of Design"))

0 commit comments

Comments
 (0)