Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Calendar functionality #18

Closed
wants to merge 31 commits into from
Closed

Calendar functionality #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
fff6863
Fixed
anantduggal Jun 21, 2024
4152184
Add calendar add and delete functionality
VJagiasi Jun 29, 2024
eda1d99
Add input form for absence details
VJagiasi Jul 5, 2024
443742a
Add Absence.ts
VJagiasi Jul 5, 2024
d1da6f8
Update calendar with database functionality
VJagiasi Jul 5, 2024
bc159f4
Fix build errors
VJagiasi Jul 6, 2024
c5977c1
Fix build error
VJagiasi Jul 7, 2024
3c84f7c
Add SubjectId and remove Subject
VJagiasi Jul 14, 2024
0359732
Fix double absence adding issue + rename event to absence
VJagiasi Jul 14, 2024
478f207
Rename event to absence
VJagiasi Jul 14, 2024
66db4f2
Add error message for invalid input
VJagiasi Jul 20, 2024
f24cb39
Fix form accepting invalid inputs issue
VJagiasi Jul 20, 2024
735e888
Fix package-lock.json
VJagiasi Jul 20, 2024
22e635d
Fix formatting
VJagiasi Jul 20, 2024
2777cc3
update package-lock.json
VJagiasi Jul 20, 2024
fd35487
Added DB Connect
ludavidca Jul 27, 2024
650e164
Deleted pnpm file
ludavidca Jul 27, 2024
e2a2b99
Completed package.json for vercel deploy
ludavidca Jul 27, 2024
9e47fed
Removed Console Log
ludavidca Jul 27, 2024
43fd605
Revert back to original tsconfig + auth.ts
VJagiasi Jul 27, 2024
5000e48
final changes
VJagiasi Oct 2, 2024
f63fdd5
Merge branch 'main' into vihaan-anant/calendar-functionality
VJagiasi Oct 2, 2024
da61aab
linting issues
VJagiasi Oct 2, 2024
c871bae
Merge branch 'vihaan-anant/calendar-functionality' of https://github.…
VJagiasi Oct 2, 2024
bb2abeb
Update eslintrc.json
VJagiasi Oct 5, 2024
c48a239
Fix linting errors
VJagiasi Oct 5, 2024
5064736
Fix nested button error by changing button to Box Layout
VJagiasi Oct 12, 2024
b92573a
fix colour scheme ChakraUI console errors
VJagiasi Oct 12, 2024
80adcbc
Remove size from button
VJagiasi Oct 12, 2024
e01e3c2
Update Dockerfile from main branch
VJagiasi Oct 12, 2024
d9a03bc
Add DayView, TileContent, WeekView components
VJagiasi Oct 12, 2024
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
3 changes: 1 addition & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ RUN npm install
EXPOSE 3000

# Run the application
CMD echo "Waiting for database to be ready..." && \
echo "Running Prisma commands..." && \
CMD echo "Running Prisma commands..." && \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Revert changes here.

npx prisma generate && \
npx prisma db push && \
npx @snaplet/seed sync && \
Expand Down
145 changes: 144 additions & 1 deletion package-lock.json
View file
Open in desktop

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

8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Revert changes here

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"private": true,
"scripts": {
"dev": "next dev",
"build": "next build",
"build": "prisma generate && prisma migrate && next build",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Revert

"start": "next start",
"lint": "next lint",
"lint:fix": "eslint . --ext js,jsx,ts,tsx --fix",
Expand All @@ -20,18 +20,18 @@
"@chakra-ui/theme-tools": "^2.0.2",
"@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.5",
"@faker-js/faker": "^8.4.1",
"@mui/material": "^5.15.20",
"@mui/system": "^5.15.20",
"@faker-js/faker": "^8.4.1",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Revert

"@prisma/client": "^5.17.0",
"dotenv": "^16.4.5",
"framer-motion": "^6.3.0",
"next": "^14.2.13",
"next-auth": "^5.0.0-beta.19",
"nodemailer": "^6.9.14",
"pnpm": "^9.4.0",
"postgres": "^3.4.4",
"prisma": "^5.16.0",
"postgres": "^3.4.4",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Revert

"react": "^18.2.0",
"react-calendar": "^5.0.0",
"react-dom": "^18.2.0"
Expand All @@ -44,7 +44,7 @@
"@types/react-dom": "^18.0.0",
"@typescript-eslint/eslint-plugin": "^8.8.0",
"@typescript-eslint/parser": "^8.8.0",
"eslint": "^8.57.1",
"eslint": "^8.57.0",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Revert

"eslint-config-next": "14.2.3",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.1.3",
Expand Down
154 changes: 140 additions & 14 deletions prisma/seed/.snaplet/dataModel.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,20 @@
"isId": true,
"maxLength": null
},
{
"id": "public.Absence.absentTeacherId",
"name": "absentTeacherId",
"columnName": "absentTeacherId",
"type": "int4",
"isRequired": true,
"kind": "scalar",
"isList": false,
"isGenerated": false,
"sequence": false,
"hasDefaultValue": false,
"isId": false,
"maxLength": null
},
{
"id": "public.Absence.lessonDate",
"name": "lessonDate",
Expand Down Expand Up @@ -65,20 +79,6 @@
"isId": false,
"maxLength": null
},
{
"id": "public.Absence.absentTeacherId",
"name": "absentTeacherId",
"columnName": "absentTeacherId",
"type": "int4",
"isRequired": true,
"kind": "scalar",
"isList": false,
"isGenerated": false,
"sequence": false,
"hasDefaultValue": false,
"isId": false,
"maxLength": null
},
{
"id": "public.Absence.substituteTeacherId",
"name": "substituteTeacherId",
Expand Down Expand Up @@ -561,6 +561,132 @@
"nullNotDistinct": false
}
]
},
"_prisma_migrations": {
"id": "public._prisma_migrations",
"schemaName": "public",
"tableName": "_prisma_migrations",
"fields": [
{
"id": "public._prisma_migrations.id",
"name": "id",
"columnName": "id",
"type": "varchar",
"isRequired": true,
"kind": "scalar",
"isList": false,
"isGenerated": false,
"sequence": false,
"hasDefaultValue": false,
"isId": true,
"maxLength": 36
},
{
"id": "public._prisma_migrations.checksum",
"name": "checksum",
"columnName": "checksum",
"type": "varchar",
"isRequired": true,
"kind": "scalar",
"isList": false,
"isGenerated": false,
"sequence": false,
"hasDefaultValue": false,
"isId": false,
"maxLength": 64
},
{
"id": "public._prisma_migrations.finished_at",
"name": "finished_at",
"columnName": "finished_at",
"type": "timestamptz",
"isRequired": false,
"kind": "scalar",
"isList": false,
"isGenerated": false,
"sequence": false,
"hasDefaultValue": false,
"isId": false,
"maxLength": null
},
{
"id": "public._prisma_migrations.migration_name",
"name": "migration_name",
"columnName": "migration_name",
"type": "varchar",
"isRequired": true,
"kind": "scalar",
"isList": false,
"isGenerated": false,
"sequence": false,
"hasDefaultValue": false,
"isId": false,
"maxLength": 255
},
{
"id": "public._prisma_migrations.logs",
"name": "logs",
"columnName": "logs",
"type": "text",
"isRequired": false,
"kind": "scalar",
"isList": false,
"isGenerated": false,
"sequence": false,
"hasDefaultValue": false,
"isId": false,
"maxLength": null
},
{
"id": "public._prisma_migrations.rolled_back_at",
"name": "rolled_back_at",
"columnName": "rolled_back_at",
"type": "timestamptz",
"isRequired": false,
"kind": "scalar",
"isList": false,
"isGenerated": false,
"sequence": false,
"hasDefaultValue": false,
"isId": false,
"maxLength": null
},
{
"id": "public._prisma_migrations.started_at",
"name": "started_at",
"columnName": "started_at",
"type": "timestamptz",
"isRequired": true,
"kind": "scalar",
"isList": false,
"isGenerated": false,
"sequence": false,
"hasDefaultValue": true,
"isId": false,
"maxLength": null
},
{
"id": "public._prisma_migrations.applied_steps_count",
"name": "applied_steps_count",
"columnName": "applied_steps_count",
"type": "int4",
"isRequired": true,
"kind": "scalar",
"isList": false,
"isGenerated": false,
"sequence": false,
"hasDefaultValue": true,
"isId": false,
"maxLength": null
}
],
"uniqueConstraints": [
{
"name": "_prisma_migrations_pkey",
"fields": ["id"],
"nullNotDistinct": false
}
]
}
},
"enums": {
Expand Down
Loading
Loading