Skip to content

Commit cc0913f

Browse files
Mr-SunglassesMr-Sunglasses
authored
Merge branch 'main' into fixcontact
2 parents dab3e52 + 9ccb803 commit cc0913f

2 files changed

Lines changed: 56 additions & 68 deletions

File tree

‎src/components/Contact.jsx‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ const Contact = () => {
2020
email: "",
2121
message: "",
2222
});
23-
const [loading, setLoading] = useState(false);
24-
const [error, setError] = useState("");
23+
const [loading, setLoading] = useState(false);
24+
const [error, setError] = useState("");
2525
const [success, setSuccess] = useState("");
2626

2727
function handle(e) {
@@ -32,7 +32,7 @@ const Contact = () => {
3232

3333
async function submit(e) {
3434
e.preventDefault();
35-
setLoading(true);
35+
setLoading(true);
3636
setError("");
3737
setSuccess("");
3838
try {
@@ -49,7 +49,7 @@ const Contact = () => {
4949
setTimeout(() => setSuccess(""), 3000);
5050
} catch (err) {
5151
console.error("Error:", err);
52-
setError("There was an error processing your request.");
52+
setError("There was an error processing your request.");
5353
setTimeout(() => setError(""), 3000);
5454
} finally {
5555
setLoading(false);
@@ -157,9 +157,9 @@ const Contact = () => {
157157
</div>
158158
</form>
159159
<div className="py-6 text-center font-semibold">
160-
{loading && <p className="text-white">Loading...</p>}
161-
{error && <p className="text-red-500">{error}</p>}
162-
{success && <p className="text-green-500">{success}</p>}
160+
{loading && <p className="text-white">Loading...</p>}
161+
{error && <p className="text-red-500">{error}</p>}
162+
{success && <p className="text-green-500">{success}</p>}
163163
</div>
164164
</div>
165165
</div>
@@ -168,4 +168,4 @@ const Contact = () => {
168168
);
169169
};
170170

171-
export default Contact;
171+
export default Contact;

‎src/components/Navbar.jsx‎

Lines changed: 48 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -39,55 +39,49 @@ const Navbar = () => {
3939
</h1>
4040
<ul className="hidden md:flex">
4141
<li
42-
className={`p-4 ${
43-
activeLink === "/" ? "text-[#0DFF1C]" : "hover:text-[#0DFF1C]"
44-
}`}
42+
className={`p-4 ${activeLink === "/" ? "text-[#0DFF1C]" : "hover:text-[#0DFF1C]"
43+
}`}
4544
>
4645
<Link to="/"> Home </Link>{" "}
4746
</li>
4847
<li
49-
className={`p-4 ${
50-
activeLink === "/about"
51-
? "text-[#0DFF1C]"
52-
: "hover:text-[#0DFF1C]"
53-
}`}
48+
className={`p-4 ${activeLink === "/about"
49+
? "text-[#0DFF1C]"
50+
: "hover:text-[#0DFF1C]"
51+
}`}
5452
>
5553
<Link to="/about">About</Link>
5654
</li>
5755
<li
58-
className={`p-4 ${
59-
activeLink === "/team" ? "text-[#0DFF1C]" : "hover:text-[#0DFF1C]"
60-
}`}
56+
className={`p-4 ${activeLink === "/team" ? "text-[#0DFF1C]" : "hover:text-[#0DFF1C]"
57+
}`}
6158
>
6259
<Link to="/team"> Team </Link>{" "}
6360
</li>
6461

6562
<li
66-
className={`p-4 ${
67-
activeLink === "/resource"
68-
? "text-[#0DFF1C]"
69-
: "hover:text-[#0DFF1C]"
70-
} hover:text-[#0DFF1C] translate-x-[-3.2em] hidden absolute bg-white text-gray-900 rounded mt-1 w-48 group-hover:block hover:rounded-md `}
63+
className={`p-4 ${activeLink === "/resource"
64+
? "text-[#0DFF1C]"
65+
: "hover:text-[#0DFF1C]"
66+
} hover:text-[#0DFF1C] translate-x-[-3.2em] hidden absolute bg-white text-gray-900 rounded mt-1 w-48 group-hover:block hover:rounded-md `}
7167
>
7268
<a href="/resource">Resources</a>
7369
</li>
7470

7571
<li
76-
className={`p-4 ${
77-
activeLink === "/contact"
78-
? "text-[#0DFF1C]"
79-
: "hover:text-[#0DFF1C]"
80-
} hover:text-[#0DFF1C]`}
72+
className={`p-4 ${activeLink === "/contact"
73+
? "text-[#0DFF1C]"
74+
: "hover:text-[#0DFF1C]"
75+
} hover:text-[#0DFF1C]`}
8176
>
8277
<Link to="/contact">Contact</Link>
8378
</li>
8479

8580
<li
86-
className={`p-4 ${
87-
activeLink === "/shipyard"
88-
? "text-[#0DFF1C]"
89-
: "hover:text-[#0DFF1C]"
90-
} hover:text-[#0DFF1C]`}
81+
className={`p-4 ${activeLink === "/shipyard"
82+
? "text-[#0DFF1C]"
83+
: "hover:text-[#0DFF1C]"
84+
} hover:text-[#0DFF1C]`}
9185
>
9286
<Link to="/shipyard">Shipyard</Link>
9387
</li>
@@ -160,61 +154,55 @@ const Navbar = () => {
160154
</center>
161155
<ul className="uppercase p-4">
162156
<li
163-
className={`p-4 ${
164-
activeLink === "/" ? "text-[#0DFF1C]" : "hover:text-[#0DFF1C]"
165-
} border-b border-gray-600 `}
157+
className={`p-4 ${activeLink === "/" ? "text-[#0DFF1C]" : "hover:text-[#0DFF1C]"
158+
} border-b border-gray-600`}
166159
>
167160
<Link to="/" onClick={() => handleLinkClick("/")}>
168-
{" "}
169-
Home{" "}
170-
</Link>{" "}
161+
Home
162+
</Link>
171163
</li>
172164
<li
173-
className={`p-4 ${
174-
activeLink === "/about"
175-
? "text-[#0DFF1C]"
176-
: "hover:text-[#0DFF1C]"
177-
} border-b border-gray-600 `}
165+
className={`p-4 ${activeLink === "/about" ? "text-[#0DFF1C]" : "hover:text-[#0DFF1C]"
166+
} border-b border-gray-600`}
178167
>
179168
<Link to="/about">About</Link>
180169
</li>
181170
<li
182-
className={`p-4 ${
183-
activeLink === "/team"
184-
? "text-[#0DFF1C]"
185-
: "hover:text-[#0DFF1C]"
186-
} border-b border-gray-600 `}
171+
className={`p-4 ${activeLink === "/team" ? "text-[#0DFF1C]" : "hover:text-[#0DFF1C]"
172+
} border-b border-gray-600`}
173+
>
174+
<Link to="/team">Team</Link>
175+
</li>
176+
<li
177+
className={`p-4 ${activeLink === "/shipyard" ? "text-[#0DFF1C]" : "hover:text-[#0DFF1C]"
178+
} border-b border-gray-600`}
187179
>
188-
<Link to="/team"> Team </Link>{" "}
180+
<Link to="/shipyard" onClick={() => handleLinkClick("/shipyard")}>
181+
Shipyard
182+
</Link>
189183
</li>
190184
<li
191-
className={`p-4 ${
192-
activeLink === "/resource"
193-
? "text-[#0DFF1C]"
194-
: "hover:text-[#0DFF1C]"
195-
} border-b border-gray-600 `}
185+
className={`p-4 ${activeLink === "/resource" ? "text-[#0DFF1C]" : "hover:text-[#0DFF1C]"
186+
} border-b border-gray-600`}
196187
>
197-
<Link to="/resource">Resources</Link>{" "}
188+
<Link to="/resource">Resources</Link>
198189
</li>
199-
<li className={`p-4 border-b border-gray-600 `}>
200-
<a href="https://docs.fosscu.org">Handbook</a>{" "}
190+
<li className="p-4 border-b border-gray-600">
191+
<a href="https://docs.fosscu.org">Handbook</a>
201192
</li>
202-
<li className={`p-4 border-b border-gray-600 `}>
193+
<li className="p-4 border-b border-gray-600">
203194
<a href="https://github.com/FOSS-Community">Projects</a>
204195
</li>
205196
<li
206-
className={`p-4 ${
207-
activeLink === "/contact"
208-
? "text-[#0DFF1C]"
209-
: "hover:text-[#0DFF1C]"
210-
} border-b border-gray-600 `}
197+
className={`p-4 ${activeLink === "/contact" ? "text-[#0DFF1C]" : "hover:text-[#0DFF1C]"
198+
} border-b border-gray-600`}
211199
>
212200
<Link to="/contact">Contact</Link>
213201
</li>
214-
<li className={`p-4 border-b border-gray-600 `}>
215-
<a href="https://lu.ma/fosscu">Calender</a>
202+
<li className="p-4 border-b border-gray-600">
203+
<a href="https://lu.ma/fosscu">Calendar</a>
216204
</li>
217-
<li className={`p-4 border-b border-gray-600 `}>
205+
<li className="p-4 border-b border-gray-600">
218206
<a href="https://github.com/FOSS-Community/">Contribute</a>
219207
</li>
220208
</ul>

0 commit comments

Comments
 (0)