Skip to content

Commit 8bba38b

Browse files
IshikaSoni056IshikaSoni056
committed
Merge branch 'main' of https://github.com/qualitywise7org/qualitywise7.github.io into origin/ishikasoni
2 parents 9f93cbf + 223c2a3 commit 8bba38b

File tree

68 files changed

+1144
-1822
lines changed

Some content is hidden

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

68 files changed

+1144
-1822
lines changed

‎.vscode/settings.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"liveServer.settings.port": 5502
2+
"liveServer.settings.port": 5503
33
}

‎about/index.html‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
<a class="nav-link" href="/myaccount/jobsforyou">Jobs for you</a>
119119
</li>
120120
<li class="nav-item">
121-
<a class="nav-link" href="/myaccount/">My account</a>
121+
<a class="nav-link" id="myaccount-2" href="/myaccount/">My account</a>
122122
</li>
123123
<li class="nav-item login-btn">
124124
<a class="nav-link" id="login-button" href="/login">Login</a>
@@ -175,7 +175,7 @@
175175
font-size: 1.1rem;
176176
margin-bottom: 8px;
177177
"
178-
><a class="nav-link" href="/myaccount/">My Account</a></span>
178+
><a class="nav-link" id="myaccount-1" href="/myaccount/">My Account</a></span>
179179
</span>
180180
</div>
181181

@@ -457,16 +457,25 @@ <h5 class="modal-title" id="exampleModalLabel">
457457
const welcomeText = document.getElementById("welcome-text");
458458
const userMail = document.getElementById("user-mail");
459459

460+
461+
460462
if (user) {
461463
// Save email to localStorage
462464
localStorage.setItem("email", user.email);
465+
const userProfileRef = doc(db, "user_profile", user.email);
466+
const docSnap = await getDoc(userProfileRef);
467+
let name = "";
468+
if(docSnap.exists()){
469+
name = docSnap.data().about.firstname + " " + docSnap.data().about.lastname || "";
470+
}
463471

464472
// Hide the signup button and show "Logout"
465473
document.getElementById("login-button").innerHTML = "Logout";
466474
signupButton.style.display = "none";
467475

468476
// Retrieve the display name (username)
469-
let username = user.displayName; // For Google Sign-In or if saved during registration
477+
let username = user.displayName;
478+
// console.log(username) // For Google Sign-In or if saved during registration
470479

471480
// If username is not available in displayName, fetch it from Firestore
472481
if (!username) {
@@ -486,7 +495,10 @@ <h5 class="modal-title" id="exampleModalLabel">
486495
localStorage.setItem("username", username);
487496

488497
// Update welcome text with the username
489-
if(username)
498+
if(name){
499+
welcomeText.innerHTML = `Hii, ${name}`;
500+
}
501+
else if(username)
490502
welcomeText.innerHTML = `Hii, ${username}`;
491503
else{
492504
userMail.innerHTML = username; // Optionally update email

‎admin/index.html‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
<a class="nav-link" href="/myaccount/jobsforyou">Jobs for you</a>
109109
</li>
110110
<li class="nav-item">
111-
<a class="nav-link" href="/myaccount/">My account</a>
111+
<a class="nav-link" id="myaccount-2" href="/myaccount/">My account</a>
112112
</li>
113113
<li class="nav-item login-btn">
114114
<a class="nav-link" id="login-button" href="/login">Login</a>
@@ -165,7 +165,7 @@
165165
font-size: 1.1rem;
166166
margin-bottom: 8px;
167167
"
168-
><a class="nav-link" href="/myaccount/">My Account</a></span>
168+
><a class="nav-link" id="myaccount-1" href="/myaccount/">My Account</a></span>
169169
</span>
170170
</div>
171171

@@ -421,16 +421,25 @@ <h5 class="modal-title" id="exampleModalLabel">
421421
const welcomeText = document.getElementById("welcome-text");
422422
const userMail = document.getElementById("user-mail");
423423

424+
425+
424426
if (user) {
425427
// Save email to localStorage
426428
localStorage.setItem("email", user.email);
429+
const userProfileRef = doc(db, "user_profile", user.email);
430+
const docSnap = await getDoc(userProfileRef);
431+
let name = "";
432+
if(docSnap.exists()){
433+
name = docSnap.data().about.firstname + " " + docSnap.data().about.lastname || "";
434+
}
427435

428436
// Hide the signup button and show "Logout"
429437
document.getElementById("login-button").innerHTML = "Logout";
430438
signupButton.style.display = "none";
431439

432440
// Retrieve the display name (username)
433-
let username = user.displayName; // For Google Sign-In or if saved during registration
441+
let username = user.displayName;
442+
// console.log(username) // For Google Sign-In or if saved during registration
434443

435444
// If username is not available in displayName, fetch it from Firestore
436445
if (!username) {
@@ -450,7 +459,10 @@ <h5 class="modal-title" id="exampleModalLabel">
450459
localStorage.setItem("username", username);
451460

452461
// Update welcome text with the username
453-
if(username)
462+
if(name){
463+
welcomeText.innerHTML = `Hii, ${name}`;
464+
}
465+
else if(username)
454466
welcomeText.innerHTML = `Hii, ${username}`;
455467
else{
456468
userMail.innerHTML = username; // Optionally update email

‎apply/cv_upload/index.html‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
<a class="nav-link" href="/myaccount/jobsforyou">Jobs for you</a>
114114
</li>
115115
<li class="nav-item">
116-
<a class="nav-link" href="/myaccount/">My account</a>
116+
<a class="nav-link" id="myaccount-2" href="/myaccount/">My account</a>
117117
</li>
118118
<li class="nav-item login-btn">
119119
<a class="nav-link" id="login-button" href="/login">Login</a>
@@ -170,7 +170,7 @@
170170
font-size: 1.1rem;
171171
margin-bottom: 8px;
172172
"
173-
><a class="nav-link" href="/myaccount/">My Account</a></span>
173+
><a class="nav-link" id="myaccount-1" href="/myaccount/">My Account</a></span>
174174
</span>
175175
</div>
176176

@@ -477,16 +477,25 @@ <h5 class="modal-title" id="exampleModalLabel">
477477
const welcomeText = document.getElementById("welcome-text");
478478
const userMail = document.getElementById("user-mail");
479479

480+
481+
480482
if (user) {
481483
// Save email to localStorage
482484
localStorage.setItem("email", user.email);
485+
const userProfileRef = doc(db, "user_profile", user.email);
486+
const docSnap = await getDoc(userProfileRef);
487+
let name = "";
488+
if(docSnap.exists()){
489+
name = docSnap.data().about.firstname + " " + docSnap.data().about.lastname || "";
490+
}
483491

484492
// Hide the signup button and show "Logout"
485493
document.getElementById("login-button").innerHTML = "Logout";
486494
signupButton.style.display = "none";
487495

488496
// Retrieve the display name (username)
489-
let username = user.displayName; // For Google Sign-In or if saved during registration
497+
let username = user.displayName;
498+
// console.log(username) // For Google Sign-In or if saved during registration
490499

491500
// If username is not available in displayName, fetch it from Firestore
492501
if (!username) {
@@ -506,7 +515,10 @@ <h5 class="modal-title" id="exampleModalLabel">
506515
localStorage.setItem("username", username);
507516

508517
// Update welcome text with the username
509-
if(username)
518+
if(name){
519+
welcomeText.innerHTML = `Hii, ${name}`;
520+
}
521+
else if(username)
510522
welcomeText.innerHTML = `Hii, ${username}`;
511523
else{
512524
userMail.innerHTML = username; // Optionally update email

‎apply/index.html‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
<a class="nav-link" href="/myaccount/jobsforyou">Jobs for you</a>
112112
</li>
113113
<li class="nav-item">
114-
<a class="nav-link" href="/myaccount/">My account</a>
114+
<a class="nav-link" id="myaccount-2" href="/myaccount/">My account</a>
115115
</li>
116116
<li class="nav-item login-btn">
117117
<a class="nav-link" id="login-button" href="/login">Login</a>
@@ -168,7 +168,7 @@
168168
font-size: 1.1rem;
169169
margin-bottom: 8px;
170170
"
171-
><a class="nav-link" href="/myaccount/">My Account</a></span>
171+
><a class="nav-link" id="myaccount-1" href="/myaccount/">My Account</a></span>
172172
</span>
173173
</div>
174174

@@ -552,16 +552,25 @@ <h5 class="modal-title" id="exampleModalLabel">
552552
const welcomeText = document.getElementById("welcome-text");
553553
const userMail = document.getElementById("user-mail");
554554

555+
556+
555557
if (user) {
556558
// Save email to localStorage
557559
localStorage.setItem("email", user.email);
560+
const userProfileRef = doc(db, "user_profile", user.email);
561+
const docSnap = await getDoc(userProfileRef);
562+
let name = "";
563+
if(docSnap.exists()){
564+
name = docSnap.data().about.firstname + " " + docSnap.data().about.lastname || "";
565+
}
558566

559567
// Hide the signup button and show "Logout"
560568
document.getElementById("login-button").innerHTML = "Logout";
561569
signupButton.style.display = "none";
562570

563571
// Retrieve the display name (username)
564-
let username = user.displayName; // For Google Sign-In or if saved during registration
572+
let username = user.displayName;
573+
// console.log(username) // For Google Sign-In or if saved during registration
565574

566575
// If username is not available in displayName, fetch it from Firestore
567576
if (!username) {
@@ -581,7 +590,10 @@ <h5 class="modal-title" id="exampleModalLabel">
581590
localStorage.setItem("username", username);
582591

583592
// Update welcome text with the username
584-
if(username)
593+
if(name){
594+
welcomeText.innerHTML = `Hii, ${name}`;
595+
}
596+
else if(username)
585597
welcomeText.innerHTML = `Hii, ${username}`;
586598
else{
587599
userMail.innerHTML = username; // Optionally update email

‎apply/thanks/index.html‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
<a class="nav-link" href="/myaccount/jobsforyou">Jobs for you</a>
106106
</li>
107107
<li class="nav-item">
108-
<a class="nav-link" href="/myaccount/">My account</a>
108+
<a class="nav-link" id="myaccount-2" href="/myaccount/">My account</a>
109109
</li>
110110
<li class="nav-item login-btn">
111111
<a class="nav-link" id="login-button" href="/login">Login</a>
@@ -162,7 +162,7 @@
162162
font-size: 1.1rem;
163163
margin-bottom: 8px;
164164
"
165-
><a class="nav-link" href="/myaccount/">My Account</a></span>
165+
><a class="nav-link" id="myaccount-1" href="/myaccount/">My Account</a></span>
166166
</span>
167167
</div>
168168

@@ -411,16 +411,25 @@ <h5 class="modal-title" id="exampleModalLabel">
411411
const welcomeText = document.getElementById("welcome-text");
412412
const userMail = document.getElementById("user-mail");
413413

414+
415+
414416
if (user) {
415417
// Save email to localStorage
416418
localStorage.setItem("email", user.email);
419+
const userProfileRef = doc(db, "user_profile", user.email);
420+
const docSnap = await getDoc(userProfileRef);
421+
let name = "";
422+
if(docSnap.exists()){
423+
name = docSnap.data().about.firstname + " " + docSnap.data().about.lastname || "";
424+
}
417425

418426
// Hide the signup button and show "Logout"
419427
document.getElementById("login-button").innerHTML = "Logout";
420428
signupButton.style.display = "none";
421429

422430
// Retrieve the display name (username)
423-
let username = user.displayName; // For Google Sign-In or if saved during registration
431+
let username = user.displayName;
432+
// console.log(username) // For Google Sign-In or if saved during registration
424433

425434
// If username is not available in displayName, fetch it from Firestore
426435
if (!username) {
@@ -440,7 +449,10 @@ <h5 class="modal-title" id="exampleModalLabel">
440449
localStorage.setItem("username", username);
441450

442451
// Update welcome text with the username
443-
if(username)
452+
if(name){
453+
welcomeText.innerHTML = `Hii, ${name}`;
454+
}
455+
else if(username)
444456
welcomeText.innerHTML = `Hii, ${username}`;
445457
else{
446458
userMail.innerHTML = username; // Optionally update email

‎biographies/BillGates.html‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
<a class="nav-link" href="/myaccount/jobsforyou">Jobs for you</a>
114114
</li>
115115
<li class="nav-item">
116-
<a class="nav-link" href="/myaccount/">My account</a>
116+
<a class="nav-link" id="myaccount-2" href="/myaccount/">My account</a>
117117
</li>
118118
<li class="nav-item login-btn">
119119
<a class="nav-link" id="login-button" href="/login">Login</a>
@@ -170,7 +170,7 @@
170170
font-size: 1.1rem;
171171
margin-bottom: 8px;
172172
"
173-
><a class="nav-link" href="/myaccount/">My Account</a></span>
173+
><a class="nav-link" id="myaccount-1" href="/myaccount/">My Account</a></span>
174174
</span>
175175
</div>
176176

@@ -548,16 +548,25 @@ <h5 class="modal-title" id="exampleModalLabel">
548548
const welcomeText = document.getElementById("welcome-text");
549549
const userMail = document.getElementById("user-mail");
550550

551+
552+
551553
if (user) {
552554
// Save email to localStorage
553555
localStorage.setItem("email", user.email);
556+
const userProfileRef = doc(db, "user_profile", user.email);
557+
const docSnap = await getDoc(userProfileRef);
558+
let name = "";
559+
if(docSnap.exists()){
560+
name = docSnap.data().about.firstname + " " + docSnap.data().about.lastname || "";
561+
}
554562

555563
// Hide the signup button and show "Logout"
556564
document.getElementById("login-button").innerHTML = "Logout";
557565
signupButton.style.display = "none";
558566

559567
// Retrieve the display name (username)
560-
let username = user.displayName; // For Google Sign-In or if saved during registration
568+
let username = user.displayName;
569+
// console.log(username) // For Google Sign-In or if saved during registration
561570

562571
// If username is not available in displayName, fetch it from Firestore
563572
if (!username) {
@@ -577,7 +586,10 @@ <h5 class="modal-title" id="exampleModalLabel">
577586
localStorage.setItem("username", username);
578587

579588
// Update welcome text with the username
580-
if(username)
589+
if(name){
590+
welcomeText.innerHTML = `Hii, ${name}`;
591+
}
592+
else if(username)
581593
welcomeText.innerHTML = `Hii, ${username}`;
582594
else{
583595
userMail.innerHTML = username; // Optionally update email

0 commit comments

Comments
 (0)