Skip to content

Commit

Permalink
Updated timeline events, past events, cleaned up, removed revolux OC …
Browse files Browse the repository at this point in the history
…recruitment page
  • Loading branch information
SaliyaBandara committed Apr 8, 2024
1 parent dbdcd5a commit b3ea83f
Show file tree
Hide file tree
Showing 10 changed files with 85 additions and 61 deletions.
28 changes: 18 additions & 10 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@testing-library/react": "^11.1.0",
"@testing-library/user-event": "^12.1.10",
"aos": "^2.3.4",
"bootstrap": "^5.1.0",
"bootstrap": "^5.3.3",
"eventsource": "^2.0.2",
"gh-pages": "^4.0.0",
"hamburger-react": "^2.4.1",
Expand Down
Binary file added public/images/event-covers/infinite-loop.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 added public/images/event-covers/madhack-3.0.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 added public/images/event-covers/revolux-3.0.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 added public/images/event-logos/Revolux3.0-logo.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 added public/images/event-logos/infinite-loop.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
60 changes: 26 additions & 34 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, {lazy, Suspense} from "react";
import React, { lazy, Suspense } from "react";
// import {BrowserRouter as Router, Route, Switch} from "react-router-dom";
import {Route, Switch} from "react-router-dom";
import { Route, Switch } from "react-router-dom";

// import Home from "./components/Landing";
// import EventDetails from "./components/Landing/EventDetails";
Expand All @@ -15,41 +15,33 @@ import NewsList from "./components/Common/NewsList";
const Home = lazy(() => import("./components/Landing"));
const EventDetails = lazy(() => import("./components/Landing/EventDetails"));
const PreviousOfficers = lazy(() => import("./components/PreviousOfficers"));
const RevoluxOCJobDesc = lazy(() => import("./components/Landing/Misc/RevoluxOCJobDesc.js"));

const App = () => {
return (
<Suspense fallback={<Loading/>}>
<main>
<Switch>
<Route exact path="/">
<TopNavbar showLinks={true}/>
<Home/>
<Footer/>
</Route>
<Route path="/event-details/:id">
<TopNavbar showLinks={false}/>
<EventDetails/>
<Footer/>
</Route>
<Route path="/previous-officers">
<TopNavbar showLinks={false}/>
<PreviousOfficers/>
<Footer/>
</Route>
<Route path="/revolux-oc-job-desc">
<RevoluxOCJobDesc/>
</Route>
</Switch>
{window.location.hash !== "#/revolux-oc-job-desc" && (
<>
<NewsList/>
<SocialMedia/>
</>
)}

</main>
</Suspense>
<Suspense fallback={<Loading />}>
<main>
<Switch>
<Route exact path="/">
<TopNavbar showLinks={true} />
<Home />
<Footer />
</Route>
<Route path="/event-details/:id">
<TopNavbar showLinks={false} />
<EventDetails />
<Footer />
</Route>
<Route path="/previous-officers">
<TopNavbar showLinks={false} />
<PreviousOfficers />
<Footer />
</Route>
</Switch>
<NewsList />
<SocialMedia />

</main>
</Suspense>
);
};

Expand Down
24 changes: 24 additions & 0 deletions src/data/past-events.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,29 @@
{
"events": [
{
"title": "MADHack 3.0",
"date": "Feb - April 2024",
"image": "madhack-3.0.jpg",
"url": "madhack.ucscieee.com",
"summary": "MADHack is a mobile app development hackathon and workshop series organized by the IEEE Student Branch of UCSC. It gives university students in Sri Lanka the chance to participate in a mobile app development competition, allowing them to sharpen their skills and learn from experts in the field.",
"description": "The awareness session of MADHACK took place on the 6th of January 2024 with the purpose of bringing about awareness of the event and giving the participants an introduction to the world of mobile app development. The very first workshop for MADHack, the Mobile Application Development Hackathon was conducted on the 11th February via Zoom platforms with more than 200 participants live. The session delivered an introduction to Android Native development with a remarkable engagement of the participants. The second workshop of MADHack was conducted on the 4th of February, 2024 physically with more than 250 participants focusing on different topics namely React Native, Flutter and Code to AppStore (i.e. Deployment)."
},
{
"title": "RevolUX 3.0",
"date": "January - March 2024",
"image": "revolux-3.0.jpg",
"url": "revolux.ucscieee.com",
"summary": "RevolUX 3.0 is the third edition of the UI/UX designathon organized by the IEEE Student Branch of UCSC in collaboration with AIESEC in University of Colombo.",
"description": "RevolUX was initiated by the IEEE student branch of UCSC together with AIESEC in University of Colombo after observing the growing interest in the field of UI/UX. The event was conducted in two phases: the preparation phase and competition phase. The initial phase consisted of awareness sessions and workshops. The subsequent phase was consistent of the initial competition round of prototype submission and a 24-hour designathon. The final designathon of RevolUX 3.0 was held on the 2nd of March 2024 as a online 24 hour event with 10 final teams with nearly 40 participating in the competition. The competitors got a kick start at 8 a.m. and concluded their final outcome at 8 a.m. of the following day. Afterwards, the winning three teams were carefully processed by the judge panel and it was announced at the award ceremony."
},
{
"title": "Infinite Loop",
"date": "Jun - Aug 2023",
"image": "infinite-loop.jpg",
"url": "",
"summary": "InfiniteLoop was an online workshop series by IEEE Student Branch of UCSC aimed at enhancing technological knowledge and skills of first-year undergraduates. Led by senior UCSC students, it covered diverse computer science and IT topics.",
"description": "InfiniteLoop was a series of weekly online workshops organized by the IEEE Student Branch of the UCSC from June to August 2023. Designed to forge unique learning journeys guided by passions and aspirations in the boundless realm of technology, the workshops focused on various trending technological topics. Conducted by experienced second and third-year UCSC undergraduates, the sessions aimed to enhance both the academic knowledge and technical skills of participants, primarily targeting first-year UCSC students new to computer science and information technology. Through interactive and hands-on sessions exploring diverse subjects, InfiniteLoop provided an opportunity for attendees to delve into theoretical concepts, practical applications, and gain valuable experience in their areas of interest within the ever-evolving technology landscape."
},
{
"title": "MADHack 2.0",
"date": "Feb - March 2023",
Expand Down
32 changes: 16 additions & 16 deletions src/data/timeline-events.json
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
{
"events": [
{
"title": "RevolUX 2.0",
"subTitle": "Inter-University UI/UX Designathon",
"date": "June - July 2022",
"iconSrc": "Revolux2.0-logo.webp",
"altText": "Revolux 2.0 logo",
"description": "RevolUX 2.0 is an inter-university UI/UX designathon organized by the IEEE Student Branch of UCSC in collaboration with AIESEC in UOC. We are proud to bring this event for the second time in a row with the goal of providing undergraduates with hands on experience in User Interface and User Experience Design"
"title": "Infinite Loop",
"subTitle": "Online Workshop Series",
"date": "Jun - Aug 2023",
"iconSrc": "infinite-loop.jpg",
"altText": "Infinite Loop Logo",
"description": "InfiniteLoop was an online workshop series by IEEE Student Branch of UCSC aimed at enhancing technological knowledge and skills of first-year undergraduates. Led by senior UCSC students, it covered diverse computer science and IT topics."
},
{
"title": "IEEE Day 2022",
"subTitle": "Celebrating Global IEEE Day",
"date": "22nd January 2023",
"iconSrc": "IEEE-Day-2022-logo.webp",
"altText": "IEEE Day 2022 logo",
"description": "IEEE Day is an annual event of global significance, celebrated by IEEE members on the first Tuesday of October. This time, the IEEE Student Branch of UCSC celebrated IEEE Day 2022 on the 22nd of January 2023."
"title": "RevolUX 3.0",
"subTitle": "Inter-University UI/UX Designathon",
"date": "January - March 2024",
"iconSrc": "Revolux3.0-logo.jpg",
"altText": "Revolux 3.0 logo",
"description": "RevolUX 3.0 is an inter-university UI/UX designathon organized by the IEEE Student Branch of UCSC in collaboration with AIESEC in UOC. We are proud to bring this event for the second time in a row with the goal of providing undergraduates with hands on experience in User Interface and User Experience Design"
},
{
"title": "MADHack 2.0",
"title": "MADHack 3.0",
"subTitle": "Mobile Application Development Hackathon",
"date": "Feb - March 2023",
"date": "Feb - April 2024",
"iconSrc": "MADHACK-2.0-logo.webp",
"altText": "MADHack 2.0 logo",
"altText": "MADHack 3.0 logo",
"description": "MADHack is a mobile app development hackathon and workshop series organized by the IEEE Student Branch of UCSC. It gives university students in Sri Lanka the chance to participate in a mobile app development competition, allowing them to sharpen their skills and learn from experts in the field."
}
]
}
}

0 comments on commit b3ea83f

Please sign in to comment.