Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
16
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,10 @@ Run the following command to run the site:
```
npm start
```

How to upload changes to the actual website
Run:
npm run build

replace the static folder and index.html in the cPanel file manager

24,475 changes: 10,767 additions & 13,708 deletions package-lock.json

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
"private": true,
"homepage": "https://rssla.org/",
"dependencies": {
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.5.0",
"@testing-library/user-event": "^7.2.1",
"papaparse": "^5.3.2",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"@testing-library/jest-dom": "^6.4.2",
"@testing-library/react": "^14.2.1",
"@testing-library/user-event": "^14.5.2",
"papaparse": "^5.4.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-papaparse": "^4.0.2",
"react-router-dom": "^5.2.0",
"react-scripts": "3.4.1"
"react-router-dom": "^6.22.3",
"react-scripts": "5.0.1"
},
"scripts": {
"start": "react-scripts start",
Expand Down
Binary file added public/images/Kavya/Tomas.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/images/board/aditya.jpg
Binary file not shown.
Binary file removed public/images/board/andrew.jpg
Binary file not shown.
Binary file removed public/images/board/anusha.jpg
Binary file not shown.
Binary file removed public/images/board/bilal.jpg
Binary file not shown.
Binary file removed public/images/board/chelsey.jpg
Binary file not shown.
Binary file removed public/images/board/cindy.jpg
Binary file not shown.
Binary file removed public/images/board/daniel.jpg
Binary file not shown.
Binary file removed public/images/board/david.jpg
Binary file not shown.
Binary file removed public/images/board/donya.jpg
Binary file not shown.
Binary file removed public/images/board/james.jpg
Binary file not shown.
Binary file removed public/images/board/joy.png
Binary file not shown.
Binary file removed public/images/board/karine.jpg
Binary file not shown.
Binary file removed public/images/board/marilyn.jpg
Binary file not shown.
Binary file removed public/images/board/ryan.jpg
Binary file not shown.
Binary file removed public/images/board/zack.jpg
Binary file not shown.
Binary file removed public/images/board22-23/Alvin.JPG
Binary file not shown.
Binary file removed public/images/board22-23/America.jpg
Binary file not shown.
Binary file removed public/images/board22-23/Anusha.JPG
Binary file not shown.
Binary file removed public/images/board22-23/Bilal.jpg
Binary file not shown.
Binary file removed public/images/board22-23/Cadence.jpg
Binary file not shown.
Binary file removed public/images/board22-23/Cody.JPG
Binary file not shown.
Binary file removed public/images/board22-23/Daisy.jpeg
Binary file not shown.
Binary file removed public/images/board22-23/Daniel.jpeg
Binary file not shown.
Binary file removed public/images/board22-23/Joy.png
Binary file not shown.
Binary file removed public/images/board22-23/Juan.jpg
Diff not rendered.
Binary file removed public/images/board22-23/Karine.jpg
Diff not rendered.
Binary file removed public/images/board22-23/Sam.jpeg
Diff not rendered.
Binary file removed public/images/board22-23/Tiffany.JPG
Diff not rendered.
Binary file removed public/images/board23-24/Alvin.JPG
Diff not rendered.
Binary file removed public/images/board23-24/America.JPG
Diff not rendered.
Binary file removed public/images/board23-24/Brianna.jpeg
Diff not rendered.
Binary file removed public/images/board23-24/Cadence.jpg
Diff not rendered.
Binary file removed public/images/board23-24/Cheryl.JPG
Diff not rendered.
Binary file removed public/images/board23-24/Cody.JPG
Diff not rendered.
Binary file removed public/images/board23-24/Daisy.jpg
Diff not rendered.
Binary file removed public/images/board23-24/Joshua.png
Diff not rendered.
Binary file removed public/images/board23-24/Juan.jpg
Diff not rendered.
Binary file removed public/images/board23-24/Kenneth.jpg
Diff not rendered.
Binary file removed public/images/board23-24/Rebecca.jpg
Diff not rendered.
Binary file removed public/images/board23-24/Shannon.jpg
Diff not rendered.
Binary file removed public/images/board23-24/Tiffany.JPG
Diff not rendered.
Binary file removed public/images/board24-25/cadence.jpg
Diff not rendered.
Binary file removed public/images/board24-25/chan.JPG
Diff not rendered.
Binary file removed public/images/board24-25/evette.jpg
Diff not rendered.
Binary file removed public/images/board24-25/jake.png
Diff not rendered.
Binary file removed public/images/board24-25/joshua.JPG
Diff not rendered.
Binary file removed public/images/board24-25/judy.jpg
Diff not rendered.
Binary file removed public/images/board24-25/katie.jpg
Diff not rendered.
Binary file removed public/images/board24-25/luke.png
Diff not rendered.
Binary file removed public/images/board24-25/nyla.jpg
Diff not rendered.
Binary file removed public/images/board24-25/rebecca.jpg
Diff not rendered.
Binary file added public/images/board25-26/AdrianAnaya.jpg
Binary file added public/images/board25-26/CarleeLincoln.jpg
Binary file added public/images/board25-26/HuntingtonCo.jpg
Binary file added public/images/board25-26/IzzyNunez.jpg
Binary file added public/images/board25-26/KatieFang.jpg
Binary file added public/images/board25-26/LukeJones.jpg
Binary file added public/images/board25-26/RebeccaLee.jpg
Binary file added public/images/board25-26/ScarlettGreenwood.jpg
Binary file added public/images/board25-26/StephanieNguyen.jpg
Binary file added public/images/board25-26/TeaWagstaff.jpg
Binary file added public/images/board25-26/TomasMazeika.jpg
Binary file added public/images/images/2025_Food_Bank.jpg
Binary file added public/images/images/2025_Kayaking.jpg
43 changes: 22 additions & 21 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import ReactDOM from 'react-dom';
import {
BrowserRouter,
Switch,
Routes,
Route
} from "react-router-dom";

Expand All @@ -23,31 +23,32 @@ import KavyaBDay from './routes/KavyaBDay';

import ResetScroll from './util/ResetScroll'

ReactDOM.render(
const root = ReactDOM.createRoot(document.getElementById('main-wrapper'));

root.render(
<React.StrictMode>
<Routes />
</React.StrictMode>,
document.getElementById('main-wrapper')
<App />
</React.StrictMode>
);

function Routes(props) {
function App() {
return (
<BrowserRouter>
<BrowserRouter basename="/">
<ResetScroll>
<Switch>
<Route exact path="/"><Home key={Math.random()}/></Route>
<Route exaxt path="/programs"><Programs /></Route>
<Route exaxt path="/committees"><Committees /></Route>
<Route exaxt path="/board"><Board /></Route>
<Route exaxt path="/gallery"><Gallery /></Route>
<Route exaxt path="/events"><Event /></Route>
<Route exaxt path="/kavya-bday"><KavyaBDay /></Route>
<Route exaxt path="/prospectives"><Prospectives /></Route>
<Route exaxt path="/contact"><Contact /></Route>
<Route exaxt path="/shop"><Shop /></Route>
<Route exaxt path="/interUC"><InterUC /></Route>
</Switch>
<Routes>
<Route path="/" element={<Home key={Math.random()} />} />
<Route path="/programs/*" element={<Programs />} />
<Route path="/committees/*" element={<Committees />} />
<Route path="/board/*" element={<Board />} />
<Route path="/gallery/*" element={<Gallery />} />
<Route path="/events/*" element={<Event />} />
<Route path="/kavya-bday/*" element={<KavyaBDay />} />
<Route path="/prospectives/*" element={<Prospectives />} />
<Route path="/contact/*" element={<Contact />} />
<Route path="/shop/*" element={<Shop />} />
<Route path="/interUC/*" element={<InterUC />} />
</Routes>
</ResetScroll>
</BrowserRouter>
)
);
}
135 changes: 75 additions & 60 deletions src/routes/Board.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,120 +32,130 @@ class Board extends Component {
<>
<BoardProfile width={this.state.width}
title="President"
name="Cadence Chang"
major="Computational & Systems Biology, 2025"
img="cadence.jpg"
size="115% auto"
halign="45%"
valign="35%"
name="Rebecca Lee"
major="Biochemistry, 2026"
img="RebeccaLee.jpg"
size="170% auto"
halign="47%"
valign="100%"
/>
<BoardProfile width={this.state.width}
title="External Vice President"
name="Rebecca Lee"
major="Biochemistry, 2026"
img="rebecca.jpg"
size="180% auto"
name="Shannon Shams"
major="Physiological Science, 2026"
img="ShannonShams.jpg"
size="110% auto"
halign="50%"
valign="20%"
valign="60%"
/>
<BoardProfile width={this.state.width}
title="Internal Vice President"
name="Luke Jones"
major="Mathematics, 2027"
img="luke.png"
major="Mathematics and Stats&nbsp;&amp;&nbsp;Data&nbsp;Science, 2027"
img="LukeJones.jpg"
size="115% auto"
halign="45%"
halign="15%"
valign="35%"
/>
<BoardProfile width={this.state.width}
title="Secretary"
name="Joshua Hockman"
major="Biochemistry, 2026"
img="joshua.JPG"
size="232% auto"
name="Scarlett Greenwood"
major="Psychology, 2028"
img="ScarlettGreenwood.jpg"
size="160% auto"
halign="47%"
valign = "58%"
/>
<BoardProfile width={this.state.width}
title="Activities Director"
name="Clarissa Zuo"
major="Physics, 2027"
img="clarissa.jpg"
size="105% auto"
halign="70%"
name="Stephanie Nguyen"
major="Neuroscience, 2028"
img="StephanieNguyen.jpg"
size="160% auto"
halign="50%"
valign="25%"
/>
<BoardProfile width={this.state.width}
title="Activities Director"
name="Judy Lee"
major="Psychobiology, 2027"
img="judy.jpg"
size="105% auto"
halign="70%"
name="Adrian Anaya"
major="Chemical Engineering, 2028"
img="AdrianAnaya.jpg"
size="140% auto"
halign="60%"
valign="20%"
/>
<BoardProfile width={this.state.width}
title="Community Service Director"
name="Jake Maricich"
major="Neuroscience, 2027"
img="jake.png"
size="110% auto"
name="Isabella Nuñez"
major="Human Biology & Society, 2028"
img="IzzyNunez.jpg"
size="170% auto"
halign = "50%"
valign="65%"
/>
<BoardProfile width={this.state.width}
title="Educational Programs Director"
name="Shannon Shams"
major="Physiological Science, 2026"
img="shannon.jpg"
name="Clarissa Zuo"
major="Physics, 2027"
img="ClarissaZuo.jpg"
size="110% auto"
halign="50%"
valign="60%"
/>
<BoardProfile width={this.state.width}
title="Funding Director"
name="Chan Park"
major="Mathematics/Economics, 2027"
img="chan.JPG"
size="130% auto"
halign="50%"
valign="30%"
name="Tomas Mazeika"
major="Philosophy, 2028"
img="TomasMazeika.jpg"
size="100% auto"
halign="2px"
valign="20%"
//rotation="180"
/>
<BoardProfile width={this.state.width}
title="Treasurer"
name="Kavya Kumar"
major="Economics and Psychology, 2025"
img="kavya.png"
size="130% auto"
major="Neuroscience, 2025"
img="KavyaKumar.png"
size="100% auto"
halign="50%"
valign="30%"
valign="55%"
/>
<BoardProfile width={this.state.width}
title="Publicity Director"
name="Katie Fang"
major="World Arts and Cultures, 2026"
img="katie.jpg"
size="170% auto"
halign="55%"
img="KatieFang.jpg"
size="120% auto"
halign="45%"
valign="38%"
/>
<BoardProfile width={this.state.width}
title="Transfer Affairs Director"
name="Evette Palacios"
major="Political Science and Education, 2025"
img="evette.jpg"
size="100% auto"
halign="50%"
valign="20%"
name="Carlee Lincoln"
major="Political Science and Philosophy, 2026"
img="CarleeLincoln.jpg"
size="120% auto"
halign="30%"
valign="50%"
/>
<BoardProfile width={this.state.width}
title="Mentorship Director"
name="Téa Wagstaff"
major="Math/Econ, 2027"
img="TeaWagstaff.jpg"
size="160% auto"
halign="40%"
valign="60%"
/>
<BoardProfile width={this.state.width}
title="Webmaster"
name="Nyla Zia"
name="Huntington Co"
major="Computer Science, 2026"
img="nyla.jpg"
img="HuntingtonCo.jpg"
size="100% auto"
halign="55%"
valign="58%"
halign="20%"
valign="20%"
/>
</>
)
Expand All @@ -157,6 +167,9 @@ class Board extends Component {
darkness="0"
valign="55%"
/>
<div className="board-description">
The Regents Scholar Society Executive Board is responsible for designing, planning, and executing all of the internal and external programs, projects, resources, activities, service events, leadership opportunities, mentorship, academic and professional events for our members to thrive at UCLA. A highly collaborative and supportive group of 14 outstanding RSSers, E-board works hard throughout the year to keep RSSers engaged and involved in the society through providing creative and innovative events and opportunities for all.
</div>
<div className="board-wrapper">
{this.state.width > 840 ? contents :
<div className="board-flex-wrapper">
Expand All @@ -174,11 +187,13 @@ class BoardProfile extends Component {
const halign = this.props.halign == null ? "0%" : this.props.halign; //picture movement laterally
const valign = this.props.valign == null ? "0%" : this.props.valign; //picture movement vertically
const size = this.props.size == null ? "cover" : this.props.size; //zoom
const rotation = this.props.rotation == null ? "0deg" : `${this.props.rotation}deg`; //rotation
const imgStyle = {
backgroundImage: `url(/images/board24-25/${this.props.img})`,
backgroundImage: `url(/images/board25-26/${this.props.img})`,
backgroundRepeat: "no-repeat",
backgroundPosition: `${halign} ${valign}`,
backgroundSize: size
backgroundSize: size,
transform: `rotate(${rotation})`
}
if (this.props.width > 840) {
return (
Expand Down
10 changes: 5 additions & 5 deletions src/routes/Committees.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,31 +53,31 @@ class Committees extends Component {
<div className="committees-list-wrapper">
<CommitteeEntry
name="A.C.E. Committee"
leaders="Judy, Clarrisa, Shannon, and Jake"
leaders="Stephanie, Adrian, Isabella, and Clarissa"
>
The A.C.E. Committee manages activities, community service, and educational programs.
The committee helps plan fun and affordable social activities, arranges community
service opportunities, and fosters engagement and bonding between members of the society.
</CommitteeEntry>
<CommitteeEntry
name="Funding Committee"
leaders="Chan and Kavya"
leaders="Tomas and Kavya"
>
The Funding Committee is in charge of fundraising, including brainstorming innovative ideas
and organizing the logistics for the fundraisers. The Funding Committee also serves as
liaisons between RSS and corporate sponsors.
</CommitteeEntry>
<CommitteeEntry
name="Special Events Committee"
leaders="Cadence, Rebecca, and Luke"
leaders="Rebecca, Shannon, and Luke"
>
The Special Events Committee plans the Society's large-scale events, such as S.P.I.E.L.
and winter retreat. In addition, the committee advocates for the needs of all members,
from first to fourth years, transfers, and non-traditional students.
</CommitteeEntry>
<CommitteeEntry
name="Tech Committee"
leaders="Nyla"
leaders="Huntington"
>
The Tech Committee works on tech-related projects with a focus on improving the society.
Committee members help maintain and add new features/pages to the RSS website,
Expand All @@ -93,7 +93,7 @@ class Committees extends Component {
</CommitteeEntry>
<CommitteeEntry
name="Transfer Affairs Committee"
leaders="Evette"
leaders="Carlee"
>
The Transfer Affairs Committee works to make the Regents Scholar Society a transfer-inclusive
space by promoting academic, educational, and professional resources to ensure success.
Expand Down
2 changes: 1 addition & 1 deletion src/routes/Home.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class Home extends Component {
return (
<RSSPage className="home">
<Banner
text="this is rss"
text="we are rss"
subtext="regents scholar society at ucla"
// video="true"
bgr="/images/banners/royce-sideview.jpg"
Expand Down
Loading