Skip to content

Commit

Permalink
Merge pull request #24 from Crudzaso/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
DiegoAndresRamirez authored Nov 4, 2024
2 parents f7e29a5 + 6b71545 commit 71b115b
Show file tree
Hide file tree
Showing 6 changed files with 229 additions and 84 deletions.
24 changes: 23 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"vue": "^3.3.13"
},
"dependencies": {
"lucide-vue-next": "^0.454.0"
"lucide-vue-next": "^0.454.0",
"vue-router": "^4.4.5"
}
}
13 changes: 11 additions & 2 deletions resources/js/Components/Sign-in/LoginComponent.vue
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,16 @@

<!-- Recordatorio de contraseña -->
<div class="d-flex flex-stack flex-wrap gap-3 fs-base fw-semibold mb-8">
<a href="authentication/layouts/overlay/reset-password.html" class="link-primary"
<a href="/reset-password/some-fake-token" class="link-primary"
:style="{ color: theme.primary }">¿Olvidaste tu contraseña?</a>
</div>

<!-- Botón de envío -->
<div class="d-grid mb-10">
<button type="button" class="btn btn-secondary" @click="cancel"
style="margin-bottom: 10px;">
Cancelar
</button>
<button type="submit" id="kt_sign_in_submit" class="btn"
:style="{ background: theme.primary, color: '#fff' }" :disabled="form.processing">
<span v-if="!form.processing" class="indicator-label">Iniciar Sesión</span>
Expand Down Expand Up @@ -167,6 +171,10 @@ export default {
window.location.href = route('github.login');
};
const cancel = () => {
window.location.href = '/'; // Cambia esto según tu ruta real
};
return {
form,
isDarkMode,
Expand All @@ -175,6 +183,7 @@ export default {
loginWithGoogle,
loginWithGitHub,
toggleDarkMode, // Asegúrate de incluir toggleDarkMode en el return
cancel
};
}
};
Expand All @@ -183,7 +192,7 @@ export default {
<style scoped>
/* Personalización de elementos del formulario */
.form {
padding: 4.75rem;
padding: 2.70rem;
border-radius: 8px;
box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
}
Expand Down
11 changes: 10 additions & 1 deletion resources/js/Pages/Auth/Register.vue
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,10 @@

<!-- Botón de Envío -->
<div class="d-grid mb-5">
<button type="button" class="btn btn-secondary" @click="cancel"
style="margin-bottom: 10px;">
Cancelar
</button>
<button type="submit" class="btn" :style="{ background: theme.primary, color: '#fff' }"
:disabled="!form.termsAccepted || form.processing">
<span v-if="!form.processing" class="indicator-label">Registrarse</span>
Expand Down Expand Up @@ -207,6 +211,10 @@ export default {
window.location.href = route('apple.register');
};
const cancel = () => {
window.location.href = '/'; // Cambia esto según tu ruta real
};
return {
form,
isDarkMode,
Expand All @@ -215,14 +223,15 @@ export default {
registerWithGoogle,
registerWithApple,
toggleDarkMode, // Asegúrate de incluir toggleDarkMode en el return
cancel
};
},
};
</script>

<style scoped>
.form-container {
padding: 1.85rem;
border-radius: 8px;
box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
}
Expand Down
Loading

0 comments on commit 71b115b

Please sign in to comment.