Skip to content

Commit 48eb7c2

Browse files
Merge branch 'main' into feature/contact-us
2 parents 69fd1be + 2e16c54 commit 48eb7c2

4 files changed

Lines changed: 10 additions & 228 deletions

File tree

.github/workflows/doc-check-linter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,4 +120,4 @@ jobs:
120120
# ---------- Optional status for skipped forked PRs ----------
121121
- name: Skip GPG checks for external PRs
122122
if: ${{ github.event.pull_request.head.repo.full_name != github.repository && github.event_name == 'pull_request' }}
123-
run: echo "🟡 Skipping GPG verification for external PR (no access to secrets)."
123+
run: echo "🟡 Skipping GPG verification for external PR (no access to secrets)."

index.html

Lines changed: 9 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,7 @@
44
<head>
55
<meta charset="UTF-8">
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
7-
<<<<<<< HEAD
8-
<<<<<<< HEAD
9-
<<<<<<< HEAD
10-
<title>Vimal Tech - Portfolio</title>
11-
=======
12-
<title>Java Developer Portfolio</title>
13-
>>>>>>> 1ffaec2 (Favicon added & services created)
14-
=======
15-
<title>Vimal Tech - Portfolio</title>
16-
>>>>>>> 5ce3cde (Icon pisition)
17-
=======
187
<title>Vimal Tech</title>
19-
>>>>>>> 38b90a3 (Dropdown added at navbar)
208
<!-- Favicon -->
219
<link rel="apple-touch-icon" sizes="180x180" href="/images/apple-touch-icon.png">
2210
<link rel="icon" type="image/png" sizes="32x32" href="/images/favicon-32x32.png">
@@ -178,8 +166,6 @@ <h3 style="color: #604848">
178166
</div>
179167
</section>
180168

181-
<<<<<<< HEAD
182-
<<<<<<< HEAD
183169
<!-- Skills Section -->
184170
<section id="skills" class="container fade-in">
185171
<h2>Skills</h2>
@@ -202,8 +188,10 @@ <h3>REST API</h3>
202188
<div class="skill-card"><i class="fas fa-database"></i>
203189
<h3>Oracle/sql-developer</h3>
204190
</div>
205-
<div class="skill-card"><i class="fab fa-aws"></i>
206-
<h3>AWS</h3>
191+
<div class="service-card">
192+
<i class="fas fa-project-diagram"></i>
193+
<h3>Project Consulting</h3>
194+
<p>Architecture guidance and microservices design for enterprise projects.</p>
207195
</div>
208196
<div class="skill-card"><i class="fas fa-database"></i>
209197
<h3>MongoDB</h3>
@@ -244,22 +232,12 @@ <h3>Atlassian</h3>
244232
<div class="skill-card"><i class="fab fa-jira"></i>
245233
<h3>Jira</h3>
246234
</div>
247-
<<<<<<< HEAD
248-
<<<<<<< HEAD
249-
<<<<<<< HEAD
250235
<div class="skill-card"><a href="https://vimal-java-dev.github.io/#links" target="_blank">
251-
=======
252-
<div class="skill-card"><a href="portfolio.html#links" target="_blank">
253-
>>>>>>> 7c0906e (Portfolio link to home page)
254236
<i class="fab fa-github"></i><br>GitHub</a></div>
255-
=======
256-
<div class="skill-card"><i class="fab fa-github"></i><br><a href="https://vimal-java-dev.github.io/"
257-
target="_blank">GitHub</a></div>
258-
>>>>>>> f4c9676 (Skill added and linked remove to put in another page)
259-
=======
260-
<div class="skill-card"><a href="https://vimal-java-dev.github.io/#links" target="_blank">
261-
<i class="fab fa-github"></i><br>GitHub</a></div>
262-
>>>>>>> 1ffaec2 (Favicon added & services created)
237+
</div><br>
238+
239+
<div class="services-preview" style="margin-top:20px; margin-bottom:10px">
240+
<a href="services.html" class="btn">View All Services</a>
263241
</div>
264242
</section><br />
265243

@@ -334,23 +312,7 @@ <h2>Portfolio</h2>
334312
<a href="portfolio.html" class="btn">View Overview</a>
335313
</div>
336314
</section>
337-
338-
=======
339-
>>>>>>> 47785b2 (Expertise page created)
340-
<!-- Contact Section -->
341-
<section id="contact" class="container fade-in">
342-
<h2>Contact Me</h2>
343-
<p>If you’d like to collaborate, feel free to reach out:</p>
344-
<div class="contact-links">
345-
<a href="tel:+919638474047"><i class="fas fa-phone"></i> Call</a>
346-
<a href="mailto:vimal.patel@vimaltech.dev"><i class="fas fa-envelope"></i> Email</a>
347-
<a href="https://www.linkedin.com/in/vimaltech/" target="_blank"><i class="fab fa-linkedin"></i> LinkedIn</a>
348-
<a href="https://www.instagram.com/vimaltech/" target="_blank"><i class="fab fa-instagram"></i> Instagram</a>
349-
</div>
350-
</section>
351-
352-
=======
353-
>>>>>>> d29f035 (contact.html created separately)
315+
354316
<!-- Floating WhatsApp -->
355317
<a href="https://wa.me/919638474047?text=Hello%20Vimal%2C%0AI%20would%20like%20to%20know%20more%20about%20your%20tech%20services."
356318
class="whatsapp-float" target="_blank">

js/services.js

Lines changed: 0 additions & 170 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
<<<<<<< HEAD
2-
<<<<<<< HEAD
3-
=======
4-
>>>>>>> 5ce3cde (Icon pisition)
51
// ===== Particles.js Hero Background (Dynamic for Dark Mode) =====
62
// ===== Initialize Particles.js with Theme-Aware Colors ===== (Applied before)
73
// ===== Initialize Particles.js with Orange (Light) & Cyan (Dark) Themes ===== (Applied)
@@ -128,169 +124,3 @@ function updateToggleIcon() {
128124
darkModeToggle.style.color = "#fff";
129125
}
130126
}
131-
132-
<<<<<<< HEAD:services.js
133-
<<<<<<< HEAD
134-
=======
135-
>>>>>>> 1ffaec2 (Favicon added & services created)
136-
=======
137-
>>>>>>> 5ce3cde (Icon pisition)
138-
// Hamburger Menu
139-
const hamburger = document.getElementById("hamburger");
140-
const navLinks = document.getElementById("nav-links");
141-
142-
if (hamburger && navLinks) {
143-
hamburger.addEventListener("click", () => {
144-
navLinks.classList.toggle("active");
145-
});
146-
}
147-
148-
// Scroll Fade-in Animation with staggered delay
149-
document.addEventListener("DOMContentLoaded", function () {
150-
const faders = document.querySelectorAll(".fade-in");
151-
152-
const appearOptions = {
153-
threshold: 0.2,
154-
rootMargin: "0px 0px -50px 0px",
155-
};
156-
157-
const appearOnScroll = new IntersectionObserver(function (entries, observer) {
158-
entries.forEach(entry => {
159-
if (!entry.isIntersecting) return;
160-
entry.target.classList.add("visible");
161-
observer.unobserve(entry.target);
162-
});
163-
}, appearOptions);
164-
165-
faders.forEach(fader => {
166-
appearOnScroll.observe(fader);
167-
});
168-
});
169-
170-
/* ===== Scroll-to-Top Button ===== */
171-
const scrollTopBtn = document.getElementById("scrollTopBtn");
172-
173-
window.addEventListener("scroll", () => {
174-
if (document.documentElement.scrollTop > 150) {
175-
scrollTopBtn.classList.add("show");
176-
} else {
177-
scrollTopBtn.classList.remove("show");
178-
}
179-
});
180-
181-
scrollTopBtn.addEventListener("click", () => {
182-
window.scrollTo({ top: 0, behavior: "smooth" });
183-
});
184-
185-
<<<<<<< HEAD
186-
<<<<<<< HEAD
187-
=======
188-
// ===== Particles.js Hero Background (Dynamic for Dark Mode) =====
189-
function initParticles() {
190-
const isDark = document.body.classList.contains("dark");
191-
192-
particlesJS("particles-js", {
193-
"particles": {
194-
"number": {
195-
"value": 60,
196-
"density": { "enable": true, "value_area": 800 }
197-
},
198-
"color": { "value": isDark ? "#00e5ff" : "#ffffff" },
199-
"shape": { "type": "circle" },
200-
"opacity": {
201-
"value": 0.6,
202-
"random": true,
203-
"anim": {
204-
"enable": true,
205-
"speed": 0.5,
206-
"opacity_min": 0.1,
207-
"sync": false
208-
}
209-
},
210-
"size": {
211-
"value": 3,
212-
"random": true,
213-
"anim": { "enable": false }
214-
},
215-
"line_linked": {
216-
"enable": true,
217-
"distance": 120,
218-
"color": isDark ? "#00bcd4" : "#ffffff",
219-
"opacity": 0.3,
220-
"width": 1
221-
},
222-
"move": {
223-
"enable": true,
224-
"speed": 2,
225-
"direction": "none",
226-
"random": true,
227-
"straight": false,
228-
"bounce": false,
229-
"attract": { "enable": false }
230-
}
231-
},
232-
"interactivity": {
233-
"detect_on": "canvas",
234-
"events": {
235-
"onhover": { "enable": true, "mode": "repulse" },
236-
"onclick": { "enable": false }
237-
},
238-
"modes": {
239-
"repulse": { "distance": 100, "duration": 0.4 }
240-
}
241-
},
242-
"retina_detect": true
243-
});
244-
}
245-
246-
// Preserve Dark Mode Preference
247-
if (localStorage.getItem("theme") === "dark") {
248-
document.body.classList.add("dark");
249-
}
250-
251-
// ===== Initialize on Load =====
252-
document.addEventListener("DOMContentLoaded", () => {
253-
initParticles();
254-
});
255-
256-
// ===== Re-initialize on Dark Mode Toggle =====
257-
const darkModeToggle = document.getElementById("darkModeToggle");
258-
259-
// Update preference on toggle
260-
if (darkModeToggle) {
261-
darkModeToggle.addEventListener("click", () => {
262-
const isDark = document.body.classList.toggle("dark");
263-
localStorage.setItem("theme", isDark ? "dark" : "light");
264-
updateOverlayGradient();
265-
266-
setTimeout(() => {
267-
if (window.pJSDom && pJSDom.length) {
268-
pJSDom[0].pJS.fn.vendors.destroypJS();
269-
document.getElementById("particles-js").innerHTML = "";
270-
}
271-
initParticles();
272-
}, 300);
273-
});
274-
}
275-
276-
function updateOverlayGradient() {
277-
const overlay = document.querySelector(".gradient-overlay");
278-
if (!overlay) return;
279-
280-
if (document.body.classList.contains("dark")) {
281-
overlay.style.background =
282-
"linear-gradient(45deg, rgba(33,150,243,0.25), rgba(0,0,0,0.3), rgba(63,81,181,0.3))";
283-
} else {
284-
overlay.style.background =
285-
"linear-gradient(45deg, rgba(255,87,34,0.3), rgba(255,255,255,0.15), rgba(255,152,0,0.25))";
286-
}
287-
}
288-
289-
290-
291-
>>>>>>> 1ffaec2 (Favicon added & services created)
292-
=======
293-
>>>>>>> 5ce3cde (Icon pisition)
294-
295-
=======
296-
>>>>>>> a6b9b59 (Design added index + services page):js/services.js

services.html

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,6 @@
3333
</style>
3434

3535
<body>
36-
<<<<<<< HEAD
37-
<<<<<<< HEAD
38-
<<<<<<< HEAD
39-
=======
40-
41-
>>>>>>> 1ffaec2 (Favicon added & services created)
42-
=======
43-
>>>>>>> 5ce3cde (Icon pisition)
44-
=======
4536
<!-- 🌟 VimalTech Diwali Offer Banner -->
4637
<div class="discount-banner">
4738
<div class="sparkle sparkle1"></div>
@@ -57,7 +48,6 @@
5748
</a>
5849
</div>
5950

60-
>>>>>>> 7c0906e (Portfolio link to home page)
6151
<!-- Navbar -->
6252
<nav class="navbar">
6353
<div>

0 commit comments

Comments
 (0)