Skip to content
Open
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
7 changes: 7 additions & 0 deletions src/@types/geese-info.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
declare module "geese-info" {
export interface GeeseInfo {
description: string;
id: number;
name: string;
}
}
9 changes: 9 additions & 0 deletions src/api/geese-info.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { Server } from 'server';
import { AxiosResponse } from 'axios';
import { GeeseInfo } from 'geese-info';

const getGeeseInfo = (server: Server) => (): Promise<AxiosResponse<GeeseInfo[]>> => server.get(`/api/geese-info/`);

export default (server: Server) => ({
getGeeseInfo: getGeeseInfo(server),
});
4 changes: 3 additions & 1 deletion src/api/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@ import postings from './postings';
import server from './server';
import sponsors from './sponsors';
import teams from './teams';
import geeseInfo from './geese-info';

export default {
postings: postings(server),
teams: teams(server),
sponsors: sponsors(server),
newsletter: newsletter(server)
newsletter: newsletter(server),
geeseInfo: geeseInfo(server)
};
17 changes: 15 additions & 2 deletions src/components/PastGeeseTimeline/hooks/geese-images.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ import goose2 from '../../../static/img/pgimgs/goose2.png';
import goose3 from '../../../static/img/pgimgs/goose3.png';
import goose4 from '../../../static/img/pgimgs/goose4.png';

import api from 'api';
import { useEffect } from 'react';

interface Image {
imgFile: string;
name: string;
Expand Down Expand Up @@ -54,6 +57,16 @@ const imgs: Image[] = [
const useGeeseImages:
GooseImagesHook = () => {
const [currentIndex, setCurrentIndex] = useState<number>(0);
const [geeseInfo, setGeeseInfo] = useState<Array<any>>([]);

useEffect(()=>{
const getInfo = async() =>{
const res = await api.geeseInfo.getGeeseInfo();
//console.log(res);
setGeeseInfo(res.data);
}
getInfo();
}, [])

const cycleRight = useCallback(
() => setCurrentIndex((currentIndex + 1) % imgs.length),
Expand All @@ -79,8 +92,8 @@ const useGeeseImages:

return {
image: imgs[currentIndex].imgFile,
name: imgs[currentIndex].name,
desc: imgs[currentIndex].desc,
name: geeseInfo[currentIndex]?.name,
desc: geeseInfo[currentIndex]?.description,
imgs: imgs,
currentGoose: currentIndex,
cycleRight,
Expand Down