Skip to content

Commit f570578

Browse files
pablodiegosspablodiegoss
committed
Merge branch 'develop'
2 parents b663375 + f4d5b6c commit f570578

3 files changed

Lines changed: 35 additions & 37 deletions

File tree

‎src/core/jinja2/core/ME/hotsite.html‎

Lines changed: 28 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<!-- Google tag (gtag.js) -->
55
<script async src="https://www.googletagmanager.com/gtag/js?id=G-N598EKHDGJ"></script>
66
<script>
7-
window.dataLayer = window.dataLayer || [];
8-
function gtag(){dataLayer.push(arguments);}
7+
globalThis.dataLayer = globalThis.dataLayer || [];
8+
function gtag(){globalThis.dataLayer.push(arguments);}
99
gtag('js', new Date());
1010

1111
gtag('config', 'G-N598EKHDGJ');
@@ -18,7 +18,7 @@
1818
<!-- Font Inter -->
1919
<link href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700&display=swap" rel="stylesheet">
2020
<!-- Font Awesome CDN for social media icons (Atualizado para 6.5.2 para suportar o ícone X-Twitter) -->
21-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.2/css/all.min.css">
21+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.2/css/all.min.css" integrity="sha384-PPIZEGYM1v8zp5Py7UjFb79S58UeqCL9pYVnVPURKEqvioPROaVAJKKLzvH2rDnI" crossorigin="anonymous">
2222
<style>
2323
body {
2424
font-family: 'Inter', sans-serif;
@@ -127,7 +127,7 @@
127127
<div class="bg-white p-6 rounded-lg shadow-md hover:shadow-xl transition-all duration-300 border border-gray-200 flex flex-col h-full hover:-translate-y-1">
128128
<h2 class="text-2xl font-semibold mb-4 text-[#08B59F]" data-translate="home_box2_title">Álbum Interativo</h2>
129129
<img src="{{ static('images/icons/me/JANDIGME_HOTSITE ALTA5.png') }}"
130-
alt="Imagem: Álbum Interativo"
130+
alt="Álbum Interativo"
131131
class="w-full h-48 object-cover rounded-lg mb-4 shadow-sm"
132132
>
133133
<p class="text-gray-700 mb-6 flex-grow" data-translate="home_box2_p">
@@ -142,7 +142,7 @@ <h2 class="text-2xl font-semibold mb-4 text-[#08B59F]" data-translate="home_box2
142142
<div class="bg-white p-6 rounded-lg shadow-md hover:shadow-xl transition-all duration-300 border border-gray-200 flex flex-col h-full hover:-translate-y-1">
143143
<h2 class="text-2xl font-semibold mb-4 text-[#08B59F]" data-translate="home_box1_title">Exposição</h2>
144144
<img src="{{ static('images/icons/me/JANDIGME_HOTSITE ALTA.png') }}"
145-
alt="Imagem: Exposição"
145+
alt="Exposição"
146146
class="w-full h-48 object-cover rounded-lg mb-4 shadow-sm"
147147
>
148148
<p class="text-gray-700 mb-6 flex-grow" data-translate="home_box1_p">
@@ -156,7 +156,7 @@ <h2 class="text-2xl font-semibold mb-4 text-[#08B59F]" data-translate="home_box1
156156
<!-- QUEM SOMOS Box -->
157157
<div class="bg-white p-6 rounded-lg shadow-md hover:shadow-xl transition-all duration-300 border border-gray-200 lg:col-span-1 md:col-span-2 flex flex-col h-full hover:-translate-y-1">
158158
<h2 class="text-2xl font-semibold mb-4 text-[#08B59F]" data-translate="home_box3_title">Quem Somos</h2>
159-
<img src="{{ static('images/icons/me/JANDIGME_HOTSITE ALTA7.png') }}" alt="Imagem: Quem Somos" class="w-full h-48 object-cover rounded-lg mb-4 shadow-sm">
159+
<img src="{{ static('images/icons/me/JANDIGME_HOTSITE ALTA7.png') }}" alt="Quem Somos" class="w-full h-48 object-cover rounded-lg mb-4 shadow-sm">
160160
<p class="text-gray-700 mb-6 flex-grow" data-translate="home_box3_p">
161161
Conheça nossa equipe e todo o projeto Jandig.
162162
</p>
@@ -213,7 +213,6 @@ <h2 class="text-3xl font-bold text-left mt-12 mb-8 text-[#08B59F]" data-translat
213213
class="absolute top-0 left-0 w-full h-full"
214214
src="https://www.youtube.com/embed/Oou7uE2XeRo?si=aXKp_PGwZ_Rh_Z8K"
215215
title="YouTube video player"
216-
frameborder="0"
217216
allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
218217
referrerpolicy="strict-origin-when-cross-origin"
219218
allowfullscreen
@@ -246,7 +245,7 @@ <h2 class="text-3xl font-bold text-left mt-12 mb-8 text-[#08B59F]" data-translat
246245
<h1 class="text-4xl font-extrabold text-left mb-8 text-[#08B59F]" data-translate="album_title">Álbum Interativo</h1>
247246
<div class="w-full mb-8 rounded-lg shadow-lg overflow-hidden">
248247
<img src="{{ static('images/icons/me/JANDIGME_HOTSITE ALTA8.png') }}"
249-
alt="Imagem: Álbum de Figurinhas"
248+
alt="Álbum de Figurinhas"
250249
class="w-full h-auto md:h-80 object-cover"
251250
>
252251
</div>
@@ -268,17 +267,17 @@ <h1 class="text-4xl font-extrabold text-left mb-8 text-[#08B59F]" data-translate
268267
<li data-translate="album_intro4_l3">▶️ Aula 3: Um passo a passo de como publicar os seus próprios conteúdos educacionais no ecossistema da Jandig.</li>
269268
<li data-translate="album_intro4_l4">▶️ Aula 4: Estratégias para expandir a experiência e transformar seus alunos em co-criadores de narrativas em Realidade Estendida.</li>
270269
</ul>
271-
<!-- <div class="video-container" style="position: relative;padding-bottom: 56.25%;height: 0;"> -->
270+
272271
<iframe width="560"
273272
height="315"
274273
referrerpolicy='strict-origin-when-cross-origin'
275274
src="https://www.youtube.com/embed/videoseries?si=ee6-7n2NkqeKJ8TY&amp;list=PLnqMPRm2VJBg1CR8j6nhCspJgeEAKKM1O"
276-
frameborder="0";
275+
title="Curso de Realidade Estendida (XR) aplicada à educação"
277276
style="margin: auto; margin-bottom: 40px;"
278277
allow="autoplay; gyroscope; picture-in-picture"
279278
allowfullscreen>
280279
</iframe>
281-
<!-- </div> -->
280+
282281
<h2 class="text-3xl font-bold text-left mb-8 text-[#08B59F] border-b pb-4" data-translate="album_downloads_title">DOWNLOADS</h2>
283282
<div class="grid grid-cols-1 md:grid-cols-2 gap-8">
284283
<!-- Álbum de Figurinhas -->
@@ -347,16 +346,16 @@ <h1 class="text-4xl font-extrabold text-left mb-8 text-[#08B59F]" data-translate
347346
</p>
348347
</div>
349348
<h2 class="text-4xl font-extrabold text-left mb-8 text-[#08B59F]" data-translate="oficina_title2">Algumas fotos da oficina</h2>
350-
<img src="{{ static('images/icons/me/oficina_me_1.jpg') }}"
349+
<img alt="Oficina ME 1" src="{{ static('images/icons/me/oficina_me_1.jpg') }}"
351350
class="w-full h-auto max-h-96 object-contain mx-auto"
352351
>
353-
<img src="{{ static('images/icons/me/oficina_me_2.jpg') }}"
352+
<img alt="Oficina ME 2" src="{{ static('images/icons/me/oficina_me_2.jpg') }}"
354353
class="w-full h-auto max-h-96 object-contain mx-auto"
355354
>
356-
<img src="{{ static('images/icons/me/oficina_me_3.jpg') }}"
355+
<img alt="Oficina ME 3" src="{{ static('images/icons/me/oficina_me_3.jpg') }}"
357356
class="w-full h-auto max-h-96 object-contain mx-auto"
358357
>
359-
<img src="{{ static('images/icons/me/oficina_me_5.jpg') }}"
358+
<img alt="Oficina ME 5" src="{{ static('images/icons/me/oficina_me_5.jpg') }}"
360359
class="w-full h-auto max-h-96 object-contain mx-auto"
361360
>
362361
</section>
@@ -370,7 +369,6 @@ <h3 class="text-2xl font-bold text-left mb-8 text-[#08B59F]" data-translate="mak
370369
class="absolute top-0 left-0 w-full h-full"
371370
src="https://www.youtube.com/embed/PY3vV_Vy0aQ?si=IhEw3D7KP2rKwiii"
372371
title="YouTube video player"
373-
frameborder="0"
374372
allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
375373
referrerpolicy="strict-origin-when-cross-origin"
376374
allowfullscreen
@@ -410,19 +408,19 @@ <h2 class="text-3xl font-bold text-left mb-6 text-gray-800" data-translate="exhi
410408
</div>
411409
</div>
412410
<h2 class="text-4xl font-extrabold text-left mb-8 mt-10 text-[#08B59F]" data-translate="exhibition_title2">Algumas fotos da exposição</h2>
413-
<img src="{{ static('images/icons/me/abertura_me_1.jpg') }}"
411+
<img alt="Abertura ME 1" src="{{ static('images/icons/me/abertura_me_1.jpg') }}"
414412
class="w-full h-auto max-h-96 object-contain mx-auto"
415413
>
416-
<img src="{{ static('images/icons/me/abertura_me_7.jpg') }}"
414+
<img alt="Abertura ME 7" src="{{ static('images/icons/me/abertura_me_7.jpg') }}"
417415
class="w-full h-auto max-h-96 object-contain mx-auto"
418416
>
419-
<img src="{{ static('images/icons/me/abertura_me_8.jpg') }}"
417+
<img alt="Abertura ME 8" src="{{ static('images/icons/me/abertura_me_8.jpg') }}"
420418
class="w-full h-auto max-h-96 object-contain mx-auto"
421419
>
422-
<img src="{{ static('images/icons/me/abertura_me_9.jpg') }}"
420+
<img alt="Abertura ME 9" src="{{ static('images/icons/me/abertura_me_9.jpg') }}"
423421
class="w-full h-auto max-h-96 object-contain mx-auto"
424422
>
425-
<img src="{{ static('images/icons/me/abertura_me_10.jpg') }}"
423+
<img alt="Abertura ME 10" src="{{ static('images/icons/me/abertura_me_10.jpg') }}"
426424
class="w-full h-auto max-h-96 object-contain mx-auto"
427425
>
428426

@@ -484,7 +482,7 @@ <h2 class="text-2xl font-semibold mb-6 text-[#08B59F]" data-translate="contact_f
484482
<!-- Fomento -->
485483
<div class="flex flex-col items-center">
486484
<p class="font-semibold text-gray-500 text-sm mb-3 uppercase tracking-wider" data-translate="footer_fomento">Fomento</p>
487-
<img src="{{ static('images/icons/me/logos_proac/proac.png') }}" alt="Logo PROAC" class="h-12 object-contain" onerror="this.onerror=null;this.src='https://placehold.co/200x90/e0e0e0/333333?text=Logo+PROAC';">
485+
<img src="{{ static('images/icons/me/logos_proac/proac.png') }}" alt="Logo PROAC" class="h-12 object-contain">
488486
</div>
489487
<!-- Produção -->
490488
<div class="flex flex-col items-center">
@@ -506,12 +504,12 @@ <h2 class="text-2xl font-semibold mb-6 text-[#08B59F]" data-translate="contact_f
506504
<div class="flex flex-col items-center">
507505
<p class="font-semibold text-gray-500 text-sm mb-3 uppercase tracking-wider" data-translate="footer_realizacao">Realização</p>
508506
<div class="flex flex-wrap justify-center gap-4 items-center">
509-
<img src="{{ static('images/icons/me/logos_proac/_preto.png') }}" alt="Logo CultSP" class="h-10 object-contain" onerror="this.onerror=null;this.src='https://placehold.co/200x90/e0e0e0/333333?text=Logo+CultSP';">
510-
<img src="{{ static('images/icons/me/logos_proac/4-vertical-slogan.png') }}" alt="Logo Secretaria" class="h-10 object-contain" onerror="this.onerror=null;this.src='https://placehold.co/250x100/e0e0e0/333333?text=Logo+Secretaria';">
511-
<img src="{{ static('images/icons/me/logos_proac/rgb-vertical_preferencial.png') }}" alt="Logo Aldir Blanc" class="h-10 object-contain" onerror="this.onerror=null;this.src='https://placehold.co/250x100/e0e0e0/333333?text=Logo+Secretaria';">
512-
<img src="{{ static('images/icons/me/snc.png') }}" alt="Logo SNC" class="h-10 object-contain" onerror="this.onerror=null;this.src='https://placehold.co/250x100/e0e0e0/333333?text=Logo+Secretaria';">
507+
<img src="{{ static('images/icons/me/logos_proac/_preto.png') }}" alt="Logo CultSP" class="h-10 object-contain">
508+
<img src="{{ static('images/icons/me/logos_proac/4-vertical-slogan.png') }}" alt="Logo Secretaria" class="h-10 object-contain">
509+
<img src="{{ static('images/icons/me/logos_proac/rgb-vertical_preferencial.png') }}" alt="Logo Aldir Blanc" class="h-10 object-contain">
510+
<img src="{{ static('images/icons/me/snc.png') }}" alt="Logo SNC" class="h-10 object-contain">
513511
<div class="hidden md:block h-8 w-px bg-gray-300"></div>
514-
<img src="{{ static('images/icons/me/logos_proac/logofederal.png') }}" alt="Logo Federal" class="h-10 object-contain" onerror="this.onerror=null;this.src='https://placehold.co/250x100/e0e0e0/333333?text=Logo+Secretaria';">
512+
<img src="{{ static('images/icons/me/logos_proac/logofederal.png') }}" alt="Logo Federal" class="h-10 object-contain">
515513
</div>
516514
</div>
517515
</div>
@@ -1136,15 +1134,15 @@ <h2 class="text-2xl font-semibold mb-6 text-[#08B59F]" data-translate="contact_f
11361134
document.documentElement.lang = lang;
11371135
const elements = document.querySelectorAll('[data-translate]');
11381136
elements.forEach(el => {
1139-
const key = el.getAttribute('data-translate');
1137+
const key = el.dataset.translate;
11401138
if (translations[lang] && translations[lang][key]) {
11411139
el.innerHTML = translations[lang][key];
11421140
}
11431141
});
11441142

11451143
const placeholderElements = document.querySelectorAll('[data-translate-placeholder]');
11461144
placeholderElements.forEach(el => {
1147-
const key = el.getAttribute('data-translate-placeholder');
1145+
const key = el.dataset.translatePlaceholder;
11481146
if (translations[lang] && translations[lang][key]) {
11491147
el.placeholder = translations[lang][key];
11501148
}
@@ -1160,7 +1158,7 @@ <h2 class="text-2xl font-semibold mb-6 text-[#08B59F]" data-translate="contact_f
11601158
handleRouting();
11611159

11621160
// Listen for browser back/forward buttons
1163-
window.addEventListener('popstate', handleRouting);
1161+
globalThis.addEventListener('popstate', handleRouting);
11641162

11651163
// Initialize language
11661164
changeLanguage('pt');

‎src/core/jinja2/core/sw.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
importScripts('https://storage.googleapis.com/workbox-cdn/releases/3.6.1/workbox-sw.js');
1+
importScripts('https://storage.googleapis.com/workbox-cdn/releases/7.4.1/workbox-sw.js');
22

33
// Activate the new SW immediately so existing users stop being served
44
// HTML from the old "cache everything" version (see #506).
@@ -20,22 +20,22 @@ if (workbox) {
2020

2121
workbox.routing.registerRoute(
2222
/.*\.(?:png|jpg|jpeg|svg|gif|patt|webp|ico)$/,
23-
workbox.strategies.networkFirst()
23+
new workbox.strategies.NetworkFirst()
2424
);
2525

2626
workbox.routing.registerRoute(
2727
/.*\.(?:js|css)$/,
28-
workbox.strategies.networkFirst()
28+
new workbox.strategies.NetworkFirst()
2929
);
3030

3131
workbox.routing.registerRoute(
3232
/.*\.(?:woff|woff2|ttf|eot|otf)$/,
33-
workbox.strategies.cacheFirst()
33+
new workbox.strategies.CacheFirst()
3434
);
3535

3636
workbox.routing.registerRoute(
37-
'https://storage.googleapis.com/workbox-cdn/releases/3.6.1/workbox-sw.js',
38-
workbox.strategies.networkFirst()
37+
'https://storage.googleapis.com/workbox-cdn/releases/7.4.1/workbox-sw.js',
38+
new workbox.strategies.NetworkFirst()
3939
);
4040

4141
} else {

‎src/core/urls.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
path("manifest.json", manifest, name="manifest"),
7373
path("i18n/", include("django.conf.urls.i18n")),
7474
re_path(
75-
r"^see_all(?:/(?P<which>[a-zA-Z]+))?/$",
75+
r"^see_all(?:/(?P<which>[a-zA-Z-]+))?/$",
7676
see_all,
7777
name="see_all",
7878
),

0 commit comments

Comments
 (0)