<#else> -

- -

+ +

- +

@@ -118,5 +118,5 @@

- <#if tip??> +<#if tip??> @@ -126,24 +126,24 @@

- +

- <#if free_reservations??> - - + <#if free_reservations??> + +

- +

Index: src/main/resources/templates/user-cart.ftl =================================================================== --- src/main/resources/templates/user-cart.ftl (revision e9b70f6947737fd8ec8c5599c2b85b09f0ce2276) +++ src/main/resources/templates/user-cart.ftl (revision 4d7e387024df6207fee718a6f286d778deadd0da) @@ -166,5 +166,5 @@ - + @@ -187,13 +187,13 @@ document.getElementById("total-price").innerText = total + " ден." - function myFunction() { - let prices = document.getElementsByName("price") - let quantities = document.getElementsByClassName("form-control form-control-sm") - let total = 0 - for(let i=0;i Index: src/main/resources/templates/user-my-orders.ftl =================================================================== --- src/main/resources/templates/user-my-orders.ftl (revision e9b70f6947737fd8ec8c5599c2b85b09f0ce2276) +++ src/main/resources/templates/user-my-orders.ftl (revision 4d7e387024df6207fee718a6f286d778deadd0da) @@ -76,27 +76,27 @@ <#if orders??> - <#list orders as order> - - ${order['localDate']} - - <#list order['orderDetails'] as detail> -

- ${detail['name']} - ${detail['quantity']} -

- - - ${order['total']} ден. - ${order['status']} - - - - - - - + <#list orders as order> + + ${order['localDate']} + + <#list order['orderDetails'] as detail> +

+ ${detail['name']} + ${detail['quantity']} +

+ + + ${order['total']} ден. + ${order['status']} + + + + + + + Index: rget/classes/application.properties =================================================================== --- target/classes/application.properties (revision e9b70f6947737fd8ec8c5599c2b85b09f0ce2276) +++ (revision ) @@ -1,23 +1,0 @@ -spring.datasource.url=jdbc:postgresql://localhost:5432/users -spring.datasource.username=postgres -spring.datasource.password=maky123 -spring.jpa.hibernate.ddl-auto=create-drop -spring.jpa.show-sql=true -spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect -spring.jpa.properties.hibernate.format_sql=true - -spring.freemarker.template-loader-path=classpath:/templates -spring.freemarker.suffix=.ftl - -spring.mail.host=localhost -spring.mail.port=1025 -spring.mail.username=maky -spring.mail.password=maky - -spring.mail.properties.mail.transport.protocol = smtp -spring.mail.properties.mail.smtp.ssl.trust="*" -spring.mail.properties.mail.smtp.auth=true -spring.mail.properties.mail.starttls.enable=true -spring.mail.properties.mail.smtp.connectiontimeout=5000 -spring.mail.properties.mail.smtp.timeout=3000 -spring.mail.properties.mail.smtp.writetimeout=5000 Index: rget/classes/templates/admin-block-reservation.ftl =================================================================== --- target/classes/templates/admin-block-reservation.ftl (revision e9b70f6947737fd8ec8c5599c2b85b09f0ce2276) +++ (revision ) @@ -1,129 +1,0 @@ - - - - - Admin Page - Block Reservation - - - - - - - - - - - - -
- -

- -

- - - - - - - - - Index: rget/classes/templates/admin-blocked-reservations.ftl =================================================================== --- target/classes/templates/admin-blocked-reservations.ftl (revision e9b70f6947737fd8ec8c5599c2b85b09f0ce2276) +++ (revision ) @@ -1,107 +1,0 @@ - - - - - Admin Page - Blocked Reservations - - - - - - - - - - - - -
- - - - - - - - - - <#if reservations??> - <#list reservations as res> - - - - - - - - -

Date/Time	Type	Cancel
${res['localDateTime']}	${res['type']}	- - - - -

- - - - - - - - Index: rget/classes/templates/admin-orders.ftl =================================================================== --- target/classes/templates/admin-orders.ftl (revision e9b70f6947737fd8ec8c5599c2b85b09f0ce2276) +++ (revision ) @@ -1,123 +1,0 @@ - - - - - Admin Page - Orders - - - - - - - - - - - - - - - - - - - - - - - - - - - <#if orders??> - <#list orders as order> - - - - - - - - - - - - -

Name/Surname	Date	Order Details	Total Price	Status	Cancel	Change
${order['name']} ${order['surname']}	${order['localDate']}	- <#list order['orderDetails'] as detail> - - ${detail['name']} - ${detail['quantity']} - - -	${order['total']} ден.	${order['status']}	- - - - -	- - - - -

- - - - - - Index: rget/classes/templates/admin-page.ftl =================================================================== --- target/classes/templates/admin-page.ftl (revision e9b70f6947737fd8ec8c5599c2b85b09f0ce2276) +++ (revision ) @@ -1,77 +1,0 @@ - - - - - Admin Page - - - - - - - - - - - - - - - - - - Index: rget/classes/templates/admin-product.ftl =================================================================== --- target/classes/templates/admin-product.ftl (revision e9b70f6947737fd8ec8c5599c2b85b09f0ce2276) +++ (revision ) @@ -1,118 +1,0 @@ - - - - - Admin - Add product - - - - - - - - - - - - -
- -

- -

- - - - - - - Index: rget/classes/templates/admin-remove-product.ftl =================================================================== --- target/classes/templates/admin-remove-product.ftl (revision e9b70f6947737fd8ec8c5599c2b85b09f0ce2276) +++ (revision ) @@ -1,256 +1,0 @@ - - - - - Admin Page - Remove product - - - - - - - - - - - - - - - -
- -

- <#if products??> - <#list products as product> -

Hot

- ${product['category']} -

${product['name']}

${product['description']}

${product['price']} ден.

-
- - -

- - -

- - - - - - - - Index: rget/classes/templates/admin-reservations.ftl =================================================================== --- target/classes/templates/admin-reservations.ftl (revision e9b70f6947737fd8ec8c5599c2b85b09f0ce2276) +++ (revision ) @@ -1,107 +1,0 @@ - - - - - Admin Page - Reservations - - - - - - - - - - - - -
- -

- -

- - - - - - - - Index: rget/classes/templates/admin-schedule-reservation.ftl =================================================================== --- target/classes/templates/admin-schedule-reservation.ftl (revision e9b70f6947737fd8ec8c5599c2b85b09f0ce2276) +++ (revision ) @@ -1,173 +1,0 @@ - - - - - Admin Page - Schedule Reservation - - - - - - - - - - - - - - - -
-

- -

-
-

- <#if tip??> - - - -

- - - -<#if tip??> - - - - - - - - - Index: rget/classes/templates/admin-scheduled-reservations.ftl =================================================================== --- target/classes/templates/admin-scheduled-reservations.ftl (revision e9b70f6947737fd8ec8c5599c2b85b09f0ce2276) +++ (revision ) @@ -1,130 +1,0 @@ - - - - - Admin Page - Scheduled Reservations - - - - - - - - - - - - -
- - - - - - - - - - - - - <#if reservations??> - <#list reservations as res> - - - - - - - - - - -

Name/Surname	Date/Time	Type	Valid	Cancel
${res['name']} ${res['surname']}	${res['localDateTime']}	${res['type']}	${res['valid']?string("TRUE","FALSE")}	- - - - - - -

- - - - - - - Index: rget/classes/templates/index.ftl =================================================================== --- target/classes/templates/index.ftl (revision e9b70f6947737fd8ec8c5599c2b85b09f0ce2276) +++ (revision ) @@ -1,145 +1,0 @@ - - - - - Salon Bella - - - - -

- B -

- -

- - Index: rget/classes/templates/login.ftl =================================================================== --- target/classes/templates/login.ftl (revision e9b70f6947737fd8ec8c5599c2b85b09f0ce2276) +++ (revision ) @@ -1,95 +1,0 @@ - - - - - Login Page - - - - - - - - - - -

- - - -

Login now

- -

- - - - - - - - Index: rget/classes/templates/register.ftl =================================================================== --- target/classes/templates/register.ftl (revision e9b70f6947737fd8ec8c5599c2b85b09f0ce2276) +++ (revision ) @@ -1,127 +1,0 @@ - - - - - Register Page - - - - - - - - - - -

- - - -

Sign up now

- -

- - First name -

- - Last name -

- - - -

- - Phone Number -

- - -

- - Email address -

- -

- - Username -

- - -

- - Password -

- -

- <#if email??> -

${email}

- - <#if username??> -

${username}

- -

- - - - -

- -

- - - - - - - - - Index: rget/classes/templates/user-cart.ftl =================================================================== --- target/classes/templates/user-cart.ftl (revision e9b70f6947737fd8ec8c5599c2b85b09f0ce2276) +++ (revision ) @@ -1,208 +1,0 @@ - - - - - My Cart - - - - - - - - - - - - - - - -
- -

Shopping Cart

- <#if products ??> - <#list products as product> -

${product['category']}

${product['name']}

Quantity

- -

Product Price

${product['price']} ден.

- - - -

- - - - - -

Summary

- -

Total price

- - - -

- - - - - - - - Index: rget/classes/templates/user-my-orders.ftl =================================================================== --- target/classes/templates/user-my-orders.ftl (revision e9b70f6947737fd8ec8c5599c2b85b09f0ce2276) +++ (revision ) @@ -1,110 +1,0 @@ - - - - - My orders - - - - - - - - - - - - - - - - - - - - - - - - - <#if orders??> - <#list orders as order> - - - - - - - - - - -

Date	Order Details	Total Price	Status	Cancel
${order['localDate']}	- <#list order['orderDetails'] as detail> - - ${detail['name']} - ${detail['quantity']} - - -	${order['total']} ден.	${order['status']}	- - - - -

- - - - - - Index: rget/classes/templates/user-my-reservations.ftl =================================================================== --- target/classes/templates/user-my-reservations.ftl (revision e9b70f6947737fd8ec8c5599c2b85b09f0ce2276) +++ (revision ) @@ -1,111 +1,0 @@ - - - - - My reservations - - - - - - - - - - - - - - - - - - - - - - - - <#if reservations??> - <#list reservations as res> - - - - - - - - - -

Date/Time	Type	Valid	Cancel
${res['localDateTime']}	${res['type']}	${res['valid']?string("TRUE","FALSE")}	- - - - -

- - - - - - - Index: rget/classes/templates/user-order.ftl =================================================================== --- target/classes/templates/user-order.ftl (revision e9b70f6947737fd8ec8c5599c2b85b09f0ce2276) +++ (revision ) @@ -1,265 +1,0 @@ - - - - - Order Products - - - - - - - - - - - - - - -
-

- - <#if products??> - <#list products as product> -

Hot

- ${product['category']} -

${product['name']}

${product['description']}

${product['price']} ден.

-
- - -

- - -

- - - - - - - - - - - Index: rget/classes/templates/user-page.ftl =================================================================== --- target/classes/templates/user-page.ftl (revision e9b70f6947737fd8ec8c5599c2b85b09f0ce2276) +++ (revision ) @@ -1,75 +1,0 @@ - - - - - User Page - - - - - - - - - - - - - - - - - - - - Index: rget/classes/templates/user-schedule-reservation.ftl =================================================================== --- target/classes/templates/user-schedule-reservation.ftl (revision e9b70f6947737fd8ec8c5599c2b85b09f0ce2276) +++ (revision ) @@ -1,166 +1,0 @@ - - - - - Schedule Reservation - - - - - - - - - - - - - -
-

- -

- -
-

- <#if tip??> - - - -

- - -<#if tip??> - - - - - - - - -

${product['name']}

Beauty Salon Bella

Login now

Sign up now

Shopping Cart

${product['category']}

${product['name']}

Quantity

Product Price

${product['price']} ден.

Summary

Total price

${product['name']}