diff --git a/public/images/company-images/deloitte.png b/public/images/company-images/deloitte.png new file mode 100644 index 0000000..9b69820 Binary files /dev/null and b/public/images/company-images/deloitte.png differ diff --git a/public/images/company-images/notion.png b/public/images/company-images/notion.png new file mode 100644 index 0000000..3910516 Binary files /dev/null and b/public/images/company-images/notion.png differ diff --git a/src/components/About/Companies/Companies.scss b/src/components/About/Companies/Companies.scss index 268dcea..39dd012 100644 --- a/src/components/About/Companies/Companies.scss +++ b/src/components/About/Companies/Companies.scss @@ -1,12 +1,13 @@ .companies-section { .title { - font-size: 35px; + font-size: 30px; font-weight: bold; fill: white; } .button-display { .svg-button { padding: 4px; + background-color: black; color: white; border: 2px solid white; border-radius: 4px; @@ -54,8 +55,22 @@ padding: 10px; font-size: 14px; overflow-y: auto; - height: 90px; + height: 450px; box-sizing: border-box; - z-index: 1; + margin: 2rem 0; + + h3 { + font-weight: bold; + font-size: 40px; + } + + h3, + p { + margin-top: 1.5rem; + } + + p { + font-size: 18px; + } } } diff --git a/src/components/About/Companies/Companies.tsx b/src/components/About/Companies/Companies.tsx index 6dd7cac..c99c25a 100644 --- a/src/components/About/Companies/Companies.tsx +++ b/src/components/About/Companies/Companies.tsx @@ -2,16 +2,32 @@ import { useState } from 'react'; import './Companies.scss'; import { companies } from './constants'; +interface Dimensions { + width: string; + height: string; +} + +interface Company { + company: string; + org_type: string; + description: string; + companyImage: string; + dimensions?: Dimensions; +} + export default function Companies() { - const [selectedButton, setSelectedButton] = useState(null); - const [selectedCompany, setSelectedCompany] = useState(''); - const [companyDescription, setCompanyDescription] = useState(''); + const [selectedButton, setSelectedButton] = useState(''); + const [companyData, setCompanyData] = useState(null); const handleButtonClick = (company: string | null) => { setSelectedButton(company); - const companyData = companies.find(obj => obj.company === company); - setSelectedCompany(company!); - setCompanyDescription(companyData?.description!); + const foundCompany = companies.find(obj => obj.company === company); + + if (foundCompany) { + setCompanyData(foundCompany); + } else { + console.error(`Company with name "${company}" not found.`); + } }; return ( @@ -59,42 +75,18 @@ export default function Companies() { fill="#FBFEFC" stroke="white" /> - - - - - - - Recruiting - + + +
+

Recruiting

+
+ {companies .filter(obj => obj.org_type === 'Recruiting') @@ -102,7 +94,7 @@ export default function Companies() { ))} - - Networking Only - + +
+

Networking Only

+
+ {companies .filter(obj => obj.org_type === 'Networking Only') @@ -128,7 +122,7 @@ export default function Companies() { - +
-

{selectedCompany}

-

Hello!

+

{companyData &&

{companyData.company}

}

+

{companyData &&

{companyData.description}

}

 + + + + + + {companyData?.companyImage && ( + +
+ {companyData?.company +
+ + )} ); diff --git a/src/components/About/Companies/constants.ts b/src/components/About/Companies/constants.ts index 80ee814..c901d48 100644 --- a/src/components/About/Companies/constants.ts +++ b/src/components/About/Companies/constants.ts @@ -1,14 +1,65 @@ export const companies = [ - { company: 'UCSD Design Lab', org_type: 'Recruiting', description: '' }, - { company: 'Deloitte', org_type: 'Recruiting' }, + { + company: 'UCSD Design Lab', + org_type: 'Recruiting', + companyImage: '../company-svgs/', + dimensions: { width: '150px', height: '50px' }, + description: + 'The UC San Diego Design Lab works on major societal issues, such as large-scale education, automation, healthcare, and the ethical issues that are of ever-increasing importance. For the Design Lab, design is a way of thinking, addressing the core issues, always taking a systems point of view, emphasizing the role of people in the complex systems of the modern world.' + }, + { + company: 'Deloitte', + org_type: 'Recruiting', + companyImage: 'images/company-images/deloitte.png', + dimensions: { width: '150px', height: '50px' }, + description: + 'With more than 100,000 professionals, Deloitte provides audit and assurance, tax, consulting, and risk and financial advisory services to a broad cross-section of the largest corporations and governmental agencies.' + }, { company: 'The Art of Problem Solving', org_type: 'Recruiting', - description: '' + companyImage: './company-svgs/', + dimensions: { width: '150px', height: '50px' }, + description: + 'Art of Problem Solving is an education technology company inspiring and training the next generation of great problem solvers. They help students develop problem-solving skills by offering resources in a variety of different formats, building a community where students can connect and collaborate with their peers.' + }, + { + company: 'San Diego Zoo', + org_type: 'Recruiting', + companyImage: './company-svgs/', + dimensions: { width: '150px', height: '50px' }, + description: + 'San Diego Zoo is an international nonprofit conservation leader, committed to inspiring passion for nature and creating a world where all life thrives. Made up of two world-famous facilities, the San Diego Zoo and San Diego Zoo Safari Park— together they give millions of guests, in person and virtually, the opportunity to experience conservation in action.' }, - { company: 'San Diego Zoo', org_type: 'Recruiting', description: '' }, - { company: 'CoNote', org_type: 'Recruiting', description: '' }, - { company: 'UCSD Library', org_type: 'Recruiting', description: '' }, - { company: 'Notion', org_type: 'Networking Only', description: '' }, - { company: 'UCSD ACM', org_type: 'Networking Only', description: '' } + { + company: 'CoNote', + org_type: 'Recruiting', + companyImage: './company-svgs/', + dimensions: { width: '150px', height: '50px' }, + description: + 'CoNote.ai is a start-up technology that helps researchers transcribe, analyze, and organize their data while collaborating with their team.' + }, + { + company: 'UCSD Library', + org_type: 'Recruiting', + companyImage: './company-svgs/', + description: + "The UC San Diego Library, one of the nation's top public academic libraries, plays a critical role in advancing and supporting the university's research, teaching, patient care, and public service missions. The Library provides the foundation of knowledge needed to advance cutting-edge discoveries in a wide range of disciplines--from healthcare and science to public policy and the arts. The Library provides access to more than 7 million items, including digital and print volumes, journals, and multimedia materials to meet the knowledge demands of scholars, students, and members of the public." + }, + { + company: 'Notion', + org_type: 'Networking Only', + companyImage: 'images/company-images/notion.png', + dimensions: { width: '100px', height: '100px' }, + description: + "Notion blends your everyday work tools into one. Product roadmap? Company wiki? Meeting notes? With Notion, they're all in one place, and totally customizable to meet the needs of any workflow. It's the all-in-one workspace for you, your team, and your whole company." + }, + { + company: 'UCSD ACM', + org_type: 'Networking Only', + companyImage: './company-svgs/', + dimensions: { width: '150px', height: '50px' }, + description: + 'ACM at UCSD is an inclusive community of students passionate about technology. As UCSD’s largest members-first computing org, they offer workshops, socials, and projects through different communities including AI, Cyber, Hack, and Design.' + } ]; diff --git a/src/components/About/Opportunities/Opportunities.tsx b/src/components/About/Opportunities/Opportunities.tsx index 9de1f4b..bf9b79d 100644 --- a/src/components/About/Opportunities/Opportunities.tsx +++ b/src/components/About/Opportunities/Opportunities.tsx @@ -45,9 +45,18 @@ export default function Opportunities() { strokeWidth="2" stroke-linecap="round" /> - - One-on-Ones - + +
+

1:1 Networking

+
+
@@ -86,9 +95,18 @@ export default function Opportunities() { strokeWidth="2" stroke-linecap="round" /> - - Company Info Sessions - + +
+

Company Info Sessions

+
+
@@ -127,9 +145,18 @@ export default function Opportunities() { strokeWidth="2" stroke-linecap="round" /> - - Resume Reviews - + +
+

Resume Reviews

+
+