Skip to content

Commit

Permalink
Merge branch 'main' into twitch-login
Browse files Browse the repository at this point in the history
  • Loading branch information
midudev authored May 13, 2024
2 parents 6262b28 + 854813d commit b86c41d
Show file tree
Hide file tree
Showing 235 changed files with 1,640 additions and 1,306 deletions.
97 changes: 97 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
name: Reportar problema
description: Reporta un problema
title: "[Bug]: "
labels: ["bug"]
body:
- type: markdown
attributes:
value: "# Pre-requisitos"
- type: checkboxes
id: pre-requisitos
attributes:
label: Señala los requisitos cumplidos
description: |
Asegúrate de cumplir estos requisitos antes de reportar un problema
options:
- label: Estoy corriendo la última versión.
required: true
- label: |
He revisado si ya hay un issue creado con características similares.
required: true
- type: markdown
attributes:
value: "# Comportamiento"
- type: textarea
id: comportamiento-esperado
attributes:
label: Comportamiento esperado
description: Describe el comportamiento esperado de la issue
placeholder: Esta feature debería hacer ...
- type: textarea
id: comportamiento-actual
attributes:
label: Comportamiento actual
description: Describe el comportamiento actual de la issue
placeholder: Esta feature hace ...
- type: markdown
attributes:
value: "# Información"
- type: textarea
id: informacion-bug
attributes:
label: Información del bug
description: Aporta información sobre el bug
placeholder: Este bug ocurre cuando ...
- type: textarea
id: pasos-reproducir
attributes:
label: Pasos para reproducirlo
description: Pasos necesarios para reproducir el bug
placeholder: |
1. Paso1
2. Paso2
- type: markdown
attributes:
value: "# Contexto"
- type: dropdown
id: navegadores
attributes:
label: ¿En qué navegadores encuentras el problema?
multiple: true
options:
- Firefox
- Chrome
- Safari
- Microsoft Edge
- Opera
- Todos los navegadores
- type: input
id: version-navegador
attributes:
label: Versión del navegador
description: Versión del navegador en el cuál encuentras el problema
placeholder: Chrome v124.0.6367.92 ...
- type: dropdown
id: sistema-operativo
attributes:
label: Sistema operativo
description: Sistema operativo en el cuál encuentras el problema
multiple: true
options:
- Windows
- MacOS
- Linux
- Android
- Todos los sistemas
- type: markdown
attributes:
value: "# Información adicional"
- type: textarea
attributes:
label: Añade información adicional si fuese necesario
description: Imágenes, link del código, fragmento de código ...
placeholder: |
```typescript
const variable = "..."
```
...
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Propuesta de mejora
description: Sugerir una mejora o feature para el proyecto
title: "[Feat]: "
labels: ["enhancement"]
body:
- type: markdown
attributes:
value: "## Pre-requisitos"
- type: markdown
attributes:
value: |
Antes de sugerir una feature, busca [features existentes](https://github.com/midudev/la-velada-web-oficial/issues)
- type: textarea
attributes:
label: Descripción
description: Descripción de la feature que quieres que se añada
placeholder: |
Estaría bien que el proyecto tuviese ...
validations:
required: true
38 changes: 0 additions & 38 deletions .github/issue_template.md

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/tag-conflicts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ jobs:
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."
commentOnDirty: "⚠️ Esta Pull Request tiene conflictos. Por favor, resuélvelos antes de que podamos evaluar los cambios."
commentOnClean: "✅ ¡Los conflictos han sido resueltos! Un colaborador revisará pronto la Pull Request."
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,9 @@ yarn.lock
.vercel/

.env
.env.local
.env.local

.config/*

local-images/*
src/middleware.tsall
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18
v18.20.2
55 changes: 34 additions & 21 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
[![Issues][issues-shield]][issues-url]

<a href="https://github.com/midudev/la-velada-web-oficial">
<img width="300px" src="./public/img/drawn-x-logo.webp" alt="Logo" width="800" />
<img width="300px" src="https://cdn.lavelada.dev/drawn-x-logo.webp" alt="Logo" width="800" />
</a>

## Web oficial de La Velada IV
Expand All @@ -23,7 +23,7 @@ La Velada IV es una competición de boxeo que enfrenta a streamers, creadores de

- [Web oficial de La Velada IV](#web-oficial-de-la-velada-iv)
- [Características principales](#características-principales)
- [Capturas de pantalla de la web de La Velada IV:](#capturas-de-pantalla-de-la-web-de-la-velada-iv)
- [Capturas de pantalla de la web de La Velada IV](#capturas-de-pantalla-de-la-web-de-la-velada-iv)
- [Para empezar](#para-empezar)
- [Prerequisitos](#prerequisitos)
- [Instalación](#instalación)
Expand Down Expand Up @@ -57,12 +57,13 @@ La Velada IV es una competición de boxeo que enfrenta a streamers, creadores de
# o
nvm use <version>
```
> Si quieres automatizar el proceso, puedes crear un script siguiendo la [documentación oficial](https://github.com/nvm-sh/nvm?tab=readme-ov-file#calling-nvm-use-automatically-in-a-directory-with-a-nvmrc-file)

> Si quieres automatizar el proceso, puedes crear un script siguiendo la [documentación oficial](https://github.com/nvm-sh/nvm?tab=readme-ov-file#calling-nvm-use-automatically-in-a-directory-with-a-nvmrc-file)
<details>
<summary>Pequeño script de automatización</summary>

- For Linux/MacOS:
- En Linux/MacOS:
```sh
# .bashrc | .zshrc | cualquier archivo de configuración
# pequeño script para cambiar de version al entrar al directorio
Expand All @@ -76,21 +77,23 @@ La Velada IV es una competición de boxeo que enfrenta a streamers, creadores de
}
```

- For Windows:
```powershell
# $PROFILE
function Change-Node-Version {
param($path)
& Set-Location $path
$pwd = pwd
if ( Test-Path "$pwd\\.nvmrc" ) {
$version = Get-Content .nvmrc
nvm use $version
}
}
New-Alias -Name cd -Value Change-Node-Version -Force -Option AllScope
```
</details>
- En Windows:

```powershell
# $PROFILE
function Change-Node-Version {
param($path)
& Set-Location $path
$pwd = pwd
if ( Test-Path "$pwd\\.nvmrc" ) {
$version = Get-Content .nvmrc
nvm use $version
}
}
New-Alias -Name cd -Value Change-Node-Version -Force -Option AllScope
```

</details>

- PNPM (es nuestra recomendación por su eficiencia y rapidez)

Expand Down Expand Up @@ -119,10 +122,20 @@ La Velada IV es una competición de boxeo que enfrenta a streamers, creadores de
```

3. Ejecuta el proyecto

- Base de datos remota (necesario linkear con proyecto de Astro Studio)
```sh
pnpm run dev
```
- Base de datos local
```sh
pnpm run start
```

4. Autenticación mediante twitch (opcional)
- Accede a la [consola de twitch](https://dev.twitch.tv/), crea un proyecto y obtén tu client id y client secret
- Genera un hash aleatorio, puedes usar el siguiente comando ```openssl rand -hex 32```
- Crea un archivo llamado ```.env.local``` y copia el contenido de [.env.demo](.env.demo) en él
- Reemplaza el texto copiado de demo en ```.env.local``` con tu id, secreto y hash

<p align="right">(<a href="#readme-top">volver arriba</a>)</p>

Expand Down Expand Up @@ -152,7 +165,7 @@ Si quieres contribuir de una manera mas sencilla, puedes iniciar este proyecto d

**¡Gracias a todos los colaboradores que han hecho posible este proyecto!**

[![Contribuidores](https://contrib.rocks/image?repo=midudev/la-velada-web-oficial)](https://github.com/midudev/la-velada-web-oficial/graphs/contributors)
[![Contribuidores](https://contrib.rocks/image?repo=midudev/la-velada-web-oficial&max=500&columns=20)](https://github.com/midudev/la-velada-web-oficial/graphs/contributors)

<p align="right">(<a href="#readme-top">volver arriba</a>)</p>

Expand Down
11 changes: 5 additions & 6 deletions astro.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ import { manifest, seoConfig } from "./src/utils/seoConfig"

// https://astro.build/config
export default defineConfig({
build: {
inlineStylesheets: "always",
},
compressHTML: true,
prefetch: true,
devToolbar: {
enabled: false,
Expand All @@ -21,9 +25,6 @@ export default defineConfig({
enabled: true,
},
}),
build: {
inlineStylesheets: "always",
},
output: "server",
site: seoConfig.baseURL,
vite: {
Expand All @@ -39,9 +40,7 @@ export default defineConfig({
manifest,
workbox: {
globDirectory: ".vercel/output/static",
globPatterns: [
"**/*.{html,js,css,svg,avif,png,jpg,jpeg,gif,webp,woff,woff2,ttf,eot,ico}",
],
globPatterns: ["**/*.{html,js,css,woff,woff2,ttf,eot,ico}"],
runtimeCaching: [
{
urlPattern: /\.(?:png|jpg|jpeg|svg|gif|webp|avif)$/,
Expand Down
9 changes: 9 additions & 0 deletions db/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,18 @@ const Votes = {
},
}

const Cache = {
columns: {
id: column.text({ primaryKey: true }),
data: column.json(),
timestamp: column.date(),
},
}

// https://astro.build/db/config
export default defineDb({
tables: {
Cache,
VoteSelections,
Votes,
},
Expand Down
29 changes: 15 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"version": "0.0.1",
"scripts": {
"dev": "astro dev",
"start": "astro dev",
"start": "astro dev --remote",
"build": "astro build --remote",
"preview": "astro preview",
"astro": "astro",
Expand All @@ -16,37 +16,38 @@
"prepare": "husky"
},
"dependencies": {
"@astrojs/db": "0.9.5",
"@astrojs/db": "0.10.6",
"@auth/core": "0.18.6",
"@fontsource-variable/jost": "5.0.18",
"@fontsource-variable/jost": "5.0.19",
"@vercel/analytics": "1.2.2",
"astro": "4.5.10",
"astro": "4.7.0",
"auth-astro": "4.1.1",
"valibot": "0.30.0"
},
"devDependencies": {
"@antfu/eslint-config": "0.43.1",
"@astrojs/check": "0.5.10",
"@astrojs/sitemap": "3.1.2",
"@astrojs/sitemap": "3.1.4",
"@astrojs/tailwind": "5.1.0",
"@astrojs/vercel": "7.4.0",
"@astrojs/vercel": "7.5.4",
"@midudev/tailwind-animations": "0.0.7",
"@typescript-eslint/parser": "7.4.0",
"@types/dom-view-transitions": "1.0.4",
"@typescript-eslint/parser": "7.7.1",
"eslint": "8.57.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-astro": "0.33.1",
"eslint-plugin-astro": "0.34.0",
"eslint-plugin-jsx-a11y": "6.8.0",
"husky": "9.0.11",
"lightningcss": "1.24.1",
"lint-staged": "15.2.2",
"postcss-import": "16.1.0",
"postcss-nesting": "12.1.0",
"postcss-nesting": "12.1.2",
"prettier": "3.2.5",
"prettier-plugin-astro": "0.13.0",
"prettier-plugin-astro-organize-imports": "0.4.3",
"prettier-plugin-tailwindcss": "0.5.12",
"tailwindcss": "3.4.1",
"typescript": "5.4.3",
"vite-plugin-pwa": "0.19.7"
"prettier-plugin-astro-organize-imports": "0.4.5",
"prettier-plugin-tailwindcss": "0.5.14",
"tailwindcss": "3.4.3",
"typescript": "5.4.5",
"vite-plugin-pwa": "0.19.8"
}
}
Binary file added public/favicon.ico
Binary file not shown.
Binary file removed public/fonts/atomic.woff2
Binary file not shown.
Binary file removed public/img/boxers/agustin-51-big.webp
Binary file not shown.
Binary file removed public/img/boxers/agustin-51-small.webp
Binary file not shown.
Binary file removed public/img/boxers/alana-big.webp
Binary file not shown.
Binary file removed public/img/boxers/alana-small.webp
Binary file not shown.
Binary file removed public/img/boxers/aldo-geo-big.webp
Binary file not shown.
Binary file removed public/img/boxers/aldo-geo-small.webp
Binary file not shown.
Binary file removed public/img/boxers/ama-blitz-big.webp
Binary file not shown.
Binary file removed public/img/boxers/ama-blitz-small.webp
Binary file not shown.
Binary file removed public/img/boxers/avatares/agustin-51-small.webp
Binary file not shown.
Binary file removed public/img/boxers/avatares/alana-small.webp
Binary file not shown.
Binary file removed public/img/boxers/avatares/ama-blitz-small.webp
Binary file not shown.
Binary file removed public/img/boxers/avatares/carreraaa-small.webp
Binary file not shown.
Binary file removed public/img/boxers/avatares/el-mariana-small.webp
Binary file not shown.
Binary file removed public/img/boxers/avatares/guanyar-small.webp
Binary file not shown.
Binary file removed public/img/boxers/avatares/la-cobra-small.webp
Binary file not shown.
Binary file removed public/img/boxers/avatares/nissaxter-small.webp
Binary file not shown.
Binary file removed public/img/boxers/avatares/plex-small.webp
Binary file not shown.
Binary file removed public/img/boxers/avatares/shelao-small.webp
Binary file not shown.
Binary file removed public/img/boxers/avatares/viruzz-small.webp
Binary file not shown.
Binary file removed public/img/boxers/avatares/zeling-small.webp
Binary file not shown.
Binary file removed public/img/boxers/carreraaa-big.webp
Binary file not shown.
Binary file removed public/img/boxers/carreraaa-small.webp
Binary file not shown.
Binary file removed public/img/boxers/el-mariana-big.webp
Binary file not shown.
Binary file removed public/img/boxers/el-mariana-small.png
Binary file not shown.
Binary file removed public/img/boxers/el-mariana-small.webp
Binary file not shown.
Binary file removed public/img/boxers/el-mariana-title.png
Binary file not shown.
Binary file removed public/img/boxers/el-mariana-title.webp
Binary file not shown.
Binary file removed public/img/boxers/folagor-big.webp
Binary file not shown.
Binary file removed public/img/boxers/folagor-small.webp
Binary file not shown.
Binary file removed public/img/boxers/gallery/alana/1.webp
Binary file not shown.
Binary file removed public/img/boxers/gallery/alana/2.webp
Binary file not shown.
Binary file removed public/img/boxers/gallery/alana/3.webp
Binary file not shown.
Binary file removed public/img/boxers/gallery/alana/4.webp
Binary file not shown.
Binary file removed public/img/boxers/gallery/alana/5.webp
Binary file not shown.
Binary file removed public/img/boxers/gallery/ama-blitz/1.webp
Binary file not shown.
Binary file removed public/img/boxers/gallery/ama-blitz/2.webp
Binary file not shown.
Binary file removed public/img/boxers/gallery/ama-blitz/3.webp
Binary file not shown.
Binary file removed public/img/boxers/gallery/ama-blitz/4.webp
Binary file not shown.
Binary file removed public/img/boxers/gallery/ama-blitz/5.webp
Binary file not shown.
Binary file removed public/img/boxers/gallery/nissaxter/1.webp
Binary file not shown.
Binary file removed public/img/boxers/gallery/nissaxter/2.webp
Binary file not shown.
Binary file removed public/img/boxers/gallery/nissaxter/3.webp
Binary file not shown.
Binary file removed public/img/boxers/gallery/nissaxter/4.webp
Binary file not shown.
Binary file removed public/img/boxers/gallery/nissaxter/5.webp
Binary file not shown.
Binary file removed public/img/boxers/gallery/zeling/1.webp
Binary file not shown.
Binary file removed public/img/boxers/gallery/zeling/2.webp
Binary file not shown.
Binary file removed public/img/boxers/gallery/zeling/3.webp
Binary file not shown.
Binary file removed public/img/boxers/gallery/zeling/4.webp
Binary file not shown.
Binary file removed public/img/boxers/gallery/zeling/5.webp
Binary file not shown.
Binary file removed public/img/boxers/guanyar-big.webp
Binary file not shown.
Binary file removed public/img/boxers/guanyar-small.webp
Binary file not shown.
Binary file removed public/img/boxers/karchez-big.webp
Binary file not shown.
Binary file removed public/img/boxers/karchez-small.webp
Binary file not shown.
Binary file removed public/img/boxers/la-cobra-big.webp
Binary file not shown.
Binary file removed public/img/boxers/la-cobra-small.webp
Binary file not shown.
Binary file removed public/img/boxers/nissaxter-big.webp
Binary file not shown.
Binary file removed public/img/boxers/nissaxter-small.webp
Binary file not shown.
Binary file removed public/img/boxers/peldanyos-big.webp
Binary file not shown.
Binary file removed public/img/boxers/peldanyos-small.webp
Binary file not shown.
Binary file removed public/img/boxers/pelicanger-big.webp
Binary file not shown.
Binary file removed public/img/boxers/pelicanger-small.webp
Binary file not shown.
Binary file removed public/img/boxers/plex-big.webp
Binary file not shown.
Binary file removed public/img/boxers/plex-small.webp
Binary file not shown.
Binary file removed public/img/boxers/plex-title.webp
Binary file not shown.
Binary file removed public/img/boxers/roberto-cein-big.webp
Binary file not shown.
Binary file removed public/img/boxers/roberto-cein-small.webp
Binary file not shown.
Binary file removed public/img/boxers/sezar-blue-big.webp
Binary file not shown.
Binary file removed public/img/boxers/sezar-blue-small.webp
Binary file not shown.
Binary file removed public/img/boxers/shelao-big.webp
Binary file not shown.
Binary file removed public/img/boxers/shelao-small.webp
Binary file not shown.
Binary file removed public/img/boxers/skain-big.webp
Binary file not shown.
Binary file removed public/img/boxers/skain-small.webp
Binary file not shown.
Binary file removed public/img/boxers/unicornio-big.webp
Binary file not shown.
Binary file removed public/img/boxers/unicornio-small.webp
Binary file not shown.
Binary file removed public/img/boxers/viruzz-big.webp
Binary file not shown.
Binary file removed public/img/boxers/viruzz-small.webp
Binary file not shown.
Binary file removed public/img/boxers/vote/vote-1-agustin-51.webp
Binary file not shown.
Binary file removed public/img/boxers/vote/vote-1-carreraaa.webp
Binary file not shown.
Binary file removed public/img/boxers/vote/vote-2-guanyar.webp
Binary file not shown.
Binary file removed public/img/boxers/vote/vote-2-la-cobra.webp
Binary file not shown.
Binary file removed public/img/boxers/vote/vote-3-alana-ama-blitz.webp
Binary file not shown.
Binary file removed public/img/boxers/vote/vote-3-zeling-nissaxter.webp
Binary file not shown.
Binary file removed public/img/boxers/vote/vote-4-shelao.webp
Binary file not shown.
Binary file removed public/img/boxers/vote/vote-4-viruzz.webp
Binary file not shown.
Binary file removed public/img/boxers/vote/vote-6-el-mariana.webp
Binary file not shown.
Binary file removed public/img/boxers/vote/vote-6-plex.webp
Binary file not shown.
Binary file removed public/img/boxers/will-big.webp
Binary file not shown.
Binary file removed public/img/boxers/will-small.webp
Binary file not shown.
Binary file removed public/img/boxers/workoutThumbnails/alana.webp
Binary file not shown.
Binary file removed public/img/boxers/workoutThumbnails/peldanyos.webp
Binary file not shown.
Binary file removed public/img/boxers/workoutThumbnails/plex.webp
Binary file not shown.
Binary file removed public/img/boxers/workoutThumbnails/shelao.webp
Binary file not shown.
Binary file removed public/img/boxers/workoutThumbnails/skain.webp
Binary file not shown.
Binary file removed public/img/boxers/workoutThumbnails/zeling.webp
Binary file not shown.
Binary file removed public/img/boxers/zeling-big.webp
Binary file not shown.
Binary file removed public/img/boxers/zeling-small.webp
Binary file not shown.
Binary file removed public/img/drawn-x-logo.webp
Binary file not shown.
Binary file removed public/img/effects/background-old.webp
Binary file not shown.
Binary file removed public/img/effects/background.webp
Binary file not shown.
Binary file removed public/img/event/combates.webp
Binary file not shown.
Binary file removed public/img/event/entradas.webp
Binary file not shown.
Binary file removed public/img/event/evento.webp
Binary file not shown.
Binary file removed public/img/event/pronosticos.webp
Binary file not shown.
Binary file removed public/img/flags/maskflag.webp
Binary file not shown.
Binary file modified public/img/icons/apple-touch-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/img/icons/favicon-114x114.png
Binary file not shown.
Binary file removed public/img/icons/favicon-120x120.png
Binary file not shown.
Binary file modified public/img/icons/favicon-128x128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/img/icons/favicon-144x144.png
Binary file not shown.
Binary file modified public/img/icons/favicon-150x150.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/img/icons/favicon-152x152.png
Binary file not shown.
Binary file removed public/img/icons/favicon-16x16.png
Binary file not shown.
Binary file removed public/img/icons/favicon-180x180.png
Binary file not shown.
Binary file modified public/img/icons/favicon-192x192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/img/icons/favicon-310x310.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/img/icons/favicon-32x32.png
Binary file not shown.
Binary file removed public/img/icons/favicon-384x384.png
Binary file not shown.
Binary file modified public/img/icons/favicon-512x512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/img/icons/favicon-57x57.png
Binary file not shown.
Binary file removed public/img/icons/favicon-60x60.png
Binary file not shown.
Binary file modified public/img/icons/favicon-70x70.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/img/icons/favicon-72x72.png
Binary file not shown.
Binary file removed public/img/icons/favicon-76x76.png
Binary file not shown.
Binary file removed public/img/icons/favicon-96x96.png
Binary file not shown.
Loading

0 comments on commit b86c41d

Please sign in to comment.