diff --git a/.DS_Store b/.DS_Store index 88b6450d..dd4e8fd2 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Tillo.png b/Tillo.png new file mode 100644 index 00000000..7bdd84ca Binary files /dev/null and b/Tillo.png differ diff --git a/backend/.DS_Store b/backend/.DS_Store index bb92db5b..4b293889 100644 Binary files a/backend/.DS_Store and b/backend/.DS_Store differ diff --git a/backend/src/main/java/com/rit/canteen/sales/config/SecurityConfig.java b/backend/src/main/java/com/rit/canteen/sales/config/SecurityConfig.java index 2b5b4277..e63ac3b8 100644 --- a/backend/src/main/java/com/rit/canteen/sales/config/SecurityConfig.java +++ b/backend/src/main/java/com/rit/canteen/sales/config/SecurityConfig.java @@ -73,7 +73,7 @@ public class SecurityConfig { .requestMatchers(HttpMethod.GET, "/api/orders/user/**").authenticated() .requestMatchers(HttpMethod.GET, "/api/wallet/balance/**").authenticated() .requestMatchers(HttpMethod.GET, "/api/wallet/transactions/**").authenticated() - .requestMatchers(HttpMethod.POST, "/api/wallet/topup").authenticated() + .requestMatchers(HttpMethod.POST, "/api/wallet/topup").hasAnyRole("MASTER", "MANAGER", "STAFF") .requestMatchers(HttpMethod.POST, "/api/coupons/redeem").authenticated() .requestMatchers(HttpMethod.POST, "/api/feedback/**").authenticated() .requestMatchers(HttpMethod.GET, "/api/feedback/**").authenticated() diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties index 6194c879..d173935f 100644 --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -20,14 +20,14 @@ spring.jpa.properties.hibernate.jdbc.time_zone=Asia/Kolkata # JWT — REQUIRED environment variables # MUST provide a secure random key (min 256-bit) # ============================================================ -app.jwt.secret=${JWT_SECRET:dev_mode_insecure_secret_key_32_chars_long} +app.jwt.secret=${JWT_SECRET} app.jwt.expiration-ms=86400000 # ============================================================ # Master Account — REQUIRED environment variables # ============================================================ app.master.username=${MASTER_USER:admin} -app.master.password=${MASTER_PASSWORD:admin123} +app.master.password=${MASTER_PASSWORD} # File upload configuration spring.servlet.multipart.max-file-size=10MB diff --git a/counter-frontend/src/assets/college-logo.png b/counter-frontend/src/assets/college-logo.png index 876b707f..7bdd84ca 100644 Binary files a/counter-frontend/src/assets/college-logo.png and b/counter-frontend/src/assets/college-logo.png differ diff --git a/counter-frontend/src/components/Layout.tsx b/counter-frontend/src/components/Layout.tsx index 5f57181f..3c022e11 100644 --- a/counter-frontend/src/components/Layout.tsx +++ b/counter-frontend/src/components/Layout.tsx @@ -35,14 +35,14 @@ const Layout = () => { return (
{/* Side Navigation Bar */} -