Skip to content

Commit

Permalink
Merge pull request #23 from UBCAgroBot/lint
Browse files Browse the repository at this point in the history
linting works
  • Loading branch information
korih authored Sep 28, 2024
2 parents 3080c96 + 8e4c465 commit 56189da
Show file tree
Hide file tree
Showing 6 changed files with 47 additions and 6 deletions.
36 changes: 36 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
import globals from "globals";
import pluginJs from "@eslint/js";
import pluginReact from "eslint-plugin-react";

export default [
{ files: ["**/*.{js,mjs,cjs,jsx}"] },
{ languageOptions: { globals: globals.browser } },
pluginJs.configs.recommended,
pluginReact.configs.flat.recommended,
{

rules: {
// Disable react/no-unknown-property and ignore specific Three.js properties
"react/no-unknown-property": ["off", { ignore: ["dispose", "geometry", "material", "position", "rotation"] }],

// Disable React JSX scope requirement for React 17+
"react/react-in-jsx-scope": "off",

// Disable global "no-unused-vars" and "no-undef" rules
"no-unused-vars": "off",
"no-undef": "off",
"no-dupe-keys": "off",
"react/prop-types": "off",
"react/display-name": "off",
"react/no-unescaped-entities": "off",
"react/jsx-no-undef": "off",

// You can disable or modify other rules here as needed
},
settings: {
react: {
version: "detect",
},
},
},
];
5 changes: 5 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,11 @@
},
"devDependencies": {
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"@eslint/js": "^8.0.0",
"eslint": "^8.0.0",
"eslint-plugin-react": "^7.37.0",
"eslint-plugin-react-hooks": "^4.6.2",
"globals": "^15.9.0",
"tailwindcss": "^3.4.1"
},
"description": "To run locally: `npm run start`",
Expand Down
4 changes: 2 additions & 2 deletions src/components/common/footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ function Footer() {
<h1 className="text-[24px] text-[#78BE20] text-left font-bold ml-2">UBC<br/>AGROBOT</h1>
</div>
<div className="my-4 flex lg:mt-auto">
<a target="_blank" href="https://www.instagram.com/ubcagrobot/"><FaInstagram className=" p-1 text-[#88BE22]" size={52} /></a>
<a target="_blank" href="https://www.linkedin.com/company/ubc-agrobot/mycompany/"><FaLinkedin className=" p-1 text-[#88BE22]" size={52} /></a>
<a target="_blank" href="https://www.instagram.com/ubcagrobot/" rel="noreferrer"><FaInstagram className=" p-1 text-[#88BE22]" size={52} /></a>
<a target="_blank" href="https://www.linkedin.com/company/ubc-agrobot/mycompany/" rel="noreferrer"><FaLinkedin className=" p-1 text-[#88BE22]" size={52} /></a>
<a href="mailto:ubcagrobot@gmail.com"><FaEnvelope className="p-1 text-[#88BE22]" size={52} /></a>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/components/contact/mailForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ function MailForm() {
<h3 className="text-[#2E1B0F] font-semibold text-mobile-header lg:text-header">Or via social media</h3>
<div className="flex flex-row flex-wrap justify-around mx-auto my-12">
<a href="mailto:ubcagrobot@gmail.com"><div className="flex flex-col items-center justify-center font-bold mr-8"><div className="bg-[#2E1B0F] rounded-xl px-2 lg:p-0 mb-2 flex justify-center items-center w-12 lg:w-24 h-12 lg:h-24"><LuMail size='64' color="#CDFF70" /></div></div></a>
<a href="https://instagram.com/ubcagrobot" target="_blank"><div className="flex flex-col items-center justify-center font-bold mr-8"><div className="bg-[#2E1B0F] rounded-xl p-2 mb-2 flex justify-center items-center w-12 lg:w-24 h-12 lg:h-24"><FaInstagram size='64' color="#CDFF70" /></div></div></a>
<a href="https://www.linkedin.com/company/ubc-agrobot/" target="_blank"><div className="flex flex-col items-center justify-center font-bold mr-8"><div className="bg-[#2E1B0F] rounded-xl p-2 mb-2 flex justify-center items-center w-12 lg:w-24 h-12 lg:h-24"><FaLinkedin size='64' color="#CDFF70" /></div></div></a>
<a href="https://instagram.com/ubcagrobot" target="_blank" rel="noreferrer"><div className="flex flex-col items-center justify-center font-bold mr-8"><div className="bg-[#2E1B0F] rounded-xl p-2 mb-2 flex justify-center items-center w-12 lg:w-24 h-12 lg:h-24"><FaInstagram size='64' color="#CDFF70" /></div></div></a>
<a href="https://www.linkedin.com/company/ubc-agrobot/" target="_blank" rel="noreferrer"><div className="flex flex-col items-center justify-center font-bold mr-8"><div className="bg-[#2E1B0F] rounded-xl p-2 mb-2 flex justify-center items-center w-12 lg:w-24 h-12 lg:h-24"><FaLinkedin size='64' color="#CDFF70" /></div></div></a>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/projects/agroponics/AgroponicsMain.js
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ const AgroponicsMain = () => {
<p className="text-white text-center font-bold text-[18px] lg:text-[1.25rem] mt-5 mb-25">
AgroPonics is a product of collaboration between three different sub-teams, each playing a pivotal role in its development and performance. They have their own website you can check out here:
</p>
<a href="https://ubcagroponics.com/" target="_blank" className="rounded-3xl bg-white p-3 mt-3 font-bold justify-center text-black">
<a href="https://ubcagroponics.com/" target="_blank" className="rounded-3xl bg-white p-3 mt-3 font-bold justify-center text-black" rel="noreferrer">
<span className="font-Roboto">Agroponics Website!</span>
</a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/sponsorship/tierBanner.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ function TierBanner({ tierElements, starImg, tierColor }) {
))}
</ul>
</div>
<a href="https://donate.support.ubc.ca/page/20924/donate/1?transaction.dirgift=AgroBot%20G2551" target="_blank" className="p-4 m-4 border-2 rounded-[14px] border-[#8cbc24] text-[#8cbc24] font-bold">Sponsor Us</a>
<a href="https://donate.support.ubc.ca/page/20924/donate/1?transaction.dirgift=AgroBot%20G2551" target="_blank" className="p-4 m-4 border-2 rounded-[14px] border-[#8cbc24] text-[#8cbc24] font-bold" rel="noreferrer">Sponsor Us</a>
</div>
);
}
Expand Down

0 comments on commit 56189da

Please sign in to comment.