diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 2284b93..4732fd9 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -5,7 +5,7 @@ name: Node.js CI on: push: - branches: [ "main" ] + branches: [ "main", "dcrepublic-dev", "v6ctor-dev"] pull_request: branches: [ "main" ] @@ -27,5 +27,5 @@ jobs: node-version: ${{ matrix.node-version }} cache: 'npm' - run: npm ci + - run: npx prisma generate - run: npm run build --if-present - - run: npm test diff --git a/app/layout.tsx b/app/layout.tsx index 2a51325..a5ab203 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -41,7 +41,13 @@ export default function RootLayout({ fontSans.variable )} > - +
diff --git a/app/page.tsx b/app/page.tsx index c8caed9..9b0c6c3 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -5,14 +5,15 @@ import { Skeleton } from "@nextui-org/skeleton"; import Search from "@/components/Search"; import { FullCourseList } from "@/components/FullCourseList"; -export default async function Page({ - searchParams, -}: { - searchParams?: { - query?: string; - page?: string; - }; -}) { +export default async function Page( + props: { + searchParams?: Promise<{ + query?: string; + page?: string; + }>; + } +) { + const searchParams = await props.searchParams; const query = searchParams?.query || ""; var homePageProps: any = {}; diff --git a/docker-compose.debug.yml b/docker-compose.debug.yml index 0c276bc..38e4de8 100644 --- a/docker-compose.debug.yml +++ b/docker-compose.debug.yml @@ -18,7 +18,7 @@ services: - 9229:9229 networks: - internal - command: sh -c "npm install --silent && npx prisma generate && npm run dev " + command: sh -c "npm install --silent && npx prisma migrate dev && npm run dev " postgres: image: postgres:16.4-bullseye diff --git a/package.json b/package.json index 3850452..d23ddb6 100644 --- a/package.json +++ b/package.json @@ -1,62 +1,62 @@ { - "name": "next-app-template", - "version": "0.0.1", - "private": true, - "scripts": { - "dev": "next dev --turbo", - "build": "next build", - "start": "next start", - "lint": "eslint . --ext .ts,.tsx -c .eslintrc.json --fix" - }, - "dependencies": { - "@emotion/react": "^11.13.3", - "@emotion/styled": "^11.13.0", - "@mui/icons-material": "^6.1.5", - "@nextui-org/button": "2.0.38", - "@nextui-org/code": "2.0.33", - "@nextui-org/input": "2.2.5", - "@nextui-org/kbd": "2.0.34", - "@nextui-org/link": "2.0.35", - "@nextui-org/listbox": "2.1.27", - "@nextui-org/navbar": "2.0.37", - "@nextui-org/react": "^2.4.8", - "@nextui-org/snippet": "2.0.43", - "@nextui-org/switch": "2.0.34", - "@nextui-org/system": "2.2.6", - "@nextui-org/tabs": "^2.0.37", - "@nextui-org/theme": "2.2.11", - "@prisma/client": "^5.21.1", - "@react-aria/ssr": "3.9.6", - "@react-aria/visually-hidden": "3.8.17", - "axios": "^1.7.7", - "clsx": "2.1.1", - "framer-motion": "~11.11.10", - "intl-messageformat": "^10.7.3", - "next": "^15.0.1", - "next-themes": "^0.3.0", - "react": "18.3.1", - "react-dom": "18.3.1", - "swr": "^2.2.5", - "use-debounce": "^10.0.4" - }, - "devDependencies": { - "@types/node": "22.8.1", - "@types/react": "18.3.12", - "@types/react-dom": "18.3.1", - "autoprefixer": "10.4.20", - "eslint": "^9.13.0", - "eslint-config-next": "15.0.1", - "eslint-config-prettier": "^9.1.0", - "eslint-plugin-import": "^2.31.0", - "eslint-plugin-jsx-a11y": "^6.10.2", - "eslint-plugin-node": "^11.1.0", - "eslint-plugin-prettier": "^5.2.1", - "eslint-plugin-react": "^7.37.2", - "eslint-plugin-react-hooks": "^5.0.0", - "eslint-plugin-unused-imports": "^4.1.4", - "postcss": "8.4.47", - "tailwind-variants": "0.2.1", - "tailwindcss": "3.4.14", - "typescript": "5.6.3" - } -} \ No newline at end of file + "name": "next-app-template", + "version": "0.0.1", + "private": true, + "scripts": { + "dev": "next dev --turbo", + "build": "next build", + "start": "next start", + "lint": "eslint . -c .ts,.tsx -c .eslintrc.json --fix" + }, + "dependencies": { + "@emotion/react": "^11.13.3", + "@emotion/styled": "^11.13.0", + "@mui/icons-material": "^6.1.5", + "@nextui-org/button": "2.0.38", + "@nextui-org/code": "2.0.33", + "@nextui-org/input": "2.2.5", + "@nextui-org/kbd": "2.0.34", + "@nextui-org/link": "2.0.35", + "@nextui-org/listbox": "2.1.27", + "@nextui-org/navbar": "2.0.37", + "@nextui-org/react": "^2.4.8", + "@nextui-org/snippet": "2.0.43", + "@nextui-org/switch": "2.0.34", + "@nextui-org/system": "2.2.6", + "@nextui-org/tabs": "^2.0.37", + "@nextui-org/theme": "2.2.11", + "@prisma/client": "^5.21.1", + "@react-aria/ssr": "3.9.6", + "@react-aria/visually-hidden": "3.8.17", + "axios": "^1.7.7", + "clsx": "2.1.1", + "framer-motion": "~11.11.10", + "intl-messageformat": "^10.7.3", + "next": "^15.0.1", + "next-themes": "^0.3.0", + "react": "18.3.1", + "react-dom": "18.3.1", + "swr": "^2.2.5", + "use-debounce": "^10.0.4" + }, + "devDependencies": { + "@types/node": "22.8.1", + "@types/react": "18.3.12", + "@types/react-dom": "18.3.1", + "autoprefixer": "10.4.20", + "eslint": "^9.13.0", + "eslint-config-next": "15.0.1", + "eslint-config-prettier": "^9.1.0", + "eslint-plugin-import": "^2.31.0", + "eslint-plugin-jsx-a11y": "^6.10.2", + "eslint-plugin-node": "^11.1.0", + "eslint-plugin-prettier": "^5.2.1", + "eslint-plugin-react": "^7.37.2", + "eslint-plugin-react-hooks": "^5.0.0", + "eslint-plugin-unused-imports": "^4.1.4", + "postcss": "8.4.47", + "tailwind-variants": "0.2.1", + "tailwindcss": "3.4.14", + "typescript": "5.6.3" + } +} diff --git a/test.md b/test.md deleted file mode 100644 index e69de29..0000000