Skip to content

Commit

Permalink
remove a lot of stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
antoinebou12 committed Nov 1, 2024
1 parent 880212f commit 92ec49e
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 198 deletions.
6 changes: 1 addition & 5 deletions components/sections/about/about.js
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ class AboutSection extends LitElement {
<section id="about" aria-labelledby="about-heading">
<div class="container">
<h1 id="about-heading">About the Event</h1>
<p>
<p style="text-align: justify;">
GRAPHQUON (formerly MOTOGRAPH) is the annual Quebec-Ontario
pre-SIGGRAPH workshop, organized by and for the major East-Canadian
computer graphics labs. It is an opportunity for students to present
Expand Down Expand Up @@ -333,10 +333,6 @@ class AboutSection extends LitElement {
to the registration form.
</p>
<!-- Button Links -->
<div class="btn-container">
<a href="#schedule" class="btn btn-primary" @click=${this.handleClick}>Schedule</a>
</div>
</div>
</section>
`;
Expand Down
3 changes: 1 addition & 2 deletions components/sections/contact/contact.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,14 @@ class ContactSection extends LitElement {
display: flex;
justify-content: center;
align-items: center;
padding: 2rem;
padding: 4rem;
}
/* Card styles */
.card {
background-color: white; /* bg-white */
padding: 2rem;
border-radius: 1rem; /* rounded-lg */
box-shadow: 0 10px 15px rgba(0, 0, 0, 0.4); /* shadow-lg */
text-align: center;
max-width: 400px; /* Ensure card doesn't get too wide */
margin: 0 auto;
Expand Down
6 changes: 5 additions & 1 deletion components/sections/hero/hero.js
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,10 @@ class HeroSection extends LitElement {
`;
}

static properties = {
scheduleData: { type: Array },
};

firstUpdated() {
this.loadScheduleAndUpdateSection();
// Update the section every minute to keep the status current
Expand All @@ -253,7 +257,7 @@ class HeroSection extends LitElement {

async loadScheduleAndUpdateSection() {
try {
const response = await fetch('/schedule.json'); // Adjust the path as necessary
const response = await fetch('schedule.json'); // Adjust the path as necessary
if (!response.ok) throw new Error('Failed to load schedule data');
const scheduleData = await response.json();
this.scheduleData = scheduleData;
Expand Down
7 changes: 1 addition & 6 deletions components/sections/keynote/keynote.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ class KeynoteSection extends LitElement {
section {
position: relative;
padding: 2rem;
background: linear-gradient(to right, #ed64a6, #f6e05e);
text-align: center;
color: white;
overflow: hidden; /* Ensure particles stay within the section */
z-index: 1;
}
Expand Down Expand Up @@ -94,7 +92,6 @@ class KeynoteSection extends LitElement {
h3 {
margin-top: 1rem;
font-size: 1.5rem;
color: #ffffff;
}
/* Accessibility focus style for images */
Expand Down Expand Up @@ -136,10 +133,8 @@ class KeynoteSection extends LitElement {
render() {
return html`
<section id="keynote" aria-labelledby="keynote-heading">
<!-- Particle.js Background -->
<div id="particles-js"></div>
<h1 id="keynote-heading">Keynote Speakers</h1>
<h1 id="keynote-heading">Speakers</h1>
<div class="grid">
<div class="speaker-card" aria-label="Masha Shugrina " data-animate="right">
<img src="res/masha.jpg" alt="Photo of Masha Shugrina " loading="lazy" tabindex="0" />
Expand Down
217 changes: 33 additions & 184 deletions components/sections/schedule/schedule.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,17 @@ class ScheduleSection extends LitElement {
scheduleData: { type: Array },
};

constructor() {
super();
this.scheduleData = [];
}

static styles = css`
:host {
display: block;
position: relative;
padding: 2rem;
font-family: 'Commissioner', sans-serif;
background-color: #f7fafc;
color: #111827;
z-index: 1;
}
Expand All @@ -35,10 +39,7 @@ class ScheduleSection extends LitElement {
flex-direction: row;
justify-content: space-around;
padding: 40px;
background-color: rgb(212, 217, 222);
color: #252525;
border-radius: 17px;
border: solid 4px #d3d3d3;
cursor: default;
flex-wrap: wrap;
}
Expand Down Expand Up @@ -166,186 +167,21 @@ class ScheduleSection extends LitElement {
}
`;

constructor() {
super();
this.scheduleData = [
{
date: "9",
month: "November",
day: "Saturday",
items: [
{
time: "08:30 - 09:00",
name: "Arrival (Breakfast)"
},
{
time: "09:00 - 09:20",
name: "Opening"
},
{
time: "09:30 - 10:30",
name: "Student presentations",
items: [
{
author: "Quoc-Minh Ton-That",
affiliation: "École de technologie supérieure",
link: "https://www.q-minh.com/"
},
{
author: "Melissa Katz",
affiliation: "McGill University"
},
{
author: "Darsh Kaushik",
affiliation: "MILA - Université de Montréal",
link: "https://mila.quebec/en/directory/darsh-kaushik"
}
]
},
{
time: "10:30 - 11:00",
name: "Break"
},
{
time: "11:00 - 12:00",
name: "Student presentations",
items: [
{
author: "Justin Benoist",
affiliation: "École de technologie supérieure",
link: "https://www.linkedin.com/in/justin-benoist"
},
{
author: "Arthur Delon",
affiliation: "University of Sherbrooke"
},
{
author: "Joel Pelletier-Guenette",
affiliation: "École de technologie supérieure",
link: "https://www.linkedin.com/in/joelpelletierguenette"
}
]
},
{
time: "12:00 - 14:00",
name: "Lunch"
},
{
time: "14:00 - 15:00",
name: "Keynote Masha Shugrina (NVIDIA)",
link: "https://shumash.com/"
},
{
time: "15:00 - 15:15",
name: "Break"
},
{
time: "15:15 - 16:00",
name: "Student presentations",
items: [
{
author: "Abhishek Madan",
affiliation: "University of Toronto",
link: "https://www.dgp.toronto.edu/~amadan/"
},
{
author: "Clara Kim",
affiliation: "University of Waterloo"
}
]
},
{
time: "16:00 - 16:30",
name: "Faculty presentation"
},
{
time: "16:30",
name: "Workshop Dinner + Trivia Night"
}
]
},
{
date: "10",
month: "November",
day: "Sunday",
items: [
{
time: "08:30 - 09:00",
name: "Arrival (Breakfast)"
},
{
time: "09:00 - 10:30",
name: "Student presentations",
items: [
{
author: "Victor Rong",
affiliation: "University of Toronto",
link: "https://www.lessvrong.com/"
},
{
author: "Ryusuke Sugimoto",
affiliation: "University of Waterloo",
link: "https://rsugimoto.net/"
},
{
author: "Yue Chang",
affiliation: "University of Toronto",
link: "https://changy1506.github.io/"
},
{
author: "Ege Ciklabakkal",
affiliation: "University of Waterloo",
link: "https://cs.uwaterloo.ca/~meciklab/"
}
]
},
{
time: "10:30 - 11:00",
name: "Break"
},
{
time: "11:00 - 12:00",
name: "Keynote Lesley Istead (Cartlon University)"
},
{
time: "12:00 - 14:00",
name: "Lunch"
},
{
time: "14:00 - 14:30",
name: "Faculty presentation"
},
{
time: "14:30 - 15:00",
name: "Round table internship"
},
{
time: "15:00 - 15:30",
name: "Break"
},
{
time: "15:30 - 16:10",
name: "Student presentations",
items: [
{
author: "Alex Hoang-Cao",
affiliation: "École de technologie supérieure",
link: "https://www.linkedin.com/in/alex-hoang-cao/?locale=fr_FR"
},
{
author: "Ivan Puhachov",
affiliation: "Université de Montréal",
link: "https://puhachov.xyz/"
}
]
},
{
time: "16:20 - 16:30",
name: "Closing"
}
]
}
];
firstUpdated() {
this.loadScheduleAndUpdateSection();
}

async loadScheduleAndUpdateSection() {
try {
const response = await fetch('schedule.json'); // Adjust the path as necessary
if (!response.ok) throw new Error('Failed to load schedule data');
const scheduleData = await response.json();
this.scheduleData = scheduleData;
} catch (error) {
console.error('Error loading schedule:', error);
// Optionally, set a specific section for errors
this.currentSection = 'ended'; // Fallback
}
}

renderSublist(subitems) {
Expand All @@ -368,6 +204,19 @@ class ScheduleSection extends LitElement {
}

render() {
if (!this.scheduleData || this.scheduleData.length === 0) {
return html`
<section id="schedule">
<header>
<h1>Schedule</h1>
</header>
<div id="schedule-grid-container">
<p>Loading schedule...</p>
</div>
</section>
`;
}

return html`
<section id="schedule">
<header>
Expand Down
2 changes: 2 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@
// Create Scene
scene = new THREE.Scene();

scene.background = new THREE.Color(0xfffffff);

// Create Camera
camera = new THREE.PerspectiveCamera(
75,
Expand Down

0 comments on commit 92ec49e

Please # to comment.