Skip to content

Commit 08d48cd

Browse files
committed
Fix linting
1 parent d23c4ef commit 08d48cd

File tree

7 files changed

+5
-22
lines changed

7 files changed

+5
-22
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ docker-build: build
1313
docker push enchanter77/labconnect-frontend
1414

1515
lint:
16-
eslint --max-warnings=0 'src/**/*{js,jsx,ts,tsx}'
16+
npm run lint
1717

1818
lintfix:
1919
eslint --max-warnings=0 'src/**/*{js,jsx,ts,tsx}' --fix

src/App.test.js

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/opportunities/components/JobsNavigation.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import React from "react";
2-
import { useLocation } from "react-router";
2+
// import { useLocation } from "react-router";
33

44
interface JobsNavigationProps {
55
jobPage: boolean;
66
switchPage: () => void;
77
}
88

99
const JobsNavigation = ({ jobPage, switchPage }: JobsNavigationProps) => {
10-
const path = useLocation().pathname;
10+
// const path = useLocation().pathname;
1111

1212
const activeLink = "text-black py-3 border-b-2 border-black text-lg";
1313
const normalLink = "text-gray-600 py-3 text-lg border-black hover:border-b-2 hover:text-black";

src/setupTests.js

Lines changed: 0 additions & 5 deletions
This file was deleted.

src/shared/components/Profile/EditInformation.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ const EditInformation = ({ className, id, name, department, researchCenter, desc
7979
<h3 className="text-lg">Role: {role}</h3>
8080
<h3 className="text-lg">Department: {department}</h3>
8181
<h3 className="text-lg">Research Center: {researchCenter}</h3>
82+
<img src={image} alt={`${name}'s profile`} className="w-32 h-32 rounded-full mt-2" />
8283
</div>
8384
{forms}
8485

src/shared/components/UIElements/Avatar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from "react";
22

3-
const Avatar: React.FC<{ img: string, name: string, role: string, className?: string }> = ({ img, name, role, className = "" }) => {
3+
const Avatar: React.FC<{ img: string, name: string, className?: string }> = ({ img, name, className = "" }) => {
44
return (
55
<div className={`${className} flex align-items-center gap-3`}>
66
<img className="rounded-full w-12 h-12" src={img} alt={name} />

src/shared/pages/EditProfile.tsx

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
import React from "react";
2-
<<<<<<<< HEAD:src/shared/pages/EditProfile.jsx
3-
import ProfileAvatar from "../components/UIElements/ProfileAvatar.tsx";
4-
import EditInformation from "../components/Profile/EditInformation.jsx";
5-
========
62
import ProfileAvatar from "../components/Profile/ProfileAvatar.tsx";
73
import EditInformation from "../components/Profile/EditInformation.tsx";
84

@@ -16,7 +12,6 @@ interface EditProfileProps {
1612
role: string;
1713
image: string;
1814
}
19-
>>>>>>>> main:src/shared/pages/EditProfile.tsx
2015

2116
const EditProfile = ({
2217
id,

0 commit comments

Comments
 (0)