diff --git a/src/app/layout.tsx b/src/app/layout.tsx index d1f026e0..23494c77 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -29,6 +29,7 @@ export const metadata: Metadata = { const merriweather = Merriweather({ weight: "400", style: "normal", + variable: "--font-merriweather", subsets: ["latin"], }); diff --git a/src/app/private/[uid]/admin/home/chapters/[chapterId]/users/[userId]/page.tsx b/src/app/private/[uid]/admin/home/chapters/[chapterId]/users/[userId]/page.tsx index 6b5c592b..62fc23dc 100644 --- a/src/app/private/[uid]/admin/home/chapters/[chapterId]/users/[userId]/page.tsx +++ b/src/app/private/[uid]/admin/home/chapters/[chapterId]/users/[userId]/page.tsx @@ -34,7 +34,7 @@ const UserPage = async ({ params }: Params) => { {/* TODO(nickbar01234) - Add pronouns */} +
{user.name ?? ""}
} diff --git a/src/app/private/[uid]/user/home/page.tsx b/src/app/private/[uid]/user/home/page.tsx index e3f666f9..31e4d04f 100644 --- a/src/app/private/[uid]/user/home/page.tsx +++ b/src/app/private/[uid]/user/home/page.tsx @@ -26,7 +26,7 @@ const UserHomePage = async ({ params }: UserHomePageParams) => { return (
-
+
{chapter.chapterName}
{ dateCreated={chapter.dateCreated} /> - Executive Board -
- } + title={
Executive Board
} tiles={chapter.students .filter((user) => user.role == "CHAPTER_LEADER") .map((user) => ( diff --git a/src/app/public/page.tsx b/src/app/public/page.tsx index deec8fb6..8771d8e6 100644 --- a/src/app/public/page.tsx +++ b/src/app/public/page.tsx @@ -24,10 +24,10 @@ const HomePage = () => { {/* Hero Section and Action Items Buttons */}
-

+

Everyone has a story that's worth preserving.

-

+

The Legacy Project, Inc. (TLP) connects college students with local elders in their community with the purpose of building strong intergenerational relationships and documenting the life @@ -35,7 +35,7 @@ const HomePage = () => { for years to come.

-

+

Join an ever-growing network of college students across the country passionate about telling stories, and form a Legacy Project chapter at your school or university today. Fill out the @@ -79,10 +79,10 @@ const HomePage = () => {

- + About Us -

+

The concept of The Legacy Project (TLP) began in 2018, when Arielle Galinsky, a high school junior at the time, spent her time working at a local senior community in her Massachusetts hometown. Her role @@ -103,7 +103,7 @@ const HomePage = () => { life accounts, both for the seniors themselves and their families.

-

+

Little did she know that, in the state right next over, Katie Furey, a sophomore in college home for the pandemic, started a similar project of her own. Katie had always been close with her @@ -125,7 +125,7 @@ const HomePage = () => {

-

+

Arielle and Katie met in 2020, quickly connecting over their aligned passions to build intergenerational connections provide a platform for local seniors to share their stories, and preserve @@ -143,7 +143,7 @@ const HomePage = () => { with the platform to amplify their stories.

-

+

Having watched the Tufts chapter grow over the past two years, Arielle, Katie, and Wanda decided to establish TLP as a nonprofit organization with the goal of spreading TLP’s mission across the diff --git a/src/components/AddFile.tsx b/src/components/AddFile.tsx index e5f134af..d1e8124b 100644 --- a/src/components/AddFile.tsx +++ b/src/components/AddFile.tsx @@ -18,9 +18,7 @@ const TagSelector = ({ }) => { return (

-
- Tags -
+
Tags
items={tagList} filterMatch={(tag, text) => tag.name.indexOf(text) != -1} @@ -76,11 +74,8 @@ const AddFile = ({ {!confirm && !error ? (
-
- {" "} - Create New File{" "} -
-
+
Create New File
+
File name
File added successfully!
); - } - else { + } else { return ( ); } -} +}; export default Button; diff --git a/src/components/DisplayChapterInfo.tsx b/src/components/DisplayChapterInfo.tsx index dbd1c188..0b0aca5a 100644 --- a/src/components/DisplayChapterInfo.tsx +++ b/src/components/DisplayChapterInfo.tsx @@ -1,5 +1,3 @@ - - interface DisplayChapterInfoParams { location: string; noMembers: number; @@ -12,7 +10,7 @@ const DisplayChapterInfo = ({ dateCreated, }: DisplayChapterInfoParams) => { return ( -
+
Location:
{location}
@@ -23,7 +21,9 @@ const DisplayChapterInfo = ({
Years Active:
-
{new Date().getFullYear() - dateCreated.getFullYear()}
+
+ {new Date().getFullYear() - dateCreated.getFullYear()} +
); diff --git a/src/components/LandingFooter.tsx b/src/components/LandingFooter.tsx index 44e7864f..56586c47 100644 --- a/src/components/LandingFooter.tsx +++ b/src/components/LandingFooter.tsx @@ -54,11 +54,11 @@ const LandingFooter = () => { return (
-

+

There are millions of stories waiting to be told. It's your moment to change that.

-

+

Leave a lasting legacy on your college or university campus by founding a chapter of The Legacy Project at your school today. Reach us at{" "} @@ -89,7 +89,7 @@ const LandingFooter = () => { className={`h-[40px] w-auto ${buttonStyle} rounded duration-150`} type="submit" > - + {buttonText} diff --git a/src/components/Navbar.tsx b/src/components/Navbar.tsx index 1d75374f..b4743b4c 100644 --- a/src/components/Navbar.tsx +++ b/src/components/Navbar.tsx @@ -71,13 +71,13 @@ const Navbar = () => { } > setDropdownVisible(false)}> -

+
Meet TLP
setDropdownVisible(false)}> -
+
Our Story
@@ -86,13 +86,13 @@ const Navbar = () => { href="/public/start-chapter" onClick={() => setDropdownVisible(false)} > -
+
Start a Chapter
diff --git a/src/components/PathNav.tsx b/src/components/PathNav.tsx index 6c12b567..d630fe1f 100644 --- a/src/components/PathNav.tsx +++ b/src/components/PathNav.tsx @@ -24,7 +24,7 @@ const PathNav = ({ pathInfo }: PathNavParams) => { }; return ( -
+
{pathInfo.map((currPath, index, array) => ( {index !== 0 &&
>
} diff --git a/src/components/PhotoHeader.tsx b/src/components/PhotoHeader.tsx index ca93ccdf..6b9a5880 100644 --- a/src/components/PhotoHeader.tsx +++ b/src/components/PhotoHeader.tsx @@ -12,26 +12,35 @@ export interface IPhotoHeaderProps { const PhotoHeader = ({ admin, name }: IPhotoHeaderProps) => { return ( <> -
-
- {"A -
- -
- - Hello{name == null ? " there" : ", " + name.split(' ').shift()}. - -
+
+
+ {
+ +
+ + Hello{name == null ? " there" : ", " + name.split(" ").shift()}. + +
+
); }; -export default PhotoHeader; \ No newline at end of file +export default PhotoHeader; diff --git a/src/components/Sidebar.tsx b/src/components/Sidebar.tsx index 2abd82ae..b18b4cb6 100644 --- a/src/components/Sidebar.tsx +++ b/src/components/Sidebar.tsx @@ -33,7 +33,7 @@ const SidebarItem = ({ iconName: IconDefinition; }) => { return ( -
+
@@ -65,20 +65,20 @@ const _Sidebar = ({ buttons }: ISideBar) => {
{user.Chapter != null && ( <> -
+
University
-
+
{user.Chapter.chapterName}
)}
-
+
{fullName(user)}
-
+
{RoleAlias[user.role]}
-

+

{student && student.name ? student.name + (student.admin ? " (Admin)" : "") : senior && senior.name @@ -59,7 +59,7 @@ export function UserTile({ : null}

{/* @TODO: Add pronouns once we add to student field */} -

+

{senior && senior.location}

diff --git a/src/components/admin/DisplayChapter.tsx b/src/components/admin/DisplayChapter.tsx index 880a72d6..02eb66ec 100644 --- a/src/components/admin/DisplayChapter.tsx +++ b/src/components/admin/DisplayChapter.tsx @@ -57,7 +57,7 @@ const DisplayChapter = (props: DisplayChapterProps) => { return (
-
+
{chapter.chapterName}
{ /> - Executive Board -
- } + title={
Executive Board
} tiles={eboardMembers.map((user) => ( { +
Pending ({requestUsers.length})
} @@ -139,7 +135,7 @@ const DisplayChapter = (props: DisplayChapterProps) => { +
Members ( {chapter.students.filter((user) => user.role == "USER").length})
diff --git a/src/pages/pending.tsx b/src/pages/pending.tsx index c7781619..dd843c8f 100644 --- a/src/pages/pending.tsx +++ b/src/pages/pending.tsx @@ -14,11 +14,11 @@ export default function Pending() {
-

+

Oh no! It looks like you don't have access to the Legacy Project yet.

-

+

Your access to The Legacy Project is pending. Please follow-up with a club administrator for more details.