Skip to content

Commit

Permalink
Merge pull request #3 from escottalexander/merge-changes
Browse files Browse the repository at this point in the history
Merge changes
  • Loading branch information
blahkheart authored Aug 17, 2023
2 parents 7c8dab8 + e513307 commit a4b2301
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

# yarn lint-staged --verbose
yarn lint-staged --verbose
2 changes: 2 additions & 0 deletions packages/nextjs/components/op/projects/ProjectList.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// TODO: re-enable type checking for file after we wire database to components
// @ts-nocheck
import React, { useState } from "react";
import CustomProjectButton from "../btn/CustomProjectButton";
import AlreadyOnBallotConflictModal from "../modals/AlreadyOnBallotConflictModal";
Expand Down
2 changes: 2 additions & 0 deletions packages/nextjs/components/project/ProjectHeader.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// TODO: re-enable type checking for file after we wire database to components
// @ts-nocheck
import React, { useState } from "react";
import Image from "next/image";
import AlreadyOnBallotConflictModal from "../op/modals/AlreadyOnBallotConflictModal";
Expand Down
3 changes: 1 addition & 2 deletions packages/nextjs/components/projects/AllProjects.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import Pagination from "~~/components/lists/Pagination";
import Card from "~~/components/projects/Card";
import { ProjectDocument } from "~~/models/Project";


interface Props {
projects: ProjectDocument[];
}
Expand Down Expand Up @@ -70,4 +69,4 @@ const AllProjects: React.FC<Props> = ({ projects }) => {
);
};

export default AllProjects;
export default AllProjects;

0 comments on commit a4b2301

Please sign in to comment.