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

Fix/c; fix some link bugs #54

Merged
merged 6 commits into from
Oct 2, 2021
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
8 changes: 5 additions & 3 deletions app/Http/View/Composers/ClientComposer.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use App\Contact;
use App\Promo;
use App\Setting;
use Illuminate\View\View;

class ClientComposer
Expand All @@ -15,15 +16,16 @@ public function __construct()
'instagram' => Contact::where('name', 'instagram')->first(),
'youtube' => Contact::where('name', 'youtube')->first(),
'email' => Contact::where('name', 'email')->first(),
'bridestory' => Contact::where('name', 'instagram')->first(),
'bridestory' => Contact::where('name', 'bridestory')->first(),
'facebook' => Contact::where('name', 'facebook')->first()
];

// ambil text pemesanan dari setting
$this->whatsapp->text = urlencode(Setting::where('setting_name', 'contactFloatingButton_text')->first()->setting_value);
$this->promos_count = Promo::get()->count();
}

public function compose(View $view)
{
$view->with( 'whatsapp', $this->whatsapp)->with('promos_count', $this->promos_count)->with('socmed', $this->socmed);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

class CreateFaqTable extends Migration
class CreateFaqsTable extends Migration
{
/**
* Run the migrations.
Expand All @@ -28,6 +28,6 @@ public function up()
*/
public function down()
{
Schema::dropIfExists('faq');
Schema::dropIfExists('faqs');
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

class CreateFeedbackTable extends Migration
class CreateFeedbacksTable extends Migration
{
/**
* Run the migrations.
Expand All @@ -30,6 +30,6 @@ public function up()
*/
public function down()
{
Schema::dropIfExists('feedback');
Schema::dropIfExists('feedbacks');
}
}
18 changes: 9 additions & 9 deletions database/seeds/ContactSeeder.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,15 @@ public function run()
// contacts table seeder
DB::table('contacts')->insert(
[
[
'name' => 'website',
'contact' => 'mamotopicture.com',
'link' => 'https://',
'text' => 'Visit Website',
'logo' => 'fa fa-globe',
'created_at' => Carbon::now(),
'updated_at' => Carbon::now()
],
[
'name' => 'whatsapp',
'contact' => '6281281828317',
Expand Down Expand Up @@ -79,15 +88,6 @@ public function run()
'created_at' => Carbon::now(),
'updated_at' => Carbon::now()
],
[
'name' => 'website',
'contact' => 'mamotopicture.com',
'link' => 'https://',
'text' => 'Visit Website',
'logo' => 'fa fa-globe',
'created_at' => Carbon::now(),
'updated_at' => Carbon::now()
],
[
'name' => 'email',
'contact' => 'mamotopicture@gmail.com',
Expand Down
22 changes: 15 additions & 7 deletions database/seeds/RyumadaTableSeeder.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,21 @@ public function run()

/* --------------------------- settings for promo --------------------------- */
// seeder nomor telpon promo
DB::table('settings')->insert([
'module_name' => 'promo',
'setting_name' => 'promo_waNumber',
// PRODUCTION ubah nomor telpon
'setting_value' => '6285289675777',
'created_at' => Carbon::now(),
'updated_at' => Carbon::now()
\App\Setting::insert([
// [
// 'module_name' => 'promo',
// 'setting_name' => 'promo_waNumber',
// 'setting_value' => '6285289675777',
// 'created_at' => Carbon::now(),
// 'updated_at' => Carbon::now()
// ],
[
'module_name' => 'contact',
'setting_name' => 'contactFloatingButton_text',
'setting_value' => "Halo saya tertarik menggunakan jasa Mamoto Picture. Boleh minta Price Listnya\n\nNama :\nAcara :\nTanggal acara :\nVenue :",
'created_at' => Carbon::now(),
'updated_at' => Carbon::now()
],
]);
}
}
Binary file added public/images/default/contact-background.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion resources/css/admin/promo.css
Original file line number Diff line number Diff line change
Expand Up @@ -94,4 +94,8 @@
height: 100%;
object-fit: cover;
object-position: center;
}
}

.rr-image-responsive {
cursor: zoom-in;
}
51 changes: 19 additions & 32 deletions resources/css/contact.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,23 @@ i:hover {

body {
/* background-color: #FFFFFF !important; */
background-position: center center;
background-position: center;
background-repeat: no-repeat;
-webkit-background-size: contain;
-moz-background-size: contain;
-o-background-size: contain;
background-size: contain;
-webkit-background-size: cover;
-moz-background-size: cover;
-o-background-size: cover;
background-size: cover;
background-attachment: fixed;
}

.contact-profile {
border-radius: 5em;
/* border-radius: 5em;
border-width: 0.0625em;
border-style: solid;
border-color: black;
padding: 0.75em;
width: 7em;
height: 7em;
border-color: black; */
/* padding: 0.75em; */
width: 10em;
height: 10em;
display: flex;
justify-content: center;
align-items: center;
Expand Down Expand Up @@ -73,12 +73,12 @@ body {
}

.contact-list:hover {
opacity: 1;
opacity: 1;
background-color: #F8EDEB;
}

.contact-list:active {
position: relative;
position: relative;
top: 7px;
box-shadow: none;
}
Expand All @@ -96,33 +96,20 @@ body {
padding: 0.75em;
}

@media (min-width: 576px) {
.contact-profile {
width: 7em;
height: 7em;
}
.contact-profile-text {
font-size: 2em;
}
.contact-list-text {
font-size: 1.25em;
}
}

@media (min-width: 768px) {
@media (max-width: 576px) {
.contact-profile {
width: 9em;
height: 9em;
}
.contact-profile-text {
font-size: 3em;
}
}

@media (min-width: 577px) {
.contact-list-text {
font-size: 1.75em;
font-size: 1.15em;
}
}

@media (min-width: 992px) {
/* @media (min-width: 992px) {
.contact-profile {
width: 10em;
height: 10em;
Expand All @@ -144,4 +131,4 @@ body {
.contact-profile-text {
font-size: 4em;
}
}
} */
3 changes: 2 additions & 1 deletion resources/css/promo.css
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
width: 100%;
padding-top: 56.25%;
background-size: cover;
cursor: zoom-in;
}

.promo-img-container {
Expand Down Expand Up @@ -85,4 +86,4 @@

.text-promo-period {
font-size: 0.857em;
}
}
19 changes: 12 additions & 7 deletions resources/js/admin/about/about_summernote.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,15 @@ summernoteElement.summernote({
toolbar: [
['style', ['bold', 'italic', 'underline', 'clear']],
['font', ['strikethrough', 'superscript', 'subscript']],
['fontsize', ['undo', 'redo', 'fontsize']],
['fontsize', [
'undo',
'redo',
// 'fontsize'
]
],
['color', ['color']],
['para', ['ul', 'ol', 'paragraph', 'style']],
['height', ['height']],
// ['height', ['height']],
['insert', ['gallery', 'video', 'link', 'hr']],
// PRODUCTION remove codeview
['view', ['fullscreen', 'codeview', 'help']],
Expand All @@ -32,7 +37,7 @@ summernoteElement.summernote({
} else {
summernoteElement.parent().removeClass('bg-danger');
}

// ubah style tombol save
summernoteSaveButton.removeClass('btn-secondary').addClass('btn-primary');
},
Expand All @@ -43,8 +48,8 @@ summernoteElement.summernote({
gallery: { // summernote gallery settings
source: {
// data: [],
url: url_getIndex +
"?page=1" +
url: url_getIndex +
"?page=1" +
"&path=" + path +
"&index=" + index +
"&url_getIndex=" + url_getIndex +
Expand Down Expand Up @@ -97,7 +102,7 @@ summernoteSaveButton.on('click', function(){
toastValidateError();
} else {
summernoteElement.parent().removeClass('bg-danger');

// lakukan ajax save data
updateAbout(); // update ke database
}
Expand Down Expand Up @@ -142,4 +147,4 @@ function toastValidateError(){
icon: 'error',
title: 'Harap isi about post'
});
}
}
26 changes: 15 additions & 11 deletions resources/views/contact.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,31 @@
@include('layouts.css.al-styles')
<link rel="stylesheet" href="{{ asset('css/contact.css') }}">
</head>
<body style="background-image: url('{{ asset('images/wedding-ring.png') }}')">
<body style="background-image: url('{{ asset('images/default/contact-background.jpg') }}')">
<div class="container">
<div class="row my-5">
<div class="col-lg-6 order-lg-2 mt-2 mt-sm-3 mt-md-4 mt-lg-5">
<div class="row mt-4 justify-content-center">
{{-- social photo profile --}}
<div class="col-auto">
<a href="{{ $contact_instagram['link'] }}">
<div class="d-flex justify-content-center">
<div class="bg-white contact-profile">
<div class="contact-img" style="background-image: url({{ asset('images/mamoto_logo_hitam.svg') }});"></div>
<div class="d-flex justify-content-center">
<div class="contact-profile">
<div class="contact-img" style="background-image: url({{ asset('images/mamoto_picture_logo.png') }});"></div>
</div>
</div>
</div>
</a>
<a href="{{ $contact_instagram['link'] }}">
{{-- <a href="{{ $contact_instagram['link'] }}">
<p class="contact-profile-text">
{{ '@'.$contact_instagram['contact'] }}
</p>
</a>
</a> --}}
</div>
<div class="col-lg-6 order-lg-1 mt-5">
</div>
<div class="row mt-2 mb-5 justify-content-center">
{{-- links --}}
<div class="col-lg-6">
@foreach ($contacts as $value)
<a href="{{ $value['link'] }}">
<div class="d-flex justify-content-center my-lg-5 my-4">
<div class="d-flex justify-content-center my-3">
<div class="contact-list w-100 px-5">
<p class="contact-list-text d-flex">
<span class="d-flex align-items-center"><i class="{{ $value['logo'] }} fa-2x"></i></span>
Expand Down
4 changes: 2 additions & 2 deletions resources/views/layouts/footer.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<p class="al-grey-color pt-2">Terdaftar sebagai CV di Kementerian Hukum dan HAM <br>(Kemenkunham)</p>
</div>
</div>
<div class="col-12 d-flex justify-content-center">
<div class="col-12 d-flex justify-content-center my-3">
<a href="{{ $socmed['bridestory']->link . $socmed['bridestory']->contact }}" target="_blank">
<img src="/images/bridestory_logo.png" width="100px" height="30px" style="object-fit: contain">
</a>
Expand Down Expand Up @@ -43,4 +43,4 @@
<p class="al-grey-color">&copy 2021 <span class="font-weight-bold">Mamoto Picture.</span> garasijogi</p>
</div>
</div>
</footer>
</footer>