Skip to content

librarian-and-sys-admin-notifications #265

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

Merged
PiCiU1221 merged 3 commits into from
Nov 10, 2025
Merged

librarian-and-sys-admin-notifications #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a24338d
Extend the input size limit on login and register email/username and …
jpie02 Sep 23, 2025
dc62406
Background color change on LegalInfoPage.tsx, ProcessingInfoPage.tsx,…
jpie02 Sep 23, 2025
149e27d
Complete the Web Socket notification functionality for the web app.
jpie02 Nov 10, 2025
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
4 changes: 2 additions & 2 deletions web_app/src/Librarian/LibrarianLogin.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ const LibrarianLogin: React.FC = () => {
value={username}
onChange={handleInputChange}
required
maxLength={25}
maxLength={50}
className="p-2 border rounded-md w-full"
/>
</div>
Expand Down Expand Up @@ -191,7 +191,7 @@ const LibrarianLogin: React.FC = () => {
value={password}
onChange={handleInputChange}
required
maxLength={25}
maxLength={50}
className="p-2 border rounded-md w-full"
/>
</div>
Expand Down
2 changes: 1 addition & 1 deletion web_app/src/Librarian/LibrarianSettings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ const LibrarianSettings: React.FC = () => {
/>
</div>

<div className="block mb-5 text-gray-600 text-lg"> {/* ✅ NEW FIELD */}
<div className="block mb-5 text-gray-600 text-lg">
<label className="block mb-1">Powtórz hasło:</label>
<input
type="password"
Expand Down
3 changes: 2 additions & 1 deletion web_app/src/LibraryAdmin/LibraryAdminAddLibrarian.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,8 @@ const LibraryAdminHomePage: React.FC = () => {
</div>
</div>

{message && <p className="text-sm text-gray-700 mt-4">{message}</p>}
{message && <p className="mt-4 p-4 rounded-md bg-green-100 text-[#3B576C]">{message}</p>}

</div>
</div>
</section>
Expand Down
6 changes: 3 additions & 3 deletions web_app/src/LibraryAdmin/LibraryAdminLogin.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ const LibraryAdminLogin: React.FC = () => {
navigate('/add-library');
}
} else {
navigate('/'); // Landing page
navigate('/'); // landing page
}

} else {
Expand Down Expand Up @@ -188,7 +188,7 @@ const LibraryAdminLogin: React.FC = () => {
value={email}
onChange={handleInputChange}
required
maxLength={25}
maxLength={50}
className={`peer p-2 border rounded-md w-full ${!emailValid ? 'border-red-600' : 'border-gray-300'}`}
/>
</div>
Expand All @@ -203,7 +203,7 @@ const LibraryAdminLogin: React.FC = () => {
value={password}
onChange={handleInputChange}
required
maxLength={25}
maxLength={50}
className="peer p-2 border rounded-md w-full"
/>
</div>
Expand Down
10 changes: 5 additions & 5 deletions web_app/src/LibraryAdmin/LibraryAdminRegisterForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ const RegistrationForm: React.FC = () => {
name="firstName"
value={formData.firstName}
onChange={handleInputChange}
maxLength={25}
maxLength={50}
required
className="bg-gray-100 w-full p-3 rounded-md text-gray-800 border border-gray-300 focus:outline-none focus:ring-2 focus:ring-[#3B576C]"
/>
Expand All @@ -163,7 +163,7 @@ const RegistrationForm: React.FC = () => {
name="lastName"
value={formData.lastName}
onChange={handleInputChange}
maxLength={25}
maxLength={50}
required
className="bg-gray-100 w-full p-3 rounded-md text-gray-800 border border-gray-300 focus:outline-none focus:ring-2 focus:ring-[#3B576C]"
/>
Expand All @@ -176,7 +176,7 @@ const RegistrationForm: React.FC = () => {
name="email"
value={formData.email}
onChange={handleInputChange}
maxLength={25}
maxLength={50}
required
className="bg-gray-100 w-full p-3 rounded-md text-gray-800 border border-gray-300 focus:outline-none focus:ring-2 focus:ring-[#3B576C]"
/>
Expand All @@ -189,7 +189,7 @@ const RegistrationForm: React.FC = () => {
name="password"
value={formData.password}
onChange={handleInputChange}
maxLength={25}
maxLength={50}
required
className="bg-gray-100 w-full p-3 rounded-md text-gray-800 border border-gray-300 focus:outline-none focus:ring-2 focus:ring-[#3B576C]"
/>
Expand All @@ -202,7 +202,7 @@ const RegistrationForm: React.FC = () => {
name="confirm_password"
value={formData.confirm_password}
onChange={handleInputChange}
maxLength={25}
maxLength={50}
required
className="bg-gray-100 w-full p-3 rounded-md text-gray-800 border border-gray-300 focus:outline-none focus:ring-2 focus:ring-[#3B576C]"
/>
Expand Down
4 changes: 2 additions & 2 deletions web_app/src/SystemAdmin/SystemAdminHomePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@ const SystemAdminDashboard: React.FC = () => {

const firstLoad = useRef(true);

useWebSocketNotification('system-administrator/library-requests/pending', () => {
useWebSocketNotification('administrator/library-requests', () => {
toast.info("Otrzymano nowe zgłoszenie biblioteki!", {
position: "bottom-right",
});
console.log("New library request received!");
});

useWebSocketNotification('system-administrator/driver-requests/pending', () => {
useWebSocketNotification('administrator/driver-applications', () => {
toast.info("Otrzymano nowe zgłoszenie kierowcy!", {
position: "bottom-right",
});
Expand Down
4 changes: 2 additions & 2 deletions web_app/src/SystemAdmin/SystemAdminLogin.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ const SysAdminLogin: React.FC = () => {
value={email}
onChange={handleInputChange}
required
maxLength={25}
maxLength={50}
className={`peer p-2 border rounded-md w-full ${
!emailValid ? 'border-red-500' : 'border-gray-300'
}`}
Expand All @@ -187,7 +187,7 @@ const SysAdminLogin: React.FC = () => {
value={password}
onChange={handleInputChange}
required
maxLength={25}
maxLength={50}
className="peer p-2 border border-gray-300 rounded-md w-full"
/>
</div>
Expand Down
2 changes: 1 addition & 1 deletion web_app/src/Utils/ContactInfoPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {Link} from "react-router-dom";

export const ContactInfoPage: React.FC = () => {
return (
<div className="min-h-screen bg-[#314757] flex items-center justify-center text-white">
<div className="min-h-screen bg-[#3b576c] flex items-center justify-center text-white">
<div className="text-center space-y-10 px-4">
{/* Big Book Logo Image */}
<img
Expand Down
4 changes: 2 additions & 2 deletions web_app/src/Utils/LegalInfoPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ import {Link} from "react-router-dom";

export const LegalInfoPage: React.FC = () => {
return (
<div className="min-h-screen bg-[#314757] flex items-center justify-center text-white">
<div className="min-h-screen bg-[#3b576c] flex items-center justify-center text-white">
<div className="text-center space-y-10 px-4">
{/* Big Book Logo Image */}
<img
className="w-[8vw] mx-auto object-cover mb-12"
alt="Book Rider Logo"
src="/book-high-res.png"
/>
<h1 className="text-3xl font-semibold">Informacje o kwestiach prawnych <br /> związanych z systemem Book Rider</h1>
<h1 className="text-3xl font-semibold">Informacje o kwestiach prawnych <br /> związanych z systemem BookRider</h1>
<Link to="/">
<button className="mt-10 bg-gray-200 text-[#314757] px-6 py-2 rounded-lg text-lg hover:scale-105 transition-all duration-[0.3s]">
Powrót do strony głównej
Expand Down
2 changes: 1 addition & 1 deletion web_app/src/Utils/ProcessingInfoPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Link } from 'react-router-dom';

const ProcessingPage: React.FC = () => {
return (
<div className="min-h-screen bg-[#314757] flex items-center justify-center text-white">
<div className="min-h-screen bg-[#3b576c] flex items-center justify-center text-white">
<div className="text-center space-y-10 px-4">
{/* Big Book Logo Image */}
<img
Expand Down
4 changes: 2 additions & 2 deletions web_app/src/Utils/UserManualPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ import {Link} from "react-router-dom";

export const UserManualPage: React.FC = () => {
return (
<div className="min-h-screen bg-[#314757] flex items-center justify-center text-white">
<div className="min-h-screen bg-[#3b576c] flex items-center justify-center text-white">
<div className="text-center space-y-10 px-4">
{/* Big Book Logo Image */}
<img
className="w-[8vw] mx-auto object-cover mb-12"
alt="Book Rider Logo"
src="/book-high-res.png"
/>
<h1 className="text-3xl font-semibold">Informacje o funkcjonowaniu systemu Book Rider</h1>
<h1 className="text-3xl font-semibold">Informacje o funkcjonowaniu systemu BookRider</h1>
<Link to="/">
<button className="mt-10 bg-gray-200 text-[#314757] px-6 py-2 rounded-lg text-lg hover:scale-105 transition-all duration-[0.3s]">
Powrót do strony głównej
Expand Down