Commit f254ee11 authored by wycers's avatar wycers
Browse files

Merge branch 'main' of e.coding.net:rescene/lms/web

parents 96806ff6 b9950da6
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -14,11 +14,15 @@ RUN pnpm fetch

COPY --chown=node:node . .
RUN pnpm install -r --offline

RUN pnpm dlx prisma generate

ENV NODE_ENV production
RUN pnpm run build \
    && pnpm prune --production

# ---
FROM builder as migration
CMD pnpm dlx prisma migrate deploy

FROM node:20-alpine

drizzle.config.ts

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line
import type { Config } from 'drizzle-kit';
export default {
	schema: './src/lib/server/drizzle/schema.ts',
	out: './src/lib/drizzle',
	driver: 'mysql2',
	dbCredentials: {
		uri: process.env.DATABASE_URL!
	}
} satisfies Config;
+1 −6
Original line number Diff line number Diff line
@@ -12,9 +12,7 @@
		"lint": "prettier --check . && eslint .",
		"format": "prettier --write .",
		"test:integration": "playwright test",
		"test:unit": "vitest",
		"db:pull": "drizzle-kit introspect:mysql",
		"db:migrate": "drizzle-kit generate:mysql"
		"test:unit": "vitest"
	},
	"devDependencies": {
		"@playwright/test": "^1.28.1",
@@ -31,7 +29,6 @@
		"@typescript-eslint/parser": "^7.0.0",
		"autoprefixer": "^10.4.16",
		"bits-ui": "^0.19.3",
		"drizzle-kit": "^0.20.14",
		"eslint": "^8.56.0",
		"eslint-config-prettier": "^9.1.0",
		"eslint-plugin-svelte": "^2.35.1",
@@ -57,7 +54,6 @@
	},
	"type": "module",
	"dependencies": {
		"@lucia-auth/adapter-drizzle": "^1.0.2",
		"@lucia-auth/adapter-prisma": "^4.0.0",
		"@milkdown/core": "^7.3.5",
		"@milkdown/ctx": "^7.3.5",
@@ -77,7 +73,6 @@
		"@tiptap/starter-kit": "^2.2.4",
		"clsx": "^2.1.0",
		"cmdk-sv": "^0.0.15",
		"drizzle-orm": "^0.29.5",
		"github-markdown-css": "^5.5.1",
		"gravatar": "^1.8.2",
		"highlight.js": "^11.9.0",
+3 −589

File changed.

Preview size limit exceeded, changes collapsed.

+4 −4
Original line number Diff line number Diff line
@@ -19,9 +19,10 @@ model LuciaUser {

model LuciaSession {
  id        String    @id
  userId    String
  expiresAt DateTime
  user      LuciaUser @relation(references: [id], fields: [userId], onDelete: Cascade)

  luciaUser      LuciaUser @relation(references: [id], fields: [userId], onDelete: Cascade)
  userId    String
}

enum LuciaUserType {
@@ -34,12 +35,11 @@ model User {
  updatedAt DateTime @updatedAt()

  email     String @unique
  studentId Int?
  sustechId Int?   @unique
  bio       String @default("")
  image     String @default("")

  nickname  String
  sustechId Int    @unique

  classes            ClassesOnUsers[]
  submissions        Submission[]
Loading