Skip to content

Commit a76a3d3

Browse files
HimanshuNarwareHimanshuNarware
authored
Merge pull request #3003 from HimanshuNarware/ui
ui changes and bug fixing
2 parents ade379d + 648618e commit a76a3d3

File tree

10 files changed

+107
-105
lines changed

10 files changed

+107
-105
lines changed

‎frontend/src/App.css‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
transition: background-color 0.2s;
66
}
77

8-
cursor: pointer;
8+
/* cursor: pointer;
99
transition: background-color 0.2s;
10-
}
10+
}
11+
}}}} */

‎frontend/src/ChatAssistant/ChatAssistant.css‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
margin-right: 20px;
66
margin-bottom: 12px;
77
/* z-index: 999; */
8-
cursor:none;
8+
/* cursor:none; */
99
}
1010
.chatbot-close-animation {
1111
animation: animate-close ease-in 0.3s forwards;
@@ -148,7 +148,7 @@
148148
.Logo {
149149
height: 50px;
150150
width: 50px;
151-
cursor: none;
151+
/* cursor: none; */
152152
height:50px;
153153
width:50px;
154154
}
@@ -183,7 +183,7 @@
183183
border-radius: 50px;
184184
color: black;
185185
font-size: 20px;
186-
cursor: none;
186+
/* cursor: none; */
187187
position: absolute;
188188
z-index: 5;
189189
margin-left: 130px;

‎frontend/src/Component/Navbar/NavbarCenter.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ function NavbarCenter() {
3030
<li className="nav-item">
3131
<NavbarItem description={<><FontAwesomeIcon icon={faInfoCircle} /> About Us</>} to="/about" />
3232
</li>
33-
<li className="nav-item">
33+
{/* <li className="nav-item">
3434
<NavbarItem description={<><FontAwesomeIcon icon={faQuestionCircle} /> FAQ's</>} to="/faq" />
35-
</li>
35+
</li> */}
3636
<li className="nav-item" onClick={handleRateUsClick}>
3737
<NavbarItem description={<><FontAwesomeIcon icon={faStar} /> Rate Us</>} to="#" />
3838
</li>

‎frontend/src/Component/TrailingCursor/TrailingCursor.jsx‎

Lines changed: 71 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,72 @@
1-
import React, { useEffect, useState } from 'react';
2-
import Styles from './TrailingCursor.module.css';
3-
import { PiCursorFill } from "react-icons/pi";
4-
import { FaHandPointer } from "react-icons/fa";
5-
import { LuTextCursor } from "react-icons/lu";
6-
const TrailingCursor = () => {
7-
const [cursorPosition, setCursorPosition] = useState({ x: 0, y: 0 });
8-
const [isPointer, setIsPointer] = useState('default');
9-
const handleMouseMove = (event) => {
10-
const scrollLeft = window.pageXOffset;
11-
const scrollTop = window.pageYOffset;
12-
setCursorPosition({ x: event.clientX + scrollLeft, y: event.clientY + scrollTop });
13-
createTrailing(event.clientX + 40, event.clientY + 40);
14-
};
15-
const handleMouseOver = (event) => {
16-
if (event.target.tagName === 'A' || event.target.tagName === 'BUTTON') {
17-
setIsPointer('pointer');
18-
} else if (event.target.tagName === 'INPUT' || event.target.tagName === 'TEXTAREA') {
19-
setIsPointer('text');
20-
} else {
21-
setIsPointer('default');
22-
}
23-
};
24-
const createTrailing = (x, y) => {
25-
const trailingContainer = document.createElement('div');
26-
trailingContainer.className = 'trailing-container';
27-
for (let i = 0; i < 2; i++) {
28-
const trailing = document.createElement('div');
29-
trailing.className = Styles['trailing'];
30-
const relativeX = x + Math.random() * 20 - 10; // Randomize position within a range
31-
const relativeY = y + Math.random() * 20 - 10; // Randomize position within a range
32-
trailing.style.left = `${relativeX - 5}px`;
33-
trailing.style.top = `${relativeY - 5}px`;
34-
trailingContainer.appendChild(trailing);
35-
}
36-
document.body.appendChild(trailingContainer);
37-
// Remove the trailing elements after the animation ends
38-
setTimeout(() => {
39-
trailingContainer.remove();
40-
}, 400);
41-
};
42-
useEffect(() => {
43-
document.addEventListener('mousemove', handleMouseMove);
44-
document.addEventListener('mouseover', handleMouseOver);
1+
// import React, { useEffect, useState } from 'react';
2+
// import Styles from './TrailingCursor.module.css';
3+
// import { PiCursorFill } from "react-icons/pi";
4+
// import { FaHandPointer } from "react-icons/fa";
5+
// import { LuTextCursor } from "react-icons/lu";
6+
// const TrailingCursor = () => {
7+
// const [cursorPosition, setCursorPosition] = useState({ x: 0, y: 0 });
8+
// const [isPointer, setIsPointer] = useState('default');
9+
// const handleMouseMove = (event) => {
10+
// const scrollLeft = window.pageXOffset;
11+
// const scrollTop = window.pageYOffset;
12+
// setCursorPosition({ x: event.clientX + scrollLeft, y: event.clientY + scrollTop });
13+
// createTrailing(event.clientX + 40, event.clientY + 40);
14+
// };
15+
// const handleMouseOver = (event) => {
16+
// if (event.target.tagName === 'A' || event.target.tagName === 'BUTTON') {
17+
// setIsPointer('pointer');
18+
// } else if (event.target.tagName === 'INPUT' || event.target.tagName === 'TEXTAREA') {
19+
// setIsPointer('text');
20+
// } else {
21+
// setIsPointer('default');
22+
// }
23+
// };
24+
// const createTrailing = (x, y) => {
25+
// const trailingContainer = document.createElement('div');
26+
// trailingContainer.className = 'trailing-container';
27+
// for (let i = 0; i < 2; i++) {
28+
// const trailing = document.createElement('div');
29+
// trailing.className = Styles['trailing'];
30+
// const relativeX = x + Math.random() * 20 - 10; // Randomize position within a range
31+
// const relativeY = y + Math.random() * 20 - 10; // Randomize position within a range
32+
// trailing.style.left = `${relativeX - 5}px`;
33+
// trailing.style.top = `${relativeY - 5}px`;
34+
// trailingContainer.appendChild(trailing);
35+
// }
36+
// document.body.appendChild(trailingContainer);
37+
// // Remove the trailing elements after the animation ends
38+
// setTimeout(() => {
39+
// trailingContainer.remove();
40+
// }, 400);
41+
// };
42+
// useEffect(() => {
43+
// document.addEventListener('mousemove', handleMouseMove);
44+
// document.addEventListener('mouseover', handleMouseOver);
4545

46-
return () => {
47-
document.removeEventListener('mousemove', handleMouseMove);
48-
document.removeEventListener('mouseover', handleMouseOver);
49-
};
50-
}, []);
51-
return (
52-
<div>
53-
<div className={Styles["cursor-container"]}
54-
style={{
55-
left: `${cursorPosition.x}px`,
56-
top: `${cursorPosition.y}px`,
57-
position: 'absolute',
58-
}}>
59-
{isPointer === 'pointer' ? (
60-
<FaHandPointer className={Styles["custom-cursor"]} />
61-
) : (
62-
isPointer === 'default' ? (
63-
<PiCursorFill className={Styles["custom-cursor"]} style={{ transform: 'rotate(13deg)' }} />
64-
) : (
65-
<LuTextCursor className={Styles["custom-cursor"]} />
66-
)
67-
)}
68-
</div>
69-
</div>
70-
);
71-
};
72-
export default TrailingCursor;
46+
// return () => {
47+
// document.removeEventListener('mousemove', handleMouseMove);
48+
// document.removeEventListener('mouseover', handleMouseOver);
49+
// };
50+
// }, []);
51+
// return (
52+
// <div>
53+
// <div className={Styles["cursor-container"]}
54+
// style={{
55+
// left: `${cursorPosition.x}px`,
56+
// top: `${cursorPosition.y}px`,
57+
// position: 'absolute',
58+
// }}>
59+
// {isPointer === 'pointer' ? (
60+
// <FaHandPointer className={Styles["custom-cursor"]} />
61+
// ) : (
62+
// isPointer === 'default' ? (
63+
// <PiCursorFill className={Styles["custom-cursor"]} style={{ transform: 'rotate(13deg)' }} />
64+
// ) : (
65+
// <LuTextCursor className={Styles["custom-cursor"]} />
66+
// )
67+
// )}
68+
// </div>
69+
// </div>
70+
// );
71+
// };
72+
// // export default TrailingCursor;

‎frontend/src/Component/TrailingCursor/TrailingCursor.module.css‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
.cursor-container {
1+
/* .cursor-container {
22
position: absolute;
33
pointer-events: none;
44
z-index: 12;
55
transform: translate(0,10%);
6-
}
7-
6+
} */
7+
/*
88
.custom-cursor {
99
width: 33px;
1010
height: 33px;
@@ -17,9 +17,9 @@
1717
position: absolute;
1818
pointer-events: none;
1919
animation: trailing-animation 0.4s linear;
20-
}
20+
} */
2121

22-
.trailing {
22+
/* .trailing {
2323
position: absolute;
2424
width: 8px;
2525
height: 8px;
@@ -30,8 +30,8 @@
3030
transition: transform 1.2s, opacity 1s;
3131
pointer-events: none;
3232
/* z-index: 9998; */
33-
}
34-
33+
/* } */
34+
/*
3535
@keyframes trailing-effect {
3636
from {
3737
transform: scale(1);
@@ -50,4 +50,4 @@
5050
opacity: 0;
5151
}
5252
}
53-
53+
*/

‎frontend/src/Component/TrailingCursor/index.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// index.js in frontend/src/Component/TrailingCursor/
22

33
// Importing the TrailingCursor component from its file
4-
import TrailingCursor from './TrailingCursor';
4+
// import TrailingCursor from './TrailingCursor';
55

66
// Exporting the component to be used in other parts of the application
7-
export default TrailingCursor;
7+
// export default TrailingCursor;

‎frontend/src/index.css‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ body,
33
html {
44
scrollbar-width: none;
55
height: 100%;
6-
cursor: none;
6+
/* cursor: none; */
77
}
88
* {
99
margin: 0;
1010
padding: 0;
1111
box-sizing: border-box;
12-
cursor: none;
12+
/* cursor: none; */
1313
}
1414

1515
body {
@@ -36,7 +36,7 @@ body {
3636
bottom: 18px !important;
3737
}
3838
.darkmode-toggle:hover {
39-
cursor: none;
39+
/* cursor: none; */
4040

4141
}
4242

‎frontend/src/style/Home.css‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@
276276
border: 2px solid #804afe;
277277
color: white;
278278
box-shadow: -1px 2px 8px #c5aff899,0px 2px 8px #6943c392;
279-
cursor: none;
279+
/* cursor: none; */
280280
}
281281
.hero-button a:hover {
282282
color: white;
@@ -437,18 +437,18 @@
437437
border-radius: 6px;
438438
box-shadow: 1px 1px rgb(0, 0, 0, 0.5);
439439
background-color: #8b5cf6;
440-
cursor: none;
440+
/* cursor: none; */
441441
}
442442
.btn-booked-box {
443443
border: 2px dashed #8b5cf6;
444444
color: white;
445-
cursor: none;
445+
/* cursor: none; */
446446
background: transparent;
447447
}
448448

449449
.btn-booked-box:hover {
450450
color: white;
451-
cursor: none;
451+
/* cursor: none; */
452452
background-color: #8b5cf6;
453453
box-shadow: 10px 10px 30px rgba(139, 92, 246, 0.8),
454454
-10px -10px 30px rgba(139, 92, 246, 0.3);
@@ -457,7 +457,7 @@
457457
.btn-b-box:hover {
458458
color: #fff;
459459
background: transparent;
460-
cursor: none;
460+
/* cursor: none; */
461461
box-shadow: 2px 2px 1px #8b5cf6;
462462
}
463463

@@ -631,7 +631,7 @@
631631
border: 2px solid #8b5cf6;
632632
color: white;
633633
box-shadow: 4px 4px 2px #8b5cf6;
634-
cursor: none;
634+
/* cursor: none; */
635635
}
636636

637637
.hero-button a:hover {

‎frontend/src/style/Navbar.css‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
padding: 0;
5858
margin: 0;
5959
justify-content: space-between; /* Add space between items */
60-
width: 109%; /* Make the navbar items stretch along the width */
60+
width: 100%; /* Make the navbar items stretch along the width */
6161
}
6262

6363
.card-body img {
@@ -81,11 +81,11 @@
8181
box-shadow: 0 0 10px rgba(255, 255, 255, 0); /* Initially no shadow */
8282
}
8383

84-
.nav-item:hover {
85-
transform: scale(1.05); /* Scale up slightly on hover */
86-
filter: brightness(1.2); /* Brighten on hover for shine effect */
87-
box-shadow: 0 0 20px rgba(255, 255, 255, 0.8); /* Add glowing effect */
88-
}
84+
.nav-item:hover {
85+
/* transform: scale(1.05); Scale up slightly on hover */
86+
filter: brightness(1.2);/* Brighten on hover for shine effect */
87+
/* box-shadow: 0 0 20px rgba(255, 255, 255, 0.8); Add glowing effect */
88+
}
8989

9090

9191

@@ -222,6 +222,7 @@
222222
height: 2px;
223223
background-color: black;
224224
transition: width 0.2s ease-in-out;
225+
transform-origin:center ;
225226
}
226227

227228
.sidebar.active {

‎frontend/src/style/Profile.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,9 +324,9 @@
324324
backdrop-filter: blur(5px); /* Add blur effect */
325325
}
326326

327-
@media (max-width: 600px) {
327+
/* @media (max-width: 600px) {
328328
.TrailingCursor_cursor-container__iOCry{
329329
display: none;
330330
}
331331
332-
}
332+
} */

0 commit comments

Comments
 (0)