Merge remote-tracking branch 'origin/about' into dev
# Conflicts: # package-lock.json # src/client/client.ts
Showing
- .gitignore 1 addition, 1 deletion.gitignore
- package.json 1 addition, 1 deletionpackage.json
- public/img1.png 0 additions, 0 deletionspublic/img1.png
- public/img2.png 0 additions, 0 deletionspublic/img2.png
- public/img3.png 0 additions, 0 deletionspublic/img3.png
- public/img4.png 0 additions, 0 deletionspublic/img4.png
- src/Routes.tsx 4 additions, 0 deletionssrc/Routes.tsx
- src/client/client.ts 3 additions, 0 deletionssrc/client/client.ts
- src/client/types.ts 3 additions, 1 deletionsrc/client/types.ts
- src/client/users.ts 24 additions, 0 deletionssrc/client/users.ts
- src/components/AboutCard.tsx 48 additions, 0 deletionssrc/components/AboutCard.tsx
- src/components/Gallery.tsx 23 additions, 0 deletionssrc/components/Gallery.tsx
- src/components/MemberCard.tsx 67 additions, 0 deletionssrc/components/MemberCard.tsx
- src/hooks/useGetStaffs.ts 10 additions, 0 deletionssrc/hooks/useGetStaffs.ts
- src/pages/AboutPage.tsx 67 additions, 0 deletionssrc/pages/AboutPage.tsx
- src/types/Profile.ts 7 additions, 0 deletionssrc/types/Profile.ts
Loading
Please register or sign in to comment