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: 3 additions & 4 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,13 @@ Together's progress and milestones are split into separate, distinct issues. You

> 💡 Issues tagged with `Good 100Devs First Try` are beginner-level issues that are great for fellow 100Devs.


Currently we have the way to discover issues using Issue Tab.

### Issues Tab

![Screenshot of Issues tab on GitHub with example issues representing various stages of a project](assets/contributing-issues-tab.jpg)
The [Issues tab](https://github.com/Together-100Devs/Together/issues) contains all of the issues that are currently in progress, planned to be worked on, or need further review.


## Editing code and submitting a pull request

Use the following process to make changes after an issue has been assigned to you.
Expand Down Expand Up @@ -128,8 +127,8 @@ Now that you have a personal fork of the project on GitHub, you will be able to

Now that you have the copy, you will need access to the feature branch related to your issue to create a local working branch to write your code.

1. Set upstream to track the remote repository containing the original repo. (Not just your fork.)
1. Set upstream to track the remote repository containing the original repo. (Not just your fork.)

Comment on lines +130 to +131
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah just unsure why these files are changed in this PR, maybe possible to remove this from the PR? If too difficult I'm sure we can make it work

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@DevinCLane it is not mine changes, but on previous commits because of contributing.md the checks were failing and i think this file was not formatted, so to fix checks I have run formatting command and pushed formatted contributing.md to pass checks

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah so I would try to remove this from your git history so the file remains unchanged in this PR. That might entail a rebase. If that's too difficult we can leave it as it.

2. Use this command to fetch the list of remote branches.
`git fetch upstream`

Expand Down
4 changes: 4 additions & 0 deletions client/src/contexts/ModalContext/useProvideModal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@ import { useState } from "react";
const useProvideModal = () => {
const [isOpen, setIsOpen] = useState(false);
const [activeEvent, setActiveEvent] = useState(null);
const [isEditing, setIsEditing] = useState(false);

const handleOpen = () => {
setIsOpen(true);
};

const handleClose = () => {
setIsOpen(false);
setIsEditing(false);
};

const handleToggle = () => {
Expand All @@ -25,6 +27,8 @@ const useProvideModal = () => {
handleToggle,
activeEvent,
setActiveEvent,
isEditing,
setIsEditing,
};
};

Expand Down
22 changes: 2 additions & 20 deletions client/src/features/form/FormCreateEvent.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { useFormContext } from "../../contexts/FormContext";
import { useAuthContext } from "../../contexts/AuthContext";
import FormError from "../form/FormError";

export default function FormCreateEvent() {
const auth = useAuthContext();
Expand All @@ -19,26 +20,7 @@ export default function FormCreateEvent() {
return (
<div className="flex flex-col">
{formCreateEventErrors.map((error, index) => {
return (
<div className="alert alert-error shadow-lg text-red-700" key={index}>
<div>
<svg
xmlns="http://www.w3.org/2000/svg"
className="stroke-current shrink-0 h-6 w-6"
fill="none"
viewBox="0 0 24 24"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="2"
d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z"
/>
</svg>
<span>{error}</span>
</div>
</div>
);
return <FormError error={error} key={index} />;
})}

<div className="w-full mx-2 flex-1">
Expand Down
26 changes: 26 additions & 0 deletions client/src/features/form/FormError.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import React from "react";

const FormError = ({ error }) => {
return (
<div className="alert alert-error shadow-lg text-red-700">
<div>
<svg
xmlns="http://www.w3.org/2000/svg"
className="stroke-current shrink-0 h-6 w-6"
fill="none"
viewBox="0 0 24 24"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="2"
d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z"
/>
</svg>
<span>{error}</span>
</div>
</div>
);
};

export default FormError;
22 changes: 2 additions & 20 deletions client/src/features/form/FormScheduleEvent.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { useFormContext } from "../../contexts/FormContext";
import FormError from "../form/FormError";
import FormRecurringDates from "./FormRecurringDates";
import { format } from "date-fns";

Expand All @@ -25,26 +26,7 @@ export default function FormScheduleEvent() {
return (
<div>
{formScheduleEventErrors.map((error, index) => {
return (
<div className="alert alert-error shadow-lg text-red-700" key={index}>
<div>
<svg
xmlns="http://www.w3.org/2000/svg"
className="stroke-current shrink-0 h-6 w-6"
fill="none"
viewBox="0 0 24 24"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="2"
d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z"
/>
</svg>
<span>{error}</span>
</div>
</div>
);
return <FormError error={error} key={index} />;
})}

<div>
Expand Down
Loading