Skip to content

Commit 370668b

Browse files
authored
Merge branch 'main' into feature/recently-viewed-section
2 parents dd50bf4 + 10d7512 commit 370668b

12 files changed

Lines changed: 342 additions & 86 deletions

File tree

.all-contributorsrc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,15 @@
9393
"code",
9494
"test"
9595
]
96+
},
97+
{
98+
"login": "anantjain-afk",
99+
"name": "anantjain-afk",
100+
"avatar_url": "https://avatars.githubusercontent.com/u/188947462?v=4",
101+
"profile": "https://github.com/anantjain-afk",
102+
"contributions": [
103+
"code"
104+
]
96105
}
97106
],
98107
"commitType": "docs",
Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: CI
1+
name: CI/CD
22

33
on:
44
push:
@@ -10,7 +10,7 @@ permissions:
1010
contents: read
1111

1212
jobs:
13-
build:
13+
build-deploy:
1414
runs-on: ubuntu-latest
1515

1616
steps:
@@ -29,5 +29,12 @@ jobs:
2929
- name: Lint
3030
run: npm run lint --if-present
3131

32-
- name: Run build
32+
- name: Build
3333
run: npm run build
34+
35+
- name: Deploy to Netlify
36+
if: github.ref == 'refs/heads/main'
37+
run: npx netlify-cli deploy --dir=dist --site=$NETLIFY_SITE_ID --prod
38+
env:
39+
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
40+
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
[![GitHub last commit](https://img.shields.io/github/last-commit/OpenCodeChicago/hacktoberfest-2025-frontend)](https://github.com/OpenCodeChicago/hacktoberfest-2025-frontend/commits/main)
66
[![License: MIT](https://img.shields.io/github/license/OpenCodeChicago/hacktoberfest-2025-frontend)](https://github.com/OpenCodeChicago/hacktoberfest-2025-frontend/blob/main/LICENSE)
7-
[![CI](https://github.com/OpenCodeChicago/hacktoberfest-2025-frontend/actions/workflows/ci.yml/badge.svg?style=for-the-badge)](https://github.com/OpenCodeChicago/hacktoberfest-2025-frontend/actions/workflows/ci.yml)
7+
[![CI/CD](https://github.com/OpenCodeChicago/hacktoberfest-2025-frontend/actions/workflows/ci-cd.yml/badge.svg)](https://github.com/OpenCodeChicago/hacktoberfest-2025-frontend/actions/workflows/ci-cd.yml)
88
[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/OpenCodeChicago/hacktoberfest-2025-frontend/badge)](https://securityscorecards.dev/viewer/?uri=github.com/OpenCodeChicago/hacktoberfest-2025-frontend)
99
[![Open Issues](https://img.shields.io/github/issues/OpenCodeChicago/hacktoberfest-2025-frontend)](https://github.com/OpenCodeChicago/hacktoberfest-2025-frontend/issues)
1010
[![Pull Requests](https://img.shields.io/github/issues-pr/OpenCodeChicago/hacktoberfest-2025-frontend)](https://github.com/OpenCodeChicago/hacktoberfest-2025-frontend/pulls)
@@ -272,6 +272,7 @@ Thanks goes to these wonderful people:
272272
<tr>
273273
<td align="center" valign="top" width="14.28%"><a href="https://github.com/mitaliiiiii"><img src="https://avatars.githubusercontent.com/u/141233593?v=4?s=100" width="100px;" alt="mitaliiiiii"/><br /><sub><b>mitaliiiiii</b></sub></a><br /><a href="https://github.com/OpenCodeChicago/hacktoberfest-2025-frontend/commits?author=mitaliiiiii" title="Code">💻</a></td>
274274
<td align="center" valign="top" width="14.28%"><a href="https://www.anasfarooq.com/"><img src="https://avatars.githubusercontent.com/u/173719230?v=4?s=100" width="100px;" alt="Muhammad Anas Farooq"/><br /><sub><b>Muhammad Anas Farooq</b></sub></a><br /><a href="https://github.com/OpenCodeChicago/hacktoberfest-2025-frontend/commits?author=anasfarock" title="Code">💻</a> <a href="https://github.com/OpenCodeChicago/hacktoberfest-2025-frontend/commits?author=anasfarock" title="Tests">⚠️</a></td>
275+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/anantjain-afk"><img src="https://avatars.githubusercontent.com/u/188947462?v=4?s=100" width="100px;" alt="anantjain-afk"/><br /><sub><b>anantjain-afk</b></sub></a><br /><a href="https://github.com/OpenCodeChicago/hacktoberfest-2025-frontend/commits?author=anantjain-afk" title="Code">💻</a></td>
275276
</tr>
276277
</tbody>
277278
</table>

package-lock.json

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/images/coreX-logo.svg

Lines changed: 35 additions & 0 deletions
Loading

src/components/Footer/TopFooter.jsx

Lines changed: 32 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import { useState } from 'react';
22
import { ArrowRight } from 'lucide-react';
3+
import { Link } from 'react-router';
4+
import { toast } from 'react-toastify';
35

46
const customerCare = [
57
{ name: 'My Account', href: '/login' },
@@ -21,24 +23,41 @@ export default function TopFooter() {
2123

2224
const handleSubmit = (e) => {
2325
e.preventDefault();
24-
if (/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email)) {
25-
console.log('Subscribed:', email);
26-
setEmail('');
27-
} else {
28-
alert('Enter a valid email.');
26+
27+
const isValidEmail = /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email.trim());
28+
29+
if (!isValidEmail) {
30+
toast.error('Please enter a valid email address.');
31+
return;
2932
}
33+
34+
// Simulate subscription success (e.g., API call here)
35+
console.log('Subscribed:', email);
36+
37+
// Show success toast notification
38+
toast.success(
39+
'Thank you for subscribing! Your email has been received. You’ll now get our latest deals and discounts.'
40+
);
41+
42+
setEmail('');
3043
};
3144

3245
return (
3346
<footer className="bg-neutral-900 text-neutral-200 px-6 py-12">
3447
<div className="max-w-7xl mx-auto grid gap-12 md:grid-cols-3">
3548
{/* Logo + Address */}
3649
<div>
37-
<img
38-
src="/images/official-logo-core-x-footer.svg"
39-
alt="CoreX"
40-
className="mb-4 w-32"
41-
/>
50+
<Link
51+
to="/"
52+
className="inline-block mb-4"
53+
onClick={() => window.scrollTo({ top: 0, behavior: 'smooth' })}
54+
>
55+
<img
56+
src="/images/official-logo-core-x-footer.svg"
57+
alt="CoreX"
58+
className="mb-4 w-32"
59+
/>
60+
</Link>
4261
<ul className="flex space-x-2 mb-4">
4362
<li>
4463
<a
@@ -97,7 +116,7 @@ export default function TopFooter() {
97116
</a>
98117
</li>
99118
</ul>
100-
<address className="underline not-italic text-sm leading-relaxed">
119+
<address className="hover:underline cursor-pointer not-italic text-sm leading-relaxed">
101120
1234 N Main St,
102121
<br /> Chicago, IL 60607
103122
</address>
@@ -148,12 +167,12 @@ export default function TopFooter() {
148167
value={email}
149168
onChange={(e) => setEmail(e.target.value)}
150169
placeholder="Enter your email"
151-
className="flex-grow p-3 bg-neutral-800 text-neutral-200 placeholder-neutral-400 outline-none"
170+
className="flex-grow p-3 bg-neutral-800 text-neutral-200 placeholder-neutral-400 outline-none hover:bg-neutral-700 hover:ring-1 hover:ring-neutral-500 focus:ring-2 focus:ring-white transition duration-200 ease-in-out"
152171
required
153172
/>
154173
<button
155174
type="submit"
156-
className="p-3 rounded-full bg-white hover:bg-neutral-400 text-neutral-900 transition"
175+
className="p-3 rounded-full bg-white hover:bg-neutral-400 text-neutral-900 transition cursor-pointer flex items-center justify-center"
157176
aria-label="Subscribe"
158177
>
159178
<ArrowRight className="w-5 h-5 text-neutral-900" />

0 commit comments

Comments
 (0)