Skip to content

Commit

Permalink
Merge pull request #22 from TalentViper/feedback-3/member
Browse files Browse the repository at this point in the history 
fix: page background, user profile view
  • Loading branch information
@TalentViper
TalentViper authored Feb 16, 2025
2 parents 76837cb + 27f8eb1 commit 6ef2cf3
Show file tree
Hide file tree
Showing 26 changed files with 170 additions and 55 deletions.
Binary file added public/uploads/250-1739455543.jpg
View file
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-1739455554.jpeg
View file
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-1739455574.jpg
View file
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-1739458936.jpeg
View file
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-1739458943.jpg
View file
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-1739459312.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
75 changes: 60 additions & 15 deletions resources/views/frontend/account.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@

@section('main-content')
<main id="main" class="main-content">

<div id="content" class="page-account">
@if($user->my_background)
<div id="content" class="page-account" style="background-image: url({{ static_asset('uploads/'. $user->my_background) }}) !important; background-repeat: no-repeat; background-size: 100% 100%;">
@else
<div id="content" class="page-account">
@endif
<div class="content_box pt-4">
<div class="container-fluit p-5 pt-4">
<div class="row">
Expand Down Expand Up @@ -49,22 +52,41 @@
</div>
</div>
</div>
<div class="desc bg-cover aspects" style="background-image: url({{ static_asset('uploads/'. $user->my_background) }});">
@if(!empty($user->my_content))
<div class="my-content-profile">@stripBBCode($user->my_content)</div>
@else
<h5 style="color: #999;" class="mt-4">
Upload your content here.
</h5>
@endif
<div class="desc w-full" style="padding: 0; margin: 0;">
<div class="row min-h-500">
@if($user->layout == "right")
@if(!empty($user->my_side))
<div class="col-md-3 img" style="padding-right: 0;">
<img src="{{ static_asset('uploads/'. $user->my_side) }}" alt="">
</div>
@endif
@endif

<!-- style="background-image: url({{ static_asset('uploads/'. $user->my_background) }}); overflow: hidden;" -->
<div class="{{ (($user->layout == 'full' || empty($user->my_side)) ? 'col-md-12' : 'col-md-9') }} text p-0 bg-cover" >
<div class="p-4 mr-2">
@if(!empty($user->my_content))
<div class="my-content-profile"> @stripBBCode($user->my_content)</div>
@else
<h5 style="color: #999;" class="mt-4">
Upload your content here
</h5>
@endif
</div>
</div>

@if($user->layout == "left")
@if(!empty($user->my_side))
<div class="col-md-3 img" style="padding-left: 0;">
<img src="{{ static_asset('uploads/'. $user->my_side) }}" alt="">
</div>
@endif
@endif
</div>
</div>

</div>
</div>




</div>

</div>
Expand All @@ -75,6 +97,24 @@
@endsection

<style>
.page-account .desc img {
height: 100%;
}
.h-full {
height: 100%;
}
.sidebar-profile {
width: 260px !important;
flex: 1;
}
.row>* {
overflow: hidden;
}
.w-flexible {
width: calc(100% - 260px) !important;
}
h1, h2 {
font-family: 'DrukTextWideBold', sans-serif;
}
Expand All @@ -83,10 +123,15 @@
text-align: left;
}
.min-h-500 {
min-height: 500px;
}
.bg-cover {
background-repeat: no-repeat;
background-size: cover;
background-size: 100% 100%;
}
.aspects {
object-fit: cover;
aspect-ratio: 2/1;
Expand Down
8 changes: 6 additions & 2 deletions resources/views/frontend/account/detail.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,12 @@
</script>
@section('main-content')
<main id="main" class="main-content">

<div id="content" class="page-account-detail">
@if(auth()->user()->my_background)
<div id="content" class="page-account-detail" style="background-image: url({{ static_asset('uploads/'. auth()->user()->my_background) }}) !important; background-repeat: no-repeat; background-size: 100% 100%;">
@else
<div id="content" class="page-account-detail">
@endif

<div class="content_box">
<div class="container-fluit p-5 pt-4">
<div class="row">
Expand Down
8 changes: 6 additions & 2 deletions resources/views/frontend/account/editartwork.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,12 @@
<link rel="stylesheet" href="https://icons.getbootstrap.com/assets/font/bootstrap-icons.min.css">
@section('main-content')
<main id="main" class="main-content">

<div id="content" class="page-account-upload">
@if(auth()->user()->my_background)
<div id="content" class="page-account-upload" style="background-image: url({{ static_asset('uploads/'. auth()->user()->my_background) }}) !important; background-repeat: no-repeat; background-size: 100% 100%;">
@else
<div id="content" class="page-account-upload">
@endif

<div class="content_box">
<div class="container-fluit p-5 pt-4">
<div class="row">
Expand Down
8 changes: 6 additions & 2 deletions resources/views/frontend/account/editgallery.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,12 @@
<link rel="stylesheet" href="https://icons.getbootstrap.com/assets/font/bootstrap-icons.min.css">
@section('main-content')
<main id="main" class="main-content">

<div id="content" class="page-account-gallery">
@if(auth()->user()->my_background)
<div id="content" class="page-account-gallery" style="background-image: url({{ static_asset('uploads/'. auth()->user()->my_background) }}) !important; background-repeat: no-repeat; background-size: 100% 100%;">
@else
<div id="content" class="page-account-gallery">
@endif

<div class="content_box">
<div class="container-fluit p-5 pt-4">
<div class="row">
Expand Down
8 changes: 6 additions & 2 deletions resources/views/frontend/account/gallery.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@

@section('main-content')
<main id="main" class="main-content">

<div id="content" class="page-account-gallery">
@if(auth()->user()->my_background)
<div id="content" class="page-account-gallery" style="background-image: url({{ static_asset('uploads/'. auth()->user()->my_background) }}) !important; background-repeat: no-repeat; background-size: 100% 100%;">
@else
<div id="content" class="page-account-gallery">
@endif

<div class="content_box">
<div class="container-fluit p-5 pt-4">
<div class="row">
Expand Down
8 changes: 6 additions & 2 deletions resources/views/frontend/account/link.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@
<link rel="stylesheet" href="https://icons.getbootstrap.com/assets/font/bootstrap-icons.min.css">
@section('main-content')
<main id="main" class="main-content">

<div id="content" class="page-account-link">
@if(auth()->user()->my_background)
<div id="content" class="page-account-link" style="background-image: url({{ static_asset('uploads/'. auth()->user()->my_background) }}) !important; background-repeat: no-repeat; background-size: 100% 100%;">
@else
<div id="content" class="page-account-link">
@endif

<div class="content_box">
<div class="container-fluit p-5 pt-4">
<div class="row">
Expand Down
7 changes: 5 additions & 2 deletions resources/views/frontend/account/linkedit.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@
<link rel="stylesheet" href="https://icons.getbootstrap.com/assets/font/bootstrap-icons.min.css">
@section('main-content')
<main id="main" class="main-content">

<div id="content" class="page-account-link">
@if(auth()->user()->my_background)
<div id="content" class="page-account-link" style="background-image: url({{ static_asset('uploads/'. auth()->user()->my_background) }}) !important; background-repeat: no-repeat; background-size: 100% 100%;">
@else
<div id="content" class="page-account-link">
@endif
<div class="content_box">
<div class="container-fluit p-5 pt-4">
<div class="row">
Expand Down
7 changes: 5 additions & 2 deletions resources/views/frontend/account/message.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@

@section('main-content')
<main id="main" class="main-content">

<div id="content" class="page-account-message">
@if(auth()->user()->my_background)
<div id="content" class="page-account-message" style="background-image: url({{ static_asset('uploads/'. auth()->user()->my_background) }}) !important; background-repeat: no-repeat; background-size: 100% 100%;">
@else
<div id="content" class="page-account-message">
@endif
<div class="content_box">
<div class="container-fluit p-5 pt-4">
<div class="row">
Expand Down
8 changes: 6 additions & 2 deletions resources/views/frontend/account/news.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,12 @@
</script>
@section('main-content')
<main id="main" class="main-content">

<div id="content" class="page-account-news">
@if(auth()->user()->my_background)
<div id="content" class="page-account-news" style="background-image: url({{ static_asset('uploads/'. auth()->user()->my_background) }}) !important; background-repeat: no-repeat; background-size: 100% 100%;">
@else
<div id="content" class="page-account-news">
@endif

<div class="content_box">
<div class="container-fluit p-5 pt-4">
<div class="row">
Expand Down
8 changes: 6 additions & 2 deletions resources/views/frontend/account/private.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,12 @@
</script>
@section('main-content')
<main id="main" class="main-content">

<div id="content" class="page-account-private">
@if(auth()->user()->my_background)
<div id="content" class="page-account-private" style="background-image: url({{ static_asset('uploads/'. auth()->user()->my_background) }}) !important; background-repeat: no-repeat; background-size: 100% 100%;">
@else
<div id="content" class="page-account-private">
@endif

<div class="content_box">
<div class="container-fluit p-5 pt-4">
<div class="row">
Expand Down
14 changes: 9 additions & 5 deletions resources/views/frontend/account/profile.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,12 @@
<link rel="stylesheet" href="https://icons.getbootstrap.com/assets/font/bootstrap-icons.min.css">
@section('main-content')
<main id="main" class="main-content">

<div id="content" class="page-account-profile">
@if($my_background)
<div id="content" class="page-account-profile" style="background-image: url({{ static_asset('uploads/'. $my_background) }}) !important; background-repeat: no-repeat; background-size: 100% 100%;">
@else
<div id="content" class="page-account-profile">
@endif

<div class="content_box">
<div class="container-fluit p-5 pt-4">
<div class="row">
Expand Down Expand Up @@ -32,9 +36,9 @@
<div class="progress-bar banner-progress-bar" role="progressbar" style="width: 0%;" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>
</div>
</div>
<input type="text" class="banner-url" name="banner" hidden>
<input type="text" class="side-url" name="side" hidden>
<input type="text" class="my-background-url" name="my_background" hidden>
<input type="text" class="banner-url" name="banner" hidden value='{{ $banner }}'>
<input type="text" class="side-url" name="side" hidden value='{{ $side }}'>
<input type="text" class="my-background-url" name="my_background" hidden value='{{ $my_background }}'>
<input type="text" class="layout" name="layout" hidden value='{{ $layout }}'>
<input type="text" class="content" name="content" hidden value='{{ $content }}'>
</div>
Expand Down
6 changes: 5 additions & 1 deletion resources/views/frontend/account/send.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,12 @@

@section('main-content')
<main id="main" class="main-content">
@if(auth()->user()->my_background)
<div id="content" class="page-account-message-send" style="background-image: url({{ static_asset('uploads/'. auth()->user()->my_background) }}) !important; background-repeat: no-repeat; background-size: 100% 100%;">
@else
<div id="content" class="page-account-message-send">
@endif

<div id="content" class="page-account-message-send">
<div class="content_box">
<div class="container-fluit p-5 pt-4">
<div class="row">
Expand Down
8 changes: 6 additions & 2 deletions resources/views/frontend/account/updatenews.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,12 @@
</script>
@section('main-content')
<main id="main" class="main-content">

<div id="content" class="page-account-news">
@if(auth()->user()->my_background)
<div id="content" class="page-account-news" style="background-image: url({{ static_asset('uploads/'. auth()->user()->my_background) }}) !important; background-repeat: no-repeat; background-size: 100% 100%;">
@else
<div id="content" class="page-account-news">
@endif

<div class="content_box">
<div class="container-fluit p-5 pt-4">
<div class="row">
Expand Down
8 changes: 6 additions & 2 deletions resources/views/frontend/account/upload.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,12 @@
<link rel="stylesheet" href="https://icons.getbootstrap.com/assets/font/bootstrap-icons.min.css">
@section('main-content')
<main id="main" class="main-content">

<div id="content" class="page-account-upload">
@if(auth()->user()->my_background)
<div id="content" class="page-account-upload" style="background-image: url({{ static_asset('uploads/'. auth()->user()->my_background) }}) !important; background-repeat: no-repeat; background-size: 100% 100%;">
@else
<div id="content" class="page-account-upload">
@endif

<div class="content_box">
<div class="container-fluit p-5 pt-4">
<div class="row">
Expand Down
8 changes: 6 additions & 2 deletions resources/views/frontend/account/wishlist.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@
<link rel="stylesheet" href="https://icons.getbootstrap.com/assets/font/bootstrap-icons.min.css">
@section('main-content')
<main id="main" class="main-content">

<div id="content" class="page-account-wishlist">
@if(auth()->user()->my_background)
<div id="content" class="page-account-wishlist" style="background-image: url({{ static_asset('uploads/'. auth()->user()->my_background) }}) !important; background-repeat: no-repeat; background-size: 100% 100%;">
@else
<div id="content" class="page-account-wishlist">
@endif

<div class="content_box">
<div class="container-fluit p-5 pt-4">
<div class="row">
Expand Down
8 changes: 6 additions & 2 deletions resources/views/frontend/account/wishlistedit.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@
<link rel="stylesheet" href="https://icons.getbootstrap.com/assets/font/bootstrap-icons.min.css">
@section('main-content')
<main id="main" class="main-content">

<div id="content" class="page-account-wishlist">
@if(auth()->user()->my_background)
<div id="content" class="page-account-wishlist" style="background-image: url({{ static_asset('uploads/'. auth()->user()->my_background) }}) !important; background-repeat: no-repeat; background-size: 100% 100%;">
@else
<div id="content" class="page-account-wishlist">
@endif

<div class="content_box">
<div class="container-fluit p-5 pt-4">
<div class="row">
Expand Down
11 changes: 7 additions & 4 deletions resources/views/frontend/artwork.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,11 @@
@section('main-content')

<main id="main" class="main-content">

<div id="content" class="page-artwork">
@if($artwork->gallery->user->my_background)
<div id="content" class="page-artwork" style="background-image: url({{ static_asset('uploads/'. $artwork->gallery->user->my_background) }}) !important; background-repeat: no-repeat; background-size: 100% 100%;">
@else
<div id="content" class="page-artwork">
@endif
<div class="content_box">
<div class="container-fluit pt-4">
<div class="row">
Expand Down Expand Up @@ -98,9 +101,9 @@ class="mt-10 {{ Request::routeIs('user.profile') ? 'active' : '' }}"
<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> -->
<a href="#" class="pointer">
<i class="bi bi-share"></i>
</a>
Expand Down
6 changes: 5 additions & 1 deletion resources/views/frontend/gallery.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@

<link rel="stylesheet" href="https://icons.getbootstrap.com/assets/font/bootstrap-icons.min.css">
<main id="main" class="main-content">
<div id="content" class="page-gallery-view">
@if($gallery->user->my_background)
<div id="content" class="page-gallery-view" style="background-image: url({{ static_asset('uploads/'. $gallery->user->my_background) }}) !important; background-repeat: no-repeat; background-size: 100% 100%;">
@else
<div id="content" class="page-gallery-view">
@endif
<div class="content_box">
<div class="container-fluit pt-4 p-4">
<div class="row">
Expand Down
Loading

0 comments on commit 6ef2cf3

Please sign in to comment.