Skip to content

Uncomment collaborators ticker on home page #1333

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

Open
Kritthika wants to merge 4 commits into
base: test
Choose a base branch
from
+79 −62
Open

Uncomment collaborators ticker on home page #1333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cdcb784
Enable collaborators scrolling ticker on Home page with updated logos
Kritthika Mar 20, 2026
b445a43
Fix: Add missing countryOptions state in OrganizationDetails component
Kritthika Mar 20, 2026
192f9ef
Fix LandingPage test async snapshot timing
Kritthika Mar 23, 2026
9a8dff1
Merge branch 'test' into home-ticker-uncomment
Kritthika Apr 6, 2026
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
66 changes: 43 additions & 23 deletions src/pages/LandingPage/LandingPage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,16 @@ import bottomFour from "../../assets/landingPageImages/bottomFour.jpg";
import bottomOne from "../../assets/landingPageImages/bottomOne.jpg";
import bottomThree from "../../assets/landingPageImages/bottomThree.jpg";
import bottomTwo from "../../assets/landingPageImages/bottomTwo.jpg";
import collabFive from "../../assets/landingPageImages/collab_five.jpg";
import collabFour from "../../assets/landingPageImages/collab_four.jpg";
import collabOne from "../../assets/landingPageImages/collab_one.jpg";
import collabSeven from "../../assets/landingPageImages/collab_seven.jpg";
import collabSix from "../../assets/landingPageImages/collab_six.jpg";
import collabThree from "../../assets/landingPageImages/collab_three.jpg";
import collabTwo from "../../assets/landingPageImages/collab_two.jpg";
import annapoornaLogo from "../../assets/Collab_logos/annapoorna.webp";
import drivenScholarsLogo from "../../assets/Collab_logos/drivenscholars.webp";
import idealistLogo from "../../assets/Collab_logos/idealist.webp";
import southPortlandLogo from "../../assets/Collab_logos/southportland.webp";
import tbi4lifeLogo from "../../assets/Collab_logos/tbi4life.webp";
import topOne from "../../assets/landingPageImages/topOne.jpg";
import topTwo from "../../assets/landingPageImages/topTwo.webp";
import "./LandingPage.css";
import Carousel from "./components/Carousel";
import MetricsTicker from "./components/MetricsTicker";
import SquareAd from "#components/Ads/SquareAd";
import HorizontalAd from "#components/Ads/HorizontalAd";

export default function Home() {
Expand Down Expand Up @@ -121,26 +118,49 @@ export default function Home() {
{t("Our Collaborators")}
</h3>

{/* Hid collaborators until we get permission from them all*/}
<div className="w-full flex flex-row overflow-hidden">
<div className="scroll imgBox">
<div>
<img src={collabOne} className="w-[150px] ml-[75px]"></img>
<img src={collabTwo}></img>
<img src={collabThree} className="w-[200px]"></img>
<img src={collabFour}></img>
<img src={collabFive}></img>
<img src={collabSix} className="w-[200px]"></img>
<img src={collabSeven} className="w-[125px]"></img>
<img
src={idealistLogo}
alt="Idealist"
className="w-[200px] ml-[75px]"
></img>
<img src={tbi4lifeLogo} alt="TBI4Life" className="w-[200px]"></img>
<img
src={annapoornaLogo}
alt="Sri Sathya Sai Annapoorna Trust"
className="w-[150px]"
></img>
<img
src={drivenScholarsLogo}
alt="The Driven Scholars Foundation"
></img>
<img
src={southPortlandLogo}
alt="South Portland Food Cupboard"
></img>
</div>
<div>
<img src={collabOne} className="w-[150px] ml-[75px]"></img>
<img src={collabTwo}></img>
<img src={collabThree} className="w-[200px]"></img>
<img src={collabFour}></img>
<img src={collabFive}></img>
<img src={collabSix} className="w-[200px]"></img>
<img src={collabSeven} className="w-[125px]"></img>
<img
src={idealistLogo}
alt="Idealist"
className="w-[200px] ml-[75px]"
></img>
<img src={tbi4lifeLogo} alt="TBI4Life" className="w-[200px]"></img>
<img
src={annapoornaLogo}
alt="Sri Sathya Sai Annapoorna Trust"
className="w-[150px]"
></img>
<img
src={drivenScholarsLogo}
alt="The Driven Scholars Foundation"
></img>
<img
src={southPortlandLogo}
alt="South Portland Food Cupboard"
></img>
</div>
</div>
</div>
Expand Down
64 changes: 28 additions & 36 deletions src/pages/LandingPage/__snapshots__/landing-page.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,55 +115,51 @@ exports[`LandingPage renders correctly 1`] = `
>
<div>
<img
class="w-[150px] ml-[75px]"
src=""
/>
<img
alt="Idealist"
class="w-[200px] ml-[75px]"
src=""
/>
<img
alt="TBI4Life"
class="w-[200px]"
src=""
/>
<img
alt="Sri Sathya Sai Annapoorna Trust"
class="w-[150px]"
src=""
/>
<img
alt="The Driven Scholars Foundation"
src=""
/>
<img
class="w-[200px]"
src=""
/>
<img
class="w-[125px]"
alt="South Portland Food Cupboard"
src=""
/>
</div>
<div>
<img
class="w-[150px] ml-[75px]"
src=""
/>
<img
alt="Idealist"
class="w-[200px] ml-[75px]"
src=""
/>
<img
alt="TBI4Life"
class="w-[200px]"
src=""
/>
<img
alt="Sri Sathya Sai Annapoorna Trust"
class="w-[150px]"
src=""
/>
<img
alt="The Driven Scholars Foundation"
src=""
/>
<img
class="w-[200px]"
src=""
/>
<img
class="w-[125px]"
alt="South Portland Food Cupboard"
src=""
/>
</div>
Expand Down Expand Up @@ -450,55 +446,51 @@ exports[`LandingPage renders correctly 1`] = `
>
<div>
<img
class="w-[150px] ml-[75px]"
src=""
/>
<img
alt="Idealist"
class="w-[200px] ml-[75px]"
src=""
/>
<img
alt="TBI4Life"
class="w-[200px]"
src=""
/>
<img
alt="Sri Sathya Sai Annapoorna Trust"
class="w-[150px]"
src=""
/>
<img
alt="The Driven Scholars Foundation"
src=""
/>
<img
class="w-[200px]"
src=""
/>
<img
class="w-[125px]"
alt="South Portland Food Cupboard"
src=""
/>
</div>
<div>
<img
class="w-[150px] ml-[75px]"
src=""
/>
<img
alt="Idealist"
class="w-[200px] ml-[75px]"
src=""
/>
<img
alt="TBI4Life"
class="w-[200px]"
src=""
/>
<img
alt="Sri Sathya Sai Annapoorna Trust"
class="w-[150px]"
src=""
/>
<img
alt="The Driven Scholars Foundation"
src=""
/>
<img
class="w-[200px]"
src=""
/>
<img
class="w-[125px]"
alt="South Portland Food Cupboard"
src=""
/>
</div>
Expand Down
10 changes: 7 additions & 3 deletions src/pages/LandingPage/landing-page.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { renderWithProviders } from "#utils/test-utils.jsx";
import { waitFor } from "@testing-library/react";
import LandingPage from "./LandingPage";

// Mock internal dependencies
Expand Down Expand Up @@ -29,8 +30,11 @@ describe("LandingPage", () => {
fetch.mockClear();
});

it("renders correctly", () => {
const tree = renderWithProviders(<LandingPage />);
expect(tree).toMatchSnapshot();
it("renders correctly", async () => {
const view = renderWithProviders(<LandingPage />);

await waitFor(() => expect(fetch).toHaveBeenCalled());

expect(view).toMatchSnapshot();
});
});
1 change: 1 addition & 0 deletions src/pages/Profile/OrganizationDetails.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ function OrganizationDetails({ setHasUnsavedChanges }) {
const [showCategoryDropdown, setShowCategoryDropdown] = useState(false);
const [hoveredCategory, setHoveredCategory] = useState(null);
const categoryDropdownRef = useRef(null);
const [countryOptions, setCountryOptions] = useState([]);

const [errors, setErrors] = useState({});

Expand Down
Loading