diff --git a/.github/workflows/tag-conflicts.yml b/.github/workflows/tag-conflicts.yml index d024e702c..4fea37c22 100644 --- a/.github/workflows/tag-conflicts.yml +++ b/.github/workflows/tag-conflicts.yml @@ -15,8 +15,8 @@ jobs: - name: check if prs are dirty uses: eps1lon/actions-label-merge-conflict@releases/2.x with: - dirtyLabel: "PR: no se puede revisar, tiene conflictos" - removeOnDirtyLabel: "PR: lista para revisar" + dirtyLabel: "conflictos" + removeOnDirtyLabel: "conflictos" repoToken: "${{ secrets.GITHUB_TOKEN }}" commentOnDirty: "⚠️ Esta Pull Request tiene conflictos. Por favor, resuelvelos antes de que podamos evaluar los cambios." commentOnClean: "✅ ¡Los conflictos han sido resuletos! Un colaborador revisará pronto la Pull Request." diff --git a/.vscode/settings.json b/.vscode/settings.json index a2a6d9838..b2d335d5e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -33,5 +33,6 @@ }, "prettier.documentSelectors": [ "**/*.astro" - ] + ], + "tailwindCSS.classAttributes": ["class", "className", "ngClass", "class:list"] } \ No newline at end of file diff --git a/astro.config.ts b/astro.config.ts index 4e630164a..5473f2802 100644 --- a/astro.config.ts +++ b/astro.config.ts @@ -8,6 +8,9 @@ export default defineConfig({ adapter: vercel({ webAnalytics: { enabled: true }, }), + build: { + inlineStylesheets: "always", + }, output: "hybrid", vite: { build: { diff --git a/package.json b/package.json index 3a0177794..b9344799f 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,7 @@ "eslint-plugin-jsx-a11y": "6.8.0", "husky": "9.0.11", "lightningcss": "1.24.0", + "postcss-nesting": "12.1.0", "prettier": "3.2.5", "prettier-plugin-astro": "0.13.0", "prettier-plugin-tailwindcss": "0.5.12", diff --git a/postcss.config.mjs b/postcss.config.mjs new file mode 100644 index 000000000..47f958c2f --- /dev/null +++ b/postcss.config.mjs @@ -0,0 +1,8 @@ +export default { + plugins: { + "postcss-import": {}, + "tailwindcss/nesting": "postcss-nesting", + "tailwindcss": {}, + "autoprefixer": {}, + }, +} diff --git a/public/favicon.svg b/public/favicon.svg index e09f786f5..38510f802 100644 --- a/public/favicon.svg +++ b/public/favicon.svg @@ -1,9 +1 @@ - - - + \ No newline at end of file diff --git a/public/fonts/atomic.woff2 b/public/fonts/atomic.woff2 index 13ac5939c..7c6e6d1fc 100644 Binary files a/public/fonts/atomic.woff2 and b/public/fonts/atomic.woff2 differ diff --git a/public/og.png b/public/og.png new file mode 100644 index 000000000..1d2328a0c Binary files /dev/null and b/public/og.png differ diff --git a/src/components/Action.astro b/src/components/Action.astro index 288165700..8501306b4 100644 --- a/src/components/Action.astro +++ b/src/components/Action.astro @@ -6,17 +6,15 @@ type Props = Polymorphic<{ as: Tag }> const { as: Tag, class: className, ...props } = Astro.props --- - + + + diff --git a/src/components/Typography.astro b/src/components/Typography.astro index 780bfcf22..84b12e4cf 100644 --- a/src/components/Typography.astro +++ b/src/components/Typography.astro @@ -9,12 +9,14 @@ type Props = Polymorphic<{ const { as: Tag, class: className, variant, color, ...props } = Astro.props -const variantClasses = { +const variantClasses: { [key: string]: string } = { "h2": "text-lg font-medium uppercase lg:text-2xl", "h3": "text-2xl font-semibold uppercase", "atomic-title": "text-5xl font-atomic", "body": "text-xl", "medium": "text-md", + "big": "text-6xl uppercase", + "bigger": "text-4xl sm:text-5xl md:text-7xl uppercase", } const colorClasses = { diff --git a/src/consts/boxers.ts b/src/consts/boxers.ts index 566a17f01..da2c6d4ea 100644 --- a/src/consts/boxers.ts +++ b/src/consts/boxers.ts @@ -1,178 +1,209 @@ -export const BOXERS = [ +type Boxer = { + id: string; + name: string; + age: number; + weight: number; + height: number; + country: string; +}; + +export const BOXERS: Boxer[]= [ { id: "el-mariana", name: "El Mariana", - age: 28, - weight: 90, + realName: "Osvaldo Palacios Flores", + age: 25, + weight: 87, height: 1.95, country: "mx", }, { id: "plex", name: "YoSoyPlex", - age: 19, - weight: 85, - height: 1.85, - country: "es", - }, - { - id: "el-mariana", - name: "El Mariana", + realName: "Daniel Alonso Góndez", age: 22, - weight: 90, - height: 1.95, - country: "mx", + weight: 70, + height: 1.97, + country: "es", }, { - id: "plex", - name: "Yo Soy Plex", - age: 19, - weight: 85, - height: 1.85, + id: "sezar-blue", + name: "Sezar Blue", + realName: "César González", + age: 50, + weight: 87, + height: 1.77, country: "es", }, { - id: "el-mariana", - name: "El Mariana", - age: 22, - weight: 90, - height: 1.95, - country: "mx", + id: "will", + name: "Will", + realName: "Ángelo Valdés", + age: 23, + weight: 85, // No encontrado + height: 1.85, // No encontrado + country: "do", }, { - id: "plex", - name: "Yo Soy Plex", - age: 19, - weight: 85, - height: 1.85, + id: "peldanyos", + name: "Peldanyos", + realName: "Sergio Bolaños", + age: 25, + weight: 87, // No encontrado + height: 1.91, // No es seguro country: "es", }, { - id: "el-mariana", - name: "El Mariana", - age: 22, - weight: 90, - height: 1.95, + id: "aldo-geo", + name: "Aldo Geo", + realName: "Aldo Geovanni", + age: 27, + weight: 80, // No encontrado + height: 1.79, country: "mx", }, { - id: "plex", - name: "Yo Soy Plex", - age: 19, - weight: 85, - height: 1.85, - country: "es", + id: "pelicanger", + name: "Pelicanger", + realName: "Angerson Esneider", + age: 23, + weight: 85, // No es seguro + height: 1.91, + country: "co", }, { - id: "el-mariana", - name: "El Mariana", - age: 22, - weight: 90, - height: 1.95, + id: "roberto-cein", + name: "RobertoCein", + realName: "Roberto Sebastián Guadarrama Jiménez", + age: 25, + weight: 85, // No encontrado + height: 1.69, // No es seguro country: "mx", }, { - id: "plex", - name: "Yo Soy Plex", - age: 19, - weight: 85, - height: 1.85, + id: "unicornio", + name: "Unicornio", + realName: "Germán Usinger", + age: 24, + weight: 75, // No encontrado + height: 1.69, // No es seguro + country: "ar", + }, + { + id: "karchez", + name: "Karchez", + realName: "José Carlos Sánchez", + age: 23, + weight: 85, // No encontrado + height: 1.84, country: "es", }, { - id: "el-mariana", - name: "El Mariana", - age: 22, - weight: 90, - height: 1.95, - country: "mx", + id: "skain", + name: "Skain", + realName: "David Carbó Ferrer", + age: 27, + weight: 83, // No encontrado + height: 1.83, // No encontrado + country: "es", }, { - id: "plex", - name: "Yo Soy Plex", - age: 19, - weight: 85, - height: 1.85, + id: "folagor", + name: "Folagor", + realName: "Yoel Ramírez Pulido", + age: 29, + weight: 71, + height: 1.80, country: "es", }, { - id: "el-mariana", - name: "El Mariana", - age: 22, - weight: 90, - height: 1.95, - country: "mx", + id: "shelao", + name: "Shelao", + realName: "Cristóbal Andrés Álvarez Leiva", + age: 33, + weight: 93, + height: 1.88, + country: "cl", }, { - id: "plex", - name: "Yo Soy Plex", - age: 19, + id: "viruzz", + name: "Viruzz", + realName: "Víctor Mélida Cambra", + age: 31, weight: 85, - height: 1.85, + height: 1.82, country: "es", }, { - id: "el-mariana", - name: "El Mariana", - age: 22, - weight: 90, - height: 1.95, + id: "ama-blitz", + name: "Ama Blitz", + realName: "Amairani Garza Alonso", + age: 29, // No es seguro + weight: 55, // No es seguro + height: 1.58, country: "mx", }, { - id: "plex", - name: "Yo Soy Plex", - age: 19, - weight: 85, - height: 1.85, - country: "es", + id: "alana", + name: "Alana", + realName: "Alana Flores", + age: 23, + weight: 55, + height: 1.70, + country: "mx", }, { - id: "el-mariana", - name: "El Mariana", - age: 22, - weight: 90, - height: 1.95, - country: "mx", + id: "zeling", + name: "Zeling", + realName: "Alicia González", + age: 28, + weight: 65, // No encontrado + height: 1.70, // No es seguro + country: "es", }, { - id: "plex", - name: "Yo Soy Plex", - age: 19, - weight: 85, - height: 1.85, + id: "nissaxter", + name: "Nissaxter", + realName: "Cristina Magadán", + age: 29, + weight: 55, // No es seguro + height: 1.64, country: "es", }, { - id: "el-mariana", - name: "El Mariana", - age: 22, - weight: 90, - height: 1.95, - country: "mx", + id: "la-cobra", + name: "La Cobra", + realName: "Lautaro Damián del Campo", + age: 26, + weight: 105, + height: 1.83, + country: "ar", }, { - id: "plex", - name: "Yo Soy Plex", - age: 19, + id: "guanyar", + name: "Guanyar", + realName: "Diego Iglesias", + age: 25, weight: 85, - height: 1.85, + height: 1.88, country: "es", }, { - id: "el-mariana", - name: "El Mariana", - age: 22, - weight: 90, - height: 1.95, - country: "mx", + id: "agustin-51", + name: "Agustin51", + realName: "José Agustín Peréz Nuñéz", + age: 23, + weight: 62, // No es seguro + height: 1.70, + country: "es", }, { - id: "plex", - name: "Yo Soy Plex", - age: 19, - weight: 85, - height: 1.85, - country: "es", + id: "carrera", + name: "Carreraaa", + realName: "Rodrigo Ezequiel Carrera", + age: 23, + weight: 61, + height: 1.65, + country: "ar", }, ] as const diff --git a/src/consts/countries.ts b/src/consts/countries.ts index be44f617f..050ee2f42 100644 --- a/src/consts/countries.ts +++ b/src/consts/countries.ts @@ -5,4 +5,16 @@ export const COUNTRIES: Record = { es: { name: "España", }, + do: { + name: "República Dominicana", + }, + ar: { + name: "Argentina", + }, + co: { + name: "Colombia", + }, + cl: { + name: "Chile", + }, } as const diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro index de07ca3fb..765da60a8 100644 --- a/src/layouts/Layout.astro +++ b/src/layouts/Layout.astro @@ -1,9 +1,11 @@ --- +import "@fontsource-variable/jost" import jost from "@fontsource-variable/jost/files/jost-latin-wght-normal.woff2" + import ButtonUp from "@/components/ButtonUp.astro" import LightsBackground from "@/components/LightsBackground.astro" import NoiseBackground from "@/components/NoiseBackground.astro" -import "@fontsource-variable/jost" +import SEO from "@/components/SEO.astro" interface Props { description: string @@ -16,38 +18,7 @@ const { title, description } = Astro.props - {title} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - diff --git a/src/pages/404.astro b/src/pages/404.astro index c2140d4a8..2e2309556 100644 --- a/src/pages/404.astro +++ b/src/pages/404.astro @@ -8,8 +8,12 @@ import Footer from "@/sections/Footer.astro" description="Web Oficial de La Velada del Año IV, evento de boxeo entre streamers y creadores de contenido, organizado por Ibai Llanos" title="La Velada del Año 4 - Página no encontrada" > -
- -
+
+ +