diff --git a/client/README.md b/client/README.md deleted file mode 100644 index 42e552b1..00000000 --- a/client/README.md +++ /dev/null @@ -1 +0,0 @@ -# Client For UNI-Verse \ No newline at end of file diff --git a/client/css/hello.css b/client/css/hello.css new file mode 100644 index 00000000..e69de29b diff --git a/client/script/hello.jsx b/client/script/hello.jsx new file mode 100644 index 00000000..e69de29b diff --git a/client/script/test.jsx b/client/script/test.jsx new file mode 100644 index 00000000..e69de29b diff --git a/client/templates/fac/Event.html b/client/templates/fac/Event.html new file mode 100644 index 00000000..3be66ceb --- /dev/null +++ b/client/templates/fac/Event.html @@ -0,0 +1,44 @@ + + + + + + + Complaints + + + +

Accept/Reject Events

+ + + + + + + + + + + + + + + + + + + + + + + + + +
Event NameEvent DescriptionEvent DateEvent TimeEvent VenueEvent OrganizerEvent CountHosted ByPosterSelect
Alfreds FutterkisteMaria AndersGermanyGermanyGermanyGermanyGermanyGermanyGermany
+
+ +
+ Register + + + \ No newline at end of file diff --git a/client/templates/fac/course.html b/client/templates/fac/course.html new file mode 100644 index 00000000..08f334fd --- /dev/null +++ b/client/templates/fac/course.html @@ -0,0 +1,32 @@ + + + + + + + View Courses + + + +

View Courses

+ + + + + + + + + + + + + + + +
Course nameCourse CodeCourse TypeCourse CreditsCourse teacherId(Name)
Alfreds FutterkisteMaria AndersGermanyGermanyGermany
+ + + + + \ No newline at end of file diff --git a/client/templates/fac/fac-login.html b/client/templates/fac/fac-login.html new file mode 100644 index 00000000..b487d612 --- /dev/null +++ b/client/templates/fac/fac-login.html @@ -0,0 +1,51 @@ + + + + + + Document + + +

Login

+
+ +

+ +

+ +
+ + + diff --git a/client/templates/hello.html b/client/templates/hello.html new file mode 100644 index 00000000..d9baddb2 --- /dev/null +++ b/client/templates/hello.html @@ -0,0 +1,16 @@ + + + + + Document + + +

Hello

+

Who are you?

+ + + diff --git a/client/templates/stu/PostEvent.html b/client/templates/stu/PostEvent.html new file mode 100644 index 00000000..479da1ee --- /dev/null +++ b/client/templates/stu/PostEvent.html @@ -0,0 +1,88 @@ + + + + + + + Post Events + + + +

Post Event

+
+ + +

+ +

+ + +

+ + +

+ + +

+ + +

+ + +

+ + +

+ + +

+ + + +
+ Register + + + + + \ No newline at end of file diff --git a/client/templates/stu/complaint.html b/client/templates/stu/complaint.html new file mode 100644 index 00000000..d53b4aff --- /dev/null +++ b/client/templates/stu/complaint.html @@ -0,0 +1,56 @@ + + + + + + Complaints + + + + + +

Previous Complaints

+ + + +

Add Complaints

+
+ +

+ +

+ +

+ +

+ +
+ + diff --git a/client/templates/stu/dashboard.html b/client/templates/stu/dashboard.html new file mode 100644 index 00000000..62438db2 --- /dev/null +++ b/client/templates/stu/dashboard.html @@ -0,0 +1,23 @@ + + + + + + Dashboard + + + +

Choose your pill

+

Red or Blue? Choose wisely

+ + + + \ No newline at end of file diff --git a/client/templates/stu/leave.html b/client/templates/stu/leave.html new file mode 100644 index 00000000..f330c83d --- /dev/null +++ b/client/templates/stu/leave.html @@ -0,0 +1,76 @@ + + + + + + Leave Requests + + + +

Leave Requests

+
+

Enter type of leave request

+ +
+
+

Enter reason for Leave request

+ +

Enter the date

+ +

Enter the time

+ +

Enter leaveDuration

+ +

+ +

+
+ + + + + + + + + +
Leave IDType of leave requestReason for leaveDate of leavingDate of returnDelete Request
+ + + diff --git a/client/templates/stu/nav.html b/client/templates/stu/nav.html new file mode 100644 index 00000000..ccfb8775 --- /dev/null +++ b/client/templates/stu/nav.html @@ -0,0 +1,36 @@ + + + + + + + diff --git a/client/templates/stu/room.html b/client/templates/stu/room.html new file mode 100644 index 00000000..c53b73d1 --- /dev/null +++ b/client/templates/stu/room.html @@ -0,0 +1,62 @@ + + + + + + Document + + +
+

Your current room:

+

Room type:

+

Block:

+

Room number:

+

Mess type:

+
+
+

Change mess:

+ + +
+ + + diff --git a/client/templates/stu/stu-login.html b/client/templates/stu/stu-login.html new file mode 100644 index 00000000..80b953e9 --- /dev/null +++ b/client/templates/stu/stu-login.html @@ -0,0 +1,52 @@ + + + + + + Document + + +

Login

+
+ +

+ +

+ +
+ Register + + + diff --git a/client/templates/stu/stu-reg.html b/client/templates/stu/stu-reg.html new file mode 100644 index 00000000..d140bd28 --- /dev/null +++ b/client/templates/stu/stu-reg.html @@ -0,0 +1,64 @@ + + + + + + Document + + + Register +
+ + + + + + + + + + + + + + + + +
+ + + diff --git a/client/templates/war/dashboard.html b/client/templates/war/dashboard.html new file mode 100644 index 00000000..c0a4d1da --- /dev/null +++ b/client/templates/war/dashboard.html @@ -0,0 +1,21 @@ + + + + + + Dashboard + + + +

Choose your pill

+

Red or Blue? Choose wisely

+ + + + \ No newline at end of file diff --git a/client/templates/war/leave.html b/client/templates/war/leave.html new file mode 100644 index 00000000..4346d250 --- /dev/null +++ b/client/templates/war/leave.html @@ -0,0 +1,69 @@ + + + + + + Document + + +

View leave request:

+ + + + + + + + + + + + +
StudentRegnoLeave TypeLeave DateLeave TimeLeave Duration
+ + + diff --git a/client/templates/war/room.html b/client/templates/war/room.html new file mode 100644 index 00000000..c054d694 --- /dev/null +++ b/client/templates/war/room.html @@ -0,0 +1,70 @@ + + + + + + Document + + +

View room requests:

+ + + + + + + + + + + + +
BlockRoom NoRoom TypeRoom CapacityStudentsIs Full?
+ + + diff --git a/client/templates/war/war-login.html b/client/templates/war/war-login.html new file mode 100644 index 00000000..4db5cdbf --- /dev/null +++ b/client/templates/war/war-login.html @@ -0,0 +1,57 @@ + + + + + + Document + + +

Login

+
+ + + + +

+ +
+ + + diff --git a/readme.md b/readme.md new file mode 100644 index 00000000..888405d0 --- /dev/null +++ b/readme.md @@ -0,0 +1,20 @@ +This project was done for a hackathon in 6hrs. We have done a barebones html site with a few pages. The following pages/features are working and have been implemented to some extend + +- Home +- Student + + - Login + - Registration + - Student dashboard + - Room details and change + - Mess details and change + +- Warden + + - Login + - Dashboard + - See all rooms + - See leave requests + +- Faculty + - Login diff --git a/server/prisma/dev.db b/server/prisma/dev.db index 8dda6a36..46913de5 100644 Binary files a/server/prisma/dev.db and b/server/prisma/dev.db differ diff --git a/server/src/router/Student/studentAuthRouter.js b/server/src/router/Student/studentAuthRouter.js index ed6dfab2..0d6375cf 100644 --- a/server/src/router/Student/studentAuthRouter.js +++ b/server/src/router/Student/studentAuthRouter.js @@ -17,7 +17,6 @@ const studentAuthRouter = Router(); // Error: { message, error } studentAuthRouter.post("/register", async (req, res) => { const { name, regNo, block, password, roomNo } = req.body; - try { const validStudent = studentAuthRegisterSchema.parse({ name, diff --git a/server/yarn.lock b/server/yarn.lock index 6743c93c..9db930e7 100644 --- a/server/yarn.lock +++ b/server/yarn.lock @@ -95,13 +95,13 @@ bcrypt@^5.1.0: "@mapbox/node-pre-gyp" "^1.0.10" node-addon-api "^5.0.0" -body-parser@1.20.1: - version "1.20.1" - resolved "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz" - integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw== +body-parser@^1.20.2: + version "1.20.2" + resolved "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz" + integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA== dependencies: bytes "3.1.2" - content-type "~1.0.4" + content-type "~1.0.5" debug "2.6.9" depd "2.0.0" destroy "1.2.0" @@ -109,17 +109,17 @@ body-parser@1.20.1: iconv-lite "0.4.24" on-finished "2.4.1" qs "6.11.0" - raw-body "2.5.1" + raw-body "2.5.2" type-is "~1.6.18" unpipe "1.0.0" -body-parser@^1.20.2: - version "1.20.2" - resolved "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz" - integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA== +body-parser@1.20.1: + version "1.20.1" + resolved "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz" + integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw== dependencies: bytes "3.1.2" - content-type "~1.0.5" + content-type "~1.0.4" debug "2.6.9" depd "2.0.0" destroy "1.2.0" @@ -127,7 +127,7 @@ body-parser@^1.20.2: iconv-lite "0.4.24" on-finished "2.4.1" qs "6.11.0" - raw-body "2.5.2" + raw-body "2.5.1" type-is "~1.6.18" unpipe "1.0.0" @@ -283,7 +283,7 @@ etag@~1.8.1: resolved "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz" integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg== -express@^4.18.2: +express@^4.18.2, "express@>=4.0.0 || >=5.0.0-beta": version "4.18.2" resolved "https://registry.npmjs.org/express/-/express-4.18.2.tgz" integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ== @@ -453,7 +453,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@2.0.4, inherits@^2.0.3: +inherits@^2.0.3, inherits@2, inherits@2.0.4: version "2.0.4" resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -583,6 +583,11 @@ mkdirp@^1.0.3: resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== +ms@^2.1.1: + version "2.1.3" + resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + ms@2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz" @@ -593,7 +598,7 @@ ms@2.1.2: resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -ms@2.1.3, ms@^2.1.1: +ms@2.1.3: version "2.1.3" resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== @@ -671,7 +676,7 @@ path-to-regexp@0.1.7: resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz" integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ== -prisma@^4.15.0: +prisma@*, prisma@^4.15.0: version "4.15.0" resolved "https://registry.npmjs.org/prisma/-/prisma-4.15.0.tgz" integrity sha512-iKZZpobPl48gTcSZVawLMQ3lEy6BnXwtoMj7hluoGFYu2kQ6F9LBuBrUyF95zRVnNo8/3KzLXJXJ5TEnLSJFiA== @@ -734,7 +739,7 @@ rimraf@^3.0.2: dependencies: glob "^7.1.3" -safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@~5.2.0: +safe-buffer@^5.0.1, safe-buffer@~5.2.0, safe-buffer@5.2.1: version "5.2.1" resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== @@ -814,6 +819,13 @@ statuses@2.0.1: resolved "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz" integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== +string_decoder@^1.1.1: + version "1.3.0" + resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz" + integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== + dependencies: + safe-buffer "~5.2.0" + "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.2.3: version "4.2.3" resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz" @@ -823,13 +835,6 @@ statuses@2.0.1: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.1" -string_decoder@^1.1.1: - version "1.3.0" - resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz" - integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== - dependencies: - safe-buffer "~5.2.0" - strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz" @@ -889,7 +894,7 @@ type-is@~1.6.18: media-typer "0.3.0" mime-types "~2.1.24" -unpipe@1.0.0, unpipe@~1.0.0: +unpipe@~1.0.0, unpipe@1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz" integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==