Skip to content
Merged
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div align="center">
<img src="./src/assets/images/webp/favicon.webp"/>
<img src="./public/images/webp/favicon.webp"/>
<h1>RustLings-Web</h1>
</div>

Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
6 changes: 2 additions & 4 deletions src/components/CookieBanner.astro
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
---
import { Image } from "astro:assets"
import ferrisCooking from "~/assets/images/webp/ferris_cooking.jpg"

import { defaultLang, ui } from "~/i18n/ui"

Expand All @@ -21,8 +19,8 @@ const projectId = import.meta.env.VITE_CLARITY_PROJECT_ID
class="w-full max-w-2xl max-h-[90vh] bg-editor-bg border border-stroke-color rounded-xl shadow-2xl overflow-hidden grid grid-cols-1 md:grid-cols-2"
>
<div class="relative aspect-4/3 md:aspect-auto">
<Image
src={ferrisCooking}
<img
src="/images/webp/ferris_cooking.jpg"
alt={t("cookie.banner.img.alt")}
class="absolute inset-0 w-full h-full object-cover"
/>
Expand Down
6 changes: 0 additions & 6 deletions src/features/home/components/Hero.astro
Original file line number Diff line number Diff line change
Expand Up @@ -146,12 +146,6 @@ const t = useTranslations(lang)
))}
</div>
</div>

<!-- Scroll indicator -->
<div class="absolute bottom-8 left-1/2 -translate-x-1/2 flex flex-col items-center gap-1.5 text-secondary/20">
<span class="text-xs tracking-widest uppercase font-medium">{t("hero.scroll")}</span>
<div class="w-px h-8 bg-linear-to-b from-secondary/20 to-transparent"></div>
</div>
</Section>

<script>
Expand Down
6 changes: 2 additions & 4 deletions src/features/home/components/Playground.astro
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
---
import { Image } from "astro:assets"
import ferrisImage from "~/assets/images/webp/ferris.webp"
import Section from "~/components/sections/Section.astro"
import { getLangFromUrl, useTranslations } from "~/i18n/utils"
import IconCheck from "~icons/tabler/check"
Expand Down Expand Up @@ -80,9 +78,9 @@ const t = useTranslations(lang)

<!-- Features side -->
<div class="w-full lg:w-2/5 flex flex-col items-center lg:items-start gap-8">
<Image
<img
class="w-28 h-auto"
src={ferrisImage}
src="/images/webp/ferris.webp"
alt={t("playground.ferris_alt")}
/>

Expand Down
3 changes: 1 addition & 2 deletions src/layouts/Layout.astro
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { ClientRouter } from "astro:transitions"
import "~/styles/global.css"
import "sweetalert2/dist/sweetalert2.min.css"
import "driver.js/dist/driver.css"
import favicon from "~/assets/images/webp/favicon.webp"
import CookieBanner from "~/components/CookieBanner.astro"
import { getLangFromUrl } from "~/i18n/utils"

Expand All @@ -20,7 +19,7 @@ const lang = Astro.locals.lang ?? getLangFromUrl(Astro.url)
<head>
<meta charset="UTF-8" />
<title>{title}</title>
<link rel="icon" type="image/webp" href={favicon.src} />
<link rel="icon" type="image/webp" href="/images/webp/favicon.webp" />
<meta name="description" content={description} />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<ClientRouter />
Expand Down
6 changes: 2 additions & 4 deletions src/pages/404.astro
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
---
import { Image } from "astro:assets"
//import img404 from "~/assets/images/webp/404_image.png"
import { getLangFromUrl, useTranslations } from "~/i18n/utils"
import Layout from "~/layouts/Layout.astro"
import IconLeft from "~icons/tabler/arrow-big-left-lines-filled"
Expand All @@ -15,8 +13,8 @@ const t = useTranslations(lang)
<main class="flex-1 flex flex-col items-center justify-center px-4 gap-8">
<!-- Temporally disabled (corrupted image) -->
<!--
<Image
src={img404}
<img
src="/images/webp/404_image.png"
alt={t("404.image_alt")}
class="w-full max-w-lg h-auto select-none pointer-events-none"
/>
Expand Down
5 changes: 1 addition & 4 deletions src/pages/[lang]/certificado/[trackId].astro
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---
import logoSvgUrl from "~/assets/Rust_Lang_ES_Logo_Blanco_color.svg?url"
import { tracks } from "~/const/tracks"
import { getLangFromUrl, useTranslations } from "~/i18n/utils"
import Layout from "~/layouts/Layout.astro"
Expand All @@ -16,6 +15,7 @@ export function getStaticPaths() {
])
}

const logoSvgUrl = "/Rust_Lang_ES_Logo_Blanco_color.svg"
const { track } = Astro.props
const lang = getLangFromUrl(Astro.url)
const t = useTranslations(lang)
Expand Down Expand Up @@ -135,10 +135,7 @@ const t = useTranslations(lang)
data-badge-certification={t("certificate.badge_certification")}
data-track-title={t(track.title)}
data-track-id={track.id}
<<<<<<< Updated upstream
=======
data-lang={lang}
>>>>>>> Stashed changes
></canvas>

<button
Expand Down
2 changes: 1 addition & 1 deletion src/pages/[lang]/verificar/[certId].astro
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
---
import logoSvgUrl from "~/assets/Rust_Lang_ES_Logo_Blanco_color.svg?url"
import { tracks } from "~/const/tracks"
import { getLangFromUrl, useTranslations } from "~/i18n/utils"
import Layout from "~/layouts/Layout.astro"
import IconLeft from "~icons/tabler/arrow-big-left-lines-filled"
import IconCertificate from "~icons/tabler/certificate"

const logoSvgUrl = "/Rust_Lang_ES_Logo_Blanco_color.svg"
const { certId } = Astro.params
const { DB } = Astro.locals.runtime.env
const lang = getLangFromUrl(Astro.url)
Expand Down
Loading