Skip to content

Commit

Permalink
some improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
Rene-Roscher committed Apr 6, 2024
1 parent a1aa7b9 commit ba3e6cb
Show file tree
Hide file tree
Showing 35 changed files with 332 additions and 251 deletions.
6 changes: 3 additions & 3 deletions docker/app/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ COPY . /var/www

RUN echo "" > /var/www/storage/logs/laravel.log

COPY ./docker/supervisord.conf /etc/supervisord.conf

RUN chmod -R gu+w storage/ && chmod -R guo+w storage/ && chmod -R gu+w bootstrap/cache/ && chmod -R guo+w bootstrap/cache/

RUN chown -R www-data:www-data /var/www

COPY ./docker/supervisord.conf /etc/supervisord.conf

CMD ["supervisord", "-c", "/etc/supervisord.conf"]
CMD ["supervisord", "-c", "/etc/supervisord.conf"]
6 changes: 5 additions & 1 deletion resources/css/app.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
@tailwind base;
@tailwind components;
@tailwind utilities;
@tailwind utilities;

[x-cloak] {
display: none;
}
Original file line number Diff line number Diff line change
@@ -1,28 +1,15 @@
<template>
<div :class="width">
<div class="text-center bg-white m-4 sm:m-0 p-4 sm:p-12 rounded-lg" :class="shadowClass">
<component :is="computerDesktopIcon" class="mx-auto h-12 w-12 text-gray-400"/>
<h3 class="mt-2 text-base font-medium text-gray-900"><slot name="title"/></h3>
<p class="mt-1 text-sm text-gray-500"><slot name="description"/></p>
<div class="mt-6">
<slot name="actions"/>
</div>
</div>
</div>
</template>

<script setup>
import { defineComponent, h } from 'vue';
import {defineComponent, h} from 'vue';
defineProps({
width: {
type: String,
default: 'sm:w-1/3',
},
shadowClass: {
type: String,
default: 'shadow-md',
},
width: {
type: String,
default: 'sm:w-1/3',
},
shadowClass: {
type: String,
default: 'shadow-md',
},
});
const computerDesktopIcon = defineComponent({
Expand All @@ -45,3 +32,20 @@ const computerDesktopIcon = defineComponent({
}
});
</script>

<template>
<div :class="width">
<div class="text-center bg-white m-4 sm:m-0 p-4 sm:p-12 rounded-lg" :class="shadowClass">
<component :is="computerDesktopIcon" class="mx-auto h-12 w-12 text-gray-400"/>
<h3 class="mt-2 text-base font-medium text-gray-900">
<slot name="title"/>
</h3>
<p class="mt-1 text-sm text-gray-500">
<slot name="description"/>
</p>
<div class="mt-6">
<slot name="actions"/>
</div>
</div>
</div>
</template>
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@
<div
:class="{'absolute': !fixed, 'fixed': fixed}"
:style="style"
class="top-0 left-0 flex items-center justify-center w-full h-full rounded flex-col z-40">

class="top-0 left-0 flex items-center justify-center w-full h-full rounded flex-col z-40"
>
<div :class="{'m-20': size === 'large', 'm-6': size === 'small'}" class="flex justify-center items-center">
<div class="spinner" :class="{'w-8 h-8 border': size === 'small', 'w-16 h-16 border-4': size === 'large'}"/>
</div>

</div>
</template>

Expand Down Expand Up @@ -43,4 +42,4 @@ export default {
transform: rotate(360deg);
}
}
</style>
</style>
6 changes: 3 additions & 3 deletions resources/js/Components/Banner.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ watch(message, async () => {
<template>
<div>
<div v-if="show && message" :class="{ 'bg-indigo-500': style == 'success', 'bg-red-700': style == 'danger' }">
<div v-if="show && message" :class="{ 'bg-primary-500': style == 'success', 'bg-red-700': style == 'danger' }">
<div class="max-w-screen-xl mx-auto py-2 px-3 sm:px-6 lg:px-8">
<div class="flex items-center justify-between flex-wrap">
<div class="w-0 flex-1 flex items-center min-w-0">
<span class="flex p-2 rounded-lg" :class="{ 'bg-indigo-600': style == 'success', 'bg-red-600': style == 'danger' }">
<span class="flex p-2 rounded-lg" :class="{ 'bg-primary-600': style == 'success', 'bg-red-600': style == 'danger' }">
<svg v-if="style == 'success'" class="h-5 w-5 text-white" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
<path stroke-linecap="round" stroke-linejoin="round" d="M9 12.75L11.25 15 15 9.75M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
</svg>
Expand All @@ -36,7 +36,7 @@ watch(message, async () => {
<button
type="button"
class="-mr-1 flex p-2 rounded-md focus:outline-none sm:-mr-2 transition"
:class="{ 'hover:bg-indigo-600 focus:bg-indigo-600': style == 'success', 'hover:bg-red-600 focus:bg-red-600': style == 'danger' }"
:class="{ 'hover:bg-primary-600 focus:bg-primary-600': style == 'success', 'hover:bg-red-600 focus:bg-red-600': style == 'danger' }"
aria-label="Dismiss"
@click.prevent="show = false"
>
Expand Down
2 changes: 1 addition & 1 deletion resources/js/Components/Checkbox.vue
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ const proxyChecked = computed({
v-model="proxyChecked"
type="checkbox"
:value="value"
class="rounded border-gray-300 text-indigo-600 shadow-sm focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50"
class="rounded border-gray-300 text-primary-600 shadow-sm focus:border-primary-300 focus:ring focus:ring-primary-200 focus:ring-opacity-50"
>
</template>
2 changes: 1 addition & 1 deletion resources/js/Components/NavLink.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const props = defineProps({
const classes = computed(() => {
return props.active
? 'inline-flex items-center px-1 pt-1 border-b-2 border-indigo-400 text-sm font-medium leading-5 text-gray-900 focus:outline-none focus:border-indigo-700 transition'
? 'inline-flex items-center px-1 pt-1 border-b-2 border-primary-400 text-sm font-medium leading-5 text-gray-900 focus:outline-none focus:border-primary-700 transition'
: 'inline-flex items-center px-1 pt-1 border-b-2 border-transparent text-sm font-medium leading-5 text-gray-500 hover:text-gray-700 hover:border-gray-300 focus:outline-none focus:text-gray-700 focus:border-gray-300 transition';
});
</script>
Expand Down
2 changes: 1 addition & 1 deletion resources/js/Components/ResponsiveNavLink.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const props = defineProps({
const classes = computed(() => {
return props.active
? 'block pl-3 pr-4 py-2 border-l-4 border-indigo-400 text-base font-medium text-indigo-700 bg-indigo-50 focus:outline-none focus:text-indigo-800 focus:bg-indigo-100 focus:border-indigo-700 transition'
? 'block pl-3 pr-4 py-2 border-l-4 border-primary-400 text-base font-medium text-primary-700 bg-primary-50 focus:outline-none focus:text-primary-800 focus:bg-primary-100 focus:border-primary-700 transition'
: 'block pl-3 pr-4 py-2 border-l-4 border-transparent text-base font-medium text-gray-600 hover:text-gray-800 hover:bg-gray-50 hover:border-gray-300 focus:outline-none focus:text-gray-800 focus:bg-gray-50 focus:border-gray-300 transition';
});
</script>
Expand Down
2 changes: 1 addition & 1 deletion resources/js/Components/TextInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ defineExpose({ focus: () => input.value.focus() });
<template>
<input
ref="input"
class="border-gray-300 focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 rounded-md shadow-sm"
class="border-gray-300 focus:border-primary-300 focus:ring focus:ring-primary-200 focus:ring-opacity-50 rounded-md shadow-sm"
:value="modelValue"
@input="$emit('update:modelValue', $event.target.value)"
>
Expand Down
8 changes: 4 additions & 4 deletions resources/js/Components/Welcome.vue
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ import ApplicationLogo from '@/Components/ApplicationLogo.vue';
</div>

<a href="https://laravel.com/docs">
<div class="mt-3 flex items-center text-sm font-semibold text-indigo-700">
<div class="mt-3 flex items-center text-sm font-semibold text-primary-700">
<div>Explore the documentation</div>

<div class="ml-1 text-indigo-500">
<div class="ml-1 text-primary-500">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
<path stroke-linecap="round" stroke-linejoin="round" d="M13.5 4.5L21 12m0 0l-7.5 7.5M21 12H3" />
</svg>
Expand All @@ -63,10 +63,10 @@ import ApplicationLogo from '@/Components/ApplicationLogo.vue';
</div>

<a href="https://laracasts.com">
<div class="mt-3 flex items-center text-sm font-semibold text-indigo-700">
<div class="mt-3 flex items-center text-sm font-semibold text-primary-700">
<div>Start watching Laracasts</div>

<div class="ml-1 text-indigo-500">
<div class="ml-1 text-primary-500">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
<path stroke-linecap="round" stroke-linejoin="round" d="M13.5 4.5L21 12m0 0l-7.5 7.5M21 12H3" />
</svg>
Expand Down
2 changes: 1 addition & 1 deletion resources/js/Pages/API/Index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ defineProps({
<template>
<AppLayout title="API Tokens">
<template #header>
<h2 class="font-semibold text-xl text-gray-800 leading-tight">
<h2 class="font-semibold text-xl text-gray-800 dark:text-gray-200 leading-tight">
API Tokens
</h2>
</template>
Expand Down
20 changes: 10 additions & 10 deletions resources/js/Pages/API/Partials/ApiTokenManager.vue
Original file line number Diff line number Diff line change
Expand Up @@ -106,15 +106,15 @@ const deleteApiToken = () => {
<div v-for="permission in availablePermissions" :key="permission">
<label class="flex items-center">
<Checkbox v-model:checked="createApiTokenForm.permissions" :value="permission" />
<span class="ml-2 text-sm text-gray-600">{{ permission }}</span>
<span class="ms-2 text-sm text-gray-600 dark:text-gray-400">{{ permission }}</span>
</label>
</div>
</div>
</div>
</template>

<template #actions>
<ActionMessage :on="createApiTokenForm.recentlySuccessful" class="mr-3">
<ActionMessage :on="createApiTokenForm.recentlySuccessful" class="me-3">
Created.
</ActionMessage>

Expand Down Expand Up @@ -142,24 +142,24 @@ const deleteApiToken = () => {
<template #content>
<div class="space-y-6">
<div v-for="token in tokens" :key="token.id" class="flex items-center justify-between">
<div class="break-all">
<div class="break-all dark:text-white">
{{ token.name }}
</div>

<div class="flex items-center ml-2">
<div class="flex items-center ms-2">
<div v-if="token.last_used_ago" class="text-sm text-gray-400">
Last used {{ token.last_used_ago }}
</div>

<button
v-if="availablePermissions.length > 0"
class="cursor-pointer ml-6 text-sm text-gray-400 underline"
class="cursor-pointer ms-6 text-sm text-gray-400 underline"
@click="manageApiTokenPermissions(token)"
>
Permissions
</button>

<button class="cursor-pointer ml-6 text-sm text-red-500" @click="confirmApiTokenDeletion(token)">
<button class="cursor-pointer ms-6 text-sm text-red-500" @click="confirmApiTokenDeletion(token)">
Delete
</button>
</div>
Expand All @@ -181,7 +181,7 @@ const deleteApiToken = () => {
Please copy your new API token. For your security, it won't be shown again.
</div>

<div v-if="$page.props.jetstream.flash.token" class="mt-4 bg-gray-100 px-4 py-2 rounded font-mono text-sm text-gray-500 break-all">
<div v-if="$page.props.jetstream.flash.token" class="mt-4 bg-gray-100 dark:bg-gray-900 px-4 py-2 rounded font-mono text-sm text-gray-500 break-all">
{{ $page.props.jetstream.flash.token }}
</div>
</template>
Expand All @@ -204,7 +204,7 @@ const deleteApiToken = () => {
<div v-for="permission in availablePermissions" :key="permission">
<label class="flex items-center">
<Checkbox v-model:checked="updateApiTokenForm.permissions" :value="permission" />
<span class="ml-2 text-sm text-gray-600">{{ permission }}</span>
<span class="ms-2 text-sm text-gray-600 dark:text-gray-400">{{ permission }}</span>
</label>
</div>
</div>
Expand All @@ -216,7 +216,7 @@ const deleteApiToken = () => {
</SecondaryButton>

<PrimaryButton
class="ml-3"
class="ms-3"
:class="{ 'opacity-25': updateApiTokenForm.processing }"
:disabled="updateApiTokenForm.processing"
@click="updateApiToken"
Expand All @@ -242,7 +242,7 @@ const deleteApiToken = () => {
</SecondaryButton>

<DangerButton
class="ml-3"
class="ms-3"
:class="{ 'opacity-25': deleteApiTokenForm.processing }"
:disabled="deleteApiTokenForm.processing"
@click="deleteApiToken"
Expand Down
4 changes: 2 additions & 2 deletions resources/js/Pages/Auth/ConfirmPassword.vue
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const submit = () => {
<AuthenticationCardLogo />
</template>

<div class="mb-4 text-sm text-gray-600">
<div class="mb-4 text-sm text-gray-600 dark:text-gray-400">
This is a secure area of the application. Please confirm your password before continuing.
</div>

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

<div class="flex justify-end mt-4">
<PrimaryButton class="ml-4" :class="{ 'opacity-25': form.processing }" :disabled="form.processing">
<PrimaryButton class="ms-4" :class="{ 'opacity-25': form.processing }" :disabled="form.processing">
Confirm
</PrimaryButton>
</div>
Expand Down
4 changes: 2 additions & 2 deletions resources/js/Pages/Auth/ForgotPassword.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ const submit = () => {
<AuthenticationCardLogo />
</template>

<div class="mb-4 text-sm text-gray-600">
<div class="mb-4 text-sm text-gray-600 dark:text-gray-400">
Forgot your password? No problem. Just let us know your email address and we will email you a password reset link that will allow you to choose a new one.
</div>

<div v-if="status" class="mb-4 font-medium text-sm text-green-600">
<div v-if="status" class="mb-4 font-medium text-sm text-green-600 dark:text-green-400">
{{ status }}
</div>

Expand Down
8 changes: 4 additions & 4 deletions resources/js/Pages/Auth/Login.vue
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const submit = () => {
<AuthenticationCardLogo />
</template>

<div v-if="status" class="mb-4 font-medium text-sm text-green-600">
<div v-if="status" class="mb-4 font-medium text-sm text-green-600 dark:text-green-400">
{{ status }}
</div>

Expand Down Expand Up @@ -72,16 +72,16 @@ const submit = () => {
<div class="block mt-4">
<label class="flex items-center">
<Checkbox v-model:checked="form.remember" name="remember" />
<span class="ml-2 text-sm text-gray-600">Remember me</span>
<span class="ms-2 text-sm text-gray-600 dark:text-gray-400">Remember me</span>
</label>
</div>

<div class="flex items-center justify-end mt-4">
<Link v-if="canResetPassword" :href="route('password.request')" class="underline text-sm text-gray-600 hover:text-gray-900">
<Link v-if="canResetPassword" :href="route('password.request')" class="underline text-sm text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary-500 dark:focus:ring-offset-gray-800">
Forgot your password?
</Link>

<PrimaryButton class="ml-4" :class="{ 'opacity-25': form.processing }" :disabled="form.processing">
<PrimaryButton class="ms-4" :class="{ 'opacity-25': form.processing }" :disabled="form.processing">
Log in
</PrimaryButton>
</div>
Expand Down
8 changes: 4 additions & 4 deletions resources/js/Pages/Auth/Register.vue
Original file line number Diff line number Diff line change
Expand Up @@ -90,20 +90,20 @@ const submit = () => {
<div class="flex items-center">
<Checkbox id="terms" v-model:checked="form.terms" name="terms" required />

<div class="ml-2">
I agree to the <a target="_blank" :href="route('terms.show')" class="underline text-sm text-gray-600 hover:text-gray-900">Terms of Service</a> and <a target="_blank" :href="route('policy.show')" class="underline text-sm text-gray-600 hover:text-gray-900">Privacy Policy</a>
<div class="ms-2">
I agree to the <a target="_blank" :href="route('terms.show')" class="underline text-sm text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary-500 dark:focus:ring-offset-gray-800">Terms of Service</a> and <a target="_blank" :href="route('policy.show')" class="underline text-sm text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary-500 dark:focus:ring-offset-gray-800">Privacy Policy</a>
</div>
</div>
<InputError class="mt-2" :message="form.errors.terms" />
</InputLabel>
</div>

<div class="flex items-center justify-end mt-4">
<Link :href="route('login')" class="underline text-sm text-gray-600 hover:text-gray-900">
<Link :href="route('login')" class="underline text-sm text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary-500 dark:focus:ring-offset-gray-800">
Already registered?
</Link>

<PrimaryButton class="ml-4" :class="{ 'opacity-25': form.processing }" :disabled="form.processing">
<PrimaryButton class="ms-4" :class="{ 'opacity-25': form.processing }" :disabled="form.processing">
Register
</PrimaryButton>
</div>
Expand Down
Loading

0 comments on commit ba3e6cb

Please sign in to comment.