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.

Sign up for GitHub

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

change theme #68

Merged
merged 1 commit into from
Nov 23, 2023
Merged

change theme #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions resources/views/auth/login.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,25 +49,25 @@ class="mb-4 rounded-lg bg-green-100 px-6 py-5 text-base text-dark-700 w-[70%] mx
<h3 class="text-xs mt-1">Fakultas Teknik dan Kejuruan</h3>
</div>
<div class="bg-[#F2F1FA] w-80 mx-auto rounded-lg p-5 lg:w-96 lg:mt-24 shadow-md lg:shadow-2xl lg:p-7"> <!--Form-->
<h2 class="text-blue-400 font-bold text-2xl">Masuk</h2>
<h2 class="text-blue-950 font-bold text-2xl">Masuk</h2>
<p class="my-2 text-[13px] max-w-[250px]">Gunakan akun Undiksha untuk masuk ke dalam Sistem Manajemen Ruangan FTK</p>
<form action="{{ route('login') }}" method="POST">
@csrf
<label class=" text-sm font-bold text-blue-400" for="email">Email</label><br>
<label class=" text-sm font-bold text-blue-950" for="email">Email</label><br>
<input class="mb-3 mt-1 w-full rounded-md p-2 text-[12px]" placeholder="[email protected]" type="email" id="email" name="email"><br>
@error('email')
<div class="text-sm text-red-500">
{{ $message }}
</div>
@enderror

<label class="text-sm font-bold text-blue-400" for="password">Password</label><br>
<label class="text-sm font-bold text-blue-950" for="password">Password</label><br>
<input class="p-2 text-[12px] mt-1 w-full rounded-md" placeholder="*********" type="password" id="password" name="password"><br>

<button class="hover:bg-blue-500 bg-blue-400 text-white text-md font-bold py-2 px-4 rounded-md w-full mt-4 mb-2" type="submit">Masuk </button>
<button class="hover:bg-blue-950 bg-blue-950 text-white text-md font-bold py-2 px-4 rounded-md w-full mt-4 mb-2" type="submit">Masuk </button>
</form>
<p class="text-[13px] max-w-[250px] my-2">Untuk pengguna dari luar Undiksha, silakan membuat akun di bawah ini</p>
<a href="/register" class="text-[13px] text-b1 underline text-blue-400" wire:navigate><p class="mt-1">Daftar</p></a>
<a href="/register" class="text-[13px] text-b1 underline text-primary" wire:navigate><p class="mt-1">Daftar</p></a>
</div>
</div>
</div>
Expand Down
18 changes: 9 additions & 9 deletions resources/views/auth/register.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,27 +41,27 @@
<h3 class="text-xs mt-1">Fakultas Teknik dan Kejuruan</h3>
</div>
<div class="bg-[#F2F1FA] w-80 mx-auto rounded-lg p-5 lg:w-96 lg:mt-12 shadow-md lg:shadow-xl lg:p-7"> <!--Form-->
<h2 class="text-[#60A5FA] font-bold text-2xl">Daftar</h2>
<h2 class="text-blue-950 font-bold text-2xl">Daftar</h2>
<p class="mt-1 text-[13px] mb-2">Silakan isi data dibawah ini dengan benar</p>
<form action="{{ route('register') }}" method="POST">
@csrf
<label class="text-sm font-bold text-[#60A5FA]" for="nama">Nama</label><br>
<input class="p-2 text-[12px] mb-3 mt-1 w-full rounded-md " placeholder="Jhon Doe" type="text" id="nama" name="name" value="{{ old('name') }}"><br>
<label class="text-sm font-bold text-blue-950" for="nama">Nama</label><br>
<input class="p-2 text-[12px] mb-3 mt-1 w-full rounded-md " placeholder="Masukan nama" type="text" id="nama" name="name" value="{{ old('name') }}"><br>
@error('name')
<div class="text-sm text-red-400 -mt-2 mb-1">
{{ $message }}
</div>
@enderror

<label class=" text-sm font-bold text-[#60A5FA]" for="email">Email</label><br>
<label class=" text-sm font-bold text-blue-950" for="email">Email</label><br>
<input class="mb-3 mt-1 w-full rounded-md p-2 text-[12px]" placeholder="[email protected]" type="email" id="email" name="email" value="{{ old('name') }}"><br>
@error('email')
<div class="text-sm text-red-400 -mt-2 mb-1">
{{ $message }}
</div>
@enderror

<label class="text-sm font-bold text-[#60A5FA]" for="telepon">Telepon (WhatsApp)</label><br>
<label class="text-sm font-bold text-blue-950" for="telepon">Telepon (WhatsApp)</label><br>
<input class="p-2 text-[12px] mb-3 mt-1 w-full rounded-md" type="text" placeholder="0812313451" id="telepon" name="phone_number" value="{{ old('phone_number') }}"><br>
@error('phone_number')
<div class="text-sm text-red-400 -mt-2 mb-1">
Expand All @@ -71,12 +71,12 @@

<div class="grid grid-cols-2 gap-2 mb-1">
<div>
<label class="text-sm font-bold text-[#60A5FA]" for="password">Password</label><br>
<label class="text-sm font-bold text-blue-950" for="password">Password</label><br>
<input class="p-2 text-[12px] mt-1 w-full rounded-md" placeholder="*********" type="password" id="password" name="password"><br>

</div>
<div>
<label class="text-sm font-bold text-[#60A5FA]" for="confirm_pass">Confirm Password</label><br>
<label class="text-sm font-bold text-blue-950" for="confirm_pass">Confirm Password</label><br>
<input class="p-2 text-[12px] mt-1 w-full rounded-md" placeholder="*********" type="password" id="confirm_pass" name="confirm_pass"><br>
</div>
</div>
Expand All @@ -86,10 +86,10 @@
</div>
@enderror

<button class="bg-blue-400 hover:bg-blue-500 bg-b1 text-white text-[15px] font-bold py-2 px-4 rounded-md w-full mt-4 mb-2 " type="submit">Daftar</button>
<button class="bg-blue-950 hover:bg-blue-950 bg-b1 text-white text-[15px] font-bold py-2 px-4 rounded-md w-full mt-4 mb-2 " type="submit">Daftar</button>
</form>
<p class="text-[13px] mt-2">Sudah punya akun? Masuk dibawah ini</p>
<a class="text-[13px] text-b1 underline text-blue-500 " href="/login" wire:navigate><p>Masuk</p></a>
<a class="text-[13px] text-b1 underline text-blue-950 " href="/login" wire:navigate><p>Masuk</p></a>
</div>

</div>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/components/modal-button.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<button
type="button"
class="rounded-full bg-white p-2 text-blue-600 drop-shadow-md text-4xl border border-blue-100"
class="rounded-full bg-white p-2 text-primary drop-shadow-md text-4xl border border-blue-100"
data-te-toggle="modal"
data-te-target="#exampleModal"
data-te-ripple-init
Expand Down
2 changes: 1 addition & 1 deletion resources/views/home/history.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class="absolute z-[1000] float-left m-0 hidden min-w-max list-none overflow-hidd
class="block w-full whitespace-nowrap bg-transparent px-4 py-2 text-sm font-normal text-neutral-700 hover:bg-neutral-100 active:text-neutral-800 active:no-underline disabled:pointer-events-none disabled:bg-transparent disabled:text-neutral-400 dark:text-neutral-200 dark:hover:bg-neutral-600"
href="/dashboard"
data-te-dropdown-item-ref
><i class="bi bi-speedometer2 text-blue-400"></i><span class="ml-2">Halaman Utama</span></a
><i class="bi bi-speedometer2 text-blue-400"></i><span class="ml-2">Dashboard</span></a
>
</li>
@endif
Expand Down
2 changes: 1 addition & 1 deletion resources/views/layouts/auth.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<title>SIMARU</title>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/font/bootstrap-icons.css">
</head>
<body class="font-poppins bg-blue-400">
<body class="font-poppins bg-blue-950">
@yield('container')

<script>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/livewire/navbar.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class="absolute z-[1000] float-left m-0 hidden min-w-max list-none overflow-hidd
class="block w-full whitespace-nowrap bg-transparent px-4 py-2 text-sm font-normal text-neutral-700 hover:bg-neutral-100 active:text-neutral-800 active:no-underline disabled:pointer-events-none disabled:bg-transparent disabled:text-neutral-400 dark:text-neutral-200 dark:hover:bg-neutral-600"
href="/dashboard"
data-te-dropdown-item-ref
><i class="bi bi-speedometer2 text-blue-400"></i><span class="ml-2">Halaman Utama</span></a
><i class="bi bi-speedometer2 text-blue-400"></i><span class="ml-2">Dashboard</span></a
>
</li>
@endif
Expand Down
6 changes: 3 additions & 3 deletions resources/views/livewire/schedule-calendar.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
@auth
@include('components.modal-button')
@else
<a href="{{ route('login') }}" type="button" class="rounded-full bg-white p-2 text-blue-600 drop-shadow-md text-4xl border border-blue-100"
<a href="{{ route('login') }}" type="button" class="rounded-full bg-white p-2 text-primary drop-shadow-md text-4xl border border-blue-100"
data-te-toggle="tooltip"
title="Booking Ruangan"><i class="bi bi-plus-lg"></i></a>
@endauth
</th>
@foreach ($weekDates as $week)
<th class="md:p-2 border-r h-24 lg:w-40 px-16 bg-blue-400 text-white box-border">
<th class="md:p-2 border-r h-24 lg:w-40 px-16 bg-primary text-white box-border">
@if ($week['date'] == $today)
<span class="uppercase text-white">
{{ Illuminate\Support\Str::limit($week['day'], 3, '') }}
Expand All @@ -38,7 +38,7 @@
<tbody class="">
@foreach ($labs as $lab)
<tr class="text-center h-20" wire:key="{{ $lab->id }} ">
<td class="border px-3 lg:px-3 h-40 items-center bg-blue-400 lg:w-40 sticky left-0" id="lab-name"
<td class="border px-3 lg:px-3 h-40 items-center bg-primary lg:w-40 sticky left-0" id="lab-name"
data-sticky="true">
<a href="{{ route('lab.view', $lab->slug) }}">
<div class="h-40 mx-auto flex justify-center items-center">
Expand Down
3 changes: 3 additions & 0 deletions tailwind.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ export default {
extend: {},
fontFamily: {
'poppins': ['Poppins', 'sans-serif']
},
color: {
'primary': '#172554',
}
},
plugins: [],
Expand Down
Loading