Skip to content

Commit edd82f8

Browse files
committed
merge s26 template, update instruction ghub page
1 parent a0aadf1 commit edd82f8

36 files changed

Lines changed: 4010 additions & 2994 deletions

.gitignore

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
22

3-
.idea
4-
53
# dependencies
64
/node_modules
75
/.pnp
8-
.pnp.js
9-
.yarn/install-state.gz
6+
.pnp.*
7+
.yarn/*
8+
!.yarn/patches
9+
!.yarn/plugins
10+
!.yarn/releases
11+
!.yarn/versions
1012

1113
# testing
1214
/coverage
@@ -26,10 +28,10 @@
2628
npm-debug.log*
2729
yarn-debug.log*
2830
yarn-error.log*
31+
.pnpm-debug.log*
2932

30-
# local env files
31-
.env*.local
32-
.env
33+
# env files (can opt-in for committing if needed)
34+
.env*
3335

3436
# vercel
3537
.vercel
@@ -39,12 +41,15 @@ yarn-error.log*
3941
next-env.d.ts
4042

4143
.vscode
42-
certificates
44+
.idea
4345

44-
settings.production.json
46+
.env
47+
/generated/prisma
4548

4649
# Playwright
50+
node_modules/
4751
/test-results/
4852
/playwright-report/
4953
/blob-report/
5054
/playwright/.cache/
55+
/playwright/.auth/

config/settings.development.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
{ "email": "admin@foo.com", "password": "changeme", "role": "ADMIN" },
44
{ "email": "john@foo.com", "password": "changeme" }
55
],
6-
76
"defaultData": [
87
{ "name": "Basket", "quantity": 3, "owner": "john@foo.com", "condition": "excellent" },
98
{ "name": "Bicycle", "quantity": 2, "owner": "john@foo.com", "condition": "poor" },

eslint.config.mjs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import { defineConfig, globalIgnores } from "eslint/config";
2+
import nextVitals from "eslint-config-next/core-web-vitals";
3+
import nextTs from "eslint-config-next/typescript";
4+
5+
const eslintConfig = defineConfig([
6+
...nextVitals,
7+
...nextTs,
8+
// Override default ignores of eslint-config-next.
9+
globalIgnores([
10+
// Default ignores of eslint-config-next:
11+
".next/**",
12+
"out/**",
13+
"build/**",
14+
"next-env.d.ts",
15+
]),
16+
]);
17+
18+
export default eslintConfig;

index.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ $ npm install
4646

4747
Fifth, create a `.env` file from the `sample.env`. Edit the line `DATABASE_URL="postgresql://johndoe:randompassword@localhost:5432/mydb?schema=public"` to match your setup. Replace `mydb` with the PostgreSQL database that you created in the first step (in the example for this step the database is `nextjs-application-template`). replace `johndoe:randompassword` with a username and password you created for this db. If you did not create a user for this database, you can use the `postgress` user with the password you set when you installed postgress. Note: this is not a recommdened practice since the `postgres` user is an admin with full access to postgres.
4848

49-
See the Prisma docs [Connect your database](https://www.prisma.io/docs/prisma-orm/add-to-existing-project/postgresql#3-connect-your-database). Then run the Prisma migration `npx prisma migrate dev` to set up the PostgreSQL tables.
49+
See the Prisma docs [Connect your database](https://www.prisma.io/docs/prisma-orm/add-to-existing-project/postgresql#3-connect-your-database).
50+
51+
Then run the Prisma migration `npx prisma migrate dev` to set up the PostgreSQL tables.
5052

5153
```
5254
$ npx prisma migrate dev

next.config.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import type { NextConfig } from "next";
2+
3+
const nextConfig: NextConfig = {
4+
/* config options here */
5+
};
6+
7+
export default nextConfig;

0 commit comments

Comments
 (0)