Skip to content

Commit 843c636

Browse files
omega5300omega5300
committed
version 8.0.0
1 parent a0d4ac2 commit 843c636

313 files changed

Lines changed: 1997 additions & 286 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/components/links.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,9 @@ module.exports = [
3838
{
3939
page: '../twitch-info/index.html',
4040
title: 'twitch info'
41+
},
42+
{
43+
page: '../scraping/index.html',
44+
title: 'web scraping'
4145
}
4246
]

‎app/crypto-market/main.css‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
.crypto-list {
2-
height: 72vh;
2+
height: 90vh;
33
scrollbar-width: thin;
44
scrollbar-color: #fff #000;
55
overflow: auto;
66
display: grid;
77
gap: 12px 10px;
8-
grid-template-columns: 1fr 1fr;
9-
grid-template-rows: 1fr 1fr;
10-
grid-template-areas: ". .";
8+
grid-template-columns: repeat(auto-fill, minmax(320px,1fr));
119
}
1210

1311
.card {

‎app/crypto-market/renderer.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ const coinList = document.getElementById('coin-list')
1515

1616
// function
1717
const coinData = async () => {
18+
const currency = Intl.NumberFormat('en-us', {
19+
style: 'currency',
20+
currency: 'USD'
21+
})
22+
1823
try {
1924
// start crypto
2025
const coinData = await CoinGeckoClient.coins.markets();
@@ -50,7 +55,7 @@ const coinData = async () => {
5055
// description and balance
5156
cardDescription.innerHTML = `
5257
symbol: ${coin.symbol.toUpperCase()} <br>
53-
price: ${coin.current_price} USD <br>
58+
price: ${currency.format(coin.current_price)} USD <br>
5459
last updated: ${format(coin.last_updated)} <br>
5560
`
5661

‎app/hardware-information/index.html‎

Lines changed: 54 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -17,84 +17,67 @@
1717

1818
<body>
1919
<navbar-stack></navbar-stack>
20-
<main class="container class=" scroll"">
21-
<section class="app-glass">
22-
<ul class="tab">
23-
<li class="tab-button tab-links">basic info</li>
24-
<li class="tab-button tab-links">disk info</li>
25-
<li class="tab-button tab-links">controller info</li>
26-
<li class="tab-button tab-links">display info</li>
27-
<li class="tab-button tab-links">bios info</li>
28-
</ul>
29-
30-
<section class="tab-content">
31-
<article class="basic-info">
32-
33-
<section class="card-container card">
34-
<h2 class="card-title">cpu info</h2>
35-
<div class="card-content">
36-
<p class="description" id="cpu-info"></p>
37-
</div>
20+
<main class="container scroll">
21+
<section class="cpu card-container card glass">
22+
<h2 class="card-title">cpu info</h2>
23+
<div class="card-content">
24+
<p class="description" id="cpu-info"></p>
25+
</div>
3826
</section>
39-
40-
<section class="card-container card">
41-
<h2 class="card-title">ram memory info</h2>
42-
<div class="card-content">
43-
<p class="description" id="ram-info"></p>
44-
</div>
27+
28+
<section class="ram card-container card glass">
29+
<h2 class="card-title">ram memory info</h2>
30+
<div class="card-content">
31+
<p class="description" id="ram-info"></p>
32+
</div>
4533
</section>
46-
47-
<section class="card-container card">
48-
<h2 class="card-title">os info</h2>
49-
<div class="card-content">
50-
<p class="description" id="os-info"></p>
51-
</div>
34+
35+
<section class="os card-container card glass">
36+
<h2 class="card-title">os info</h2>
37+
<div class="card-content">
38+
<p class="description" id="os-info"></p>
39+
</div>
5240
</section>
53-
</article>
54-
</section>
55-
56-
<section class="tab-content">
57-
<article class="card-content">
58-
<h2 class="card-title flow-text">disks info</h2>
59-
<ul class="disk-info" id="disks-info"></ul>
60-
</article>
61-
</section>
62-
63-
<section class="tab-content">
64-
<article class="card horizontal">
65-
<div class="card-content">
66-
<h2 class="card-title flow-text">controllers info</h2>
67-
<ul class="controller-info" id="controller-info"></ul>
68-
</div>
69-
</article>
70-
</section>
7141

72-
<section class="tab-content">
73-
<article class="card horizontal">
74-
<div class="card-content">
75-
<h2 class="card-title flow-text">displays info</h2>
76-
<ul class="display-info" id="display-info"></ul>
77-
</div>
78-
</article>
79-
</section>
42+
<section class="disks tab-content">
43+
<article class="card-content glass">
44+
<h2 class="card-title flow-text">disks info</h2>
45+
<div class="disk-info" id="disks-info"></div>
46+
</article>
47+
</section>
8048

81-
<section class="tab-content">
82-
<article class="bios-info">
83-
<section class="card">
84-
<h2 class="card-title flow-text">bios info</h2>
85-
<div class="card-content">
86-
<p class="description" id="bios-info"></p>
87-
</div>
49+
<section class="controllers tab-content glass">
50+
<article class="card horizontal">
51+
<div class="card-content">
52+
<h2 class="card-title flow-text">controllers info</h2>
53+
<div class="controller-info" id="controller-info"></div>
54+
</div>
55+
</article>
8856
</section>
89-
<section class="card">
90-
<h2 class="card-title flow-text">motherboard info</h2>
91-
<div class="card-content">
92-
<p class="description" id="board-info"></p>
93-
</div>
57+
58+
<section class="display tab-content glass">
59+
<article class="card horizontal">
60+
<div class="card-content">
61+
<h2 class="card-title flow-text">displays info</h2>
62+
<div class="display-info" id="display-info"></div>
63+
</div>
64+
</article>
65+
</section>
66+
67+
<section class="bios card glass">
68+
<h2 class="card-title flow-text">bios info</h2>
69+
<div class="card-content">
70+
<p class="description" id="bios-info"></p>
71+
</div>
72+
</section>
73+
74+
<section class="board card glass">
75+
<h2 class="card-title flow-text">motherboard info</h2>
76+
<div class="card-content">
77+
<p class="description" id="board-info"></p>
78+
</div>
9479
</section>
95-
</article>
96-
</section>
97-
</main>
80+
</main>
9881
</body>
9982

10083
</html>

‎app/hardware-information/main.css‎

Lines changed: 32 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,51 @@
1-
.tab {
2-
overflow: hidden;
3-
list-style: none;
4-
margin: 0;
1+
.container {
2+
height: 85vh;
3+
overflow: auto;
4+
display: grid;
5+
grid-template-areas: "cpu ram"
6+
"os bios"
7+
"disk disk"
8+
"controller controller"
9+
"display display"
10+
"board board";
11+
gap: 0.5rem;
512
}
613

7-
/* Style the buttons inside the tab */
8-
.tab-button {
9-
background-color: inherit;
10-
display: inline-block;
11-
float: left;
12-
cursor: pointer;
13-
padding: 14px 16px;
14-
transition: 0.3s;
15-
font-size: 17px;
14+
.card {
15+
width: fit-content;
16+
padding: 8px;
1617
}
1718

18-
/* Change background color of buttons on hover */
19-
.tab-button:hover {
20-
background-color: #ddd;
19+
.cpu {
20+
grid-area: "cpu";
2121
}
2222

23-
/* Create an active/current tablink class */
24-
.active {
25-
background-color: rgba(204, 204, 204, .2);
23+
.ram {
24+
grid-area: "ram";
2625
}
2726

28-
/* Style the tab content */
29-
.tab-content {
30-
display: none;
31-
padding: 6px 12px;
32-
border: 1px solid #ccc;
33-
border-top: none;
27+
.os {
28+
grid-area: "os";
3429
}
3530

36-
.basic-info, .disk-info, .hardware-list, .display-info, .bios-info {
37-
display: grid;
38-
grid-template-rows: 1fr;
31+
.bios {
32+
grid-area: "bios";
3933
}
4034

41-
.basic-info {
42-
grid-template-columns: 1fr 1fr 1fr;
43-
gap: 15px;
44-
grid-template-areas:
45-
". . .";
35+
.disk {
36+
grid-area: "disk";
4637
}
4738

48-
.display-info {
49-
grid-template-columns: 1fr;
50-
gap: 0 0;
51-
grid-template-areas:
52-
".";
39+
.controller {
40+
grid-area: "controller";
5341
}
5442

55-
.disk-info, .controller-info {
56-
list-style: none;
57-
grid-template-columns: 1fr 1fr;
58-
gap: 10px;
59-
grid-template-areas:
60-
". .";
43+
.display {
44+
grid-area: "display";
45+
}
46+
47+
.board {
48+
grid-area: "board";
6149
}
6250

6351
.card-title {

0 commit comments

Comments
 (0)