diff --git a/README.md b/README.md index fcaa3313..edbd68a0 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,9 @@ posted by professors, graduate students, or lab staff.

[![Node.js][Node.js]][Node.js-url] [![Tailwind CSS][TailwindCSS]][TailwindCSS-url] +### Current Frontend UI +Website Image 1 +Website Image 2 ## Prerequisites @@ -64,10 +67,10 @@ posted by professors, graduate students, or lab staff.

|------------------------|---------------|---------------------------------------------------------------| | `VITE_BACKEND_SERVER` | None | URL to the backend server | -Set the varaible with: -``` -$ export VITE_BACKEND_SERVER="http://127.0.0.1:9000" -``` +* Set the variable with: + ``` + $ export VITE_BACKEND_SERVER="http://127.0.0.1:9000" + ``` ## Testing * To run the frontend locally run the following: @@ -75,12 +78,44 @@ $ export VITE_BACKEND_SERVER="http://127.0.0.1:9000" $ make develop ``` This command allows editing and autoreloading while making changes + +### Linting +* Run the linter and fix any lint issues to maintiain code quality and standards + ``` + make lint + ``` ## Building - * To build the application use this command to build the static files and test the production version of deploy the files. + * To build the application use this command to build the static files and test the production version of the files. ``` - npm run build + $ npm run build ``` + This command allows editing and autoreloading while making changes + +## Deployment +Create PRs to the main branch from your working branch. Make sure your new code is tested and bug free. Upon creating a merge request, a build test will make sure your code is running without errors and safe to merge to main. + +## Contact Us +[![Discord](https://img.shields.io/badge/Discord-5865F2.svg?style=for-the-badge&logo=discord&logoColor=white)](https://discord.gg/tsaxCKjYHT) +[![Jira](https://img.shields.io/badge/Jira-0052CC.svg?style=for-the-badge&logo=jira&logoColor=white)](https://rcoslabconnect.atlassian.net/jira/software/projects/CCS/list) + +## Project Contributors + +Running list of contributors to the LabConnect project: + +### Project Lead + +- **Will Broadwell** [Project Lead] +- **Rafael Cenzano** [Former Project Lead] + +### Rensselaer Center for Open Source Development Team + +- **Jaswanth D** [Frontend] +- **Doan N** [Frontend] +- **Pragathi A** [Frontend / Backend] +- **Aniket S** [Backend] + +### Past Rensselaer Center for Open Source Development Team ## Deployment Create PRs to the main branch. Upon merging, a build test will make sure your code is running without errors and safe to merge to main. On a completed merge the action will build and push the new docker image. diff --git a/index.html b/index.html index bf15cd2d..1a5a0bf1 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - + Labconnect diff --git a/public/favicon.ico b/public/favicon.ico index a11777cc..30bf4987 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/logo192.png b/public/logo192.png deleted file mode 100644 index fc44b0a3..00000000 Binary files a/public/logo192.png and /dev/null differ diff --git a/public/logo512.png b/public/logo512.png deleted file mode 100644 index a4e47a65..00000000 Binary files a/public/logo512.png and /dev/null differ diff --git a/src/App.tsx b/src/App.tsx index 821ea1ed..1c3b5fc2 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -25,7 +25,7 @@ function App() {
-
+
} /> App is Healthy

} /> diff --git a/src/images/simple_logo-transparent.png b/src/images/simple_logo-transparent.png new file mode 100644 index 00000000..b57178b1 Binary files /dev/null and b/src/images/simple_logo-transparent.png differ diff --git a/src/images/simple_logo.png b/src/images/simple_logo.png new file mode 100644 index 00000000..f1f9c374 Binary files /dev/null and b/src/images/simple_logo.png differ diff --git a/src/images/website_image1.png b/src/images/website_image1.png new file mode 100644 index 00000000..4b0464d6 Binary files /dev/null and b/src/images/website_image1.png differ diff --git a/src/images/website_image2.png b/src/images/website_image2.png new file mode 100644 index 00000000..a0be6ae2 Binary files /dev/null and b/src/images/website_image2.png differ diff --git a/src/logo.svg b/src/logo.svg deleted file mode 100644 index 9dfc1c05..00000000 --- a/src/logo.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/opportunities/components/AboutSection.tsx b/src/opportunities/components/AboutSection.tsx deleted file mode 100644 index d264162c..00000000 --- a/src/opportunities/components/AboutSection.tsx +++ /dev/null @@ -1,30 +0,0 @@ -import React from "react"; -import AboutSectionElement from "./AboutSectionElement"; - -interface AboutSectionProps { - aboutSection: AboutItem[]; -} - -const AboutSection = ({ aboutSection }: AboutSectionProps) => { - let i = 0; - - return ( -
-

About the role

- -
- {aboutSection.map((item) => { - return ( - - ); - })} -
-
- ); -}; - -export default AboutSection; diff --git a/src/opportunities/components/AboutSectionElement.tsx b/src/opportunities/components/AboutSectionElement.tsx deleted file mode 100644 index b46b81bc..00000000 --- a/src/opportunities/components/AboutSectionElement.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from "react"; - -const AboutSectionElement = ({ title, description }: { title: string, description: string }) => { - return ( -
-
{title}
-
{description}
-
- ); -}; - -export default AboutSectionElement; diff --git a/src/opportunities/components/HorizontalIconButton.tsx b/src/opportunities/components/HorizontalIconButton.tsx index 4667eb21..bd282ac8 100644 --- a/src/opportunities/components/HorizontalIconButton.tsx +++ b/src/opportunities/components/HorizontalIconButton.tsx @@ -1,8 +1,8 @@ import React from "react"; interface HorizontalIconButtonProps { - children?: React.ReactNode; - onClick: (arg?: React.ReactNode) => void; + children: string; + onClick: (arg: string) => void; icon: React.ReactNode; special: boolean; } diff --git a/src/opportunities/components/JobDetails.tsx b/src/opportunities/components/JobDetails.tsx index 90e9568f..f898189c 100644 --- a/src/opportunities/components/JobDetails.tsx +++ b/src/opportunities/components/JobDetails.tsx @@ -1,5 +1,4 @@ import React from "react"; -import AboutSection from "./AboutSection"; import JobHeader from "./JobHeader"; import JobDescription from "./JobDescription"; @@ -9,17 +8,14 @@ interface JobDetailsProps { department: string; description: string; authorProfile: string; - aboutSection: AboutItem[]; recommended_experience: string; } const JobDetails = ({ name, author, - department, description, authorProfile, - aboutSection, recommended_experience, }: JobDetailsProps) => { return ( @@ -28,9 +24,7 @@ const JobDetails = ({ title={name} author={author} img={authorProfile} - department={department} /> - { +const JobHeader = ({ title, img, author}: JobHeaderProps) => { return (

{title}

- +
); }; diff --git a/src/opportunities/components/OpportunitiesDetails.tsx b/src/opportunities/components/OpportunitiesDetails.tsx index a1f98282..d4e41f36 100644 --- a/src/opportunities/components/OpportunitiesDetails.tsx +++ b/src/opportunities/components/OpportunitiesDetails.tsx @@ -1,4 +1,5 @@ import React from "react"; +import { Link } from "react-router-dom"; import { OpportunityList } from "../../types/opportunities.ts"; interface OpportunitiesListProps { @@ -39,9 +40,11 @@ export default function OpportunitiesList({ opportunities }: OpportunitiesListPr {opportunity.semester} {opportunity.year} - + + +