Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Breeze prefix and double name space some other components #3

Merged
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
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<script setup>
import { ref, onBeforeMount } from 'vue'
import { useUsers } from '@/stores/user'
import BreezeApplicationLogo from '@/components/ApplicationLogo.vue'
import BreezeDropdown from '@/components/Dropdown.vue'
import BreezeDropdownLink from '@/components/DropdownLink.vue'
import BreezeNavLink from '@/components/NavLink.vue'
import BreezeResponsiveNavLink from '@/components/ResponsiveNavLink.vue'
import ApplicationLogo from '@/components/ApplicationLogo.vue'
import Dropdown from '@/components/Dropdown.vue'
import DropdownLink from '@/components/DropdownLink.vue'
import NavLink from '@/components/NavLink.vue'
import ResponsiveNavLink from '@/components/ResponsiveNavLink.vue'

const showingNavigationDropdown = ref(false)

Expand Down Expand Up @@ -35,7 +35,7 @@ const submitLogout = () => {
<!-- Logo -->
<div class="shrink-0 flex items-center">
<router-link to="/">
<BreezeApplicationLogo
<ApplicationLogo
class="block h-9 w-auto" />
</router-link>
</div>
Expand All @@ -47,20 +47,20 @@ const submitLogout = () => {
to="/dashboard"
custom
v-slot="{ href, isActive, navigate }">
<BreezeNavLink
<NavLink
:href="href"
:active="isActive"
@click="navigate">
Dashboard
</BreezeNavLink>
</NavLink>
</router-link>
</div>
</div>

<div class="hidden sm:flex sm:items-center sm:ml-6">
<!-- Settings Dropdown -->
<div class="ml-3 relative">
<BreezeDropdown align="right" width="48">
<Dropdown align="right" width="48">
<template #trigger>
<span class="inline-flex rounded-md">
<button
Expand All @@ -83,12 +83,12 @@ const submitLogout = () => {
</template>

<template #content>
<BreezeDropdownLink
<DropdownLink
@click="submitLogout">
Log Out
</BreezeDropdownLink>
</DropdownLink>
</template>
</BreezeDropdown>
</Dropdown>
</div>
</div>

Expand Down Expand Up @@ -143,12 +143,12 @@ const submitLogout = () => {
to="/dashboard"
custom
v-slot="{ href, isActive, navigate }">
<BreezeResponsiveNavLink
<ResponsiveNavLink
:href="href"
:active="isActive"
@click="navigate">
Dashboard
</BreezeResponsiveNavLink>
</ResponsiveNavLink>
</router-link>
</div>

Expand All @@ -168,11 +168,11 @@ const submitLogout = () => {
to="/"
custom
v-slot="{ href, navigate }">
<BreezeResponsiveNavLink
<ResponsiveNavLink
:href="href"
@click="navigate">
Log Out
</BreezeResponsiveNavLink>
</ResponsiveNavLink>
</router-link>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/layouts/Guest.vue → src/layouts/GuestLayout.vue
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<script setup>
import BreezeApplicationLogo from '@/components/ApplicationLogo.vue'
import ApplicationLogo from '@/components/ApplicationLogo.vue'
</script>

<template>
<div
class="min-h-screen flex flex-col sm:justify-center items-center pt-6 sm:pt-0 bg-gray-100">
<div>
<router-link to="/">
<BreezeApplicationLogo
<ApplicationLogo
class="w-20 h-20 fill-current text-gray-500" />
</router-link>
</div>
Expand Down
6 changes: 3 additions & 3 deletions src/pages/Dashboard.vue
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<script setup>
import BreezeAuthenticatedLayout from '@/layouts/Authenticated.vue'
import AuthenticatedLayout from '@/layouts/AuthenticatedLayout.vue'
</script>

<template>
<BreezeAuthenticatedLayout>
<AuthenticatedLayout>
<template #header>
<h2 class="font-semibold text-xl text-gray-800 leading-tight">
Dashboard
Expand All @@ -19,5 +19,5 @@ import BreezeAuthenticatedLayout from '@/layouts/Authenticated.vue'
</div>
</div>
</div>
</BreezeAuthenticatedLayout>
</AuthenticatedLayout>
</template>
24 changes: 12 additions & 12 deletions src/pages/auth/ForgotPassword.vue
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<script setup>
import { useUsers } from '@/stores/user'
import { computed, ref } from 'vue'
import BreezeButton from '@/components/Button.vue'
import BreezeGuestLayout from '@/layouts/Guest.vue'
import BreezeInput from '@/components/Input.vue'
import BreezeLabel from '@/components/Label.vue'
import BreezeValidationErrors from '@/components/ValidationErrors.vue'
import PrimaryButton from '@/components/PrimaryButton.vue'
import GuestLayout from '@/layouts/GuestLayout.vue'
import TextInput from '@/components/TextInput.vue'
import InputLabel from '@/components/InputLabel.vue'
import ValidationErrors from '@/components/ValidationErrors.vue'

const store = useUsers()

Expand All @@ -29,7 +29,7 @@ const submit = () => {
</script>

<template>
<BreezeGuestLayout>
<GuestLayout>
<div class="mb-4 text-sm text-gray-600">
Forgot your password? No problem. Just let us know your email
address and we will email you a password reset link that will allow
Expand All @@ -40,12 +40,12 @@ const submit = () => {
{{ status }}
</div>

<BreezeValidationErrors class="mb-4" :errors="errors" />
<ValidationErrors class="mb-4" :errors="errors" />

<form @submit.prevent="submit">
<div>
<BreezeLabel for="email" value="Email" />
<BreezeInput
<InputLabel for="email" value="Email" />
<TextInput
id="email"
type="email"
class="mt-1 block w-full"
Expand All @@ -56,10 +56,10 @@ const submit = () => {
</div>

<div class="flex items-center justify-end mt-4">
<BreezeButton class="ml-4" :processing="processing">
<PrimaryButton class="ml-4" :processing="processing">
Email Password Reset Link
</BreezeButton>
</PrimaryButton>
</div>
</form>
</BreezeGuestLayout>
</GuestLayout>
</template>
32 changes: 16 additions & 16 deletions src/pages/auth/Login.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
import { useRoute } from 'vue-router'
import { useUsers } from '@/stores/user'
import { computed, ref } from 'vue'
import BreezeButton from '@/components/Button.vue'
import BreezeCheckbox from '@/components/Checkbox.vue'
import BreezeGuestLayout from '@/layouts/Guest.vue'
import BreezeInput from '@/components/Input.vue'
import BreezeLabel from '@/components/Label.vue'
import BreezeValidationErrors from '@/components/ValidationErrors.vue'
import PrimaryButton from '@/components/PrimaryButton.vue'
import Checkbox from '@/components/Checkbox.vue'
import GuestLayout from '@/layouts/GuestLayout.vue'
import TextInput from '@/components/TextInput.vue'
import InputLabel from '@/components/InputLabel.vue'
import ValidationErrors from '@/components/ValidationErrors.vue'

const route = useRoute()

Expand Down Expand Up @@ -35,17 +35,17 @@ const submitLogin = () => {
</script>

<template>
<BreezeGuestLayout>
<GuestLayout>
<div v-if="status" class="mb-4 font-medium text-sm text-green-600">
{{ status }}
</div>

<BreezeValidationErrors class="mb-4" :errors="errors" />
<ValidationErrors class="mb-4" :errors="errors" />

<form @submit.prevent="submitLogin">
<div>
<BreezeLabel for="email" value="Email" />
<BreezeInput
<InputLabel for="email" value="Email" />
<TextInput
id="email"
type="email"
class="mt-1 block w-full"
Expand All @@ -56,8 +56,8 @@ const submitLogin = () => {
</div>

<div class="mt-4">
<BreezeLabel for="password" value="Password" />
<BreezeInput
<InputLabel for="password" value="Password" />
<TextInput
id="password"
type="password"
class="mt-1 block w-full"
Expand All @@ -68,7 +68,7 @@ const submitLogin = () => {

<div class="block mt-4">
<label class="flex items-center">
<BreezeCheckbox
<Checkbox
name="remember"
:checked="form.remember"
v-model="form.remember" />
Expand All @@ -82,10 +82,10 @@ const submitLogin = () => {
class="underline text-sm text-gray-600 hover:text-gray-900">
Forgot your password?
</router-link>
<BreezeButton class="ml-4" :processing="processing">
<PrimaryButton class="ml-4" :processing="processing">
Login
</BreezeButton>
</PrimaryButton>
</div>
</form>
</BreezeGuestLayout>
</GuestLayout>
</template>
36 changes: 18 additions & 18 deletions src/pages/auth/Register.vue
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<script setup>
import { useUsers } from '@/stores/user'
import { computed, ref } from 'vue'
import BreezeButton from '@/components/Button.vue'
import BreezeGuestLayout from '@/layouts/Guest.vue'
import BreezeInput from '@/components/Input.vue'
import BreezeLabel from '@/components/Label.vue'
import BreezeValidationErrors from '@/components/ValidationErrors.vue'
import PrimaryButton from '@/components/PrimaryButton.vue'
import GuestLayout from '@/layouts/GuestLayout.vue'
import TextInput from '@/components/TextInput.vue'
import InputLabel from '@/components/InputLabel.vue'
import ValidationErrors from '@/components/ValidationErrors.vue'

const store = useUsers()

Expand All @@ -29,13 +29,13 @@ const submitRegister = () => {
</script>

<template>
<BreezeGuestLayout>
<BreezeValidationErrors class="mb-4" :errors="errors" />
<GuestLayout>
<ValidationErrors class="mb-4" :errors="errors" />

<form @submit.prevent="submitRegister">
<div>
<BreezeLabel for="name" value="Name" />
<BreezeInput
<InputLabel for="name" value="Name" />
<TextInput
id="name"
type="text"
class="mt-1 block w-full"
Expand All @@ -46,8 +46,8 @@ const submitRegister = () => {
</div>

<div class="mt-4">
<BreezeLabel for="email" value="Email" />
<BreezeInput
<InputLabel for="email" value="Email" />
<TextInput
id="email"
type="email"
class="mt-1 block w-full"
Expand All @@ -57,8 +57,8 @@ const submitRegister = () => {
</div>

<div class="mt-4">
<BreezeLabel for="password" value="Password" />
<BreezeInput
<InputLabel for="password" value="Password" />
<TextInput
id="password"
type="password"
class="mt-1 block w-full"
Expand All @@ -68,10 +68,10 @@ const submitRegister = () => {
</div>

<div class="mt-4">
<BreezeLabel
<InputLabel
for="password_confirmation"
value="Confirm Password" />
<BreezeInput
<TextInput
id="password_confirmation"
type="password"
class="mt-1 block w-full"
Expand All @@ -87,10 +87,10 @@ const submitRegister = () => {
Already registered?
</router-link>

<BreezeButton class="ml-4" :processing="processing">
<PrimaryButton class="ml-4" :processing="processing">
Register
</BreezeButton>
</PrimaryButton>
</div>
</form>
</BreezeGuestLayout>
</GuestLayout>
</template>
Loading