From 7d6f04b906bb9f9b539e2c3b0725096e538c52d8 Mon Sep 17 00:00:00 2001 From: Nikol Georgieva Date: Thu, 29 Feb 2024 00:51:25 +0200 Subject: [PATCH] Small changes --- build.gradle | 16 ++++++- src/main/resources/application.yml | 11 +++-- src/main/resources/templates/add-class.html | 47 +++++++++++++++++-- .../resources/templates/classes-edit.html | 46 ++++++++++++++++-- src/main/resources/templates/classes.html | 46 ++++++++++++++++-- .../resources/templates/current-class.html | 47 +++++++++++++++++-- src/main/resources/templates/dense-ball.html | 44 +++++++++++++++-- src/main/resources/templates/error.html | 9 +++- src/main/resources/templates/home.html | 45 ++++++++++++++++-- src/main/resources/templates/jump.html | 46 ++++++++++++++++-- src/main/resources/templates/login.html | 46 ++++++++++++++++-- src/main/resources/templates/register.html | 45 ++++++++++++++++-- src/main/resources/templates/student-add.html | 47 +++++++++++++++++-- src/main/resources/templates/t-test.html | 45 ++++++++++++++++-- src/main/resources/templates/tasks.html | 46 ++++++++++++++++-- .../resources/templates/thirty-meters.html | 44 +++++++++++++++-- .../templates/two-hundred-meters.html | 44 +++++++++++++++-- 17 files changed, 625 insertions(+), 49 deletions(-) diff --git a/build.gradle b/build.gradle index 6679764..aafc858 100644 --- a/build.gradle +++ b/build.gradle @@ -2,6 +2,20 @@ plugins { id 'java' id 'org.springframework.boot' version '3.0.1' id 'io.spring.dependency-management' version '1.1.4' + id "com.microsoft.azure.azurewebapp" version "1.7.1" +} + +azurewebapp { + subscription = 'Azure for Students' + resourceGroup = 'scores-rg-pe' + appName = 'pescores' + pricingTier = 'Basic (B2)' + region = 'Central US' + runtime { + os = 'Windows' + webContainer = 'Java SE' + javaVersion = 'Java 17' + } } group = 'pmgkn.pescores' @@ -31,7 +45,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-validation' implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-webflux' - runtimeOnly 'com.mysql:mysql-connector-j' + runtimeOnly 'com.mysql:mysql-connector-j:8.2.0' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.security:spring-security-test' testImplementation 'org.hsqldb:hsqldb' diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 4dfcbc3..e272cef 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -11,10 +11,11 @@ server: spring: datasource: driverClassName: com.mysql.cj.jdbc.Driver - password: ${DB_PASSWORD} - url: jdbc:mysql://scores-pe-db.mysql.database.azure.com:3306/information_schema?serverTimezone=UTC&useSSL=true&requireSSL=false - # url: jdbc:mysql://localhost:3306/pe_scores?allowPublicKeyRetrieval=true&useSSL=false&createDatabaseIfNotExist=true&serverTimezone=UTC - username: ${DB_USERNAME} + password: Nikoleto18@ + url: jdbc:mysql://scores-pe-db.mysql.database.azure.com:3306/pe_scores?serverTimezone=UTC&useSSL=true&requireSSL=false +# url: jdbc:mysql://scores-pe-db.mysql.database.azure.com:3306/pe_scores?useSSL=TRUE;myDbConn=DriverManager.getConnection(url, "peScores", "Nikoleto18@") +# url: jdbc:mysql://localhost:3306/pe_scores?allowPublicKeyRetrieval=true&useSSL=false&createDatabaseIfNotExist=true&serverTimezone=UTC + username: peScores jpa: database-platform: org.hibernate.dialect.MySQLDialect defer-datasource-initialization: true @@ -31,4 +32,4 @@ spring: init: mode: always - hostName: https://pescores.azurewebsites.net/ \ No newline at end of file + hostName: https://pescores.azurewebsites.net/ \ No newline at end of file diff --git a/src/main/resources/templates/add-class.html b/src/main/resources/templates/add-class.html index 41f997f..ca10a91 100644 --- a/src/main/resources/templates/add-class.html +++ b/src/main/resources/templates/add-class.html @@ -1,11 +1,48 @@ Add class - + + + + + + + +
- +
+ pe scores logo + pe scores logo + + +
+ +
@@ -51,5 +88,9 @@

Add class

- + + + \ No newline at end of file diff --git a/src/main/resources/templates/classes-edit.html b/src/main/resources/templates/classes-edit.html index 696e06f..cf8b171 100644 --- a/src/main/resources/templates/classes-edit.html +++ b/src/main/resources/templates/classes-edit.html @@ -4,13 +4,49 @@ My classes - + + + + + + +
- + + +
+ pe scores logo + pe scores logo + + +
@@ -55,7 +91,11 @@

Edit class

- + + + diff --git a/src/main/resources/templates/classes.html b/src/main/resources/templates/classes.html index 9d7e26b..b53c8f2 100644 --- a/src/main/resources/templates/classes.html +++ b/src/main/resources/templates/classes.html @@ -4,13 +4,49 @@ My classes - + + + + + + +
- + + +
+ pe scores logo + pe scores logo + + +
@@ -42,7 +78,11 @@

My classes

- + + + diff --git a/src/main/resources/templates/current-class.html b/src/main/resources/templates/current-class.html index b74b6b9..205cba8 100644 --- a/src/main/resources/templates/current-class.html +++ b/src/main/resources/templates/current-class.html @@ -5,13 +5,50 @@ Class page - + + + + + + + +
- + + +
+ pe scores logo + pe scores logo + + +
@@ -130,7 +167,11 @@

7a

- + + + diff --git a/src/main/resources/templates/dense-ball.html b/src/main/resources/templates/dense-ball.html index eb8081a..4732a1f 100644 --- a/src/main/resources/templates/dense-ball.html +++ b/src/main/resources/templates/dense-ball.html @@ -5,13 +5,48 @@ Dense ball - + + + + + + +
- + +
+ pe scores logo + pe scores logo + + +
@@ -826,8 +861,11 @@
+ - + diff --git a/src/main/resources/templates/error.html b/src/main/resources/templates/error.html index 9e1a817..ccdd725 100644 --- a/src/main/resources/templates/error.html +++ b/src/main/resources/templates/error.html @@ -5,7 +5,14 @@ Error - + + + + + + + + diff --git a/src/main/resources/templates/home.html b/src/main/resources/templates/home.html index 617873d..bb133cc 100644 --- a/src/main/resources/templates/home.html +++ b/src/main/resources/templates/home.html @@ -5,13 +5,48 @@ Home - + + + + + + +
- + +
+ pe scores logo + pe scores logo + + +
@@ -24,6 +59,10 @@

Welcome to PE Scores.

- + + + diff --git a/src/main/resources/templates/jump.html b/src/main/resources/templates/jump.html index 2d8674b..4258ab7 100644 --- a/src/main/resources/templates/jump.html +++ b/src/main/resources/templates/jump.html @@ -5,13 +5,49 @@ Jump - + + + + + + +
- + + +
+ pe scores logo + pe scores logo + + +
@@ -827,7 +863,11 @@
- + + + diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html index 91eb116..5e5d4b1 100644 --- a/src/main/resources/templates/login.html +++ b/src/main/resources/templates/login.html @@ -1,13 +1,49 @@ Login - + + + + + + +
- + + +
+ pe scores logo + pe scores logo + + +
@@ -40,7 +76,11 @@

Login

- + + + diff --git a/src/main/resources/templates/register.html b/src/main/resources/templates/register.html index 0011c6a..28ec560 100644 --- a/src/main/resources/templates/register.html +++ b/src/main/resources/templates/register.html @@ -4,13 +4,48 @@ Register - + + + + + + +
- + +
+ pe scores logo + pe scores logo + + +
@@ -112,7 +147,11 @@

Sign up

- + + + diff --git a/src/main/resources/templates/student-add.html b/src/main/resources/templates/student-add.html index 260a864..a6fdbd4 100644 --- a/src/main/resources/templates/student-add.html +++ b/src/main/resources/templates/student-add.html @@ -1,11 +1,48 @@ Add student - + + + + + + + +
- + + +
+ pe scores logo + pe scores logo + + +
@@ -79,5 +116,9 @@

Add student

- + + + \ No newline at end of file diff --git a/src/main/resources/templates/t-test.html b/src/main/resources/templates/t-test.html index 23b2603..e682307 100644 --- a/src/main/resources/templates/t-test.html +++ b/src/main/resources/templates/t-test.html @@ -5,13 +5,49 @@ T test - + + + + + + +
- + + +
+ pe scores logo + pe scores logo + + +
@@ -826,8 +862,11 @@
+ - + diff --git a/src/main/resources/templates/tasks.html b/src/main/resources/templates/tasks.html index 333cb91..5329c66 100644 --- a/src/main/resources/templates/tasks.html +++ b/src/main/resources/templates/tasks.html @@ -5,13 +5,49 @@ Tasks - + + + + + + +
- + +
+ pe scores logo + pe scores logo + + +
+
@@ -98,7 +134,11 @@

Done todos

- + + + diff --git a/src/main/resources/templates/thirty-meters.html b/src/main/resources/templates/thirty-meters.html index 936fb66..10e8a3b 100644 --- a/src/main/resources/templates/thirty-meters.html +++ b/src/main/resources/templates/thirty-meters.html @@ -5,13 +5,48 @@ Thirty meters - + + + + + + +
- + +
+ pe scores logo + pe scores logo + + +
@@ -826,8 +861,11 @@
+ - + diff --git a/src/main/resources/templates/two-hundred-meters.html b/src/main/resources/templates/two-hundred-meters.html index b35adb3..e871e41 100644 --- a/src/main/resources/templates/two-hundred-meters.html +++ b/src/main/resources/templates/two-hundred-meters.html @@ -5,13 +5,48 @@ Two hundred meters - + + + + + + +
- +
+ pe scores logo + pe scores logo + + +
+
@@ -826,8 +861,11 @@
+ - +