Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
032ed59
Primer commit
aurynncrow Jan 14, 2025
fc44275
Añadidas paginas en front de precios, habitaciones y preinscripcion. …
aurynncrow Jan 15, 2025
047aeb7
añadido page.js y llamada en page svelte para ver contenido de precio…
aurynncrow Jan 16, 2025
e148496
Images and changes on room types
aurynncrow Jan 16, 2025
e944b49
Creado single type enrollment. Links forms actualizados. Preinscripci…
aurynncrow Jan 17, 2025
c8f789b
Ajustes footer y estilos
aurynncrow Jan 18, 2025
157098f
Added favicon
aurynncrow Jan 18, 2025
981a98e
Ajuste para el logo
aurynncrow Jan 18, 2025
634d68a
error texto footer
aurynncrow Jan 18, 2025
3a1f5d0
arreglar metadatos OpenGraph
hirunatan Jan 18, 2025
57e5dd4
fondo en favicon y cambios en meta descriptions y thumbnail
aurynncrow Jan 19, 2025
98f2461
Un par de arreglitos más
hirunatan Jan 19, 2025
3af229d
desactivar habs
aurynncrow Jan 19, 2025
b5b8eff
mensajes habs
aurynncrow Jan 19, 2025
59ebd07
Añadidos forms
aurynncrow Jan 19, 2025
31e3fe5
Añadir setting para activar o desactivar preinscripcion
hirunatan Jan 20, 2025
f37a209
cambiado form individuales a lista espera
aurynncrow Jan 22, 2025
2244390
Añadido info opcion EC parcial
aurynncrow Jan 25, 2025
c271cd0
Fijar versión de npm para compatibilidad
hirunatan Jan 31, 2025
0674488
Añadir login
hirunatan Feb 8, 2025
1b2b1cd
Apartado invitados y reorganizacion menu
aurynncrow Feb 16, 2025
8926c0b
Ajustes para simple-page y home
aurynncrow Feb 24, 2025
77992c0
Cambios en user
aurynncrow Mar 16, 2025
726f6cf
added custom fields for user registration
diacritica Mar 16, 2025
ada3db5
Ajustes para la pagina usuario
aurynncrow Mar 19, 2025
8e4977f
Cambios pagina login
aurynncrow Mar 19, 2025
95713ab
Añadir opciòn de establecer contraseña
hirunatan Mar 22, 2025
fb65d96
Arreglar botón de Mis Datos al hacer logout
hirunatan Mar 22, 2025
2278b80
Preparar para usar un servidor SMTP real
hirunatan Mar 22, 2025
a935a33
Ocultacion bloques inactivos
aurynncrow Mar 23, 2025
d4f3543
Añadir edición de ficha de usuario
hirunatan Mar 30, 2025
80be46f
Quitar un atributo que sobra
hirunatan Mar 30, 2025
43c4e5c
Campos editables elegidos y estilos
aurynncrow Apr 3, 2025
1968c22
Arreglar valores undefined
hirunatan Apr 4, 2025
6182584
Ajuste en valores repetidos en newData, del form de edicion de usuario
aurynncrow Apr 6, 2025
3e4d854
Quitado campo repetido de edicion en opciones camisetas
aurynncrow Apr 6, 2025
f543c33
imagen camiseta EC
aurynncrow Apr 7, 2025
0ad5251
Camiseta en parte edicion
aurynncrow Apr 7, 2025
ffa19d7
Procesar valores nulos del servidor
hirunatan Apr 8, 2025
9cdc6f7
modificados datos pago camiseta
aurynncrow Apr 8, 2025
80efa09
Arreglar fillers rotos
hirunatan Apr 13, 2025
54c3669
Añadir registro en actividades
hirunatan Apr 17, 2025
1bdc98d
Ajustes css parciales para agenda
aurynncrow Apr 17, 2025
b63d7dc
Añadir setting para desactivar registro de actividades
hirunatan Apr 18, 2025
3be45b7
Eliminar huecos en la agenda y ajustar alto y hora de tarjetas
hirunatan Apr 18, 2025
492e224
Añadir ficha completa de actividades
hirunatan Apr 18, 2025
afe0e5b
Cambios front actividades y horario
aurynncrow Apr 22, 2025
34338ee
Cambios backend tags
aurynncrow Apr 22, 2025
86d203c
Añadidos tags modificados y ocultacuion menu usuario
aurynncrow Apr 23, 2025
bc5a8b9
Comprimir huecos en la agenda
hirunatan Apr 26, 2025
0d7399c
Merge branch 'compresion' into ec2025
hirunatan Apr 26, 2025
f62c6a1
Ajuste agenda y inscripcion actividades
aurynncrow Apr 27, 2025
279c124
Añadir una pequeña protección
hirunatan Apr 30, 2025
f7f838f
Ocultar tracks sin actividades
hirunatan Apr 30, 2025
21da2d9
Merge pull request #5 from aurynncrow/ec2025
hirunatan Dec 15, 2025
db2f621
Unify EasyFest content
elenatorro Dec 16, 2025
dc4e9fc
Format styles
elenatorro Dec 17, 2025
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
Binary file added .DS_Store
Binary file not shown.
20 changes: 20 additions & 0 deletions backend/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,23 @@ ADMIN_JWT_SECRET="<fill me>"
# SECRET (Strapi)
# Generate new ones in a terminal with `$ openssl rand -base64 32`
JWT_SECRET="<fill me>"

# EMAIL CONFIGURATION
# Email provider (e.g. strapi-provider-email-local-browser, nodemailer)
EMAIL_PROVIDER="strapi-provider-email-local-browser"
# Email provider option: browser (for local-browser provider)
EMAIL_PROVIDER_BROWSER="chromium"
# Email SMTP host (for nodemailer, optional)
EMAIL_SMTP_HOST=""
# Email SMTP port (for nodemailer, optional)
EMAIL_SMTP_PORT=""
# Email SMTP user (for nodemailer, optional)
EMAIL_SMTP_USER=""
# Email SMTP password (for nodemailer, optional)
EMAIL_SMTP_PASS=""
# Default from address
EMAIL_DEFAULT_FROM="juliasedefdjian@strapi.io"
# Default reply-to address
EMAIL_DEFAULT_REPLY_TO="juliasedefdjian@strapi.io"
# Test address
EMAIL_TEST_ADDRESS="juliasedefdjian@strapi.io"
2 changes: 1 addition & 1 deletion backend/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ $RECYCLE.BIN/
ssl
.idea
nbproject
public/uploads/*
public/uploads
!public/uploads/.gitkeep

############################
Expand Down
44 changes: 35 additions & 9 deletions backend/config/plugins.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,43 @@
module.exports = ({ env }) => ({
// ...
email: {
config: {
provider: 'strapi-provider-email-local-browser', // For community providers pass the full package name (e.g. provider: 'strapi-provider-email-mandrill')
providerOptions: {
browser: 'chromium'
},
provider: env('EMAIL_PROVIDER', 'strapi-provider-email-local-browser'),
providerOptions: env('EMAIL_PROVIDER', 'strapi-provider-email-local-browser') === 'strapi-provider-email-local-browser'
? {
browser: env('EMAIL_PROVIDER_BROWSER', 'chromium')
}
: env('EMAIL_PROVIDER', '') === 'nodemailer'
? {
host: env('EMAIL_SMTP_HOST'),
port: env.int('EMAIL_SMTP_PORT', 587),
auth: {
user: env('EMAIL_SMTP_USER'),
pass: env('EMAIL_SMTP_PASS'),
},
}
: {},
settings: {
defaultFrom: 'juliasedefdjian@strapi.io',
defaultReplyTo: 'juliasedefdjian@strapi.io',
testAddress: 'juliasedefdjian@strapi.io',
defaultFrom: env('EMAIL_DEFAULT_FROM', 'juliasedefdjian@strapi.io'),
defaultReplyTo: env('EMAIL_DEFAULT_REPLY_TO', 'juliasedefdjian@strapi.io'),
testAddress: env('EMAIL_TEST_ADDRESS', 'juliasedefdjian@strapi.io'),
},
},
},
'users-permissions': {
enabled: true,
config: {
jwtSecret: env('JWT_SECRET', 'default_jwt_secret'),
jwt: {
expiresIn: '7d',
},
register: {
allowedFields: [
"activities_staff","registrationType","dni",
"phone_number","last_name","pseudonym","smial","room_code",
"menu_type","menu_comment","premium","premium_comment",
"aide","mentee","mentor","childrens","name","room_type"
],
},
},
},
// ...
});
Loading