Skip to content

Commit efe4155

Browse files
Guiwil-mgGuiwil-mg
committed
Update app
1 parent 6efc7b8 commit efe4155

19 files changed

+72
-38
lines changed

‎backend/webandtech/.classpath‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,12 @@
3636
<attribute name="maven.pomderived" value="true"/>
3737
</attributes>
3838
</classpathentry>
39+
<classpathentry kind="src" output="target/classes" path="api-docs/src/main/java">
40+
<attributes>
41+
<attribute name="optional" value="true"/>
42+
<attribute name="maven.pomderived" value="true"/>
43+
</attributes>
44+
</classpathentry>
3945
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
4046
<attributes>
4147
<attribute name="optional" value="true"/>

‎backend/webandtech/api-docs/.openapi-generator/api-docs.yaml-default.sha256‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ae0d0315eb90df639ea61db208d9f4dd2037256fea81e6b6c75f957408352a0f
1+
612ea4be24d723c79b159585d9062761a205b51d87378f8441015bd04d5684d9

‎backend/webandtech/pom.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,18 @@
126126
<plugin>
127127
<groupId>org.springframework.boot</groupId>
128128
<artifactId>spring-boot-maven-plugin</artifactId>
129+
<configuration>
130+
<image>
131+
<env>
132+
<BPE_OVERRIDE_JAVA_TOOL_OPTIONS>
133+
-Xss256K
134+
-XX:ReservedCodeCacheSize=64M
135+
-XX:MaxMetaspaceSize=100000K
136+
-Xmx64M
137+
</BPE_OVERRIDE_JAVA_TOOL_OPTIONS>
138+
</env>
139+
</image>
140+
</configuration>
129141
<executions>
130142
<execution>
131143
<id>pre-integration-test</id>
@@ -201,6 +213,7 @@
201213
</executions>
202214
</plugin>
203215
</plugins>
216+
204217
</build>
205218

206219

‎backend/webandtech/src/main/java/webapp8/webandtech/service/PDFGeneratorService.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ public void export(HttpServletResponse response, Order order, List<Product> cart
6565

6666
document.add(p);
6767

68-
Image logo = Image.getInstance("backend/webandtech/src/main/resources/static/images/logo.jpg");
69-
document.add(logo);
68+
// Image logo = Image.getInstance("backend/webandtech/src/main/resources/static/images/logo.jpg");
69+
// document.add(logo);
7070

7171
Paragraph idOrder = new Paragraph("Factura: "+ (ord.get(0).getIdorder()+1));
7272
idOrder.setAlignment(Paragraph.ALIGN_LEFT);

‎backend/webandtech/src/main/resources/application.properties‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
spring.mustache.suffix:.html
2+
server.port:${PORT:8443}
23
server.ssl.key-store = classpath:keystore.jks
34
server.ssl.key-store-password = password
45
server.ssl.key-password = password
5-
server.port:8443
6+
7+
68

79

810
spring.datasource.driver-class-name=org.postgresql.Driver
9-
spring.datasource.url=jdbc:postgresql://localhost:5432/webandtech
10-
spring.datasource.username=postgres
11-
spring.datasource.password=password
11+
spring.datasource.url=jdbc:postgresql://ec2-52-73-155-171.compute-1.amazonaws.com:5432/db6ur7a8r51q3a
12+
spring.datasource.username=xrlxwzkarguimj
13+
spring.datasource.password=5f77730cc7043e05b1eff7e68221ad9c95c055fd99b5c8c2707e5ac1f0fb9d3a
1214
spring.jpa.database-platform=org.hibernate.dialect.PostgreSQLDialect
1315
spring.jpa.show-sql=false
1416
spring.jpa.hibernate.ddl-auto = update
@@ -22,6 +24,11 @@ logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
2224
springdoc.swagger-ui.path=swagger-ui.html
2325
springdoc.packagesToScan=webapp8.webandtech.controller.api
2426

27+
server.error.whitelabel.enabled=false
28+
server.error.path=/error
29+
30+
spring.jackson.serialization.FAIL_ON_EMPTY_BEANS=false
31+
2532
jwt.secret=spiceandwolf
2633

27-
spring.datasource.hikari.auto-commit=false
34+
spring.datasource.hikari.auto-commit=false

‎backend/webandtech/src/main/resources/templates/checkout.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ <h3>Mi carrito</h3>
242242
</div>
243243
</td>
244244
{{#img1}}
245-
<td class="invert-image"><a href="/products/{{idproduct}}"><img src="https://localhost:8443/productImg1/{{idproduct}}" alt=" " class="img-responsive" /></a></td>
245+
<td class="invert-image"><a href="/products/{{idproduct}}"><img src="https://codeurjc-daw-2021-22-webapp8.herokuapp.com/productImg1/{{idproduct}}" alt=" " class="img-responsive" /></a></td>
246246
{{/img1}}
247247
<td class="invert">{{nameproduct}}</td>
248248
<td class="invert">{{price}}€</td>

‎backend/webandtech/src/main/resources/templates/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,8 +282,8 @@ <h3><span>nuevos </span>productos</h3>
282282
<div class="men-pro-item simpleCart_shelfItem">
283283
<div class="men-thumb-item">
284284
{{#img1}}
285-
<img src="https://localhost:8443/productImg1/{{idproduct}}" alt="" class="pro-image-front">
286-
<img src="https://localhost:8443/productImg1/{{idproduct}}" alt="" class="pro-image-back">
285+
<img src="https://codeurjc-daw-2021-22-webapp8.herokuapp.com/productImg1/{{idproduct}}" alt="" class="pro-image-front">
286+
<img src="https://codeurjc-daw-2021-22-webapp8.herokuapp.com/productImg1/{{idproduct}}" alt="" class="pro-image-back">
287287
{{/img1}}
288288
<div class="men-cart-pro">
289289
<div class="inner-men-cart-pro">

‎backend/webandtech/src/main/resources/templates/productElement.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -251,19 +251,19 @@ <h3>{{nameproduct}}</h3>
251251
<ul class="">
252252
{{#img1}}
253253
<li data-thumb="https://localhost:8443/productImg1/{{idproduct}}">
254-
<div class="thumb-image"> <img src="https://localhost:8443/productImg1/{{idproduct}}"
254+
<div class="thumb-image"> <img src="https://codeurjc-daw-2021-22-webapp8.herokuapp.com/productImg1/{{idproduct}}"
255255
data-imagezoom="true" class="img-responsive"> </div>
256256
</li>
257257
{{/img1}}
258258
{{#img2}}
259259
<li data-thumb="https://localhost:8443/productImg2/{{idproduct}}">
260-
<div class="thumb-image"> <img src="https://localhost:8443/productImg2/{{idproduct}}"
260+
<div class="thumb-image"> <img src="https://codeurjc-daw-2021-22-webapp8.herokuapp.com/productImg2/{{idproduct}}"
261261
data-imagezoom="true" class="img-responsive"> </div>
262262
</li>
263263
{{/img2}}
264264
{{#img3}}
265265
<li data-thumb="https://localhost:8443/productImg3/{{idproduct}}">
266-
<div class="thumb-image"> <img src="https://localhost:8443/productImg3/{{idproduct}}"
266+
<div class="thumb-image"> <img src="https://codeurjc-daw-2021-22-webapp8.herokuapp.com/productImg3/{{idproduct}}"
267267
data-imagezoom="true" class="img-responsive"> </div>
268268
</li>
269269
{{/img3}}
@@ -315,7 +315,7 @@ <h5>Descripción del producto</h5>
315315
{{#ratings}}
316316
<div class="bootstrap-tab-text-grid">
317317
<div class="bootstrap-tab-text-grid-left">
318-
<img src="https://localhost:8443/imageprofile/{{iduser.username}}" alt=" " class="img-responsive">
318+
<img src="https://codeurjc-daw-2021-22-webapp8.herokuapp.com/imageprofile/{{iduser.username}}" alt=" " class="img-responsive">
319319
</div>
320320

321321
<div class="bootstrap-tab-text-grid-right">

‎backend/webandtech/src/main/resources/templates/productsByFeatures.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,8 +307,8 @@ <h4>Los productos más novedosos</h4>
307307
<div class="men-pro-item simpleCart_shelfItem">
308308
<div class="men-thumb-item">
309309
{{#img1}}
310-
<img src="https://localhost:8443/productImg1/{{idproduct}}" alt="" class="pro-image-front">
311-
<img src="https://localhost:8443/productImg1/{{idproduct}}" alt="" class="pro-image-back">
310+
<img src="https://codeurjc-daw-2021-22-webapp8.herokuapp.com/productImg1/{{idproduct}}" alt="" class="pro-image-front">
311+
<img src="https://codeurjc-daw-2021-22-webapp8.herokuapp.com/productImg1/{{idproduct}}" alt="" class="pro-image-back">
312312
{{/img1}}
313313
<div class="men-cart-pro">
314314
<div class="inner-men-cart-pro">

‎backend/webandtech/src/main/resources/templates/userList.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ <h3 class="mb-2">LISTADO DE USUARIOS</h3>
158158
<div class="row align-items-center">
159159
<div class="col-xl-9 col-lg-12 col-md-12 col-sm-12 col-12">
160160
<div class="user-avatar float-xl-left pr-4 float-none">
161-
<img src="https://localhost:8443/imageprofile/{{username}}"
161+
<img src="https://codeurjc-daw-2021-22-webapp8.herokuapp.com/imageprofile/{{username}}"
162162
alt="User Avatar" class="rounded-circle user-avatar-xl">
163163
</div>
164164
<div class="pl-xl-3">

0 commit comments

Comments
 (0)