From 2faa478946792ab4215e302593f4ed0a25d7f9bb Mon Sep 17 00:00:00 2001 From: Rasta341 Date: Mon, 6 Jan 2025 22:43:59 +0300 Subject: [PATCH 1/3] update bootstrap version --- src/main/resources/static/assets/servizi-dog-theme/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/static/assets/servizi-dog-theme/package.json b/src/main/resources/static/assets/servizi-dog-theme/package.json index 59936e21..f77d0c23 100644 --- a/src/main/resources/static/assets/servizi-dog-theme/package.json +++ b/src/main/resources/static/assets/servizi-dog-theme/package.json @@ -21,7 +21,7 @@ "homepage": "https://github.com/josdem/servizi-dog-template#readme", "dependencies": { "jquery": "^3.6.0", - "bootstrap": "~3.3.7", + "bootstrap": "~5.3", "font-awesome": "~4.1.0" } } From 7d6b23030b420a58e88a76f317ae2610d12f121a Mon Sep 17 00:00:00 2001 From: Rasta341 Date: Mon, 6 Jan 2025 22:45:38 +0300 Subject: [PATCH 2/3] fix V1_vetlog_master.sql script --- .../db/migration/V1__vetlog_master.sql | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/src/main/resources/db/migration/V1__vetlog_master.sql b/src/main/resources/db/migration/V1__vetlog_master.sql index a19768b6..40932e90 100644 --- a/src/main/resources/db/migration/V1__vetlog_master.sql +++ b/src/main/resources/db/migration/V1__vetlog_master.sql @@ -1,9 +1,3 @@ --- MySQL dump 10.13 Distrib 5.7.18, for Linux (x86_64) --- --- Host: localhost Database: vetlog_spring_boot --- ------------------------------------------------------ --- Server version 5.7.18-0ubuntu0.17.04.1 - /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; /*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; @@ -26,7 +20,7 @@ CREATE TABLE `registration_code` ( `id` bigint(20) NOT NULL AUTO_INCREMENT, `date_created` datetime NOT NULL, `email` varchar(255) NOT NULL, - `status` int(11) NOT NULL, + `status` tinyint(11) NOT NULL, `token` varchar(255) NOT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; @@ -88,6 +82,7 @@ CREATE TABLE `user` ( `username` varchar(255) NOT NULL, `first_name` varchar(255) DEFAULT NULL, `last_name` varchar(255) DEFAULT NULL, + `country_code` varchar(255) default null, PRIMARY KEY (`id`), UNIQUE KEY `UK_sb8bbouer5wak8vyiiy4pf2bx` (`username`) ) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=latin1; @@ -227,3 +222,17 @@ CREATE TABLE `pet_medicine` ( KEY `FKnf9loskcjkxo9f2qafq08dyjm` (`pet_medicine_id`), CONSTRAINT `FKnf9loskcjkxo9f2qafq08dyjm` FOREIGN KEY (`pet_medicine_id`) REFERENCES `pet` (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; + +DROP TABLE IF EXISTS `vaccination`; +CREATE TABLE vaccination ( +`id` bigint(20) NOT NULL AUTO_INCREMENT, + `pet_id` bigint(20) NOT NULL, + `name` varchar(255) NOT NULL, + `date` date NOT NULL, + `status` varchar(255), + `pet` varchar(255), + PRIMARY KEY (`id`) +) +ENGINE=InnoDB +DEFAULT CHARSET=utf8mb4 +COLLATE=utf8mb4_0900_ai_ci; From 0ff745c22f5c1bb7903b694a175c82bfeaa8f834 Mon Sep 17 00:00:00 2001 From: Viktor <102875180+Rasta341@users.noreply.github.com> Date: Tue, 7 Jan 2025 00:17:13 +0300 Subject: [PATCH 3/3] Update V1__vetlog_master.sql --- src/main/resources/db/migration/V1__vetlog_master.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/db/migration/V1__vetlog_master.sql b/src/main/resources/db/migration/V1__vetlog_master.sql index 40932e90..119e7441 100644 --- a/src/main/resources/db/migration/V1__vetlog_master.sql +++ b/src/main/resources/db/migration/V1__vetlog_master.sql @@ -1,3 +1,4 @@ +-- Server version 5.7.18-0ubuntu0.17.04.1 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; /*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; @@ -8,7 +9,6 @@ /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - -- -- Table structure for table `registration_code` --