Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/Hummatech-Indonesia/product…
Browse files Browse the repository at this point in the history 
…-hummaclass-front-end
  • Loading branch information
@farahamaliaa
farahamaliaa committed Jan 6, 2025
2 parents d48d350 + 91cb494 commit e31e5d4
Show file tree
Hide file tree
Showing 4 changed files with 88 additions and 32 deletions.
69 changes: 53 additions & 16 deletions resources/views/auth/login.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@ class="authentication-login min-vh-100 bg-body row justify-content-center align-
width="130px;" alt="Logo"></a>
</div>
<h2 class="mb-3 fs-7 fw-bolder">Selamat Datang👋</h2>
<p class=" mb-9">Just enter your username and password below and you'll be back in
action
in no time. Let's go!</p>
<p class=" mb-9">Halo! Selamat datang di halaman pendaftaran akun GetSkill. Lengkapi
formulir di bawah ini dengan data yang valid untuk memulai pengalaman Anda bersama
kami.</p>
<button class="w-100 btn bg-transparent border border-1" style="border-radius: 15px;"
id="google-login">
<svg xmlns="http://www.w3.org/2000/svg" class="me-1 mb-1" width="17"
Expand All @@ -109,24 +109,25 @@ class="border-top w-100 position-absolute top-50 start-50 translate-middle"></sp
<form id="login-form">
<div class="input-group mb-3">
<button class="btn"
style="background-color: #F3F3F3;border-radius: 12px 0px 0px 12px"
type="button">
<svg xmlns="http://www.w3.org/2000/svg" width="25" height="15"
viewBox="-5 -2 24 24">
<path fill="#8B8B8B"
d="M3.534 10.07a1 1 0 1 1 .733 1.86A3.58 3.58 0 0 0 2 15.26V17a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1v-1.647a3.66 3.66 0 0 0-2.356-3.419a1 1 0 1 1 .712-1.868A5.66 5.66 0 0 1 14 15.353V17a3 3 0 0 1-3 3H3a3 3 0 0 1-3-3v-1.74a5.58 5.58 0 0 1 3.534-5.19M7 0a4 4 0 0 1 4 4v2a4 4 0 1 1-8 0V4a4 4 0 0 1 4-4m0 2a2 2 0 0 0-2 2v2a2 2 0 1 0 4 0V4a2 2 0 0 0-2-2" />
style="background-color: #F3F3F3; border-radius: 12px 0px 0px 12px"
type="button" tabindex="-1">
<svg class="ms-2" xmlns="http://www.w3.org/2000/svg" width="16"
height="16" fill="currentColor" class="bi bi-envelope"
viewBox="0 0 16 16">
<path
d="M0 4a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2v8a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2zm2-1a1 1 0 0 0-1 1v.217l7 4.2 7-4.2V4a1 1 0 0 0-1-1zm13 2.383-4.708 2.825L15 11.105zm-.034 6.876-5.64-3.471L8 9.583l-1.326-.795-5.64 3.47A1 1 0 0 0 2 13h12a1 1 0 0 0 .966-.741M1 11.105l4.708-2.897L1 5.383z" />
</svg>
</button>
<input type="text" class="form-control"
style="background-color: #F3F3F3;border:0px;border-radius: 0 12px 12px 0"
style="background-color: #F3F3F3; border: 0px; border-radius: 0 12px 12px 0"
name="email" id="email" value="{{ old('name', request('name')) }}"
placeholder="Email" aria-label="" aria-describedby="basic-addon1">
placeholder="Email">
<div class="invalid-feedback"></div>
</div>
<div class="input-group mb-3">
<button class="btn"
style="background-color: #F3F3F3;border-radius: 12px 0px 0px 12px"
type="button">
style="background-color: #F3F3F3; border-radius: 12px 0px 0px 12px"
type="button" tabindex="-1">
<svg class="ms-2" xmlns="http://www.w3.org/2000/svg" width="15"
height="15" viewBox="0 0 16 16">
<path fill="#8B8B8B" fill-rule="evenodd"
Expand All @@ -135,11 +136,24 @@ class="border-top w-100 position-absolute top-50 start-50 translate-middle"></sp
</svg>
</button>
<input type="password" class="form-control"
style="background-color: #F3F3F3;border:0px;border-radius: 0 12px 12px 0"
name="password" id="password" value="{{ old('name', request('name')) }}"
placeholder="Password" aria-label="" aria-describedby="basic-addon1">
style="background-color: #F3F3F3;border:0px;" name="password"
id="password" value="{{ old('name', request('name')) }}"
placeholder="Password" aria-label="" aria-describedby="basic-addon1"
tabindex="3">
<button type="button" class="btn" id="toggle-password">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"
fill="currentColor" class="bi bi-eye-slash" viewBox="0 0 16 16">
<path
d="M13.359 11.238C15.06 9.72 16 8 16 8s-3-5.5-8-5.5a7 7 0 0 0-2.79.588l.77.771A6 6 0 0 1 8 3.5c2.12 0 3.879 1.168 5.168 2.457A13 13 0 0 1 14.828 8q-.086.13-.195.288c-.335.48-.83 1.12-1.465 1.755q-.247.248-.517.486z" />
<path
d="M11.297 9.176a3.5 3.5 0 0 0-4.474-4.474l.823.823a2.5 2.5 0 0 1 2.829 2.829zm-2.943 1.299.822.822a3.5 3.5 0 0 1-4.474-4.474l.823.823a2.5 2.5 0 0 0 2.829 2.829" />
<path
d="M3.35 5.47q-.27.24-.518.487A13 13 0 0 0 1.172 8l.195.288c.335.48.83 1.12 1.465 1.755C4.121 11.332 5.881 12.5 8 12.5c.716 0 1.39-.133 2.02-.36l.77.772A7 7 0 0 1 8 13.5C3 13.5 0 8 0 8s.939-1.721 2.641-3.238l.708.709zm10.296 8.884-12-12 .708-.708 12 12z" />
</svg>
</button>
<div class="invalid-feedback"></div>
</div>
<!-- Form elements below remain unchanged -->
<div class="d-flex align-items-center justify-content-between mb-4">
<div class="form-check">
<input class="form-check-input" name="remember" type="checkbox"
Expand Down Expand Up @@ -170,6 +184,29 @@ class="border-top w-100 position-absolute top-50 start-50 translate-middle"></sp
</div>

<script src="{{ asset('assets/js/jquery-3.6.0.min.js') }}"></script>
<script>
document.getElementById('toggle-password').addEventListener('click', function() {
const passwordInput = document.getElementById('password');
const type = passwordInput.type === 'password' ? 'text' : 'password';
passwordInput.type = type;
if (type === 'password') {
$('#toggle-password').html(
`<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-eye-slash" viewBox="0 0 16 16">
<path d="M13.359 11.238C15.06 9.72 16 8 16 8s-3-5.5-8-5.5a7 7 0 0 0-2.79.588l.77.771A6 6 0 0 1 8 3.5c2.12 0 3.879 1.168 5.168 2.457A13 13 0 0 1 14.828 8q-.086.13-.195.288c-.335.48-.83 1.12-1.465 1.755q-.247.248-.517.486z"/>
<path d="M11.297 9.176a3.5 3.5 0 0 0-4.474-4.474l.823.823a2.5 2.5 0 0 1 2.829 2.829zm-2.943 1.299.822.822a3.5 3.5 0 0 1-4.474-4.474l.823.823a2.5 2.5 0 0 0 2.829 2.829"/>
<path d="M3.35 5.47q-.27.24-.518.487A13 13 0 0 0 1.172 8l.195.288c.335.48.83 1.12 1.465 1.755C4.121 11.332 5.881 12.5 8 12.5c.716 0 1.39-.133 2.02-.36l.77.772A7 7 0 0 1 8 13.5C3 13.5 0 8 0 8s.939-1.721 2.641-3.238l.708.709zm10.296 8.884-12-12 .708-.708 12 12z"/>
</svg>`
);
} else {
$('#toggle-password').html(
`<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-eye" viewBox="0 0 16 16">
<path d="M16 8s-3-5.5-8-5.5S0 8 0 8s3 5.5 8 5.5S16 8 16 8M1.173 8a13 13 0 0 1 1.66-2.043C4.12 4.668 5.88 3.5 8 3.5s3.879 1.168 5.168 2.457A13 13 0 0 1 14.828 8q-.086.13-.195.288c-.335.48-.83 1.12-1.465 1.755C11.879 11.332 10.119 12.5 8 12.5s-3.879-1.168-5.168-2.457A13 13 0 0 1 1.172 8z"/>
<path d="M8 5.5a2.5 2.5 0 1 0 0 5 2.5 2.5 0 0 0 0-5M4.5 8a3.5 3.5 0 1 1 7 0 3.5 3.5 0 0 1-7 0"/>
</svg>`
);
}
});
</script>
<script>
$(document).ready(function() {
// Google Login
Expand Down
21 changes: 19 additions & 2 deletions resources/views/user/layouts/header.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,15 @@ class="menu-item {{ Route::currentRouteName() == 'point-exchange.index' ? 'activ
<form action="{{ route('logout') }}" method="POST">
@csrf
<li class="menu-item d-block d-md-none">
<button type="submit" class="border-0 bg-transparent ps-4">Keluar</button>
<button type="submit" class="border-0 bg-transparent ps-4"
style="background: #e30000"><svg xmlns="http://www.w3.org/2000/svg"
width="16" height="16" fill="currentColor"
class="bi bi-box-arrow-left" viewBox="0 0 16 16">
<path fill-rule="evenodd"
d="M6 12.5a.5.5 0 0 0 .5.5h8a.5.5 0 0 0 .5-.5v-9a.5.5 0 0 0-.5-.5h-8a.5.5 0 0 0-.5.5v2a.5.5 0 0 1-1 0v-2A1.5 1.5 0 0 1 6.5 2h8A1.5 1.5 0 0 1 16 3.5v9a1.5 1.5 0 0 1-1.5 1.5h-8A1.5 1.5 0 0 1 5 12.5v-2a.5.5 0 0 1 1 0z" />
<path fill-rule="evenodd"
d="M.146 8.354a.5.5 0 0 1 0-.708l3-3a.5.5 0 1 1 .708.708L1.707 7.5H10.5a.5.5 0 0 1 0 1H1.707l2.147 2.146a.5.5 0 0 1-.708.708z" />
</svg> Keluar</button>
</li>
</form>
@endsession
Expand Down Expand Up @@ -273,7 +281,16 @@ class="rounded rounded-circle" width="48px" alt=""
class="profile-image">
</a>

<button type="submit" class="btn shadow-none py-3 ms-3">Keluar</button>
<button type="submit" class="btn shadow-none py-3 ms-3"
style="background: #e30000"><svg
xmlns="http://www.w3.org/2000/svg" width="16"
height="16" fill="currentColor"
class="bi bi-box-arrow-left" viewBox="0 0 16 16">
<path fill-rule="evenodd"
d="M6 12.5a.5.5 0 0 0 .5.5h8a.5.5 0 0 0 .5-.5v-9a.5.5 0 0 0-.5-.5h-8a.5.5 0 0 0-.5.5v2a.5.5 0 0 1-1 0v-2A1.5 1.5 0 0 1 6.5 2h8A1.5 1.5 0 0 1 16 3.5v9a1.5 1.5 0 0 1-1.5 1.5h-8A1.5 1.5 0 0 1 5 12.5v-2a.5.5 0 0 1 1 0z" />
<path fill-rule="evenodd"
d="M.146 8.354a.5.5 0 0 1 0-.708l3-3a.5.5 0 1 1 .708.708L1.707 7.5H10.5a.5.5 0 0 1 0 1H1.707l2.147 2.146a.5.5 0 0 1-.708.708z" />
</svg> Keluar</button>
</div>
</form>
</li>
Expand Down
3 changes: 2 additions & 1 deletion resources/views/user/pages/checkout/scripts/index.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -268,9 +268,10 @@ function submitCheckout() {
}
function eWalletChild(data, checked = '') {
return `
<label class="payment-option">
<input type="radio" class="payment-method" name="payment_method" data-code="${data.code}" id="${data.code}" data-fee="${data.fee_merchant.flat}" value="${data.code}" ${checked}>
<input type="radio" class="payment-method" name="payment_method" data-code="${data.code}" id="${data.code}" data-fee="${data.fee_customer.flat}" value="${data.code}" ${checked}>
<div class="option-content">
<img src="${data.icon_url}" alt="Gopay logo" style="width: 100%;">
</div>
Expand Down
27 changes: 14 additions & 13 deletions resources/views/user/pages/dashboard/widgets/dashboard-top.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<div class="dashboard__instructor-info">
<div class="dashboard__instructor-info-left">
<div class="thumb">
<img class="detail-photo" id="detail-photo-user"
src="" alt="img" style="width: 120px;height: 120px;object-fit: cover;">
<img class="detail-photo" id="detail-photo-user" src="" alt="img"
style="width: 120px;height: 120px;object-fit: cover;">
</div>
<div class="content">
<h4 class="title detail-name" id="detail-name-user"></h4>
Expand All @@ -22,22 +22,23 @@
$(document).ready(function() {
$.ajax({
type: "GET",
url: "{{ config('app.api_url') }}" + "/api/profile" ,
url: "{{ config('app.api_url') }}" + "/api/profile",
headers: {
Authorization: 'Bearer ' + "{{ session('hummaclass-token') }}"
},
dataType: "json",
success: function(response) {
var profileImage = response.data.photo && /\.(jpeg|jpg|gif|png)$/i.test(response.data.photo)
? response.data.photo
: '{{ asset('assets/img/no-image/no-profile.jpeg') }}';
console.log(profileImage);
var profileImage = response.data.photo && /\.(jpeg|jpg|gif|png)$/i.test(response
.data.photo) ?
response.data.photo :
'{{ asset('assets/img/no-image/no-profile.jpeg') }}';
$('#detail-photo-user').attr('src', profileImage);
var bannerImage = response.data.banner && /\.(jpeg|jpg|gif|png)$/i.test(response.data.banner)
? response.data.banner
: '{{ asset('assets/img/no-image/no-image.jpg') }}';
var bannerImage = response.data.banner && /\.(jpeg|jpg|gif|png)$/i.test(response
.data.banner) ?
response.data.banner :
'{{ asset('assets/img/no-image/no-image.jpg') }}';
$('#detail-banner-user').css('background-image', 'url(' + bannerImage + ')');
$('#detail-name-user').html(response.data.name);
$('#detail-email-user').html(response.data.email);
Expand All @@ -53,4 +54,4 @@
}
});
});
</script>
</script>

0 comments on commit e31e5d4

Please sign in to comment.