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

Uploading the cover photo #16

Merged
merged 1 commit into from
Oct 26, 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
84 changes: 47 additions & 37 deletions public/css/main.css
Original file line number Diff line number Diff line change
@@ -1,22 +1,20 @@
:root {
--blue: #1fa2f1;
--blueBackhround: rgba(212, 237, 255, 0.6);
--blue: #1FA2F1;
--blueLight: #9BD1F9;
--blueBackground: rgba(212, 237, 255, 0.6);
--buttonHoverBg: #d4edff;
--lightGrey: rgb(230, 236, 240);
--spacing: 15px;
--blueLight: #9bd1f9;
--greyText: rgb(101, 119, 134);
--greyButtonText: rgba(0, 0, 0, 0.34);
--red: rgb(226, 34, 94);
--green: rgb(23, 191, 99);
--greenBackground: rgba(23, 191, 99, 0.1);
--redBackground: rgba(226, 34, 94, 0.34);

}
--greyButtonText: rgba(0,0,0,0.34);
--red: rgb(226,34,94);
--redBackground: rgba(226,34,94,0.1);
--green: rgb(23,191,99);
--greenBackground: rgba(23,191,99,0.1);
}

* {
outline: none !important;

}

a {
Expand Down Expand Up @@ -49,10 +47,11 @@ nav a {
display: flex;
align-items: center;
justify-content: center;
color: #212529;
}

nav a.blue {
color: var(--blue)
color: var(--blue);
}

nav a:hover {
Expand All @@ -71,14 +70,13 @@ button {
color: var(--greyButtonText);
}


button i,
button span {
pointer-events: none;
}

.mainSectionContainer {
padding: 0;
padding: 0;
border-left: 1px solid var(--lightGrey);
border-right: 1px solid var(--lightGrey);
display: flex;
Expand All @@ -90,7 +88,7 @@ button span {
padding: 0 var(--spacing);
display: flex;
align-items: center;
border-bottom: 10px solid var(--lightGrey);
border-bottom: 1px solid var(--lightGrey);
flex-shrink: 0;
}

Expand All @@ -105,7 +103,6 @@ button span {
flex-shrink: 0;
}


.modal .postFormContainer {
border: none;
padding: 0;
Expand All @@ -114,7 +111,6 @@ button span {

.modal .post {
padding: 0 0 var(--spacing) 0;
padding-bottom: var(--spacing);
}

.userImageContainer {
Expand All @@ -133,7 +129,7 @@ button span {
padding-left: var(--spacing);
}

.textareaContainer textarea{
.textareaContainer textarea {
width: 100%;
border: none;
resize: none;
Expand Down Expand Up @@ -175,7 +171,7 @@ button span {

.username,
.date {
color: var(--greyText);
color: var(--greyText)
}

.displayName {
Expand Down Expand Up @@ -211,28 +207,26 @@ button span {
border-radius: 50%;
}


.postButtonContainer.red button.active {
color: var(--red);
}

}

.postButtonContainer.red button:hover {
color: var(--red);
background-color: var(--redBackground);
}
background-color: var(--redBackground)
}

.postButtonContainer.green button.active {
color: var(--green);
}
}

.postButtonContainer.green button:hover {
color: var(--green);
background-color: var(--greenBackground);
background-color: var(--greenBackground)
}

.postActionContainer {
padding-left: 45px;
padding-left: 35px;
font-size: 13px;
color: var(--greyText);
margin-bottom: 5px;
Expand Down Expand Up @@ -260,21 +254,22 @@ button span {
}

.errorMessage {
padding: var(--spacing)
padding: var(--spacing);
}

.profileHeaderContainer .coverPhotoContainer {
.coverPhotoSection {
height: 180px;
background-color: var(--blue);
position: relative;
}

.profileHeaderContainer .userImageContainer {
height: 132px;
width: 132px;
height: 132px;
margin-left: var(--spacing);
position: absolute;
bottom: -66px;

display: flex;
align-items: center;
justify-content: center;
Expand Down Expand Up @@ -323,7 +318,7 @@ button span {
}

.followersContainer span:not(.value) {
color: var(--greyText)
color: var(--greyText);
}

.followersContainer a {
Expand All @@ -334,7 +329,6 @@ button span {
border-bottom: 1px solid #000;
}


.tabsContainer {
display: flex;
border-bottom: 1px solid var(--lightGrey);
Expand All @@ -358,7 +352,7 @@ button span {

.tab:hover {
color: var(--blue);
background-color: var(--blueBackhround);
background-color: var(--blueBackground);
}

.noResults {
Expand All @@ -381,18 +375,34 @@ button span {
padding: 0 var(--spacing)
}

.profilePictureButton {
.profilePictureButton,
.coverPhotoButton {
position: absolute;
font-size: 50px;
color: rgba(0,0,00.6);
color: rgba(0,0,0,0.6);
display: none;
}

.userImageContainer:hover .profilePictureButton {
.userImageContainer:hover .profilePictureButton,
.coverPhotoSection:hover .coverPhotoButton {
display: block;
}

#imagePreview {
.coverPhotoContainer {
display: flex;
align-items: center;
justify-content: center;
height: 100%;
}

.coverPhotoContainer img {
width: 100%;
height: 100%;
object-fit: cover;
}

#imagePreview,
#coverPreview {
width: 100%;
display: block;
max-width: 100%;
Expand Down
Binary file modified public/images/profilePic.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
65 changes: 65 additions & 0 deletions public/js/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,27 @@ $("#filePhoto").change(function() {
}
})

$("#coverPhoto").change(function() {
if (this.files && this.files[0]) {
const reader = new FileReader();
reader.onload = (event) => {
const image = document.getElementById("coverPreview")
image.src = event.target.result

if (cropper !== undefined) {
cropper.destroy()
}

cropper = new Cropper(image, {
aspectRatio: 16 / 9,
background: false
})

}
reader.readAsDataURL(this.files[0]);
}
})

$("#imageUploadButton").click(() => {
const canvas = cropper.getCroppedCanvas();

Expand All @@ -131,6 +152,50 @@ $("#imageUploadButton").click(() => {
})
})

$("#coverPhoto").change(function(){
if(this.files && this.files[0]) {
var reader = new FileReader();
reader.onload = (e) => {
var image = document.getElementById("coverPreview");
image.src = e.target.result;

if(cropper !== undefined) {
cropper.destroy();
}

cropper = new Cropper(image, {
aspectRatio: 16 / 9,
background: false
});

}
reader.readAsDataURL(this.files[0]);
}
})

$("#coverPhotoButton").click(() => {
var canvas = cropper.getCroppedCanvas();

if(canvas == null) {
alert("Отсутствует картинка. Загрузите желаемое фото обложки.");
return;
}

canvas.toBlob((blob) => {
var formData = new FormData();
formData.append("croppedImage", blob);

$.ajax({
url: "/api/users/coverPhoto",
type: "POST",
data: formData,
processData: false,
contentType: false,
success: () => location.reload()
})
})
})

$(document).on("click", ".likeButton", (event) => {
const button = $(event.target);
const postId = getPostIdFromElement(button);
Expand Down
22 changes: 22 additions & 0 deletions routes/api/users.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,5 +78,27 @@ router.post("/profilePicture", upload.single("croppedImage"), async (req, res, n
})
})

router.post("/coverPhoto", upload.single("croppedImage"), async (req, res, next) => {
if(!req.file) {
console.log("Отсутствует файл, который должен прийти в запросе от ajax.");
return res.sendStatus(400);
}

var filePath = `/uploads/images/${req.file.filename}.png`;
var tempPath = req.file.path;
var targetPath = path.join(__dirname, `../../${filePath}`);

fs.rename(tempPath, targetPath, async error => {
if(error != null) {
console.log(error);
return res.sendStatus(400);
}

req.session.user = await User.findByIdAndUpdate(req.session.user._id, { coverPhoto: filePath }, { new: true });
res.sendStatus(204);
})

});


module.exports = router;
3 changes: 3 additions & 0 deletions schemas/UserSchema.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ const UserSchema = new Schema({
type: String,
default: "/images/profilePic.jpg"
},
coverPhoto: {
type: String
},
likes: [{
type: Schema.Types.ObjectId,
ref: 'Post'
Expand Down
Binary file removed uploads/images/51c53395ef8f8cbf1f74ece7739f4a4c.png
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed uploads/images/a42916190f0f7afe2d848578c5cfdb5c.png
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed uploads/images/aef34c648a009bf7f4e8210a55e9419a.png
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 18 additions & 1 deletion views/mixins/mixins.pug
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,21 @@ mixin createImageUploadModal()

.modal-footer
button.btn.btn-secondary(type='button' data-dismiss='modal') Отменить
button#imageUploadButton.btn.btn-primary(type='button') Сохранить
button#imageUploadButton.btn.btn-primary(type='button') Сохранить

mixin createCoverPhotoUploadModal()
#coverPhotoUploadModal.modal.fade(tabindex='-1', role='dialog', aria-labelledby='coverPhotoModalLabel', aria-hidden='true')
.modal-dialog(role='document')
.modal-content
.modal-header
h5#coverPhotoModalLabel.modal-title Изменить фото обложки
button.close(type='button', data-dismiss='modal', aria-label='Close')
span(aria-hidden='true') ×
.modal-body
input#coverPhoto(type="file", name="filePhoto")

.coverPhotoPreviewContainer
img#coverPreview
.modal-footer
button.btn.btn-secondary(type='button', data-dismiss='modal') Отменить
button#coverPhotoButton.btn.btn-primary(type='button') Сохранить
10 changes: 9 additions & 1 deletion views/profilePage.pug
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,14 @@ block content
- followingCount = profileUser.following.length

.profileHeaderContainer
.coverPhotoContainer
.coverPhotoSection
.coverPhotoContainer
if profileUser.coverPhoto
img(src=profileUser.coverPhoto, alt="Обложка пользователя")

if profileUser._id == userLoggedIn._id
button.coverPhotoButton(data-toggle="modal", data-target="#coverPhotoUploadModal")
i.fas.fa-camera

.userImageContainer
img(src=profileUser.profilePic, alt="Фото пользователя")
Expand Down Expand Up @@ -53,6 +60,7 @@ block content

+createPostModals(userLoggedIn)
+createImageUploadModal()
+createCoverPhotoUploadModal()

block scripts
script(src="/js/profile.js")