Skip to content

Commit bbdf1d3

Browse files
danielfeitopindanielfeitopin
authored
Merge pull request #2 from dafic-udc/dev
Improve activities lists
2 parents 1dba520 + 8c02eb7 commit bbdf1d3

7 files changed

Lines changed: 80 additions & 44 deletions

File tree

site/css/styles.css renamed to site/css/activities.css

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
21
/* ACTIVITIES */
32

4-
#activities-list {
3+
.activities-list {
54
display: flex;
65
flex-flow: row wrap;
76
justify-content: center;
@@ -12,7 +11,7 @@
1211
list-style-type: none;
1312
}
1413

15-
#activities-list li {
14+
.activities-list li {
1615
display: flex;
1716
flex-direction: column;
1817
align-items: center;

‎site/css/layout.css‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,30 @@ h1, h2, h3, h4, h5, h6 {
8181
text-align: center;
8282
}
8383

84+
h1 {
85+
font-size: 32px;
86+
}
87+
88+
h2 {
89+
font-size: 28px;
90+
}
91+
92+
h3 {
93+
font-size: 24px;
94+
}
95+
96+
h4 {
97+
font-size: 20px;
98+
}
99+
100+
h5 {
101+
font-size: 18px;
102+
}
103+
104+
h6 {
105+
font-size: 16px;
106+
}
107+
84108
p {
85109
width: 100%;
86110
margin: 1em 0;

‎site/index.html‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,39 @@
77
<title>DAFIC - Welcome to da FIC</title>
88
<link rel="icon" type="image/png" href="./assets/img/Logo_DAFIC_redondo.svg">
99
<link rel="stylesheet" type="text/css" href="./css/layout.css">
10-
<link rel="stylesheet" type="text/css" href="./css/styles.css">
10+
<link rel="stylesheet" type="text/css" href="./css/activities.css">
1111
</head>
1212

1313
<body>
1414
<header>
1515
<a id="brand" href="https://dafic.org/">
16-
<img id="brand-logo" alt="DAFIC" src="./assets/img/Logo_DAFIC_redondo.svg">
16+
<img id="brand-logo" alt="Logo DAFIC" src="./assets/img/Logo_DAFIC_redondo.svg">
1717
<span id="brand-name">DAFIC</span>
1818
</a>
1919
</header>
2020
<main>
21-
<h1>Benvido, curso<span id="course"></span>.</h1>
2221
<section id="welcome">
22+
<h1>Benvido, curso<span id="course"></span>.</h1>
23+
<script src="./js/course.js"></script>
2324
<p>
2425
Somos DAFIC, a asociación <b>División do Alumnado da FIC</b>. Somos estudantes co obxectivo de apoiar á
2526
representación estudiantil e realizar actividades de interese para o estudantado da facultade.
2627
</p>
2728
</section>
2829

2930
<section id="activities">
30-
<h2>Próximas actividades</h2>
31-
<ul id="activities-list">
31+
<h2>Actividades</h2>
32+
33+
<h3>Próximas actividades</h3>
34+
<ul id="next-activities-list" class="activities-list">
35+
<!-- Updated by activities.js -->
36+
</ul>
37+
38+
<h3>Actividades realizadas</h3>
39+
<ul id="previous-activities-list" class="activities-list">
3240
<!-- Updated by activities.js -->
3341
</ul>
42+
3443
<script src="./js/activities.js"></script>
3544
</section>
3645
</main>
@@ -65,9 +74,9 @@ <h2>Próximas actividades</h2>
6574
<img title="Linktree" src="https://simpleicons.vercel.app/linktree/43E55E" alt="Linktree">
6675
</a>
6776
</div>
77+
<script src="./js/protect_email.js"></script>
6878
</footer>
6979

70-
<script src="./js/script.js"></script>
7180
</body>
7281

7382
</html>

‎site/js/activities.js‎

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
ACTIVITIES = [
1+
NEXT_ACTIVITIES = [
2+
23
[
34
"Concurso de fotografía",
45
"Participa no noso concurso de fotografía e saca o teu lado máis creativo! Esta actividade conta co apoio das axudas do VEE da UDC.",
@@ -7,6 +8,25 @@ ACTIVITIES = [
78
"https://dafic.org/concurso-fotografia-2025/"
89
],
910

11+
[
12+
"Charla Egresados GEI",
13+
"Coñece a experiencia de antigos alumnos do Grao en Enxeñaría Informática da FIC. Esta actividade conta co apoio das axudas do VEE da UDC.",
14+
"23/09/2025",
15+
"./assets/img/activities/actividad_egresados_gei.png",
16+
"./assets/img/poster/cartel_egresados_gei.png"
17+
],
18+
19+
[
20+
"Charla Egresados GCED",
21+
"Coñece a experiencia de antigos alumnos do Grao en Ciencia e Enxeñaría de Datos da FIC. Esta actividade conta co apoio das axudas do VEE da UDC.",
22+
"24/09/2025",
23+
"./assets/img/activities/actividad_egresados_gced.png",
24+
"./assets/img/poster/cartel_egresados_gced.png"
25+
]
26+
]
27+
28+
PREVIOUS_ACTIVITIES = [
29+
1030
[
1131
"Batallas matemáticas",
1232
"Gústache desafiar a túa mente? Participa nas nosas batallas matemáticas e demostra o teu talento! Esta actividade conta co apoio das axudas do VEE da UDC.",
@@ -37,30 +57,14 @@ ACTIVITIES = [
3757
"18/09/2025",
3858
"./assets/img/activities/actividad_benvida_udc.png"
3959
],
40-
41-
[
42-
"Charla Egresados GEI",
43-
"Coñece a experiencia de antigos alumnos do Grao en Enxeñaría Informática da FIC. Esta actividade conta co apoio das axudas do VEE da UDC.",
44-
"23/09/2025",
45-
"./assets/img/activities/actividad_egresados_gei.png",
46-
"./assets/img/poster/cartel_egresados_gei.png"
47-
],
48-
49-
[
50-
"Charla Egresados GCED",
51-
"Coñece a experiencia de antigos alumnos do Grao en Ciencia e Enxeñaría de Datos da FIC. Esta actividade conta co apoio das axudas do VEE da UDC.",
52-
"24/09/2025",
53-
"./assets/img/activities/actividad_egresados_gced.png",
54-
"./assets/img/poster/cartel_egresados_gced.png"
55-
]
5660
]
5761

58-
const showActivities = () => {
62+
const showActivities = (activityList, listID) => {
5963

60-
const activities = document.getElementById('activities-list');
64+
const activities = document.getElementById(listID);
6165
if (!activities) return;
6266

63-
ACTIVITIES.forEach(activity => {
67+
activityList.forEach(activity => {
6468
const activityItem = document.createElement('li');
6569

6670
const activityIcon = document.createElement('img');
@@ -101,4 +105,5 @@ const showActivities = () => {
101105
});
102106
};
103107

104-
showActivities();
108+
showActivities(PREVIOUS_ACTIVITIES, 'previous-activities-list');
109+
showActivities(NEXT_ACTIVITIES, 'next-activities-list');

‎site/js/course.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
// Update academic course
2+
const currentYear = new Date().getFullYear();
3+
const currentMonth = new Date().getMonth() + 1; // 1 to 12
4+
const courseRange = (currentMonth >= 9) ? ` ${currentYear}-${currentYear+1}`
5+
: ` ${currentYear-1}-${currentYear}`;
6+
document.getElementById('course').innerText = courseRange;

‎site/js/protect_email.js‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// Protect email
2+
const emailUsername = 'contacto';
3+
const emailDomain = 'dafic.org';
4+
const openEmail = () => {
5+
document.getElementById('email').href = `mailto:${emailUsername}@${emailDomain}`;
6+
}
7+
document.getElementById('email').setAttribute('onclick', 'openEmail();');

‎site/js/script.js‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)