diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index f4a0038b..da9e7ada 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -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. @@ -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.) + 2. Use this command to fetch the list of remote branches. `git fetch upstream` diff --git a/client/src/features/calendarHeader/CalendarHeader.jsx b/client/src/features/calendarHeader/CalendarHeader.jsx index ee88dc14..b859e224 100644 --- a/client/src/features/calendarHeader/CalendarHeader.jsx +++ b/client/src/features/calendarHeader/CalendarHeader.jsx @@ -30,8 +30,8 @@ function CalendarHeader({ date }) { }; return ( -
-
+
+
navigate("/")} />
-
+
Logo date.getCurrentMonth()} />
-
+
{ + const defaultLinks = [{ name: "HOME", link: "/", type: "button" }]; + if (location.pathname.includes("calendar")) { + defaultLinks.push({ + name: "ADD EVENT", + action: formModal.handleOpen, + type: "function", + }); + } else { + defaultLinks.push({ + name: "CALENDAR", + link: "/calendar", + type: "button", + }); + } - if (!isAuthenticated()) { - Links.push({ name: "LOG IN", link: "api/auth/discord", type: "a" }); - } else { - Links.push({ name: "LOG OUT", onClick: logout, type: "button" }); - } + if (!isAuthenticated()) { + defaultLinks.push({ + name: "LOG IN", + link: "api/auth/discord", + type: "a", + }); + } else { + defaultLinks.push({ name: "LOG OUT", action: logout, type: "function" }); + } - let [open, setOpen] = useState(false); + return defaultLinks; + }; + + const menuItems = links || getDefaultLinks(); + + const [open, setOpen] = useState(false); return (