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

fix: feedback-4/ styling #20

Merged
merged 1 commit into from
Feb 13, 2025
Merged

fix: feedback-4/ styling #20

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
21 changes: 15 additions & 6 deletions app/Http/Controllers/Admin/UserController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,10 +178,9 @@ public function createCustomerViaAjax(Request $request)

public function update(Request $request, $id) {
$user = User::find(Auth::id());
if($request->banner != "")
$user->my_banner = $request->banner;
if($request->side != "")
$user->my_side = $request->side;

$user->my_side = $request->side;
$user->my_banner = $request->banner;
$user->layout = $request->layout;
$user->my_content = $request->content;
$user->my_background = $request->my_background;
Expand Down Expand Up @@ -231,13 +230,23 @@ public function updatePrivatePassword(Request $request) {

public function updatePrivateContent(Request $request) {
$user = User::find(Auth::id());
if(isset($request->password)) {
if($request->password == $request->confirmpassword) {
$user->private_password = Hash::make($request->password);
$user->save();
} else {
Toastr::error(__('Password does not match.'));
return back()->withInput();
}
}

if ($user->private_password != null) {
$user->private_content = $request->content;
$user->save();
Toastr::success(__('Your content updated successfuly!'));
return redirect()->route('private');
return redirect()->route('private');
} else {
Toastr::error(__('Please set your private password.'));
Toastr::error(__('Please set up your password for your Protected Content.'));
return back()->withInput();
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/ArtWorkController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public function store(Request $request) {
$artwork->type = $request->input('type');
$artwork->section = $request->input('section');
$artwork->info = $request->input('info');
$artwork->visibility = $request->input('visibility');
$artwork->visibility = "1";
$artwork->layers = $request->input('layers');
$artwork->sketch = $request->input('sketch');
$artwork->snb = $request->input('snb');
Expand Down
4 changes: 4 additions & 0 deletions public/frontend/css/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1583,4 +1583,8 @@ button.row_but {

.bg-danger {
background-color: red !important;
}

.border-bottom-divider {
border-bottom: 1px solid #fff;
}
Binary file added public/uploads/249-1739283814.jpeg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/uploads/249-1739283822.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/uploads/249-1739283835.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/uploads/250-1739284583.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/uploads/250-1739284594.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/uploads/250-1739284598.jpeg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/uploads/250-1739284601.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/uploads/250-1739291281.jpeg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/uploads/250-1739291517.jpeg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/uploads/250-1739291519.jpeg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/uploads/250-1739291522.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/uploads/250-1739291892.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/uploads/250-1739291894.jpeg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/uploads/250-1739291941.jpeg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/uploads/250-1739291958.jpeg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/uploads/250-1739291961.jpeg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/uploads/250-1739291964.jpeg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/uploads/250-1739293261.jpeg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion resources/views/admin/threads/create.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

var textarea = document.getElementById('editor');
sceditor.create(textarea, {
format: 'bbcode',
format: 'xhtml',
style: 'https://cdn.jsdelivr.net/npm/sceditor@3/minified/themes/content/default.min.css',
emoticonsEnabled: false
});
Expand Down
2 changes: 1 addition & 1 deletion resources/views/frontend/account.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
</div>
<div class="desc bg-cover aspects" style="background-image: url({{ static_asset('uploads/'. $user->my_background) }});">
@if(!empty($user->my_content))
<p class="my-content-profile">{{$user->my_content}}</p>
<div class="my-content-profile">@stripBBCode($user->my_content)</div>
@else
<h5 style="color: #999;" class="mt-4">
Upload your content here.
Expand Down
4 changes: 2 additions & 2 deletions resources/views/frontend/account/detail.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
</div>
</div>
<div class="row mt-3 position-relative">
<img src="{{ $user->avatar == NULL ? ($user->gender == 'female' ? static_asset('images/img/female_default.jpg') : static_asset('images/img/male_default.jpg')) : static_asset('uploads') . '/' . $user->avatar }}" alt="" width="300" class="avatar-img" style="width: 300px; height: 300px; margin: auto">
<img src="{{ $user->avatar == NULL ? ($user->gender == 'female' ? static_asset('images/img/female_default.jpg') : static_asset('images/img/male_default.jpg')) : static_asset('uploads') . '/' . $user->avatar }}" alt="" width="300" class="avatar-img" style="width: 300px; height: 300px; margin: auto; padding: 0;">
<button type="button" class="remove-profile" id="removeThumbnail"><span aria-hidden="true">&times;</span></button>
</div>
<div class="row mt-3">
Expand Down Expand Up @@ -273,7 +273,7 @@
text-align: center;
color: grey;
padding: 2px 8px;
right: -24px;
right: 49px;
}
</style>

Expand Down
6 changes: 5 additions & 1 deletion resources/views/frontend/account/editartwork.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@

.go-back-button {
color: white;
background-color: red;
background-color: #999999;
padding: 5px 15px;
width: 200px;
font-size: 15px;
Expand Down Expand Up @@ -418,6 +418,10 @@
/* float: left; */
}

.submit-artwork {
background-color: #999999;
}

.page-account-upload .create {
float: right;
}
Expand Down
2 changes: 1 addition & 1 deletion resources/views/frontend/account/link.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
@else
@foreach($links as $link)
<tr data-id="{{ $link->id }}">
<td><a style="color:red; text-decoration: underline; font-size: unset;" href="{{ $link->url }}" target="_blank">{{ $link->name }}</a></td>
<td><a style="color:red; text-decoration: none; font-size: unset;" href="{{ $link->url }}" target="_blank">{{ $link->name }}</a></td>
<td>{{ $link->desc }}</td>
<td>
<a href="{{ route('link.edit', $link->id) }}">
Expand Down
30 changes: 28 additions & 2 deletions resources/views/frontend/account/private.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
@include('frontend.partials.sidebar1')
<div class="col-md-10 center primary p-4">
<h1>PRIVATE AREA</h1>
@if(!empty($user->private_password))
<form class="pt-4">
<div class="mb-3 row">
<div class="col-md-6">
Expand All @@ -45,14 +46,38 @@
<div class="col-md-6 d-flex justify-content-center align-items-center" style="height: 108px">
<button type="button" class="change" id="changePasswordBtn">Change Password</button>
</div>

</div>
</form>
@endif
<form action="{{ route('user.updatePrivateContent') }}" method="POST" enctype="multipart/form-data">
@csrf
@if(empty($user->private_password))
<div class="mb-3 mt-4 row border-bottom-divider">
<div class="col-md-6">
<div class="mb-3 row form-group">
<label for="password" class="col-sm-5 col-form-label" required >Set Password:</label>
<div class="col-sm-7">
<input type="password" class="form-control" id="password" data-indicator="strengthLevel" name="password" placeholder="" value="{{ old('password') }}" required>
</div>
</div>
<div class="mb-3 row form-group">
<label for="confirmpassword" class="col-sm-5 col-form-label" required >Confirm Password:</label>
<div class="col-sm-7">
<input type="password" class="form-control" id="confirmpassword" name="confirmpassword" placeholder="" value="{{ old('confirmpassword') }}" required>
<div id="strengthLevel" class="password_strength pass_state01"></div>
</div>
</div>
<div class="mb-3 row form-group">
<div class="col-md-12">
<span id="passwordError" style="color: red;"></span>
</div>
</div>
</div>
</div>
@endif
<div class="row">
<div class="col-sm-12">
<textarea name="content" id="editor">{{ $user->private_content}}</textarea>
<textarea name="content" id="editor">{{ !empty(old('content')) ? old('content') : $user->private_content }}</textarea>
</div>
</div>
<div class="mb-3 row mt-3">
Expand All @@ -67,6 +92,7 @@
</div>
</div>
</main>

<script>
var textarea = document.getElementById('editor');
sceditor.create(textarea, {
Expand Down
97 changes: 68 additions & 29 deletions resources/views/frontend/account/profile.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@
<div class="col-md-4">
Main Banner:
</div>
<div class="col-md-4 banner-img">
<div class="col-md-4 banner-img position-relative">
@if($banner != NULL)
<img src="{{ static_asset('uploads/' . $banner) }}" width="300" alt="">
<button type="button" class="remove-img-btn" id="remote-main-banner-img-btn"><span aria-hidden="true">&times;</span></button>
<p style="color:#999">(1200 <i class="bi bi-plus-lg"></i> 400px)</p>
@endif
</div>
Expand All @@ -43,9 +44,10 @@
<div class="col-md-4">
Main Background:
</div>
<div class="col-md-4 main-background-img">
<div class="col-md-4 main-background-img position-relative">
@if($my_background != NULL)
<img src="{{ static_asset('uploads/' . $my_background) }}" width="300" alt="">
<button type="button" class="remove-img-btn" id="remote-main-background-img-btn"><span aria-hidden="true">&times;</span></button>
<p style="color:#999">(1920 <i class="bi bi-plus-lg"></i> 1080px)</p>
@endif
</div>
Expand Down Expand Up @@ -75,32 +77,37 @@
<input type="file" id="banner-upload" accept="image/*" hidden>
</div>

<div class="full-width-layout" style="display:none;">
<div class="main-content1">
<textarea name="content" id="editor">{{$content}}</textarea>
<!-- Content goes here -->
</div>
</div>

<div class="left-sidebar-layout">
<div class="sidebar left">
<img src="{{ $side == NULL ? static_asset('images/img/sidebar_default.jpg') : static_asset('uploads/' . $side) }}" alt="Banner" />
<p style="color:#999; text-align:left" >(300 <i class="bi bi-plus-lg"></i> 850px)</p>
</div>
<div class="main-content1">
<textarea name="content" id="editor1">{{$content}}</textarea>
<!-- Content goes here -->

<div class="profile-info-editor-group">
<div class="full-width-layout" style="display:none;">
<div class="main-content1">
<textarea name="content" id="editor">{{$content}}</textarea>
<!-- Content goes here -->
</div>
</div>
</div>

<div class="right-sidebar-layout" style="display:none;">
<div class="main-content1">
<textarea name="content" id="editor2">{{$content}}</textarea>
<!-- Content goes here -->
<div class="left-sidebar-layout">
<div class="sidebar left position-relative">
<img src="{{ $side == NULL ? static_asset('images/img/sidebar_default.jpg') : static_asset('uploads/' . $side) }}" alt="Banner" />
<button type="button" style="right: 0;" class="remove-img-btn remove-sidebar-img-btn" id="remote-sidebar-img-btn"><span aria-hidden="true">&times;</span></button>
<p style="color:#999; text-align:left" >(300 <i class="bi bi-plus-lg"></i> 850px)</p>
</div>
<div class="main-content1">
<textarea name="content" id="editor1">{{$content}}</textarea>
<!-- Content goes here -->
</div>
</div>
<div class="sidebar right">
<img src="{{ $side == NULL ? static_asset('images/img/sidebar_default.jpg') : static_asset('uploads/' . $side) }}" alt="Banner" />
<p style="color:#999; text-align:left" >(300 <i class="bi bi-plus-lg"></i> 850px)</p>

<div class="right-sidebar-layout" style="display:none;">
<div class="main-content1">
<textarea name="content" id="editor2">{{$content}}</textarea>
<!-- Content goes here -->
</div>
<div class="sidebar right position-relative">
<img src="{{ $side == NULL ? static_asset('images/img/sidebar_default.jpg') : static_asset('uploads/' . $side) }}" alt="Banner" />
<button type="button" style="right: 0;" class="remove-img-btn remove-sidebar-img-btn" id="remote-right-sidebar-img-btn"><span aria-hidden="true">&times;</span></button>
<p style="color:#999; text-align:left" >(300 <i class="bi bi-plus-lg"></i> 850px)</p>
</div>
</div>
</div>
<!-- <div class="row">
Expand All @@ -125,6 +132,18 @@
@endsection

<style>
.remove-img-btn {
position: absolute;
width: 36px;
height: 33px;
text-align: center;
color: grey !important;
padding: 2px 8px !important;
right: -6px;
top: 0px;
background: white !important;
}

.progress {
height: 20px;
background-color: #e9ecef;
Expand Down Expand Up @@ -297,7 +316,6 @@
}
</style>


<script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>

Expand All @@ -312,19 +330,22 @@
sceditor.create(textarea, {
format: 'bbcode',
style: 'https://cdn.jsdelivr.net/npm/sceditor@3/minified/themes/content/default.min.css',
emoticonsEnabled: false
emoticonsEnabled: false,
plugins: 'dragdrop'
});

sceditor.create(textarea1, {
format: 'bbcode',
style: 'https://cdn.jsdelivr.net/npm/sceditor@3/minified/themes/content/default.min.css',
emoticonsEnabled: false
emoticonsEnabled: false,
plugins: 'dragdrop'
});

sceditor.create(textarea2, {
format: 'bbcode',
style: 'https://cdn.jsdelivr.net/npm/sceditor@3/minified/themes/content/default.min.css',
emoticonsEnabled: false
emoticonsEnabled: false,
plugins: 'dragdrop'
});

editor = sceditor.instance(textarea);
Expand Down Expand Up @@ -528,6 +549,24 @@ function chooselayout(layout) {

})

$('#remote-main-banner-img-btn').on('click', function() {
$(this).parent('.position-relative').html('');
$('.banner-url').val('');
})

$('#remote-main-background-img-btn').on('click', function() {
$(this).parent('.position-relative').html('');
$('.my-background-url').val('');
})

$('.remove-sidebar-img-btn').on('click', function(e) {
e.preventDefault();
e.stopPropagation();
$(this).closest('.profile-info-editor-group').find('.left-sidebar-layout').find('.position-relative').find('img').attr('src', '{{ static_asset('images/img/sidebar_default.jpg') }}');
$(this).closest('.profile-info-editor-group').find('.right-sidebar-layout').find('.position-relative').find('img').attr('src', '{{ static_asset('images/img/sidebar_default.jpg') }}');
$('.side-url').val('');
})

// chooselayout('full');
chooselayout('{{$layout}}');
});
Expand Down
6 changes: 5 additions & 1 deletion resources/views/frontend/account/upload.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@

.go-back-button {
color: white;
background-color: red;
background-color: #999999;
padding: 5px 15px;
width: 200px;
font-size: 15px;
Expand Down Expand Up @@ -428,6 +428,10 @@
/* float: left; */
}

.submit-artwork {
background-color: #999999;
}

.page-account-upload .create {
float: right;
}
Expand Down
10 changes: 5 additions & 5 deletions resources/views/frontend/artwork.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,18 +95,18 @@ class="mt-10 {{ Request::routeIs('user.profile') ? 'active' : '' }}"
@endif
</div>
<div class="row favorite-buttons p-2">
<!-- <a href="#" class="pointer">
<i class="bi bi-hand-thumbs-up"></i>
</a> -->
<a id="like-button" class="pointer">
<i class="bi bi-heart{{ $artwork->isLikedByUser() ? '-fill' : '' }}"></i>
</a>
<!-- <a href="#" class="pointer">
<a href="#" class="pointer">
<i class="bi bi-hand-thumbs-up"></i>
</a>
<a href="#" class="pointer">
<i class="bi bi-share"></i>
</a>
<a class="pointer">
<i class="bi bi-exclamation-triangle"></i>
</a> -->
</a>
</div>
@if($artwork->img_main)
<a href="{{ static_asset('uploads/' . $artwork->img_main) }}" data-lightbox="artwork" data-title="Unknown ArtWork #1" class="light-detail mt-2" data-fancybox="gallery">
Expand Down
Loading