Skip to content

Commit

Permalink
bumped prettier to 3.2.5 and ran format
Browse files Browse the repository at this point in the history
  • Loading branch information
oscarwang20 committed Mar 24, 2024
1 parent e03a3bf commit bb8c680
Show file tree
Hide file tree
Showing 9 changed files with 44 additions and 31 deletions.
4 changes: 1 addition & 3 deletions backend/src/API/mailAPI.ts
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,7 @@ export const sendTECReminder = async (
): Promise<AxiosResponse> => {
const subject = 'TEC Reminder';
const allEvents = await Promise.all(
(
await TeamEventsDao.getAllTeamEvents()
).map(async (event) => ({
(await TeamEventsDao.getAllTeamEvents()).map(async (event) => ({
...event,
requests: await teamEventAttendanceDao.getTeamEventAttendanceByEventId(event.uuid)
}))
Expand Down
5 changes: 2 additions & 3 deletions backend/src/API/teamEventsAPI.ts
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,8 @@ export const requestTeamEventCredit = async (
);
}
const updatedteamEvent = { ...request, status: 'pending' as Status };
const teamEventAttendance = await teamEventAttendanceDao.createTeamEventAttendance(
updatedteamEvent
);
const teamEventAttendance =
await teamEventAttendanceDao.createTeamEventAttendance(updatedteamEvent);
return teamEventAttendance;
};

Expand Down
4 changes: 2 additions & 2 deletions backend/src/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ export const enforceSession = true;
const allowedOrigins = allowAllOrigins
? [/.*/]
: isProd
? [/https:\/\/idol\.cornelldti\.org/, /.*--cornelldti-idol\.netlify\.app/]
: [/http:\/\/localhost:3000/];
? [/https:\/\/idol\.cornelldti\.org/, /.*--cornelldti-idol\.netlify\.app/]
: [/http:\/\/localhost:3000/];

// Middleware
app.use(
Expand Down
5 changes: 4 additions & 1 deletion backend/src/utils/errors.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
/* eslint-disable max-classes-per-file */

export class HandlerError extends Error {
constructor(public readonly errorCode: number, public readonly reason: string) {
constructor(
public readonly errorCode: number,
public readonly reason: string
) {
super();
}
}
Expand Down
14 changes: 12 additions & 2 deletions dti-website-redesign/src/pages/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,18 @@ html,
body {
padding: 0;
margin: 0;
font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell,
Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
font-family:
-apple-system,
BlinkMacSystemFont,
Segoe UI,
Roboto,
Oxygen,
Ubuntu,
Cantarell,
Fira Sans,
Droid Sans,
Helvetica Neue,
sans-serif;
line-height: 1.6;
font-size: 18px;
}
Expand Down
27 changes: 15 additions & 12 deletions dti-website/src/components/ProjectGoTo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,21 @@ export default function ProjectGoTo({ project, className }: Props): JSX.Element
</Button>
</Col>
)}
{project.android_github && !project.appstore && !project.playstore && !project.website && (
<Col className="connect-icon-container col-auto">
<Button
variant="secondary"
className="align-content-center"
href={project.android_github}
>
<GitHub className="connect-icon connect-icon-blank" />
<span className="connect-text">Android</span>
</Button>
</Col>
)}
{project.android_github &&
!project.appstore &&
!project.playstore &&
!project.website && (
<Col className="connect-icon-container col-auto">
<Button
variant="secondary"
className="align-content-center"
href={project.android_github}
>
<GitHub className="connect-icon connect-icon-blank" />
<span className="connect-text">Android</span>
</Button>
</Col>
)}
{project.github && !project.appstore && !project.playstore && !project.website && (
<Col className="connect-icon-container col-auto">
<Button variant="secondary" className="align-content-center" href={project.github}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const designLeads = DESIGN_LEAD_NETIDS.map(
netid,
role: 'lead',
subteams: ['leads', 'design-leads']
} as const)
}) as const
);

const devLeads = DEV_LEAD_NETIDS.map(
Expand All @@ -42,7 +42,7 @@ const devLeads = DEV_LEAD_NETIDS.map(
netid,
role: 'lead',
subteams: ['leads', 'dev-leads']
} as const)
}) as const
);

const tpms = [
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"identity-obj-proxy": "^3.0.0",
"jest": "^27.2.4",
"lint-staged": "^11.2.0",
"prettier": "^2.4.1",
"prettier": "^3.2.5",
"typescript": "^5.2.2"
},
"lint-staged": {
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -14750,16 +14750,16 @@ prettier-plugin-tailwindcss@^0.5.4:
resolved "https://registry.yarnpkg.com/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.5.6.tgz#8e511857a49bf127f078985f52b04a70e8e92285"
integrity sha512-2Xgb+GQlkPAUCFi3sV+NOYcSI5XgduvDBL2Zt/hwJudeKXkyvRS65c38SB0yb9UB40+1rL83I6m0RtlOQ8eHdg==

prettier@^2.4.1:
version "2.4.1"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.4.1.tgz#671e11c89c14a4cfc876ce564106c4a6726c9f5c"
integrity sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA==

prettier@^3.0.3:
version "3.0.3"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.0.3.tgz#432a51f7ba422d1469096c0fdc28e235db8f9643"
integrity sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==

prettier@^3.2.5:
version "3.2.5"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.2.5.tgz#e52bc3090586e824964a8813b09aba6233b28368"
integrity sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==

pretty-format@^27.0.0, pretty-format@^27.0.2, pretty-format@^27.2.4:
version "27.2.4"
resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.2.4.tgz#08ea39c5eab41b082852d7093059a091f6ddc748"
Expand Down

0 comments on commit bb8c680

Please sign in to comment.