Skip to content

Commit afc9123

Browse files
authored
Merge pull request #54 from recursivezero:feature/RZA-2500050
Feature/RZA-2500050
2 parents e9939c6 + f42d683 commit afc9123

File tree

8 files changed

+26
-25
lines changed

8 files changed

+26
-25
lines changed

.vscode/dictionaries/project-words.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ audiorecorder
88
bincount
99
clsx
1010
cmdk
11+
controlslist
1112
datetime
1213
dhaga
1314
ensurepip
@@ -24,6 +25,7 @@ kmeans
2425
linalg
2526
lucide
2627
matras
28+
nodownload
2729
Organja
2830
orgenja
2931
Peina

src/assets/styles/varnmala/barahkhadi/consonant.css

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,12 @@
66
display: flex;
77
align-items: center;
88
gap: 2rem;
9-
margin-bottom: 2rem;
9+
10+
& .consonant {
11+
margin: 0 auto;
12+
font-size: 2rem;
13+
color: aquamarine;
14+
}
1015
}
1116

1217
& .back__link {
@@ -31,7 +36,7 @@
3136
& .combination__card {
3237
background-color: color-mix(in srgb, var(--secondary) 15%, var(--background) 85%);
3338
border-radius: 0.5rem;
34-
padding: 2rem 1rem;
39+
padding: 1.25rem;
3540
display: grid;
3641
place-items: center;
3742
gap: 0.5rem;
@@ -45,8 +50,8 @@
4550
}
4651

4752
& .combination__result {
48-
font-size: 3rem;
49-
font-weight: bold;
53+
font-size: 7rem;
54+
font-weight: normal;
5055
}
5156

5257
@container (min-width: 768px) {
@@ -60,4 +65,4 @@
6065
grid-template-columns: 1fr;
6166
}
6267
}
63-
}
68+
}

src/assets/styles/varnmala/number.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@
119119

120120
& .variation {
121121
font-size: 2.75rem;
122-
padding: 0.4rem;
123122
text-align: center;
124123
background: color-mix(in srgb, var(--text) 5%, var(--background) 95%);
125124
border-radius: 4px;

src/assets/styles/varnmala/reader.css

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,20 @@
33
--mute-button__bg: hsla(255, 100%, 50%, 0.281);
44
}
55

6-
#container__reader {
6+
.container__reader {
77
font-size: min(40rem, 35vw);
88
display: grid;
99
place-items: center;
1010
grid-template-columns: repeat(auto-fit, minmax(min(100%, 250px), 1fr));
11-
place-content: center;
1211
color: var(--main__txt);
1312
outline: none;
1413
text-transform: uppercase;
1514
transform: rotate(0deg);
1615
transition: all 0.3s ease-in-out;
1716
will-change: contents;
18-
text-align: center;
1917
line-height: 1;
20-
padding: 1rem;
2118
gap: 0.5rem;
22-
overflow: hidden;
19+
height: 80%;
2320
}
2421

2522
.hide {
@@ -68,7 +65,7 @@
6865
cursor: pointer;
6966
}
7067

71-
.speaker > span {
68+
.speaker>span {
7269
padding: 0.5rem;
7370
border: 1px solid var(--primary);
7471
border-radius: 5px;
@@ -80,17 +77,17 @@
8077
}
8178

8279
@media screen and (max-width: 768px) {
83-
#container__reader {
80+
.container__reader {
8481
font-size: min(30rem, 55vw);
8582
}
8683
}
8784

8885
@media screen and (max-width: 480px) {
89-
#container__reader {
86+
.container__reader {
9087
font-size: min(200rem, 70vw);
9188
}
9289

9390
.mute-button {
9491
font-size: min(2.5rem, 8vw);
9592
}
96-
}
93+
}

src/components/ui/backButton.astro

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
border: 1px solid var(--border);
88
border-radius: 0.5rem;
99
padding: 0.5rem 1rem;
10-
margin-bottom: 1rem;
1110
cursor: pointer;
1211
transition: all 0.4s cubic-bezier(0.4, 0, 0.2, 1);
1312
}

src/pages/varnmala/barahkhadi/[consonant].astro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const combinations = [consonant, ...Object.values(matras).map((matra) => consona
1919
<div class="container__consonant">
2020
<div class="consonant__header">
2121
<BackButton />
22-
<h1>{consonant}</h1>
22+
<div class="consonant">{consonant}</div>
2323
</div>
2424
<div class="combinations__grid">
2525
{

src/pages/varnmala/reader.astro

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22
import "@/assets/styles/varnmala/reader.css";
33
import Help from "@/components/Help.astro";
44
import BaseLayout from "@/layouts/Base";
5-
65
import BackButton from "@/components/ui/backButton.astro";
76
---
87

9-
<BaseLayout meta={{ title: "Reader" }}>
8+
<BaseLayout meta={{ title: "Audio Reader" }}>
109
<Fragment slot="header-right">
1110
<div class="action">
1211
<button type="button" title="click audio" id="mute" class="mute-button mute-button-audio"></button>
@@ -23,7 +22,7 @@ import BackButton from "@/components/ui/backButton.astro";
2322
</Fragment>
2423

2524
<BackButton />
26-
<article id="container__reader">a🍎</article>
25+
<article id="container__reader" class="container__reader">a🍎</article>
2726
<section class="section--audio hide">
2827
<audio id="audioPlayer" controlslist="nodownload" controls autoplay></audio>
2928
</section>
@@ -69,9 +68,10 @@ import BackButton from "@/components/ui/backButton.astro";
6968
const target = e.target as HTMLButtonElement;
7069
target.classList.toggle("mute");
7170
});
72-
7371
const getEmoji = (letter: string) => {
74-
const { [letter.toUpperCase()]: list = [] } = emojiList as { [key: string]: number[] };
72+
type List = { [key: string]: number[] };
73+
const upperCase = letter.toUpperCase();
74+
const list = (emojiList as List)[upperCase];
7575
if (list.length) {
7676
const codePoint = random(list);
7777
return String.fromCodePoint(codePoint);

src/utils/common.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,16 @@ export const matras = {
4646
ee: String.fromCharCode(2368),
4747
u: String.fromCharCode(2369),
4848
uu: String.fromCharCode(2370),
49+
ru: String.fromCharCode(2371),
4950
ae: String.fromCharCode(2375),
5051
aie: String.fromCharCode(2376),
5152
au: String.fromCharCode(2379),
5253
aau: String.fromCharCode(2380),
5354
an: String.fromCharCode(2306),
54-
ah: String.fromCharCode(2307),
55-
ru: String.fromCharCode(2371)
55+
ah: String.fromCharCode(2307)
5656
};
5757

5858
export const barahkhadi = (code: number) => {
59-
console.log({ code });
6059
const sanyukat = Object.values(matras);
6160
const list = [String.fromCharCode(code)];
6261
return list.concat(sanyukat);

0 commit comments

Comments
 (0)