Skip to content

Commit

Permalink
Merge pull request #15 from frontChapter/develop
Browse files Browse the repository at this point in the history 
feat: 🐛 fix ui bugs
  • Loading branch information
@lokiwich
lokiwich authored Jan 9, 2024
2 parents 6e70fc7 + 2ff32e0 commit 3908d9e
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 39 deletions.
14 changes: 7 additions & 7 deletions app/Enums/AttributeTypeEum.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@ public function iconName(): string
public function htmlValue(string $value): string
{
return match ($this) {
static::Link => "<a class='text-primary-500 hover:text-primary-600' href='$value'>$value</a>",
static::Instagram => "<a class='text-primary-500 hover:text-primary-600' href='$value'>$value</a>",
static::Linkedin => "<a class='text-primary-500 hover:text-primary-600' href='$value'>$value</a>",
static::Resume => "<a class='text-primary-500 hover:text-primary-600' href='$value'>$value</a>",
static::Bio => "<p>$value</p>",
static::Job => "<p>$value</p>",
static::Company => "<p>$value</p>",
static::Link => "<a class='overflow-hidden text-ellipsis text-primary-500 hover:text-primary-600' href='$value'>$value</a>",
static::Instagram => "<a class='overflow-hidden text-ellipsis text-primary-500 hover:text-primary-600' href='$value'>$value</a>",
static::Linkedin => "<a class='overflow-hidden text-ellipsis text-primary-500 hover:text-primary-600' href='$value'>$value</a>",
static::Resume => "<a class='overflow-hidden text-ellipsis text-primary-500 hover:text-primary-600' href='$value'>$value</a>",
static::Bio => "<p class='overflow-hidden text-ellipsis'>$value</p>",
static::Job => "<p class='overflow-hidden text-ellipsis'>$value</p>",
static::Company => "<p class='overflow-hidden text-ellipsis'>$value</p>",
};
}
}
2 changes: 1 addition & 1 deletion resources/views/components/check-email-verified.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@auth
@empty (auth()->user()->email_verified_at)
<div class="container mx-auto mt-5 md:max-w-3xl">
<div class="container px-2 mx-auto mt-5 md:max-w-3xl">
<x-alert icon="exclamation-triangle" type="warning" :title="__('Verify Your Email Address')"
:description="__('Before proceeding, please check your email for a verification link.')">
<x-slot name="actions">
Expand Down
2 changes: 1 addition & 1 deletion resources/views/layouts/app.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
@include('layouts.template.header')

<!-- Page Content -->
<main>
<main class="p-2">
@isset ($slot)
{{ $slot }}
@endisset
Expand Down
2 changes: 1 addition & 1 deletion resources/views/layouts/auth.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@extends('layouts.base')

@section('body')
<div class="flex flex-col justify-center min-h-screen py-12 sm:px-6 lg:px-8">
<div class="flex flex-col justify-center min-h-screen p-2 py-12 sm:px-6 lg:px-8">
@yield('content')

@isset($slot)
Expand Down
8 changes: 4 additions & 4 deletions resources/views/livewire/profile/show-profile.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<div class="container mx-auto my-8">
<div class="grid grid-cols-12 gap-x-4">
<div class="col-span-12 p-2 xl:col-span-4">
<div class="col-span-12 xl:col-span-4">
<x-card cardClasses="mt-8">
<x-slot name="header">
<div class="relative flex gap-4 px-2 pt-4 pb-2 border-b md:px-4">
Expand Down Expand Up @@ -42,7 +42,7 @@
<div class="flex flex-col gap-2">
@foreach ($user->attributes()->whereIn('type', [AttributeTypeEum::Job, AttributeTypeEum::Company])->get() as $attribute)
<div class="flex items-center gap-4">
<div class="flex gap-2 w-28">
<div class="flex gap-2 w-28 min-w-28">
<div class="min-w-max">
@svg($attribute->type->iconName(), 'w-6 h-6')
</div>
Expand Down Expand Up @@ -75,7 +75,7 @@
</div>
</x-card>
</div>
<div class="col-span-12 p-2 xl:col-span-8">
<div class="col-span-12 xl:col-span-8">
<div class="flex flex-col gap-4 mt-8">
<x-sad-carrot-complate-profile :show="auth()->id() === $user->id && !auth()->user()->isCompleted()" />
<x-card :title="__('About me')">
Expand All @@ -89,7 +89,7 @@
<div class="flex flex-col gap-2">
@forelse ($user->attributes()->whereNotIn('type', [AttributeTypeEum::Job, AttributeTypeEum::Bio, AttributeTypeEum::Company])->get() as $attribute)
<div class="flex items-center gap-4">
<div class="flex gap-2 w-28">
<div class="flex gap-2 w-28 min-w-28">
<div class="min-w-max">
@svg($attribute->type->iconName(), 'w-6 h-6')
</div>
Expand Down
50 changes: 25 additions & 25 deletions resources/views/livewire/ticket/list-tickets.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,48 +13,48 @@
<x-heroicon-o-ticket class="w-8 h-8 my-auto" />
<div class="-my-5 border border-2 border-dashed border-secondary-100 dark:border-secondary-900 border-left"></div>
<div class="grid items-center w-full grid-cols-12 lg:gap-6">
<h2 class="h-8 col-span-12 text-lg font-semibold md:col-span-3">
<h2 class="col-span-12 mb-4 text-xl font-semibold md:mb-0 md:text-lg md:col-span-3">
{{ $ticket->ticket_title }}
</h2>
<div class="grid items-center grid-cols-12 col-span-12 gap-4 md:col-span-9">
<div class="flex flex-col col-span-12 gap-1 md:col-span-5 lg:col-span-4">
<div class="flex md:flex-col lg:gap-2 lg:flex-row">
<p class="text-sm text-secondary-500">{{ __('Name') }}:</p>
<p class="text-sm">{{ $ticket->data->data->first_name . ' ' . $ticket->data->data->last_name }}</p>
<div class="flex flex-col col-span-12 gap-1 sm:flex-row md:flex-col md:col-span-5 lg:col-span-4">
<div class="flex w-full md:flex-col lg:gap-2 lg:flex-row">
<p class="w-full text-sm text-start text-secondary-500">{{ __('Name') }}:</p>
<p class="w-full text-sm text-start ">{{ $ticket->data->data->first_name . ' ' . $ticket->data->data->last_name }}</p>
</div>
<div class="flex md:flex-col lg:gap-2 lg:flex-row">
<p class="text-sm text-secondary-500">{{ __('Email') }}:</p>
<p class="text-sm">{{ $ticket->data->data->email }}</p>
<div class="flex w-full md:flex-col lg:gap-2 lg:flex-row">
<p class="w-full text-sm text-start text-secondary-500">{{ __('Email') }}:</p>
<p class="w-full text-sm text-start ">{{ $ticket->data->data->email }}</p>
</div>
</div>

<div class="flex flex-col col-span-12 gap-1 md:col-span-4">
<div class="flex md:flex-col lg:gap-2 lg:flex-row">
<p class="text-sm text-secondary-500">{{ __('Ticket price') }}:</p>
<p class="text-sm">{{ number_format($ticket->ticket_price) }} {{ __('Toman') }}</p>
<div class="flex flex-col col-span-12 gap-1 sm:flex-row md:flex-col md:col-span-4">
<div class="flex w-full md:flex-col lg:gap-2 lg:flex-row">
<p class="w-full text-sm text-start text-secondary-500">{{ __('Ticket price') }}:</p>
<p class="w-full text-sm text-start ">{{ number_format($ticket->ticket_price) }} {{ __('Toman') }}</p>
</div>
<div class="flex md:flex-col lg:gap-2 lg:flex-row">
<p class="text-sm text-secondary-500">{{ __('Paid price') }}:</p>
<p class="text-sm">{{ number_format($ticket->order_price) }} {{ __('Toman') }}</p>
<div class="flex w-full md:flex-col lg:gap-2 lg:flex-row">
<p class="w-full text-sm text-start text-secondary-500">{{ __('Paid price') }}:</p>
<p class="w-full text-sm text-start ">{{ number_format($ticket->order_price) }} {{ __('Toman') }}</p>
</div>
</div>

@if(!empty($ticket->discount_code))
<div class="flex flex-col col-span-3 col-span-12 gap-1 lg:col-span-4">
<div class="flex md:flex-col lg:gap-2 lg:flex-row">
<p class="text-sm text-secondary-500">{{ __('Discount code') }}:</p>
<p class="text-sm">{{ $ticket->discount_code }}</p>
<div class="flex flex-col col-span-12 gap-1 sm:flex-row md:flex-col md:col-span-3 lg:col-span-4">
<div class="flex w-full md:flex-col lg:gap-2 lg:flex-row">
<p class="w-full text-sm text-start text-secondary-500">{{ __('Discount code') }}:</p>
<p class="w-full text-sm text-start ">{{ $ticket->discount_code }}</p>
</div>
@if($ticket->discount_price != 0)
<div class="flex md:flex-col lg:gap-2 lg:flex-row">
<p class="text-sm text-secondary-500">{{ __('Discount price') }}:</p>
<p class="text-sm">{{ $ticket->discount_price }} {{ __('Toman') }}</p>
<div class="flex w-full md:flex-col lg:gap-2 lg:flex-row">
<p class="w-full text-sm text-start text-secondary-500">{{ __('Discount price') }}:</p>
<p class="w-full text-sm text-start ">{{ $ticket->discount_price }} {{ __('Toman') }}</p>
</div>
@endif
@if($ticket->discount_percentage != 0)
<div class="flex md:flex-col lg:gap-2 lg:flex-row">
<p class="text-sm text-secondary-500">{{ __('Discount percentage') }}:</p>
<p class="text-sm">%{{ $ticket->discount_percentage }}</p>
<div class="flex w-full md:flex-col lg:gap-2 lg:flex-row">
<p class="w-full text-sm text-start text-secondary-500">{{ __('Discount percentage') }}:</p>
<p class="w-full text-sm text-start ">%{{ $ticket->discount_percentage }}</p>
</div>
@endif
</div>
Expand Down

0 comments on commit 3908d9e

Please sign in to comment.