Skip to content

Commit 4a35565

Browse files
pankajparkarpankajparkar
authored
Merge branch 'main' into feat/520-upadte-angular-20
2 parents a1f927f + f751603 commit 4a35565

263 files changed

Lines changed: 1349 additions & 1153 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.

‎apps/angular/src/app/components/navbar/navbar.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="left">
33
<a [href]="backURL" class="back"> &lt; </a>
44
<a [href]="homeURL" class="logo">
5-
<img src="{{ repoURL() }}/raw/main/shared/assets/core/logo.png" alt="logo" />
5+
<img src="{{ repoURL() }}/raw/main/shared/assets/core/logo.svg" alt="logo" />
66
</a>
77
</div>
88

‎apps/angular/src/app/components/navbar/navbar.component.scss‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
align-items: center;
99
justify-content: space-between;
1010
padding: 1rem;
11-
margin-bottom: 2rem;
11+
margin-bottom: 1rem;
1212
box-shadow: 0 4px 4px 0 rgb(0 0 0 / 10%);
1313

1414
.left {
@@ -27,12 +27,12 @@
2727
}
2828

2929
img {
30-
width: 32px;
31-
height: 32px;
30+
width: 2rem;
31+
height: 2rem;
3232
}
3333

3434
.logo {
35-
height: 32px;
35+
height: 2rem;
3636
}
3737
}
3838

@@ -61,8 +61,8 @@
6161
text-decoration: none;
6262

6363
img {
64-
width: 32px;
65-
height: 32px;
64+
width: 2rem;
65+
height: 2rem;
6666
}
6767
}
6868
}

‎apps/css/src/challenges/skeleton-loader/index.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<!doctype html>
22
<html lang="en">
33
<head>
4-
<link rel="icon" type="image/svg+xml" href="../../logo.svg" />
54
<script src="../../helpers/header.js" type="module"></script>
65
<link rel="stylesheet" href="./style.css" />
76
</head>

‎apps/css/src/challenges/star-rating-display/index.html‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
<!doctype html>
22
<html lang="en">
33
<head>
4-
<meta charset="UTF-8" />
5-
<link rel="icon" type="image/svg+xml" href="../../logo.svg" />
6-
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
7-
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
8-
<script src="index.js" type="module"></script>
94
<script src="../../helpers/header.js" type="module"></script>
5+
<script src="index.js" type="module"></script>
106
<link rel="stylesheet" href="style.css" />
117
</head>
128
<body>

‎apps/css/src/helpers/header.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ metaHTTP.setAttribute('content', 'IE=edge');
2121
const favIcon = document.createElement('link');
2222
favIcon.setAttribute('rel', 'icon');
2323
favIcon.setAttribute('type', 'image/svg+xml');
24-
favIcon.setAttribute('href', `${REPO_URL}/raw/main/shared/assets/core/logo.png`);
24+
favIcon.setAttribute('href', `${REPO_URL}/raw/main/shared/assets/core/logo.svg`);
2525

2626
// Add all tags to the head
2727
const headTags = [metaUTF, metaName, metaHTTP, favIcon];

‎apps/host/package.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
"@fmc/assets": "*",
1616
"@fmc/data": "*",
1717
"@fmc/shared-styles": "*",
18-
"@formkit/auto-animate": "^0.8.2",
1918
"axios": "^1.10.0",
2019
"lucide-react": "^0.525.0",
2120
"react": "^19.1.0",

‎apps/host/src/components/common/navbar/navbar.module.scss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
.logoImage {
3535
width: auto;
36-
height: 32px;
36+
height: 2rem;
3737
}
3838

3939
.logoText {
@@ -91,8 +91,8 @@
9191
}
9292

9393
.githubIcon {
94-
width: 32px;
95-
height: 32px;
94+
width: 2rem;
95+
height: 2rem;
9696
border: 1px solid white;
9797
border-radius: 50%;
9898
}

‎apps/host/src/components/common/navbar/navbar.tsx‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Moon, Sun, Trophy } from 'lucide-react';
2-
import { logo, logo_dark } from '@fmc/assets';
2+
import { logo_dark, logo_light } from '@fmc/assets';
33

44
import { Link } from 'react-router-dom';
55
import { REPO_URL } from '@fmc/data/content';
@@ -11,7 +11,7 @@ import { useContext } from 'react';
1111
export function Navbar() {
1212
const { theme, toggleTheme } = useContext(ThemeContext);
1313
const isDark = theme === 'dark';
14-
const logoSrc = isDark ? logo_dark : logo;
14+
const logoSrc = isDark ? logo_dark : logo_light;
1515

1616
return (
1717
<nav className={styles.navbar}>
@@ -24,7 +24,7 @@ export function Navbar() {
2424

2525
<div className={styles.navLinks}>
2626
<Link to="/leaderboard" className={styles.navLink}>
27-
<Trophy size="24" className={styles.navIcon} />
27+
<Trophy size="1.5rem" className={styles.navIcon} />
2828
<span>Leaderboard</span>
2929
</Link>
3030

@@ -43,7 +43,11 @@ export function Navbar() {
4343
className={styles.themeToggle}
4444
aria-label={`Switch to ${isDark ? 'light' : 'dark'} mode`}
4545
>
46-
{isDark ? <Moon className={styles.themeIcon} /> : <Sun className={styles.themeIcon} />}
46+
{isDark ? (
47+
<Moon className={styles.themeIcon} size="1.5rem" />
48+
) : (
49+
<Sun className={styles.themeIcon} size="1.5rem" />
50+
)}
4751
</button>
4852
</div>
4953
</div>

‎apps/host/src/components/common/tags/tags.module.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
grid-column: -2;
44
justify-self: flex-end;
55
width: 70%;
6-
border: 2px solid #ccc;
76
}
87

98
.segmentBtn {
109
width: 50%;
10+
color: var(--text-primary);
1111
text-transform: capitalize;
1212
background-color: var(--shadow-footer);
1313
border: none;

‎apps/host/src/components/modules/home/contribution/contribution.tsx‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@ import { useEffect, useState } from 'react';
44
import { Contributor } from '@/pages/types';
55
import axios from 'axios';
66
import styles from './contribution.module.scss';
7-
import { useAutoAnimate } from '@formkit/auto-animate/react';
87

98
export function Contribution() {
109
const [contributors, setContributors] = useState<Contributor[]>([]);
1110
const [loading, setLoading] = useState(true);
1211
const [error, setError] = useState<string | null>(null);
13-
const [contributorsRef] = useAutoAnimate<HTMLDivElement>();
1412

1513
useEffect(() => {
1614
const fetchContributors = async () => {
@@ -41,7 +39,7 @@ export function Contribution() {
4139
<p>{error}</p>
4240
) : (
4341
<>
44-
<div className={styles.contributorsGrid} ref={contributorsRef}>
42+
<div className={styles.contributorsGrid}>
4543
{contributors.map((contributor) => (
4644
<a
4745
key={contributor.id}

0 commit comments

Comments
 (0)