Skip to content

Commit 618a353

Browse files
Anuj3553Anuj3553
authored
Merge branch 'main' into enhance/feedback
Signed-off-by: Anuj Verma <[email protected]>
2 parents 870f2ae + 81727fc commit 618a353

16 files changed

+717
-767
lines changed

Diff for: ‎client/index.html

+6-11
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,15 @@
1515
integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous" />
1616
<!-- Importing EXO 2 font from Google font -->
1717
<link href="https://fonts.googleapis.com/css2?family=Exo+2:wght@400;700&display=swap" rel="stylesheet" />
18+
<!-- VISITOR CDN -->
19+
<link rel="stylesheet" href="visi.css">
1820
</head>
1921

2022
<body>
2123
<div id="root"></div>
2224
<script type="module" src="/src/main.jsx"></script>
2325
</body>
26+
2427
<!-- Bootstrap Script -->
2528
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
2629
<script src="https://stackpath.bootstrapcdn.com/bootstrap/5.1.3/js/bootstrap.bundle.min.js"></script>
@@ -44,18 +47,10 @@
4447

4548
</script>
4649

50+
<!-- Google Translate Script -->
4751
<script src="https://cdn.gtranslate.net/widgets/latest/float.js" defer></script>
4852

49-
<br /><br />
50-
<link rel="stylesheet" href="visi.css">
51-
52-
<!-- ############### Footer ############### -->
53-
54-
53+
<!-- VISITOR SCRIPT -->
5554
<script src="visi.js"></script>
5655

57-
</html>
58-
59-
<li className="nav-item">
60-
<a href="./src/contributor.html" id="ourvisionlink">Our Contributors</a>
61-
</li>
56+
</html>

Diff for: ‎client/src/component/Discussion.jsx

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
1-
import React, { useEffect, useState, useRef } from 'react';
1+
import { useEffect, useState, useRef } from 'react';
2+
// eslint-disable-next-line
23
import { MessageCircle, Users, Send, Smile, Image, Paperclip, Moon, Sun, ChevronDown } from 'lucide-react';
34
// CHAT-PATTERN-IMAGE
45
import chatPatternLight from "../assets/images/Discussion/chat-pattern.png";
56
import chatPatternDark from "../assets/images/Discussion/chat-pattern-dark.png";
67

8+
// eslint-disable-next-line
79
const Discussion = ({ mode }) => {
810
const [messages, setMessages] = useState([]);
911
const [messageInput, setMessageInput] = useState('');
12+
// eslint-disable-next-line
1013
const [userName, setUserName] = useState('');
1114
const [showModal, setShowModal] = useState(true);
15+
// eslint-disable-next-line
1216
const [onlineUsers, setOnlineUsers] = useState([
1317
{ id: 1, name: 'Alice', status: 'active' },
1418
{ id: 2, name: 'Bob', status: 'idle' },
@@ -60,7 +64,7 @@ const Discussion = ({ mode }) => {
6064
};
6165

6266
return (
63-
<div className={`min-h-screen ${isDarkMode ? 'bg-gray-900' : 'bg-gray-50'} flex items-center justify-center p-4 transition-colors duration-300`}>
67+
<div className={`min-h-screen ${isDarkMode ? 'bg-gray-900' : 'bg-gray-50'} flex items-center justify-center p-4 mt-24 transition-colors duration-300`}>
6468
{/* Main Chat Container */}
6569
<div className={`w-full max-w-5xl ${isDarkMode ? 'bg-gray-800' : 'bg-white'} rounded-xl shadow-2xl overflow-hidden transition-colors duration-300`}>
6670
{/* Chat Header */}

Diff for: ‎client/src/component/Footer.jsx

+1-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
33
import { Link } from 'react-router-dom';
44
import { FaXTwitter } from "react-icons/fa6";
55
import { FaGithub, FaLinkedin, FaYoutube } from 'react-icons/fa';
6-
import React, { useEffect, useState } from 'react';
6+
import { useEffect, useState } from 'react';
77

88
const Footer = (props) => {
99
const [email, setEmail] = useState("");
@@ -196,13 +196,9 @@ const Footer = (props) => {
196196
<li className="nav-item">
197197
<Link to='/codeofconduct'>Code of Conduct</Link>
198198
</li>
199-
<li className="nav-item">
200-
<Link to="./src/contributor">Our Contributors</Link>
201-
</li>
202199
<li className="nav-item">
203200
<a href="./src/contributor.html" id="ourvisionlink">Our Contributors</a>
204201
</li>
205-
206202
</ul>
207203
</div>
208204

Diff for: ‎client/src/component/Home.jsx

+1-4
Original file line numberDiff line numberDiff line change
@@ -207,9 +207,6 @@ const Home = (props) => {
207207
</motion.div>
208208
</div>
209209
</motion.section>
210-
211-
212-
213210
<CardsPage />
214211

215212
{/* Service Section */}
@@ -223,7 +220,7 @@ const Home = (props) => {
223220
</div>
224221
</div>
225222
{/* Works Section */}
226-
<div className="work-Sec mb-2" style={{ background: props.mode === 'dark' ? 'black' : '#f7f7f7', color: props.mode === 'dark' ? 'white' : 'black' }}>
223+
<div className="work-Sec mb-2 pt-14" style={{ background: props.mode === 'dark' ? 'black' : '#f7f7f7', color: props.mode === 'dark' ? 'white' : 'black' }}>
227224
<h2 className='work-heading' style={{ textAlign: 'center', marginBottom: '1rem', fontWeight: 'bold', textTransform: 'uppercase' }} data-aos="zoom-out">
228225
What We Work On
229226
</h2>

Diff for: ‎client/src/component/Login.jsx

+4-5
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,14 @@ const Login = ({ mode, showAlert, isloggedin, setloggedin }) => {
6666
if (!isloggedin) {
6767
setloggedin(true)
6868
doSignInWithGoogle().catch(err => {
69+
console.error(err)
6970
setloggedin(false)
7071
})
7172
}
7273
}
7374

7475
return (
75-
<div className="h-screen flex items-center justify-center" data-aos="zoom-in" data-aos-duration="1800">
76+
<div className="min-h-screen flex items-center justify-center mt-10" data-aos="zoom-in" data-aos-duration="1800">
7677
{userLoggedIn && navigate('/')}
7778
<div
7879
className="wrapper h-3/4 mt-10"
@@ -169,16 +170,14 @@ const Login = ({ mode, showAlert, isloggedin, setloggedin }) => {
169170
Don&apos;t have an account?
170171

171172
<Link className="link text-xl" to="/signup">
172-
173-
{" "}
174-
Sign Up
173+
{" "} Sign Up
175174
</Link>
176175
</p>
177176

178177
<Button
179178
style={{ backgroundColor: "#6366f1", color: "#FFFFFF" }}
180179
onClick={() => navigate("/forgot-password")}
181-
className="mt-3 h-10 text-xl"
180+
className="mt-3 h-10 text-xl text-white"
182181
>
183182
Forgot Password?
184183
</Button>

Diff for: ‎client/src/component/MiniChatbot.jsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ const MiniChatbot = () => {
2828
// Generate content based on the user's message
2929
const prompt = `
3030
You can do Hi hello but
31-
You are an AI assistant for an educational platform. Only respond to questions related to education and all.
32-
If the question is unrelated, respond with: "I can only assist with questions related to our learning platform and its services."
33-
Here's the user's question: '${userMessage}'
34-
`;
31+
You are an AI assistant for an educational platform. Only respond to questions related to education and all.
32+
If the question is unrelated, respond with: "I can only assist with questions related to our learning platform and its services."
33+
Here's the user's question: '${userMessage}'
34+
`;
3535

3636

3737
const result = await model.generateContent(prompt);

Diff for: ‎client/src/component/Navbar.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ function Navbar(props) {
2323
const navigate = useNavigate();
2424
const location = useLocation();
2525
const [isScrolled, setIsScrolled] = useState(false); // State to keep track of whether page has been scrolled
26+
// eslint-disable-next-line
2627
const [isOpen, setIsOpen] = useState(false);
2728
const [isSidebarOpen, setIsSidebarOpen] = useState(false);
2829

@@ -133,7 +134,7 @@ function Navbar(props) {
133134
id="navbarSupportedContent"
134135
>
135136
<ul
136-
className="navbar-nav mb-2 mb-lg-0 gap-3 fw-medium"
137+
className="navbar-nav mb-2 mb-lg-0 gap-3 fw-medium menu2"
137138
style={{ position: "absolute", left: "36%" }}
138139
>
139140
<li className="nav-item fs-4 fw-medium">
@@ -232,7 +233,6 @@ function Navbar(props) {
232233
</>
233234
:
234235
<>
235-
236236
<div className="relative w-16 flex justify-center">
237237
{/* Placeholder image if user.picture is not available */}
238238
<img

Diff for: ‎client/src/component/Signup.jsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ const Signup = ({ mode }) => {
4949
if (!isloggedin) {
5050
setloggedin(true)
5151
doSignInWithGoogle().catch(err => {
52+
console.log(err)
5253
setloggedin(false)
5354
})
5455
}
@@ -74,7 +75,7 @@ const Signup = ({ mode }) => {
7475
};
7576

7677
return (
77-
<div className="min-h-screen flex items-center justify-center p-4">
78+
<div className="min-h-screen flex items-center justify-center mt-24 p-4">
7879
{userLoggedIn && navigate('/')}
7980

8081
<div

Diff for: ‎client/src/component/Testimonial.jsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { useEffect, useState } from 'react';
1+
import { useEffect, useState } from 'react';
22

33
const Testimonial = () => {
44
const [active, setActive] = useState(3);
@@ -84,12 +84,12 @@ const Testimonial = () => {
8484
};
8585

8686
return (
87-
<div>
87+
<div className='pt-10'>
8888
<h1 className='text-center text-5xl' data-aos="zoom-out">
8989
See What our client say&apos;s about us !
9090
</h1>
9191

92-
<div className="slider" style={{ position: 'relative', marginTop: '100px', width: '100%', height: '550px', overflow: 'hidden' }}
92+
<div className="slider" style={{ position: 'relative', marginTop: '70px', width: '100%', height: '550px', overflow: 'hidden' }}
9393
data-aos='zoom-in'
9494
data-aos-duration='1700'>
9595
{items.map((item, index) => (
@@ -114,7 +114,7 @@ const Testimonial = () => {
114114
<img
115115
src={item.img}
116116
alt="User Avatar"
117-
className='w-[150px] h-[150px] rounded-lg object-cover mb-[20px] cursor-pointer max-sm:h-[120px] mb-0'
117+
className='w-[150px] h-[150px] rounded-lg object-cover mb-[20px] cursor-pointer max-sm:h-[120px] md:mb-0'
118118
style={{
119119
transition: 'transform 0.3s ease, filter 0.3s ease',
120120
border: '3px solid #d0e7b0' // Green border for the image

0 commit comments

Comments
 (0)