Skip to content
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.

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

Member card UI chanes #196

Merged
merged 3 commits into from
Mar 18, 2024
Merged
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
67 changes: 50 additions & 17 deletions CONTRIBUTING/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
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.
66 changes: 45 additions & 21 deletions CONTRIBUTING/GUIDELINES.md
Original file line number Diff line number Diff line change
@@ -1,68 +1,92 @@
# 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`

## Community

### 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.
23 changes: 11 additions & 12 deletions LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
39 changes: 21 additions & 18 deletions app/[locale]/members/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand All @@ -29,29 +28,33 @@ export const metadata: Metadata = {

const WelcomeMessage = () => {
return (
<div className='flex flex-col justify-center bg-purple-100 dark:bg-gray-800 mt-16 mb-16 h-20'>
<div className='flex justify-evenly flex-wrap'>
<p className='text-2xl'>כאן אפשר להכיר את כל המשפחה! וכשתסיימו, בואו לדיסקורד</p>
<div className="flex flex-col justify-center bg-purple-100 dark:bg-gray-800 mt-16 mb-16 h-20">
<div className="flex justify-evenly flex-wrap">
<p className="text-2xl">
כאן אפשר להכיר את כל המשפחה! וכשתסיימו, בואו לדיסקורד
</p>
<div>
<DiscordLink
href={LINKS.DISCORD}
className="flex-grow-[2] font-inter font-semibold bg-gray-50 text-gray-600 py-2 px-6"
>
ערוץ דיסקורד
</DiscordLink>
<DiscordLink
href={LINKS.DISCORD}
className="flex-grow-[2] font-inter font-semibold bg-gray-50 text-gray-600 py-2 px-6"
>
ערוץ דיסקורד
</DiscordLink>
</div>
</div>
</div>
)
}
);
};

const MembersPage: React.FC = () => {
return <div>
<h1 className='text-center'>Members</h1>
<WelcomeMessage/>
<MembersSearch/>
<MembersList/>
</div>;
return (
<div>
<h1 className="text-center">Members</h1>
<WelcomeMessage />
<MembersSearch />
<MembersList />
</div>
);
};

export default MembersPage;
6 changes: 1 addition & 5 deletions app/[locale]/projects/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,7 @@ export const metadata: Metadata = {
};

const ProjectsLayout = ({ children }: { children: React.ReactNode }) => {
return (
<section className="flex flex-col h-full gap-4">
{children}
</section>
);
return <section className="flex flex-col h-full gap-4">{children}</section>;
};

export default ProjectsLayout;
16 changes: 8 additions & 8 deletions app/i18n.ts
Original file line number Diff line number Diff line change
@@ -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,
};
});
});
2 changes: 1 addition & 1 deletion components.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
"components": "@/components",
"utils": "@/lib/utils"
}
}
}
Loading
Loading