From 00020dd6cf9a17c58b5f1706960a471f2569984f Mon Sep 17 00:00:00 2001 From: EthanAuyeung Date: Sun, 1 Oct 2023 16:28:14 -0700 Subject: [PATCH 1/4] Added file structure --- src/app/login.tsx | 8 ++++ src/app/page.tsx | 95 ----------------------------------------------- tsconfig.json | 24 ++++++++++-- 3 files changed, 28 insertions(+), 99 deletions(-) create mode 100644 src/app/login.tsx delete mode 100644 src/app/page.tsx diff --git a/src/app/login.tsx b/src/app/login.tsx new file mode 100644 index 00000000..2e64d750 --- /dev/null +++ b/src/app/login.tsx @@ -0,0 +1,8 @@ +import Image from 'next/image' +import styles from './page.module.css' + +export default function Home() { + return ( +

yo

+ ) +} diff --git a/src/app/page.tsx b/src/app/page.tsx deleted file mode 100644 index 9ddf9b95..00000000 --- a/src/app/page.tsx +++ /dev/null @@ -1,95 +0,0 @@ -import Image from 'next/image' -import styles from './page.module.css' - -export default function Home() { - return ( -
-
-

- Get started by editing  - src/app/page.tsx -

-
- - By{' '} - Vercel Logo - -
-
- -
- Next.js Logo -
- -
- -

- Docs -> -

-

Find in-depth information about Next.js features and API.

- - - -

- Learn -> -

-

Learn about Next.js in an interactive course with quizzes!

- - - -

- Templates -> -

-

Explore the Next.js 13 playground.

- - - -

- Deploy -> -

-

- Instantly deploy your Next.js site to a shareable URL with Vercel. -

- -
-
- ) -} diff --git a/tsconfig.json b/tsconfig.json index 80b29d1b..90e5f9d9 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,7 +1,11 @@ { "compilerOptions": { "target": "es5", - "lib": ["dom", "dom.iterable", "esnext"], + "lib": [ + "dom", + "dom.iterable", + "esnext" + ], "allowJs": true, "skipLibCheck": true, "strict": true, @@ -19,7 +23,19 @@ } ], "paths": { - "@/*": ["./src/*"] - } + "@/*": [ + "./src/*" + ] + }, + "forceConsistentCasingInFileNames": true }, -} \ No newline at end of file + "include": [ + "next-env.d.ts", + ".next/types/**/*.ts", + "**/*.ts", + "**/*.tsx" + ], + "exclude": [ + "node_modules" + ] +} From 0aa5f3b293864583678ccf7418f4302ccba6a665 Mon Sep 17 00:00:00 2001 From: EthanAuyeung Date: Sun, 1 Oct 2023 16:35:37 -0700 Subject: [PATCH 2/4] fixed eslint/prettier --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5addaf53..192659da 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3910,4 +3910,4 @@ } } } -} +} \ No newline at end of file diff --git a/package.json b/package.json index 2cc4f905..bd865841 100644 --- a/package.json +++ b/package.json @@ -37,4 +37,4 @@ "prettier": "^2.8.8", "typescript": "^4.9.5" } -} +} \ No newline at end of file From 71ca4717f252f70fdbaa8113f61b3582742a025b Mon Sep 17 00:00:00 2001 From: EthanAuyeung Date: Sun, 1 Oct 2023 16:43:46 -0700 Subject: [PATCH 3/4] fixed eslint --- .eslintrc.js | 2 +- package-lock.json | 8 +++++--- package.json | 6 +++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 9f6eb0b8..ca4281cd 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,5 +1,5 @@ module.exports = { - extends: ["@calblueprint/eslint-config-react", "eslint:recommended", "plugin:react/recommended", "plugin:prettier/recommended"], + extends: ["@calblueprint/eslint-config-react"], rules: { // Add any custom rules here // Disable the rule that requires React to be in scope -- we don't need this with React 18 diff --git a/package-lock.json b/package-lock.json index 192659da..d4587e0d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,6 @@ "name": "shanti-project", "version": "0.1.0", "dependencies": { - "@calblueprint/prettier-config": "^0.0.1", "@supabase/supabase-js": "^2.37.0", "@types/node": "20.6.3", "@types/react": "18.2.22", @@ -21,9 +20,10 @@ }, "devDependencies": { "@calblueprint/eslint-config-react": "^0.0.3", + "@calblueprint/prettier-config": "^0.0.1", "@typescript-eslint/eslint-plugin": "^5.62.0", "@typescript-eslint/parser": "^5.62.0", - "eslint": "^8.49.0", + "eslint": "^8.50.0", "eslint-config-airbnb": "^19.0.4", "eslint-config-prettier": "^8.10.0", "eslint-plugin-import": "^2.28.1", @@ -76,6 +76,7 @@ "version": "0.0.1", "resolved": "https://registry.npmjs.org/@calblueprint/prettier-config/-/prettier-config-0.0.1.tgz", "integrity": "sha512-WIF1b8p57gArSMXu1XXQaE7fQWrTYHmP3F17YfS4Fjwz6o5Gog/fTiTJDsqnzKl98WjoegPXsK6ahomHAiFaZg==", + "dev": true, "peerDependencies": { "prettier": "^2.8.4" } @@ -3077,6 +3078,7 @@ "version": "2.8.8", "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", + "dev": true, "bin": { "prettier": "bin-prettier.js" }, @@ -3910,4 +3912,4 @@ } } } -} \ No newline at end of file +} diff --git a/package.json b/package.json index bd865841..9ba3fc86 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,6 @@ "prettier:fix": "npx prettier --write ." }, "dependencies": { - "@calblueprint/prettier-config": "^0.0.1", "@supabase/supabase-js": "^2.37.0", "@types/node": "20.6.3", "@types/react": "18.2.22", @@ -25,9 +24,10 @@ }, "devDependencies": { "@calblueprint/eslint-config-react": "^0.0.3", + "@calblueprint/prettier-config": "^0.0.1", "@typescript-eslint/eslint-plugin": "^5.62.0", "@typescript-eslint/parser": "^5.62.0", - "eslint": "^8.49.0", + "eslint": "^8.50.0", "eslint-config-airbnb": "^19.0.4", "eslint-config-prettier": "^8.10.0", "eslint-plugin-import": "^2.28.1", @@ -37,4 +37,4 @@ "prettier": "^2.8.8", "typescript": "^4.9.5" } -} \ No newline at end of file +} From b82710bfe877ca18f1f94e34f67ce45d69bd0585 Mon Sep 17 00:00:00 2001 From: EthanAuyeung Date: Sun, 1 Oct 2023 16:45:29 -0700 Subject: [PATCH 4/4] fixed prettier issues --- src/app/login.tsx | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/app/login.tsx b/src/app/login.tsx index 2e64d750..b1fb9968 100644 --- a/src/app/login.tsx +++ b/src/app/login.tsx @@ -1,6 +1,3 @@ -import Image from 'next/image' -import styles from './page.module.css' - export default function Home() { return (

yo