Skip to content

Commit 36b4cdd

Browse files
Fixed issues with certain pages where footer wasn't being anchored to the bottom
1 parent e474cdf commit 36b4cdd

File tree

5 files changed

+48
-34
lines changed

5 files changed

+48
-34
lines changed

.firebase/hosting.ZGlzdA.cache

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
index.html,1731481522403,74cc73f3824a952dba28fd7cb52971a133f6a0d92938d7072aa9c832f3cd9c41
2-
assets/index-876n0NzJ.css,1731481522402,77618a9ff4f0ab53af368bb104dffe3f8c6b5c9963d98271a9d51c52940d6117
3-
assets/google_icon-CXt9Hb0b.png,1731481522392,0ab433e7d4447b571a40a1b6ea33217a4aaf92d06cd58bfa1323b58591b629de
4-
assets/company_logo-CouiMkYs.png,1731481522392,bf8cf22cb7a3e6225eb8db1ff333d180c85e5ef1da5aaa98b00a50d7752ee78b
5-
assets/golden_retriever-dZtdF_5l.jpg,1731481522391,3e1d7192270e6a0cac0a79277f3f80d8bc7dbcd728b4110b79ec230215153fd2
6-
assets/index-RpfXXt9f.js,1731481522403,f895f247f52155a08c4a5443d6a61d9acbf531bc194bd360161c6eae07715c6d
7-
assets/pet_video_2-ClyQYbMo.mp4,1731481522392,1dbbc1b96563d50c4c031c56e81f37ee1dac4a89a4477ba7852daabe4e347c22
8-
assets/rabbit_01-8H_gpSQt.jpg,1731481522393,62cf76bf91fda141290ab4ad336b515d72127ea5f9c0707101eceac3c0263260
9-
assets/pet_video_5-D4uS9HZH.mp4,1731481522393,e786e6059c8b764530dd27041f26aeecbe145153795ac3833daa73e234d44e1a
10-
assets/pet_video_1-iuO2ihVr.mp4,1731481522395,3be49ca9cb0081defea0898529fbfd5d48fd012098a50dfdbbc403647de15f52
11-
assets/rabbit_02-gXsZr3li.jpg,1731481522396,04463007dce289019a516fd833a699dc8807c3c57f39721adab18ae248941a6f
12-
assets/pet_video_3-DzjNNjDx.mp4,1731481522396,a23659f28eda6aca97afa5f6ee6a2381c7b5e719eb2b4f1ec92760ed02327728
13-
assets/dog_07-ifzOsHig.jpg,1731481522398,487870f3b35b3528c61cfe2e072d71be43d8a7d4ca9627f5786785face17e2a5
14-
assets/dog_04-3KqGUsK8.jpg,1731481522398,0945f4ec5fe2a815bbd7912ea037a26eccf375196ec15ecbda6477438503bf98
15-
assets/shiba_inu-PBequAkv.jpg,1731481522396,f8e66a1b11d6c53b21ae7a645a543be98f361499ac438056104224232e70265d
16-
assets/pet_video_6-COrN2YmV.mp4,1731481522396,934626f545fcb03fed4a486f6ddfe1d0792a5feaa1534b14882c261402fadfb8
17-
assets/cat_01-DhgDCHf9.jpg,1731481522397,ef3689ae5ffdb5ee409677fbe4f774a318c135c721705a184b371edc56648480
18-
assets/dog_08-BotrdEsQ.jpg,1731481522403,52c2c858cc7d8b799631d72baed1399e2c97951fad4fc6a6874636262b7f696a
19-
assets/cat_04-Bjt4xJjC.jpg,1731481522399,abda58b0ba1fa6b6c56d3026390d5f8806ad70f32ad04bf5c1ff9dfdbc800760
20-
assets/pet_video_4-BJzBm242.mp4,1731481522399,64de6fe6f50bcb70fb43099e20726fc45d4257847f3c8718eb5c274e4ab8485b
21-
assets/cat_02-B2XqYwkF.jpg,1731481522399,ac9df9b1e3d29d4081b6c4c49c0ff11695414826c9e76b93e549d4dedb7b5dd5
22-
assets/golden_retriever_2-C34B0aHl.jpg,1731481522399,e557dbe69c1650ac83eca5f6ca55a782c987bfc8582cadf02412ffc7f7f4b793
23-
assets/dog_02-g05Zbkyu.jpg,1731481522402,2e146f2e0fbfd65aee6d50d4b5107f6a06e460118c893bd85469c9a7c3dfaf8d
24-
assets/dog_03-CzTXj2O-.jpg,1731481522405,aec6b5c3e282b265c20b00d9ec2c8e703a931814091b4b764788f1d1f844c66c
25-
assets/cat_03-DPY7bLqd.jpg,1731481522405,d7c1f91fd95586a80c30b405b7cc9522a01c28af311599954c877234fa6557d3
26-
assets/dog_05-BN0xbOnA.jpg,1731481522405,0aedef6969f6cbcd91b5cabe85f6f339d3a1c6d8a2ca4312414e637522970886
27-
assets/dog_01-BugzkKh6.jpg,1731481522403,3b0d661f659e107a5f65d21cf949c3b1efe211cb6e7bb8a25d4dbbc3c4a81dd7
1+
index.html,1731859180285,dd7749148346090eae2bacec71565e95e1db5b16a53e26454f4db498900d7ec7
2+
assets/index-876n0NzJ.css,1731859180284,77618a9ff4f0ab53af368bb104dffe3f8c6b5c9963d98271a9d51c52940d6117
3+
assets/google_icon-CXt9Hb0b.png,1731859180276,0ab433e7d4447b571a40a1b6ea33217a4aaf92d06cd58bfa1323b58591b629de
4+
assets/company_logo-CouiMkYs.png,1731859180276,bf8cf22cb7a3e6225eb8db1ff333d180c85e5ef1da5aaa98b00a50d7752ee78b
5+
assets/golden_retriever-dZtdF_5l.jpg,1731859180277,3e1d7192270e6a0cac0a79277f3f80d8bc7dbcd728b4110b79ec230215153fd2
6+
assets/index-DWQgFAB3.js,1731859180285,d9a3814bec8d14e45fbf115852f818b5f030cb478323b86f566fbf73b32f9b21
7+
assets/pet_video_2-ClyQYbMo.mp4,1731859180276,1dbbc1b96563d50c4c031c56e81f37ee1dac4a89a4477ba7852daabe4e347c22
8+
assets/rabbit_01-8H_gpSQt.jpg,1731859180277,62cf76bf91fda141290ab4ad336b515d72127ea5f9c0707101eceac3c0263260
9+
assets/pet_video_5-D4uS9HZH.mp4,1731859180276,e786e6059c8b764530dd27041f26aeecbe145153795ac3833daa73e234d44e1a
10+
assets/pet_video_1-iuO2ihVr.mp4,1731859180279,3be49ca9cb0081defea0898529fbfd5d48fd012098a50dfdbbc403647de15f52
11+
assets/rabbit_02-gXsZr3li.jpg,1731859180280,04463007dce289019a516fd833a699dc8807c3c57f39721adab18ae248941a6f
12+
assets/pet_video_3-DzjNNjDx.mp4,1731859180280,a23659f28eda6aca97afa5f6ee6a2381c7b5e719eb2b4f1ec92760ed02327728
13+
assets/dog_04-3KqGUsK8.jpg,1731859180281,0945f4ec5fe2a815bbd7912ea037a26eccf375196ec15ecbda6477438503bf98
14+
assets/dog_07-ifzOsHig.jpg,1731859180281,487870f3b35b3528c61cfe2e072d71be43d8a7d4ca9627f5786785face17e2a5
15+
assets/shiba_inu-PBequAkv.jpg,1731859180280,f8e66a1b11d6c53b21ae7a645a543be98f361499ac438056104224232e70265d
16+
assets/pet_video_6-COrN2YmV.mp4,1731859180281,934626f545fcb03fed4a486f6ddfe1d0792a5feaa1534b14882c261402fadfb8
17+
assets/cat_01-DhgDCHf9.jpg,1731859180281,ef3689ae5ffdb5ee409677fbe4f774a318c135c721705a184b371edc56648480
18+
assets/dog_08-BotrdEsQ.jpg,1731859180286,52c2c858cc7d8b799631d72baed1399e2c97951fad4fc6a6874636262b7f696a
19+
assets/cat_04-Bjt4xJjC.jpg,1731859180282,abda58b0ba1fa6b6c56d3026390d5f8806ad70f32ad04bf5c1ff9dfdbc800760
20+
assets/pet_video_4-BJzBm242.mp4,1731859180282,64de6fe6f50bcb70fb43099e20726fc45d4257847f3c8718eb5c274e4ab8485b
21+
assets/cat_02-B2XqYwkF.jpg,1731859180283,ac9df9b1e3d29d4081b6c4c49c0ff11695414826c9e76b93e549d4dedb7b5dd5
22+
assets/golden_retriever_2-C34B0aHl.jpg,1731859180283,e557dbe69c1650ac83eca5f6ca55a782c987bfc8582cadf02412ffc7f7f4b793
23+
assets/dog_02-g05Zbkyu.jpg,1731859180286,2e146f2e0fbfd65aee6d50d4b5107f6a06e460118c893bd85469c9a7c3dfaf8d
24+
assets/dog_03-CzTXj2O-.jpg,1731859180287,aec6b5c3e282b265c20b00d9ec2c8e703a931814091b4b764788f1d1f844c66c
25+
assets/cat_03-DPY7bLqd.jpg,1731859180284,d7c1f91fd95586a80c30b405b7cc9522a01c28af311599954c877234fa6557d3
26+
assets/dog_01-BugzkKh6.jpg,1731859180284,3b0d661f659e107a5f65d21cf949c3b1efe211cb6e7bb8a25d4dbbc3c4a81dd7
27+
assets/dog_05-BN0xbOnA.jpg,1731859180287,0aedef6969f6cbcd91b5cabe85f6f339d3a1c6d8a2ca4312414e637522970886

src/components/sections/HeroSection.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,12 @@ import pet_video_3 from '../../assets/videos/pet_video_3.mp4'
55
import pet_video_4 from '../../assets/videos/pet_video_4.mp4'
66
import pet_video_5 from '../../assets/videos/pet_video_5.mp4'
77
import pet_video_6 from '../../assets/videos/pet_video_6.mp4'
8+
import { useNavigate } from 'react-router-dom'
9+
import { ROUTE_URL } from '../../others/Globals'
810

911
const HeroSection: React.FC = () => {
12+
const m_navTo = useNavigate()
13+
1014
return (
1115
<section className='
1216
relative h-screen
@@ -35,7 +39,7 @@ const HeroSection: React.FC = () => {
3539
<h1 className='text-7xl mb-4'>Pet Heaven</h1>
3640
<p className='text-xl mb-6'>Where every animal, big or small, deserves to find a loving forever home. Begin your adoption journey today, and find yourself a furry friend!</p>
3741
<div className='h-14'>
38-
<button className='
42+
<button onClick={() => m_navTo(ROUTE_URL.GALLERY)} className='
3943
bg-primary-500 px-5 h-full rounded-lg mr-3 hover:bg-primary-600 transition-colors
4044
'>Adopt a Pet</button>
4145
</div>

src/pages/AdoptionGalleryPage.tsx

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
1-
import React, { useEffect, useRef, useState } from 'react'
2-
import { PetApiData, Utils } from '../others/Globals'
1+
import React, { useContext, useEffect, useRef, useState } from 'react'
2+
import { PetApiData, ROUTE_URL, Utils } from '../others/Globals'
33
import search_icon from '../assets/SVG/search.svg'
44
import Navbar from '../components/Navbar'
55
import PetInfoCard from '../components/PetInfoCard'
66
import FooterSection from '../components/sections/FooterSection'
77
import Dropdown, { DropdownOption } from '../components/Dropdown'
8+
import { AuthContext } from '../common/AuthContext'
9+
import { useNavigate } from 'react-router-dom'
810

911
const AdoptionGalleryPage: React.FC = () => {
12+
const m_authCtx = useContext(AuthContext)
13+
const m_navTo = useNavigate()
14+
1015
const m_loadCount = useRef<number>(-1)
1116
const [m_loadingCardsShown, setLoadingCardsShown] = useState<boolean>(true)
1217
const [m_petData, setPetData] = useState<PetApiData[]>([])
@@ -27,6 +32,11 @@ const AdoptionGalleryPage: React.FC = () => {
2732
}
2833

2934
useEffect(() => {
35+
// Not logged in? Re-direct to auth page first
36+
if (m_authCtx && !m_authCtx.firebaseUser) {
37+
m_navTo(ROUTE_URL.AUTH)
38+
}
39+
3040
setPetTypeDropdown([
3141
{ optionName: "Dog", isChecked: true },
3242
{ optionName: "Cat", isChecked: true },

src/pages/AuthPage.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ const AuthPage: React.FC = () => {
9191
}
9292

9393
return (
94-
<main>
94+
<main className='flex flex-col min-h-screen'>
9595
<Navbar useSticky={true} />
9696
<framer.section
9797
style={{ willChange: m_willChange }}
@@ -101,7 +101,7 @@ const AuthPage: React.FC = () => {
101101
}}
102102
animate={m_isAnimating ? 'rotated' : 'default'}
103103
transition={{ duration: ROTATION_TIME_MS / 1000 }}
104-
className='flex justify-center items-center'>
104+
className='flex-grow flex justify-center items-center'>
105105
<div
106106
style={{ perspective: '300px', transformStyle: 'preserve-3d' }}
107107
className='

src/pages/PetReleasePage.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import PetReleaseInputField from '../components/sections/PetReleaseInputField'
66

77
const PetReleasePage: React.FC = () => {
88
return (
9-
<main>
9+
<main className='flex flex-col min-h-screen'>
1010
<Navbar useSticky />
1111
<section
1212
style={{ backgroundImage: `url(${background_img})` }}
13-
className='min-h-[45rem] bg-cover relative py-margin-3xl flex justify-center items-center'>
13+
className='min-h-[45rem] bg-cover relative py-margin-3xl flex justify-center items-center flex-grow'>
1414

1515
{/* --- TRANSLUCENT BACKGROUND --- */}
1616
<div className="absolute inset-0 bg-accent-50 opacity-70"></div>

0 commit comments

Comments
 (0)