Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
6 changes: 1 addition & 5 deletions .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,16 @@ jobs:
with:
node-version: "20"
cache: "npm"
cache-dependency-path: src/package-lock.json
cache-dependency-path: package-lock.json

- name: Install dependencies
run: npm ci
working-directory: src

- name: Generate Prisma Client
run: npx prisma generate
working-directory: src

- name: Lint
run: npm run lint
working-directory: src

- name: Typecheck
run: npx tsc --noEmit
working-directory: src
File renamed without changes.
7 changes: 7 additions & 0 deletions .husky/commit-msg
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
commit_msg=$(cat "$1")

if ! echo "$commit_msg" | grep -qE "^WEB-[0-9]+"; then
echo "ERROR: Commit message must start with 'WEB-XX' (e.g., 'WEB-67 Fix bug')"
echo " got: $commit_msg"
exit 1
fi
File renamed without changes.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ We *highly* recommend the use of VSCode for this project. Please download the VS
git clone git@github.com:SGAOperations/website-development.git
```

After opening the project, open the terminal and navigate to the sga-puck directory:
After opening the project, open the terminal and navigate to the project directory:
```
cd website-development/src
cd website-development
```

Once you are in the directory, install all package dependencies by running:
Expand All @@ -41,7 +41,7 @@ Afterwards, you should be able to run the application using:
npm run dev
```

The applications expects a local database and will return an error without it. Look at DATABASE_SETUP.md in the src directory for Prisma/Postgres setup instructions.
The applications expects a local database and will return an error without it. Look at DATABASE_SETUP.md for Prisma/Postgres setup instructions.

# Features for implementation
- Visual Drag-and-Drop Editor
Expand Down
File renamed without changes.
File renamed without changes.
112 changes: 64 additions & 48 deletions src/package-lock.json → package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion src/package.json → package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"dev": "next dev",
"build": "next build",
"start": "next start",
"lint": "next lint"
"lint": "next lint",
"prepare": "husky"
},
"dependencies": {
"@prisma/client": "^6.19.0",
Expand All @@ -24,6 +25,7 @@
"@types/react-dom": "^19.0.2",
"autoprefixer": "^10.4.21",
"eslint-config-custom": "*",
"husky": "^9.1.7",
"postcss": "^8.5.6",
"prisma": "^6.19.0",
"tailwindcss": "^4.1.14",
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
38 changes: 0 additions & 38 deletions src/README.md

This file was deleted.

4 changes: 2 additions & 2 deletions src/tailwind.config.js → tailwind.config.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/** @type {import('tailwindcss').Config} */
module.exports = {
content: [
"./app/**/*.{js,ts,jsx,tsx}",
"./puck.config.tsx",
"./src/app/**/*.{js,ts,jsx,tsx}",
"./src/puck.config.tsx",
],
theme: {
extend: {
Expand Down
2 changes: 1 addition & 1 deletion src/tsconfig.json → tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"compilerOptions": {
"plugins": [{ "name": "next" }]
},
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
"include": ["next-env.d.ts", "src/**/*.ts", "src/**/*.tsx", ".next/types/**/*.ts"],
"exclude": ["node_modules"]
}
File renamed without changes.
File renamed without changes.
Loading