Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/calblueprint/ace-ny into de…
Browse files Browse the repository at this point in the history
…enasun/branch1
  • Loading branch information
deenasun committed Oct 5, 2024
2 parents be0b532 + 2be341b commit d39c2ab
Show file tree
Hide file tree
Showing 5 changed files with 254 additions and 256 deletions.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/app/page.tsx → app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import { CSSProperties, useEffect } from 'react';
import Image from 'next/image';
import BPLogo from '@/assets/images/bp-logo.png';
import queryProjects from '../queries/query';
import queryProjects from '../src/queries/query';

// TODO: build some sort of testing page
export default function Home() {
Expand Down
2 changes: 1 addition & 1 deletion src/app/testing/page.tsx → app/testing/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import { CSSProperties, useEffect, useState } from 'react';
import Image from 'next/image';
import BPLogo from '@/assets/images/bp-logo.png';
import queryProjects from '../../queries/query';
import queryProjects from '../../src/queries/query';

interface Project {
id: string;
Expand Down
7 changes: 3 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,17 @@
"start": "next start",
"lint": "next lint",
"tsc": "pnpm exec tsc --noEmit",
"prettier:check": "pnpm exec prettier --check .",
"prettier": "pnpm exec prettier --check .",
"prettier:fix": "pnpm exec prettier --write .",
"prepare": "husky",
"pre-commit": "(pnpm run tsc || true) && (pnpm run lint || true) && pnpm run prettier:check"
"pre-commit": "(pnpm run tsc || true) && (pnpm run lint || true) && pnpm run prettier"
},
"dependencies": {
"@supabase/supabase-js": "^2.45.4",
"dotenv": "^16.4.5",
"next": "^14.2.13",
"react": "^18",
"react-dom": "^18",
"react-icons": "^5.3.0"
"react-dom": "^18"
},
"devDependencies": {
"@ianvs/prettier-plugin-sort-imports": "^4.3.1",
Expand Down
Loading

0 comments on commit d39c2ab

Please sign in to comment.