diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 0000000..6d0191b --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,6 @@ +{ + "name": "Node.js & TypeScript", + "image": "mcr.microsoft.com/devcontainers/typescript-node:1-22-bookworm", + "postCreateCommand": "sudo apt update && curl -1sLf 'https://dl.cloudsmith.io/public/evilmartians/lefthook/setup.deb.sh' | sudo -E bash && sudo apt install lefthook && npm install -g pnpm && lefthook install", + "postStartCommand": "pnpm install" +} diff --git a/.gitignore b/.gitignore index 7e7c46a..321c6bc 100755 --- a/.gitignore +++ b/.gitignore @@ -1,32 +1,9 @@ -# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. - # dependencies /node_modules /.pnp .pnp.js -Programming/ - -# testing -/coverage - -# production -/build - -# misc -.DS_Store -.env.local -.env.development.local -.env.test.local -.env.production.local +.pnpm-store npm-debug.log* yarn-debug.log* -yarn-error.log* -.env - -.envrc -.direnv -flake.nix -flake.lock -.devcontainer -.pnpm-store \ No newline at end of file +yarn-error.log* \ No newline at end of file diff --git a/README.md b/README.md index 9100eef..ddf7b2a 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,11 @@ # AgroBot Website -This is the Agrobot team website. The website was developed with **React**, **Tailwind CSS**, **ThreeJS**, and **GSAP**. - -Website will be deployed [here](https://ubcagrobot.github.io/AgroBotWebsite/) - -# Prerequisites - -- `NodeJS` 20+ -- `pnpm` - # Installation To setup the project make sure that you have `npm` installed. To get started, you can do the following commands to run the website after cloning it -1. `pnpm install` to install dependencies -2. `pnpm run start` to deploy website on local machine +- `pnpm install` to install dependencies +- `pnpm run start` to deploy website on local machine After this the website should be deployed on `http://localhost:3000` where you can view the website @@ -22,24 +13,4 @@ After this the website should be deployed on `http://localhost:3000` where you c Once the environment is setup you can use some of the following tools to make working on the project easier -1. `pnpm run build` to compile to website -2. `pnpm run lint` to lint the project -3. `pnpm run pretty` to use prettier to format the website - -# Contributing - -To contribute to the project, you can follow this guideline - -1. Create a branch for your feature -2. Add your changes to this new branch -3. Create a Pull Request on this branch -4. If the PR passes the Github Actions and is approved you can merge it to main - -## Layout guide: - -These rules should be defied or else the site will look like a word doc. Use these as a general guide. - -Values in red, tailwind styles in white -![image](public/LayoutGuide.png) - -![image](public/MobileLayoutGuide.png) +- `pnpm run build` to compile to website diff --git a/lefthook.yml b/lefthook.yml new file mode 100644 index 0000000..4a239b7 --- /dev/null +++ b/lefthook.yml @@ -0,0 +1,8 @@ +pre-commit: + commands: + prettier: + run: npx prettier . --write + stage_fixed: true + lint: + run: npx eslint . --fix + stage_fixed: true diff --git a/public/LayoutGuide.png b/public/LayoutGuide.png deleted file mode 100644 index 759bad1..0000000 Binary files a/public/LayoutGuide.png and /dev/null differ diff --git a/public/MobileLayoutGuide.png b/public/MobileLayoutGuide.png deleted file mode 100644 index 2e8b334..0000000 Binary files a/public/MobileLayoutGuide.png and /dev/null differ diff --git a/public/robots.txt b/public/robots.txt deleted file mode 100755 index e9e57dc..0000000 --- a/public/robots.txt +++ /dev/null @@ -1,3 +0,0 @@ -# https://www.robotstxt.org/robotstxt.html -User-agent: * -Disallow: diff --git a/src/components/recruitment/Timeline.tsx b/src/components/recruitment/Timeline.tsx index 3e35cfb..86fc62a 100644 --- a/src/components/recruitment/Timeline.tsx +++ b/src/components/recruitment/Timeline.tsx @@ -29,14 +29,9 @@ function Timeline() { if (today > end_day || today < start_day) { return (

- Applications for the team are now officially open! Apply using the - following{' '} - - Google Forms Link. - {' '} + Applications for the team are now closed, stay tuned for updates in + early January! +
Questions? Send us an email at{' '} ubcagrobot@gmail.com