From 91a70bcb7a82f423dee4ee3dd5085d34a44a9af2 Mon Sep 17 00:00:00 2001 From: Tamir <1tamir198@gmail.com> Date: Mon, 18 Mar 2024 12:51:13 +0200 Subject: [PATCH 1/3] Text color change --- components/Members/MemberCard/MemberCard.tsx | 2 +- components/Members/MemberCard/MemberCardInfo.tsx | 8 ++++---- components/Members/MemberCard/MemberCardSocialButtons.tsx | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/Members/MemberCard/MemberCard.tsx b/components/Members/MemberCard/MemberCard.tsx index 2770bc5a..6d2d5379 100644 --- a/components/Members/MemberCard/MemberCard.tsx +++ b/components/Members/MemberCard/MemberCard.tsx @@ -18,7 +18,7 @@ export const MemberCard = ({ joinDate, }: MemberCardProps) => { return ( -
+
-

{name}

-

{shortDescription}

+

{name}

+

{shortDescription}

-

{longDescription}

-

{joinDate}

+

{longDescription}

+

{joinDate}

); }; \ No newline at end of file diff --git a/components/Members/MemberCard/MemberCardSocialButtons.tsx b/components/Members/MemberCard/MemberCardSocialButtons.tsx index 7465f423..2e1e5e9a 100644 --- a/components/Members/MemberCard/MemberCardSocialButtons.tsx +++ b/components/Members/MemberCard/MemberCardSocialButtons.tsx @@ -4,7 +4,7 @@ import React from 'react' export const MemberCardSocialButtons = () => { return ( -
+
From e42b88e0d3927837d738773ff667b395e454dc39 Mon Sep 17 00:00:00 2001 From: Tamir <1tamir198@gmail.com> Date: Mon, 18 Mar 2024 13:11:30 +0200 Subject: [PATCH 2/3] Adding memebrs icons --- .../MemberCard/MemberCardSocialButtons.tsx | 14 +++--- .../socialIcons/GithubMemberLink.tsx | 34 +++++++++++++ .../socialIcons/LinkedInMemberLink.tsx | 48 +++++++++++++++++++ .../socialIcons/TwiterMemberLink.tsx | 36 ++++++++++++++ 4 files changed, 126 insertions(+), 6 deletions(-) create mode 100644 components/Members/MemberCard/socialIcons/GithubMemberLink.tsx create mode 100644 components/Members/MemberCard/socialIcons/LinkedInMemberLink.tsx create mode 100644 components/Members/MemberCard/socialIcons/TwiterMemberLink.tsx diff --git a/components/Members/MemberCard/MemberCardSocialButtons.tsx b/components/Members/MemberCard/MemberCardSocialButtons.tsx index 2e1e5e9a..0a5dfa84 100644 --- a/components/Members/MemberCard/MemberCardSocialButtons.tsx +++ b/components/Members/MemberCard/MemberCardSocialButtons.tsx @@ -1,13 +1,15 @@ -import GithubIconLink from '@/components/Footer/GithubIconLink'; - import React from 'react' +import GithubIconLink from '@/components/Footer/GithubIconLink'; +import { TwitterMemberLink } from './socialIcons/TwiterMemberLink'; +import { LinkedInMemberLink } from './socialIcons/LinkedInMemberLink'; +import { GithubMemberLink } from './socialIcons/GithubMemberLink'; export const MemberCardSocialButtons = () => { return ( -
- - - +
+ + +
) } diff --git a/components/Members/MemberCard/socialIcons/GithubMemberLink.tsx b/components/Members/MemberCard/socialIcons/GithubMemberLink.tsx new file mode 100644 index 00000000..21a0ebd8 --- /dev/null +++ b/components/Members/MemberCard/socialIcons/GithubMemberLink.tsx @@ -0,0 +1,34 @@ +import React from 'react'; + +interface GithubMemberLinkProps { + githubUrl: string; +} + +export const GithubMemberLink = ({ githubUrl }: GithubMemberLinkProps) => { + return ( + + ); +}; diff --git a/components/Members/MemberCard/socialIcons/LinkedInMemberLink.tsx b/components/Members/MemberCard/socialIcons/LinkedInMemberLink.tsx new file mode 100644 index 00000000..c7f0ca4a --- /dev/null +++ b/components/Members/MemberCard/socialIcons/LinkedInMemberLink.tsx @@ -0,0 +1,48 @@ +import React from 'react'; + +interface LinkedInMemProps { + linkedInUrl: string; +} + +export const LinkedInMemberLink = ({ linkedInUrl }: LinkedInMemProps) => { + return ( + + ); +}; diff --git a/components/Members/MemberCard/socialIcons/TwiterMemberLink.tsx b/components/Members/MemberCard/socialIcons/TwiterMemberLink.tsx new file mode 100644 index 00000000..b2be31bb --- /dev/null +++ b/components/Members/MemberCard/socialIcons/TwiterMemberLink.tsx @@ -0,0 +1,36 @@ +import React from 'react'; + +interface TwitterMemberLinkProps{ + twitterUrl: string; +} + +export const TwitterMemberLink = ({twitterUrl} : TwitterMemberLinkProps) => { + return ( + + ); +}; + +export default TwitterMemberLink; From ebbbb101f8d3e62fc6143ced69849f25dbc7b118 Mon Sep 17 00:00:00 2001 From: Tamir <1tamir198@gmail.com> Date: Mon, 18 Mar 2024 13:17:01 +0200 Subject: [PATCH 3/3] Changing Icons --- CONTRIBUTING/CODE_OF_CONDUCT.md | 67 +++++++++++---- CONTRIBUTING/GUIDELINES.md | 66 ++++++++++----- LICENSE.md | 23 +++-- app/[locale]/members/page.tsx | 39 +++++---- app/[locale]/projects/layout.tsx | 6 +- app/i18n.ts | 16 ++-- components.json | 2 +- components/Header/Header.tsx | 33 ++++++-- components/Header/NavRightSide.tsx | 6 +- components/Members/MemberCard/MemberCard.tsx | 6 +- .../Members/MemberCard/MemberCardInfo.tsx | 24 ++++-- .../MemberCard/MemberCardSocialButtons.tsx | 20 +++-- .../socialIcons/GithubMemberLink.tsx | 4 +- .../socialIcons/LinkedInMemberLink.tsx | 80 +++++++++--------- .../socialIcons/TwiterMemberLink.tsx | 14 ++-- .../Members/MembersLIst/MembersList.tsx | 84 +++++++++++-------- .../Members/MembersSearch/MembersSearch.tsx | 19 +++-- components/MembersPics/MembersPics.tsx | 9 +- components/Newbies/FaqsSection.tsx | 2 +- components/utils/Dropdown.tsx | 6 +- hooks/useFetchProjects.ts | 9 +- middleware.ts | 6 +- tailwind.config.js | 8 +- 23 files changed, 331 insertions(+), 218 deletions(-) diff --git a/CONTRIBUTING/CODE_OF_CONDUCT.md b/CONTRIBUTING/CODE_OF_CONDUCT.md index 1ceb82d9..4fa3fd00 100644 --- a/CONTRIBUTING/CODE_OF_CONDUCT.md +++ b/CONTRIBUTING/CODE_OF_CONDUCT.md @@ -2,46 +2,79 @@ ## Purpose -The Maakaf Website community is dedicated to creating a welcoming and inclusive environment for all contributors and participants, regardless of their background or identity. We aim to foster a diverse and respectful community where everyone feels valued and can collaborate effectively. +The Maakaf Website community is dedicated to creating a welcoming and inclusive +environment for all contributors and participants, regardless of their +background or identity. We aim to foster a diverse and respectful community +where everyone feels valued and can collaborate effectively. ## Expected Behavior -To contribute to a positive and productive community, we expect all participants to: +To contribute to a positive and productive community, we expect all participants +to: -1. **Be Respectful**: Treat others with kindness and respect. Disagreements may arise, but it is important to express differing opinions in a constructive and considerate manner. +1. **Be Respectful**: Treat others with kindness and respect. Disagreements may + arise, but it is important to express differing opinions in a constructive + and considerate manner. -2. **Be Inclusive**: Embrace diversity and inclusivity. Welcome people of all backgrounds and identities, including but not limited to race, gender, sexual orientation, nationality, religion, age, disability, and experience level. +2. **Be Inclusive**: Embrace diversity and inclusivity. Welcome people of all + backgrounds and identities, including but not limited to race, gender, sexual + orientation, nationality, religion, age, disability, and experience level. -3. **Listen Actively**: Value others' perspectives and actively listen to their ideas and concerns. Foster a culture of open and empathetic communication. +3. **Listen Actively**: Value others' perspectives and actively listen to their + ideas and concerns. Foster a culture of open and empathetic communication. -4. **Stay Focused**: Keep discussions and contributions relevant to the project's goals. Refrain from engaging in off-topic or disruptive behavior. +4. **Stay Focused**: Keep discussions and contributions relevant to the + project's goals. Refrain from engaging in off-topic or disruptive behavior. -5. **Respect Privacy**: Avoid sharing personal or confidential information without an explicit consent. Protect the privacy of others. +5. **Respect Privacy**: Avoid sharing personal or confidential information + without an explicit consent. Protect the privacy of others. -6. **Encourage Growth**: Support the learning and growth of fellow community members. Share knowledge, provide constructive feedback, and help others succeed. +6. **Encourage Growth**: Support the learning and growth of fellow community + members. Share knowledge, provide constructive feedback, and help others + succeed. ## Unacceptable Behavior -The following behaviors are considered unacceptable within the Maakaf Website community: +The following behaviors are considered unacceptable within the Maakaf Website +community: -1. **Harassment and Discrimination**: Harassment or discrimination of any form, including but not limited to offensive language, unwelcome advances, and harmful stereotypes, will not be tolerated. +1. **Harassment and Discrimination**: Harassment or discrimination of any form, + including but not limited to offensive language, unwelcome advances, and + harmful stereotypes, will not be tolerated. -2. **Trolling and Disruption**: Deliberate attempts to disrupt discussions, troll, or provoke others are not allowed. Maintain a respectful and productive tone in all interactions. +2. **Trolling and Disruption**: Deliberate attempts to disrupt discussions, + troll, or provoke others are not allowed. Maintain a respectful and + productive tone in all interactions. -3. **Hate Speech**: Hate speech, slurs, or any form of offensive content that targets individuals or groups based on their characteristics are strictly prohibited. +3. **Hate Speech**: Hate speech, slurs, or any form of offensive content that + targets individuals or groups based on their characteristics are strictly + prohibited. -4. **Doxing**: Sharing or seeking out others' private or personal information without their consent is a breach of privacy and will not be tolerated. +4. **Doxing**: Sharing or seeking out others' private or personal information + without their consent is a breach of privacy and will not be tolerated. -5. **Inappropriate Content**: Posting or sharing explicit or inappropriate content within project spaces is not allowed. +5. **Inappropriate Content**: Posting or sharing explicit or inappropriate + content within project spaces is not allowed. ## Reporting Violations -If you believe someone has violated this Code of Conduct, please report the incident to the project maintainers on the official [Discord server](https://discord.gg/84NPsRqqde) or in private Discord message. All reports will be treated with discretion and confidentiality. The maintainers are committed to addressing and resolving conflicts promptly and fairly. +If you believe someone has violated this Code of Conduct, please report the +incident to the project maintainers on the official +[Discord server](https://discord.gg/84NPsRqqde) or in private Discord message. +All reports will be treated with discretion and confidentiality. The maintainers +are committed to addressing and resolving conflicts promptly and fairly. ## Enforcement -Project maintainers have the authority and responsibility to enforce this Code of Conduct. Enforcement may include, but is not limited to, issuing warnings, temporary or permanent bans from project spaces, and contacting relevant authorities in cases of legal violations. +Project maintainers have the authority and responsibility to enforce this Code +of Conduct. Enforcement may include, but is not limited to, issuing warnings, +temporary or permanent bans from project spaces, and contacting relevant +authorities in cases of legal violations. ## Attribution -This Code of Conduct is adapted from the [Contributor Covenant](https://www.contributor-covenant.org/version/2/0/code_of_conduct.html), version 2.0. We are grateful to the Contributor Covenant community for their work in creating a Code of Conduct that promotes inclusivity and respect in open-source projects. \ No newline at end of file +This Code of Conduct is adapted from the +[Contributor Covenant](https://www.contributor-covenant.org/version/2/0/code_of_conduct.html), +version 2.0. We are grateful to the Contributor Covenant community for their +work in creating a Code of Conduct that promotes inclusivity and respect in +open-source projects. diff --git a/CONTRIBUTING/GUIDELINES.md b/CONTRIBUTING/GUIDELINES.md index 42abcf09..7696a96f 100644 --- a/CONTRIBUTING/GUIDELINES.md +++ b/CONTRIBUTING/GUIDELINES.md @@ -1,55 +1,75 @@ # Maakaf Website Contribution Guidelines -Welcome to the **Maakaf Website** open source project! These guidelines will help you contribute effectively to our project. Please make sure to read and follow them to ensure a smooth collaboration. +Welcome to the **Maakaf Website** open source project! These guidelines will +help you contribute effectively to our project. Please make sure to read and +follow them to ensure a smooth collaboration. ## Table of Contents + 1. [Contributing](#contributing) - - [Code Conventions](#code-conventions) - - [Assigning Issues](#assigning-issues) - - [Finding Issues](#finding-issues) - - [Creating a New Issue](#creating-a-new-issue) - - [Code of Conduct](#code-of-conduct) + - [Code Conventions](#code-conventions) + - [Assigning Issues](#assigning-issues) + - [Finding Issues](#finding-issues) + - [Creating a New Issue](#creating-a-new-issue) + - [Code of Conduct](#code-of-conduct) 2. [Pull Requests](#pull-requests) - - [Creating a Pull Request](#creating-a-pull-request) + - [Creating a Pull Request](#creating-a-pull-request) 3. [Community](#community) - - [Communication](#communication) - - [License](#license) + - [Communication](#communication) + - [License](#license) ## Contributing ### Code Conventions -To maintain code consistency, adhere to our coding conventions outlined in our [CONVENTIONS.md](CONVENTIONS.md). Consistent code makes it easier for everyone to read and contribute. +To maintain code consistency, adhere to our coding conventions outlined in our +[CONVENTIONS.md](CONVENTIONS.md). Consistent code makes it easier for everyone +to read and contribute. ### Assigning Issues -Before starting to write code, it's essential to assign yourself to an issue. This ensures that no two people work simultaneously on the same issue, reducing duplication of effort. \ -If you're interested in working on an issue that isn't assigned to anyone, feel free to request being assigned through a comment on the issue itself. +Before starting to write code, it's essential to assign yourself to an issue. +This ensures that no two people work simultaneously on the same issue, reducing +duplication of effort. \ +If you're interested in working on an issue that isn't assigned to anyone, feel free +to request being assigned through a comment on the issue itself. ### Finding Issues -In order to find issues available, please look at the `Ready For Dev` column inside each project in our [Projects page](https://github.com/orgs/Maakaf/projects/). Please note that every page of the website has its own project. +In order to find issues available, please look at the `Ready For Dev` column +inside each project in our +[Projects page](https://github.com/orgs/Maakaf/projects/). Please note that +every page of the website has its own project. ### Creating a New Issue -If you encounter a bug or have a new feature idea, please create a new issue from our [Issues page](https://github.com/Maakaf/maakaf-website/issues) by clicking the "New issue" button. Provide a detailed description of the problem or feature, steps to reproduce the issue (if applicable), and any relevant information. +If you encounter a bug or have a new feature idea, please create a new issue +from our [Issues page](https://github.com/Maakaf/maakaf-website/issues) by +clicking the "New issue" button. Provide a detailed description of the problem +or feature, steps to reproduce the issue (if applicable), and any relevant +information. ### Code of Conduct -By participating in this project, you agree to abide by our [Code of Conduct](CODE_OF_CONDUCT.md). Please be respectful and considerate of others when communicating and collaborating within our community. +By participating in this project, you agree to abide by our +[Code of Conduct](CODE_OF_CONDUCT.md). Please be respectful and considerate of +others when communicating and collaborating within our community. ## Pull Requests ### Creating a Pull Request -When you've completed your work on an issue, it's time to create a pull request (PR). Follow these steps: +When you've completed your work on an issue, it's time to create a pull request +(PR). Follow these steps: -1. Ensure your fork is up to date with the latest changes from the main repository. +1. Ensure your fork is up to date with the latest changes from the main + repository. 2. Create a new branch for your feature or bug fix. 3. Commit your changes with clear and concise messages. 4. Push your changes to your fork. 5. Open a PR against the main repository's `main` branch. -6. **Describe the purpose of your PR and reference the related issue (e.g., "Closes #1").** +6. **Describe the purpose of your PR and reference the related issue (e.g., + "Closes #1").** `Feel free to contact the maintainers for giving you a code review` @@ -57,12 +77,16 @@ When you've completed your work on an issue, it's time to create a pull request ### Communication -Join our [Discord Channel](https://discord.gg/uZvKfvG7NU) to connect with other contributors, ask questions, and share your experiences. We welcome your feedback and ideas! +Join our [Discord Channel](https://discord.gg/uZvKfvG7NU) to connect with other +contributors, ask questions, and share your experiences. We welcome your +feedback and ideas! -If you feel the maintainers are not noticing your PR or changes you've made on it, shouting out in the channel will grab our attention :) +If you feel the maintainers are not noticing your PR or changes you've made on +it, shouting out in the channel will grab our attention :) ### License Distributed under the MIT License. -Thank you for contributing to Maakaf Website! Your contributions help make this project better for everyone. +Thank you for contributing to Maakaf Website! Your contributions help make this +project better for everyone. diff --git a/LICENSE.md b/LICENSE.md index 6cd39f62..f02ba03b 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -2,20 +2,19 @@ MIT License Copyright (c) 2023 Maakaf -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/app/[locale]/members/page.tsx b/app/[locale]/members/page.tsx index 1b3111b7..5aa7bfb2 100644 --- a/app/[locale]/members/page.tsx +++ b/app/[locale]/members/page.tsx @@ -2,7 +2,6 @@ import { MembersList } from '@/components/Members/MembersLIst/MembersList'; import DiscordLink from '@/components/Common/DiscordLink'; import { LINKS } from '@/config/consts'; - import { Metadata } from 'next'; import { MembersSearch } from '@/components/Members/MembersSearch/MembersSearch'; @@ -29,29 +28,33 @@ export const metadata: Metadata = { const WelcomeMessage = () => { return ( -
-
-

כאן אפשר להכיר את כל המשפחה! וכשתסיימו, בואו לדיסקורד

+
+
+

+ כאן אפשר להכיר את כל המשפחה! וכשתסיימו, בואו לדיסקורד +

- - ערוץ דיסקורד - + + ערוץ דיסקורד +
- ) -} + ); +}; const MembersPage: React.FC = () => { - return
-

Members

- - - -
; + return ( +
+

Members

+ + + +
+ ); }; export default MembersPage; diff --git a/app/[locale]/projects/layout.tsx b/app/[locale]/projects/layout.tsx index 0bcad40c..b2c29267 100644 --- a/app/[locale]/projects/layout.tsx +++ b/app/[locale]/projects/layout.tsx @@ -22,11 +22,7 @@ export const metadata: Metadata = { }; const ProjectsLayout = ({ children }: { children: React.ReactNode }) => { - return ( -
- {children} -
- ); + return
{children}
; }; export default ProjectsLayout; diff --git a/app/i18n.ts b/app/i18n.ts index 4fd173f9..7c75b95a 100644 --- a/app/i18n.ts +++ b/app/i18n.ts @@ -1,14 +1,14 @@ -import {notFound} from 'next/navigation'; -import {getRequestConfig} from 'next-intl/server'; - +import { notFound } from 'next/navigation'; +import { getRequestConfig } from 'next-intl/server'; + // Can be imported from a shared config const locales = ['he', 'en']; - -export default getRequestConfig(async ({locale}) => { + +export default getRequestConfig(async ({ locale }) => { // Validate that the incoming `locale` parameter is valid if (!locales.includes(locale as any)) notFound(); - + return { - messages: (await import(`../public/locales/${locale}.json`)).default + messages: (await import(`../public/locales/${locale}.json`)).default, }; -}); \ No newline at end of file +}); diff --git a/components.json b/components.json index f62b1bb8..4c8fe889 100644 --- a/components.json +++ b/components.json @@ -13,4 +13,4 @@ "components": "@/components", "utils": "@/lib/utils" } -} \ No newline at end of file +} diff --git a/components/Header/Header.tsx b/components/Header/Header.tsx index ec66a98f..0792ae27 100644 --- a/components/Header/Header.tsx +++ b/components/Header/Header.tsx @@ -21,7 +21,7 @@ const NavRightSide = dynamic(() => import('./NavRightSide'), { const Header: React.FC = () => { const pathname = usePathname(); - const currentPage = pathname.split("/").at(-1); + const currentPage = pathname.split('/').at(-1); return ( <> @@ -31,21 +31,40 @@ const Header: React.FC = () => {
    • -
  • - +
  • + הפרויקטים
    • -
  • - +
  • + מי אנחנו
    • - maakafLogo + maakafLogo @@ -53,4 +72,4 @@ const Header: React.FC = () => { ); }; -export default Header; \ No newline at end of file +export default Header; diff --git a/components/Header/NavRightSide.tsx b/components/Header/NavRightSide.tsx index d960efe5..24b97583 100644 --- a/components/Header/NavRightSide.tsx +++ b/components/Header/NavRightSide.tsx @@ -41,9 +41,9 @@ const NavRightSide = () => { ) : ( -
    - {process.env.NODE_ENV === 'development' && } - +
    + {process.env.NODE_ENV === 'development' && } +
    ); }; diff --git a/components/Members/MemberCard/MemberCard.tsx b/components/Members/MemberCard/MemberCard.tsx index 6d2d5379..44cbbb12 100644 --- a/components/Members/MemberCard/MemberCard.tsx +++ b/components/Members/MemberCard/MemberCard.tsx @@ -5,8 +5,8 @@ import { MemberCardSocialButtons } from './MemberCardSocialButtons'; interface MemberCardProps { imgUrl: string; name: string; - shortDescription: string; - longDescription: string; + shortDescription: string; + longDescription: string; joinDate: string; } @@ -18,7 +18,7 @@ export const MemberCard = ({ joinDate, }: MemberCardProps) => { return ( -
    +
    { +export const MemberCardInfo = ({ + imgUrl, + name, + shortDescription, + longDescription, + joinDate, +}: MemberCardInfoProps) => { return ( -
    -
    +
    +
    -

    {name}

    -

    {shortDescription}

    +

    {name}

    +

    + {shortDescription} +

    -

    {longDescription}

    -

    {joinDate}

    +

    {longDescription}

    +

    {joinDate}

    ); -}; \ No newline at end of file +}; diff --git a/components/Members/MemberCard/MemberCardSocialButtons.tsx b/components/Members/MemberCard/MemberCardSocialButtons.tsx index 0a5dfa84..4a884852 100644 --- a/components/Members/MemberCard/MemberCardSocialButtons.tsx +++ b/components/Members/MemberCard/MemberCardSocialButtons.tsx @@ -1,4 +1,4 @@ -import React from 'react' +import React from 'react'; import GithubIconLink from '@/components/Footer/GithubIconLink'; import { TwitterMemberLink } from './socialIcons/TwiterMemberLink'; import { LinkedInMemberLink } from './socialIcons/LinkedInMemberLink'; @@ -6,10 +6,16 @@ import { GithubMemberLink } from './socialIcons/GithubMemberLink'; export const MemberCardSocialButtons = () => { return ( -
    - - - +
    + + +
    - ) -} + ); +}; diff --git a/components/Members/MemberCard/socialIcons/GithubMemberLink.tsx b/components/Members/MemberCard/socialIcons/GithubMemberLink.tsx index 21a0ebd8..94091d92 100644 --- a/components/Members/MemberCard/socialIcons/GithubMemberLink.tsx +++ b/components/Members/MemberCard/socialIcons/GithubMemberLink.tsx @@ -6,7 +6,7 @@ interface GithubMemberLinkProps { export const GithubMemberLink = ({ githubUrl }: GithubMemberLinkProps) => { return ( -
    +
    { aria-label="Github page" > { > { - return ( - - ); + return ( + + ); }; diff --git a/components/Members/MemberCard/socialIcons/TwiterMemberLink.tsx b/components/Members/MemberCard/socialIcons/TwiterMemberLink.tsx index b2be31bb..57ff0a52 100644 --- a/components/Members/MemberCard/socialIcons/TwiterMemberLink.tsx +++ b/components/Members/MemberCard/socialIcons/TwiterMemberLink.tsx @@ -1,12 +1,12 @@ import React from 'react'; -interface TwitterMemberLinkProps{ - twitterUrl: string; +interface TwitterMemberLinkProps { + twitterUrl: string; } -export const TwitterMemberLink = ({twitterUrl} : TwitterMemberLinkProps) => { +export const TwitterMemberLink = ({ twitterUrl }: TwitterMemberLinkProps) => { return ( -
    +
    { aria-label="Twiter page" > { > diff --git a/components/Members/MembersLIst/MembersList.tsx b/components/Members/MembersLIst/MembersList.tsx index ed757836..6eca9d9f 100644 --- a/components/Members/MembersLIst/MembersList.tsx +++ b/components/Members/MembersLIst/MembersList.tsx @@ -1,62 +1,73 @@ -import React from 'react' +import React from 'react'; import { MemberCard } from '../MemberCard/MemberCard'; export const MembersList = () => { const dummyMembers = [ { id: 1, - imgUrl: "http://localhost:3000/_next/image?url=https%3A%2F%2Favatars.githubusercontent.com%2Fu%2F19125%3Fv%3D4&w=48&q=75", - name: "יוסף כהן", - shortDescription: "מפתח אינטרנט", - longDescription: "מפתח אינטרנט מכור ליצירת ממשקים ידידותיים למשתמש באמצעות React ו-Node.js.", - joinDate: "2022-01-01" + imgUrl: + 'http://localhost:3000/_next/image?url=https%3A%2F%2Favatars.githubusercontent.com%2Fu%2F19125%3Fv%3D4&w=48&q=75', + name: 'יוסף כהן', + shortDescription: 'מפתח אינטרנט', + longDescription: + 'מפתח אינטרנט מכור ליצירת ממשקים ידידותיים למשתמש באמצעות React ו-Node.js.', + joinDate: '2022-01-01', }, { id: 2, - imgUrl: "http://localhost:3000/_next/image?url=https%3A%2F%2Favatars.githubusercontent.com%2Fu%2F19125%3Fv%3D4&w=48&q=75", - name: "שרה לוי", - shortDescription: "מפתחת אינטרנט", - longDescription: "מפתחת אינטרנט מכורה ליצירת ממשקים ידידותיים למשתמש באמצעות React ו-Node.js.", - joinDate: "2022-01-01" + imgUrl: + 'http://localhost:3000/_next/image?url=https%3A%2F%2Favatars.githubusercontent.com%2Fu%2F19125%3Fv%3D4&w=48&q=75', + name: 'שרה לוי', + shortDescription: 'מפתחת אינטרנט', + longDescription: + 'מפתחת אינטרנט מכורה ליצירת ממשקים ידידותיים למשתמש באמצעות React ו-Node.js.', + joinDate: '2022-01-01', }, { id: 3, - imgUrl: "http://localhost:3000/_next/image?url=https%3A%2F%2Favatars.githubusercontent.com%2Fu%2F19125%3Fv%3D4&w=48&q=75", - name: "דניאל כהן", - shortDescription: "מפתח אינטרנט", - longDescription: "מפתח אינטרנט מכור ליצירת ממשקים ידידותיים למשתמש באמצעות React ו-Node.js.", - joinDate: "2022-01-01" + imgUrl: + 'http://localhost:3000/_next/image?url=https%3A%2F%2Favatars.githubusercontent.com%2Fu%2F19125%3Fv%3D4&w=48&q=75', + name: 'דניאל כהן', + shortDescription: 'מפתח אינטרנט', + longDescription: + 'מפתח אינטרנט מכור ליצירת ממשקים ידידותיים למשתמש באמצעות React ו-Node.js.', + joinDate: '2022-01-01', }, { id: 4, - imgUrl: "http://localhost:3000/_next/image?url=https%3A%2F%2Favatars.githubusercontent.com%2Fu%2F19125%3Fv%3D4&w=48&q=75", - name: "רבקה כהן", - shortDescription: "מפתחת אינטרנט", - longDescription: "מפתחת אינטרנט מכורה ליצירת ממשקים ידידותיים למשתמש באמצעות React ו-Node.js.", - joinDate: "2022-01-01" + imgUrl: + 'http://localhost:3000/_next/image?url=https%3A%2F%2Favatars.githubusercontent.com%2Fu%2F19125%3Fv%3D4&w=48&q=75', + name: 'רבקה כהן', + shortDescription: 'מפתחת אינטרנט', + longDescription: + 'מפתחת אינטרנט מכורה ליצירת ממשקים ידידותיים למשתמש באמצעות React ו-Node.js.', + joinDate: '2022-01-01', }, { id: 5, - imgUrl: "http://localhost:3000/_next/image?url=https%3A%2F%2Favatars.githubusercontent.com%2Fu%2F19125%3Fv%3D4&w=48&q=75", - name: "רבקה כהן", - shortDescription: "מפתחת אינטרנט", - longDescription: "מפתחת אינטרנט מכורה ליצירת ממשקים ידידותיים למשתמש באמצעות React ו-Node.js.", - joinDate: "2022-01-01" + imgUrl: + 'http://localhost:3000/_next/image?url=https%3A%2F%2Favatars.githubusercontent.com%2Fu%2F19125%3Fv%3D4&w=48&q=75', + name: 'רבקה כהן', + shortDescription: 'מפתחת אינטרנט', + longDescription: + 'מפתחת אינטרנט מכורה ליצירת ממשקים ידידותיים למשתמש באמצעות React ו-Node.js.', + joinDate: '2022-01-01', }, { id: 6, - imgUrl: "http://localhost:3000/_next/image?url=https%3A%2F%2Favatars.githubusercontent.com%2Fu%2F19125%3Fv%3D4&w=48&q=75", - name: "רבקה כהן", - shortDescription: "מפתחת אינטרנט", - longDescription: "מפתחת אינטרנט מכורה ליצירת ממשקים ידידותיים למשתמש באמצעות React ו-Node.js.", - joinDate: "2022-01-01" + imgUrl: + 'http://localhost:3000/_next/image?url=https%3A%2F%2Favatars.githubusercontent.com%2Fu%2F19125%3Fv%3D4&w=48&q=75', + name: 'רבקה כהן', + shortDescription: 'מפתחת אינטרנט', + longDescription: + 'מפתחת אינטרנט מכורה ליצירת ממשקים ידידותיים למשתמש באמצעות React ו-Node.js.', + joinDate: '2022-01-01', }, - ]; - + ]; return ( -
    - {dummyMembers.map((member) => ( +
    + {dummyMembers.map(member => ( { /> ))}
    - )} \ No newline at end of file + ); +}; diff --git a/components/Members/MembersSearch/MembersSearch.tsx b/components/Members/MembersSearch/MembersSearch.tsx index 61ebdd42..3aba335f 100644 --- a/components/Members/MembersSearch/MembersSearch.tsx +++ b/components/Members/MembersSearch/MembersSearch.tsx @@ -1,15 +1,22 @@ -import React from 'react' +import React from 'react'; export const MembersSearch = () => { return ( -
    - - +
    - ) -} + ); +}; diff --git a/components/MembersPics/MembersPics.tsx b/components/MembersPics/MembersPics.tsx index d03668ad..88a25209 100644 --- a/components/MembersPics/MembersPics.tsx +++ b/components/MembersPics/MembersPics.tsx @@ -9,7 +9,9 @@ type MemberPicProps = { const MemberPic = ({ borderColorClass, imageSrc }: MemberPicProps) => { return ( -
    +
    { return (

    הכירו את חברי{' '} - + הקהילה

    diff --git a/components/Newbies/FaqsSection.tsx b/components/Newbies/FaqsSection.tsx index 47c8aea2..850e82e0 100644 --- a/components/Newbies/FaqsSection.tsx +++ b/components/Newbies/FaqsSection.tsx @@ -63,7 +63,7 @@ const faqs = [ {' '} תוכלו למצוא מידע על פרויקטים בקוד פתוח במגוון שפות ותחומים.
    - + בדיסקורד שלנו {' '} diff --git a/components/utils/Dropdown.tsx b/components/utils/Dropdown.tsx index de576636..27697494 100644 --- a/components/utils/Dropdown.tsx +++ b/components/utils/Dropdown.tsx @@ -16,19 +16,19 @@ interface Field { export type OptionValue = number | string; -interface Option{ +interface Option { title: string; titleHoverColor: string; text?: string; linkPath?: string; } -type DropdownProps= { +type DropdownProps = { field: Field; options: Option[]; }; -type ItemBodyProps= Omit; +type ItemBodyProps = Omit; export const Dropdown = ({ field, diff --git a/hooks/useFetchProjects.ts b/hooks/useFetchProjects.ts index bf58826c..3fed5128 100644 --- a/hooks/useFetchProjects.ts +++ b/hooks/useFetchProjects.ts @@ -1,8 +1,11 @@ import { useEffect, useState } from 'react'; import useLocalStorage from './useLocalStorage'; -import { CachedProjects, IRepositoriesAPIResponse, ProjectFilter, RepoItem } from '@/types'; - - +import { + CachedProjects, + IRepositoriesAPIResponse, + ProjectFilter, + RepoItem, +} from '@/types'; const cacheKey = 'projectsData'; const apiEndpoint = '/api/projects'; // The new API endpoint diff --git a/middleware.ts b/middleware.ts index 7874a0e7..d1199c5f 100644 --- a/middleware.ts +++ b/middleware.ts @@ -6,8 +6,8 @@ export default createMiddleware({ // localePrefix: undefined, defaultLocale: 'he', }); - + export const config = { // Match only internationalized pathnames - matcher: ['/', '/(he|en)/:path*', '/((?!_next|_vercel|.*\\..*).*)'] -}; \ No newline at end of file + matcher: ['/', '/(he|en)/:path*', '/((?!_next|_vercel|.*\\..*).*)'], +}; diff --git a/tailwind.config.js b/tailwind.config.js index 6b81e575..7b332b1a 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -72,15 +72,15 @@ module.exports = { inter: ['Inter', 'sans-serif'], }, fontSize: { - "3xs": "6px", - "2xs": "8px", - "1xs": "10px", + '3xs': '6px', + '2xs': '8px', + '1xs': '10px', xs: '12px', sm: '14px', base: '16px', lg: '18px', xl: '20px', - "1xl": "22px", + '1xl': '22px', '2xl': '24px', '3xl': '34px', '4xl': '48px',