Skip to content

Commit 7f5ebd6

Browse files
committed
Merge remote-tracking branch 'upstream/main' into issue/ui-modal-card-layout-fix
# Conflicts: # web-app/index.html
2 parents 8fe35c3 + d4f0c26 commit 7f5ebd6

48 files changed

Lines changed: 1820 additions & 1468 deletions

Some content is hidden

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

README.md

Lines changed: 47 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,12 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for detailed guidelines.
174174
<sub><b>@Aayuiiitmg</b></sub>
175175
</a>
176176
</td>
177+
<td align="center" width="120">
178+
<a href="https://github.com/Alvi24-hub">
179+
<img src="https://github.com/Alvi24-hub.png?size=100" width="100" height="100" style="border-radius:50%; border:2px solid #555;" alt="Alvi24-hub" /><br />
180+
<sub><b>@Alvi24-hub</b></sub>
181+
</a>
182+
</td>
177183
<td align="center" width="120">
178184
<a href="https://github.com/AnushkaJagtap22">
179185
<img src="https://github.com/AnushkaJagtap22.png?size=100" width="100" height="100" style="border-radius:50%; border:2px solid #555;" alt="AnushkaJagtap22" /><br />
@@ -192,14 +198,14 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for detailed guidelines.
192198
<sub><b>@Arpitawork24</b></sub>
193199
</a>
194200
</td>
201+
</tr>
202+
<tr>
195203
<td align="center" width="120">
196204
<a href="https://github.com/ArshiBansal">
197205
<img src="https://github.com/ArshiBansal.png?size=100" width="100" height="100" style="border-radius:50%; border:2px solid #555;" alt="ArshiBansal" /><br />
198206
<sub><b>@ArshiBansal</b></sub>
199207
</a>
200208
</td>
201-
</tr>
202-
<tr>
203209
<td align="center" width="120">
204210
<a href="https://github.com/Ashvin-KS">
205211
<img src="https://github.com/Ashvin-KS.png?size=100" width="100" height="100" style="border-radius:50%; border:2px solid #555;" alt="Ashvin-KS" /><br />
@@ -230,14 +236,14 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for detailed guidelines.
230236
<sub><b>@C4aZy</b></sub>
231237
</a>
232238
</td>
239+
</tr>
240+
<tr>
233241
<td align="center" width="120">
234242
<a href="https://github.com/Devexhhh">
235243
<img src="https://github.com/Devexhhh.png?size=100" width="100" height="100" style="border-radius:50%; border:2px solid #555;" alt="Devexhhh" /><br />
236244
<sub><b>@Devexhhh</b></sub>
237245
</a>
238246
</td>
239-
</tr>
240-
<tr>
241247
<td align="center" width="120">
242248
<a href="https://github.com/Diksha57-git">
243249
<img src="https://github.com/Diksha57-git.png?size=100" width="100" height="100" style="border-radius:50%; border:2px solid #555;" alt="Diksha57-git" /><br />
@@ -268,14 +274,14 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for detailed guidelines.
268274
<sub><b>@Indrayani11-15</b></sub>
269275
</a>
270276
</td>
277+
</tr>
278+
<tr>
271279
<td align="center" width="120">
272280
<a href="https://github.com/Ishita-varshney">
273281
<img src="https://github.com/Ishita-varshney.png?size=100" width="100" height="100" style="border-radius:50%; border:2px solid #555;" alt="Ishita-varshney" /><br />
274282
<sub><b>@Ishita-varshney</b></sub>
275283
</a>
276284
</td>
277-
</tr>
278-
<tr>
279285
<td align="center" width="120">
280286
<a href="https://github.com/Juhi4433">
281287
<img src="https://github.com/Juhi4433.png?size=100" width="100" height="100" style="border-radius:50%; border:2px solid #555;" alt="Juhi4433" /><br />
@@ -306,14 +312,14 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for detailed guidelines.
306312
<sub><b>@Lalitya31</b></sub>
307313
</a>
308314
</td>
315+
</tr>
316+
<tr>
309317
<td align="center" width="120">
310318
<a href="https://github.com/Lavanya-Talele">
311319
<img src="https://github.com/Lavanya-Talele.png?size=100" width="100" height="100" style="border-radius:50%; border:2px solid #555;" alt="Lavanya-Talele" /><br />
312320
<sub><b>@Lavanya-Talele</b></sub>
313321
</a>
314322
</td>
315-
</tr>
316-
<tr>
317323
<td align="center" width="120">
318324
<a href="https://github.com/Mayank251125">
319325
<img src="https://github.com/Mayank251125.png?size=100" width="100" height="100" style="border-radius:50%; border:2px solid #555;" alt="Mayank251125" /><br />
@@ -344,14 +350,14 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for detailed guidelines.
344350
<sub><b>@NidhiS-7</b></sub>
345351
</a>
346352
</td>
353+
</tr>
354+
<tr>
347355
<td align="center" width="120">
348356
<a href="https://github.com/PIYUSH-NEXTGEN">
349357
<img src="https://github.com/PIYUSH-NEXTGEN.png?size=100" width="100" height="100" style="border-radius:50%; border:2px solid #555;" alt="PIYUSH-NEXTGEN" /><br />
350358
<sub><b>@PIYUSH-NEXTGEN</b></sub>
351359
</a>
352360
</td>
353-
</tr>
354-
<tr>
355361
<td align="center" width="120">
356362
<a href="https://github.com/PRODHOSH">
357363
<img src="https://github.com/PRODHOSH.png?size=100" width="100" height="100" style="border-radius:50%; border:2px solid #555;" alt="PRODHOSH" /><br />
@@ -382,18 +388,18 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for detailed guidelines.
382388
<sub><b>@Ranjanmaiti6</b></sub>
383389
</a>
384390
</td>
391+
</tr>
392+
<tr>
385393
<td align="center" width="120">
386394
<a href="https://github.com/Sanjhivvarshan-b-s">
387395
<img src="https://github.com/Sanjhivvarshan-b-s.png?size=100" width="100" height="100" style="border-radius:50%; border:2px solid #555;" alt="Sanjhivvarshan-b-s" /><br />
388396
<sub><b>@Sanjhivvarshan-b-s</b></sub>
389397
</a>
390398
</td>
391-
</tr>
392-
<tr>
393399
<td align="center" width="120">
394-
<a href="https://github.com/SathvikaTalari">
395-
<img src="https://github.com/SathvikaTalari.png?size=100" width="100" height="100" style="border-radius:50%; border:2px solid #555;" alt="SathvikaTalari" /><br />
396-
<sub><b>@SathvikaTalari</b></sub>
400+
<a href="https://github.com/Shashank-8p">
401+
<img src="https://github.com/Shashank-8p.png?size=100" width="100" height="100" style="border-radius:50%; border:2px solid #555;" alt="Shashank-8p" /><br />
402+
<sub><b>@Shashank-8p</b></sub>
397403
</a>
398404
</td>
399405
<td align="center" width="120">
@@ -402,6 +408,12 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for detailed guidelines.
402408
<sub><b>@Shivi-Srivastava-4444</b></sub>
403409
</a>
404410
</td>
411+
<td align="center" width="120">
412+
<a href="https://github.com/Siddh2024">
413+
<img src="https://github.com/Siddh2024.png?size=100" width="100" height="100" style="border-radius:50%; border:2px solid #555;" alt="Siddh2024" /><br />
414+
<sub><b>@Siddh2024</b></sub>
415+
</a>
416+
</td>
405417
<td align="center" width="120">
406418
<a href="https://github.com/Sparshjoshi-iit">
407419
<img src="https://github.com/Sparshjoshi-iit.png?size=100" width="100" height="100" style="border-radius:50%; border:2px solid #555;" alt="Sparshjoshi-iit" /><br />
@@ -414,6 +426,8 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for detailed guidelines.
414426
<sub><b>@Sreekuttan-007</b></sub>
415427
</a>
416428
</td>
429+
</tr>
430+
<tr>
417431
<td align="center" width="120">
418432
<a href="https://github.com/Suhani-ai-dev">
419433
<img src="https://github.com/Suhani-ai-dev.png?size=100" width="100" height="100" style="border-radius:50%; border:2px solid #555;" alt="Suhani-ai-dev" /><br />
@@ -426,8 +440,6 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for detailed guidelines.
426440
<sub><b>@Tech4Aditya</b></sub>
427441
</a>
428442
</td>
429-
</tr>
430-
<tr>
431443
<td align="center" width="120">
432444
<a href="https://github.com/TheBinaryAVA">
433445
<img src="https://github.com/TheBinaryAVA.png?size=100" width="100" height="100" style="border-radius:50%; border:2px solid #555;" alt="TheBinaryAVA" /><br />
@@ -452,6 +464,8 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for detailed guidelines.
452464
<sub><b>@Vinanthi07</b></sub>
453465
</a>
454466
</td>
467+
</tr>
468+
<tr>
455469
<td align="center" width="120">
456470
<a href="https://github.com/abdullahxyz85">
457471
<img src="https://github.com/abdullahxyz85.png?size=100" width="100" height="100" style="border-radius:50%; border:2px solid #555;" alt="abdullahxyz85" /><br />
@@ -464,8 +478,6 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for detailed guidelines.
464478
<sub><b>@abhi-nav-25</b></sub>
465479
</a>
466480
</td>
467-
</tr>
468-
<tr>
469481
<td align="center" width="120">
470482
<a href="https://github.com/advikdivekar">
471483
<img src="https://github.com/advikdivekar.png?size=100" width="100" height="100" style="border-radius:50%; border:2px solid #555;" alt="advikdivekar" /><br />
@@ -490,6 +502,8 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for detailed guidelines.
490502
<sub><b>@ash-heinz</b></sub>
491503
</a>
492504
</td>
505+
</tr>
506+
<tr>
493507
<td align="center" width="120">
494508
<a href="https://github.com/aspartic-gthb">
495509
<img src="https://github.com/aspartic-gthb.png?size=100" width="100" height="100" style="border-radius:50%; border:2px solid #555;" alt="aspartic-gthb" /><br />
@@ -502,8 +516,6 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for detailed guidelines.
502516
<sub><b>@avzuha</b></sub>
503517
</a>
504518
</td>
505-
</tr>
506-
<tr>
507519
<td align="center" width="120">
508520
<a href="https://github.com/ayushyadav0707">
509521
<img src="https://github.com/ayushyadav0707.png?size=100" width="100" height="100" style="border-radius:50%; border:2px solid #555;" alt="ayushyadav0707" /><br />
@@ -528,6 +540,8 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for detailed guidelines.
528540
<sub><b>@developer-yash03</b></sub>
529541
</a>
530542
</td>
543+
</tr>
544+
<tr>
531545
<td align="center" width="120">
532546
<a href="https://github.com/dhanushrajvr">
533547
<img src="https://github.com/dhanushrajvr.png?size=100" width="100" height="100" style="border-radius:50%; border:2px solid #555;" alt="dhanushrajvr" /><br />
@@ -540,8 +554,6 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for detailed guidelines.
540554
<sub><b>@gatiksolanki13-netizen</b></sub>
541555
</a>
542556
</td>
543-
</tr>
544-
<tr>
545557
<td align="center" width="120">
546558
<a href="https://github.com/iamprasoon2006-cell">
547559
<img src="https://github.com/iamprasoon2006-cell.png?size=100" width="100" height="100" style="border-radius:50%; border:2px solid #555;" alt="iamprasoon2006-cell" /><br />
@@ -566,6 +578,8 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for detailed guidelines.
566578
<sub><b>@jyotish6699</b></sub>
567579
</a>
568580
</td>
581+
</tr>
582+
<tr>
569583
<td align="center" width="120">
570584
<a href="https://github.com/kumudasrip">
571585
<img src="https://github.com/kumudasrip.png?size=100" width="100" height="100" style="border-radius:50%; border:2px solid #555;" alt="kumudasrip" /><br />
@@ -578,8 +592,6 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for detailed guidelines.
578592
<sub><b>@madhavcodes25</b></sub>
579593
</a>
580594
</td>
581-
</tr>
582-
<tr>
583595
<td align="center" width="120">
584596
<a href="https://github.com/mahi-8758">
585597
<img src="https://github.com/mahi-8758.png?size=100" width="100" height="100" style="border-radius:50%; border:2px solid #555;" alt="mahi-8758" /><br />
@@ -604,6 +616,8 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for detailed guidelines.
604616
<sub><b>@nene-hana</b></sub>
605617
</a>
606618
</td>
619+
</tr>
620+
<tr>
607621
<td align="center" width="120">
608622
<a href="https://github.com/nimkarprachi17">
609623
<img src="https://github.com/nimkarprachi17.png?size=100" width="100" height="100" style="border-radius:50%; border:2px solid #555;" alt="nimkarprachi17" /><br />
@@ -616,8 +630,6 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for detailed guidelines.
616630
<sub><b>@nishtha-agarwal-211</b></sub>
617631
</a>
618632
</td>
619-
</tr>
620-
<tr>
621633
<td align="center" width="120">
622634
<a href="https://github.com/parasmani-dev">
623635
<img src="https://github.com/parasmani-dev.png?size=100" width="100" height="100" style="border-radius:50%; border:2px solid #555;" alt="parasmani-dev" /><br />
@@ -642,6 +654,8 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for detailed guidelines.
642654
<sub><b>@prasad-0007</b></sub>
643655
</a>
644656
</td>
657+
</tr>
658+
<tr>
645659
<td align="center" width="120">
646660
<a href="https://github.com/priya05-git">
647661
<img src="https://github.com/priya05-git.png?size=100" width="100" height="100" style="border-radius:50%; border:2px solid #555;" alt="priya05-git" /><br />
@@ -654,8 +668,6 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for detailed guidelines.
654668
<sub><b>@r-sushanth08</b></sub>
655669
</a>
656670
</td>
657-
</tr>
658-
<tr>
659671
<td align="center" width="120">
660672
<a href="https://github.com/rashiaggarwal06">
661673
<img src="https://github.com/rashiaggarwal06.png?size=100" width="100" height="100" style="border-radius:50%; border:2px solid #555;" alt="rashiaggarwal06" /><br />
@@ -680,6 +692,8 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for detailed guidelines.
680692
<sub><b>@sanzzzz-g</b></sub>
681693
</a>
682694
</td>
695+
</tr>
696+
<tr>
683697
<td align="center" width="120">
684698
<a href="https://github.com/shaktipy">
685699
<img src="https://github.com/shaktipy.png?size=100" width="100" height="100" style="border-radius:50%; border:2px solid #555;" alt="shaktipy" /><br />
@@ -692,20 +706,12 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for detailed guidelines.
692706
<sub><b>@shimonenator</b></sub>
693707
</a>
694708
</td>
695-
</tr>
696-
<tr>
697709
<td align="center" width="120">
698710
<a href="https://github.com/shreyasarote7717-cyber">
699711
<img src="https://github.com/shreyasarote7717-cyber.png?size=100" width="100" height="100" style="border-radius:50%; border:2px solid #555;" alt="shreyasarote7717-cyber" /><br />
700712
<sub><b>@shreyasarote7717-cyber</b></sub>
701713
</a>
702714
</td>
703-
<td align="center" width="120">
704-
<a href="https://github.com/shreyasgawande19">
705-
<img src="https://github.com/shreyasgawande19.png?size=100" width="100" height="100" style="border-radius:50%; border:2px solid #555;" alt="shreyasgawande19" /><br />
706-
<sub><b>@shreyasgawande19</b></sub>
707-
</a>
708-
</td>
709715
<td align="center" width="120">
710716
<a href="https://github.com/siri-004">
711717
<img src="https://github.com/siri-004.png?size=100" width="100" height="100" style="border-radius:50%; border:2px solid #555;" alt="siri-004" /><br />
@@ -724,14 +730,14 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for detailed guidelines.
724730
<sub><b>@snehanair-486</b></sub>
725731
</a>
726732
</td>
733+
</tr>
734+
<tr>
727735
<td align="center" width="120">
728736
<a href="https://github.com/steam-bell-92">
729737
<img src="https://github.com/steam-bell-92.png?size=100" width="100" height="100" style="border-radius:50%; border:2px solid #555;" alt="steam-bell-92" /><br />
730738
<sub><b>@steam-bell-92</b></sub>
731739
</a>
732740
</td>
733-
</tr>
734-
<tr>
735741
<td align="center" width="120">
736742
<a href="https://github.com/sujitsingh8">
737743
<img src="https://github.com/sujitsingh8.png?size=100" width="100" height="100" style="border-radius:50%; border:2px solid #555;" alt="sujitsingh8" /><br />
@@ -762,14 +768,14 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for detailed guidelines.
762768
<sub><b>@vedika76</b></sub>
763769
</a>
764770
</td>
771+
</tr>
772+
<tr>
765773
<td align="center" width="120">
766774
<a href="https://github.com/vedikabajaj05">
767775
<img src="https://github.com/vedikabajaj05.png?size=100" width="100" height="100" style="border-radius:50%; border:2px solid #555;" alt="vedikabajaj05" /><br />
768776
<sub><b>@vedikabajaj05</b></sub>
769777
</a>
770778
</td>
771-
</tr>
772-
<tr>
773779
<td align="center" width="120">
774780
<a href="https://github.com/vivekCS007">
775781
<img src="https://github.com/vivekCS007.png?size=100" width="100" height="100" style="border-radius:50%; border:2px solid #555;" alt="vivekCS007" /><br />
@@ -785,7 +791,6 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for detailed guidelines.
785791
<td width="120"></td>
786792
<td width="120"></td>
787793
<td width="120"></td>
788-
<td width="120"></td>
789794
</tr>
790795
</table>
791796
<!-- CONTRIBUTORS_END -->

games/Emoji-Memory-Game/emoji_memory_game.py

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,20 @@ def show_countdown():
3636
time.sleep(1)
3737
clear_screen()
3838

39+
def get_difficulty():
40+
print("🎯 Select Difficulty")
41+
print("1. Easy (5 sec)")
42+
print("2. Medium (4 sec)")
43+
print("3. Hard (2 sec)")
44+
45+
choice = input("Enter choice (1/2/3): ").strip()
46+
47+
if choice == "1":
48+
return 5
49+
elif choice == "3":
50+
return 2
51+
else:
52+
return 4
3953

4054
def play_game():
4155
score = 0
@@ -45,6 +59,9 @@ def play_game():
4559
print("🎮 Welcome to Emoji Memory Game!")
4660
print(f"🏅 High Score: {high_score}\n")
4761

62+
# Added difficulty mode
63+
display_time = get_difficulty()
64+
4865
show_countdown()
4966

5067
while True:
@@ -53,10 +70,15 @@ def play_game():
5370
print("🧠 MEMORIZE THESE EMOJIS:")
5471
print(" ".join(sequence))
5572

56-
time.sleep(4)
73+
# difficulty-based timing
74+
time.sleep(display_time)
5775
clear_screen()
5876

59-
user_input = input("Type the emojis in order:\n> ").split()
77+
# Improved input validation
78+
user_input = input("Type the emojis in order:\n> ").strip().split()
79+
80+
# normalize input
81+
user_input = [emoji.strip() for emoji in user_input]
6082

6183
if not user_input:
6284
print("⚠️ Empty input detected!")
@@ -84,4 +106,12 @@ def play_game():
84106

85107

86108
if __name__ == "__main__":
87-
play_game()
109+
while True:
110+
play_game()
111+
112+
# Replay option
113+
choice = input("\nPlay again? (y/n): ").strip().lower()
114+
115+
if choice != "y":
116+
print("👋 Thanks for playing!")
117+
break

0 commit comments

Comments
 (0)