Skip to content

Commit

Permalink
Merge pull request #453 from Together-100Devs/githubActionsFix
Browse files Browse the repository at this point in the history
lint fixes & 2024 block removed
  • Loading branch information
intelagense authored Jan 6, 2024
2 parents 5285afa + eeb3f37 commit da310e3
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 6 deletions.
1 change: 1 addition & 0 deletions client/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { useAuthContext } from "contexts/AuthContext";
import LandingPage from "pages/LandingPage";
import CalendarPage from "pages/CalendarPage";
import { AdminDashboard } from "pages/AdminDashboard";
// eslint-disable-next-line
import { BrowserRouter as Router, Routes, Route } from "react-router-dom";

function App() {
Expand Down
2 changes: 0 additions & 2 deletions client/src/features/form/FormScheduleEvent.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ export default function FormScheduleEvent() {
className="p-1 px-2 appearance-none outline-non w-full text-gray-800"
required
min={format(new Date(), "yyyy-MM-dd")}
max="2023-12-31"
/>
</div>
</div>
Expand Down Expand Up @@ -116,7 +115,6 @@ export default function FormScheduleEvent() {
className="p-1 px-2 appearance-none outline-non w-full text-gray-800"
required
min={format(new Date(), "yyyy-MM-dd")}
max="2023-12-31"
/>
</div>
</div>
Expand Down
1 change: 1 addition & 0 deletions client/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import ModalProvider from "contexts/ModalContext";
import EventsProvider from "contexts/EventsContext";
import FormModalProvider from "contexts/FormModalContext";
import { createRoot } from "react-dom/client";
//eslint-disable-next-line
import { BrowserRouter as Router, Routes, Route } from "react-router-dom";

const rootElement = document.getElementById("root");
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/admin-dashboard.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ describe("Admin Dashboard", () => {
});

it("Group event titles and descriptions", () => {
GROUP_TEST_EVENTS.forEach((test_event, i) => {
GROUP_TEST_EVENTS.forEach(test_event => {
// Ensure test events rendered with correct title and description
cy.get("#events")
.find(`.group-event`)
Expand Down
3 changes: 1 addition & 2 deletions cypress/support/commands.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ Cypress.Commands.add("deleteOwnEvent", id => {
}
});

Cypress.Commands.add("getAllEvents", userCode => {
// cy.login(userCode)
Cypress.Commands.add("getAllEvents", () => {
return cy.request("GET", "/events");
});
2 changes: 1 addition & 1 deletion server/models/Event.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const { Temporal } = require("@js-temporal/polyfill");

const STRING_MAX_LENGTH = 280;
// Event's starting date should be less than (strictly) EVENT_MAX_DATE
const EVENT_MAX_DATE = "2024-01-01";
const EVENT_MAX_DATE = "2030-01-01";
// Recurring events should span no more than MAX_RECURRENCE_PERIOD number of days
const MAX_RECURRENCE_PERIOD = 90;
const DAYS_OF_WEEK = ["1", "2", "3", "4", "5", "6", "7"];
Expand Down

0 comments on commit da310e3

Please sign in to comment.