Skip to content

[hotfix] Making the adoption bubble behave like the fact bubble #92

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

Merged
mngweb merged 3 commits into from
Jan 4, 2022
Merged

[hotfix] Making the adoption bubble behave like the fact bubble #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
23bb1c0
Making the adoption bubble behave like the fact bubble
mngweb Jan 3, 2022
1f092cb
better image proportions in bubbles
mngweb Jan 4, 2022
8bf7591
Merge branch 'develop' into hotfix/issue-79
mngweb Jan 4, 2022
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
2 changes: 1 addition & 1 deletion src/components/Bubble/Bubble.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

padding: 20px;
margin-bottom: 30px;
min-height: 200px;
min-height: 180px;

background: var(--bubble-color);
box-shadow: 0 0 20px rgba(0, 0, 0, 0.3);
Expand Down
29 changes: 21 additions & 8 deletions src/views/MainPage/MainPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const PAGE_TITLE = 'ANIMALIADA';
const MAIN_ANIMAL_IMG = { pathOrUrl: './kangoroo.png', alt: 'kangoroo that tells informations' };
const FACT_HEADER = 'Did you know?';
const AdoptionBubbleContent = {
IMG: { pathOrUrl: 'https://placedog.net/300/400?random', alt: 'the animal to adoption' },
IMG: { pathOrUrl: 'https://placedog.net/150/150?random', alt: 'the animal to adoption' },
HEADER_TEXT: "Maybe you'd like to adopt your own pet?",
SENTENCES: ['This one is looking for home', 'See more here: <a href="#adoption-page">Adoption Page</a>'],
};
Expand Down Expand Up @@ -75,7 +75,7 @@ function createFactBubble() {

function createAdoptionBubble() {
const bubbleAdoption = Bubble('higher', AdoptionBubbleContent.HEADER_TEXT, AdoptionBubbleContent.SENTENCES, true);
bubbleAdoption.classList.add('adoption');
bubbleAdoption.classList.add('adoption', 'invisible');
return bubbleAdoption;
}

Expand All @@ -90,10 +90,8 @@ async function renderFactBubbleContent() {
imageObject.addEventListener(
'load',
() => {
const factBubble = document.querySelector('.bubble.fact');
renderAnimalFact(imageFact);
factBubble.classList.remove('invisible');
factBubble.classList.add('fade-in');
fadeInBubble('fact');
},
false,
);
Expand All @@ -102,7 +100,22 @@ async function renderFactBubbleContent() {
}

function renderAdoptionBubbleContent() {
renderAnimalAdoptionImg();
const imageObject = new Image();
imageObject.addEventListener(
'load',
() => {
fadeInBubble('adoption');
},
false,
);

renderAnimalAdoptionImg(imageObject);
}

function fadeInBubble(bubbleClass) {
const bubble = document.querySelector(`.bubble.${bubbleClass}`);
bubble.classList.remove('invisible');
bubble.classList.add('fade-in');
}

function renderAnimalFact(fact) {
Expand All @@ -120,9 +133,9 @@ function renderAnimalFactImg(imageFact, imageObject) {
createImage(factImageSpace, imageFact, imageObject);
}

function renderAnimalAdoptionImg() {
function renderAnimalAdoptionImg(imageObject) {
const adoptionImageSpace = document.querySelector('.bubble.adoption .bubble-img');
createImage(adoptionImageSpace, AdoptionBubbleContent.IMG);
createImage(adoptionImageSpace, AdoptionBubbleContent.IMG, imageObject);
}

function createImage(domElement, imageData, imageElement) {
Expand Down