Index: BusnGo_2025/.idea/.idea.BusnGo_2025/.idea/.gitignore
===================================================================
--- BusnGo_2025/.idea/.idea.BusnGo_2025/.idea/.gitignore	(revision f363bfd06ac9e7b45e7e89125593b5d9d067bf0f)
+++ BusnGo_2025/.idea/.idea.BusnGo_2025/.idea/.gitignore	(revision f363bfd06ac9e7b45e7e89125593b5d9d067bf0f)
@@ -0,0 +1,13 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Rider ignored files
+/projectSettingsUpdater.xml
+/.idea.BusnGo_2025.iml
+/modules.xml
+/contentModel.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
Index: BusnGo_2025/.idea/.idea.BusnGo_2025/.idea/encodings.xml
===================================================================
--- BusnGo_2025/.idea/.idea.BusnGo_2025/.idea/encodings.xml	(revision f363bfd06ac9e7b45e7e89125593b5d9d067bf0f)
+++ BusnGo_2025/.idea/.idea.BusnGo_2025/.idea/encodings.xml	(revision f363bfd06ac9e7b45e7e89125593b5d9d067bf0f)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with BOM under Windows, with no BOM otherwise" />
+</project>
Index: BusnGo_2025/.idea/.idea.BusnGo_2025/.idea/indexLayout.xml
===================================================================
--- BusnGo_2025/.idea/.idea.BusnGo_2025/.idea/indexLayout.xml	(revision f363bfd06ac9e7b45e7e89125593b5d9d067bf0f)
+++ BusnGo_2025/.idea/.idea.BusnGo_2025/.idea/indexLayout.xml	(revision f363bfd06ac9e7b45e7e89125593b5d9d067bf0f)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="UserContentModel">
+    <attachedFolders />
+    <explicitIncludes />
+    <explicitExcludes />
+  </component>
+</project>
Index: BusnGo_2025/BusnGo_2025.sln
===================================================================
--- BusnGo_2025/BusnGo_2025.sln	(revision f363bfd06ac9e7b45e7e89125593b5d9d067bf0f)
+++ BusnGo_2025/BusnGo_2025.sln	(revision f363bfd06ac9e7b45e7e89125593b5d9d067bf0f)
@@ -0,0 +1,16 @@
+﻿
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BusnGo_2025", "BusnGo_2025\BusnGo_2025.csproj", "{23670919-507D-427B-A0D7-BBDB8A500BAC}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{23670919-507D-427B-A0D7-BBDB8A500BAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{23670919-507D-427B-A0D7-BBDB8A500BAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{23670919-507D-427B-A0D7-BBDB8A500BAC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{23670919-507D-427B-A0D7-BBDB8A500BAC}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+EndGlobal
Index: BusnGo_2025/BusnGo_2025/BusnGo_2025.csproj
===================================================================
--- BusnGo_2025/BusnGo_2025/BusnGo_2025.csproj	(revision f363bfd06ac9e7b45e7e89125593b5d9d067bf0f)
+++ BusnGo_2025/BusnGo_2025/BusnGo_2025.csproj	(revision f363bfd06ac9e7b45e7e89125593b5d9d067bf0f)
@@ -0,0 +1,14 @@
+﻿<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net8.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <PackageReference Include="Npgsql" Version="9.0.3" />
+    </ItemGroup>
+
+</Project>
Index: BusnGo_2025/BusnGo_2025/Program.cs
===================================================================
--- BusnGo_2025/BusnGo_2025/Program.cs	(revision f363bfd06ac9e7b45e7e89125593b5d9d067bf0f)
+++ BusnGo_2025/BusnGo_2025/Program.cs	(revision f363bfd06ac9e7b45e7e89125593b5d9d067bf0f)
@@ -0,0 +1,478 @@
+﻿using Npgsql;
+using NpgsqlTypes;
+
+class BusnGo
+{
+    // Connection string with schema set to project_v3
+    static string connStr = "Host=localhost;Port=9999;Database=db_202425z_va_prj_busngo;Username=db_202425z_va_prj_busngo_owner;Password=cb67b5e4a198";
+
+    // Class to store session information
+    class UserSession
+    {
+        public long UserId { get; set; }
+        public string Role { get; set; } // "patnik", "vozac", "konduktor", or "admin"
+        public bool IsAdmin { get; set; }
+    }
+
+    static void Main()
+    {
+        using var conn = new NpgsqlConnection(connStr);
+        try
+        {
+            conn.Open();
+            // Set schema search path to project_v3
+            using (var cmd = new NpgsqlCommand("SET search_path TO project_v3, public", conn))
+            {
+                cmd.ExecuteNonQuery();
+            }
+        }
+        catch (PostgresException ex)
+        {
+            Console.WriteLine($"Connection error: {ex.Message}, SQLState: {ex.SqlState}, Detail: {ex.Detail}");
+            return;
+        }
+
+        // Start as admin by default for testing
+        var session = new UserSession
+        {
+            UserId = 0, // Default admin ID (not tied to a specific user)
+            Role = "admin",
+            IsAdmin = true
+        };
+        Console.WriteLine("Started as Admin for testing.");
+
+        // Main menu loop
+        while (true)
+        {
+            DisplayMenu(session);
+            Console.Write("Choose: ");
+            var choice = Console.ReadLine();
+
+            switch (choice)
+            {
+                case "1" when session.Role == "patnik" || session.IsAdmin:
+                    BuyTicket(conn);
+                    break;
+                case "2" when session.Role == "patnik" || session.IsAdmin:
+                    StartRide(conn);
+                    break;
+                case "3" when session.Role == "vozac" || session.IsAdmin:
+                    StartBusRoute(conn);
+                    break;
+                case "4" when session.Role == "konduktor" || session.IsAdmin:
+                    DoControl(conn);
+                    break;
+                case "5" when session.Role == "konduktor" || session.IsAdmin:
+                    WriteFine(conn);
+                    break;
+                case "6" when session.IsAdmin:
+                    RegisterPassenger(conn);
+                    break;
+                case "7" when session.IsAdmin:
+                    RegisterWorker(conn, "vozac");
+                    break;
+                case "8" when session.IsAdmin:
+                    RegisterWorker(conn, "konduktor");
+                    break;
+                case "9" when session.IsAdmin:
+                    ShowView(conn);
+                    break;
+                case "10": // Login as another user
+                    var newSession = Login(conn);
+                    session = newSession ?? session; // Revert to admin if login fails
+                    if (newSession != null)
+                        Console.WriteLine($"Logged in as {session.Role}{(session.IsAdmin ? " (Admin)" : "")}.");
+                    else
+                        Console.WriteLine("Login failed, continuing as Admin.");
+                    break;
+                case "0":
+                    return;
+                default:
+                    Console.WriteLine("Invalid choice or unauthorized action.");
+                    break;
+            }
+        }
+    }
+
+    // Login function (optional for testing)
+    static UserSession Login(NpgsqlConnection conn)
+    {
+        Console.Write("Email: ");
+        var email = Console.ReadLine();
+        Console.Write("Password: ");
+        var password = Console.ReadLine();
+
+        using var cmd = new NpgsqlCommand(
+            @"SELECT k.k_id, k.k_is_admin, 
+                     CASE 
+                         WHEN p.k_id IS NOT NULL THEN 'patnik'
+                         WHEN v.k_id IS NOT NULL THEN 'vozac'
+                         WHEN knd.k_id IS NOT NULL THEN 'konduktor'
+                         ELSE 'unknown'
+                     END AS role
+              FROM Korisnik k
+              LEFT JOIN Patnik p ON k.k_id = p.k_id
+              LEFT JOIN Vraboten v ON k.k_id = v.k_id
+              LEFT JOIN Vozac vz ON v.k_id = vz.k_id
+              LEFT JOIN Konduktor knd ON v.k_id = knd.k_id
+              WHERE k.k_email = @email AND k.k_lozinka = @password", conn);
+        cmd.Parameters.AddWithValue("email", NpgsqlDbType.Varchar, email);
+        cmd.Parameters.AddWithValue("password", NpgsqlDbType.Varchar, password);
+
+        try
+        {
+            using var reader = cmd.ExecuteReader();
+            if (reader.Read())
+            {
+                var session = new UserSession
+                {
+                    UserId = reader.GetInt64(0),
+                    IsAdmin = reader.GetBoolean(1),
+                    Role = reader.GetString(2)
+                };
+                if (session.IsAdmin)
+                    session.Role = "admin"; // Override role for admins
+                return session;
+            }
+            else
+            {
+                Console.WriteLine("Invalid email or password.");
+                return null;
+            }
+        }
+        catch (PostgresException ex)
+        {
+            Console.WriteLine($"Login error: {ex.Message}, SQLState: {ex.SqlState}, Detail: {ex.Detail}");
+            return null;
+        }
+    }
+
+    // Display role-based menu
+    static void DisplayMenu(UserSession session)
+    {
+        Console.WriteLine($"\nMenu (Logged in as {session.Role}{(session.IsAdmin ? " (Admin)" : "")}):");
+        if (session.Role == "patnik" || session.IsAdmin)
+        {
+            Console.WriteLine("1. Buy Ticket");
+            Console.WriteLine("2. Start Ride");
+        }
+        if (session.Role == "vozac" || session.IsAdmin)
+        {
+            Console.WriteLine("3. Start Bus Route");
+        }
+        if (session.Role == "konduktor" || session.IsAdmin)
+        {
+            Console.WriteLine("4. Do Control");
+            Console.WriteLine("5. Write Fine");
+        }
+        if (session.IsAdmin)
+        {
+            Console.WriteLine("6. Register Passenger");
+            Console.WriteLine("7. Register Driver");
+            Console.WriteLine("8. Register Conductor");
+            Console.WriteLine("9. Show Analytics View");
+        }
+        Console.WriteLine("10. Login as another user");
+        Console.WriteLine("0. Exit");
+    }
+
+    // Helper to list rows then prompt for numeric ID
+    static long PromptWithList(NpgsqlConnection conn, string sql, string idField, string displayField, string prompt)
+    {
+        using (var cmd = new NpgsqlCommand(sql, conn))
+        using (var reader = cmd.ExecuteReader())
+        {
+            while (reader.Read())
+                Console.WriteLine($"{reader[idField]} - {reader[displayField]}");
+        }
+        Console.Write(prompt);
+        return long.Parse(Console.ReadLine());
+    }
+
+    // Helper to list rows then prompt for string ID
+    static string PromptWithListString(NpgsqlConnection conn, string sql, string idField, string displayField, string prompt)
+    {
+        using (var cmd = new NpgsqlCommand(sql, conn))
+        using (var reader = cmd.ExecuteReader())
+        {
+            while (reader.Read())
+                Console.WriteLine($"{reader[idField]} - {reader[displayField]}");
+        }
+        Console.Write(prompt);
+        return Console.ReadLine();
+    }
+
+    // ---------------- Passenger Registration ----------------
+    static void RegisterPassenger(NpgsqlConnection conn)
+    {
+        Console.Write("Ime: "); var ime = Console.ReadLine();
+        Console.Write("Adresa: "); var adresa = Console.ReadLine();
+        Console.Write("Telefon: "); var tel = Console.ReadLine();
+        Console.Write("Email: "); var email = Console.ReadLine();
+        Console.Write("EMBG (13 digits): "); var embg = Console.ReadLine();
+        Console.Write("Lozinka: "); var pass = Console.ReadLine();
+
+        using var cmd = new NpgsqlCommand(
+            "CALL registracija_korisnik(@ime, @adr, @tel, @em, @embg, @pass, @isAdmin, @uloga, @plata, @datum, @datumPrekin)", conn);
+        cmd.Parameters.AddWithValue("ime", NpgsqlDbType.Varchar, ime);
+        cmd.Parameters.AddWithValue("adr", NpgsqlDbType.Varchar, adresa);
+        cmd.Parameters.AddWithValue("tel", NpgsqlDbType.Varchar, tel);
+        cmd.Parameters.AddWithValue("em", NpgsqlDbType.Varchar, email);
+        cmd.Parameters.AddWithValue("embg", NpgsqlDbType.Char, embg);
+        cmd.Parameters.AddWithValue("pass", NpgsqlDbType.Varchar, pass);
+        cmd.Parameters.AddWithValue("isAdmin", NpgsqlDbType.Boolean, false);
+        cmd.Parameters.AddWithValue("uloga", NpgsqlDbType.Varchar, "patnik");
+        cmd.Parameters.AddWithValue("plata", NpgsqlDbType.Numeric, DBNull.Value);
+        cmd.Parameters.AddWithValue("datum", NpgsqlDbType.Date, DBNull.Value);
+        cmd.Parameters.AddWithValue("datumPrekin", NpgsqlDbType.Date, DBNull.Value);
+
+        try
+        {
+            cmd.ExecuteNonQuery();
+            Console.WriteLine("Passenger registered successfully.");
+        }
+        catch (PostgresException ex)
+        {
+            Console.WriteLine($"Error registering passenger: {ex.Message}, SQLState: {ex.SqlState}, Detail: {ex.Detail}");
+        }
+    }
+
+    // ---------------- Worker Registration (Driver/Conductor) ----------------
+    static void RegisterWorker(NpgsqlConnection conn, string role)
+    {
+        Console.Write("Ime: "); var ime = Console.ReadLine();
+        Console.Write("Adresa: "); var adresa = Console.ReadLine();
+        Console.Write("Telefon: "); var tel = Console.ReadLine();
+        Console.Write("Email: "); var email = Console.ReadLine();
+        Console.Write("EMBG (13 digits): "); var embg = Console.ReadLine();
+        Console.Write("Lozinka: "); var pass = Console.ReadLine();
+        Console.Write("Plata: "); var plata = decimal.Parse(Console.ReadLine());
+        Console.Write("Datum vrabotuvanje (yyyy-mm-dd): "); var datum = DateTime.Parse(Console.ReadLine());
+
+        using var cmd = new NpgsqlCommand(
+            "CALL registracija_korisnik(@ime, @adr, @tel, @em, @embg, @pass, @isAdmin, @uloga, @plata, @datum, @datumPrekin)", conn);
+        cmd.Parameters.AddWithValue("ime", NpgsqlDbType.Varchar, ime);
+        cmd.Parameters.AddWithValue("adr", NpgsqlDbType.Varchar, adresa);
+        cmd.Parameters.AddWithValue("tel", NpgsqlDbType.Varchar, tel);
+        cmd.Parameters.AddWithValue("em", NpgsqlDbType.Varchar, email);
+        cmd.Parameters.AddWithValue("embg", NpgsqlDbType.Char, embg);
+        cmd.Parameters.AddWithValue("pass", NpgsqlDbType.Varchar, pass);
+        cmd.Parameters.AddWithValue("isAdmin", NpgsqlDbType.Boolean, false);
+        cmd.Parameters.AddWithValue("uloga", NpgsqlDbType.Varchar, role);
+        cmd.Parameters.AddWithValue("plata", NpgsqlDbType.Numeric, plata);
+        cmd.Parameters.AddWithValue("datum", NpgsqlDbType.Date, datum.Date);
+        cmd.Parameters.AddWithValue("datumPrekin", NpgsqlDbType.Date, DBNull.Value);
+
+        try
+        {
+            cmd.ExecuteNonQuery();
+            Console.WriteLine($"Registered {role} successfully.");
+        }
+        catch (PostgresException ex)
+        {
+            Console.WriteLine($"Error registering {role}: {ex.Message}, SQLState: {ex.SqlState}, Detail: {ex.Detail}");
+        }
+    }
+
+    // ---------------- Ticket ----------------
+    static void BuyTicket(NpgsqlConnection conn)
+    {
+        var tbId = PromptWithList(conn, "SELECT tb_id,tb_ime FROM TipBilet", "tb_id", "tb_ime", "Choose ticket type ID: ");
+        var patnikId = PromptWithList(conn, "SELECT k_id,k_ime FROM Korisnik JOIN Patnik USING(k_id)", "k_id", "k_ime", "Choose passenger k_id: ");
+
+        var sql = @"INSERT INTO Bilet(b_datum_na_kupuvnje,patnik_k_id,tb_id,b_status)
+                    VALUES(now(),@p,@t,'inactive') RETURNING b_id";
+        using var cmd = new NpgsqlCommand(sql, conn);
+        cmd.Parameters.AddWithValue("p", NpgsqlDbType.Bigint, patnikId);
+        cmd.Parameters.AddWithValue("t", NpgsqlDbType.Integer, tbId);
+        try
+        {
+            var bid = cmd.ExecuteScalar();
+            Console.WriteLine($"Created ticket b_id: {bid}");
+        }
+        catch (PostgresException ex)
+        {
+            Console.WriteLine($"Error buying ticket: {ex.Message}, SQLState: {ex.SqlState}, Detail: {ex.Detail}");
+        }
+    }
+
+    // ---------------- Ride ----------------
+    static void StartRide(NpgsqlConnection conn)
+    {
+        var inlId = PromptWithList(conn, "SELECT inl_id,li_id FROM InstancaNaLinija WHERE inl_datum_end IS NULL", "inl_id", "li_id", "Choose InstancaNaLinija ID: ");
+        var patnikId = PromptWithList(conn, "SELECT k_id,k_ime FROM Korisnik JOIN Patnik USING(k_id)", "k_id", "k_ime", "Choose passenger k_id: ");
+        var pnlId = PromptWithList(conn, "SELECT pnl_id,p_ime FROM PostojkaNaLinija JOIN Postojka USING(p_id)", "pnl_id", "p_ime", "Choose stop pnl_id: ");
+        var bId = PromptWithList(conn, "SELECT b_id,b_status FROM Bilet WHERE patnik_k_id=" + patnikId, "b_id", "b_status", "Choose active ticket b_id: ");
+
+        var sql = @"INSERT INTO Vozenje(vozenje_start,patnik_k_id,pnl_id,inl_id,vozenje_status,b_id)
+                    VALUES(now(),@p,@pnl,@inl,'active',@b) RETURNING vozenje_id";
+        using var cmd = new NpgsqlCommand(sql, conn);
+        cmd.Parameters.AddWithValue("p", NpgsqlDbType.Bigint, patnikId);
+        cmd.Parameters.AddWithValue("pnl", NpgsqlDbType.Integer, pnlId);
+        cmd.Parameters.AddWithValue("inl", NpgsqlDbType.Integer, inlId);
+        cmd.Parameters.AddWithValue("b", NpgsqlDbType.Bigint, bId);
+        try
+        {
+            var vid = cmd.ExecuteScalar();
+            Console.WriteLine($"Started ride vozenje_id: {vid}");
+        }
+        catch (PostgresException ex)
+        {
+            Console.WriteLine($"Error starting ride: {ex.Message}, SQLState: {ex.SqlState}, Detail: {ex.Detail}");
+        }
+    }
+
+    // ---------------- Control ----------------
+    static void DoControl(NpgsqlConnection conn)
+    {
+        var konduktorId = PromptWithList(conn, "SELECT k_id,k_ime FROM Korisnik JOIN Konduktor USING(k_id)", "k_id", "k_ime", "Choose konduktor k_id: ");
+        var inlId = PromptWithList(conn, "SELECT inl_id,li_id FROM InstancaNaLinija WHERE inl_datum_end IS NULL", "inl_id", "li_id", "Choose InstancaNaLinija ID: ");
+
+        var sql = @"INSERT INTO Kontroli(kontrola_datum,konduktor_k_id,inl_id)
+                    VALUES(now(),@k,@inl) RETURNING kontrola_id";
+        using var cmd = new NpgsqlCommand(sql, conn);
+        cmd.Parameters.AddWithValue("k", NpgsqlDbType.Bigint, konduktorId);
+        cmd.Parameters.AddWithValue("inl", NpgsqlDbType.Integer, inlId);
+        try
+        {
+            var kid = cmd.ExecuteScalar();
+            Console.WriteLine($"Control recorded kontrola_id: {kid}");
+        }
+        catch (PostgresException ex)
+        {
+            Console.WriteLine($"Error recording control: {ex.Message}, SQLState: {ex.SqlState}, Detail: {ex.Detail}");
+        }
+    }
+
+    // ---------------- Fine ----------------
+    static void WriteFine(NpgsqlConnection conn)
+{
+    var konduktorId = PromptWithList(conn, "SELECT k_id,k_ime FROM Korisnik JOIN Konduktor USING(k_id)", "k_id", "k_ime", "Choose konduktor k_id: ");
+    var kontrolaId = PromptWithList(conn, "SELECT kontrola_id,kontrola_datum FROM Kontroli", "kontrola_id", "kontrola_datum", "Choose kontrola_id: ");
+    Console.Write("Iznos: "); var iznos = decimal.Parse(Console.ReadLine());
+    Console.Write("Dokument: "); var dok = Console.ReadLine();
+
+    Console.Write("Is the passenger registered? (y/n): ");
+    var reg = Console.ReadLine();
+    if (reg?.ToLower() == "y")
+    {
+        var patnikId = PromptWithList(conn, "SELECT k_id,k_ime FROM Korisnik JOIN Patnik USING(k_id)", "k_id", "k_ime", "Choose passenger k_id: ");
+        using var cmd2 = new NpgsqlCommand(
+            "CALL zapisi_kazna(@iznos, @plateno, CURRENT_DATE, @dok, @kon, @kont, 'registriran', null, @p, null, null, null)", conn);
+        cmd2.Parameters.AddWithValue("iznos", NpgsqlDbType.Numeric, iznos);
+        cmd2.Parameters.AddWithValue("plateno", NpgsqlDbType.Boolean, true);
+        cmd2.Parameters.AddWithValue("dok", NpgsqlDbType.Varchar, dok);
+        cmd2.Parameters.AddWithValue("kon", NpgsqlDbType.Bigint, konduktorId);
+        cmd2.Parameters.AddWithValue("kont", NpgsqlDbType.Integer, kontrolaId);
+        cmd2.Parameters.AddWithValue("p", NpgsqlDbType.Bigint, patnikId);
+        try
+        {
+            cmd2.ExecuteNonQuery();
+            Console.WriteLine("Fine recorded successfully for registered passenger.");
+        }
+        catch (PostgresException ex)
+        {
+            Console.WriteLine($"Error recording fine: {ex.Message}, SQLState: {ex.SqlState}, Detail: {ex.Detail}");
+        }
+    }
+    else
+    {
+        Console.Write("Ime: "); var ime = Console.ReadLine();
+        Console.Write("Adresa: "); var adr = Console.ReadLine();
+        Console.Write("Telefon: "); var tel = Console.ReadLine();
+        using var cmd2 = new NpgsqlCommand(
+            "CALL zapisi_kazna(@iznos, @plateno, CURRENT_DATE, @dok, @kon, @kont, 'neregistriran', null, null, @tel, @ime, @adr)", conn);
+        cmd2.Parameters.AddWithValue("iznos", NpgsqlDbType.Numeric, iznos);
+        cmd2.Parameters.AddWithValue("plateno", NpgsqlDbType.Boolean, true);
+        cmd2.Parameters.AddWithValue("dok", NpgsqlDbType.Varchar, dok);
+        cmd2.Parameters.AddWithValue("kon", NpgsqlDbType.Bigint, konduktorId);
+        cmd2.Parameters.AddWithValue("kont", NpgsqlDbType.Integer, kontrolaId);
+        cmd2.Parameters.AddWithValue("tel", NpgsqlDbType.Varchar, tel);
+        cmd2.Parameters.AddWithValue("ime", NpgsqlDbType.Varchar, ime);
+        cmd2.Parameters.AddWithValue("adr", NpgsqlDbType.Varchar, adr);
+        try
+        {
+            cmd2.ExecuteNonQuery();
+            Console.WriteLine("Fine recorded successfully for unregistered passenger.");
+        }
+        catch (PostgresException ex)
+        {
+            Console.WriteLine($"Error recording fine: {ex.Message}, SQLState: {ex.SqlState}, Detail: {ex.Detail}");
+        }
+    }
+}
+
+    // ---------------- Bus Route ----------------
+    static void StartBusRoute(NpgsqlConnection conn)
+    {
+        var linijaId = PromptWithList(conn, "SELECT li_id,li_ime FROM Linija", "li_id", "li_ime", "Choose Linija ID: ");
+        var avtobusReg = PromptWithListString(conn, "SELECT a_registracija,a_seriski_broj FROM Avtobus", "a_registracija", "a_seriski_broj", "Choose Avtobus a_registracija: ");
+        var vozacId = PromptWithList(conn, "SELECT k_id,k_ime FROM Korisnik JOIN Vozac USING(k_id)", "k_id", "k_ime", "Choose Vozac k_id: ");
+
+        var sql = @"INSERT INTO InstancaNaLinija(inl_datum_start,vozac_k_id,a_registracija,li_id)
+                    VALUES(now(),@v,@a,@l) RETURNING inl_id";
+        using var cmd = new NpgsqlCommand(sql, conn);
+        cmd.Parameters.AddWithValue("v", NpgsqlDbType.Bigint, vozacId);
+        cmd.Parameters.AddWithValue("a", NpgsqlDbType.Varchar, avtobusReg);
+        cmd.Parameters.AddWithValue("l", NpgsqlDbType.Integer, linijaId);
+        try
+        {
+            var inlid = cmd.ExecuteScalar();
+            Console.WriteLine($"Started InstancaNaLinija inl_id: {inlid}");
+        }
+        catch (PostgresException ex)
+        {
+            Console.WriteLine($"Error starting bus route: {ex.Message}, SQLState: {ex.SqlState}, Detail: {ex.Detail}");
+        }
+    }
+
+    // ---------------- Analytics ----------------
+    static void ShowView(NpgsqlConnection conn)
+    {
+        var views = new List<string>();
+        using (var cmd = new NpgsqlCommand("SELECT matviewname FROM pg_matviews WHERE schemaname = 'project_v3' ORDER BY matviewname", conn))
+        using (var reader = cmd.ExecuteReader())
+        {
+            while (reader.Read())
+                views.Add(reader.GetString(0));
+        }
+
+        if (views.Count == 0)
+        {
+            Console.WriteLine("No materialized views found in the project_v3 schema.");
+            return;
+        }
+
+        Console.WriteLine("Available materialized views:");
+        for (int i = 0; i < views.Count; i++)
+            Console.WriteLine($"{i + 1}. {views[i]}");
+
+        Console.Write("Choose a view by number: ");
+        if (!int.TryParse(Console.ReadLine(), out int choice) || choice < 1 || choice > views.Count)
+        {
+            Console.WriteLine("Invalid choice.");
+            return;
+        }
+
+        var viewName = views[choice - 1];
+
+        try
+        {
+            using var cmdView = new NpgsqlCommand($"SELECT * FROM {viewName}", conn);
+            using var reader = cmdView.ExecuteReader();
+            var cols = reader.GetColumnSchema();
+
+            Console.WriteLine($"\nContents of '{viewName}':");
+            while (reader.Read())
+            {
+                for (int i = 0; i < cols.Count; i++)
+                    Console.Write($"{cols[i].ColumnName}: {reader.GetValue(i)} ");
+                Console.WriteLine();
+            }
+        }
+        catch (PostgresException ex)
+        {
+            Console.WriteLine($"Error showing view '{viewName}': {ex.Message}, SQLState: {ex.SqlState}, Detail: {ex.Detail}");
+        }
+    }
+}
Index: BusnGo_2025/BusnGo_2025/obj/BusnGo_2025.csproj.nuget.dgspec.json
===================================================================
--- BusnGo_2025/BusnGo_2025/obj/BusnGo_2025.csproj.nuget.dgspec.json	(revision f363bfd06ac9e7b45e7e89125593b5d9d067bf0f)
+++ BusnGo_2025/BusnGo_2025/obj/BusnGo_2025.csproj.nuget.dgspec.json	(revision f363bfd06ac9e7b45e7e89125593b5d9d067bf0f)
@@ -0,0 +1,72 @@
+{
+  "format": 1,
+  "restore": {
+    "C:\\Users\\Darko\\RiderProjects\\BusNGo\\BusnGo_2025\\BusnGo_2025\\BusnGo_2025.csproj": {}
+  },
+  "projects": {
+    "C:\\Users\\Darko\\RiderProjects\\BusNGo\\BusnGo_2025\\BusnGo_2025\\BusnGo_2025.csproj": {
+      "version": "1.0.0",
+      "restore": {
+        "projectUniqueName": "C:\\Users\\Darko\\RiderProjects\\BusNGo\\BusnGo_2025\\BusnGo_2025\\BusnGo_2025.csproj",
+        "projectName": "BusnGo_2025",
+        "projectPath": "C:\\Users\\Darko\\RiderProjects\\BusNGo\\BusnGo_2025\\BusnGo_2025\\BusnGo_2025.csproj",
+        "packagesPath": "C:\\Users\\Darko\\.nuget\\packages\\",
+        "outputPath": "C:\\Users\\Darko\\RiderProjects\\BusNGo\\BusnGo_2025\\BusnGo_2025\\obj\\",
+        "projectStyle": "PackageReference",
+        "configFilePaths": [
+          "C:\\Users\\Darko\\AppData\\Roaming\\NuGet\\NuGet.Config"
+        ],
+        "originalTargetFrameworks": [
+          "net8.0"
+        ],
+        "sources": {
+          "https://api.nuget.org/v3/index.json": {}
+        },
+        "frameworks": {
+          "net8.0": {
+            "targetAlias": "net8.0",
+            "projectReferences": {}
+          }
+        },
+        "warningProperties": {
+          "warnAsError": [
+            "NU1605"
+          ]
+        },
+        "restoreAuditProperties": {
+          "enableAudit": "true",
+          "auditLevel": "low",
+          "auditMode": "direct"
+        }
+      },
+      "frameworks": {
+        "net8.0": {
+          "targetAlias": "net8.0",
+          "dependencies": {
+            "Npgsql": {
+              "target": "Package",
+              "version": "[9.0.3, )"
+            }
+          },
+          "imports": [
+            "net461",
+            "net462",
+            "net47",
+            "net471",
+            "net472",
+            "net48",
+            "net481"
+          ],
+          "assetTargetFallback": true,
+          "warn": true,
+          "frameworkReferences": {
+            "Microsoft.NETCore.App": {
+              "privateAssets": "all"
+            }
+          },
+          "runtimeIdentifierGraphPath": "C:\\Users\\Darko\\.dotnet\\sdk\\8.0.413/PortableRuntimeIdentifierGraph.json"
+        }
+      }
+    }
+  }
+}
Index: BusnGo_2025/BusnGo_2025/obj/BusnGo_2025.csproj.nuget.g.props
===================================================================
--- BusnGo_2025/BusnGo_2025/obj/BusnGo_2025.csproj.nuget.g.props	(revision f363bfd06ac9e7b45e7e89125593b5d9d067bf0f)
+++ BusnGo_2025/BusnGo_2025/obj/BusnGo_2025.csproj.nuget.g.props	(revision f363bfd06ac9e7b45e7e89125593b5d9d067bf0f)
@@ -0,0 +1,15 @@
+﻿<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
+    <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
+    <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
+    <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
+    <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
+    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Darko\.nuget\packages\</NuGetPackageFolders>
+    <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.14.0</NuGetToolVersion>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
+    <SourceRoot Include="C:\Users\Darko\.nuget\packages\" />
+  </ItemGroup>
+</Project>
Index: BusnGo_2025/BusnGo_2025/obj/BusnGo_2025.csproj.nuget.g.targets
===================================================================
--- BusnGo_2025/BusnGo_2025/obj/BusnGo_2025.csproj.nuget.g.targets	(revision f363bfd06ac9e7b45e7e89125593b5d9d067bf0f)
+++ BusnGo_2025/BusnGo_2025/obj/BusnGo_2025.csproj.nuget.g.targets	(revision f363bfd06ac9e7b45e7e89125593b5d9d067bf0f)
@@ -0,0 +1,6 @@
+﻿<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
+    <Import Project="$(NuGetPackageRoot)microsoft.extensions.logging.abstractions\8.0.2\buildTransitive\net6.0\Microsoft.Extensions.Logging.Abstractions.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.logging.abstractions\8.0.2\buildTransitive\net6.0\Microsoft.Extensions.Logging.Abstractions.targets')" />
+  </ImportGroup>
+</Project>
Index: BusnGo_2025/BusnGo_2025/obj/Debug/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs
===================================================================
--- BusnGo_2025/BusnGo_2025/obj/Debug/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs	(revision f363bfd06ac9e7b45e7e89125593b5d9d067bf0f)
+++ BusnGo_2025/BusnGo_2025/obj/Debug/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs	(revision f363bfd06ac9e7b45e7e89125593b5d9d067bf0f)
@@ -0,0 +1,4 @@
+// <autogenerated />
+using System;
+using System.Reflection;
+[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v8.0", FrameworkDisplayName = ".NET 8.0")]
Index: BusnGo_2025/BusnGo_2025/obj/Debug/net8.0/BusnGo_2025.AssemblyInfo.cs
===================================================================
--- BusnGo_2025/BusnGo_2025/obj/Debug/net8.0/BusnGo_2025.AssemblyInfo.cs	(revision f363bfd06ac9e7b45e7e89125593b5d9d067bf0f)
+++ BusnGo_2025/BusnGo_2025/obj/Debug/net8.0/BusnGo_2025.AssemblyInfo.cs	(revision f363bfd06ac9e7b45e7e89125593b5d9d067bf0f)
@@ -0,0 +1,22 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Reflection;
+
+[assembly: System.Reflection.AssemblyCompanyAttribute("BusnGo_2025")]
+[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
+[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
+[assembly: System.Reflection.AssemblyProductAttribute("BusnGo_2025")]
+[assembly: System.Reflection.AssemblyTitleAttribute("BusnGo_2025")]
+[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
+
+// Generated by the MSBuild WriteCodeFragment class.
+
Index: BusnGo_2025/BusnGo_2025/obj/Debug/net8.0/BusnGo_2025.AssemblyInfoInputs.cache
===================================================================
--- BusnGo_2025/BusnGo_2025/obj/Debug/net8.0/BusnGo_2025.AssemblyInfoInputs.cache	(revision f363bfd06ac9e7b45e7e89125593b5d9d067bf0f)
+++ BusnGo_2025/BusnGo_2025/obj/Debug/net8.0/BusnGo_2025.AssemblyInfoInputs.cache	(revision f363bfd06ac9e7b45e7e89125593b5d9d067bf0f)
@@ -0,0 +1,1 @@
+80a4a4b90eaf8da9b502c1eeb335b57684c264936f17a54fdbf104d4eb4d7e73
Index: BusnGo_2025/BusnGo_2025/obj/Debug/net8.0/BusnGo_2025.GeneratedMSBuildEditorConfig.editorconfig
===================================================================
--- BusnGo_2025/BusnGo_2025/obj/Debug/net8.0/BusnGo_2025.GeneratedMSBuildEditorConfig.editorconfig	(revision f363bfd06ac9e7b45e7e89125593b5d9d067bf0f)
+++ BusnGo_2025/BusnGo_2025/obj/Debug/net8.0/BusnGo_2025.GeneratedMSBuildEditorConfig.editorconfig	(revision f363bfd06ac9e7b45e7e89125593b5d9d067bf0f)
@@ -0,0 +1,13 @@
+is_global = true
+build_property.TargetFramework = net8.0
+build_property.TargetPlatformMinVersion = 
+build_property.UsingMicrosoftNETSdkWeb = 
+build_property.ProjectTypeGuids = 
+build_property.InvariantGlobalization = 
+build_property.PlatformNeutralAssembly = 
+build_property.EnforceExtendedAnalyzerRules = 
+build_property._SupportedPlatformList = Linux,macOS,Windows
+build_property.RootNamespace = BusnGo_2025
+build_property.ProjectDir = C:\Users\Darko\RiderProjects\BusNGo\BusnGo_2025\BusnGo_2025\
+build_property.EnableComHosting = 
+build_property.EnableGeneratedComInterfaceComImportInterop = 
Index: BusnGo_2025/BusnGo_2025/obj/Debug/net8.0/BusnGo_2025.GlobalUsings.g.cs
===================================================================
--- BusnGo_2025/BusnGo_2025/obj/Debug/net8.0/BusnGo_2025.GlobalUsings.g.cs	(revision f363bfd06ac9e7b45e7e89125593b5d9d067bf0f)
+++ BusnGo_2025/BusnGo_2025/obj/Debug/net8.0/BusnGo_2025.GlobalUsings.g.cs	(revision f363bfd06ac9e7b45e7e89125593b5d9d067bf0f)
@@ -0,0 +1,8 @@
+// <auto-generated/>
+global using global::System;
+global using global::System.Collections.Generic;
+global using global::System.IO;
+global using global::System.Linq;
+global using global::System.Net.Http;
+global using global::System.Threading;
+global using global::System.Threading.Tasks;
Index: BusnGo_2025/BusnGo_2025/obj/project.assets.json
===================================================================
--- BusnGo_2025/BusnGo_2025/obj/project.assets.json	(revision f363bfd06ac9e7b45e7e89125593b5d9d067bf0f)
+++ BusnGo_2025/BusnGo_2025/obj/project.assets.json	(revision f363bfd06ac9e7b45e7e89125593b5d9d067bf0f)
@@ -0,0 +1,254 @@
+{
+  "version": 3,
+  "targets": {
+    "net8.0": {
+      "Microsoft.Extensions.DependencyInjection.Abstractions/8.0.2": {
+        "type": "package",
+        "compile": {
+          "lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll": {
+            "related": ".xml"
+          }
+        },
+        "runtime": {
+          "lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll": {
+            "related": ".xml"
+          }
+        },
+        "build": {
+          "buildTransitive/net6.0/_._": {}
+        }
+      },
+      "Microsoft.Extensions.Logging.Abstractions/8.0.2": {
+        "type": "package",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2"
+        },
+        "compile": {
+          "lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll": {
+            "related": ".xml"
+          }
+        },
+        "runtime": {
+          "lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll": {
+            "related": ".xml"
+          }
+        },
+        "build": {
+          "buildTransitive/net6.0/Microsoft.Extensions.Logging.Abstractions.targets": {}
+        }
+      },
+      "Npgsql/9.0.3": {
+        "type": "package",
+        "dependencies": {
+          "Microsoft.Extensions.Logging.Abstractions": "8.0.2"
+        },
+        "compile": {
+          "lib/net8.0/Npgsql.dll": {
+            "related": ".xml"
+          }
+        },
+        "runtime": {
+          "lib/net8.0/Npgsql.dll": {
+            "related": ".xml"
+          }
+        }
+      }
+    }
+  },
+  "libraries": {
+    "Microsoft.Extensions.DependencyInjection.Abstractions/8.0.2": {
+      "sha512": "3iE7UF7MQkCv1cxzCahz+Y/guQbTqieyxyaWKhrRO91itI9cOKO76OHeQDahqG4MmW5umr3CcCvGmK92lWNlbg==",
+      "type": "package",
+      "path": "microsoft.extensions.dependencyinjection.abstractions/8.0.2",
+      "files": [
+        ".nupkg.metadata",
+        ".signature.p7s",
+        "Icon.png",
+        "LICENSE.TXT",
+        "PACKAGE.md",
+        "THIRD-PARTY-NOTICES.TXT",
+        "buildTransitive/net461/Microsoft.Extensions.DependencyInjection.Abstractions.targets",
+        "buildTransitive/net462/_._",
+        "buildTransitive/net6.0/_._",
+        "buildTransitive/netcoreapp2.0/Microsoft.Extensions.DependencyInjection.Abstractions.targets",
+        "lib/net462/Microsoft.Extensions.DependencyInjection.Abstractions.dll",
+        "lib/net462/Microsoft.Extensions.DependencyInjection.Abstractions.xml",
+        "lib/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll",
+        "lib/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.xml",
+        "lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll",
+        "lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.xml",
+        "lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll",
+        "lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.xml",
+        "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll",
+        "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.Abstractions.xml",
+        "lib/netstandard2.1/Microsoft.Extensions.DependencyInjection.Abstractions.dll",
+        "lib/netstandard2.1/Microsoft.Extensions.DependencyInjection.Abstractions.xml",
+        "microsoft.extensions.dependencyinjection.abstractions.8.0.2.nupkg.sha512",
+        "microsoft.extensions.dependencyinjection.abstractions.nuspec",
+        "useSharedDesignerContext.txt"
+      ]
+    },
+    "Microsoft.Extensions.Logging.Abstractions/8.0.2": {
+      "sha512": "nroMDjS7hNBPtkZqVBbSiQaQjWRDxITI8Y7XnDs97rqG3EbzVTNLZQf7bIeUJcaHOV8bca47s1Uxq94+2oGdxA==",
+      "type": "package",
+      "path": "microsoft.extensions.logging.abstractions/8.0.2",
+      "files": [
+        ".nupkg.metadata",
+        ".signature.p7s",
+        "Icon.png",
+        "LICENSE.TXT",
+        "PACKAGE.md",
+        "THIRD-PARTY-NOTICES.TXT",
+        "analyzers/dotnet/roslyn3.11/cs/Microsoft.Extensions.Logging.Generators.dll",
+        "analyzers/dotnet/roslyn3.11/cs/cs/Microsoft.Extensions.Logging.Generators.resources.dll",
+        "analyzers/dotnet/roslyn3.11/cs/de/Microsoft.Extensions.Logging.Generators.resources.dll",
+        "analyzers/dotnet/roslyn3.11/cs/es/Microsoft.Extensions.Logging.Generators.resources.dll",
+        "analyzers/dotnet/roslyn3.11/cs/fr/Microsoft.Extensions.Logging.Generators.resources.dll",
+        "analyzers/dotnet/roslyn3.11/cs/it/Microsoft.Extensions.Logging.Generators.resources.dll",
+        "analyzers/dotnet/roslyn3.11/cs/ja/Microsoft.Extensions.Logging.Generators.resources.dll",
+        "analyzers/dotnet/roslyn3.11/cs/ko/Microsoft.Extensions.Logging.Generators.resources.dll",
+        "analyzers/dotnet/roslyn3.11/cs/pl/Microsoft.Extensions.Logging.Generators.resources.dll",
+        "analyzers/dotnet/roslyn3.11/cs/pt-BR/Microsoft.Extensions.Logging.Generators.resources.dll",
+        "analyzers/dotnet/roslyn3.11/cs/ru/Microsoft.Extensions.Logging.Generators.resources.dll",
+        "analyzers/dotnet/roslyn3.11/cs/tr/Microsoft.Extensions.Logging.Generators.resources.dll",
+        "analyzers/dotnet/roslyn3.11/cs/zh-Hans/Microsoft.Extensions.Logging.Generators.resources.dll",
+        "analyzers/dotnet/roslyn3.11/cs/zh-Hant/Microsoft.Extensions.Logging.Generators.resources.dll",
+        "analyzers/dotnet/roslyn4.0/cs/Microsoft.Extensions.Logging.Generators.dll",
+        "analyzers/dotnet/roslyn4.0/cs/cs/Microsoft.Extensions.Logging.Generators.resources.dll",
+        "analyzers/dotnet/roslyn4.0/cs/de/Microsoft.Extensions.Logging.Generators.resources.dll",
+        "analyzers/dotnet/roslyn4.0/cs/es/Microsoft.Extensions.Logging.Generators.resources.dll",
+        "analyzers/dotnet/roslyn4.0/cs/fr/Microsoft.Extensions.Logging.Generators.resources.dll",
+        "analyzers/dotnet/roslyn4.0/cs/it/Microsoft.Extensions.Logging.Generators.resources.dll",
+        "analyzers/dotnet/roslyn4.0/cs/ja/Microsoft.Extensions.Logging.Generators.resources.dll",
+        "analyzers/dotnet/roslyn4.0/cs/ko/Microsoft.Extensions.Logging.Generators.resources.dll",
+        "analyzers/dotnet/roslyn4.0/cs/pl/Microsoft.Extensions.Logging.Generators.resources.dll",
+        "analyzers/dotnet/roslyn4.0/cs/pt-BR/Microsoft.Extensions.Logging.Generators.resources.dll",
+        "analyzers/dotnet/roslyn4.0/cs/ru/Microsoft.Extensions.Logging.Generators.resources.dll",
+        "analyzers/dotnet/roslyn4.0/cs/tr/Microsoft.Extensions.Logging.Generators.resources.dll",
+        "analyzers/dotnet/roslyn4.0/cs/zh-Hans/Microsoft.Extensions.Logging.Generators.resources.dll",
+        "analyzers/dotnet/roslyn4.0/cs/zh-Hant/Microsoft.Extensions.Logging.Generators.resources.dll",
+        "analyzers/dotnet/roslyn4.4/cs/Microsoft.Extensions.Logging.Generators.dll",
+        "analyzers/dotnet/roslyn4.4/cs/cs/Microsoft.Extensions.Logging.Generators.resources.dll",
+        "analyzers/dotnet/roslyn4.4/cs/de/Microsoft.Extensions.Logging.Generators.resources.dll",
+        "analyzers/dotnet/roslyn4.4/cs/es/Microsoft.Extensions.Logging.Generators.resources.dll",
+        "analyzers/dotnet/roslyn4.4/cs/fr/Microsoft.Extensions.Logging.Generators.resources.dll",
+        "analyzers/dotnet/roslyn4.4/cs/it/Microsoft.Extensions.Logging.Generators.resources.dll",
+        "analyzers/dotnet/roslyn4.4/cs/ja/Microsoft.Extensions.Logging.Generators.resources.dll",
+        "analyzers/dotnet/roslyn4.4/cs/ko/Microsoft.Extensions.Logging.Generators.resources.dll",
+        "analyzers/dotnet/roslyn4.4/cs/pl/Microsoft.Extensions.Logging.Generators.resources.dll",
+        "analyzers/dotnet/roslyn4.4/cs/pt-BR/Microsoft.Extensions.Logging.Generators.resources.dll",
+        "analyzers/dotnet/roslyn4.4/cs/ru/Microsoft.Extensions.Logging.Generators.resources.dll",
+        "analyzers/dotnet/roslyn4.4/cs/tr/Microsoft.Extensions.Logging.Generators.resources.dll",
+        "analyzers/dotnet/roslyn4.4/cs/zh-Hans/Microsoft.Extensions.Logging.Generators.resources.dll",
+        "analyzers/dotnet/roslyn4.4/cs/zh-Hant/Microsoft.Extensions.Logging.Generators.resources.dll",
+        "buildTransitive/net461/Microsoft.Extensions.Logging.Abstractions.targets",
+        "buildTransitive/net462/Microsoft.Extensions.Logging.Abstractions.targets",
+        "buildTransitive/net6.0/Microsoft.Extensions.Logging.Abstractions.targets",
+        "buildTransitive/netcoreapp2.0/Microsoft.Extensions.Logging.Abstractions.targets",
+        "buildTransitive/netstandard2.0/Microsoft.Extensions.Logging.Abstractions.targets",
+        "lib/net462/Microsoft.Extensions.Logging.Abstractions.dll",
+        "lib/net462/Microsoft.Extensions.Logging.Abstractions.xml",
+        "lib/net6.0/Microsoft.Extensions.Logging.Abstractions.dll",
+        "lib/net6.0/Microsoft.Extensions.Logging.Abstractions.xml",
+        "lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll",
+        "lib/net7.0/Microsoft.Extensions.Logging.Abstractions.xml",
+        "lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll",
+        "lib/net8.0/Microsoft.Extensions.Logging.Abstractions.xml",
+        "lib/netstandard2.0/Microsoft.Extensions.Logging.Abstractions.dll",
+        "lib/netstandard2.0/Microsoft.Extensions.Logging.Abstractions.xml",
+        "microsoft.extensions.logging.abstractions.8.0.2.nupkg.sha512",
+        "microsoft.extensions.logging.abstractions.nuspec",
+        "useSharedDesignerContext.txt"
+      ]
+    },
+    "Npgsql/9.0.3": {
+      "sha512": "tPvY61CxOAWxNsKLEBg+oR646X4Bc8UmyQ/tJszL/7mEmIXQnnBhVJZrZEEUv0Bstu0mEsHZD5At3EO8zQRAYw==",
+      "type": "package",
+      "path": "npgsql/9.0.3",
+      "files": [
+        ".nupkg.metadata",
+        ".signature.p7s",
+        "README.md",
+        "lib/net6.0/Npgsql.dll",
+        "lib/net6.0/Npgsql.xml",
+        "lib/net8.0/Npgsql.dll",
+        "lib/net8.0/Npgsql.xml",
+        "npgsql.9.0.3.nupkg.sha512",
+        "npgsql.nuspec",
+        "postgresql.png"
+      ]
+    }
+  },
+  "projectFileDependencyGroups": {
+    "net8.0": [
+      "Npgsql >= 9.0.3"
+    ]
+  },
+  "packageFolders": {
+    "C:\\Users\\Darko\\.nuget\\packages\\": {}
+  },
+  "project": {
+    "version": "1.0.0",
+    "restore": {
+      "projectUniqueName": "C:\\Users\\Darko\\RiderProjects\\BusNGo\\BusnGo_2025\\BusnGo_2025\\BusnGo_2025.csproj",
+      "projectName": "BusnGo_2025",
+      "projectPath": "C:\\Users\\Darko\\RiderProjects\\BusNGo\\BusnGo_2025\\BusnGo_2025\\BusnGo_2025.csproj",
+      "packagesPath": "C:\\Users\\Darko\\.nuget\\packages\\",
+      "outputPath": "C:\\Users\\Darko\\RiderProjects\\BusNGo\\BusnGo_2025\\BusnGo_2025\\obj\\",
+      "projectStyle": "PackageReference",
+      "configFilePaths": [
+        "C:\\Users\\Darko\\AppData\\Roaming\\NuGet\\NuGet.Config"
+      ],
+      "originalTargetFrameworks": [
+        "net8.0"
+      ],
+      "sources": {
+        "https://api.nuget.org/v3/index.json": {}
+      },
+      "frameworks": {
+        "net8.0": {
+          "targetAlias": "net8.0",
+          "projectReferences": {}
+        }
+      },
+      "warningProperties": {
+        "warnAsError": [
+          "NU1605"
+        ]
+      },
+      "restoreAuditProperties": {
+        "enableAudit": "true",
+        "auditLevel": "low",
+        "auditMode": "direct"
+      }
+    },
+    "frameworks": {
+      "net8.0": {
+        "targetAlias": "net8.0",
+        "dependencies": {
+          "Npgsql": {
+            "target": "Package",
+            "version": "[9.0.3, )"
+          }
+        },
+        "imports": [
+          "net461",
+          "net462",
+          "net47",
+          "net471",
+          "net472",
+          "net48",
+          "net481"
+        ],
+        "assetTargetFallback": true,
+        "warn": true,
+        "frameworkReferences": {
+          "Microsoft.NETCore.App": {
+            "privateAssets": "all"
+          }
+        },
+        "runtimeIdentifierGraphPath": "C:\\Users\\Darko\\.dotnet\\sdk\\8.0.413/PortableRuntimeIdentifierGraph.json"
+      }
+    }
+  }
+}
Index: BusnGo_2025/BusnGo_2025/obj/project.nuget.cache
===================================================================
--- BusnGo_2025/BusnGo_2025/obj/project.nuget.cache	(revision f363bfd06ac9e7b45e7e89125593b5d9d067bf0f)
+++ BusnGo_2025/BusnGo_2025/obj/project.nuget.cache	(revision f363bfd06ac9e7b45e7e89125593b5d9d067bf0f)
@@ -0,0 +1,12 @@
+{
+  "version": 2,
+  "dgSpecHash": "gR22Yy40uYY=",
+  "success": true,
+  "projectFilePath": "C:\\Users\\Darko\\RiderProjects\\BusNGo\\BusnGo_2025\\BusnGo_2025\\BusnGo_2025.csproj",
+  "expectedPackageFiles": [
+    "C:\\Users\\Darko\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\8.0.2\\microsoft.extensions.dependencyinjection.abstractions.8.0.2.nupkg.sha512",
+    "C:\\Users\\Darko\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\8.0.2\\microsoft.extensions.logging.abstractions.8.0.2.nupkg.sha512",
+    "C:\\Users\\Darko\\.nuget\\packages\\npgsql\\9.0.3\\npgsql.9.0.3.nupkg.sha512"
+  ],
+  "logs": []
+}
Index: BusnGo_2025/BusnGo_2025/obj/project.packagespec.json
===================================================================
--- BusnGo_2025/BusnGo_2025/obj/project.packagespec.json	(revision f363bfd06ac9e7b45e7e89125593b5d9d067bf0f)
+++ BusnGo_2025/BusnGo_2025/obj/project.packagespec.json	(revision f363bfd06ac9e7b45e7e89125593b5d9d067bf0f)
@@ -0,0 +1,1 @@
+﻿"restore":{"projectUniqueName":"C:\\Users\\Darko\\RiderProjects\\BusNGo\\BusnGo_2025\\BusnGo_2025\\BusnGo_2025.csproj","projectName":"BusnGo_2025","projectPath":"C:\\Users\\Darko\\RiderProjects\\BusNGo\\BusnGo_2025\\BusnGo_2025\\BusnGo_2025.csproj","outputPath":"C:\\Users\\Darko\\RiderProjects\\BusNGo\\BusnGo_2025\\BusnGo_2025\\obj\\","projectStyle":"PackageReference","originalTargetFrameworks":["net8.0"],"sources":{"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net8.0":{"targetAlias":"net8.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]},"restoreAuditProperties":{"enableAudit":"true","auditLevel":"low","auditMode":"direct"}}"frameworks":{"net8.0":{"targetAlias":"net8.0","dependencies":{"Npgsql":{"target":"Package","version":"[9.0.3, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Users\\Darko\\.dotnet\\sdk\\8.0.413/PortableRuntimeIdentifierGraph.json"}}
Index: BusnGo_2025/BusnGo_2025/obj/rider.project.model.nuget.info
===================================================================
--- BusnGo_2025/BusnGo_2025/obj/rider.project.model.nuget.info	(revision f363bfd06ac9e7b45e7e89125593b5d9d067bf0f)
+++ BusnGo_2025/BusnGo_2025/obj/rider.project.model.nuget.info	(revision f363bfd06ac9e7b45e7e89125593b5d9d067bf0f)
@@ -0,0 +1,1 @@
+﻿17583245447738005
Index: BusnGo_2025/BusnGo_2025/obj/rider.project.restore.info
===================================================================
--- BusnGo_2025/BusnGo_2025/obj/rider.project.restore.info	(revision f363bfd06ac9e7b45e7e89125593b5d9d067bf0f)
+++ BusnGo_2025/BusnGo_2025/obj/rider.project.restore.info	(revision f363bfd06ac9e7b45e7e89125593b5d9d067bf0f)
@@ -0,0 +1,1 @@
+﻿17583245450613355
Index: BusnGo_2025/global.json
===================================================================
--- BusnGo_2025/global.json	(revision f363bfd06ac9e7b45e7e89125593b5d9d067bf0f)
+++ BusnGo_2025/global.json	(revision f363bfd06ac9e7b45e7e89125593b5d9d067bf0f)
@@ -0,0 +1,7 @@
+{
+  "sdk": {
+    "version": "8.0.0",
+    "rollForward": "latestMinor",
+    "allowPrerelease": false
+  }
+}
Index: s-n-go-do-5ta-faza/.gitignore
===================================================================
--- bus-n-go-do-5ta-faza/.gitignore	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,33 +1,0 @@
-HELP.md
-target/
-!.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**/target/
-!**/src/test/**/target/
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### VS Code ###
-.vscode/
Index: s-n-go-do-5ta-faza/.mvn/wrapper/maven-wrapper.properties
===================================================================
--- bus-n-go-do-5ta-faza/.mvn/wrapper/maven-wrapper.properties	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,2 +1,0 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
Index: s-n-go-do-5ta-faza/README.md
===================================================================
--- bus-n-go-do-5ta-faza/README.md	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,65 +1,0 @@
-# Documentation for the project 
-
-You can find a detailed documentation in macedonian for the project on our [Wiki page](https://develop.finki.ukim.mk/projects/BusNGo)
-
-# Get the application running
-
-## Install Java JDK 
-
-Download and install Java JDK 8 or above from [Oracle](https://www.oracle.com/java/technologies/javase/jdk21-archive-downloads.html)
-
-## Clone the repository 
-
-Make a clone from the repository onto your machine
-
-```bash
-git clone https://github.com/ppaunovski/Bus-GO.git
-```
-
-Then open the project in your IDE of choice (preferably IntelliJ)
-
-## Connect to the database
-
-Establish a connection to the remote database
-
-## Run the application
-
-Start the application, open a browser and navigate to [https://localhost:8080](https://localhost:8080)
-
-## Registered accounts:
-
-### 1. Admin
-
-Email: vangel.ajanovski@admin.jsp.mk
-
-Password: va
-
-#### Functionalities: 
-Register bus drivers and conductors.
-
-### 2. Bus Driver
-
-Email: petar.gruevski@vozac.jsp.mk
-
-Password: pg
-
-#### Functionalities:
-Start and end routes.
-
-### 3. Conductor
-
-Email: darko.sekulovski@kondukter.jsp.mk
-
-Password: ds
-
-#### Functionalities:
-Control the routes, and write tickets to registered or unregistered commuters which haven't paid for the ride.
-
-### 4. Commuter
-
-Email: pavel.paunovski@patnik.jsp.mk
-
-Password: pp
-
-#### Functionalities:
-Buy tickets for the rides, starting and ending a ride.
Index: s-n-go-do-5ta-faza/mvnw
===================================================================
--- bus-n-go-do-5ta-faza/mvnw	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,308 +1,0 @@
-#!/bin/sh
-# ----------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# ----------------------------------------------------------------------------
-
-# ----------------------------------------------------------------------------
-# Apache Maven Wrapper startup batch script, version 3.2.0
-#
-# Required ENV vars:
-# ------------------
-#   JAVA_HOME - location of a JDK home dir
-#
-# Optional ENV vars
-# -----------------
-#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
-#     e.g. to debug Maven itself, use
-#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
-# ----------------------------------------------------------------------------
-
-if [ -z "$MAVEN_SKIP_RC" ] ; then
-
-  if [ -f /usr/local/etc/mavenrc ] ; then
-    . /usr/local/etc/mavenrc
-  fi
-
-  if [ -f /etc/mavenrc ] ; then
-    . /etc/mavenrc
-  fi
-
-  if [ -f "$HOME/.mavenrc" ] ; then
-    . "$HOME/.mavenrc"
-  fi
-
-fi
-
-# OS specific support.  $var _must_ be set to either true or false.
-cygwin=false;
-darwin=false;
-mingw=false
-case "$(uname)" in
-  CYGWIN*) cygwin=true ;;
-  MINGW*) mingw=true;;
-  Darwin*) darwin=true
-    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
-    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
-    if [ -z "$JAVA_HOME" ]; then
-      if [ -x "/usr/libexec/java_home" ]; then
-        JAVA_HOME="$(/usr/libexec/java_home)"; export JAVA_HOME
-      else
-        JAVA_HOME="/Library/Java/Home"; export JAVA_HOME
-      fi
-    fi
-    ;;
-esac
-
-if [ -z "$JAVA_HOME" ] ; then
-  if [ -r /etc/gentoo-release ] ; then
-    JAVA_HOME=$(java-config --jre-home)
-  fi
-fi
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin ; then
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=$(cygpath --unix "$JAVA_HOME")
-  [ -n "$CLASSPATH" ] &&
-    CLASSPATH=$(cygpath --path --unix "$CLASSPATH")
-fi
-
-# For Mingw, ensure paths are in UNIX format before anything is touched
-if $mingw ; then
-  [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] &&
-    JAVA_HOME="$(cd "$JAVA_HOME" || (echo "cannot cd into $JAVA_HOME."; exit 1); pwd)"
-fi
-
-if [ -z "$JAVA_HOME" ]; then
-  javaExecutable="$(which javac)"
-  if [ -n "$javaExecutable" ] && ! [ "$(expr "\"$javaExecutable\"" : '\([^ ]*\)')" = "no" ]; then
-    # readlink(1) is not available as standard on Solaris 10.
-    readLink=$(which readlink)
-    if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then
-      if $darwin ; then
-        javaHome="$(dirname "\"$javaExecutable\"")"
-        javaExecutable="$(cd "\"$javaHome\"" && pwd -P)/javac"
-      else
-        javaExecutable="$(readlink -f "\"$javaExecutable\"")"
-      fi
-      javaHome="$(dirname "\"$javaExecutable\"")"
-      javaHome=$(expr "$javaHome" : '\(.*\)/bin')
-      JAVA_HOME="$javaHome"
-      export JAVA_HOME
-    fi
-  fi
-fi
-
-if [ -z "$JAVACMD" ] ; then
-  if [ -n "$JAVA_HOME"  ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-      # IBM's JDK on AIX uses strange locations for the executables
-      JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-      JAVACMD="$JAVA_HOME/bin/java"
-    fi
-  else
-    JAVACMD="$(\unset -f command 2>/dev/null; \command -v java)"
-  fi
-fi
-
-if [ ! -x "$JAVACMD" ] ; then
-  echo "Error: JAVA_HOME is not defined correctly." >&2
-  echo "  We cannot execute $JAVACMD" >&2
-  exit 1
-fi
-
-if [ -z "$JAVA_HOME" ] ; then
-  echo "Warning: JAVA_HOME environment variable is not set."
-fi
-
-# traverses directory structure from process work directory to filesystem root
-# first directory with .mvn subdirectory is considered project base directory
-find_maven_basedir() {
-  if [ -z "$1" ]
-  then
-    echo "Path not specified to find_maven_basedir"
-    return 1
-  fi
-
-  basedir="$1"
-  wdir="$1"
-  while [ "$wdir" != '/' ] ; do
-    if [ -d "$wdir"/.mvn ] ; then
-      basedir=$wdir
-      break
-    fi
-    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
-    if [ -d "${wdir}" ]; then
-      wdir=$(cd "$wdir/.." || exit 1; pwd)
-    fi
-    # end of workaround
-  done
-  printf '%s' "$(cd "$basedir" || exit 1; pwd)"
-}
-
-# concatenates all lines of a file
-concat_lines() {
-  if [ -f "$1" ]; then
-    # Remove \r in case we run on Windows within Git Bash
-    # and check out the repository with auto CRLF management
-    # enabled. Otherwise, we may read lines that are delimited with
-    # \r\n and produce $'-Xarg\r' rather than -Xarg due to word
-    # splitting rules.
-    tr -s '\r\n' ' ' < "$1"
-  fi
-}
-
-log() {
-  if [ "$MVNW_VERBOSE" = true ]; then
-    printf '%s\n' "$1"
-  fi
-}
-
-BASE_DIR=$(find_maven_basedir "$(dirname "$0")")
-if [ -z "$BASE_DIR" ]; then
-  exit 1;
-fi
-
-MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR
-log "$MAVEN_PROJECTBASEDIR"
-
-##########################################################################################
-# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
-# This allows using the maven wrapper in projects that prohibit checking in binary data.
-##########################################################################################
-wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar"
-if [ -r "$wrapperJarPath" ]; then
-    log "Found $wrapperJarPath"
-else
-    log "Couldn't find $wrapperJarPath, downloading it ..."
-
-    if [ -n "$MVNW_REPOURL" ]; then
-      wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
-    else
-      wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
-    fi
-    while IFS="=" read -r key value; do
-      # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' )
-      safeValue=$(echo "$value" | tr -d '\r')
-      case "$key" in (wrapperUrl) wrapperUrl="$safeValue"; break ;;
-      esac
-    done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties"
-    log "Downloading from: $wrapperUrl"
-
-    if $cygwin; then
-      wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath")
-    fi
-
-    if command -v wget > /dev/null; then
-        log "Found wget ... using wget"
-        [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet"
-        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
-            wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
-        else
-            wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
-        fi
-    elif command -v curl > /dev/null; then
-        log "Found curl ... using curl"
-        [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent"
-        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
-            curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath"
-        else
-            curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath"
-        fi
-    else
-        log "Falling back to using Java to download"
-        javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java"
-        javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class"
-        # For Cygwin, switch paths to Windows format before running javac
-        if $cygwin; then
-          javaSource=$(cygpath --path --windows "$javaSource")
-          javaClass=$(cygpath --path --windows "$javaClass")
-        fi
-        if [ -e "$javaSource" ]; then
-            if [ ! -e "$javaClass" ]; then
-                log " - Compiling MavenWrapperDownloader.java ..."
-                ("$JAVA_HOME/bin/javac" "$javaSource")
-            fi
-            if [ -e "$javaClass" ]; then
-                log " - Running MavenWrapperDownloader.java ..."
-                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath"
-            fi
-        fi
-    fi
-fi
-##########################################################################################
-# End of extension
-##########################################################################################
-
-# If specified, validate the SHA-256 sum of the Maven wrapper jar file
-wrapperSha256Sum=""
-while IFS="=" read -r key value; do
-  case "$key" in (wrapperSha256Sum) wrapperSha256Sum=$value; break ;;
-  esac
-done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties"
-if [ -n "$wrapperSha256Sum" ]; then
-  wrapperSha256Result=false
-  if command -v sha256sum > /dev/null; then
-    if echo "$wrapperSha256Sum  $wrapperJarPath" | sha256sum -c > /dev/null 2>&1; then
-      wrapperSha256Result=true
-    fi
-  elif command -v shasum > /dev/null; then
-    if echo "$wrapperSha256Sum  $wrapperJarPath" | shasum -a 256 -c > /dev/null 2>&1; then
-      wrapperSha256Result=true
-    fi
-  else
-    echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available."
-    echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties."
-    exit 1
-  fi
-  if [ $wrapperSha256Result = false ]; then
-    echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2
-    echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2
-    echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2
-    exit 1
-  fi
-fi
-
-MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME")
-  [ -n "$CLASSPATH" ] &&
-    CLASSPATH=$(cygpath --path --windows "$CLASSPATH")
-  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
-    MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR")
-fi
-
-# Provide a "standardized" way to retrieve the CLI args that will
-# work with both Windows and non-Windows executions.
-MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*"
-export MAVEN_CMD_LINE_ARGS
-
-WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-
-# shellcheck disable=SC2086 # safe args
-exec "$JAVACMD" \
-  $MAVEN_OPTS \
-  $MAVEN_DEBUG_OPTS \
-  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
-  "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
-  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
Index: s-n-go-do-5ta-faza/mvnw.cmd
===================================================================
--- bus-n-go-do-5ta-faza/mvnw.cmd	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,205 +1,0 @@
-@REM ----------------------------------------------------------------------------
-@REM Licensed to the Apache Software Foundation (ASF) under one
-@REM or more contributor license agreements.  See the NOTICE file
-@REM distributed with this work for additional information
-@REM regarding copyright ownership.  The ASF licenses this file
-@REM to you under the Apache License, Version 2.0 (the
-@REM "License"); you may not use this file except in compliance
-@REM with the License.  You may obtain a copy of the License at
-@REM
-@REM    https://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM Unless required by applicable law or agreed to in writing,
-@REM software distributed under the License is distributed on an
-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@REM KIND, either express or implied.  See the License for the
-@REM specific language governing permissions and limitations
-@REM under the License.
-@REM ----------------------------------------------------------------------------
-
-@REM ----------------------------------------------------------------------------
-@REM Apache Maven Wrapper startup batch script, version 3.2.0
-@REM
-@REM Required ENV vars:
-@REM JAVA_HOME - location of a JDK home dir
-@REM
-@REM Optional ENV vars
-@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
-@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
-@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
-@REM     e.g. to debug Maven itself, use
-@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
-@REM ----------------------------------------------------------------------------
-
-@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
-@echo off
-@REM set title of command window
-title %0
-@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
-@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
-
-@REM set %HOME% to equivalent of $HOME
-if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
-
-@REM Execute a user defined script before this one
-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
-@REM check for pre script, once with legacy .bat ending and once with .cmd ending
-if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %*
-if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %*
-:skipRcPre
-
-@setlocal
-
-set ERROR_CODE=0
-
-@REM To isolate internal variables from possible post scripts, we use another setlocal
-@setlocal
-
-@REM ==== START VALIDATION ====
-if not "%JAVA_HOME%" == "" goto OkJHome
-
-echo.
-echo Error: JAVA_HOME not found in your environment. >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-:OkJHome
-if exist "%JAVA_HOME%\bin\java.exe" goto init
-
-echo.
-echo Error: JAVA_HOME is set to an invalid directory. >&2
-echo JAVA_HOME = "%JAVA_HOME%" >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-@REM ==== END VALIDATION ====
-
-:init
-
-@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
-@REM Fallback to current working directory if not found.
-
-set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
-IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
-
-set EXEC_DIR=%CD%
-set WDIR=%EXEC_DIR%
-:findBaseDir
-IF EXIST "%WDIR%"\.mvn goto baseDirFound
-cd ..
-IF "%WDIR%"=="%CD%" goto baseDirNotFound
-set WDIR=%CD%
-goto findBaseDir
-
-:baseDirFound
-set MAVEN_PROJECTBASEDIR=%WDIR%
-cd "%EXEC_DIR%"
-goto endDetectBaseDir
-
-:baseDirNotFound
-set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
-cd "%EXEC_DIR%"
-
-:endDetectBaseDir
-
-IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
-
-@setlocal EnableExtensions EnableDelayedExpansion
-for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
-@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
-
-:endReadAdditionalConfig
-
-SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
-set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
-set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-
-set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
-
-FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
-    IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B
-)
-
-@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
-@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
-if exist %WRAPPER_JAR% (
-    if "%MVNW_VERBOSE%" == "true" (
-        echo Found %WRAPPER_JAR%
-    )
-) else (
-    if not "%MVNW_REPOURL%" == "" (
-        SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
-    )
-    if "%MVNW_VERBOSE%" == "true" (
-        echo Couldn't find %WRAPPER_JAR%, downloading it ...
-        echo Downloading from: %WRAPPER_URL%
-    )
-
-    powershell -Command "&{"^
-		"$webclient = new-object System.Net.WebClient;"^
-		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
-		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
-		"}"^
-		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^
-		"}"
-    if "%MVNW_VERBOSE%" == "true" (
-        echo Finished downloading %WRAPPER_JAR%
-    )
-)
-@REM End of extension
-
-@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file
-SET WRAPPER_SHA_256_SUM=""
-FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
-    IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B
-)
-IF NOT %WRAPPER_SHA_256_SUM%=="" (
-    powershell -Command "&{"^
-       "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^
-       "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^
-       "  Write-Output 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^
-       "  Write-Output 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^
-       "  Write-Output 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^
-       "  exit 1;"^
-       "}"^
-       "}"
-    if ERRORLEVEL 1 goto error
-)
-
-@REM Provide a "standardized" way to retrieve the CLI args that will
-@REM work with both Windows and non-Windows executions.
-set MAVEN_CMD_LINE_ARGS=%*
-
-%MAVEN_JAVA_EXE% ^
-  %JVM_CONFIG_MAVEN_PROPS% ^
-  %MAVEN_OPTS% ^
-  %MAVEN_DEBUG_OPTS% ^
-  -classpath %WRAPPER_JAR% ^
-  "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
-  %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
-if ERRORLEVEL 1 goto error
-goto end
-
-:error
-set ERROR_CODE=1
-
-:end
-@endlocal & set ERROR_CODE=%ERROR_CODE%
-
-if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost
-@REM check for post script, once with legacy .bat ending and once with .cmd ending
-if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat"
-if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd"
-:skipRcPost
-
-@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
-if "%MAVEN_BATCH_PAUSE%"=="on" pause
-
-if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE%
-
-cmd /C exit /B %ERROR_CODE%
Index: s-n-go-do-5ta-faza/pom.xml
===================================================================
--- bus-n-go-do-5ta-faza/pom.xml	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,91 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.2.1</version>
-        <relativePath/> <!-- lookup parent from repository -->
-    </parent>
-    <groupId>mk.ukim.finki</groupId>
-    <artifactId>BusNGo</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>BusNGo</name>
-    <description>BusNGo</description>
-    <properties>
-        <java.version>21</java.version>
-    </properties>
-    <dependencies>
-        <dependency>
-            <groupId>com.jcraft</groupId>
-            <artifactId>jsch</artifactId>
-            <version>0.1.55</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-thymeleaf</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.thymeleaf.extras</groupId>
-            <artifactId>thymeleaf-extras-springsecurity6</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
-        </dependency>
-
-
-        <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>
-                            <groupId>org.projectlombok</groupId>
-                            <artifactId>lombok</artifactId>
-                        </exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/BusNGoApplication.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/BusNGoApplication.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,22 +1,0 @@
-package mk.ukim.finki.busngo;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-
-@SpringBootApplication
-public class BusNGoApplication {
-
-    public static void main(String[] args) {
-
-
-        SpringApplication.run(BusNGoApplication.class, args);
-    }
-    @Bean
-    PasswordEncoder passwordEncoder(){
-        return new BCryptPasswordEncoder(10);
-    }
-
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/config/CustomUsernamePasswordAuthenticationProvider.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/config/CustomUsernamePasswordAuthenticationProvider.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,46 +1,0 @@
-package mk.ukim.finki.busngo.config;
-
-import mk.ukim.finki.busngo.service.KorisnikService;
-import org.springframework.security.authentication.AuthenticationProvider;
-import org.springframework.security.authentication.BadCredentialsException;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.stereotype.Component;
-
-@Component
-public class CustomUsernamePasswordAuthenticationProvider implements AuthenticationProvider {
-
-    private final KorisnikService userService;
-    private final PasswordEncoder passwordEncoder;
-
-    public CustomUsernamePasswordAuthenticationProvider(KorisnikService userService, PasswordEncoder passwordEncoder) {
-        this.userService = userService;
-        this.passwordEncoder = passwordEncoder;
-    }
-
-    @Override
-    public Authentication authenticate(Authentication authentication) throws AuthenticationException {
-        String username = authentication.getName();
-        String password = authentication.getCredentials().toString();
-
-        if (username.isEmpty() || password.isEmpty()) {
-            throw new BadCredentialsException("Empty credentials!");
-        }
-
-        UserDetails userDetails = this.userService.loadUserByEmail(username);
-
-        if (!passwordEncoder.matches(password, userDetails.getPassword())) {
-            throw new BadCredentialsException("Password is incorrect!");
-        }
-        return new UsernamePasswordAuthenticationToken(userDetails, userDetails.getPassword(), userDetails.getAuthorities());
-    }
-
-    @Override
-    public boolean supports(Class<?> aClass) {
-        return aClass.equals(UsernamePasswordAuthenticationToken.class);
-    }
-
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/config/WebSecurityConfig.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/config/WebSecurityConfig.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,73 +1,0 @@
-package mk.ukim.finki.busngo.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
-import org.springframework.security.core.userdetails.User;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.provisioning.InMemoryUserDetailsManager;
-import org.springframework.security.web.SecurityFilterChain;
-
-
-@Configuration
-@EnableWebSecurity
-@EnableMethodSecurity
-public class WebSecurityConfig {
-
-    private final PasswordEncoder passwordEncoder;
-    private final CustomUsernamePasswordAuthenticationProvider authProvider;
-
-    public WebSecurityConfig(PasswordEncoder passwordEncoder, CustomUsernamePasswordAuthenticationProvider authProvider) {
-        this.passwordEncoder = passwordEncoder;
-        this.authProvider = authProvider;
-    }
-
-    @Bean
-    public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception  {
-
-        http
-                .csrf(AbstractHttpConfigurer::disable)
-                .authorizeHttpRequests( (requests) -> requests
-                        .requestMatchers("/", "/home", "/assets/**", "/register")
-                        .permitAll()
-                        .requestMatchers("/admin/**").hasRole("ADMIN")
-                        .anyRequest()
-                        .authenticated()
-                )
-                .formLogin((form) -> form
-                        .loginPage("/login")
-                        .permitAll()
-                        .failureUrl("/login?error=BadCredentials")
-                        .defaultSuccessUrl("/bilet", true)
-                )
-                .logout((logout) -> logout
-                        .logoutUrl("/logout")
-                        .clearAuthentication(true)
-                        .invalidateHttpSession(true)
-                        .deleteCookies("JSESSIONID")
-                        .logoutSuccessUrl("/login")
-                )
-                .exceptionHandling((ex) -> ex
-                        .accessDeniedPage("/access_denied")
-                );
-
-        return http.build();
-    }
-
-
-
-    @Bean
-    public AuthenticationManager authManager(HttpSecurity http) throws Exception {
-        AuthenticationManagerBuilder authenticationManagerBuilder =
-                http.getSharedObject(AuthenticationManagerBuilder.class);
-        authenticationManagerBuilder.authenticationProvider(authProvider);
-        return authenticationManagerBuilder.build();
-    }
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/entities/Avtobus.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/entities/Avtobus.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,24 +1,0 @@
-package mk.ukim.finki.busngo.model.entities;
-
-import jakarta.persistence.*;
-import lombok.Data;
-
-import java.util.List;
-import java.util.Objects;
-
-@Data
-@Entity
-public class Avtobus {
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Id
-    @Column(name = "a_registracija")
-    private String aRegistracija;
-    @Basic
-    @Column(name = "a_seriski_broj")
-    private String aSeriskiBroj;
-    @Basic
-    @Column(name = "a_broj_sedista")
-    private Short aBrojSedista;
-    @OneToMany(mappedBy = "avtobusByARegistracija")
-    private List<Instancanalinija> instancanalinijaList;
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/entities/Bilet.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/entities/Bilet.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,39 +1,0 @@
-package mk.ukim.finki.busngo.model.entities;
-
-import jakarta.persistence.*;
-import lombok.Data;
-import mk.ukim.finki.busngo.model.enums.BILET_STATUS;
-import org.hibernate.annotations.Type;
-
-import java.sql.Timestamp;
-import java.util.Collection;
-import java.util.List;
-import java.util.Objects;
-
-@Data
-@Entity
-public class Bilet {
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Id
-    @Column(name = "b_id")
-    private Long BId;
-
-    @Basic
-    @Column(name = "b_datum_na_kupuvanje")
-    private Timestamp bDatumNaKupuvanje;
-
-    @Basic
-    @Column(name = "b_status", columnDefinition = "string_kratok")
-    @Enumerated(EnumType.STRING)
-    private BILET_STATUS bStatus;
-
-    @ManyToOne
-    @JoinColumn(name = "patnik_k_id", referencedColumnName = "k_id")
-    private Patnik korisnikByPatnikKId;
-
-    @ManyToOne
-    @JoinColumn(name = "tb_id", referencedColumnName = "tb_id")
-    private Tipbilet tipbiletByTbId;
-//    @OneToMany(mappedBy = "biletByBId")
-//    private List<Vozenje> vozenjesByBId;
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/entities/Instancanalinija.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/entities/Instancanalinija.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,37 +1,0 @@
-package mk.ukim.finki.busngo.model.entities;
-
-import jakarta.persistence.*;
-import lombok.Data;
-
-import java.sql.Timestamp;
-import java.util.Collection;
-import java.util.List;
-import java.util.Objects;
-
-@Data
-@Entity
-public class Instancanalinija {
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Id
-    @Column(name = "inl_id")
-    private Long inlId;
-    @Basic
-    @Column(name = "inl_datum_start")
-    private Timestamp inlDatumStart;
-    @Basic
-    @Column(name = "inl_datum_end")
-    private Timestamp inlDatumEnd;
-    @ManyToOne
-    @JoinColumn(name = "vozac_k_id", referencedColumnName = "k_id", nullable = false)
-    private Vozac korisnikByVozacKId;
-    @ManyToOne
-    @JoinColumn(name = "a_registracija", referencedColumnName = "a_registracija")
-    private Avtobus avtobusByARegistracija;
-    @ManyToOne
-    @JoinColumn(name = "li_id", referencedColumnName = "li_id", nullable = false)
-    private Linija linijaByLiId;
-    @OneToMany(mappedBy = "instancanalinijaByInlId")
-    private List<Kontroli> kontrolisByInlId;
-    @OneToMany(mappedBy = "instancanalinijaByInlId")
-    private List<Vozenje> vozenjesByInlId;
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/entities/Kazna.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/entities/Kazna.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,51 +1,0 @@
-package mk.ukim.finki.busngo.model.entities;
-
-import jakarta.persistence.*;
-import lombok.Data;
-
-import java.sql.Timestamp;
-import java.util.Objects;
-
-@Data
-@Entity
-@Inheritance(strategy = InheritanceType.JOINED)
-public class Kazna {
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Id
-    @Column(name = "kz_id")
-    private Long kzId;
-
-    @Basic
-    @Column(name = "kz_iznos")
-    private Double kzIznos;
-
-    @Basic
-    @Column(name = "kz_plateno")
-    private Boolean kzPlateno;
-
-    @Basic
-    @Column(name = "kz_datum")
-    private Timestamp kzDatum;
-
-    @Basic
-    @Column(name = "kz_datum_plateno")
-    private Timestamp kzDatumPlateno;
-
-    @Basic
-    @Column(name = "kz_dokument")
-    private String kzDokument;
-
-    @ManyToOne
-    @JoinColumn(name = "kondukter_k_id", referencedColumnName = "k_id")
-    private Kondukter korisnikByKondukterKId;
-
-    @ManyToOne
-    @JoinColumn(name = "kontrola_id", referencedColumnName = "kontrola_id")
-    private Kontroli kontroliByKontrolaId;
-
-//    @OneToOne(mappedBy = "kaznaByKzId")
-//    private Kaznazaneregistriran kaznazaneregistriranByKzId;
-//
-//    @OneToOne(mappedBy = "kaznaByKzId")
-//    private Kaznazaregistriran kaznazaregistriranByKzId;
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/entities/Kaznazaneregistriran.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/entities/Kaznazaneregistriran.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,22 +1,0 @@
-package mk.ukim.finki.busngo.model.entities;
-
-import jakarta.persistence.*;
-import lombok.Data;
-
-import java.util.Objects;
-
-@Data
-@Entity
-public class Kaznazaneregistriran extends Kazna {
-    @Basic
-    @Column(name = "kzn_telefon")
-    private String kznTelefon;
-
-    @Basic
-    @Column(name = "kzn_ime")
-    private String kznIme;
-
-    @Basic
-    @Column(name = "kzn_adresa")
-    private String kznAdresa;
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/entities/Kaznazaregistriran.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/entities/Kaznazaregistriran.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,14 +1,0 @@
-package mk.ukim.finki.busngo.model.entities;
-
-import jakarta.persistence.*;
-import lombok.Data;
-
-import java.util.Objects;
-
-@Data
-@Entity
-public class Kaznazaregistriran extends Kazna{
-    @ManyToOne
-    @JoinColumn(name = "patnik_k_id", referencedColumnName = "k_id")
-    private Patnik korisnikByPatnikKId;
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/entities/Kondukter.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/entities/Kondukter.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,19 +1,0 @@
-package mk.ukim.finki.busngo.model.entities;
-
-import jakarta.persistence.*;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.List;
-import java.util.Objects;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
-@Entity
-public class Kondukter extends Vraboten{
-    @OneToMany(mappedBy = "korisnikByKondukterKId")
-    private List<Kazna> kaznasByKId;
-    @OneToMany(mappedBy = "korisnikByKondukterKId")
-    private List<Kontroli> kontrolisByKId;
-
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/entities/Kontroli.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/entities/Kontroli.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,30 +1,0 @@
-package mk.ukim.finki.busngo.model.entities;
-
-import jakarta.persistence.*;
-import lombok.Data;
-
-import java.sql.Timestamp;
-import java.util.Collection;
-import java.util.List;
-import java.util.Objects;
-
-@Data
-@Entity
-public class Kontroli {
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Id
-    @Column(name = "kontrola_id")
-    private Long kontrolaId;
-    @Basic
-    @Column(name = "kontrola_datum")
-    private Timestamp kontrolaDatum;
-    @OneToMany(mappedBy = "kontroliByKontrolaId")
-    private List<Kazna> kaznasByKontrolaId;
-    @ManyToOne
-    @JoinColumn(name = "kondukter_k_id", referencedColumnName = "k_id")
-    private Kondukter korisnikByKondukterKId;
-    @ManyToOne
-    @JoinColumn(name = "inl_id", referencedColumnName = "inl_id")
-    private Instancanalinija instancanalinijaByInlId;
-
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/entities/Korisnik.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/entities/Korisnik.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,119 +1,0 @@
-package mk.ukim.finki.busngo.model.entities;
-
-import jakarta.persistence.*;
-import lombok.Data;
-import mk.ukim.finki.busngo.model.enums.Role;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-
-@Data
-@Entity
-@Inheritance(strategy = InheritanceType.JOINED)
-public class Korisnik implements UserDetails {
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Id
-    @Column(name = "k_id")
-    private Long kId;
-
-    @Basic
-    @Column(name = "k_ime")
-    private String kIme;
-
-    @Basic
-    @Column(name = "k_adresa")
-    private String kAdresa;
-
-    @Basic
-    @Column(name = "k_telefon")
-    private String kTelefon;
-
-    @Basic
-    @Column(name = "k_email")
-    private String kEmail;
-
-    @Basic
-    @Column(name = "k_embg")
-    private String kEmbg;
-
-    @Basic
-    @Column(name = "k_is_admin")
-    private Boolean kIsAdmin;
-
-    @Basic
-    @Column(name = "k_lozinka")
-    private String kLozinka;
-
-    @Basic
-    @Column(name = "k_role")
-    @Enumerated(EnumType.STRING)
-    private Role kRole;
-
-//    @OneToMany(mappedBy = "korisnikByPatnikKId")
-//    private List<Bilet> biletsByKId;
-//    private boolean isAccountNonExpired = true;
-//    private boolean isAccountNonLocked = true;
-//    private boolean isCredentialsNonExpired =  true;
-//    private boolean isEnabled = true;
-
-
-    @Override
-    public Collection<? extends GrantedAuthority> getAuthorities() {
-        return Collections.singletonList(kRole);
-    }
-
-    @Override
-    public String getPassword() {
-        return kLozinka;
-    }
-
-    @Override
-    public String getUsername() {
-        return kEmail;
-    }
-
-    @Override
-    public boolean isAccountNonExpired() {
-        return true;
-    }
-
-    @Override
-    public boolean isAccountNonLocked() {
-        return true;
-    }
-
-    @Override
-    public boolean isCredentialsNonExpired() {
-        return true;
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return true;
-    }
-
-
-//    @OneToMany(mappedBy = "korisnikByVozacKId")
-//    private List<Instancanalinija> instancanalinijasByKId;
-//    @OneToMany(mappedBy = "korisnikByKondukterKId")
-//    private List<Kazna> kaznasByKId;
-//    @OneToMany(mappedBy = "korisnikByPatnikKId")
-//    private List<Kaznazaregistriran> kaznazaregistriransByKId;
-//    @OneToOne(mappedBy = "korisnikByKId")
-//    private Kondukter kondukterByKId;
-//    @OneToMany(mappedBy = "korisnikByKondukterKId")
-//    private List<Kontroli> kontrolisByKId;
-//    @OneToOne(mappedBy = "korisnikByKId")
-//    private Patnik patnikByKId;
-//    @OneToOne(mappedBy = "korisnikByKId")
-//    private Vozac vozacByKId;
-//    @OneToMany(mappedBy = "korisnikByPatnikKId")
-//    private List<Vozenje> vozenjesByKId;
-//    @OneToOne(mappedBy = "korisnikByKId")
-//    private Vraboten vrabotenByKId;
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/entities/Linija.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/entities/Linija.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,29 +1,0 @@
-package mk.ukim.finki.busngo.model.entities;
-
-import jakarta.persistence.*;
-import lombok.Data;
-
-import java.lang.invoke.CallSite;
-import java.util.Collection;
-import java.util.List;
-import java.util.Objects;
-
-@Data
-@Entity
-public class Linija {
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Id
-    @Column(name = "li_id")
-    private Integer liId;
-    @Basic
-    @Column(name = "li_ime")
-    private String liIme;
-    @Basic
-    @Column(name = "li_pravec")
-    private String liPravec;
-    @OneToMany(mappedBy = "linijaByLiId")
-    private List<Instancanalinija> instancanalinijasByLiId;
-    @OneToMany(mappedBy = "linijaByLiId")
-    private List<Postojkanalinija> postojkanalinijasByLiId;
-
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/entities/Mesto.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/entities/Mesto.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,28 +1,0 @@
-package mk.ukim.finki.busngo.model.entities;
-
-import jakarta.persistence.*;
-import lombok.Data;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Objects;
-
-@Data
-@Entity
-public class Mesto {
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Id
-    @Column(name = "m_id")
-    private Integer mId;
-    @Basic
-    @Column(name = "m_grad")
-    private String mGrad;
-    @Basic
-    @Column(name = "m_opstina")
-    private String mOpstina;
-    @Basic
-    @Column(name = "m_ulica")
-    private String mUlica;
-    @OneToMany(mappedBy = "mestoByMId")
-    private List<Postojka> postojkasByMId;
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/entities/Patnik.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/entities/Patnik.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,22 +1,0 @@
-package mk.ukim.finki.busngo.model.entities;
-
-import jakarta.persistence.*;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.List;
-import java.util.Objects;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
-@Entity
-public class Patnik extends Korisnik {
-    @OneToMany(mappedBy = "korisnikByPatnikKId")
-    private List<Bilet> biletsByKId;
-
-    @OneToMany(mappedBy = "korisnikByPatnikKId")
-    private List<Kaznazaregistriran> kaznazaregistriransByKId;
-
-    @OneToMany(mappedBy = "korisnikByPatnikKId")
-    private List<Vozenje> vozenjesByKId;
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/entities/Postojka.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/entities/Postojka.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,26 +1,0 @@
-package mk.ukim.finki.busngo.model.entities;
-
-import jakarta.persistence.*;
-import lombok.Data;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Objects;
-
-@Data
-@Entity
-public class Postojka {
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Id
-    @Column(name = "p_id")
-    private Integer pId;
-    @Basic
-    @Column(name = "p_ime")
-    private String pIme;
-    @ManyToOne
-    @JoinColumn(name = "m_id", referencedColumnName = "m_id")
-    private Mesto mestoByMId;
-    @OneToMany(mappedBy = "postojkaByPId")
-    private List<Postojkanalinija> postojkanalinijasByPId;
-
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/entities/Postojkanalinija.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/entities/Postojkanalinija.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,28 +1,0 @@
-package mk.ukim.finki.busngo.model.entities;
-
-import jakarta.persistence.*;
-import lombok.Data;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Objects;
-
-@Data
-@Entity
-public class Postojkanalinija {
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Id
-    @Column(name = "pnl_id")
-    private Long pnlId;
-    @Basic
-    @Column(name = "pnl_reden_broj")
-    private Short pnlRedenBroj;
-    @ManyToOne
-    @JoinColumn(name = "li_id", referencedColumnName = "li_id", nullable = false)
-    private Linija linijaByLiId;
-    @ManyToOne
-    @JoinColumn(name = "p_id", referencedColumnName = "p_id", nullable = false)
-    private Postojka postojkaByPId;
-    @OneToMany(mappedBy = "postojkanalinijaByKacuvaPnlId")
-    private List<Vozenje> vozenjesByPnlId;
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/entities/SeSimnuvaNa.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/entities/SeSimnuvaNa.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,17 +1,0 @@
-package mk.ukim.finki.busngo.model.entities;
-
-import jakarta.persistence.*;
-import lombok.Data;
-
-import java.util.Objects;
-
-@Data
-@Entity
-//@jakarta.persistence.Table(name = "se_simnuva_na", schema = "project", catalog = "db_202324z_va_prj_busngo")
-//@jakarta.persistence.IdClass(mk.ukim.finki.busngo.model.entities.SeSimnuvaNaPK.class)
-public class SeSimnuvaNa {
-    @EmbeddedId
-    private SeSimnuvaNaPK id;
-
-
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/entities/SeSimnuvaNaPK.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/entities/SeSimnuvaNaPK.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,13 +1,0 @@
-package mk.ukim.finki.busngo.model.entities;
-
-import jakarta.persistence.Embeddable;
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-@Embeddable
-public class SeSimnuvaNaPK implements Serializable {
-    private Long vozenjeId;
-    private Long pnlId;
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/entities/Tipbilet.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/entities/Tipbilet.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,30 +1,0 @@
-package mk.ukim.finki.busngo.model.entities;
-
-import jakarta.persistence.*;
-import lombok.Data;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Objects;
-
-@Data
-@Entity
-public class Tipbilet {
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Id
-    @Column(name = "tb_id", columnDefinition = "serial")
-    private Long tbId;
-    @Basic
-    @Column(name = "tb_trajnost")
-    private Long tbTrajnost;
-    @Basic
-    @Column(name = "tb_cena")
-    private Float tbCena;
-    @Basic
-    @Column(name = "tb_ime")
-    private String tbIme;
-    @OneToMany(mappedBy = "tipbiletByTbId")
-    private List<Bilet> biletsByTbId;
-
-
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/entities/Vozac.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/entities/Vozac.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,17 +1,0 @@
-package mk.ukim.finki.busngo.model.entities;
-
-import jakarta.persistence.*;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.List;
-import java.util.Objects;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
-@Entity
-public class Vozac extends Vraboten {
-    @OneToMany(mappedBy = "korisnikByVozacKId")
-    private List<Instancanalinija> instancanalinijasByKId;
-
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/entities/Vozenje.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/entities/Vozenje.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,40 +1,0 @@
-package mk.ukim.finki.busngo.model.entities;
-
-import jakarta.persistence.*;
-import lombok.Data;
-import mk.ukim.finki.busngo.model.enums.VOZENJE_STATUS;
-
-import java.sql.Timestamp;
-import java.util.Objects;
-
-@Data
-@Entity
-public class Vozenje {
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Id
-    @Column(name = "vozenje_id")
-    private Long vozenjeId;
-    @Basic
-    @Column(name = "vozenje_start")
-    private Timestamp vozenjeStart;
-    @Basic
-    @Column(name = "vozenje_end")
-    private Timestamp vozenjeEnd;
-    @Basic
-    @Column(name = "vozenje_status")
-    @Enumerated(EnumType.STRING)
-    private VOZENJE_STATUS vozenjeStatus;
-    @ManyToOne
-    @JoinColumn(name = "patnik_k_id", referencedColumnName = "k_id")
-    private Patnik korisnikByPatnikKId;
-    @ManyToOne
-    @JoinColumn(name = "kacuva_pnl_id", referencedColumnName = "pnl_id", nullable = false)
-    private Postojkanalinija postojkanalinijaByKacuvaPnlId;
-    @ManyToOne
-    @JoinColumn(name = "inl_id", referencedColumnName = "inl_id", nullable = false)
-    private Instancanalinija instancanalinijaByInlId;
-    @ManyToOne
-    @JoinColumn(name = "b_id", referencedColumnName = "b_id", nullable = false)
-    private Bilet biletByBId;
-
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/entities/Vraboten.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/entities/Vraboten.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,27 +1,0 @@
-package mk.ukim.finki.busngo.model.entities;
-
-import jakarta.persistence.*;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-
-import java.sql.Date;
-import java.util.Objects;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
-@Entity
-public class Vraboten extends Korisnik {
-    @Basic
-    @Column(name = "v_plata")
-    private Double vPlata;
-
-    @Basic
-    @Column(name = "v_datum_na_vrabotuvanje")
-    private Date vDatumNaVrabotuvanje;
-
-    @Basic
-    @Column(name = "v_datum_prekin_vrabotuvanje")
-    private Date vDatumPrekinVrabotuvanje;
-
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/enums/BILET_STATUS.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/enums/BILET_STATUS.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,7 +1,0 @@
-package mk.ukim.finki.busngo.model.enums;
-
-public enum BILET_STATUS {
-    INACTIVE,
-    ACTIVE,
-    EXPIRED
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/enums/Role.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/enums/Role.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,18 +1,0 @@
-package mk.ukim.finki.busngo.model.enums;
-
-
-import org.springframework.security.core.GrantedAuthority;
-
-public enum Role implements GrantedAuthority {
-    ROLE_USER,
-    ROLE_PASSENGER,
-    ROLE_DRIVER,
-    ROLE_CONDUCTOR,
-    ROLE_ADMIN;
-
-
-    @Override
-    public String getAuthority() {
-        return name();
-    }
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/enums/VOZENJE_STATUS.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/enums/VOZENJE_STATUS.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,6 +1,0 @@
-package mk.ukim.finki.busngo.model.enums;
-
-public enum VOZENJE_STATUS {
-    ACTIVE,
-    FINISHED
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/enums/VrabotenType.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/enums/VrabotenType.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,7 +1,0 @@
-package mk.ukim.finki.busngo.model.enums;
-
-public enum VrabotenType {
-    KONDUKTER,
-    VOZAC,
-    ADMIN
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/exceptions/InvalidAvtobusRegistracijaException.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/exceptions/InvalidAvtobusRegistracijaException.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,7 +1,0 @@
-package mk.ukim.finki.busngo.model.exceptions;
-
-public class InvalidAvtobusRegistracijaException extends RuntimeException{
-    public InvalidAvtobusRegistracijaException() {
-        super("Invalid avtobus registracija!");
-    }
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/exceptions/InvalidBiletIdException.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/exceptions/InvalidBiletIdException.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,7 +1,0 @@
-package mk.ukim.finki.busngo.model.exceptions;
-
-public class InvalidBiletIdException extends RuntimeException{
-    public InvalidBiletIdException() {
-        super("Invalid bilet id!");
-    }
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/exceptions/InvalidCredentialsException.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/exceptions/InvalidCredentialsException.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,7 +1,0 @@
-package mk.ukim.finki.busngo.model.exceptions;
-
-public class InvalidCredentialsException extends RuntimeException{
-    public InvalidCredentialsException() {
-        super("The credentials entered are invalid!");
-    }
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/exceptions/InvalidInstancaNaLinijaIdException.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/exceptions/InvalidInstancaNaLinijaIdException.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,7 +1,0 @@
-package mk.ukim.finki.busngo.model.exceptions;
-
-public class InvalidInstancaNaLinijaIdException extends RuntimeException{
-    public InvalidInstancaNaLinijaIdException() {
-        super("Invalid instanca na linija id!");
-    }
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/exceptions/InvalidLinijaIdException.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/exceptions/InvalidLinijaIdException.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,7 +1,0 @@
-package mk.ukim.finki.busngo.model.exceptions;
-
-public class InvalidLinijaIdException extends RuntimeException{
-    public InvalidLinijaIdException() {
-        super("Invalid linija id!");
-    }
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/exceptions/InvalidPatnikIdException.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/exceptions/InvalidPatnikIdException.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,7 +1,0 @@
-package mk.ukim.finki.busngo.model.exceptions;
-
-public class InvalidPatnikIdException extends RuntimeException{
-    public InvalidPatnikIdException() {
-        super("The given patnik id does not exist!");
-    }
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/exceptions/InvalidPostojkaNaLinijaIdException.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/exceptions/InvalidPostojkaNaLinijaIdException.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,7 +1,0 @@
-package mk.ukim.finki.busngo.model.exceptions;
-
-public class InvalidPostojkaNaLinijaIdException extends RuntimeException {
-    public InvalidPostojkaNaLinijaIdException() {
-        super("Invalid postoja na linija id!");
-    }
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/exceptions/InvalidTipBiletIdException.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/exceptions/InvalidTipBiletIdException.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,7 +1,0 @@
-package mk.ukim.finki.busngo.model.exceptions;
-
-public class InvalidTipBiletIdException extends RuntimeException{
-    public InvalidTipBiletIdException() {
-        super("Invalid tipbilet id!");
-    }
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/exceptions/InvalidUserId.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/exceptions/InvalidUserId.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,7 +1,0 @@
-package mk.ukim.finki.busngo.model.exceptions;
-
-public class InvalidUserId extends RuntimeException{
-    public InvalidUserId() {
-        super("The iven user id does not exist!");
-    }
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/exceptions/InvalidVozacIdException.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/exceptions/InvalidVozacIdException.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,7 +1,0 @@
-package mk.ukim.finki.busngo.model.exceptions;
-
-public class InvalidVozacIdException extends RuntimeException{
-    public InvalidVozacIdException() {
-        super("Invalid vozac id!");
-    }
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/exceptions/InvalidVozenjeIdException.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/exceptions/InvalidVozenjeIdException.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,7 +1,0 @@
-package mk.ukim.finki.busngo.model.exceptions;
-
-public class InvalidVozenjeIdException extends RuntimeException{
-    public InvalidVozenjeIdException() {
-        super("Inavlid vozenje id!");
-    }
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/exceptions/UnauthorizedAccess.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/exceptions/UnauthorizedAccess.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,7 +1,0 @@
-package mk.ukim.finki.busngo.model.exceptions;
-
-public class UnauthorizedAccess extends RuntimeException {
-    public UnauthorizedAccess(String message) {
-        super(message);
-    }
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/exceptions/UserAlreadyExistsException.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/exceptions/UserAlreadyExistsException.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,7 +1,0 @@
-package mk.ukim.finki.busngo.model.exceptions;
-
-public class UserAlreadyExistsException extends RuntimeException{
-    public UserAlreadyExistsException(String message) {
-        super(message);
-    }
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/exceptions/UserShouldNotBeTicketedException.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/model/exceptions/UserShouldNotBeTicketedException.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,7 +1,0 @@
-package mk.ukim.finki.busngo.model.exceptions;
-
-public class UserShouldNotBeTicketedException extends RuntimeException{
-    public UserShouldNotBeTicketedException(String message) {
-        super(message);
-    }
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/repository/AvtobusRepository.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/repository/AvtobusRepository.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,12 +1,0 @@
-package mk.ukim.finki.busngo.repository;
-
-import mk.ukim.finki.busngo.model.entities.Avtobus;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-
-import java.util.Optional;
-
-public interface AvtobusRepository extends JpaRepository<Avtobus, Long> {
-    @Query("select a from Avtobus a where a.aRegistracija = ?1")
-    Optional<Avtobus> findByARegistracija(String registracija);
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/repository/BiletRepository.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/repository/BiletRepository.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,18 +1,0 @@
-package mk.ukim.finki.busngo.repository;
-
-import mk.ukim.finki.busngo.model.entities.Bilet;
-import mk.ukim.finki.busngo.model.entities.Korisnik;
-import mk.ukim.finki.busngo.model.entities.Patnik;
-import mk.ukim.finki.busngo.model.enums.BILET_STATUS;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-import java.util.List;
-import java.util.Optional;
-
-
-public interface BiletRepository extends JpaRepository<Bilet, Long> {
-//    List<Bilet> findAllByKorisnikByPatnikKIdAndBStatus(Korisnik korisnik, BILET_STATUS status);
-//    List<Bilet> findAllByKorisnikByPatnikKId(Korisnik korisnik);
-    Optional<Bilet> findByBIdAndAndKorisnikByPatnikKId(Long bid, Patnik patnik);
-//    List<Bilet> findAllByKorisnikByPatnikKIdAndBStatus(Patnik patnik, BILET_STATUS status);
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/repository/InstancaNaLinijaRepository.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/repository/InstancaNaLinijaRepository.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,13 +1,0 @@
-package mk.ukim.finki.busngo.repository;
-
-import mk.ukim.finki.busngo.model.entities.Instancanalinija;
-import mk.ukim.finki.busngo.model.entities.Linija;
-import mk.ukim.finki.busngo.service.LinijaService;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-import java.util.List;
-
-public interface InstancaNaLinijaRepository extends JpaRepository<Instancanalinija, Long> {
-    List<Instancanalinija> findAllByLinijaByLiIdAndInlDatumEndIsNull(Linija linija);
-    List<Instancanalinija> findAllByInlDatumEndIsNull();
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/repository/KaznaRepository.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/repository/KaznaRepository.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,13 +1,0 @@
-package mk.ukim.finki.busngo.repository;
-
-import mk.ukim.finki.busngo.model.entities.Kazna;
-import mk.ukim.finki.busngo.model.entities.Kontroli;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.repository.NoRepositoryBean;
-
-import java.util.List;
-
-
-public interface KaznaRepository extends JpaRepository<Kazna, Long> {
-    List<Kazna> findAllByKontroliByKontrolaId(Kontroli kontroli);
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/repository/KaznaZaNeregistriranRepository.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/repository/KaznaZaNeregistriranRepository.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,7 +1,0 @@
-package mk.ukim.finki.busngo.repository;
-
-import mk.ukim.finki.busngo.model.entities.Kaznazaneregistriran;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-public interface KaznaZaNeregistriranRepository extends JpaRepository<Kaznazaneregistriran, Long> {
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/repository/KaznaZaRegistriranRepository.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/repository/KaznaZaRegistriranRepository.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,11 +1,0 @@
-package mk.ukim.finki.busngo.repository;
-
-import mk.ukim.finki.busngo.model.entities.Kaznazaregistriran;
-import mk.ukim.finki.busngo.model.entities.Patnik;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-import java.util.List;
-
-public interface KaznaZaRegistriranRepository extends JpaRepository<Kaznazaregistriran, Long> {
-    List<Kaznazaregistriran> findAllByKorisnikByPatnikKId(Patnik patnik);
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/repository/KondukterRepository.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/repository/KondukterRepository.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,13 +1,0 @@
-package mk.ukim.finki.busngo.repository;
-
-import mk.ukim.finki.busngo.model.entities.Kondukter;
-import mk.ukim.finki.busngo.model.entities.Patnik;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-
-import java.util.Optional;
-
-public interface KondukterRepository extends JpaRepository<Kondukter, Long> {
-    @Query("SELECT p from Kondukter p where p.kEmail = ?1")
-    Optional<Kondukter> findByKEmail(String email);
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/repository/KontrolaRepository.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/repository/KontrolaRepository.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,11 +1,0 @@
-package mk.ukim.finki.busngo.repository;
-
-import mk.ukim.finki.busngo.model.entities.Instancanalinija;
-import mk.ukim.finki.busngo.model.entities.Kontroli;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-import java.util.List;
-
-public interface KontrolaRepository extends JpaRepository<Kontroli, Long> {
-    List<Kontroli> findAllByInstancanalinijaByInlId(Instancanalinija inl);
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/repository/KorisnikRepository.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/repository/KorisnikRepository.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,17 +1,0 @@
-package mk.ukim.finki.busngo.repository;
-
-import mk.ukim.finki.busngo.model.entities.Korisnik;
-import org.aspectj.apache.bcel.classfile.Module;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.NoRepositoryBean;
-
-import java.util.Optional;
-
-
-public interface KorisnikRepository extends JpaRepository<Korisnik, Long> {
-    @Query("SELECT k FROM Korisnik k WHERE k.kEmail = ?1 and k.kLozinka = ?2")
-    Optional<Korisnik> findByKEmailAndKLozinka(String kEmail, String kLozinka);
-    @Query("SELECT k FROM Korisnik k WHERE k.kEmail = ?1")
-    Optional<Korisnik> findByKEmail(String kEmail);
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/repository/LinijaRepository.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/repository/LinijaRepository.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,7 +1,0 @@
-package mk.ukim.finki.busngo.repository;
-
-import mk.ukim.finki.busngo.model.entities.Linija;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-public interface LinijaRepository extends JpaRepository<Linija, Long> {
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/repository/PatnikRepository.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/repository/PatnikRepository.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,14 +1,0 @@
-package mk.ukim.finki.busngo.repository;
-
-import mk.ukim.finki.busngo.model.entities.Patnik;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-import java.util.Optional;
-
-public interface PatnikRepository extends JpaRepository<Patnik, Long> {
-    @Query("SELECT p from Patnik p where p.kEmail = ?1")
-    Optional<Patnik> findByKEmail(String email);
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/repository/PostojkaNaLinijaRepository.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/repository/PostojkaNaLinijaRepository.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,14 +1,0 @@
-package mk.ukim.finki.busngo.repository;
-
-import mk.ukim.finki.busngo.model.entities.Linija;
-import mk.ukim.finki.busngo.model.entities.Postojkanalinija;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.query.Jpa21Utils;
-
-import java.util.List;
-import java.util.Optional;
-
-public interface PostojkaNaLinijaRepository extends JpaRepository<Postojkanalinija, Long> {
-    List<Postojkanalinija> findAllByLinijaByLiId(Linija linija);
-    List<Postojkanalinija> findAllByLinijaByLiIdAndPnlRedenBrojGreaterThan(Linija linija, Short redenBroj);
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/repository/TipBIletRepository.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/repository/TipBIletRepository.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,8 +1,0 @@
-package mk.ukim.finki.busngo.repository;
-
-import mk.ukim.finki.busngo.model.entities.Tipbilet;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-public interface TipBIletRepository extends JpaRepository<Tipbilet, Long> {
-
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/repository/VozacRepository.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/repository/VozacRepository.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,14 +1,0 @@
-package mk.ukim.finki.busngo.repository;
-
-import mk.ukim.finki.busngo.model.entities.Patnik;
-import mk.ukim.finki.busngo.model.entities.Vozac;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-
-import java.util.Optional;
-
-public interface VozacRepository extends JpaRepository<Vozac, Long> {
-
-    @Query("SELECT v from Vozac v where v.kEmail = ?1")
-    Optional<Vozac> findByKEmail(String email);
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/repository/VozenjeRepository.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/repository/VozenjeRepository.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,13 +1,0 @@
-package mk.ukim.finki.busngo.repository;
-
-import mk.ukim.finki.busngo.model.entities.Patnik;
-import mk.ukim.finki.busngo.model.entities.Vozenje;
-import mk.ukim.finki.busngo.model.enums.VOZENJE_STATUS;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-import java.util.List;
-
-public interface VozenjeRepository extends JpaRepository<Vozenje, Long> {
-    List<Vozenje> findAllByKorisnikByPatnikKId(Patnik patnik);
-    List<Vozenje> findAllByKorisnikByPatnikKIdAndAndVozenjeStatus(Patnik patnik, VOZENJE_STATUS vozenjeStatus);
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/repository/VrabotrenRepository.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/repository/VrabotrenRepository.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,8 +1,0 @@
-package mk.ukim.finki.busngo.repository;
-
-import mk.ukim.finki.busngo.model.entities.Vraboten;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-public interface VrabotrenRepository extends JpaRepository<Vraboten, Long> {
-
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/AuthService.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/AuthService.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,13 +1,0 @@
-package mk.ukim.finki.busngo.service;
-
-import mk.ukim.finki.busngo.model.entities.Korisnik;
-import mk.ukim.finki.busngo.model.enums.Role;
-import mk.ukim.finki.busngo.model.enums.VrabotenType;
-
-public interface AuthService {
-    Korisnik login(String email, String password);
-    Korisnik registerPatnik(String ime, String email, String password, String confirmPassword, String address, String telefon);
-    Korisnik registerVraboten(String ime, String email, String password, String confirmPassword, String address, String telefon, VrabotenType type, Double salary);
-
-    Korisnik register(String name, String email, String password, String confirmPassword, String address, String phone, Role role, Double salary);
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/AvtobusService.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/AvtobusService.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,12 +1,0 @@
-package mk.ukim.finki.busngo.service;
-
-import mk.ukim.finki.busngo.model.entities.Avtobus;
-import mk.ukim.finki.busngo.repository.AvtobusRepository;
-
-import java.util.List;
-
-public interface AvtobusService {
-    List<Avtobus> findAll();
-
-    Avtobus findById(String aRegistracija);
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/BiletService.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/BiletService.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,27 +1,0 @@
-package mk.ukim.finki.busngo.service;
-
-import mk.ukim.finki.busngo.model.entities.Bilet;
-import mk.ukim.finki.busngo.model.entities.Patnik;
-import mk.ukim.finki.busngo.model.enums.BILET_STATUS;
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-public interface BiletService {
-    List<Bilet> listAll();
-    List<Bilet> findAllByPatnikId(Long id);
-    List<Bilet> findAllByPatnikIdAndStatus(Long id, BILET_STATUS status);
-
-    Bilet buy(Long tipbilet, LocalDateTime now, BILET_STATUS biletStatus, String name);
-
-    List<Bilet> findAllByPatnikEmail(String email);
-//    List<Bilet> findAllByPatnikEmailACTIVE(String email);
-    Bilet findBybIdAndPatnikEmail(Long bId, String email);
-
-    Bilet activate(Long bId);
-    Bilet findById(Long bId);
-    Bilet finish(Long bId);
-
-    boolean checkExpiration(Long bId);
-//    void encode();
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/InstancaNaLinijaService.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/InstancaNaLinijaService.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,17 +1,0 @@
-package mk.ukim.finki.busngo.service;
-
-import mk.ukim.finki.busngo.model.entities.Instancanalinija;
-
-import javax.swing.event.ListDataEvent;
-import java.time.LocalDateTime;
-import java.util.List;
-
-public interface InstancaNaLinijaService {
-    List<Instancanalinija> findAll();
-    Instancanalinija findById(Long inlId);
-    Instancanalinija start(Long liId, String a_registracija, String email);
-    Instancanalinija end(Long inlId, String email);
-    List<Instancanalinija> findAllActive();
-
-    List<Instancanalinija> findByPnlId(Long pnlId);
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/KaznaService.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/KaznaService.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,12 +1,0 @@
-package mk.ukim.finki.busngo.service;
-
-import mk.ukim.finki.busngo.model.entities.Kazna;
-
-import java.util.List;
-
-public interface KaznaService {
-    List<Kazna> findAll();
-    List<Kazna> findAllByKontrolaId(Long kontrolaId);
-    Kazna pay(Long kaznaId);
-    Kazna findById(Long id);
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/KaznaZaNeregistriranService.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/KaznaZaNeregistriranService.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,20 +1,0 @@
-package mk.ukim.finki.busngo.service;
-
-import mk.ukim.finki.busngo.model.entities.Kaznazaneregistriran;
-import mk.ukim.finki.busngo.model.entities.Kaznazaregistriran;
-import org.springframework.security.core.Authentication;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.util.List;
-
-public interface KaznaZaNeregistriranService {
-    List<Kaznazaneregistriran> findAll();
-    Kaznazaneregistriran findById(Long id);
-    Kaznazaneregistriran create(Long kontrolaId,
-                                 String dokument,
-                                Double iznos,
-                                 String telefon,
-                                 String ime,
-                                 String adresa,
-                                String email);
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/KaznaZaRegistriranService.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/KaznaZaRegistriranService.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,15 +1,0 @@
-package mk.ukim.finki.busngo.service;
-
-import mk.ukim.finki.busngo.model.entities.Kazna;
-import mk.ukim.finki.busngo.model.entities.Kaznazaregistriran;
-import mk.ukim.finki.busngo.model.exceptions.UserShouldNotBeTicketedException;
-
-import java.util.List;
-
-public interface KaznaZaRegistriranService {
-    List<Kaznazaregistriran> findAllByPatnik(String email);
-
-    Kaznazaregistriran create(Long kontrolaId, String dokument, Double iznos, Long patnik, String email) throws UserShouldNotBeTicketedException;
-    Kaznazaregistriran pay(Long kaznaId);
-    Kaznazaregistriran findById(Long id);
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/KondukterService.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/KondukterService.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,10 +1,0 @@
-package mk.ukim.finki.busngo.service;
-
-import mk.ukim.finki.busngo.model.entities.Kondukter;
-
-import java.util.List;
-
-public interface KondukterService {
-    List<Kondukter> findAll();
-    Kondukter findByEmail(String email);
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/KontrolaService.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/KontrolaService.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,14 +1,0 @@
-package mk.ukim.finki.busngo.service;
-
-import mk.ukim.finki.busngo.model.entities.Kontroli;
-
-import java.util.List;
-
-public interface KontrolaService {
-    List<Kontroli> findAll();
-    Kontroli create(Long inlId, String email);
-
-    Kontroli findById(Long kontrolaId);
-
-    List<Kontroli> findAllByInl(Long inlId);
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/KorisnikService.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/KorisnikService.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,14 +1,0 @@
-package mk.ukim.finki.busngo.service;
-
-import mk.ukim.finki.busngo.model.entities.Korisnik;
-import mk.ukim.finki.busngo.model.enums.Role;
-
-
-import java.util.List;
-
-public interface KorisnikService {
-    List<Korisnik> listAll();
-    Korisnik findById(Long id);
-    Korisnik loadUserByEmail(String email);
-
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/LinijaService.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/LinijaService.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,11 +1,0 @@
-package mk.ukim.finki.busngo.service;
-
-import mk.ukim.finki.busngo.model.entities.Linija;
-
-import java.util.List;
-
-public interface LinijaService {
-    List<Linija> findAll();
-
-    Linija findById(Long liId);
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/PatnikService.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/PatnikService.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,16 +1,0 @@
-package mk.ukim.finki.busngo.service;
-
-import mk.ukim.finki.busngo.model.entities.Bilet;
-import mk.ukim.finki.busngo.model.entities.Korisnik;
-import mk.ukim.finki.busngo.model.entities.Patnik;
-
-import java.util.List;
-
-public interface PatnikService {
-    List<Patnik> listAll();
-    Patnik findById(Long id);
-    Patnik loadUserByEmail(String email);
-
-    Patnik save(Korisnik korisnik);
-
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/PostojkaNaLinijaService.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/PostojkaNaLinijaService.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,12 +1,0 @@
-package mk.ukim.finki.busngo.service;
-
-import mk.ukim.finki.busngo.model.entities.Postojkanalinija;
-
-import java.util.List;
-
-public interface PostojkaNaLinijaService {
-    List<Postojkanalinija> findAll();
-    Postojkanalinija findById(Long id);
-    List<Postojkanalinija> findByLinija(Long liId);
-    List<Postojkanalinija> findByLinijaAfterRedenBroj(Long liId, Short redenBroj);
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/TipBiletService.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/TipBiletService.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,9 +1,0 @@
-package mk.ukim.finki.busngo.service;
-
-import mk.ukim.finki.busngo.model.entities.Tipbilet;
-
-import java.util.List;
-
-public interface TipBiletService {
-    List<Tipbilet> listAll();
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/VozacService.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/VozacService.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,11 +1,0 @@
-package mk.ukim.finki.busngo.service;
-
-import mk.ukim.finki.busngo.model.entities.Vozac;
-import mk.ukim.finki.busngo.repository.VozacRepository;
-
-import java.util.List;
-
-public interface VozacService {
-    List<Vozac> findAll();
-    Vozac findByEmail(String email);
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/VozenjeService.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/VozenjeService.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,14 +1,0 @@
-package mk.ukim.finki.busngo.service;
-
-import mk.ukim.finki.busngo.model.entities.Vozenje;
-import mk.ukim.finki.busngo.model.enums.VOZENJE_STATUS;
-
-import java.util.List;
-
-public interface VozenjeService {
-    List<Vozenje> findVozenjaByPatnik(String email);
-    List<Vozenje> findVozenjaByPatnikAndStatus(String email, VOZENJE_STATUS status);
-    Vozenje start(String email, Long bId, Long pnlId, Long inlId);
-    Vozenje end(Long vozenjeId, Long pnlId);
-    Vozenje findById(Long id);
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/impl/AuthServiceImpl.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/impl/AuthServiceImpl.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,182 +1,0 @@
-package mk.ukim.finki.busngo.service.impl;
-
-import mk.ukim.finki.busngo.model.entities.Kondukter;
-import mk.ukim.finki.busngo.model.entities.Korisnik;
-import mk.ukim.finki.busngo.model.entities.Patnik;
-import mk.ukim.finki.busngo.model.entities.Vozac;
-import mk.ukim.finki.busngo.model.enums.Role;
-import mk.ukim.finki.busngo.model.enums.VrabotenType;
-import mk.ukim.finki.busngo.model.exceptions.InvalidCredentialsException;
-import mk.ukim.finki.busngo.model.exceptions.UserAlreadyExistsException;
-import mk.ukim.finki.busngo.repository.KondukterRepository;
-import mk.ukim.finki.busngo.repository.KorisnikRepository;
-import mk.ukim.finki.busngo.repository.PatnikRepository;
-import mk.ukim.finki.busngo.repository.VozacRepository;
-import mk.ukim.finki.busngo.service.*;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.stereotype.Service;
-
-import java.sql.Date;
-import java.time.LocalDate;
-
-@Service
-public class AuthServiceImpl implements AuthService {
-    private final KorisnikRepository korisnikRepository;
-    private final PatnikRepository patnikRepository;
-    private final VozacRepository vozacRepository;
-    private final KondukterRepository kondukterRepository;
-    private final PasswordEncoder passwordEncoder;
-    private final PatnikService patnikService;
-    private final KondukterService kondukterService;
-    private final VozacService vozacService;
-
-    public AuthServiceImpl(KorisnikRepository korisnikRepository, PatnikRepository patnikRepository, VozacRepository vozacRepository, KondukterRepository kondukterRepository, PasswordEncoder passwordEncoder, PatnikService patnikService, KondukterService kondukterService, VozacService vozacService) {
-        this.korisnikRepository = korisnikRepository;
-        this.patnikRepository = patnikRepository;
-        this.vozacRepository = vozacRepository;
-        this.kondukterRepository = kondukterRepository;
-        this.passwordEncoder = passwordEncoder;
-        this.patnikService = patnikService;
-        this.kondukterService = kondukterService;
-        this.vozacService = vozacService;
-    }
-
-    @Override
-    public Korisnik login(String email, String password) {
-        if(email == null || password == null || email.isEmpty() || password.isEmpty())
-            throw new InvalidCredentialsException();
-        return korisnikRepository.findByKEmailAndKLozinka(email, password).orElseThrow(InvalidCredentialsException::new);
-    }
-
-    @Override
-    public Korisnik registerPatnik(String ime, String email, String password, String confirmPassword, String address, String telefon) {
-        if (email == null || password == null || email.isEmpty() || password.isEmpty()) {
-            throw new InvalidCredentialsException();
-        }
-
-        if (!password.equals(confirmPassword)) {
-            throw new InvalidCredentialsException();
-        }
-
-        if(this.korisnikRepository.findByKEmail(email).isPresent()) {
-            throw new UserAlreadyExistsException(email);
-        }
-
-        Patnik korisnik = new Patnik();
-        korisnik.setKIme(ime);
-        korisnik.setKAdresa(address);
-        korisnik.setKLozinka(passwordEncoder.encode(password));
-        korisnik.setKEmail(email);
-        korisnik.setKTelefon(telefon);
-        korisnik.setKIsAdmin(false);
-
-        return patnikRepository.save(korisnik);
-    }
-
-    @Override
-    public Korisnik registerVraboten(String ime, String email, String password, String confirmPassword, String address, String telefon, VrabotenType type, Double salary) {
-        if (email == null || password == null || email.isEmpty() || password.isEmpty()) {
-            throw new InvalidCredentialsException();
-        }
-
-        if (!password.equals(confirmPassword)) {
-            throw new InvalidCredentialsException();
-        }
-
-        if(this.korisnikRepository.findByKEmail(email).isPresent()) {
-            throw new UserAlreadyExistsException(email);
-        }
-
-
-        switch (type){
-            case ADMIN:
-                Korisnik korisnik = new Korisnik();
-                korisnik.setKIme(ime);
-                korisnik.setKAdresa(address);
-                korisnik.setKLozinka(passwordEncoder.encode(password));
-                korisnik.setKEmail(email);
-                korisnik.setKTelefon(telefon);
-                korisnik.setKIsAdmin(true);
-                return korisnikRepository.save(korisnik);
-            case VOZAC:
-                Vozac vozac = new Vozac();
-                vozac.setKIme(ime);
-                vozac.setKAdresa(address);
-                vozac.setKLozinka(passwordEncoder.encode(password));
-                vozac.setKEmail(email);
-                vozac.setKTelefon(telefon);
-                vozac.setKIsAdmin(false);
-                vozac.setVPlata(salary);
-                vozac.setVDatumNaVrabotuvanje(Date.valueOf(LocalDate.now()));
-                this.korisnikRepository.save(vozac);
-
-                return vozacRepository.save(vozac);
-            case KONDUKTER:
-                Kondukter kondukter = new Kondukter();
-                kondukter.setKIme(ime);
-                kondukter.setKAdresa(address);
-                kondukter.setKLozinka(passwordEncoder.encode(password));
-                kondukter.setKEmail(email);
-                kondukter.setKTelefon(telefon);
-                kondukter.setKIsAdmin(false);
-                kondukter.setVPlata(salary);
-                kondukter.setVDatumNaVrabotuvanje(Date.valueOf(LocalDate.now()));
-                this.korisnikRepository.save(kondukter);
-
-                return kondukterRepository.save(kondukter);
-        }
-        return null;
-    }
-
-    @Override
-    public Korisnik register(String name, String email, String password, String confirmPassword, String address, String phone, Role role, Double salary) {
-        if (email == null || password == null || email.isEmpty() || password.isEmpty()) {
-            throw new InvalidCredentialsException();
-        }
-
-        if(!password.equals(confirmPassword)){
-            throw new InvalidCredentialsException();
-        }
-
-        if(role.equals(Role.ROLE_DRIVER)){
-            Vozac vozac = new Vozac();
-            vozac.setKIme(name);
-            vozac.setKAdresa(address);
-            vozac.setKLozinka(passwordEncoder.encode(password));
-            vozac.setKEmail(email);
-            vozac.setKTelefon(phone);
-            vozac.setKIsAdmin(role.equals(Role.ROLE_ADMIN));
-            vozac.setKRole(role);
-            vozac.setVPlata(salary != null ? salary : 0.0);
-            vozac.setVDatumNaVrabotuvanje(Date.valueOf(LocalDate.now()));
-            this.korisnikRepository.save(vozac);
-            return vozacRepository.save(vozac);
-        } else if(role.equals(Role.ROLE_CONDUCTOR)){
-            Kondukter kondukter = new Kondukter();
-            kondukter.setKIme(name);
-            kondukter.setKAdresa(address);
-            kondukter.setKLozinka(passwordEncoder.encode(password));
-            kondukter.setKEmail(email);
-            kondukter.setKTelefon(phone);
-            kondukter.setKIsAdmin(role.equals(Role.ROLE_ADMIN));
-            kondukter.setKRole(role);
-            kondukter.setVPlata(salary != null ? salary : 0.0);
-            kondukter.setVDatumNaVrabotuvanje(Date.valueOf(LocalDate.now()));
-            this.korisnikRepository.save(kondukter);
-            return kondukterRepository.save(kondukter);
-        } else {
-            Patnik patnik = new Patnik();
-            patnik.setKIme(name);
-            patnik.setKAdresa(address);
-            patnik.setKLozinka(passwordEncoder.encode(password));
-            patnik.setKEmail(email);
-            patnik.setKTelefon(phone);
-            patnik.setKIsAdmin(role.equals(Role.ROLE_ADMIN));
-            patnik.setKRole(role);
-            this.korisnikRepository.save(patnik);
-            return patnikRepository.save(patnik);
-        }
-    }
-
-
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/impl/AvtobusServiceImpl.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/impl/AvtobusServiceImpl.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,28 +1,0 @@
-package mk.ukim.finki.busngo.service.impl;
-
-import mk.ukim.finki.busngo.model.entities.Avtobus;
-import mk.ukim.finki.busngo.model.exceptions.InvalidAvtobusRegistracijaException;
-import mk.ukim.finki.busngo.repository.AvtobusRepository;
-import mk.ukim.finki.busngo.service.AvtobusService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class AvtobusServiceImpl implements AvtobusService {
-    private final AvtobusRepository avtobusRepository;
-
-    public AvtobusServiceImpl(AvtobusRepository avtobusRepository) {
-        this.avtobusRepository = avtobusRepository;
-    }
-
-    @Override
-    public List<Avtobus> findAll() {
-        return avtobusRepository.findAll();
-    }
-
-    @Override
-    public Avtobus findById(String aRegistracija) {
-        return avtobusRepository.findByARegistracija(aRegistracija).orElseThrow(InvalidAvtobusRegistracijaException::new);
-    }
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/impl/BiletServiceImpl.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/impl/BiletServiceImpl.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,135 +1,0 @@
-package mk.ukim.finki.busngo.service.impl;
-
-import mk.ukim.finki.busngo.model.entities.Bilet;
-import mk.ukim.finki.busngo.model.entities.Korisnik;
-import mk.ukim.finki.busngo.model.entities.Patnik;
-import mk.ukim.finki.busngo.model.entities.Tipbilet;
-import mk.ukim.finki.busngo.model.enums.BILET_STATUS;
-import mk.ukim.finki.busngo.model.exceptions.InvalidBiletIdException;
-import mk.ukim.finki.busngo.model.exceptions.InvalidTipBiletIdException;
-import mk.ukim.finki.busngo.repository.BiletRepository;
-import mk.ukim.finki.busngo.repository.KorisnikRepository;
-import mk.ukim.finki.busngo.repository.TipBIletRepository;
-import mk.ukim.finki.busngo.service.BiletService;
-import mk.ukim.finki.busngo.service.KorisnikService;
-import mk.ukim.finki.busngo.service.PatnikService;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.stereotype.Service;
-import org.thymeleaf.expression.Lists;
-
-import java.sql.Timestamp;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class BiletServiceImpl implements BiletService {
-    private final BiletRepository biletRepository;
-    private final KorisnikService korisnikService;
-    private final TipBIletRepository tipBIletRepository;
-    private final PatnikService patnikService;
-    private final PasswordEncoder passwordEncoder;
-    private final KorisnikRepository korisnikRepository;
-
-    public BiletServiceImpl(BiletRepository biletRepository, KorisnikService korisnikService, TipBIletRepository tipBIletRepository, PatnikService patnikService, PasswordEncoder passwordEncoder, KorisnikRepository korisnikRepository) {
-        this.biletRepository = biletRepository;
-        this.korisnikService = korisnikService;
-        this.tipBIletRepository = tipBIletRepository;
-        this.patnikService = patnikService;
-        this.passwordEncoder = passwordEncoder;
-        this.korisnikRepository = korisnikRepository;
-    }
-
-    @Override
-    public List<Bilet> listAll() {
-        return biletRepository.findAll();
-    }
-
-    @Override
-    public List<Bilet> findAllByPatnikId(Long id) {
-        Patnik patnik = patnikService.findById(id);
-        return patnik.getBiletsByKId();
-    }
-
-    @Override
-    public List<Bilet> findAllByPatnikIdAndStatus(Long id, BILET_STATUS status) {
-        Korisnik korisnik = korisnikService.findById(id);
-        return new ArrayList<>();
-    }
-
-    @Override
-    public Bilet buy(Long tipbilet, LocalDateTime now, BILET_STATUS biletStatus, String name) {
-        Tipbilet tipbilet1 = tipBIletRepository.findById(tipbilet).orElseThrow(InvalidTipBiletIdException::new);
-        Patnik korisnik = patnikService.loadUserByEmail(name);
-        Bilet bilet = new Bilet();
-        bilet.setBStatus(biletStatus);
-        bilet.setTipbiletByTbId(tipbilet1);
-        bilet.setBDatumNaKupuvanje(Timestamp.valueOf(now));
-        bilet.setKorisnikByPatnikKId(korisnik);
-        return biletRepository.save(bilet);
-    }
-
-    @Override
-    public List<Bilet> findAllByPatnikEmail(String email) {
-        Patnik patnik = patnikService.loadUserByEmail(email);
-        return patnik.getBiletsByKId();
-    }
-
-//    @Override
-//    public List<Bilet> findAllByPatnikEmailACTIVE(String email) {
-//        Patnik patnik = patnikService.loadUserByEmail(email);
-//        List<Bilet> allByKorisnikByPatnikKIdAndBStatus = biletRepository.findAllByKorisnikByPatnikKIdAndBStatus(patnik, BILET_STATUS.ACTIVE);
-//        List<Bilet> allByKorisnikByPatnikKIdAndBStatus1 = biletRepository.findAllByKorisnikByPatnikKIdAndBStatus(patnik, BILET_STATUS.INACTIVE);
-//        allByKorisnikByPatnikKIdAndBStatus1.addAll(allByKorisnikByPatnikKIdAndBStatus);
-//        return allByKorisnikByPatnikKIdAndBStatus1;
-//    }
-
-    @Override
-    public Bilet findBybIdAndPatnikEmail(Long bId, String email) {
-        Patnik patnik = patnikService.loadUserByEmail(email);
-        return biletRepository.findByBIdAndAndKorisnikByPatnikKId(bId, patnik).orElseThrow(InvalidBiletIdException::new);
-    }
-
-    @Override
-    public Bilet activate(Long bId) {
-        Bilet bilet = this.findById(bId);
-        bilet.setBStatus(BILET_STATUS.ACTIVE);
-        return biletRepository.save(bilet);
-    }
-
-    @Override
-    public Bilet findById(Long bId) {
-        return biletRepository.findById(bId).orElseThrow(RuntimeException::new);
-    }
-
-    @Override
-    public Bilet finish(Long bId) {
-        Bilet bilet = this.findById(bId);
-        bilet.setBStatus(BILET_STATUS.EXPIRED);
-        return biletRepository.save(bilet);
-    }
-
-    @Override
-    public boolean checkExpiration(Long bId) {
-        Bilet bilet = this.findById(bId);
-        LocalDateTime timeBought = bilet.getBDatumNaKupuvanje().toLocalDateTime();
-
-        if(timeBought.plusSeconds(bilet.getTipbiletByTbId().getTbTrajnost()).isBefore(LocalDateTime.now())){
-            bilet.setBStatus(BILET_STATUS.EXPIRED);
-            biletRepository.save(bilet);
-            return true;
-        }
-
-        return false;
-    }
-
-//    @Override
-//    public void encode(){
-//        List<Korisnik> all = korisnikRepository.findAll();
-//        all.forEach(p -> p.setKLozinka(passwordEncoder.encode(p.getKLozinka())));
-//        korisnikRepository.saveAll(all);
-//        System.out.println("DONE!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
-//    }
-
-
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/impl/InstancaNaLinijaServiceImpl.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/impl/InstancaNaLinijaServiceImpl.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,72 +1,0 @@
-package mk.ukim.finki.busngo.service.impl;
-
-import mk.ukim.finki.busngo.model.entities.*;
-import mk.ukim.finki.busngo.model.exceptions.InvalidInstancaNaLinijaIdException;
-import mk.ukim.finki.busngo.repository.InstancaNaLinijaRepository;
-import mk.ukim.finki.busngo.service.*;
-import org.springframework.stereotype.Service;
-
-import java.sql.Timestamp;
-import java.time.LocalDateTime;
-import java.util.List;
-
-@Service
-public class InstancaNaLinijaServiceImpl implements InstancaNaLinijaService{
-    private final InstancaNaLinijaRepository instancaNaLinijaRepository;
-    private final VozacService vozacService;
-    private final AvtobusService avtobusService;
-    private final LinijaService linijaService;
-    private final PostojkaNaLinijaService postojkaNaLinijaService;
-
-    public InstancaNaLinijaServiceImpl(InstancaNaLinijaRepository instancaNaLinijaRepository, VozacService vozacService, AvtobusService avtobusService, LinijaService linijaService, PostojkaNaLinijaService postojkaNaLinijaService) {
-        this.instancaNaLinijaRepository = instancaNaLinijaRepository;
-        this.vozacService = vozacService;
-        this.avtobusService = avtobusService;
-        this.linijaService = linijaService;
-        this.postojkaNaLinijaService = postojkaNaLinijaService;
-    }
-
-    @Override
-    public List<Instancanalinija> findAll() {
-        return instancaNaLinijaRepository.findAll();
-    }
-
-    @Override
-    public Instancanalinija findById(Long inlId) {
-        return instancaNaLinijaRepository.findById(inlId).orElseThrow(InvalidInstancaNaLinijaIdException::new);
-    }
-
-    @Override
-    public Instancanalinija start(Long liId, String a_registracija, String email) {
-        Linija linija = linijaService.findById(liId);
-        Avtobus avtobus = avtobusService.findById(a_registracija);
-        Vozac vozac = vozacService.findByEmail(email);
-        Instancanalinija instancanalinija = new Instancanalinija();
-        instancanalinija.setLinijaByLiId(linija);
-        instancanalinija.setAvtobusByARegistracija(avtobus);
-        instancanalinija.setKorisnikByVozacKId(vozac);
-        instancanalinija.setInlDatumStart(Timestamp.valueOf(LocalDateTime.now()));
-
-        return instancaNaLinijaRepository.save(instancanalinija);
-    }
-
-    @Override
-    public Instancanalinija end(Long inlId, String email) {
-        Vozac vozac = vozacService.findByEmail(email);
-        Instancanalinija instancanalinija = this.findById(inlId);
-        instancanalinija.setInlDatumEnd(Timestamp.valueOf(LocalDateTime.now()));
-        return instancaNaLinijaRepository.save(instancanalinija);
-    }
-
-    @Override
-    public List<Instancanalinija> findAllActive() {
-        return instancaNaLinijaRepository.findAllByInlDatumEndIsNull();
-    }
-
-    @Override
-    public List<Instancanalinija> findByPnlId(Long pnlId) {
-        Postojkanalinija postojkanalinija = postojkaNaLinijaService.findById(pnlId);
-        Linija linijaByLiId = postojkanalinija.getLinijaByLiId();
-        return instancaNaLinijaRepository.findAllByLinijaByLiIdAndInlDatumEndIsNull(linijaByLiId);
-    }
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/impl/KaznaServiceImpl.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/impl/KaznaServiceImpl.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,47 +1,0 @@
-package mk.ukim.finki.busngo.service.impl;
-
-import mk.ukim.finki.busngo.model.entities.Kazna;
-import mk.ukim.finki.busngo.model.entities.Kontroli;
-import mk.ukim.finki.busngo.repository.KaznaRepository;
-import mk.ukim.finki.busngo.service.KaznaService;
-import mk.ukim.finki.busngo.service.KontrolaService;
-import org.springframework.stereotype.Service;
-
-import java.sql.Timestamp;
-import java.time.LocalDateTime;
-import java.util.List;
-
-@Service
-public class KaznaServiceImpl implements KaznaService {
-    private final KaznaRepository kaznaRepository;
-    private final KontrolaService kontrolaService;
-
-    public KaznaServiceImpl(KaznaRepository kaznaRepository, KontrolaService kontrolaService) {
-        this.kaznaRepository = kaznaRepository;
-        this.kontrolaService = kontrolaService;
-    }
-
-    @Override
-    public List<Kazna> findAll() {
-        return kaznaRepository.findAll();
-    }
-
-    @Override
-    public List<Kazna> findAllByKontrolaId(Long kontrolaId) {
-        Kontroli kontroli = kontrolaService.findById(kontrolaId);
-        return kaznaRepository.findAllByKontroliByKontrolaId(kontroli);
-    }
-
-    @Override
-    public Kazna pay(Long kaznaId) {
-        Kazna kazna = this.findById(kaznaId);
-        kazna.setKzPlateno(true);
-        kazna.setKzDatumPlateno(Timestamp.valueOf(LocalDateTime.now()));
-        return kaznaRepository.save(kazna);
-    }
-
-    @Override
-    public Kazna findById(Long id) {
-        return kaznaRepository.findById(id).orElseThrow(RuntimeException::new);
-    }
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/impl/KaznaZaNeregistriranServiceImpl.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/impl/KaznaZaNeregistriranServiceImpl.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,53 +1,0 @@
-package mk.ukim.finki.busngo.service.impl;
-
-import mk.ukim.finki.busngo.model.entities.Kaznazaneregistriran;
-import mk.ukim.finki.busngo.model.entities.Kondukter;
-import mk.ukim.finki.busngo.model.entities.Kontroli;
-import mk.ukim.finki.busngo.repository.KaznaZaNeregistriranRepository;
-import mk.ukim.finki.busngo.service.KaznaZaNeregistriranService;
-import mk.ukim.finki.busngo.service.KondukterService;
-import mk.ukim.finki.busngo.service.KontrolaService;
-import org.springframework.stereotype.Service;
-
-import java.sql.Timestamp;
-import java.time.LocalDateTime;
-import java.util.List;
-@Service
-public class KaznaZaNeregistriranServiceImpl implements KaznaZaNeregistriranService {
-    private final KaznaZaNeregistriranRepository kaznaZaNeregistriranRepository;
-    private final KontrolaService kontrolaService;
-    private final KondukterService kondukterService;
-
-    public KaznaZaNeregistriranServiceImpl(KaznaZaNeregistriranRepository kaznaZaNeregistriranRepository, KontrolaService kontrolaService, KondukterService kondukterService) {
-        this.kaznaZaNeregistriranRepository = kaznaZaNeregistriranRepository;
-        this.kontrolaService = kontrolaService;
-        this.kondukterService = kondukterService;
-    }
-
-    @Override
-    public List<Kaznazaneregistriran> findAll() {
-        return kaznaZaNeregistriranRepository.findAll();
-    }
-
-    @Override
-    public Kaznazaneregistriran findById(Long id) {
-        return kaznaZaNeregistriranRepository.findById(id).orElseThrow(RuntimeException::new);
-    }
-
-    @Override
-    public Kaznazaneregistriran create(Long kontrolaId, String dokument, Double iznos, String telefon, String ime, String adresa, String email) {
-        Kondukter byEmail = kondukterService.findByEmail(email);
-        Kontroli kontroli = kontrolaService.findById(kontrolaId);
-        Kaznazaneregistriran kaznazaneregistriran = new Kaznazaneregistriran();
-        kaznazaneregistriran.setKznAdresa(adresa);
-        kaznazaneregistriran.setKznIme(ime);
-        kaznazaneregistriran.setKznTelefon(telefon);
-        kaznazaneregistriran.setKzDatum(Timestamp.valueOf(LocalDateTime.now()));
-        kaznazaneregistriran.setKontroliByKontrolaId(kontroli);
-        kaznazaneregistriran.setKorisnikByKondukterKId(byEmail);
-        kaznazaneregistriran.setKzIznos(iznos);
-        kaznazaneregistriran.setKzDokument(dokument);
-        kaznazaneregistriran.setKzPlateno(false);
-        return kaznaZaNeregistriranRepository.save(kaznazaneregistriran);
-    }
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/impl/KaznaZaRegistriranServiceImpl.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/impl/KaznaZaRegistriranServiceImpl.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,76 +1,0 @@
-package mk.ukim.finki.busngo.service.impl;
-
-import mk.ukim.finki.busngo.model.entities.*;
-import mk.ukim.finki.busngo.model.exceptions.UserShouldNotBeTicketedException;
-import mk.ukim.finki.busngo.repository.KaznaZaRegistriranRepository;
-import mk.ukim.finki.busngo.service.KaznaZaRegistriranService;
-import mk.ukim.finki.busngo.service.KondukterService;
-import mk.ukim.finki.busngo.service.KontrolaService;
-import mk.ukim.finki.busngo.service.PatnikService;
-import org.springframework.stereotype.Service;
-
-import java.sql.Timestamp;
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.stream.Collectors;
-
-@Service
-public class KaznaZaRegistriranServiceImpl implements KaznaZaRegistriranService {
-    private final PatnikService patnikService;
-    private final KaznaZaRegistriranRepository kaznaZaRegistriranRepository;
-    private final KontrolaService kontrolaService;
-    private final KondukterService kondukterService;
-
-    public KaznaZaRegistriranServiceImpl(PatnikService patnikService, KaznaZaRegistriranRepository kaznaZaRegistriranRepository, KontrolaService kontrolaService, KondukterService kondukterService) {
-        this.patnikService = patnikService;
-        this.kaznaZaRegistriranRepository = kaznaZaRegistriranRepository;
-        this.kontrolaService = kontrolaService;
-        this.kondukterService = kondukterService;
-    }
-
-    @Override
-    public List<Kaznazaregistriran> findAllByPatnik(String email) {
-        Patnik patnik = patnikService.loadUserByEmail(email);
-        return kaznaZaRegistriranRepository.findAllByKorisnikByPatnikKId(patnik);
-    }
-
-    @Override
-    public Kaznazaregistriran create(Long kontrolaId, String dokument, Double iznos, Long patnik, String email) {
-        Kontroli kontroli = kontrolaService.findById(kontrolaId);
-        Kondukter kondukter = kondukterService.findByEmail(email);
-        Patnik patnik1 = patnikService.findById(patnik);
-        Kaznazaregistriran kaznazaregistriran = new Kaznazaregistriran();
-        kaznazaregistriran.setKzDatum(Timestamp.valueOf(LocalDateTime.now()));
-        kaznazaregistriran.setKzDokument(dokument);
-        kaznazaregistriran.setKzIznos(iznos);
-        kaznazaregistriran.setKzPlateno(false);
-        kaznazaregistriran.setKontroliByKontrolaId(kontroli);
-        kaznazaregistriran.setKorisnikByPatnikKId(patnik1);
-        kaznazaregistriran.setKorisnikByKondukterKId(kondukter);
-        List<Vozenje> vozenjeList = patnik1.getVozenjesByKId().stream()
-                .filter(v -> v.getInstancanalinijaByInlId().getInlId().equals(kontroli.getInstancanalinijaByInlId().getInlId()))
-                .toList();
-        if(vozenjeList.isEmpty())
-            return kaznaZaRegistriranRepository.save(kaznazaregistriran);
-
-        throw new UserShouldNotBeTicketedException(String.format("Patnik with id: %d and email: %s has valid vozenje for the %d instance!",
-                patnik1.getKId(),
-                patnik1.getKEmail(),
-                kontroli.getInstancanalinijaByInlId().getInlId()));
-    }
-
-    @Override
-    public Kaznazaregistriran pay(Long kaznaId) {
-        Kaznazaregistriran kazna = this.findById(kaznaId);
-        if(!kazna.getKzPlateno()){
-            kazna.setKzPlateno(true);
-            kazna.setKzDatumPlateno(Timestamp.valueOf(LocalDateTime.now()));
-        }
-        return kaznaZaRegistriranRepository.save(kazna);
-    }
-
-    @Override
-    public Kaznazaregistriran findById(Long id) {
-        return kaznaZaRegistriranRepository.findById(id).orElseThrow(RuntimeException::new);
-    }
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/impl/KondukterServiceImpl.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/impl/KondukterServiceImpl.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,28 +1,0 @@
-package mk.ukim.finki.busngo.service.impl;
-
-import mk.ukim.finki.busngo.model.entities.Kondukter;
-import mk.ukim.finki.busngo.model.exceptions.InvalidUserId;
-import mk.ukim.finki.busngo.repository.KondukterRepository;
-import mk.ukim.finki.busngo.service.KondukterService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class KondukterServiceImpl implements KondukterService {
-    private final KondukterRepository kondukterRepository;
-
-    public KondukterServiceImpl(KondukterRepository kondukterRepository) {
-        this.kondukterRepository = kondukterRepository;
-    }
-
-    @Override
-    public List<Kondukter> findAll() {
-        return kondukterRepository.findAll();
-    }
-
-    @Override
-    public Kondukter findByEmail(String email) {
-        return kondukterRepository.findByKEmail(email).orElseThrow(InvalidUserId::new);
-    }
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/impl/KontrolaServiceImpl.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/impl/KontrolaServiceImpl.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,55 +1,0 @@
-package mk.ukim.finki.busngo.service.impl;
-
-import mk.ukim.finki.busngo.model.entities.Instancanalinija;
-import mk.ukim.finki.busngo.model.entities.Kondukter;
-import mk.ukim.finki.busngo.model.entities.Kontroli;
-import mk.ukim.finki.busngo.repository.KontrolaRepository;
-import mk.ukim.finki.busngo.service.InstancaNaLinijaService;
-import mk.ukim.finki.busngo.service.KondukterService;
-import mk.ukim.finki.busngo.service.KontrolaService;
-import org.springframework.stereotype.Service;
-
-import java.sql.Timestamp;
-import java.time.LocalDateTime;
-import java.util.List;
-
-@Service
-public class KontrolaServiceImpl implements KontrolaService {
-    private final KontrolaRepository kontrolaRepository;
-    private final KondukterService kondukterService;
-    private final InstancaNaLinijaService instancaNaLinijaService;
-
-    public KontrolaServiceImpl(KontrolaRepository kontrolaRepository, KondukterService kondukterService, InstancaNaLinijaService instancaNaLinijaService) {
-        this.kontrolaRepository = kontrolaRepository;
-        this.kondukterService = kondukterService;
-        this.instancaNaLinijaService = instancaNaLinijaService;
-    }
-
-    @Override
-    public List<Kontroli> findAll() {
-        return kontrolaRepository.findAll();
-    }
-
-    @Override
-    public Kontroli create(Long inlId, String email) {
-        Kondukter kondukter = kondukterService.findByEmail(email);
-        Instancanalinija instancanalinija = instancaNaLinijaService.findById(inlId);
-        Kontroli kontroli = new Kontroli();
-        kontroli.setKontrolaDatum(Timestamp.valueOf(LocalDateTime.now()));
-        kontroli.setKorisnikByKondukterKId(kondukter);
-        kontroli.setInstancanalinijaByInlId(instancanalinija);
-
-        return kontrolaRepository.save(kontroli);
-    }
-
-    @Override
-    public Kontroli findById(Long kontrolaId) {
-        return kontrolaRepository.findById(kontrolaId).orElseThrow(RuntimeException::new);
-    }
-
-    @Override
-    public List<Kontroli> findAllByInl(Long inlId) {
-        Instancanalinija instancanalinija = instancaNaLinijaService.findById(inlId);
-        return kontrolaRepository.findAllByInstancanalinijaByInlId(instancanalinija);
-    }
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/impl/KorisnikServiceImpl.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/impl/KorisnikServiceImpl.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,35 +1,0 @@
-package mk.ukim.finki.busngo.service.impl;
-
-import mk.ukim.finki.busngo.model.entities.Korisnik;
-import mk.ukim.finki.busngo.model.enums.Role;
-import mk.ukim.finki.busngo.model.exceptions.InvalidUserId;
-import mk.ukim.finki.busngo.repository.KorisnikRepository;
-import mk.ukim.finki.busngo.service.KorisnikService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class KorisnikServiceImpl implements KorisnikService {
-    private final KorisnikRepository korisnikRepository;
-
-    public KorisnikServiceImpl(KorisnikRepository korisnikRepository) {
-        this.korisnikRepository = korisnikRepository;
-    }
-
-
-    @Override
-    public List<Korisnik> listAll() {
-        return korisnikRepository.findAll();
-    }
-
-    @Override
-    public Korisnik findById(Long id) {
-        return korisnikRepository.findById(id).orElseThrow(InvalidUserId::new);
-    }
-
-    @Override
-    public Korisnik loadUserByEmail(String email) {
-        return korisnikRepository.findByKEmail(email).orElseThrow(InvalidUserId::new);
-    }
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/impl/LinijaServiceImpl.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/impl/LinijaServiceImpl.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,29 +1,0 @@
-package mk.ukim.finki.busngo.service.impl;
-
-import mk.ukim.finki.busngo.model.entities.Linija;
-import mk.ukim.finki.busngo.model.exceptions.InvalidLinijaIdException;
-import mk.ukim.finki.busngo.repository.LinijaRepository;
-import mk.ukim.finki.busngo.service.LinijaService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class LinijaServiceImpl implements LinijaService {
-
-    private final LinijaRepository linijaRepository;
-
-    public LinijaServiceImpl(LinijaRepository linijaRepository) {
-        this.linijaRepository = linijaRepository;
-    }
-
-    @Override
-    public List<Linija> findAll() {
-        return linijaRepository.findAll();
-    }
-
-    @Override
-    public Linija findById(Long liId) {
-        return linijaRepository.findById(liId).orElseThrow(InvalidLinijaIdException::new);
-    }
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/impl/PatnikServiceImpl.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/impl/PatnikServiceImpl.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,55 +1,0 @@
-package mk.ukim.finki.busngo.service.impl;
-
-import mk.ukim.finki.busngo.model.entities.Instancanalinija;
-import mk.ukim.finki.busngo.model.entities.Korisnik;
-import mk.ukim.finki.busngo.model.entities.Patnik;
-import mk.ukim.finki.busngo.model.exceptions.InvalidPatnikIdException;
-import mk.ukim.finki.busngo.repository.PatnikRepository;
-import mk.ukim.finki.busngo.service.InstancaNaLinijaService;
-import mk.ukim.finki.busngo.service.PatnikService;
-import org.springframework.stereotype.Service;
-
-import java.util.Collections;
-import java.util.List;
-
-@Service
-public class PatnikServiceImpl implements PatnikService {
-    private final PatnikRepository patnikRepository;
-    private final InstancaNaLinijaService instancaNaLinijaService;
-
-    public PatnikServiceImpl(PatnikRepository patnikRepository, InstancaNaLinijaService instancaNaLinijaService) {
-        this.patnikRepository = patnikRepository;
-        this.instancaNaLinijaService = instancaNaLinijaService;
-    }
-
-    @Override
-    public List<Patnik> listAll() {
-        return  patnikRepository.findAll();
-    }
-
-    @Override
-    public Patnik findById(Long id) {
-        return patnikRepository.findById(id).orElseThrow(InvalidPatnikIdException::new);
-    }
-
-    @Override
-    public Patnik loadUserByEmail(String email) {
-        return patnikRepository.findByKEmail(email).orElseThrow(InvalidPatnikIdException::new);
-    }
-
-    @Override
-    public Patnik save(Korisnik korisnik) {
-        Patnik patnik = new Patnik();
-        patnik.setKId(korisnik.getKId());
-        patnik.setKEmail(korisnik.getKEmail());
-        patnik.setKAdresa(korisnik.getKAdresa());
-        patnik.setKIme(korisnik.getKIme());
-        patnik.setKTelefon(korisnik.getKTelefon());
-        patnik.setKIsAdmin(korisnik.getKIsAdmin());
-        patnik.setKLozinka(korisnik.getKLozinka());
-
-        return patnikRepository.save((Patnik) korisnik);
-    }
-
-
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/impl/PostojkaNaLinijaServiceImpl.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/impl/PostojkaNaLinijaServiceImpl.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,44 +1,0 @@
-package mk.ukim.finki.busngo.service.impl;
-
-import mk.ukim.finki.busngo.model.entities.Linija;
-import mk.ukim.finki.busngo.model.entities.Postojkanalinija;
-import mk.ukim.finki.busngo.model.exceptions.InvalidPostojkaNaLinijaIdException;
-import mk.ukim.finki.busngo.repository.PostojkaNaLinijaRepository;
-import mk.ukim.finki.busngo.service.LinijaService;
-import mk.ukim.finki.busngo.service.PostojkaNaLinijaService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class PostojkaNaLinijaServiceImpl implements PostojkaNaLinijaService {
-    private final PostojkaNaLinijaRepository postojkaNaLinijaRepository;
-    private final LinijaService linijaService;
-
-    public PostojkaNaLinijaServiceImpl(PostojkaNaLinijaRepository postojkaNaLinijaRepository, LinijaService linijaService) {
-        this.postojkaNaLinijaRepository = postojkaNaLinijaRepository;
-        this.linijaService = linijaService;
-    }
-
-    @Override
-    public List<Postojkanalinija> findAll() {
-        return postojkaNaLinijaRepository.findAll();
-    }
-
-    @Override
-    public Postojkanalinija findById(Long id) {
-        return postojkaNaLinijaRepository.findById(id).orElseThrow(InvalidPostojkaNaLinijaIdException::new);
-    }
-
-    @Override
-    public List<Postojkanalinija> findByLinija(Long liId) {
-        Linija linija = linijaService.findById(liId);
-        return postojkaNaLinijaRepository.findAllByLinijaByLiId(linija);
-    }
-
-    @Override
-    public List<Postojkanalinija> findByLinijaAfterRedenBroj(Long liId, Short redenBroj) {
-        Linija linija = linijaService.findById(liId);
-        return postojkaNaLinijaRepository.findAllByLinijaByLiIdAndPnlRedenBrojGreaterThan(linija, redenBroj);
-    }
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/impl/TipBiletServiceImpl.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/impl/TipBiletServiceImpl.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,22 +1,0 @@
-package mk.ukim.finki.busngo.service.impl;
-
-import mk.ukim.finki.busngo.model.entities.Tipbilet;
-import mk.ukim.finki.busngo.repository.TipBIletRepository;
-import mk.ukim.finki.busngo.service.TipBiletService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class TipBiletServiceImpl implements TipBiletService {
-    private final TipBIletRepository tipBIletRepository;
-
-    public TipBiletServiceImpl(TipBIletRepository tipBIletRepository) {
-        this.tipBIletRepository = tipBIletRepository;
-    }
-
-    @Override
-    public List<Tipbilet> listAll() {
-        return tipBIletRepository.findAll();
-    }
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/impl/VozacServiceImpl.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/impl/VozacServiceImpl.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,28 +1,0 @@
-package mk.ukim.finki.busngo.service.impl;
-
-import mk.ukim.finki.busngo.model.entities.Vozac;
-import mk.ukim.finki.busngo.model.exceptions.InvalidVozacIdException;
-import mk.ukim.finki.busngo.repository.VozacRepository;
-import mk.ukim.finki.busngo.service.VozacService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class VozacServiceImpl implements VozacService {
-    private final VozacRepository vozacRepository;
-
-    public VozacServiceImpl(VozacRepository vozacRepository) {
-        this.vozacRepository = vozacRepository;
-    }
-
-    @Override
-    public List<Vozac> findAll() {
-        return vozacRepository.findAll();
-    }
-
-    @Override
-    public Vozac findByEmail(String email) {
-        return vozacRepository.findByKEmail(email).orElseThrow(InvalidVozacIdException::new);
-    }
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/impl/VozenjeServiceImpl.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/service/impl/VozenjeServiceImpl.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,81 +1,0 @@
-package mk.ukim.finki.busngo.service.impl;
-
-import mk.ukim.finki.busngo.model.entities.*;
-import mk.ukim.finki.busngo.model.enums.BILET_STATUS;
-import mk.ukim.finki.busngo.model.enums.VOZENJE_STATUS;
-import mk.ukim.finki.busngo.model.exceptions.InvalidVozenjeIdException;
-import mk.ukim.finki.busngo.repository.VozenjeRepository;
-import mk.ukim.finki.busngo.service.*;
-import org.springframework.stereotype.Service;
-
-import java.sql.Timestamp;
-import java.time.LocalDateTime;
-import java.util.List;
-
-@Service
-public class VozenjeServiceImpl  implements VozenjeService {
-    private final VozenjeRepository vozenjeRepository;
-    private final PatnikService patnikService;
-    private final BiletService biletService;
-    private final PostojkaNaLinijaService postojkaNaLinijaService;
-    private final InstancaNaLinijaService instancaNaLinijaService;
-
-    public VozenjeServiceImpl(VozenjeRepository vozenjeRepository, PatnikService patnikService, BiletService biletService, PostojkaNaLinijaService postojkaNaLinijaService, InstancaNaLinijaService instancaNaLinijaService) {
-        this.vozenjeRepository = vozenjeRepository;
-        this.patnikService = patnikService;
-        this.biletService = biletService;
-        this.postojkaNaLinijaService = postojkaNaLinijaService;
-        this.instancaNaLinijaService = instancaNaLinijaService;
-    }
-
-    @Override
-    public List<Vozenje> findVozenjaByPatnik(String email) {
-        Patnik patnik = patnikService.loadUserByEmail(email);
-        return vozenjeRepository.findAllByKorisnikByPatnikKId(patnik);
-    }
-
-    @Override
-    public List<Vozenje> findVozenjaByPatnikAndStatus(String email, VOZENJE_STATUS status) {
-        Patnik patnik = patnikService.loadUserByEmail(email);
-        return vozenjeRepository.findAllByKorisnikByPatnikKIdAndAndVozenjeStatus(patnik, status);
-    }
-
-    @Override
-    public Vozenje start(String email, Long bId, Long pnlId, Long inlId) {
-        Patnik patnik = patnikService.loadUserByEmail(email);
-        Bilet bilet = biletService.findBybIdAndPatnikEmail(bId, email);
-        Postojkanalinija postojkanalinija = postojkaNaLinijaService.findById(pnlId);
-        Instancanalinija instancanalinija = instancaNaLinijaService.findById(inlId);
-
-        Vozenje vozenje = new Vozenje();
-        vozenje.setVozenjeStart(Timestamp.valueOf(LocalDateTime.now()));
-        vozenje.setVozenjeStatus(VOZENJE_STATUS.ACTIVE);
-        vozenje.setInstancanalinijaByInlId(instancanalinija);
-        vozenje.setKorisnikByPatnikKId(patnik);
-        vozenje.setPostojkanalinijaByKacuvaPnlId(postojkanalinija);
-
-        if(bilet.getBStatus().equals(BILET_STATUS.INACTIVE))
-            bilet = biletService.activate(bId);
-        else if(biletService.checkExpiration(bId))
-            throw new RuntimeException("Bilet is expired!");
-        else if(bilet.getBStatus().equals(BILET_STATUS.EXPIRED))
-            throw new RuntimeException("Bilet is expired!");
-
-        vozenje.setBiletByBId(bilet);
-        return vozenjeRepository.save(vozenje);
-    }
-
-    @Override
-    public Vozenje end(Long vozenjeId, Long pnlId) {
-        // TODO : Relacija se simnuva na pnlId
-        Vozenje vozenje = this.findById(vozenjeId);
-        vozenje.setVozenjeEnd(Timestamp.valueOf(LocalDateTime.now()));
-        vozenje.setVozenjeStatus(VOZENJE_STATUS.FINISHED);
-        return vozenjeRepository.save(vozenje);
-    }
-
-    @Override
-    public Vozenje findById(Long id) {
-        return vozenjeRepository.findById(id).orElseThrow(InvalidVozenjeIdException::new);
-    }
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/web/BiletController.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/web/BiletController.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,75 +1,0 @@
-package mk.ukim.finki.busngo.web;
-
-import mk.ukim.finki.busngo.model.entities.Patnik;
-import mk.ukim.finki.busngo.model.enums.BILET_STATUS;
-import mk.ukim.finki.busngo.model.exceptions.InvalidPatnikIdException;
-import mk.ukim.finki.busngo.service.AuthService;
-import mk.ukim.finki.busngo.service.BiletService;
-import mk.ukim.finki.busngo.service.PatnikService;
-import mk.ukim.finki.busngo.service.TipBiletService;
-import org.springframework.security.core.Authentication;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.time.LocalDateTime;
-
-@Controller
-@RequestMapping("/bilet")
-public class BiletController {
-    private final BiletService biletService;
-    private final TipBiletService tipBiletService;
-    private final AuthService authService;
-    private final PatnikService patnikService;
-
-    public BiletController(BiletService biletService, TipBiletService tipBiletService, AuthService authService, PatnikService patnikService) {
-        this.biletService = biletService;
-        this.tipBiletService = tipBiletService;
-        this.authService = authService;
-        this.patnikService = patnikService;
-    }
-
-    @GetMapping()
-    public String getAllBileti(@RequestParam(required = false) Long id,
-                               @RequestParam(required = false) BILET_STATUS status,
-                               Model model,
-                               Authentication authentication){
-        model.addAttribute("bodyContent", "listBileti");
-        Patnik patnik = null;
-        try{
-            patnik = patnikService.loadUserByEmail(authentication.getName());
-            model.addAttribute("bileti", biletService.findAllByPatnikEmail(authentication.getName()));
-        }
-        catch (InvalidPatnikIdException e){
-            model.addAttribute("bodyContent", "listBileti");
-            model.addAttribute("hasError", true);
-            model.addAttribute("error", e.getMessage());
-            return "master-template";
-        }
-
-        return "master-template";
-    }
-
-    @GetMapping("/kupi")
-    public String getKupiPage(Model model){
-        model.addAttribute("bodyContent", "kupiBilet");
-        model.addAttribute("tipbileti", tipBiletService.listAll());
-        return "master-template";
-    }
-
-    @PostMapping("/kupi")
-    public String kupiBilet(@RequestParam Long tipbilet, Authentication authentication){
-        biletService.buy(tipbilet, LocalDateTime.now(), BILET_STATUS.INACTIVE, authentication.getName());
-        return "redirect:/bilet";
-    }
-
-//    @GetMapping("/encode")
-//    public String encode(){
-//        biletService.encode();
-//        return "redirect:/bilet";
-//    }
-
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/web/InstancaNaLinijaController.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/web/InstancaNaLinijaController.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,78 +1,0 @@
-package mk.ukim.finki.busngo.web;
-
-import mk.ukim.finki.busngo.model.entities.Avtobus;
-import mk.ukim.finki.busngo.model.entities.Instancanalinija;
-import mk.ukim.finki.busngo.model.entities.Linija;
-import mk.ukim.finki.busngo.service.AvtobusService;
-import mk.ukim.finki.busngo.service.InstancaNaLinijaService;
-import mk.ukim.finki.busngo.service.KontrolaService;
-import mk.ukim.finki.busngo.service.LinijaService;
-import org.springframework.security.core.Authentication;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-@Controller
-@RequestMapping("instanca-na-linija")
-public class InstancaNaLinijaController {
-    private final InstancaNaLinijaService instancaNaLinijaService;
-    private final LinijaService linijaService;
-    private final AvtobusService avtobusService;
-    private final KontrolaService kontrolaService;
-
-    public InstancaNaLinijaController(InstancaNaLinijaService instancaNaLinijaService, LinijaService linijaService, AvtobusService avtobusService, KontrolaService kontrolaService) {
-        this.instancaNaLinijaService = instancaNaLinijaService;
-        this.linijaService = linijaService;
-        this.avtobusService = avtobusService;
-        this.kontrolaService = kontrolaService;
-    }
-
-    @GetMapping()
-    public String getList(Model model){
-        model.addAttribute("bodyContent", "listInstanci");
-        model.addAttribute("inls", instancaNaLinijaService.findAllActive());
-
-        return "master-template";
-    }
-    @GetMapping("/start")
-    public String getStartPage(Model model){
-        List<Linija> linijaList = linijaService.findAll();
-        List<Avtobus> avtobusList = avtobusService.findAll();
-        model.addAttribute("avtobusi", avtobusList);
-        model.addAttribute("linii", linijaList);
-        model.addAttribute("bodyContent", "startInstanca");
-
-        return "master-template";
-    }
-
-    @PostMapping("/start")
-    public String startInstanca(@RequestParam String aRegistracija,
-                                @RequestParam Long liId,
-                                Model model,
-                                Authentication authentication){
-        Instancanalinija start = instancaNaLinijaService.start(liId, aRegistracija, authentication.getName());
-//        model.addAttribute("inl", start);
-//        model.addAttribute("bodyContent", "inlShow");
-
-        return "redirect:/instanca-na-linija/" + start.getInlId();
-    }
-
-    @GetMapping("/{inlId}")
-    public String getInlShow(@PathVariable Long inlId,
-                             Model model){
-        model.addAttribute("inl", instancaNaLinijaService.findById(inlId));
-        model.addAttribute("kontroli", kontrolaService.findAllByInl(inlId));
-        model.addAttribute("bodyContent", "inlShow");
-
-        return "master-template";
-    }
-
-    @PostMapping("/{inlId}/end")
-    public String endInstanca(@PathVariable Long inlId,
-                              Authentication authentication){
-        Instancanalinija ended = instancaNaLinijaService.end(inlId, authentication.getName());
-        return "redirect:/instanca-na-linija/" + ended.getInlId();
-    }
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/web/KaznaController.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/web/KaznaController.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,49 +1,0 @@
-package mk.ukim.finki.busngo.web;
-
-import mk.ukim.finki.busngo.model.entities.Patnik;
-import mk.ukim.finki.busngo.model.exceptions.InvalidPatnikIdException;
-import mk.ukim.finki.busngo.service.KaznaZaRegistriranService;
-import mk.ukim.finki.busngo.service.VozenjeService;
-import org.springframework.security.core.Authentication;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@Controller
-@RequestMapping("/kazna")
-public class KaznaController {
-    private final KaznaZaRegistriranService kaznaZaRegistriranService;
-
-    public KaznaController(KaznaZaRegistriranService kaznaZaRegistriranService) {
-        this.kaznaZaRegistriranService = kaznaZaRegistriranService;
-    }
-
-    @GetMapping()
-    public String getKaznaPage(Model model,
-                                 Authentication authentication){
-        model.addAttribute("bodyContent", "listKazni");
-        Patnik patnik = null;
-        try{
-            model.addAttribute("kazni", kaznaZaRegistriranService.findAllByPatnik(authentication.getName()));
-        }
-        catch (InvalidPatnikIdException e){
-            model.addAttribute("bodyContent", "listBileti");
-            model.addAttribute("hasError", true);
-            model.addAttribute("error", e.getMessage());
-            return "master-template";
-        }
-
-        return "master-template";
-    }
-
-    @PostMapping("/{id}/pay")
-    public String pay(@PathVariable Long id,
-                      Model model){
-        kaznaZaRegistriranService.pay(id);
-        return "redirect:/kazna";
-    }
-
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/web/KontrolaController.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/web/KontrolaController.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,85 +1,0 @@
-package mk.ukim.finki.busngo.web;
-
-import mk.ukim.finki.busngo.model.entities.Kontroli;
-import mk.ukim.finki.busngo.model.exceptions.UserShouldNotBeTicketedException;
-import mk.ukim.finki.busngo.service.*;
-import org.springframework.security.core.Authentication;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-
-@Controller
-@RequestMapping("/kontrola")
-public class KontrolaController {
-
-    private final KontrolaService kontrolaService;
-    private final KaznaZaRegistriranService kaznaZaRegistriranService;
-    private final KaznaZaNeregistriranService kaznaZaNeregistriranService;
-    private final KaznaService kaznaService;
-    private final PatnikService patnikService;
-    private final VozacService vozacService;
-    private final InstancaNaLinijaService instancaNaLinijaService;
-
-    public KontrolaController(KontrolaService kontrolaService, KaznaZaRegistriranService kaznaZaRegistriranService, KaznaZaNeregistriranService kaznaZaNeregistriranService, KaznaService kaznaService, PatnikService patnikService, VozacService vozacService, InstancaNaLinijaService instancaNaLinijaService) {
-        this.kontrolaService = kontrolaService;
-        this.kaznaZaRegistriranService = kaznaZaRegistriranService;
-        this.kaznaZaNeregistriranService = kaznaZaNeregistriranService;
-        this.kaznaService = kaznaService;
-        this.patnikService = patnikService;
-        this.vozacService = vozacService;
-        this.instancaNaLinijaService = instancaNaLinijaService;
-    }
-
-    @GetMapping("/{kontrolaId}")
-    public String get(@PathVariable Long kontrolaId,
-                      Model model){
-        model.addAttribute("bodyContent", "kontrola");
-        Kontroli kontroli = kontrolaService.findById(kontrolaId);
-
-        model.addAttribute("kontrola", kontroli);
-        model.addAttribute("kazni", kaznaService.findAllByKontrolaId(kontrolaId));
-        model.addAttribute("patnici", patnikService.listAll());
-        return "master-template";
-    }
-    @GetMapping("/start-for/{inlId}")
-    public String getStartPage(@PathVariable Long inlId,
-                               Model model,
-                               Authentication authentication){
-        model.addAttribute("bodyContent", "kontrola");
-        Kontroli kontroli = kontrolaService.create(inlId, authentication.getName());
-
-        model.addAttribute("kontrola", kontroli);
-        return "redirect:/kontrola/" + kontroli.getKontrolaId();
-    }
-
-    @PostMapping("/{kontrolaId}/kazni-registriran")
-    public String kazniRegistriran(@PathVariable Long kontrolaId,
-                                   @RequestParam String dokument,
-                                   @RequestParam Double iznos,
-                                   @RequestParam Long patnik,
-                                   Authentication authentication){
-        try {
-
-            kaznaZaRegistriranService.create(kontrolaId, dokument, iznos, patnik, authentication.getName());
-        }
-        catch (UserShouldNotBeTicketedException exception){
-            return "redirect:/kontrola/" + kontrolaId;
-        }
-
-        return "redirect:/kontrola/" + kontrolaId;
-    }
-
-    @PostMapping("/{kontrolaId}/kazni-neregistriran")
-    public String kazniNeregistriran(@PathVariable Long kontrolaId,
-                                   @RequestParam String dokument,
-                                   @RequestParam Double iznos,
-                                   @RequestParam String telefon,
-                                   @RequestParam String ime,
-                                   @RequestParam String adresa,
-                                   Authentication authentication){
-
-        kaznaZaNeregistriranService.create(kontrolaId, dokument, iznos, telefon, ime, adresa, authentication.getName());
-
-        return "redirect:/kontrola/" + kontrolaId;
-    }
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/web/LoginController.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/web/LoginController.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,47 +1,0 @@
-package mk.ukim.finki.busngo.web;
-
-import jakarta.servlet.http.HttpServletRequest;
-import mk.ukim.finki.busngo.model.entities.Korisnik;
-import mk.ukim.finki.busngo.model.exceptions.InvalidCredentialsException;
-import mk.ukim.finki.busngo.service.AuthService;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@Controller
-@RequestMapping("/login")
-public class LoginController {
-
-    private final AuthService authService;
-
-    public LoginController(AuthService authService) {
-        this.authService = authService;
-    }
-
-    @GetMapping
-    public String getLoginPage(Model model) {
-        model.addAttribute("bodyContent", "login");
-        return "master-template";
-    }
-
-    @PostMapping
-    public String login(HttpServletRequest request, Model model) {
-        Korisnik user = null;
-
-        try {
-            user = authService.login(request.getParameter("username"), request.getParameter("password"));
-        } catch (InvalidCredentialsException exception) {
-            model.addAttribute("bodyContent", "login");
-            model.addAttribute("hasError", true);
-            model.addAttribute("error", exception.getMessage());
-            return "master-template";
-        }
-
-        request.getSession().setAttribute("user", user);
-        return "redirect:/home";
-    }
-
-}
-
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/web/RegisterController.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/web/RegisterController.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,73 +1,0 @@
-package mk.ukim.finki.busngo.web;
-
-import mk.ukim.finki.busngo.model.entities.Korisnik;
-import mk.ukim.finki.busngo.model.enums.Role;
-import mk.ukim.finki.busngo.model.enums.VrabotenType;
-import mk.ukim.finki.busngo.model.exceptions.InvalidCredentialsException;
-import mk.ukim.finki.busngo.model.exceptions.UserAlreadyExistsException;
-import mk.ukim.finki.busngo.service.AuthService;
-import mk.ukim.finki.busngo.service.KorisnikService;
-import mk.ukim.finki.busngo.service.PatnikService;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-@Controller
-@RequestMapping("/register")
-public class RegisterController {
-    private final AuthService authService;
-    private final KorisnikService korisnikService;
-    private final PatnikService patnikService;
-
-    public RegisterController(AuthService authService, KorisnikService korisnikService, PatnikService patnikService) {
-        this.authService = authService;
-        this.korisnikService = korisnikService;
-        this.patnikService = patnikService;
-    }
-
-    @GetMapping
-    public String getRegisterPage(@RequestParam(required = false) String error, Model model) {
-        if(error != null && !error.isEmpty()) {
-            model.addAttribute("hasError", true);
-            model.addAttribute("error", error);
-        }
-
-        model.addAttribute("roles", Role.values());
-
-        model.addAttribute("bodyContent", "register");
-        return "master-template";
-    }
-
-    @PostMapping
-    public String register(@RequestParam String name,
-                           @RequestParam String email,
-                           @RequestParam String password,
-                           @RequestParam String confirmPassword,
-                           @RequestParam String address,
-                           @RequestParam String phone,
-                           @RequestParam Role role,
-                           @RequestParam(required = false) Double salary
-                           ) {
-        try{
-            Korisnik korisnik = authService.register(name, email, password, confirmPassword, address, phone, role, salary);
-
-            return "redirect:/login";
-        } catch (InvalidCredentialsException | UserAlreadyExistsException exception) {
-            return "redirect:/register?error=" + exception.getMessage();
-        }
-    }
-
-//    @PostMapping
-//    public String registerVraboten(@RequestParam String name,
-//                                   @RequestParam String email,
-//                                   @RequestParam String password,
-//                                   @RequestParam String confirmPassword,
-//                                   @RequestParam String address,
-//                                   @RequestParam String phone){
-//
-//    }
-
-}
Index: s-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/web/VozenjeController.java
===================================================================
--- bus-n-go-do-5ta-faza/src/main/java/mk/ukim/finki/busngo/web/VozenjeController.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,129 +1,0 @@
-package mk.ukim.finki.busngo.web;
-
-import mk.ukim.finki.busngo.model.entities.Linija;
-import mk.ukim.finki.busngo.model.entities.Patnik;
-import mk.ukim.finki.busngo.model.entities.Vozenje;
-import mk.ukim.finki.busngo.model.enums.VOZENJE_STATUS;
-import mk.ukim.finki.busngo.model.exceptions.InvalidPatnikIdException;
-import mk.ukim.finki.busngo.model.exceptions.InvalidPostojkaNaLinijaIdException;
-import mk.ukim.finki.busngo.service.*;
-import org.springframework.security.core.Authentication;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-
-@Controller
-@RequestMapping("/vozenje")
-public class VozenjeController {
-    private final VozenjeService vozenjeService;
-    private final PostojkaNaLinijaService postojkaNaLinijaService;
-    private final InstancaNaLinijaService instancaNaLinijaService;
-    private final BiletService biletService;
-
-    public VozenjeController(VozenjeService vozenjeService, PostojkaNaLinijaService postojkaNaLinijaService, InstancaNaLinijaService instancaNaLinijaService, BiletService biletService) {
-        this.vozenjeService = vozenjeService;
-        this.postojkaNaLinijaService = postojkaNaLinijaService;
-        this.instancaNaLinijaService = instancaNaLinijaService;
-        this.biletService = biletService;
-    }
-
-    @GetMapping()
-    public String getVozenjePage(Model model,
-                                 Authentication authentication,
-                                 @RequestParam(required = false) VOZENJE_STATUS status){
-        model.addAttribute("bodyContent", "listVozenja");
-        Patnik patnik = null;
-        try{
-            if(status != null)
-                model.addAttribute("vozenja", vozenjeService.findVozenjaByPatnikAndStatus(authentication.getName(), status));
-            else
-                model.addAttribute("vozenja", vozenjeService.findVozenjaByPatnikAndStatus(authentication.getName(), VOZENJE_STATUS.ACTIVE));
-            model.addAttribute("vozStatus", VOZENJE_STATUS.values());
-        }
-        catch (InvalidPatnikIdException e){
-            model.addAttribute("bodyContent", "listBileti");
-            model.addAttribute("hasError", true);
-            model.addAttribute("error", e.getMessage());
-            return "master-template";
-        }
-
-        return "master-template";
-    }
-
-//    @GetMapping("/start")
-//    public String getStartVozenjePagePostojkaPage(Model model){
-//        model.addAttribute("postojki", postojkaNaLinijaService.findAll());
-//        model.addAttribute("bodyContent", "choosePostojka");
-//
-//        return "master-template";
-//    }
-    @GetMapping("/start")
-    public String getStartVozenjePageAll(@RequestParam(required = false) Long pnlId,
-                                         Model model,
-                                         Authentication authentication){
-        try{
-            if(pnlId != null){
-                model.addAttribute("postojka", postojkaNaLinijaService.findById(pnlId));
-                model.addAttribute("instanci", instancaNaLinijaService.findByPnlId(pnlId));
-            }
-            model.addAttribute("postojki", postojkaNaLinijaService.findAll());
-
-            model.addAttribute("bileti", biletService.findAllByPatnikEmail(authentication.getName()));
-            model.addAttribute("bodyContent", "startVozenje");
-        }
-        catch (InvalidPostojkaNaLinijaIdException | InvalidPatnikIdException exception){
-            model.addAttribute("bodyContent", "listBileti");
-            model.addAttribute("hasError", true);
-            model.addAttribute("error", exception.getMessage());
-            return "master-template";
-        }
-
-        return "master-template";
-    }
-
-    @PostMapping("/start")
-    public String startVozenje(@RequestParam Long pnlId,
-                               @RequestParam Long inlId,
-                               @RequestParam Long bId,
-                               Authentication authentication,
-                               Model model){
-        try{
-            vozenjeService
-                    .start(authentication.getName(), bId, pnlId, inlId);
-        }
-        catch (RuntimeException e){
-            System.out.println(e.getMessage());
-            model.addAttribute("bodyContent", "listBileti");
-            model.addAttribute("hasError", true);
-            model.addAttribute("error", e.getMessage());
-            return "master-template";
-        }
-
-        return "redirect:/vozenje";
-    }
-
-    @GetMapping("/{vozenjeId}/end")
-    public String getEndVozenje(@PathVariable Long vozenjeId,
-                                Model model){
-        Vozenje vozenje = vozenjeService.findById(vozenjeId);
-        model.addAttribute("vozenje", vozenjeService.findById(vozenjeId));
-        model.addAttribute("pnls",
-                postojkaNaLinijaService
-                        .findByLinijaAfterRedenBroj(Long.valueOf(vozenje
-                                .getInstancanalinijaByInlId()
-                                .getLinijaByLiId()
-                                .getLiId()),
-                                vozenje.getPostojkanalinijaByKacuvaPnlId().getPnlRedenBroj()));
-
-        model.addAttribute("bodyContent", "endVozenje");
-
-        return "master-template";
-    }
-
-    @PostMapping("/{vozenjeId}/end")
-    public String endVozenje(@PathVariable Long vozenjeId,
-                             @RequestParam Long pnlEndId){
-        Vozenje end = vozenjeService.end(vozenjeId, pnlEndId);
-        return "redirect:/vozenje";
-    }
-}
Index: s-n-go-do-5ta-faza/src/main/resources/application.properties
===================================================================
--- bus-n-go-do-5ta-faza/src/main/resources/application.properties	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,17 +1,0 @@
-#
-spring.datasource.url=jdbc:postgresql://localhost:8081/db_202324z_va_prj_busngo
-spring.datasource.username=db_202324z_va_prj_busngo_owner
-spring.datasource.password=d9f924580e7
-spring.datasource.driver-class-name=org.postgresql.Driver
-
-
-spring.datasource.hikari.connection-timeout=20000
-spring.datasource.hikari.maximum-pool-size=5
-
-#spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
-spring.jpa.properties.hibernate.jdbc.non_contextual_creation=true
-spring.jpa.properties.hibernate.default_schema=project_new
-
-spring.jpa.hibernate.ddl-auto=validate
-spring.jpa.show-sql=true
-
Index: s-n-go-do-5ta-faza/src/main/resources/templates/choosePostojka.html
===================================================================
--- bus-n-go-do-5ta-faza/src/main/resources/templates/choosePostojka.html	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,17 +1,0 @@
-<div class="container" xmlns:th="http://www.thymeleaf.org">
-    <form class="form-signin mt-xl-5" method="get" action="/vozenje/choose-postojka">
-        <h2 class="form-signin-heading">Odberete postojka na koja se naogjate</h2>
-        <p>
-            <label for="pnlId" class="sr-only">Postojka</label>
-            <select class="form-control" name="pnlId" id="pnlId">
-                <option class="form-control" th:each="postojka : ${postojki}" th:text="${postojka.postojkaByPId.pIme}" th:value="${postojka.pnlId}" ></option>
-            </select>
-
-
-        </p>
-        <div class="col-md-3">
-            <button id="submit" class="btn btn-lg btn-primary btn-block" type="submit">Odberi</button>
-        </div>
-    </form>
-</div>
-
Index: s-n-go-do-5ta-faza/src/main/resources/templates/endVozenje.html
===================================================================
--- bus-n-go-do-5ta-faza/src/main/resources/templates/endVozenje.html	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,62 +1,0 @@
-<div class="container" xmlns:th="http://www.thymeleaf.org">
-    <form class="form-signin mt-xl-5" method="post" th:action="@{'/vozenje/{id}/end'(id=${vozenje.vozenjeId})}">
-        <h2 class="form-signin-heading">Start vozenje</h2>
-
-        <p>
-            <label for="pnlId" class="sr-only">Postojka</label>
-            <select   class="form-control" name="pnlId" id="pnlId">
-                <option class="form-control"
-                        th:text="${vozenje.postojkanalinijaByKacuvaPnlId.postojkaByPId.pIme}"
-                        selected
-                        disabled
-                        th:value="${vozenje.postojkanalinijaByKacuvaPnlId.pnlId} "  ></option>
-<!--                        th:selected="${postojka!= null && postojka.pnlId == pos.pnlId} ? 'true' : 'false' " -->
-<!--                        th:disabled="${postojka!= null && postojka.pnlId != pos.pnlId} ? 'true' : 'false' "  -->
-
-            </select>
-        </p>
-
-        <p >
-            <label for="instanca" class="sr-only">Instanca</label>
-            <select id="instanca" name="inlId" class="form-control">
-                <option
-                        selected
-                        disabled
-                        th:value="${vozenje.instancanalinijaByInlId.inlId}"
-                        th:text="${vozenje.instancanalinijaByInlId.linijaByLiId.liIme} + ' - ' + ${vozenje.instancanalinijaByInlId.linijaByLiId.liPravec}"></option>
-            </select>
-        </p>
-
-        <p >
-            <label for="bilet" class="sr-only">Bilet</label>
-            <select id="bilet" name="bId" class="form-control">
-                <option
-                        selected
-                        disabled
-                        th:value="${vozenje.biletByBId.bId}"
-                        th:text="${vozenje.biletByBId.tipbiletByTbId.tbIme} + ' - ' + ${vozenje.biletByBId.bStatus.name()}"></option>
-            </select>
-        </p>
-
-        <p>
-            <label for="pnlEndId" class="sr-only">Postojka Simnuvanje</label>
-            <select   class="form-control" name="pnlEndId" id="pnlEndId">
-                <option class="form-control"
-                        th:each="pos : ${pnls}"
-                        th:text="${pos.postojkaByPId.pIme}"
-                        th:value="${pos.pnlId} "  ></option>
-
-
-            </select>
-        </p>
-
-        <div th:if="${param.error}" th:text="${param.error}" class="text-danger"></div>
-
-        <div class="row">
-            <div class="col-md-3">
-                <button id="submit" class="btn btn-lg btn-primary btn-block" type="submit">End</button>
-            </div>
-        </div>
-    </form>
-</div>
-
Index: s-n-go-do-5ta-faza/src/main/resources/templates/fragments/footer.html
===================================================================
--- bus-n-go-do-5ta-faza/src/main/resources/templates/fragments/footer.html	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,48 +1,0 @@
-<footer class="text-black-50 mt-xl-5" xmlns:th="http://www.thymeleaf.org">
-    <div class="container">
-        <div class="row">
-            <div class="col-md-3 col-lg-4 col-xl-3">
-                <h5>About</h5>
-                <hr class="bg-white mb-2 mt-0 d-inline-block mx-auto w-25">
-                <p class="mb-0">
-                    Le Lorem Ipsum est simplement du faux texte employé dans la composition et la mise en page avant
-                    impression.
-                </p>
-            </div>
-
-            <div class="col-md-2 col-lg-2 col-xl-2 mx-auto">
-                <h5>Informations</h5>
-                <hr class="bg-white mb-2 mt-0 d-inline-block mx-auto w-25">
-                <ul class="list-unstyled">
-                    <li><a href="">Link 1</a></li>
-                    <li><a href="">Link 2</a></li>
-                    <li><a href="">Link 3</a></li>
-                    <li><a href="">Link 4</a></li>
-                </ul>
-            </div>
-
-            <div class="col-md-3 col-lg-2 col-xl-2 mx-auto">
-                <h5>Others links</h5>
-                <hr class="bg-white mb-2 mt-0 d-inline-block mx-auto w-25">
-                <ul class="list-unstyled">
-                    <li><a href="">Link 1</a></li>
-                    <li><a href="">Link 2</a></li>
-                    <li><a href="">Link 3</a></li>
-                    <li><a href="">Link 4</a></li>
-                </ul>
-            </div>
-
-            <div class="col-md-4 col-lg-3 col-xl-3">
-                <h5>Contact</h5>
-                <hr class="bg-white mb-2 mt-0 d-inline-block mx-auto w-25">
-                <ul class="list-unstyled">
-                    <li><i class="fa fa-home mr-2"></i> My company</li>
-                    <li><i class="fa fa-envelope mr-2"></i> email@example.com</li>
-                    <li><i class="fa fa-phone mr-2"></i> + 33 12 14 15 16</li>
-                    <li><i class="fa fa-print mr-2"></i> + 33 12 14 15 16</li>
-                </ul>
-            </div>
-        </div>
-    </div>
-</footer>
-
Index: s-n-go-do-5ta-faza/src/main/resources/templates/fragments/header.html
===================================================================
--- bus-n-go-do-5ta-faza/src/main/resources/templates/fragments/header.html	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,68 +1,0 @@
-<header xmlns:th="http://www.thymeleaf.org">
-  <nav class="navbar navbar-expand-md navbar-dark bg-dark">
-    <div class="container">
-      <a class="navbar-brand" href="/">Bus & GO</a>
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
-              aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-
-      <div class="collapse navbar-collapse justify-content-end" id="navbarsExampleDefault">
-        <ul class="navbar-nav m-auto">
-          <li sec:authorize="hasRole('ROLE_PASSENGER')" class="nav-item m-auto">
-            <a class="nav-link active" href="/bilet">Bileti</a>
-          </li>
-          <li sec:authorize="hasAnyRole('ROLE_PASSENGER')" class="nav-item m-auto">
-            <a class="nav-link active" href="/vozenje">Vozenja</a>
-          </li>
-          <li sec:authorize="hasRole('ROLE_PASSENGER')" class="nav-item m-auto">
-            <a class="nav-link active" href="/kazna">Kazni</a>
-          </li>
-          <li sec:authorize="hasAnyRole('ROLE_CONDUCTOR', 'ROLE_DRIVER')" class="nav-item m-auto">
-            <a class="nav-link active" href="/instanca-na-linija">Instanci</a>
-          </li>
-        </ul>
-
-
-        <form class="form-inline my-2 my-lg-0">
-          <div class="input-group input-group-sm">
-            <input type="text" class="form-control" aria-label="Small"
-                   aria-describedby="inputGroup-sizing-sm"
-                   placeholder="Search...">
-            <div class="input-group-append">
-              <button type="button" class="btn btn-secondary btn-number">
-                <i class="fa fa-search"></i>
-              </button>
-            </div>
-          </div>
-        </form>
-        <ul class="nav navbar-nav navbar-right">
-
-          <li class="nav-item">
-            <a class="nav-link" href="#"></a>
-          </li>
-
-          <li class="nav-item" sec:authorize="isAuthenticated()">
-            <a href="#" class="btn btn-light btn-sm ml-3" sec:authentication="name">
-            </a>
-          </li>
-          <li class="nav-item" sec:authorize="isAuthenticated()">
-            <a class="btn btn-light btn-sm ml-3" href="/logout">
-              <i class="fa-solid fa-right-from-bracket"></i> Logout
-            </a>
-          </li>
-          <li class="nav-item" sec:authorize="isAnonymous()">
-            <a class="btn btn-light btn-sm ml-3" href="/login">
-              <i class="fa-solid fa-right-to-bracket"></i> Login
-            </a>
-          </li>
-          <li class="nav-item" sec:authorize="hasRole('ROLE_ADMIN')">
-            <a class="btn btn-light btn-sm ml-3" href="/admin">
-               Admin Menu
-            </a>
-          </li>
-        </ul>
-      </div>
-    </div>
-  </nav>
-</header>
Index: s-n-go-do-5ta-faza/src/main/resources/templates/inlShow.html
===================================================================
--- bus-n-go-do-5ta-faza/src/main/resources/templates/inlShow.html	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,115 +1,0 @@
-<div class="container" xmlns:th="http://www.thymeleaf.org">
-    <form class="form-signin mt-xl-5" method="post" th:action="@{'/instanca-na-linija/{id}/end'(id=${inl.inlId})}">
-        <h2 class="form-signin-heading">Instanca na linija</h2>
-
-        <p>
-            <label for="aRegistracija" class="sr-only">Avtobus</label>
-            <input type="text"
-                   class="form-controll"
-                   th:value="${inl.avtobusByARegistracija.aRegistracija} "
-                   disabled
-                   name="aRegistracija"
-                   id="aRegistracija"
-            >
-        </p>
-
-        <p>
-            <label for="liId" class="sr-only">Linija</label>
-            <select id="liId" name="liId" class="form-control">
-                <option th:value="${inl.linijaByLiId.liId}"
-                        th:text="${inl.linijaByLiId.liIme} + ' - ' + ${inl.linijaByLiId.liPravec}"
-                        selected
-                        disabled></option>
-            </select>
-
-
-        </p>
-
-
-        <div th:if="${param.error}" th:text="${param.error}" class="text-danger"></div>
-
-        <div class="row">
-            <div class="col-md-3">
-                <button th:disabled="${inl.inlDatumEnd != null} ? 'true' : 'false'"
-                        id="submit"
-                        class="btn btn-lg btn-primary btn-block"
-                        type="submit"
-                        th:text="${inl.inlDatumEnd != null} ? 'Already ended' : 'End'"></button>
-            </div>
-        </div>
-    </form>
-
-    <div xmlns:th="http://www.thymeleaf.org">
-
-        <div class="container mb-4">
-            <div class="row">
-                <div class="col-12" >
-                    <div class="table-responsive">
-                        <table class="table table-striped">
-                            <thead>
-                            <tr>
-                                <th scope="col">#</th>
-                                <th scope="col">Timestamp</th>
-                                <th scope="col">Kondukter</th>
-                                <th scope="col"></th>
-                                <th scope="col"></th>
-                                <th scope="col"></th>
-                            </tr>
-                            </thead>
-                            <tbody>
-                            <tr th:each="kontrola : ${kontroli}" class="product">
-                                <td >
-                                    <a th:text="${kontrola.kontrolaId}" th:href="@{'/kontrola/{id}'(id= ${kontrola.kontrolaId})}"></a>
-                                </td>
-                                <td th:text="${kontrola.kontrolaDatum}"></td>
-                                <td th:text="${kontrola.korisnikByKondukterKId.kIme}"></td>
-
-                                <td class="text-right">
-                                    <!--                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">-->
-                                    <!--                                    <form th:action="@{'/products/delete/{id}' (id=${vozenje.vozenjeId})}"-->
-                                    <!--                                          th:method="DELETE">-->
-                                    <!--                                        <button type="submit"-->
-                                    <!--                                                class="btn btn-sm btn-danger delete-product">-->
-                                    <!--                                            <i class="fas fa-trash-alt"></i> Delete-->
-                                    <!--                                        </button>-->
-                                    <!--                                    </form>-->
-                                    <!--                                </th:block>-->
-                                </td>
-                                <td>
-                                    <!--                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">-->
-                                    <!--                                    <a th:href="@{'/products/edit-form/{id}' (id=${vozenje.vozenjeId})}"-->
-                                    <!--                                       class="btn btn-sm btn-info edit-product">-->
-                                    <!--                                        <i class="fas fa-edit"></i> Edit-->
-                                    <!--                                    </a>-->
-                                    <!--                                </th:block>-->
-                                </td>
-                                <td>
-<!--                                    <form th:action="@{'/kontrola/start-for/{id}'(id=${inl.inlId})}"-->
-<!--                                          th:method="GET">-->
-<!--                                        <button type="submit" class="btn btn-sm btn-success add-to-cart">-->
-<!--                                            <i class="fas fa-shopping-cart"></i> Kontrola-->
-<!--                                        </button>-->
-<!--                                    </form>-->
-                                </td>
-                            </tr>
-                            </tbody>
-                        </table>
-                    </div>
-                </div>
-                <div class="col mb-3">
-                    <div class="row">
-                        <div class="col-sm-12 col-md-12">
-                            <a href="/instanca-na-linija/start" class="btn btn-block btn-dark add-product-btn">
-                                Start instanca
-                            </a>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
-
-
-</div>
-
Index: s-n-go-do-5ta-faza/src/main/resources/templates/kontrola.html
===================================================================
--- bus-n-go-do-5ta-faza/src/main/resources/templates/kontrola.html	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,150 +1,0 @@
-<div xmlns:th="http://www.thymeleaf.org">
-
-    <div class="container mb-4">
-        <div class="row">
-            <div class="col-12" >
-
-    <form class="form-signin mt-xl-5" method="post" th:action="@{'/kontrola/{id}/kazni-neregistriran'(id=${kontrola.kontrolaId})}">
-        <h2 class="form-signin-heading">Kazna za neregirstiran</h2>
-
-        <p>
-            <label for="dokument" >Dokument</label>
-            <input class="form-control" name="dokument" id="dokument" type="text">
-        </p>
-
-
-        <p>
-            <label for="telefon" >Telefon</label>
-            <input class="form-control" name="telefon" id="telefon" type="text">
-        </p>
-
-        <p>
-            <label for="ime" >Ime</label>
-            <input class="form-control" name="ime" id="ime" type="text">
-        </p>
-
-        <p>
-            <label for="adresa" >Adresa</label>
-            <input class="form-control" name="adresa" id="adresa" type="text">
-        </p>
-
-
-        <p>
-            <label for="iznos" >Iznos</label>
-            <input class="form-control" name="iznos" id="iznos" type="number">
-        </p>
-
-
-        <div th:if="${param.error}" th:text="${param.error}" class="text-danger"></div>
-
-        <div class="row">
-            <div class="col-md-3">
-                <button id="submit" class="btn btn-lg btn-primary btn-block" type="submit">Kazni</button>
-            </div>
-        </div>
-    </form>
-
-
-
-    <form class="form-signin mt-xl-5" method="post" th:action="@{'/kontrola/{id}/kazni-registriran'(id=${kontrola.kontrolaId})}">
-        <h2 class="form-signin-heading">Kazna za regirstiran</h2>
-
-        <p>
-            <label for="dk" >Dokument</label>
-            <input class="form-control" name="dokument" id="dk" type="text">
-        </p>
-
-        <p>
-            <label for="iz" >Iznos</label>
-            <input class="form-control" name="iznos" id="iz" type="number">
-        </p>
-
-        <p>
-            <label for="patnik" >Patnik</label>
-            <select id="patnik" name="patnik" class="form-control">
-                <option th:each="patnik : ${patnici}"
-                        th:value="${patnik.kId}"
-                        th:text="${patnik.kIme} + ' - ' + ${patnik.kEmail}">
-
-                </option>
-            </select>
-        </p>
-
-
-        <div th:if="${param.error}" th:text="${param.error}" class="text-danger"></div>
-
-        <div class="row">
-            <div class="col-md-3">
-                <button id="sub" class="btn btn-lg btn-primary btn-block" type="submit">Kazni</button>
-            </div>
-        </div>
-    </form>
-
-            </div>
-        </div>
-    </div>
-
-
-
-
-
-
-
-
-
-    <div class="container mb-4">
-        <div class="row">
-            <div class="col-12" >
-                <div class="table-responsive">
-                    <table class="table table-striped">
-                        <thead>
-                        <tr>
-                            <th scope="col">#</th>
-                            <th scope="col">Iznos</th>
-                            <th scope="col">Plateno</th>
-                            <th scope="col">Dokument</th>
-                            <th scope="col"></th>
-                            <th scope="col"></th>
-                            <th scope="col"></th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <tr th:each="kazna : ${kazni}" class="product">
-                            <td th:text="${kazna.kzId}"></td>
-                            <td th:text="${kazna.kzIznos}"></td>
-                            <td th:text="${kazna.kzPlateno}"></td>
-                            <td th:text="${kazna.kzDokument}"></td>
-
-                            <td class="text-right">
-<!--                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">-->
-<!--                                    <form th:action="@{'/products/delete/{id}' (id=${kazna.kzId})}"-->
-<!--                                          th:method="DELETE">-->
-<!--                                        <button type="submit"-->
-<!--                                                class="btn btn-sm btn-danger delete-product">-->
-<!--                                            <i class="fas fa-trash-alt"></i> Delete-->
-<!--                                        </button>-->
-<!--                                    </form>-->
-<!--                                </th:block>-->
-                            </td>
-                            <td>
-<!--                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">-->
-<!--                                    <a th:href="@{'/products/edit-form/{id}' (id=${kazna.kzId})}"-->
-<!--                                       class="btn btn-sm btn-info edit-product">-->
-<!--                                        <i class="fas fa-edit"></i> Edit-->
-<!--                                    </a>-->
-<!--                                </th:block>-->
-                            </td>
-                            <td>
-
-                            </td>
-                        </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-
-        </div>
-    </div>
-</div>
-
-
Index: s-n-go-do-5ta-faza/src/main/resources/templates/kupiBilet.html
===================================================================
--- bus-n-go-do-5ta-faza/src/main/resources/templates/kupiBilet.html	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<div xmlns:th="http://www.thymeleaf.org">
-
-
-    <div style="width: 500px">
-        <form method="post" action="/bilet/kupi">
-
-            <p>
-                <label for="tipbilet" class="sr-only">Tip Bilet</label>
-                <select id="tipbilet" name="tipbilet" class="form-control">
-                    <option class="form-control" th:each="tip : ${tipbileti}" th:value="${tip.tbId}" th:text="${tip.tbIme}"></option>
-                </select>
-            </p>
-
-            <input type="submit" value="Kupi" class="btn btn-success">
-        </form>
-
-    </div>
-</div>
-
-
Index: s-n-go-do-5ta-faza/src/main/resources/templates/listBileti.html
===================================================================
--- bus-n-go-do-5ta-faza/src/main/resources/templates/listBileti.html	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,67 +1,0 @@
-<div xmlns:th="http://www.thymeleaf.org">
-
-
-    <div class="container mb-4">
-        <div class="row">
-            <div class="col-12" >
-                <div class="table-responsive">
-                    <table class="table table-striped">
-                        <thead>
-                        <tr>
-                            <th scope="col">#</th>
-                            <th scope="col">Status</th>
-                            <th scope="col">Korisnik Ime</th>
-                            <th scope="col">Tip Bilet</th>
-                            <th scope="col"></th>
-                            <th scope="col"></th>
-                            <th scope="col"></th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <tr th:each="bilet : ${bileti}" class="product">
-                            <td th:text="${bilet.bId}"></td>
-                            <td th:text="${bilet.bStatus.name()}"></td>
-                            <td th:text="${bilet.korisnikByPatnikKId.kIme}"></td>
-                            <td th:text="${bilet.tipbiletByTbId.tbIme}"></td>
-
-                            <td class="text-right">
-<!--                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">-->
-<!--                                    <form th:action="@{'/products/delete/{id}' (id=${bilet.bId})}"-->
-<!--                                          th:method="DELETE">-->
-<!--                                        <button type="submit"-->
-<!--                                                class="btn btn-sm btn-danger delete-product">-->
-<!--                                            <i class="fas fa-trash-alt"></i> Delete-->
-<!--                                        </button>-->
-<!--                                    </form>-->
-<!--                                </th:block>-->
-                            </td>
-                            <td>
-<!--                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">-->
-<!--                                    <a th:href="@{'/products/edit-form/{id}' (id=${bilet.bId})}"-->
-<!--                                       class="btn btn-sm btn-info edit-product">-->
-<!--                                        <i class="fas fa-edit"></i> Edit-->
-<!--                                    </a>-->
-<!--                                </th:block>-->
-                            </td>
-                            <td>
-
-                            </td>
-                        </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-            <div class="col mb-3">
-                <div class="row">
-                    <div class="col-sm-12 col-md-12">
-                        <a href="/bilet/kupi" class="btn btn-block btn-dark add-product-btn">
-                            Kupi bilet
-                        </a>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-
Index: s-n-go-do-5ta-faza/src/main/resources/templates/listInstanci.html
===================================================================
--- bus-n-go-do-5ta-faza/src/main/resources/templates/listInstanci.html	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,80 +1,0 @@
-<div xmlns:th="http://www.thymeleaf.org">
-
-
-    <div class="container mb-4">
-        <div class="row">
-            <div class="col-12" >
-                <div class="table-responsive">
-                    <table class="table table-striped">
-                        <thead>
-                        <tr>
-                            <th scope="col">#</th>
-                            <th scope="col">Vozac</th>
-                            <th scope="col">Avtobus</th>
-                            <th scope="col">Linija</th>
-                            <th scope="col">Pravec</th>
-                            <th scope="col">Start date</th>
-                            <th scope="col">End date</th>
-                            <th scope="col"></th>
-                            <th scope="col"></th>
-                            <th scope="col"></th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <tr th:each="inl : ${inls}" class="product">
-                            <td >
-                                <a th:text="${inl.inlId}" th:href="@{'/instanca-na-linija/{id}'(id= ${inl.inlId})}"></a>
-                            </td>
-                            <td th:text="${inl.korisnikByVozacKId.kIme}"></td>
-                            <td th:text="${inl.avtobusByARegistracija.aRegistracija}"></td>
-                            <td th:text="${inl.linijaByLiId.liIme}"></td>
-                            <td th:text="${inl.linijaByLiId.liPravec}"></td>
-                            <td th:text="${inl.inlDatumStart.toString()}"></td>
-                            <td th:text="${inl.inlDatumEnd != null} ? ${inl.inlDatumEnd.toString()} : 'Still active'"></td>
-
-                            <td class="text-right">
-<!--                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">-->
-<!--                                    <form th:action="@{'/products/delete/{id}' (id=${vozenje.vozenjeId})}"-->
-<!--                                          th:method="DELETE">-->
-<!--                                        <button type="submit"-->
-<!--                                                class="btn btn-sm btn-danger delete-product">-->
-<!--                                            <i class="fas fa-trash-alt"></i> Delete-->
-<!--                                        </button>-->
-<!--                                    </form>-->
-<!--                                </th:block>-->
-                            </td>
-                            <td>
-<!--                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">-->
-<!--                                    <a th:href="@{'/products/edit-form/{id}' (id=${vozenje.vozenjeId})}"-->
-<!--                                       class="btn btn-sm btn-info edit-product">-->
-<!--                                        <i class="fas fa-edit"></i> Edit-->
-<!--                                    </a>-->
-<!--                                </th:block>-->
-                            </td>
-                            <td>
-                                <form th:action="@{'/kontrola/start-for/{id}'(id=${inl.inlId})}"
-                                      th:method="GET">
-                                    <button type="submit" class="btn btn-sm btn-success add-to-cart">
-                                         Kontrola
-                                    </button>
-                                </form>
-                            </td>
-                        </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-            <div class="col mb-3">
-                <div class="row">
-                    <div class="col-sm-12 col-md-12">
-                        <a href="/instanca-na-linija/start" class="btn btn-block btn-dark add-product-btn">
-                            Start instanca
-                        </a>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-
Index: s-n-go-do-5ta-faza/src/main/resources/templates/listKazni.html
===================================================================
--- bus-n-go-do-5ta-faza/src/main/resources/templates/listKazni.html	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,76 +1,0 @@
-<div xmlns:th="http://www.thymeleaf.org">
-
-
-    <div class="container mb-4">
-        <div class="row">
-            <div class="col-12" >
-                <div class="table-responsive">
-                    <table class="table table-striped">
-                        <thead>
-                        <tr>
-                            <th scope="col">#</th>
-                            <th scope="col">Iznos</th>
-                            <th scope="col">Datum</th>
-                            <th scope="col">Plateno</th>
-                            <th scope="col">Datum plateno</th>
-                            <th scope="col">Dokument</th>
-                            <th scope="col"></th>
-                            <th scope="col"></th>
-                            <th scope="col"></th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <tr th:each="kazna : ${kazni}" class="product">
-                            <td th:text="${kazna.kzId}"></td>
-                            <td th:text="${kazna.kzIznos}"></td>
-                            <td th:text="${kazna.kzDatum}"></td>
-                            <td th:text="${kazna.kzPlateno}"></td>
-                            <td th:text="${kazna.kzDatumPlateno}"></td>
-                            <td th:text="${kazna.kzDokument}"></td>
-
-                            <td class="text-right">
-<!--                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">-->
-<!--                                    <form th:action="@{'/products/delete/{id}' (id=${kazna.kzId})}"-->
-<!--                                          th:method="DELETE">-->
-<!--                                        <button type="submit"-->
-<!--                                                class="btn btn-sm btn-danger delete-product">-->
-<!--                                            <i class="fas fa-trash-alt"></i> Delete-->
-<!--                                        </button>-->
-<!--                                    </form>-->
-<!--                                </th:block>-->
-                            </td>
-                            <td>
-<!--                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">-->
-<!--                                    <a th:href="@{'/products/edit-form/{id}' (id=${kazna.kzId})}"-->
-<!--                                       class="btn btn-sm btn-info edit-product">-->
-<!--                                        <i class="fas fa-edit"></i> Edit-->
-<!--                                    </a>-->
-<!--                                </th:block>-->
-                            </td>
-                            <td>
-                                <form th:action="@{'/kazna/{id}/pay' (id=${kazna.kzId})}"
-                                      th:method="POST">
-                                    <button type="submit" class="btn btn-sm btn-success add-to-cart">
-                                         Pay
-                                    </button>
-                                </form>
-                            </td>
-                        </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-            <div class="col mb-3">
-                <div class="row">
-                    <div class="col-sm-12 col-md-12">
-                        <a href="/bilet/kupi" class="btn btn-block btn-dark add-product-btn">
-                            Kupi bilet
-                        </a>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-
Index: s-n-go-do-5ta-faza/src/main/resources/templates/listVozenja.html
===================================================================
--- bus-n-go-do-5ta-faza/src/main/resources/templates/listVozenja.html	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,83 +1,0 @@
-<div xmlns:th="http://www.thymeleaf.org">
-    <section class="jumbotron text-center">
-        <div class="container">
-            <h1 class="jumbotron-heading">WEB PROGRAMMING SHOP</h1>
-            <h3 class="jumbotron-heading">All products</h3>
-        </div>
-    </section>
-
-    <form method="get" action="/vozenje">
-        <select name="status">
-            <option th:each="status : ${vozStatus}" th:value="${status}" th:text="${status.name()}"></option>
-        </select>
-
-        <input type="submit" value="Search">
-    </form>
-
-    <div class="container mb-4">
-        <div class="row">
-            <div class="col-12" >
-                <div class="table-responsive">
-                    <table class="table table-striped">
-                        <thead>
-                        <tr>
-                            <th scope="col">#</th>
-                            <th scope="col">Status</th>
-                            <th scope="col">Korisnik Ime</th>
-                            <th scope="col">Bilet Id</th>
-                            <th scope="col">Tip Bilet</th>
-                            <th scope="col"></th>
-                            <th scope="col"></th>
-                            <th scope="col"></th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <tr th:each="vozenje : ${vozenja}" class="product">
-                            <td th:text="${vozenje.vozenjeId}"></td>
-                            <td th:text="${vozenje.vozenjeStatus.name()}"></td>
-                            <td th:text="${vozenje.korisnikByPatnikKId.kIme}"></td>
-                            <td th:text="${vozenje.biletByBId.bId}"></td>
-                            <td th:text="${vozenje.biletByBId.tipbiletByTbId.tbIme}"></td>
-
-                            <td class="text-right">
-                                <th:block  >
-                                    <form th:action="@{'/vozenje/{id}/end' (id=${vozenje.vozenjeId})}"
-                                          th:hidden="${vozenje.vozenjeStatus.name().equals('FINISHED')} ? 'true' : 'false'"
-                                          th:method="GET">
-                                        <button type="submit"
-                                                class="btn btn-sm btn-danger delete-product">
-                                            <i class="fas fa-trash-alt"></i> End
-                                        </button>
-                                    </form>
-                                </th:block>
-                            </td>
-                            <td>
-<!--                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">-->
-<!--                                    <a th:href="@{'/products/edit-form/{id}' (id=${vozenje.vozenjeId})}"-->
-<!--                                       class="btn btn-sm btn-info edit-product">-->
-<!--                                        <i class="fas fa-edit"></i> Edit-->
-<!--                                    </a>-->
-<!--                                </th:block>-->
-                            </td>
-                            <td>
-
-                            </td>
-                        </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-            <div class="col mb-3">
-                <div class="row">
-                    <div class="col-sm-12 col-md-12">
-                        <a href="/vozenje/start" class="btn btn-block btn-dark add-product-btn">
-                            Start vozenje
-                        </a>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-
Index: s-n-go-do-5ta-faza/src/main/resources/templates/login.html
===================================================================
--- bus-n-go-do-5ta-faza/src/main/resources/templates/login.html	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,27 +1,0 @@
-<div class="container" xmlns:th="http://www.thymeleaf.org">
-    <form class="form-signin mt-xl-5" method="post" action="/login">
-        <h2 class="form-signin-heading">Sign in</h2>
-        <p>
-            <label for="username" class="sr-only">Username</label>
-            <input type="text" id="username" name="username" class="form-control" placeholder="Username" required=""
-                   autofocus="">
-        </p>
-        <p>
-            <label for="password" class="sr-only">Password</label>
-            <input type="password" id="password" name="password" class="form-control" placeholder="Password"
-                   required="">
-        </p>
-
-        <div th:if="${param.error}" th:text="${param.error}" class="text-danger"></div>
-
-        <div class="row">
-            <div class="col-md-3">
-                <button id="submit" class="btn btn-lg btn-primary btn-block" type="submit">Sign in</button>
-            </div>
-            <div class="col-md-3">
-                <a href="/register" class="btn btn-lg btn-block btn-light">Register here</a>
-            </div>
-        </div>
-    </form>
-</div>
-
Index: s-n-go-do-5ta-faza/src/main/resources/templates/master-template.html
===================================================================
--- bus-n-go-do-5ta-faza/src/main/resources/templates/master-template.html	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,30 +1,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <meta charset="UTF-8"/>
-    <title>Products</title>
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css"
-          integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
-    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
-            integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
-            crossorigin="anonymous"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"
-            integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1"
-            crossorigin="anonymous"></script>
-    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"
-            integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM"
-            crossorigin="anonymous"></script>
-    <script src="https://kit.fontawesome.com/e59232f0a1.js" crossorigin="anonymous"></script>
-</head>
-<body>
-<header th:replace="fragments/header"/>
-
-<div th:text="${error}"></div>
-
-<section th:include="${bodyContent}">
-
-</section>
-<footer th:replace="fragments/footer"/>
-</body>
-</html>
-
Index: s-n-go-do-5ta-faza/src/main/resources/templates/register.html
===================================================================
--- bus-n-go-do-5ta-faza/src/main/resources/templates/register.html	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,57 +1,0 @@
-<div xmlns:th="http://www.thymeleaf.org">
-
-  <div class="container mb-4">
-    <form class="form-signin mt-xl-5" method="post" action="/register">
-      <h2 class="form-signin-heading">Register</h2>
-      <p>
-        <label for="username" class="sr-only">Email</label>
-        <input type="text" id="username" name="email" class="form-control" placeholder="Email" required="" autofocus="">
-      </p>
-      <p>
-        <label for="password" class="sr-only">Password</label>
-        <input type="password" id="password" name="password" class="form-control" placeholder="Password" required="">
-      </p>
-      <p>
-        <label for="repeatedPassword" class="sr-only">Repeat Password</label>
-        <input type="password" id="repeatedPassword" name="confirmPassword" class="form-control" placeholder="Repeat Password" required="">
-      </p>
-      <p>
-        <label for="name" class="sr-only">Name</label>
-        <input type="text" id="name" name="name" class="form-control" placeholder="Name" required="" autofocus="">
-      </p>
-      <p>
-        <label for="surname" class="sr-only">Address</label>
-        <input type="text" id="surname" name="address" class="form-control" placeholder="Address" required="" autofocus="">
-      </p>
-      <p>
-        <label for="phone" class="sr-only">Phone</label>
-        <input type="text" id="phone" name="phone" class="form-control" placeholder="Phone" required="" autofocus="">
-      </p>
-
-<!--      <p sec:authorize="hasRole('ROLE_ADMIN')">-->
-        <label for="role" class="sr-only">Role</label>
-        <select name="role" id="role">
-          <option th:each="role : ${roles}"
-                  th:text="${role.name()}"
-                  th:value="${role}" ></option>
-        </select>
-<!--      </p>-->
-
-      <p sec:authorize="hasRole('ROLE_ADMIN')">
-        <label for="salary" class="sr-only">Salary</label>
-        <input type="number" id="salary" name="salary">
-      </p>
-
-
-
-
-      <th:block th:if="${hasError}">
-        <div th:text="${error}" class="text-danger"></div>
-      </th:block>
-
-      <button class="btn btn-lg btn-primary btn-block" type="submit">Sign up</button>
-    </form>
-    <a href="/login" class="btn btn-block btn-light">Already have an account? Login here!</a>
-  </div>
-
-</div>
Index: s-n-go-do-5ta-faza/src/main/resources/templates/startInstanca.html
===================================================================
--- bus-n-go-do-5ta-faza/src/main/resources/templates/startInstanca.html	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,29 +1,0 @@
-<div class="container" xmlns:th="http://www.thymeleaf.org">
-    <form class="form-signin mt-xl-5" method="post" action="/instanca-na-linija/start">
-        <h2 class="form-signin-heading">Start instanca na linija</h2>
-
-        <p>
-            <label for="aRegistracija" class="sr-only">Avtobus</label>
-            <select   class="form-control" name="aRegistracija" id="aRegistracija">
-                <option class="form-control" th:each="avtobus : ${avtobusi}" th:text="${avtobus.aRegistracija}"  th:value="${avtobus.aRegistracija} "  ></option>
-            </select>
-        </p>
-
-        <p>
-            <label for="liId" class="sr-only">Password</label>
-            <select id="liId" name="liId" class="form-control">
-                <option th:each="linija : ${linii}" th:value="${linija.liId}" th:text="${linija.liIme} + ' - ' + ${linija.liPravec}"></option>
-            </select>
-        </p>
-
-
-        <div th:if="${param.error}" th:text="${param.error}" class="text-danger"></div>
-
-        <div class="row">
-            <div class="col-md-3">
-                <button id="submit" class="btn btn-lg btn-primary btn-block" type="submit">Start</button>
-            </div>
-        </div>
-    </form>
-</div>
-
Index: s-n-go-do-5ta-faza/src/main/resources/templates/startVozenje.html
===================================================================
--- bus-n-go-do-5ta-faza/src/main/resources/templates/startVozenje.html	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,35 +1,0 @@
-<div class="container" xmlns:th="http://www.thymeleaf.org">
-    <form class="form-signin mt-xl-5" th:method="${postojka} != null ? 'post' : 'get'" action="/vozenje/start">
-        <h2 class="form-signin-heading">Start vozenje</h2>
-
-        <p>
-            <label for="pnlId" class="sr-only">Postojka</label>
-            <select   class="form-control" name="pnlId" id="pnlId">
-                <option class="form-control" th:each="pos : ${postojki}" th:text="${pos.postojkaByPId.pIme}" th:selected="${postojka!= null && postojka.pnlId == pos.pnlId} ? 'true' : 'false' " th:disabled="${postojka!= null && postojka.pnlId != pos.pnlId} ? 'true' : 'false' "  th:value="${pos.pnlId} "  ></option>
-            </select>
-        </p>
-
-        <p th:hidden="${instanci} == null">
-            <label for="instanca" class="sr-only">Password</label>
-            <select id="instanca" name="inlId" class="form-control">
-                <option th:each="instanca : ${instanci}" th:value="${instanca.inlId}" th:text="${instanca.linijaByLiId.liIme} + ' - ' + ${instanca.linijaByLiId.liPravec}"></option>
-            </select>
-        </p>
-
-        <p th:hidden="${instanci} == null">
-            <label for="bilet" class="sr-only">Password</label>
-            <select id="bilet" name="bId" class="form-control">
-                <option th:each="bilet : ${bileti}" th:value="${bilet.bId}" th:text="${bilet.tipbiletByTbId.tbIme} + ' - ' + ${bilet.bStatus.name()}"></option>
-            </select>
-        </p>
-
-        <div th:if="${param.error}" th:text="${param.error}" class="text-danger"></div>
-
-        <div class="row">
-            <div class="col-md-3">
-                <button id="submit" class="btn btn-lg btn-primary btn-block" type="submit">Start</button>
-            </div>
-        </div>
-    </form>
-</div>
-
Index: s-n-go-do-5ta-faza/src/test/java/mk/ukim/finki/busngo/BusNGoApplicationTests.java
===================================================================
--- bus-n-go-do-5ta-faza/src/test/java/mk/ukim/finki/busngo/BusNGoApplicationTests.java	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,13 +1,0 @@
-package mk.ukim.finki.busngo;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class BusNGoApplicationTests {
-
-    @Test
-    void contextLoads() {
-    }
-
-}
Index: s-n-go-pavel-216049/.gitignore
===================================================================
--- bus-n-go-pavel-216049/.gitignore	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,83 +1,0 @@
-# See https://docs.github.com/get-started/getting-started-with-git/ignoring-files for more about ignoring files.
-
-# Compiled output
-/dist
-/tmp
-/out-tsc
-/bazel-out
-
-# Node
-/node_modules
-npm-debug.log
-yarn-error.log
-
-# IDEs and editors
-.idea/
-.project
-.classpath
-.c9/
-*.launch
-.settings/
-*.sublime-workspace
-
-# Visual Studio Code
-.vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
-.history/*
-
-# Miscellaneous
-/.angular/cache
-.sass-cache/
-/connect.lock
-/coverage
-/libpeerconnection.log
-testem.log
-/typings
-
-# System files
-.DS_Store
-Thumbs.db
-
-HELP.md
-.gradle
-build/
-!gradle/wrapper/gradle-wrapper.jar
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-bin/
-!**/src/main/**/bin/
-!**/src/test/**/bin/
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-out/
-!**/src/main/**/out/
-!**/src/test/**/out/
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-
-### VS Code ###
-.vscode/
-
-### Kotlin ###
-.kotlin
Index: s-n-go-pavel-216049/bus-n-go-backend/.gitignore
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/.gitignore	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,40 +1,0 @@
-HELP.md
-.gradle
-build/
-!gradle/wrapper/gradle-wrapper.jar
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-bin/
-!**/src/main/**/bin/
-!**/src/test/**/bin/
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-out/
-!**/src/main/**/out/
-!**/src/test/**/out/
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-
-### VS Code ###
-.vscode/
-
-### Kotlin ###
-.kotlin
Index: s-n-go-pavel-216049/bus-n-go-backend/build.gradle.kts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/build.gradle.kts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,51 +1,0 @@
-plugins {
-    id("org.springframework.boot") version "3.3.1"
-    id("io.spring.dependency-management") version "1.1.5"
-    kotlin("jvm") version "1.9.24"
-    kotlin("plugin.spring") version "1.9.24"
-    kotlin("plugin.jpa") version "1.9.24"
-}
-
-group = "mk.ukim.finki"
-version = "0.0.1-SNAPSHOT"
-
-java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(17)
-    }
-}
-
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    testImplementation("org.jetbrains.kotlin:kotlin-test-junit5")
-    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
-    implementation("com.pinterest.ktlint:ktlint-cli:1.3.0")
-    implementation("org.springframework.boot:spring-boot-starter-data-jpa")
-    implementation("org.springframework.boot:spring-boot-starter-websocket")
-    implementation("org.springframework.boot:spring-boot-starter-security")
-    implementation("org.springframework.boot:spring-boot-starter-oauth2-client")
-    implementation("org.springframework.boot:spring-boot-starter-web")
-    implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
-    implementation("org.flywaydb:flyway-core")
-    runtimeOnly("org.flywaydb:flyway-database-postgresql:10.15.0")
-    implementation("org.jetbrains.kotlin:kotlin-reflect")
-    implementation("io.jsonwebtoken:jjwt-api:0.12.5")
-    runtimeOnly("org.postgresql:postgresql")
-    implementation("io.jsonwebtoken:jjwt-impl:0.12.5")
-    implementation("io.jsonwebtoken:jjwt-jackson:0.12.5")
-    testImplementation("org.springframework.boot:spring-boot-starter-test")
-}
-
-kotlin {
-    compilerOptions {
-        freeCompilerArgs.addAll("-Xjsr305=strict")
-    }
-}
-
-tasks.withType<Test> {
-    useJUnitPlatform()
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/gradle/wrapper/gradle-wrapper.properties
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/gradle/wrapper/gradle-wrapper.properties	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,7 +1,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
-networkTimeout=10000
-validateDistributionUrl=true
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
Index: s-n-go-pavel-216049/bus-n-go-backend/gradlew
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/gradlew	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,249 +1,0 @@
-#!/bin/sh
-
-#
-# Copyright © 2015-2021 the original authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-##############################################################################
-#
-#   Gradle start up script for POSIX generated by Gradle.
-#
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh Gradle
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       Darwin, MinGW, and NonStop.
-#
-#   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-#       within the Gradle project.
-#
-#       You can find Gradle at https://github.com/gradle/gradle/.
-#
-##############################################################################
-
-# Attempt to set APP_HOME
-
-# Resolve links: $0 may be a link
-app_path=$0
-
-# Need this for daisy-chained symlinks.
-while
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    [ -h "$app_path" ]
-do
-    ls=$( ls -ld "$app_path" )
-    link=${ls#*' -> '}
-    case $link in             #(
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
-done
-
-# This is normally unused
-# shellcheck disable=SC2034
-APP_BASE_NAME=${0##*/}
-# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
-
-warn () {
-    echo "$*"
-} >&2
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-} >&2
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "$( uname )" in                #(
-  CYGWIN* )         cygwin=true  ;; #(
-  Darwin* )         darwin=true  ;; #(
-  MSYS* | MINGW* )  msys=true    ;; #(
-  NONSTOP* )        nonstop=true ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
-    else
-        JAVACMD=$JAVA_HOME/bin/java
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD=java
-    if ! command -v java >/dev/null 2>&1
-    then
-        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-fi
-
-# Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    case $MAX_FD in #(
-      max*)
-        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
-        MAX_FD=$( ulimit -H -n ) ||
-            warn "Could not query maximum file descriptor limit"
-    esac
-    case $MAX_FD in  #(
-      '' | soft) :;; #(
-      *)
-        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
-fi
-
-# Collect all arguments for the java command, stacking in reverse order:
-#   * args from the command line
-#   * the main class name
-#   * -classpath
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
-
-    JAVACMD=$( cygpath --unix "$JAVACMD" )
-
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    for arg do
-        if
-            case $arg in                                #(
-              -*)   false ;;                            # don't mess with options #(
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
-        fi
-        # Roll the args list around exactly as many times as the number of
-        # args, so each arg winds up back in the position where it started, but
-        # possibly modified.
-        #
-        # NB: a `for` loop captures its iteration list before it begins, so
-        # changing the positional parameters here affects neither the number of
-        # iterations, nor the values presented in `arg`.
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
-    done
-fi
-
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
-#     and any embedded shellness will be escaped.
-#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
-#     treated as '${Hostname}' itself on the command line.
-
-set -- \
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
-        "$@"
-
-# Stop when "xargs" is not available.
-if ! command -v xargs >/dev/null 2>&1
-then
-    die "xargs is not available"
-fi
-
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
-
-exec "$JAVACMD" "$@"
Index: s-n-go-pavel-216049/bus-n-go-backend/gradlew.bat
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/gradlew.bat	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,92 +1,0 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%"=="" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
-
-echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
Index: s-n-go-pavel-216049/bus-n-go-backend/settings.gradle.kts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/settings.gradle.kts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,1 +1,0 @@
-rootProject.name = "bus-n-go-backend"
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/BusNGoBackendApplication.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/BusNGoBackendApplication.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,39 +1,0 @@
-package mk.ukim.finki.busngobackend
-
-import org.springframework.boot.autoconfigure.SpringBootApplication
-import org.springframework.boot.runApplication
-import org.springframework.context.annotation.Bean
-import org.springframework.context.event.ApplicationEventMulticaster
-import org.springframework.context.event.SimpleApplicationEventMulticaster
-import org.springframework.core.task.SimpleAsyncTaskExecutor
-import org.springframework.scheduling.annotation.EnableAsync
-import org.springframework.scheduling.annotation.EnableScheduling
-import org.springframework.security.crypto.password.NoOpPasswordEncoder
-import org.springframework.security.crypto.password.PasswordEncoder
-
-@SpringBootApplication
-@EnableAsync
-@EnableScheduling
-class BusNGoBackendApplication
-
-fun main(args: Array<String>) {
-    runApplication<BusNGoBackendApplication>(*args)
-}
-
-@Bean
-fun encoder(): PasswordEncoder = NoOpPasswordEncoder.getInstance()
-//    object : PasswordEncoder {
-//        override fun encode(rawPassword: CharSequence?): String = rawPassword.toString()
-//
-//        override fun matches(
-//            rawPassword: CharSequence?,
-//            encodedPassword: String?,
-//        ): Boolean = rawPassword != null && rawPassword.toString() == encodedPassword
-//    }
-
-@Bean
-fun asyncEventPublisher(): ApplicationEventMulticaster {
-    val publisher = SimpleApplicationEventMulticaster()
-    publisher.setTaskExecutor(SimpleAsyncTaskExecutor())
-    return publisher
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/AdminController.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/AdminController.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,40 +1,0 @@
-package mk.ukim.finki.busngobackend.api
-
-import mk.ukim.finki.busngobackend.service.AdminService
-import org.springframework.web.bind.annotation.*
-
-@RestController
-@RequestMapping("/api/admin")
-class AdminController(
-    private val adminService: AdminService,
-) {
-    @GetMapping("/average-time-between-stations")
-    fun getAvgTimeBetweenStations() = adminService.getAverageTimeBetweenStations()
-
-    @GetMapping("/fines-by-line")
-    fun getFinesByLine() = adminService.getFinesByLine()
-
-    @GetMapping("/commutes-by-hour")
-    fun getCommutesByHour() = adminService.getCommutesByHour()
-
-    @GetMapping("/commutes-by-line")
-    fun getCommutesByLine() = adminService.getCommutesByLine()
-
-    @GetMapping("/number-of-passengers-per-line-and-station")
-    fun getNumberOfPassengersPerLineAndStation() = adminService.getNumberOfPassengersByLineAndStation()
-
-    @GetMapping("/ticket-sales")
-    fun getTicketSales() = adminService.getTicketSales()
-
-    @GetMapping("/total-income")
-    fun getTotalIncome() = adminService.getTotalIncome()
-
-    @GetMapping("/all-users")
-    fun getAllUsers() = adminService.getAllUsers()
-
-    @PostMapping("/update-roles/{id}")
-    fun updateRolesForUser(
-        @PathVariable id: Long,
-        @RequestBody roles: List<String>,
-    ) = adminService.updateRolesForUser(id, roles)
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/AuthController.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/AuthController.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,29 +1,0 @@
-package mk.ukim.finki.busngobackend.api
-
-import mk.ukim.finki.busngobackend.api.requests.AuthRequest
-import mk.ukim.finki.busngobackend.api.requests.RegisterRequest
-import mk.ukim.finki.busngobackend.api.responses.AuthResponse
-import mk.ukim.finki.busngobackend.service.AuthService
-import org.springframework.web.bind.annotation.*
-
-@RestController
-@RequestMapping("/api/auth")
-class AuthController(
-    private val authService: AuthService,
-) {
-    @GetMapping()
-    fun isAuthenticated() = authService.isAuthenticated()
-
-    @PostMapping("/register")
-    fun register(
-        @RequestBody registerRequest: RegisterRequest,
-    ): AuthResponse = authService.register(registerRequest)
-
-    @PostMapping()
-    fun authenticate(
-        @RequestBody authRequest: AuthRequest,
-    ): AuthResponse = authService.authenticate(authRequest)
-
-    @GetMapping("/is-driver-free")
-    fun isDriverFree() = this.authService.isDriverFree()
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/BusController.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/BusController.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,18 +1,0 @@
-package mk.ukim.finki.busngobackend.api
-
-import mk.ukim.finki.busngobackend.service.BusService
-import org.springframework.web.bind.annotation.GetMapping
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RestController
-
-@RestController
-@RequestMapping("/api/buses")
-class BusController(
-    private val busService: BusService,
-) {
-    @GetMapping("")
-    fun getAllBuses() = busService.findAll()
-
-    @GetMapping("/free")
-    fun getAllFrees() = busService.findAllFree()
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/ChatController.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/ChatController.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,26 +1,0 @@
-package mk.ukim.finki.busngobackend.api
-
-import org.springframework.messaging.handler.annotation.MessageMapping
-import org.springframework.messaging.handler.annotation.Payload
-import org.springframework.messaging.handler.annotation.SendTo
-import org.springframework.messaging.simp.SimpMessageHeaderAccessor
-import org.springframework.web.bind.annotation.RestController
-
-@RestController
-class ChatController {
-    @MessageMapping("/chat.sendMessage")
-    @SendTo("/topic/public")
-    fun sendMessage(
-        @Payload message: String,
-    ): String = message
-
-    @MessageMapping("/chat.addUser")
-    @SendTo("/topic/public")
-    fun addUser(
-        @Payload message: String,
-        headerAccessor: SimpMessageHeaderAccessor,
-    ): String {
-        headerAccessor.sessionAttributes?.put("username", message)
-        return message
-    }
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/CommuteController.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/CommuteController.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,23 +1,0 @@
-package mk.ukim.finki.busngobackend.api
-
-import mk.ukim.finki.busngobackend.api.requests.StartCommuteRequest
-import mk.ukim.finki.busngobackend.service.CommuteService
-import org.springframework.web.bind.annotation.PutMapping
-import org.springframework.web.bind.annotation.RequestBody
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RestController
-
-@RestController
-@RequestMapping("/api/commutes")
-class CommuteController(
-    private val commuteService: CommuteService,
-) {
-    @PutMapping("/start")
-    fun startCommute(
-        @RequestBody request: StartCommuteRequest,
-    ) = commuteService.start(request)
-
-    // subscribe to the topic for that station
-    // receive the incoming route instances
-    // choose one as target and start commute
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/ControlsController.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/ControlsController.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,23 +1,0 @@
-package mk.ukim.finki.busngobackend.api
-
-import mk.ukim.finki.busngobackend.service.ControlService
-import org.springframework.web.bind.annotation.*
-
-@RestController
-@RequestMapping("/api/controls")
-class ControlsController(
-    private val controlService: ControlService,
-) {
-    @GetMapping()
-    fun getControls() = controlService.getAllByConductor()
-
-    @PutMapping("/start")
-    fun start(
-        @RequestBody routeInstanceId: Long,
-    ) = controlService.start(routeInstanceId)
-
-    @GetMapping("/{controlId}/fines")
-    fun getFines(
-        @PathVariable controlId: Long,
-    ) = controlService.getFines(controlId)
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/DummyDataPopulatorController.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/DummyDataPopulatorController.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,21 +1,0 @@
-package mk.ukim.finki.busngobackend.api
-
-import mk.ukim.finki.busngobackend.simulator.DummyDataPopulator
-import org.springframework.web.bind.annotation.GetMapping
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RestController
-
-@RestController
-@RequestMapping("/api/dummy")
-class DummyDataPopulatorController(
-    private val dummyDataPopulator: DummyDataPopulator,
-) {
-    @GetMapping("/route-instances")
-    fun populateRouteInstances() = dummyDataPopulator.populateRouteInstances()
-
-    @GetMapping("/commutes")
-    fun populateCommutes() = dummyDataPopulator.populateCommutes()
-
-    @GetMapping("/fines")
-    fun populateFines() = dummyDataPopulator.populateFines()
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/FineController.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/FineController.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,19 +1,0 @@
-package mk.ukim.finki.busngobackend.api
-
-import mk.ukim.finki.busngobackend.api.requests.FineRequest
-import mk.ukim.finki.busngobackend.service.FineService
-import org.springframework.web.bind.annotation.PutMapping
-import org.springframework.web.bind.annotation.RequestBody
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RestController
-
-@RestController
-@RequestMapping("/api/fines")
-class FineController(
-    private val fineService: FineService,
-) {
-    @PutMapping()
-    fun createFine(
-        @RequestBody request: FineRequest,
-    ) = fineService.createFine(request)
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/LineController.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/LineController.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,28 +1,0 @@
-package mk.ukim.finki.busngobackend.api
-
-import mk.ukim.finki.busngobackend.service.DirectionService
-import mk.ukim.finki.busngobackend.service.LineService
-import mk.ukim.finki.busngobackend.service.StationService
-import org.springframework.web.bind.annotation.*
-
-@RestController
-@RequestMapping("/api/lines")
-class LineController(
-    private val lineService: LineService,
-    private val directionService: DirectionService,
-    private val stationService: StationService,
-) {
-    @GetMapping("")
-    fun getLines() = lineService.findAllLines()
-
-    @GetMapping("/{id}/directions")
-    fun getLineDirections(
-        @PathVariable("id") lineId: Int,
-    ) = directionService.findDirectionsByLineId(lineId)
-
-    @GetMapping("/{lineId}/stations")
-    fun getLineStations(
-        @PathVariable("lineId") lineId: Int,
-        @RequestParam("directionId", required = false) directionId: Long,
-    ) = stationService.findStationsByLineIdAndDirectionId(lineId, directionId)
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/RouteInstanceController.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/RouteInstanceController.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,34 +1,0 @@
-package mk.ukim.finki.busngobackend.api
-
-import mk.ukim.finki.busngobackend.api.requests.StartRouteInstanceRequest
-import mk.ukim.finki.busngobackend.service.RouteInstanceService
-import org.springframework.web.bind.annotation.*
-
-@RestController
-@RequestMapping("/api/route-instances")
-class RouteInstanceController(
-    private val routeInstanceService: RouteInstanceService,
-) {
-    @PostMapping("/start")
-    fun start(
-        @RequestBody request: StartRouteInstanceRequest,
-    ) = routeInstanceService.start(request)
-
-    @PatchMapping("/stop")
-    fun stop(
-        @RequestBody id: Long,
-    ) = routeInstanceService.stop(id)
-
-    @GetMapping("/{id}")
-    fun getById(
-        @PathVariable id: Long,
-    ) = this.routeInstanceService.getById(id)
-
-    @GetMapping("/station/{stationId}")
-    fun getForStation(
-        @PathVariable stationId: Long,
-    ) = routeInstanceService.getForStation(stationId)
-
-    @GetMapping()
-    fun getAll() = routeInstanceService.getAll()
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/StationController.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/StationController.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,15 +1,0 @@
-package mk.ukim.finki.busngobackend.api
-
-import mk.ukim.finki.busngobackend.service.StationService
-import org.springframework.web.bind.annotation.GetMapping
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RestController
-
-@RestController
-@RequestMapping("/api/stations")
-class StationController(
-    private val stationService: StationService,
-) {
-    @GetMapping()
-    fun getAllStations() = stationService.getAll()
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/TicketController.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/TicketController.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,25 +1,0 @@
-package mk.ukim.finki.busngobackend.api
-
-import mk.ukim.finki.busngobackend.api.requests.TicketBuyRequest
-import mk.ukim.finki.busngobackend.api.responses.TicketResponse
-import mk.ukim.finki.busngobackend.service.BiletService
-import org.springframework.web.bind.annotation.*
-
-@RestController
-@RequestMapping("/api/tickets")
-class TicketController(
-    private val biletService: BiletService,
-) {
-    @GetMapping()
-    fun getTicketsByUser(): List<TicketResponse> = this.biletService.getTicketsByUser()
-
-    @PostMapping("/buy")
-    fun buyTicket(
-        @RequestBody request: TicketBuyRequest,
-    ): TicketResponse = this.biletService.buyTicket(request)
-
-    @PatchMapping("/activate/{id}")
-    fun activateTicket(
-        @PathVariable id: Long,
-    ): TicketResponse = this.biletService.activateTicket(id)
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/TicketTypeController.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/TicketTypeController.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,16 +1,0 @@
-package mk.ukim.finki.busngobackend.api
-
-import mk.ukim.finki.busngobackend.domain.entities.Tipbilet
-import mk.ukim.finki.busngobackend.repository.TipbiletRepository
-import org.springframework.web.bind.annotation.GetMapping
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RestController
-
-@RestController
-@RequestMapping("/api/ticket-types")
-class TicketTypeController(
-    private val tipbiletRepository: TipbiletRepository,
-) {
-    @GetMapping()
-    fun getTicketTypes(): List<Tipbilet> = tipbiletRepository.findAll()
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/UserController.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/UserController.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,19 +1,0 @@
-package mk.ukim.finki.busngobackend.api
-
-import mk.ukim.finki.busngobackend.api.responses.UserResponse
-import mk.ukim.finki.busngobackend.service.KorisnikService
-import org.springframework.web.bind.annotation.GetMapping
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RestController
-
-@RestController
-@RequestMapping("/api/users")
-class UserController(
-    private val korisnikService: KorisnikService,
-) {
-    @GetMapping()
-    fun getAuthenticatedUser(): UserResponse = korisnikService.getAuthenticatedUser()
-
-    @GetMapping("/passengers")
-    fun getAllPassengers() = korisnikService.getAllPassengers()
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/requests/AuthRequest.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/requests/AuthRequest.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,6 +1,0 @@
-package mk.ukim.finki.busngobackend.api.requests
-
-data class AuthRequest(
-    val email: String,
-    val password: String,
-)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/requests/FineRequest.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/requests/FineRequest.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,12 +1,0 @@
-package mk.ukim.finki.busngobackend.api.requests
-
-data class FineRequest(
-    var iznos: Double,
-    var plateno: Boolean,
-    var dokument: String,
-    val kontrolaId: Long,
-    var telefon: String?,
-    var ime: String?,
-    var adresa: String?,
-    var patnikId: Long?,
-)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/requests/RegisterRequest.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/requests/RegisterRequest.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,10 +1,0 @@
-package mk.ukim.finki.busngobackend.api.requests
-
-data class RegisterRequest(
-    val email: String,
-    val password: String,
-    val confirmPassword: String,
-    val name: String,
-    val address: String,
-    val phoneNumber: String,
-)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/requests/StartCommuteRequest.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/requests/StartCommuteRequest.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,7 +1,0 @@
-package mk.ukim.finki.busngobackend.api.requests
-
-data class StartCommuteRequest(
-    val ticketId: Long,
-    val routeInstanceId: Long,
-    val stationId: Long,
-)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/requests/StartRouteInstanceRequest.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/requests/StartRouteInstanceRequest.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,7 +1,0 @@
-package mk.ukim.finki.busngobackend.api.requests
-
-data class StartRouteInstanceRequest(
-    val lineId: Int,
-    val directionId: Long,
-    val busId: Long,
-)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/requests/TicketBuyRequest.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/requests/TicketBuyRequest.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,5 +1,0 @@
-package mk.ukim.finki.busngobackend.api.requests
-
-data class TicketBuyRequest(
-    val type: Long,
-)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/responses/AdminUsersResponse.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/responses/AdminUsersResponse.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,10 +1,0 @@
-package mk.ukim.finki.busngobackend.api.responses
-
-data class AdminUsersResponse(
-    val email: String,
-    val name: String,
-    val address: String,
-    val phoneNumber: String,
-    val id: Long,
-    val roles: List<String>,
-)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/responses/AuthResponse.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/responses/AuthResponse.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,5 +1,0 @@
-package mk.ukim.finki.busngobackend.api.responses
-
-data class AuthResponse(
-    val token: String,
-)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/responses/CommuteResponse.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/responses/CommuteResponse.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,14 +1,0 @@
-package mk.ukim.finki.busngobackend.api.responses
-
-import mk.ukim.finki.busngobackend.domain.entities.PostojkaNaLinija
-import java.time.LocalDateTime
-
-data class CommuteResponse(
-    val commuter: UserResponse,
-    val ticket: TicketResponse,
-    val stationStart: PostojkaNaLinija,
-    val status: String,
-    val startDate: LocalDateTime,
-    val endDate: LocalDateTime?,
-    val id: Long,
-)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/responses/ControlResponse.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/responses/ControlResponse.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,10 +1,0 @@
-package mk.ukim.finki.busngobackend.api.responses
-
-import java.sql.Timestamp
-
-data class ControlResponse(
-    var id: Long,
-    val dateCreated: Timestamp,
-    val kondukter: UserResponse,
-    val instancaNaLinija: RouteInstanceResponse,
-)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/responses/FineResponse.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/responses/FineResponse.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,18 +1,0 @@
-package mk.ukim.finki.busngobackend.api.responses
-
-import java.sql.Timestamp
-
-data class FineResponse(
-    var id: Long,
-    var iznos: Double,
-    var plateno: Boolean,
-    val dateCreated: Timestamp,
-    var datePayed: Timestamp?,
-    var dokument: String,
-    val kondukter: UserResponse,
-    val kontrola: ControlResponse,
-    val patnik: UserResponse?,
-    var telefon: String?,
-    var ime: String?,
-    var adresa: String?,
-)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/responses/RouteInstanceResponse.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/responses/RouteInstanceResponse.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,16 +1,0 @@
-package mk.ukim.finki.busngobackend.api.responses
-
-import mk.ukim.finki.busngobackend.domain.entities.Avtobus
-import mk.ukim.finki.busngobackend.domain.entities.Linija
-import mk.ukim.finki.busngobackend.domain.entities.Pravec
-import java.time.LocalDateTime
-
-data class RouteInstanceResponse(
-    val id: Long,
-    val bus: Avtobus,
-    val direction: Pravec,
-    val line: Linija,
-    val driver: UserResponse,
-    val start: LocalDateTime,
-    val end: LocalDateTime?,
-)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/responses/TicketResponse.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/responses/TicketResponse.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,12 +1,0 @@
-package mk.ukim.finki.busngobackend.api.responses
-
-import mk.ukim.finki.busngobackend.domain.entities.Tipbilet
-import java.time.LocalDateTime
-
-data class TicketResponse(
-    var id: Long,
-    var datumKupuvanje: LocalDateTime,
-    var datumAktivacija: LocalDateTime?,
-    var status: String,
-    var tip: Tipbilet,
-)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/responses/UserResponse.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/api/responses/UserResponse.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,9 +1,0 @@
-package mk.ukim.finki.busngobackend.api.responses
-
-data class UserResponse(
-    val email: String,
-    val name: String,
-    val address: String,
-    val phoneNumber: String,
-    val id: Long,
-)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/config/ApplicationConfig.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/config/ApplicationConfig.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,33 +1,0 @@
-package mk.ukim.finki.busngobackend.config
-
-import mk.ukim.finki.busngobackend.encoder
-import mk.ukim.finki.busngobackend.repository.KorisnikRepository
-import org.springframework.context.annotation.Bean
-import org.springframework.context.annotation.Configuration
-import org.springframework.security.authentication.AuthenticationManager
-import org.springframework.security.authentication.AuthenticationProvider
-import org.springframework.security.authentication.dao.DaoAuthenticationProvider
-import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration
-import org.springframework.security.core.userdetails.UserDetailsService
-
-@Configuration
-class ApplicationConfig(
-    private val korisnikRepository: KorisnikRepository,
-) {
-    @Bean
-    fun userDetailsService(): UserDetailsService =
-        UserDetailsService { email ->
-            korisnikRepository.findByEmail(email)
-        }
-
-    @Bean
-    fun authenticationProvider(korisnikRepository: KorisnikRepository): AuthenticationProvider {
-        val provider = DaoAuthenticationProvider()
-        provider.setUserDetailsService(userDetailsService())
-        provider.setPasswordEncoder(encoder())
-        return provider
-    }
-
-    @Bean
-    fun authenticationManager(config: AuthenticationConfiguration): AuthenticationManager = config.authenticationManager
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/config/JwtAuthFilter.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/config/JwtAuthFilter.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,57 +1,0 @@
-package mk.ukim.finki.busngobackend.config
-
-import jakarta.servlet.FilterChain
-import jakarta.servlet.http.HttpServletRequest
-import jakarta.servlet.http.HttpServletResponse
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken
-import org.springframework.security.core.context.SecurityContextHolder
-import org.springframework.security.core.userdetails.UserDetails
-import org.springframework.security.core.userdetails.UserDetailsService
-import org.springframework.security.web.authentication.WebAuthenticationDetailsSource
-import org.springframework.stereotype.Component
-import org.springframework.web.filter.OncePerRequestFilter
-
-@Component
-class JwtAuthFilter(
-    private val jwtService: JwtService,
-    private val userDetailsService: UserDetailsService,
-) : OncePerRequestFilter() {
-    override fun doFilterInternal(
-        request: HttpServletRequest,
-        response: HttpServletResponse,
-        filterChain: FilterChain,
-    ) {
-        val authHeader: String? = request.getHeader("Authorization")
-
-        if (authHeader == null || authHeader.doesNotContainBearer()) {
-            filterChain.doFilter(request, response)
-            return
-        }
-
-        val jwt = authHeader.extractTokenValue()
-        val email = jwtService.extractUsername(jwt)
-
-        if (email != null && SecurityContextHolder.getContext().authentication == null) {
-            val userDetails = this.userDetailsService.loadUserByUsername(email)
-
-            if (jwtService.isTokenValid(jwt, userDetails)) {
-                updateContext(userDetails, request)
-            }
-            filterChain.doFilter(request, response)
-        }
-    }
-
-    private fun updateContext(
-        userDetails: UserDetails,
-        request: HttpServletRequest,
-    ) {
-        val authToken = UsernamePasswordAuthenticationToken(userDetails, null, userDetails.authorities)
-        authToken.details = WebAuthenticationDetailsSource().buildDetails(request)
-
-        SecurityContextHolder.getContext().authentication = authToken
-    }
-
-    private fun String?.doesNotContainBearer(): Boolean = this == null || !this.startsWith("Bearer ")
-
-    private fun String?.extractTokenValue(): String = this!!.substringAfter("Bearer ")
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/config/JwtService.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/config/JwtService.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,64 +1,0 @@
-package mk.ukim.finki.busngobackend.config
-
-import io.jsonwebtoken.Claims
-import io.jsonwebtoken.Jwts
-import io.jsonwebtoken.security.Keys
-import org.springframework.security.core.userdetails.UserDetails
-import org.springframework.stereotype.Service
-import java.security.Key
-import java.util.Date
-
-@Service
-class JwtService {
-    private val secretKey =
-        Keys.hmacShaKeyFor(
-            "hu55nfa3pRrBRV4DIlvKVDMrg7jnqla9".toByteArray(),
-        )
-
-    fun extractUsername(token: String): String? = extractClaim(token, Claims::getSubject)
-
-    fun <T> extractClaim(
-        token: String,
-        claimsResolver: (Claims) -> T,
-    ): T {
-        val claims = extractAllClaims(token)
-        return claimsResolver(claims)
-    }
-
-    fun generateToken(
-        extraClaims: Map<String, Any> = emptyMap(),
-        userDetails: UserDetails,
-    ): String =
-        Jwts
-            .builder()
-            .claims()
-            .subject(userDetails.username)
-            .issuedAt(Date(System.currentTimeMillis()))
-            .expiration(Date(System.currentTimeMillis() + 1000 * 60 * 60 * 10))
-            .add(extraClaims)
-            .and()
-            .signWith(getSignInKey())
-            .compact()
-
-    fun isTokenValid(
-        token: String,
-        userDetails: UserDetails,
-    ): Boolean {
-        val username = extractUsername(token)
-        return username == userDetails.username && !isTokenExpired(token)
-    }
-
-    private fun isTokenExpired(token: String): Boolean = extractExpiration(token).before(Date())
-
-    private fun extractExpiration(token: String): Date = extractClaim(token, Claims::getExpiration)
-
-    private fun extractAllClaims(token: String): Claims =
-        Jwts
-            .parser()
-            .verifyWith(secretKey)
-            .build()
-            .parseSignedClaims(token)
-            .payload
-
-    private fun getSignInKey(): Key = secretKey
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/config/SecurityConfig.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/config/SecurityConfig.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,54 +1,0 @@
-package mk.ukim.finki.busngobackend.config
-
-import org.springframework.context.annotation.Bean
-import org.springframework.context.annotation.Configuration
-import org.springframework.http.HttpMethod
-import org.springframework.security.authentication.AuthenticationProvider
-import org.springframework.security.config.annotation.web.builders.HttpSecurity
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity
-import org.springframework.security.config.http.SessionCreationPolicy
-import org.springframework.security.web.DefaultSecurityFilterChain
-import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter
-
-@Configuration
-@EnableWebSecurity
-class SecurityConfig(
-    private val jwtAuthFilter: JwtAuthFilter,
-    private val authenticationProvider: AuthenticationProvider,
-) {
-    @Bean
-    fun securityFilterChain(
-        http: HttpSecurity,
-        jwtAuthFilter: JwtAuthFilter,
-    ): DefaultSecurityFilterChain =
-        http
-            .csrf {
-                it.disable()
-            }.authorizeHttpRequests {
-                it
-                    .requestMatchers("/api/booking/populate")
-                    .permitAll()
-                    .requestMatchers("/api/booking/**")
-                    .authenticated()
-                    .requestMatchers(HttpMethod.GET, "/api/city/**")
-                    .permitAll()
-                    .requestMatchers("/api/city/**")
-                    .authenticated()
-                    .requestMatchers(HttpMethod.POST, "/api/properties/**")
-                    .authenticated()
-                    .requestMatchers(HttpMethod.GET, "/api/properties/{id}/for-review")
-                    .authenticated()
-                    .requestMatchers(HttpMethod.POST, "/api/property-image/{id}/save-file")
-                    .permitAll()
-                    .requestMatchers(HttpMethod.POST, "/api/property-image/**")
-                    .authenticated()
-                    .requestMatchers(HttpMethod.POST, "/api/reviews/**")
-                    .authenticated()
-                    .anyRequest()
-                    .permitAll()
-            }.sessionManagement {
-                it.sessionCreationPolicy(SessionCreationPolicy.STATELESS)
-            }.authenticationProvider(authenticationProvider)
-            .addFilterBefore(jwtAuthFilter, UsernamePasswordAuthenticationFilter::class.java)
-            .build()
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/config/WebSocketConfig.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/config/WebSocketConfig.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,20 +1,0 @@
-package mk.ukim.finki.busngobackend.config
-
-import org.springframework.context.annotation.Configuration
-import org.springframework.messaging.simp.config.MessageBrokerRegistry
-import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker
-import org.springframework.web.socket.config.annotation.StompEndpointRegistry
-import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer
-
-@Configuration
-@EnableWebSocketMessageBroker
-class WebSocketConfig : WebSocketMessageBrokerConfigurer {
-    override fun registerStompEndpoints(registry: StompEndpointRegistry) {
-        registry.addEndpoint("/ws").setAllowedOrigins("http://localhost:4200", "http://localhost:4200/").withSockJS()
-    }
-
-    override fun configureMessageBroker(registry: MessageBrokerRegistry) {
-        registry.setApplicationDestinationPrefixes("/app")
-        registry.enableSimpleBroker("/topic")
-    }
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/Avtobus.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/Avtobus.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,15 +1,0 @@
-package mk.ukim.finki.busngobackend.domain.entities
-
-import jakarta.persistence.Entity
-import jakarta.persistence.GeneratedValue
-import jakarta.persistence.GenerationType
-import jakarta.persistence.Id
-
-@Entity
-data class Avtobus(
-    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
-    var id: Long,
-    var registracija: String,
-    var seriskiBroj: String,
-    var brojSedishta: Short?,
-)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/Bilet.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/Bilet.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,19 +1,0 @@
-package mk.ukim.finki.busngobackend.domain.entities
-
-import jakarta.persistence.*
-import mk.ukim.finki.busngobackend.domain.enums.BiletEnum
-import java.sql.Timestamp
-
-@Entity
-data class Bilet(
-    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
-    var id: Long,
-    var datumKupuvanje: Timestamp,
-    var datumAktivacija: Timestamp?,
-    @Enumerated(EnumType.STRING)
-    var status: BiletEnum,
-    @ManyToOne
-    var patnik: Patnik,
-    @ManyToOne
-    var tip: Tipbilet,
-)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/InstancaNaLinija.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/InstancaNaLinija.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,20 +1,0 @@
-package mk.ukim.finki.busngobackend.domain.entities
-
-import jakarta.persistence.*
-import java.sql.Timestamp
-
-@Entity
-data class InstancaNaLinija(
-    @GeneratedValue(strategy = GenerationType.IDENTITY) @Id
-    var id: Long,
-    var startDate: Timestamp,
-    var endDate: Timestamp?,
-    @ManyToOne
-    var vozac: Vozac,
-    @ManyToOne
-    var avtobus: Avtobus,
-    @ManyToOne
-    var linija: Linija,
-    @ManyToOne
-    var pravec: Pravec,
-)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/InstancaNaLinijaPostojkaNaLinija.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/InstancaNaLinijaPostojkaNaLinija.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,20 +1,0 @@
-package mk.ukim.finki.busngobackend.domain.entities
-
-import jakarta.persistence.Entity
-import jakarta.persistence.GeneratedValue
-import jakarta.persistence.GenerationType
-import jakarta.persistence.Id
-import jakarta.persistence.ManyToOne
-import java.sql.Timestamp
-
-@Entity
-data class InstancaNaLinijaPostojkaNaLinija(
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    var id: Long,
-    @ManyToOne
-    var postojkaNaLinija: PostojkaNaLinija,
-    @ManyToOne
-    var instancaNaLinija: InstancaNaLinija,
-    var timestamp: Timestamp,
-)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/Kazna.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/Kazna.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,19 +1,0 @@
-package mk.ukim.finki.busngobackend.domain.entities
-
-import jakarta.persistence.*
-import java.sql.Timestamp
-
-@Entity
-data class Kazna(
-    @GeneratedValue(strategy = GenerationType.IDENTITY) @Id
-    var id: Long,
-    var iznos: Double,
-    var plateno: Boolean,
-    val dateCreated: Timestamp,
-    var datePayed: Timestamp?,
-    var dokument: String,
-    @ManyToOne
-    val kondukter: Kondukter,
-    @ManyToOne
-    val kontrola: Kontrola,
-)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/KaznaZaNeregistriran.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/KaznaZaNeregistriran.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,14 +1,0 @@
-package mk.ukim.finki.busngobackend.domain.entities
-
-import jakarta.persistence.*
-
-@Entity
-data class KaznaZaNeregistriran(
-    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
-    var id: Long,
-    @OneToOne
-    val kazna: Kazna,
-    var telefon: String,
-    var ime: String,
-    var adresa: String,
-)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/KaznaZaRegistriran.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/KaznaZaRegistriran.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,13 +1,0 @@
-package mk.ukim.finki.busngobackend.domain.entities
-
-import jakarta.persistence.*
-
-@Entity
-data class KaznaZaRegistriran(
-    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
-    var id: Long,
-    @OneToOne
-    val kazna: Kazna,
-    @ManyToOne
-    val patnik: Patnik,
-)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/Kondukter.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/Kondukter.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,12 +1,0 @@
-package mk.ukim.finki.busngobackend.domain.entities
-
-import jakarta.persistence.*
-
-@Entity
-data class Kondukter(
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    var id: Long,
-    @OneToOne
-    var vraboten: Vraboten,
-)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/Kontrola.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/Kontrola.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,15 +1,0 @@
-package mk.ukim.finki.busngobackend.domain.entities
-
-import jakarta.persistence.*
-import java.sql.Timestamp
-
-@Entity
-data class Kontrola(
-    @GeneratedValue(strategy = GenerationType.IDENTITY) @Id
-    var id: Long,
-    val dateCreated: Timestamp,
-    @ManyToOne
-    val kondukter: Kondukter,
-    @ManyToOne
-    val instancaNaLinija: InstancaNaLinija,
-)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/Korisnik.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/Korisnik.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,38 +1,0 @@
-package mk.ukim.finki.busngobackend.domain.entities
-
-import jakarta.persistence.*
-import org.springframework.security.core.GrantedAuthority
-import org.springframework.security.core.userdetails.UserDetails
-
-@Entity
-class Korisnik(
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    var id: Long,
-    val ime: String,
-    val adresa: String,
-    val telefon: String,
-    var email: String,
-    @Column(name = "is_admin")
-    var admin: Boolean,
-    var lozinka: String,
-    @OneToMany(fetch = FetchType.EAGER, mappedBy = "korisnik")
-    var roles: List<KorisnikRole>?,
-) : UserDetails {
-    constructor() : this(0, "", "", "", "", false, "", emptyList()) {
-    }
-
-    override fun getAuthorities(): MutableCollection<out GrantedAuthority> = roles?.map { it.role!! }?.toMutableList() ?: mutableListOf()
-
-    override fun getPassword(): String = lozinka
-
-    override fun getUsername(): String = email
-
-    override fun isAccountNonExpired(): Boolean = true
-
-    override fun isAccountNonLocked(): Boolean = true
-
-    override fun isCredentialsNonExpired(): Boolean = true
-
-    override fun isEnabled(): Boolean = true
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/KorisnikRole.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/KorisnikRole.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,20 +1,0 @@
-package mk.ukim.finki.busngobackend.domain.entities
-
-import jakarta.persistence.Entity
-import jakarta.persistence.GeneratedValue
-import jakarta.persistence.GenerationType
-import jakarta.persistence.Id
-import jakarta.persistence.ManyToOne
-
-@Entity
-data class KorisnikRole(
-    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
-    var id: Long,
-    @ManyToOne
-    val korisnik: Korisnik?,
-    @ManyToOne
-    val role: Role?,
-) {
-    constructor() : this(0, null, null) {
-    }
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/Linija.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/Linija.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,13 +1,0 @@
-package mk.ukim.finki.busngobackend.domain.entities
-
-import jakarta.persistence.Entity
-import jakarta.persistence.GeneratedValue
-import jakarta.persistence.GenerationType
-import jakarta.persistence.Id
-
-@Entity
-data class Linija(
-    @GeneratedValue(strategy = GenerationType.IDENTITY) @Id
-    var id: Int,
-    var ime: String,
-)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/LinijaPravec.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/LinijaPravec.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,17 +1,0 @@
-package mk.ukim.finki.busngobackend.domain.entities
-
-import jakarta.persistence.Entity
-import jakarta.persistence.GeneratedValue
-import jakarta.persistence.GenerationType
-import jakarta.persistence.Id
-import jakarta.persistence.ManyToOne
-
-@Entity
-data class LinijaPravec(
-    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
-    var id: Long,
-    @ManyToOne
-    val linija: Linija,
-    @ManyToOne
-    val pravec: Pravec,
-)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/Patnik.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/Patnik.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,11 +1,0 @@
-package mk.ukim.finki.busngobackend.domain.entities
-
-import jakarta.persistence.*
-
-@Entity
-data class Patnik(
-    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
-    var id: Long,
-    @OneToOne(fetch = FetchType.EAGER)
-    var korisnik: Korisnik,
-)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/Postojka.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/Postojka.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,16 +1,0 @@
-package mk.ukim.finki.busngobackend.domain.entities
-
-import jakarta.persistence.Entity
-import jakarta.persistence.GeneratedValue
-import jakarta.persistence.GenerationType
-import jakarta.persistence.Id
-
-@Entity
-data class Postojka(
-    @GeneratedValue(strategy = GenerationType.IDENTITY) @Id
-    var id: Int,
-    var ime: String,
-    var lat: Double,
-    var lon: Double,
-    var opis: String,
-)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/PostojkaNaLinija.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/PostojkaNaLinija.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,20 +1,0 @@
-package mk.ukim.finki.busngobackend.domain.entities
-
-import jakarta.persistence.Entity
-import jakarta.persistence.GeneratedValue
-import jakarta.persistence.GenerationType
-import jakarta.persistence.Id
-import jakarta.persistence.ManyToOne
-
-@Entity
-data class PostojkaNaLinija(
-    @GeneratedValue(strategy = GenerationType.IDENTITY) @Id
-    var id: Long,
-    var redenBroj: Short,
-    @ManyToOne
-    val linija: Linija,
-    @ManyToOne
-    val postojka: Postojka,
-    @ManyToOne
-    val pravec: Pravec,
-)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/Pravec.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/Pravec.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,14 +1,0 @@
-package mk.ukim.finki.busngobackend.domain.entities
-
-import jakarta.persistence.Entity
-import jakarta.persistence.GeneratedValue
-import jakarta.persistence.GenerationType
-import jakarta.persistence.Id
-
-@Entity
-data class Pravec(
-    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
-    var id: Long,
-    var pravec: String,
-    var opis: String,
-)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/Role.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/Role.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,18 +1,0 @@
-package mk.ukim.finki.busngobackend.domain.entities
-
-import jakarta.persistence.Entity
-import jakarta.persistence.GeneratedValue
-import jakarta.persistence.GenerationType
-import jakarta.persistence.Id
-import org.springframework.security.core.GrantedAuthority
-
-@Entity
-class Role : GrantedAuthority {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    var id: Long = 0
-    var name: String = ""
-    var description: String = ""
-
-    override fun getAuthority(): String = name
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/SeSimnuvaNa.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/SeSimnuvaNa.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,18 +1,0 @@
-package mk.ukim.finki.busngobackend.domain.entities
-
-import jakarta.persistence.Entity
-import jakarta.persistence.GeneratedValue
-import jakarta.persistence.GenerationType
-import jakarta.persistence.Id
-import jakarta.persistence.OneToOne
-
-@Entity
-data class SeSimnuvaNa(
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    var id: Long,
-    @OneToOne
-    val vozenje: Vozenje,
-    @OneToOne
-    val postojkaNaLinija: PostojkaNaLinija,
-)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/Tipbilet.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/Tipbilet.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,15 +1,0 @@
-package mk.ukim.finki.busngobackend.domain.entities
-
-import jakarta.persistence.Entity
-import jakarta.persistence.GeneratedValue
-import jakarta.persistence.GenerationType
-import jakarta.persistence.Id
-
-@Entity
-data class Tipbilet(
-    @GeneratedValue(strategy = GenerationType.IDENTITY) @Id
-    var id: Long,
-    var trajnost: Long,
-    var cena: Float,
-    var ime: String,
-)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/Vozac.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/Vozac.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,15 +1,0 @@
-package mk.ukim.finki.busngobackend.domain.entities
-
-import jakarta.persistence.Entity
-import jakarta.persistence.GeneratedValue
-import jakarta.persistence.GenerationType
-import jakarta.persistence.Id
-import jakarta.persistence.OneToOne
-
-@Entity
-data class Vozac(
-    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
-    var id: Long,
-    @OneToOne
-    var vraboten: Vraboten,
-)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/Vozenje.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/Vozenje.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,23 +1,0 @@
-package mk.ukim.finki.busngobackend.domain.entities
-
-import jakarta.persistence.*
-import mk.ukim.finki.busngobackend.domain.enums.VozenjeStatus
-import java.sql.Timestamp
-
-@Entity
-data class Vozenje(
-    @GeneratedValue(strategy = GenerationType.IDENTITY) @Id
-    var id: Long,
-    var startDate: Timestamp,
-    var endDate: Timestamp?,
-    @Enumerated(EnumType.STRING)
-    var status: VozenjeStatus,
-    @ManyToOne
-    var patnik: Patnik,
-    @ManyToOne
-    var postojkaNaLinijaStart: PostojkaNaLinija,
-    @ManyToOne
-    var instancaNaLinija: InstancaNaLinija,
-    @ManyToOne
-    var bilet: Bilet,
-)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/Vraboten.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/entities/Vraboten.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,19 +1,0 @@
-package mk.ukim.finki.busngobackend.domain.entities
-
-import jakarta.persistence.Entity
-import jakarta.persistence.FetchType
-import jakarta.persistence.GeneratedValue
-import jakarta.persistence.GenerationType
-import jakarta.persistence.Id
-import java.sql.Date
-
-@Entity
-data class Vraboten(
-    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
-    var id: Long,
-    @jakarta.persistence.OneToOne(fetch = FetchType.EAGER)
-    var korisnik: Korisnik,
-    var plata: Double,
-    val datumNaVrabotuvanje: Date,
-    var datumPrekinVrabotuvanje: Date?,
-)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/enums/BiletEnum.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/enums/BiletEnum.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,7 +1,0 @@
-package mk.ukim.finki.busngobackend.domain.enums
-
-enum class BiletEnum {
-    INACTIVE,
-    ACTIVE,
-    EXPIRED,
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/enums/RoleEnum.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/enums/RoleEnum.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,10 +1,0 @@
-package mk.ukim.finki.busngobackend.domain.enums
-
-enum class RoleEnum {
-    ROLE_ADMIN,
-    ROLE_DRIVER,
-    ROLE_CONDUCTOR,
-    ROLE_PASSENGER,
-}
-
-fun RoleEnum.toId(): Long = this.ordinal + 1L
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/enums/VozenjeStatus.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/enums/VozenjeStatus.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,6 +1,0 @@
-package mk.ukim.finki.busngobackend.domain.enums
-
-enum class VozenjeStatus {
-    ACTIVE,
-    FINISHED,
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/helpers/RouteInstanceOnStation.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/helpers/RouteInstanceOnStation.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,11 +1,0 @@
-package mk.ukim.finki.busngobackend.domain.helpers
-
-import mk.ukim.finki.busngobackend.domain.entities.InstancaNaLinija
-import mk.ukim.finki.busngobackend.domain.entities.PostojkaNaLinija
-import java.sql.Timestamp
-
-data class RouteInstanceOnStation(
-    val instance: InstancaNaLinija,
-    val station: PostojkaNaLinija,
-    val timestamp: Timestamp,
-)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/views/AverageTimeBetweenStations.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/views/AverageTimeBetweenStations.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,20 +1,0 @@
-package mk.ukim.finki.busngobackend.domain.views
-
-import jakarta.persistence.*
-import mk.ukim.finki.busngobackend.domain.entities.PostojkaNaLinija
-
-@Entity
-@Table(name = "avg_time_diffs")
-data class AverageTimeBetweenStations(
-    @Column(name = "id")
-    @Id
-    val id: Long,
-    @ManyToOne
-    @JoinColumn(name = "start_station_id")
-    val startStation: PostojkaNaLinija,
-    @ManyToOne
-    @JoinColumn(name = "end_station_id")
-    val endStation: PostojkaNaLinija,
-    @Column(name = "avg_time_diff_seconds")
-    val timeInSeconds: Double,
-)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/views/CommutesByHour.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/views/CommutesByHour.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,18 +1,0 @@
-package mk.ukim.finki.busngobackend.domain.views
-
-import jakarta.persistence.*
-import mk.ukim.finki.busngobackend.domain.entities.Linija
-
-@Entity
-@Table(name = "most_busy_part_of_the_day")
-data class CommutesByHour(
-    @Id
-    val id: Long,
-    @ManyToOne
-    @JoinColumn(name = "linija_id")
-    val line: Linija,
-    @Column(name = "interval_1h")
-    val interval: String,
-    @Column(name = "broj_pati")
-    val numberOfCommutes: Long,
-)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/views/CommutesByLine.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/views/CommutesByLine.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,16 +1,0 @@
-package mk.ukim.finki.busngobackend.domain.views
-
-import jakarta.persistence.*
-import mk.ukim.finki.busngobackend.domain.entities.Linija
-
-@Entity
-@Table(name = "commutes_by_line")
-data class CommutesByLine(
-    @Id
-    val id: Long,
-    @ManyToOne
-    @JoinColumn(name = "linija_id")
-    val line: Linija,
-    @Column(name = "count")
-    val commutesPerLine: Long,
-)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/views/FinesByLine.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/views/FinesByLine.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,16 +1,0 @@
-package mk.ukim.finki.busngobackend.domain.views
-
-import jakarta.persistence.*
-import mk.ukim.finki.busngobackend.domain.entities.Linija
-
-@Entity
-@Table(name = "kazna_po_linija")
-data class FinesByLine(
-    @Id
-    val id: Long,
-    @JoinColumn(name = "line_id")
-    @ManyToOne
-    val line: Linija,
-    @Column(name = "count")
-    val count: Long,
-)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/views/NumberOfPassengersByLineAndStation.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/views/NumberOfPassengersByLineAndStation.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,20 +1,0 @@
-package mk.ukim.finki.busngobackend.domain.views
-
-import jakarta.persistence.*
-import mk.ukim.finki.busngobackend.domain.entities.Linija
-import mk.ukim.finki.busngobackend.domain.entities.Postojka
-
-@Entity
-@Table(name = "number_passengers_per_line_and_station")
-data class NumberOfPassengersByLineAndStation(
-    @Id
-    val id: Long,
-    @ManyToOne
-    @JoinColumn(name = "line_id")
-    val line: Linija,
-    @ManyToOne
-    @JoinColumn(name = "station_id")
-    val station: Postojka,
-    @Column(name = "count")
-    val passengersByLineAndStation: Long,
-)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/views/TicketSales.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/views/TicketSales.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,18 +1,0 @@
-package mk.ukim.finki.busngobackend.domain.views
-
-import jakarta.persistence.*
-import mk.ukim.finki.busngobackend.domain.entities.Tipbilet
-
-@Entity
-@Table(name = "ticket_sales")
-data class TicketSales(
-    @Id
-    val id: Long,
-    @ManyToOne
-    @JoinColumn(name = "tip_id")
-    val type: Tipbilet,
-    @Column(name = "interval_1h")
-    val interval: String,
-    @Column(name = "broj_pati")
-    val numberOfSales: Long,
-)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/views/TotalIncome.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/domain/views/TotalIncome.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,21 +1,0 @@
-package mk.ukim.finki.busngobackend.domain.views
-
-import jakarta.persistence.Column
-import jakarta.persistence.Entity
-import jakarta.persistence.Id
-import jakarta.persistence.Table
-
-@Entity
-@Table(name = "total_income")
-class TotalIncome(
-    @Id
-    val id: Long,
-    @Column(name = "year")
-    val year: String,
-    @Column(name = "fines_income")
-    val finesIncome: Double,
-    @Column(name = "ticket_income")
-    val ticketIncome: Double,
-    @Column(name = "total_income")
-    val totalIncome: Double,
-)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/events/RouteInstanceOnStationEvent.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/events/RouteInstanceOnStationEvent.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,8 +1,0 @@
-package mk.ukim.finki.busngobackend.events
-
-import mk.ukim.finki.busngobackend.domain.helpers.RouteInstanceOnStation
-import org.springframework.context.ApplicationEvent
-
-class RouteInstanceOnStationEvent(
-    source: RouteInstanceOnStation,
-) : ApplicationEvent(source)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/events/StartRouteEvent.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/events/StartRouteEvent.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,8 +1,0 @@
-package mk.ukim.finki.busngobackend.events
-
-import mk.ukim.finki.busngobackend.domain.entities.InstancaNaLinija
-import org.springframework.context.ApplicationEvent
-
-class StartRouteEvent(
-    source: InstancaNaLinija,
-) : ApplicationEvent(source)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/events/StopRouteInstanceEvent.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/events/StopRouteInstanceEvent.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,8 +1,0 @@
-package mk.ukim.finki.busngobackend.events
-
-import mk.ukim.finki.busngobackend.domain.entities.InstancaNaLinija
-import org.springframework.context.ApplicationEvent
-
-class StopRouteInstanceEvent(
-    source: InstancaNaLinija,
-) : ApplicationEvent(source)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/listener/RouteEventListener.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/listener/RouteEventListener.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,56 +1,0 @@
-package mk.ukim.finki.busngobackend.listener
-
-import mk.ukim.finki.busngobackend.domain.entities.InstancaNaLinija
-import mk.ukim.finki.busngobackend.domain.helpers.RouteInstanceOnStation
-import mk.ukim.finki.busngobackend.events.RouteInstanceOnStationEvent
-import mk.ukim.finki.busngobackend.events.StartRouteEvent
-import mk.ukim.finki.busngobackend.events.StopRouteInstanceEvent
-import mk.ukim.finki.busngobackend.service.RouteInstanceOnStationService
-import mk.ukim.finki.busngobackend.service.RouteInstanceService
-import mk.ukim.finki.busngobackend.service.StationService
-import mk.ukim.finki.busngobackend.service.WebSocketService
-import mk.ukim.finki.busngobackend.simulator.RouteInstanceSimulator
-import org.springframework.context.ApplicationEventPublisher
-import org.springframework.context.event.EventListener
-import org.springframework.scheduling.annotation.Async
-import org.springframework.stereotype.Component
-
-@Component
-class RouteEventListener(
-    private val stationService: StationService,
-    private val simulator: RouteInstanceSimulator,
-    private val eventPublisher: ApplicationEventPublisher,
-    private val routeInstanceService: RouteInstanceService,
-    private val routeInstanceOnStationService: RouteInstanceOnStationService,
-    private val webSocketService: WebSocketService,
-) {
-    @Async
-    @EventListener
-    fun startRouteEvent(event: StartRouteEvent) {
-        println(event)
-        println(event)
-        val instance = event.source as InstancaNaLinija
-        val line = instance.linija
-        val direction = instance.pravec
-        val stations = stationService.findStationsByLineIdAndDirectionId(line.id, direction.id)
-
-        simulator.simulate(instance, stations)
-    }
-
-    @Async
-    @EventListener
-    fun routeInstanceOnStation(event: RouteInstanceOnStationEvent) {
-        println("------------------------------------------------")
-        println(event)
-        val source = event.source as RouteInstanceOnStation
-        routeInstanceOnStationService.create(source.instance.id, source.station.id, source.timestamp)
-        // todo: publish event to the websocket so that the user gets notified
-        webSocketService.sendMessage("routes", "Updated routes")
-    }
-
-    @EventListener
-    fun stopRouteEvent(event: StopRouteInstanceEvent) {
-        val instance = event.source as InstancaNaLinija
-        routeInstanceService.stop(instance.id)
-    }
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/listener/WebSocketEventListener.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/listener/WebSocketEventListener.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,15 +1,0 @@
-package mk.ukim.finki.busngobackend.listener
-
-import org.springframework.context.event.EventListener
-import org.springframework.messaging.simp.stomp.StompHeaderAccessor
-import org.springframework.stereotype.Component
-import org.springframework.web.socket.messaging.SessionDisconnectEvent
-
-@Component
-class WebSocketEventListener {
-    @EventListener
-    fun handleWebSocketDisconnectListener(event: SessionDisconnectEvent) {
-        val headerAccessor = StompHeaderAccessor.wrap(event.message)
-        val username = headerAccessor.sessionAttributes?.get("username")
-    }
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/mapper/ClassToDtoMapper.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/mapper/ClassToDtoMapper.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,85 +1,0 @@
-package mk.ukim.finki.busngobackend.mapper
-
-import mk.ukim.finki.busngobackend.api.responses.*
-import mk.ukim.finki.busngobackend.domain.entities.*
-import org.springframework.stereotype.Service
-
-@Service
-class ClassToDtoMapper {
-    fun toUserResponse(user: Korisnik): UserResponse =
-        UserResponse(
-            id = user.id,
-            email = user.email,
-            phoneNumber = user.telefon,
-            address = user.adresa,
-            name = user.ime,
-        )
-
-    fun toTicketResponse(it: Bilet) =
-        TicketResponse(
-            id = it.id,
-            tip = it.tip,
-            datumKupuvanje = it.datumKupuvanje.toLocalDateTime(),
-            status = it.status.name,
-            datumAktivacija = it.datumAktivacija?.toLocalDateTime(),
-        )
-
-    fun toRouteInstanceResponse(it: InstancaNaLinija) =
-        RouteInstanceResponse(
-            line = it.linija,
-            bus = it.avtobus,
-            start = it.startDate.toLocalDateTime(),
-            driver = toUserResponse(it.vozac.vraboten.korisnik),
-            direction = it.pravec,
-            end = it.endDate?.toLocalDateTime(),
-            id = it.id,
-        )
-
-    fun toCommuteResponse(it: Vozenje) =
-        CommuteResponse(
-            status = it.status.name,
-            endDate = it.endDate?.toLocalDateTime(),
-            startDate = it.startDate.toLocalDateTime(),
-            commuter = this.toUserResponse(it.patnik.korisnik),
-            stationStart = it.postojkaNaLinijaStart,
-            ticket = this.toTicketResponse(it.bilet),
-            id = it.id,
-        )
-
-    fun toControlResponse(kontrola: Kontrola) =
-        ControlResponse(
-            id = kontrola.id,
-            instancaNaLinija = this.toRouteInstanceResponse(kontrola.instancaNaLinija),
-            kondukter = this.toUserResponse(kontrola.kondukter.vraboten.korisnik),
-            dateCreated = kontrola.dateCreated,
-        )
-
-    fun toFineResponse(
-        kazna: Kazna,
-        kzr: KaznaZaRegistriran?,
-        kzn: KaznaZaNeregistriran?,
-    ) = FineResponse(
-        dokument = kazna.dokument,
-        kontrola = this.toControlResponse(kazna.kontrola),
-        plateno = kazna.plateno,
-        iznos = kazna.iznos,
-        id = kazna.id,
-        kondukter = this.toUserResponse(kazna.kondukter.vraboten.korisnik),
-        datePayed = kazna.datePayed,
-        dateCreated = kazna.dateCreated,
-        adresa = kzn?.adresa,
-        patnik = kzr?.patnik?.let { this.toUserResponse(it.korisnik) },
-        ime = kzn?.ime,
-        telefon = kzn?.telefon,
-    )
-
-    fun toAdminUsersResponse(user: Korisnik): AdminUsersResponse =
-        AdminUsersResponse(
-            id = user.id,
-            email = user.email,
-            phoneNumber = user.telefon,
-            address = user.adresa,
-            name = user.ime,
-            roles = user.roles!!.map { it.role!!.name },
-        )
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/AvgTimeDIffsRepository.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/AvgTimeDIffsRepository.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,6 +1,0 @@
-package mk.ukim.finki.busngobackend.repository
-
-import mk.ukim.finki.busngobackend.domain.views.AverageTimeBetweenStations
-import org.springframework.data.jpa.repository.JpaRepository
-
-interface AvgTimeDIffsRepository : JpaRepository<AverageTimeBetweenStations, Long>
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/AvtobusRepository.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/AvtobusRepository.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,21 +1,0 @@
-package mk.ukim.finki.busngobackend.repository
-
-import mk.ukim.finki.busngobackend.domain.entities.Avtobus
-import org.springframework.data.jpa.repository.JpaRepository
-import org.springframework.data.jpa.repository.Query
-
-interface AvtobusRepository : JpaRepository<Avtobus, Long> {
-    @Query(
-        nativeQuery = true,
-        value =
-            "select a.id, a.registracija, a.seriski_broj, a.broj_sedishta " +
-                "from project.avtobus a " +
-                "where not exists( " +
-                "select 1 " +
-                "from project.avtobus a1 " +
-                "join project.instanca_na_linija inl on inl.avtobus_id = a1.id " +
-                "where a1.id = a.id and " +
-                "inl.end_date is null)",
-    )
-    fun findAllFreeBuses(): List<Avtobus>
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/BiletRepository.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/BiletRepository.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,14 +1,0 @@
-package mk.ukim.finki.busngobackend.repository
-
-import mk.ukim.finki.busngobackend.domain.entities.Bilet
-import mk.ukim.finki.busngobackend.domain.entities.Patnik
-import org.springframework.data.jpa.repository.JpaRepository
-
-interface BiletRepository : JpaRepository<Bilet, Long> {
-    fun findAllByPatnik(patnik: Patnik): List<Bilet>
-
-    fun findByIdAndPatnik(
-        id: Long,
-        patnik: Patnik,
-    ): Bilet?
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/CommutesByHourRepository.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/CommutesByHourRepository.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,6 +1,0 @@
-package mk.ukim.finki.busngobackend.repository
-
-import mk.ukim.finki.busngobackend.domain.views.CommutesByHour
-import org.springframework.data.jpa.repository.JpaRepository
-
-interface CommutesByHourRepository : JpaRepository<CommutesByHour, Long>
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/CommutesByLineRepository.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/CommutesByLineRepository.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,6 +1,0 @@
-package mk.ukim.finki.busngobackend.repository
-
-import mk.ukim.finki.busngobackend.domain.views.CommutesByLine
-import org.springframework.data.jpa.repository.JpaRepository
-
-interface CommutesByLineRepository : JpaRepository<CommutesByLine, Long>
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/FinesByLineRepository.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/FinesByLineRepository.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,6 +1,0 @@
-package mk.ukim.finki.busngobackend.repository
-
-import mk.ukim.finki.busngobackend.domain.views.FinesByLine
-import org.springframework.data.jpa.repository.JpaRepository
-
-interface FinesByLineRepository : JpaRepository<FinesByLine, Long>
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/InstancaNaLinijaPostojkaNaLinijaRepository.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/InstancaNaLinijaPostojkaNaLinijaRepository.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,21 +1,0 @@
-package mk.ukim.finki.busngobackend.repository
-
-import mk.ukim.finki.busngobackend.domain.entities.InstancaNaLinijaPostojkaNaLinija
-import org.springframework.data.jpa.repository.JpaRepository
-import org.springframework.data.jpa.repository.Query
-import java.sql.Timestamp
-
-interface InstancaNaLinijaPostojkaNaLinijaRepository : JpaRepository<InstancaNaLinijaPostojkaNaLinija, Long> {
-    @Query(
-        nativeQuery = true,
-        value = """
-            select id, instanca_na_linija_id, postojka_na_linija_id, timestamp from project.instanca_na_linija_postojka_na_linija where id = (
-            select id from project.instanca_na_linija_postojka_na_linija where instanca_na_linija_id = ?1 order by EXTRACT(epoch FROM (timestamp - ?2)) limit 1
-            )
-        """,
-    )
-    fun findByInstancaNaLinijaAndTimestampNearestTo(
-        instancaNaLinija: Long,
-        startDate: Timestamp,
-    ): InstancaNaLinijaPostojkaNaLinija?
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/InstancaNaLinijaRepository.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/InstancaNaLinijaRepository.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,38 +1,0 @@
-package mk.ukim.finki.busngobackend.repository
-
-import mk.ukim.finki.busngobackend.domain.entities.InstancaNaLinija
-import org.springframework.data.jpa.repository.JpaRepository
-import org.springframework.data.jpa.repository.Query
-
-interface InstancaNaLinijaRepository : JpaRepository<InstancaNaLinija, Long> {
-    @Query(
-        value = "select count(id) > 0 from project.instanca_na_linija inl where inl.vozac_id=:vozac and inl.end_date is null",
-        nativeQuery = true,
-    )
-    fun existsByVozacAndEndDateIsNull(vozac: Long): Boolean
-
-    @Query(
-        value =
-            """
-            select distinct inl.id
-from project.instanca_na_linija inl
-         join project.instanca_na_linija_postojka_na_linija inlpnl on inl.id = inlpnl.instanca_na_linija_id
-where end_date is null
-  and linija_id in (
-    select distinct(pnl.linija_id)
-    from project.postojka_na_linija pnl
-    where postojka_id = ?1
-)
-except
-select inl.id
-from project.postojka_na_linija pnl
-         join project.instanca_na_linija inl on inl.linija_id = pnl.linija_id and inl.pravec_id = pnl.pravec_id
-join project.instanca_na_linija_postojka_na_linija inlpnl on inl.id = inlpnl.instanca_na_linija_id and pnl.id = inlpnl.postojka_na_linija_id
-where inl.end_date is null and postojka_id = ?1;
-        """,
-        nativeQuery = true,
-    )
-    fun findIncomingRouteInstancesForStation(stationId: Int): List<Long>
-
-    fun findAllByEndDateIsNull(): List<InstancaNaLinija>
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/KaznaRepository.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/KaznaRepository.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,9 +1,0 @@
-package mk.ukim.finki.busngobackend.repository
-
-import mk.ukim.finki.busngobackend.domain.entities.Kazna
-import mk.ukim.finki.busngobackend.domain.entities.Kontrola
-import org.springframework.data.jpa.repository.JpaRepository
-
-interface KaznaRepository : JpaRepository<Kazna, Long> {
-    fun findAllByKontrola(kontrola: Kontrola): List<Kazna>
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/KaznaZaNeregistriranRepository.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/KaznaZaNeregistriranRepository.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,9 +1,0 @@
-package mk.ukim.finki.busngobackend.repository
-
-import mk.ukim.finki.busngobackend.domain.entities.Kazna
-import mk.ukim.finki.busngobackend.domain.entities.KaznaZaNeregistriran
-import org.springframework.data.jpa.repository.JpaRepository
-
-interface KaznaZaNeregistriranRepository : JpaRepository<KaznaZaNeregistriran, Long> {
-    fun findAllByKaznaIn(kazni: List<Kazna>): List<KaznaZaNeregistriran>
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/KaznaZaRegistriranRepository.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/KaznaZaRegistriranRepository.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,9 +1,0 @@
-package mk.ukim.finki.busngobackend.repository
-
-import mk.ukim.finki.busngobackend.domain.entities.Kazna
-import mk.ukim.finki.busngobackend.domain.entities.KaznaZaRegistriran
-import org.springframework.data.jpa.repository.JpaRepository
-
-interface KaznaZaRegistriranRepository : JpaRepository<KaznaZaRegistriran, Long> {
-    fun findAllByKaznaIn(kazni: List<Kazna>): List<KaznaZaRegistriran>
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/KondukterRepository.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/KondukterRepository.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,9 +1,0 @@
-package mk.ukim.finki.busngobackend.repository
-
-import mk.ukim.finki.busngobackend.domain.entities.Kondukter
-import mk.ukim.finki.busngobackend.domain.entities.Vraboten
-import org.springframework.data.jpa.repository.JpaRepository
-
-interface KondukterRepository : JpaRepository<Kondukter, Long> {
-    fun findByVraboten(vraboten: Vraboten): Kondukter?
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/KontrolaRepository.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/KontrolaRepository.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,9 +1,0 @@
-package mk.ukim.finki.busngobackend.repository
-
-import mk.ukim.finki.busngobackend.domain.entities.Kondukter
-import mk.ukim.finki.busngobackend.domain.entities.Kontrola
-import org.springframework.data.jpa.repository.JpaRepository
-
-interface KontrolaRepository : JpaRepository<Kontrola, Long> {
-    fun findAllByKondukterOrderByDateCreatedDesc(kondukter: Kondukter): List<Kontrola>
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/KorisnikRepository.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/KorisnikRepository.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,8 +1,0 @@
-package mk.ukim.finki.busngobackend.repository
-
-import mk.ukim.finki.busngobackend.domain.entities.Korisnik
-import org.springframework.data.jpa.repository.JpaRepository
-
-interface KorisnikRepository : JpaRepository<Korisnik, Long> {
-    fun findByEmail(email: String): Korisnik?
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/KorisnikRoleRepository.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/KorisnikRoleRepository.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,9 +1,0 @@
-package mk.ukim.finki.busngobackend.repository
-
-import mk.ukim.finki.busngobackend.domain.entities.Korisnik
-import mk.ukim.finki.busngobackend.domain.entities.KorisnikRole
-import org.springframework.data.jpa.repository.JpaRepository
-
-interface KorisnikRoleRepository : JpaRepository<KorisnikRole, Long> {
-    fun findAllByKorisnik(user: Korisnik): List<KorisnikRole>
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/LinijaPravecRepository.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/LinijaPravecRepository.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,15 +1,0 @@
-package mk.ukim.finki.busngobackend.repository
-
-import mk.ukim.finki.busngobackend.domain.entities.Linija
-import mk.ukim.finki.busngobackend.domain.entities.LinijaPravec
-import mk.ukim.finki.busngobackend.domain.entities.Pravec
-import org.springframework.data.jpa.repository.JpaRepository
-
-interface LinijaPravecRepository : JpaRepository<LinijaPravec, Long> {
-    fun findAllByLinija(linija: Linija): List<LinijaPravec>
-
-    fun existsByLinijaAndPravec(
-        linija: Linija,
-        pravec: Pravec,
-    ): Boolean
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/LinijaRepository.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/LinijaRepository.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,6 +1,0 @@
-package mk.ukim.finki.busngobackend.repository
-
-import mk.ukim.finki.busngobackend.domain.entities.Linija
-import org.springframework.data.jpa.repository.JpaRepository
-
-interface LinijaRepository : JpaRepository<Linija, Int>
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/NumberOfPassengersByLineAndStationRepository.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/NumberOfPassengersByLineAndStationRepository.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,6 +1,0 @@
-package mk.ukim.finki.busngobackend.repository
-
-import mk.ukim.finki.busngobackend.domain.views.NumberOfPassengersByLineAndStation
-import org.springframework.data.jpa.repository.JpaRepository
-
-interface NumberOfPassengersByLineAndStationRepository : JpaRepository<NumberOfPassengersByLineAndStation, Long>
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/PatnikRepository.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/PatnikRepository.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,9 +1,0 @@
-package mk.ukim.finki.busngobackend.repository
-
-import mk.ukim.finki.busngobackend.domain.entities.Korisnik
-import mk.ukim.finki.busngobackend.domain.entities.Patnik
-import org.springframework.data.jpa.repository.JpaRepository
-
-interface PatnikRepository : JpaRepository<Patnik, Long> {
-    fun findByKorisnik(korisnik: Korisnik): Patnik?
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/PostojkaNaLinijaRepository.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/PostojkaNaLinijaRepository.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,42 +1,0 @@
-package mk.ukim.finki.busngobackend.repository
-
-import mk.ukim.finki.busngobackend.domain.entities.Linija
-import mk.ukim.finki.busngobackend.domain.entities.Postojka
-import mk.ukim.finki.busngobackend.domain.entities.PostojkaNaLinija
-import mk.ukim.finki.busngobackend.domain.entities.Pravec
-import mk.ukim.finki.busngobackend.domain.views.AverageTimeBetweenStations
-import org.springframework.data.jpa.repository.JpaRepository
-import org.springframework.data.jpa.repository.Query
-
-interface PostojkaNaLinijaRepository : JpaRepository<PostojkaNaLinija, Long> {
-    fun findByLinija(linija: Linija): List<PostojkaNaLinija>
-
-    fun findByLinijaAndPravec(
-        linija: Linija,
-        pravec: Pravec,
-    ): List<PostojkaNaLinija>
-
-    fun existsByLinijaAndPostojka(
-        linija: Linija,
-        postojkaStart: Postojka,
-    ): Boolean
-
-    fun findByLinijaAndPostojka(
-        linija: Linija,
-        postojkaStart: Postojka,
-    ): PostojkaNaLinija?
-
-    fun findByLinijaAndPostojkaAndPravec(
-        linija: Linija,
-        postojkaStart: Postojka,
-        pravec: Pravec,
-    ): PostojkaNaLinija?
-
-    @Query(
-        nativeQuery = true,
-        value = """
-            select id, start_station_id, end_station_id, avg_time_diff_seconds from project.avg_time_diffs
-        """,
-    )
-    fun getAverageTimeBetweenStations(): List<AverageTimeBetweenStations>
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/PostojkaRepository.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/PostojkaRepository.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,6 +1,0 @@
-package mk.ukim.finki.busngobackend.repository
-
-import mk.ukim.finki.busngobackend.domain.entities.Postojka
-import org.springframework.data.jpa.repository.JpaRepository
-
-interface PostojkaRepository : JpaRepository<Postojka, Long>
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/PravecRepository.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/PravecRepository.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,6 +1,0 @@
-package mk.ukim.finki.busngobackend.repository
-
-import mk.ukim.finki.busngobackend.domain.entities.Pravec
-import org.springframework.data.jpa.repository.JpaRepository
-
-interface PravecRepository : JpaRepository<Pravec, Long>
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/RoleRepository.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/RoleRepository.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,8 +1,0 @@
-package mk.ukim.finki.busngobackend.repository
-
-import mk.ukim.finki.busngobackend.domain.entities.Role
-import org.springframework.data.jpa.repository.JpaRepository
-
-interface RoleRepository : JpaRepository<Role, Long> {
-    fun findAllByNameLikeIgnoreCase(name: String): List<Role>
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/SeSimnuvaNaRepository.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/SeSimnuvaNaRepository.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,6 +1,0 @@
-package mk.ukim.finki.busngobackend.repository
-
-import mk.ukim.finki.busngobackend.domain.entities.SeSimnuvaNa
-import org.springframework.data.jpa.repository.JpaRepository
-
-interface SeSimnuvaNaRepository : JpaRepository<SeSimnuvaNa, Long>
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/TicketSalesRepository.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/TicketSalesRepository.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,6 +1,0 @@
-package mk.ukim.finki.busngobackend.repository
-
-import mk.ukim.finki.busngobackend.domain.views.TicketSales
-import org.springframework.data.jpa.repository.JpaRepository
-
-interface TicketSalesRepository : JpaRepository<TicketSales, Long>
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/TipbiletRepository.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/TipbiletRepository.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,6 +1,0 @@
-package mk.ukim.finki.busngobackend.repository
-
-import mk.ukim.finki.busngobackend.domain.entities.Tipbilet
-import org.springframework.data.jpa.repository.JpaRepository
-
-interface TipbiletRepository : JpaRepository<Tipbilet, Long>
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/TotalIncomeRepository.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/TotalIncomeRepository.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,6 +1,0 @@
-package mk.ukim.finki.busngobackend.repository
-
-import mk.ukim.finki.busngobackend.domain.views.TotalIncome
-import org.springframework.data.jpa.repository.JpaRepository
-
-interface TotalIncomeRepository : JpaRepository<TotalIncome, Long>
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/VozacRepository.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/VozacRepository.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,9 +1,0 @@
-package mk.ukim.finki.busngobackend.repository
-
-import mk.ukim.finki.busngobackend.domain.entities.Vozac
-import mk.ukim.finki.busngobackend.domain.entities.Vraboten
-import org.springframework.data.jpa.repository.JpaRepository
-
-interface VozacRepository : JpaRepository<Vozac, Long> {
-    fun findByVraboten(vraboten: Vraboten): Vozac?
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/VozenjeRepository.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/VozenjeRepository.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,6 +1,0 @@
-package mk.ukim.finki.busngobackend.repository
-
-import mk.ukim.finki.busngobackend.domain.entities.Vozenje
-import org.springframework.data.jpa.repository.JpaRepository
-
-interface VozenjeRepository : JpaRepository<Vozenje, Long>
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/VrabotenRepository.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/repository/VrabotenRepository.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,9 +1,0 @@
-package mk.ukim.finki.busngobackend.repository
-
-import mk.ukim.finki.busngobackend.domain.entities.Korisnik
-import mk.ukim.finki.busngobackend.domain.entities.Vraboten
-import org.springframework.data.jpa.repository.JpaRepository
-
-interface VrabotenRepository : JpaRepository<Vraboten, Long> {
-    fun findByKorisnik(korisnik: Korisnik): Vraboten?
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/service/AdminService.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/service/AdminService.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,91 +1,0 @@
-package mk.ukim.finki.busngobackend.service
-
-import mk.ukim.finki.busngobackend.api.responses.AdminUsersResponse
-import mk.ukim.finki.busngobackend.domain.entities.KorisnikRole
-import mk.ukim.finki.busngobackend.domain.enums.RoleEnum
-import mk.ukim.finki.busngobackend.domain.views.*
-import mk.ukim.finki.busngobackend.repository.*
-import mk.ukim.finki.busngobackend.service.exceptions.NotFoundException
-import org.springframework.data.repository.findByIdOrNull
-import org.springframework.stereotype.Service
-
-@Service
-class AdminService(
-    private val avgTimeDIffsRepository: AvgTimeDIffsRepository,
-    private val finesByLineRepository: FinesByLineRepository,
-    private val commutesByHourRepository: CommutesByHourRepository,
-    private val commutesByLineRepository: CommutesByLineRepository,
-    private val numberOfPassengersByLineAndStationRepository: NumberOfPassengersByLineAndStationRepository,
-    private val ticketSalesRepository: TicketSalesRepository,
-    private val totalIncomeRepository: TotalIncomeRepository,
-    private val korisnikService: KorisnikService,
-    private val korisnikRepository: KorisnikRepository,
-    private val roleRepository: RoleRepository,
-    private val korisnikRoleRepository: KorisnikRoleRepository,
-    private val authService: AuthService,
-) {
-    fun getAverageTimeBetweenStations(): List<AverageTimeBetweenStations> {
-        authService.hasAuthority(RoleEnum.ROLE_ADMIN)
-        return avgTimeDIffsRepository.findAll()
-    }
-
-    fun getFinesByLine(): List<FinesByLine> {
-        authService.hasAuthority(RoleEnum.ROLE_ADMIN)
-        return finesByLineRepository.findAll()
-    }
-
-    fun getCommutesByHour(): List<CommutesByHour> {
-        authService.hasAuthority(RoleEnum.ROLE_ADMIN)
-        return commutesByHourRepository.findAll()
-    }
-
-    fun getCommutesByLine(): List<CommutesByLine> {
-        authService.hasAuthority(RoleEnum.ROLE_ADMIN)
-        return commutesByLineRepository.findAll()
-    }
-
-    fun getNumberOfPassengersByLineAndStation(): List<NumberOfPassengersByLineAndStation> {
-        authService.hasAuthority(RoleEnum.ROLE_ADMIN)
-        return numberOfPassengersByLineAndStationRepository.findAll()
-    }
-
-    fun getTicketSales(): List<TicketSales> {
-        authService.hasAuthority(RoleEnum.ROLE_ADMIN)
-        return ticketSalesRepository.findAll()
-    }
-
-    fun getTotalIncome(): List<TotalIncome> {
-        authService.hasAuthority(RoleEnum.ROLE_ADMIN)
-        return totalIncomeRepository.findAll()
-    }
-
-    fun getAllUsers(): List<AdminUsersResponse> {
-        authService.hasAuthority(RoleEnum.ROLE_ADMIN)
-        return korisnikService.getAllUsers()
-    }
-
-    fun updateRolesForUser(
-        id: Long,
-        roleNames: List<String>,
-    ): List<AdminUsersResponse> {
-        authService.hasAuthority(RoleEnum.ROLE_ADMIN)
-        val user = korisnikRepository.findByIdOrNull(id) ?: throw NotFoundException("User not found")
-        val roles = roleNames.flatMap { role -> roleRepository.findAllByNameLikeIgnoreCase(role) }
-
-        val allByKorisnik = korisnikRoleRepository.findAllByKorisnik(user)
-
-        val rolesToDelete = allByKorisnik.filter { it.role !in roles }
-        val rolesToAdd =
-            roles.filter { it !in allByKorisnik.map { r -> r.role } }.map {
-                KorisnikRole(
-                    id = 0L,
-                    korisnik = user,
-                    role = it,
-                )
-            }
-
-        korisnikRoleRepository.deleteAll(rolesToDelete)
-        korisnikRoleRepository.saveAll(rolesToAdd)
-        return getAllUsers()
-    }
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/service/AuthService.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/service/AuthService.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,157 +1,0 @@
-package mk.ukim.finki.busngobackend.service
-
-import mk.ukim.finki.busngobackend.api.requests.AuthRequest
-import mk.ukim.finki.busngobackend.api.requests.RegisterRequest
-import mk.ukim.finki.busngobackend.api.responses.AuthResponse
-import mk.ukim.finki.busngobackend.config.JwtService
-import mk.ukim.finki.busngobackend.domain.entities.*
-import mk.ukim.finki.busngobackend.domain.enums.RoleEnum
-import mk.ukim.finki.busngobackend.domain.enums.toId
-import mk.ukim.finki.busngobackend.repository.*
-import mk.ukim.finki.busngobackend.service.exceptions.NotFoundException
-import mk.ukim.finki.busngobackend.service.exceptions.UnauthorizedAccessException
-import org.springframework.data.repository.findByIdOrNull
-import org.springframework.security.authentication.AuthenticationManager
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken
-import org.springframework.security.core.GrantedAuthority
-import org.springframework.security.core.context.SecurityContext
-import org.springframework.security.core.context.SecurityContextHolder
-import org.springframework.security.core.userdetails.UserDetailsService
-import org.springframework.stereotype.Service
-
-@Service
-class AuthService(
-    private val authenticationManager: AuthenticationManager,
-    private val userDetailsService: UserDetailsService,
-    private val jwtService: JwtService,
-    private val korisnikRepository: KorisnikRepository,
-    private val korisnikRoleRepository: KorisnikRoleRepository,
-    private val roleRepository: RoleRepository,
-    private val instancaNaLinijaRepository: InstancaNaLinijaRepository,
-    private val vrabotenRepository: VrabotenRepository,
-    private val vozacRepository: VozacRepository,
-    private val kondukterRepository: KondukterRepository,
-    private val patnikRepository: PatnikRepository,
-) {
-    fun getSecurityContext(): SecurityContext = SecurityContextHolder.getContext()
-
-    fun getAuthenticatedUser(): Korisnik = userDetailsService.loadUserByUsername(getSecurityContext().authentication.name) as Korisnik
-
-    fun hasAuthority(authority: RoleEnum): Boolean =
-        getAuthenticatedUser().authorities.contains(roleRepository.findByIdOrNull(authority.toId()) as GrantedAuthority)
-
-    fun isAuthenticated(): Boolean {
-        if (getSecurityContext().authentication == null) {
-            throw UnauthorizedAccessException("User is not authenticated")
-        }
-        return true
-    }
-
-    fun register(registerRequest: RegisterRequest): AuthResponse {
-        if (this.korisnikRepository.findByEmail(registerRequest.email) != null) {
-            throw RuntimeException("Invalid credentials")
-        }
-        if (registerRequest.password != registerRequest.confirmPassword) {
-            throw RuntimeException("Passwords do not match")
-        }
-
-        val roles = this.roleRepository.findAllByNameLikeIgnoreCase("role_passenger")
-
-        val user =
-            this.korisnikRepository.save(
-                Korisnik(
-                    email = registerRequest.email,
-                    lozinka = registerRequest.password,
-                    ime = registerRequest.name,
-                    id = 0L,
-                    adresa = registerRequest.address,
-                    admin = false,
-                    telefon = registerRequest.phoneNumber,
-                    roles = null,
-                ),
-            )
-
-        val newRoles =
-            roles.map {
-                this.korisnikRoleRepository.save(
-                    KorisnikRole(
-                        id = 0,
-                        role = it,
-                        korisnik = user,
-                    ),
-                )
-            }
-
-        user.roles = newRoles
-
-        val korisnik = this.korisnikRepository.save(user)
-        val patnik =
-            this.patnikRepository.save(
-                Patnik(
-                    id = 0L,
-                    korisnik = korisnik,
-                ),
-            )
-
-        return this.authenticate(AuthRequest(user.email, user.lozinka))
-    }
-
-    fun authenticate(authRequest: AuthRequest): AuthResponse {
-        authenticationManager.authenticate(
-            UsernamePasswordAuthenticationToken(
-                authRequest.email,
-                authRequest.password,
-            ),
-        )
-
-        val user = userDetailsService.loadUserByUsername(authRequest.email)
-
-        val token = jwtService.generateToken(userDetails = user)
-
-        return AuthResponse(token)
-    }
-
-    fun isDriverFree(): Boolean {
-        if (!this.hasAuthority(RoleEnum.ROLE_DRIVER)) throw UnauthorizedAccessException("User is not authorized")
-        val korisnik = this.userDetailsService.loadUserByUsername(this.getSecurityContext().authentication.name) as Korisnik
-        val vraboten = this.vrabotenRepository.findByKorisnik(korisnik) ?: throw NotFoundException("Vraboten not found")
-        val vozac = this.vozacRepository.findByVraboten(vraboten) ?: throw NotFoundException("Vozac not found")
-
-        return !this.instancaNaLinijaRepository.existsByVozacAndEndDateIsNull(vozac.id)
-    }
-
-    fun getConductor(): Kondukter {
-        if (!this.isAuthenticated() || !this.hasAuthority(RoleEnum.ROLE_CONDUCTOR)) {
-            throw UnauthorizedAccessException("Unauthorized access")
-        }
-
-        val korisnik = this.getAuthenticatedUser()
-        val vraboten = vrabotenRepository.findByKorisnik(korisnik) ?: throw NotFoundException("Korisnik")
-        val kondukter = kondukterRepository.findByVraboten(vraboten) ?: throw NotFoundException("Kondukter")
-
-        return kondukter
-    }
-
-    fun getDriver(): Vozac {
-        if (!this.isAuthenticated() || !this.hasAuthority(RoleEnum.ROLE_DRIVER)) {
-            throw UnauthorizedAccessException("Unauthorized access")
-        }
-
-        val korisnik = this.getAuthenticatedUser()
-        val vraboten = vrabotenRepository.findByKorisnik(korisnik) ?: throw NotFoundException("Korisnik")
-        val vozac = vozacRepository.findByVraboten(vraboten) ?: throw NotFoundException("Vozac")
-
-        return vozac
-    }
-
-    fun getPassenger(): Patnik {
-        if (!this.isAuthenticated() || !this.hasAuthority(RoleEnum.ROLE_PASSENGER)) {
-            throw UnauthorizedAccessException("Unauthorized access")
-        }
-
-        val korisnik = this.getAuthenticatedUser()
-        val patnik = patnikRepository.findByKorisnik(korisnik) ?: throw NotFoundException("Patnik")
-
-        return patnik
-    }
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/service/BiletService.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/service/BiletService.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,65 +1,0 @@
-package mk.ukim.finki.busngobackend.service
-
-import mk.ukim.finki.busngobackend.api.requests.TicketBuyRequest
-import mk.ukim.finki.busngobackend.api.responses.TicketResponse
-import mk.ukim.finki.busngobackend.domain.entities.Bilet
-import mk.ukim.finki.busngobackend.domain.enums.BiletEnum
-import mk.ukim.finki.busngobackend.mapper.ClassToDtoMapper
-import mk.ukim.finki.busngobackend.repository.BiletRepository
-import mk.ukim.finki.busngobackend.repository.PatnikRepository
-import mk.ukim.finki.busngobackend.repository.TipbiletRepository
-import mk.ukim.finki.busngobackend.service.exceptions.NotFoundException
-import org.springframework.data.repository.findByIdOrNull
-import org.springframework.stereotype.Service
-import java.sql.Timestamp
-import java.time.LocalDateTime
-
-@Service
-class BiletService(
-    private val mapper: ClassToDtoMapper,
-    private val biletRepository: BiletRepository,
-    private val korisnikService: KorisnikService,
-    private val patnikRepository: PatnikRepository,
-    private val tipbiletRepository: TipbiletRepository,
-) {
-    fun getTicketsByUser(): List<TicketResponse> {
-        val user = korisnikService.getUser()
-        val patnik =
-            patnikRepository.findByKorisnik(user) ?: throw NotFoundException("Patnik not found")
-
-        return biletRepository.findAllByPatnik(patnik).map { mapper.toTicketResponse(it) }
-    }
-
-    fun buyTicket(request: TicketBuyRequest): TicketResponse {
-        val user = korisnikService.getUser()
-        val patnik =
-            patnikRepository.findByKorisnik(user) ?: throw NotFoundException("Patnik not found")
-        val type = tipbiletRepository.findByIdOrNull(request.type) ?: throw NotFoundException("Type not found")
-
-        val ticket =
-            biletRepository.save(
-                Bilet(
-                    id = 0L,
-                    status = BiletEnum.INACTIVE,
-                    tip = type,
-                    datumKupuvanje = Timestamp.valueOf(LocalDateTime.now()),
-                    patnik = patnik,
-                    datumAktivacija = null,
-                ),
-            )
-
-        return mapper.toTicketResponse(ticket)
-    }
-
-    fun activateTicket(id: Long): TicketResponse {
-        val user = korisnikService.getUser()
-        val patnik =
-            patnikRepository.findByKorisnik(user) ?: throw NotFoundException("Patnik not found")
-
-        val ticket = biletRepository.findByIdAndPatnik(id, patnik) ?: throw NotFoundException("Ticket not found")
-
-        ticket.status = BiletEnum.ACTIVE
-        ticket.datumAktivacija = Timestamp.valueOf(LocalDateTime.now())
-        return mapper.toTicketResponse(biletRepository.save(ticket))
-    }
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/service/BusService.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/service/BusService.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,14 +1,0 @@
-package mk.ukim.finki.busngobackend.service
-
-import mk.ukim.finki.busngobackend.domain.entities.Avtobus
-import mk.ukim.finki.busngobackend.repository.AvtobusRepository
-import org.springframework.stereotype.Service
-
-@Service
-class BusService(
-    private val avtobusRepository: AvtobusRepository,
-) {
-    fun findAll() = avtobusRepository.findAll()
-
-    fun findAllFree(): List<Avtobus> = this.avtobusRepository.findAllFreeBuses()
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/service/CommuteService.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/service/CommuteService.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,66 +1,0 @@
-package mk.ukim.finki.busngobackend.service
-
-import jakarta.transaction.Transactional
-import mk.ukim.finki.busngobackend.api.requests.StartCommuteRequest
-import mk.ukim.finki.busngobackend.api.responses.CommuteResponse
-import mk.ukim.finki.busngobackend.domain.entities.Vozenje
-import mk.ukim.finki.busngobackend.domain.enums.BiletEnum
-import mk.ukim.finki.busngobackend.domain.enums.RoleEnum
-import mk.ukim.finki.busngobackend.domain.enums.VozenjeStatus
-import mk.ukim.finki.busngobackend.mapper.ClassToDtoMapper
-import mk.ukim.finki.busngobackend.repository.*
-import mk.ukim.finki.busngobackend.service.exceptions.NotFoundException
-import mk.ukim.finki.busngobackend.service.exceptions.UnauthorizedAccessException
-import org.springframework.data.repository.findByIdOrNull
-import org.springframework.stereotype.Service
-import java.sql.Timestamp
-import java.time.LocalDateTime
-
-@Service
-class CommuteService(
-    private val linijaRepository: LinijaRepository,
-    private val postojkaRepository: PostojkaRepository,
-    private val postojkaNaLinijaRepository: PostojkaNaLinijaRepository,
-    private val biletRepository: BiletRepository,
-    private val authService: AuthService,
-    private val patnikRepository: PatnikRepository,
-    private val instancaNaLinijaRepository: InstancaNaLinijaRepository,
-    private val vozenjeRepository: VozenjeRepository,
-    private val dtoMapper: ClassToDtoMapper,
-) {
-    @Transactional
-    fun start(request: StartCommuteRequest): CommuteResponse {
-        if (!this.authService.hasAuthority(RoleEnum.ROLE_PASSENGER)) throw UnauthorizedAccessException("Unauthorised role")
-        val korisnik = this.authService.getAuthenticatedUser()
-        val patnik = patnikRepository.findByKorisnik(korisnik) ?: throw NotFoundException("Korisnik")
-
-        var bilet = biletRepository.findByIdAndPatnik(request.ticketId, patnik) ?: throw NotFoundException("Bilet")
-
-        val instancaNaLinija =
-            instancaNaLinijaRepository.findByIdOrNull(request.routeInstanceId) ?: throw NotFoundException("RouteInstanceId")
-        val postojka = postojkaRepository.findByIdOrNull(request.stationId) ?: throw NotFoundException("StationId")
-
-        val postojkaNaLinijaStart =
-            postojkaNaLinijaRepository.findByLinijaAndPostojkaAndPravec(instancaNaLinija.linija, postojka, instancaNaLinija.pravec)
-                ?: throw NotFoundException("Station not found")
-
-        if (bilet.status == BiletEnum.INACTIVE) {
-            bilet.status = BiletEnum.ACTIVE
-            bilet.datumAktivacija = Timestamp.valueOf(LocalDateTime.now())
-            bilet = biletRepository.save(bilet)
-        }
-
-        val vozenje =
-            Vozenje(
-                id = 0L,
-                startDate = Timestamp.valueOf(LocalDateTime.now()),
-                endDate = null,
-                status = VozenjeStatus.ACTIVE,
-                patnik = patnik,
-                postojkaNaLinijaStart = postojkaNaLinijaStart,
-                instancaNaLinija = instancaNaLinija,
-                bilet = bilet,
-            )
-        return vozenjeRepository.save(vozenje).let { dtoMapper.toCommuteResponse(it) }
-    }
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/service/ControlService.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/service/ControlService.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,61 +1,0 @@
-package mk.ukim.finki.busngobackend.service
-
-import mk.ukim.finki.busngobackend.api.responses.ControlResponse
-import mk.ukim.finki.busngobackend.api.responses.FineResponse
-import mk.ukim.finki.busngobackend.domain.entities.Kontrola
-import mk.ukim.finki.busngobackend.mapper.ClassToDtoMapper
-import mk.ukim.finki.busngobackend.repository.*
-import mk.ukim.finki.busngobackend.service.exceptions.NotFoundException
-import org.springframework.data.repository.findByIdOrNull
-import org.springframework.stereotype.Service
-import java.sql.Timestamp
-import java.time.LocalDateTime
-
-@Service
-class ControlService(
-    private val kontrolaRepository: KontrolaRepository,
-    private val dtoMapper: ClassToDtoMapper,
-    private val authService: AuthService,
-    private val instancaNaLinijaRepository: InstancaNaLinijaRepository,
-    private val kaznaRepository: KaznaRepository,
-    private val kaznaZaRegistriranRepository: KaznaZaRegistriranRepository,
-    private val kaznaZaNeregistriranRepository: KaznaZaNeregistriranRepository,
-) {
-    fun getAllByConductor(): List<ControlResponse> {
-        val kondukter = authService.getConductor()
-
-        return kontrolaRepository
-            .findAllByKondukterOrderByDateCreatedDesc(
-                kondukter,
-            ).map { kontrola -> dtoMapper.toControlResponse(kontrola) }
-    }
-
-    fun start(routeInstanceId: Long): ControlResponse {
-        val instancaNaLinija =
-            instancaNaLinijaRepository.findByIdOrNull(routeInstanceId) ?: throw NotFoundException("Route instance")
-        val kontrola =
-            kontrolaRepository.save(
-                Kontrola(
-                    id = 0L,
-                    kondukter = authService.getConductor(),
-                    dateCreated = Timestamp.valueOf(LocalDateTime.now()),
-                    instancaNaLinija = instancaNaLinija,
-                ),
-            )
-        return kontrola.let { dtoMapper.toControlResponse(it) }
-    }
-
-    fun getFines(controlId: Long): List<FineResponse> {
-        val kondukter = authService.getConductor()
-        val kontrola = kontrolaRepository.findByIdOrNull(controlId) ?: throw NotFoundException("Control not found")
-
-        val kazni = kaznaRepository.findAllByKontrola(kontrola)
-
-        val kzrs = kaznaZaRegistriranRepository.findAllByKaznaIn(kazni)
-        val kzns = kaznaZaNeregistriranRepository.findAllByKaznaIn(kazni)
-
-        return kzrs
-            .map { dtoMapper.toFineResponse(kazna = it.kazna, kzr = it, kzn = null) }
-            .plus(kzns.map { dtoMapper.toFineResponse(kazna = it.kazna, kzr = null, kzn = it) })
-    }
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/service/DirectionService.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/service/DirectionService.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,21 +1,0 @@
-package mk.ukim.finki.busngobackend.service
-
-import mk.ukim.finki.busngobackend.domain.entities.LinijaPravec
-import mk.ukim.finki.busngobackend.repository.LinijaPravecRepository
-import mk.ukim.finki.busngobackend.repository.LinijaRepository
-import mk.ukim.finki.busngobackend.repository.PravecRepository
-import mk.ukim.finki.busngobackend.service.exceptions.NotFoundException
-import org.springframework.data.repository.findByIdOrNull
-import org.springframework.stereotype.Service
-
-@Service
-class DirectionService(
-    private val pravecRepository: PravecRepository,
-    private val linijaPravecRepository: LinijaPravecRepository,
-    private val linijaRepository: LinijaRepository,
-) {
-    fun findDirectionsByLineId(lineId: Int): List<LinijaPravec> {
-        val linija = linijaRepository.findByIdOrNull(lineId) ?: throw NotFoundException("Line not found")
-        return linijaPravecRepository.findAllByLinija(linija)
-    }
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/service/FineService.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/service/FineService.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,81 +1,0 @@
-package mk.ukim.finki.busngobackend.service
-
-import jakarta.transaction.Transactional
-import mk.ukim.finki.busngobackend.api.requests.FineRequest
-import mk.ukim.finki.busngobackend.api.responses.FineResponse
-import mk.ukim.finki.busngobackend.domain.entities.Kazna
-import mk.ukim.finki.busngobackend.domain.entities.KaznaZaNeregistriran
-import mk.ukim.finki.busngobackend.domain.entities.KaznaZaRegistriran
-import mk.ukim.finki.busngobackend.mapper.ClassToDtoMapper
-import mk.ukim.finki.busngobackend.repository.*
-import mk.ukim.finki.busngobackend.service.exceptions.NotFoundException
-import org.springframework.data.repository.findByIdOrNull
-import org.springframework.stereotype.Service
-import java.sql.Timestamp
-import java.time.LocalDateTime
-
-@Service
-class FineService(
-    private val kaznaRepository: KaznaRepository,
-    private val authService: AuthService,
-    private val kontrolaRepository: KontrolaRepository,
-    private val dtoMapper: ClassToDtoMapper,
-    private val kaznaZaRegistriranRepository: KaznaZaRegistriranRepository,
-    private val kaznaZaNeregistriranRepository: KaznaZaNeregistriranRepository,
-    private val korisnikRepository: KorisnikRepository,
-    private val patnikRepository: PatnikRepository,
-) {
-    @Transactional
-    fun createFine(request: FineRequest): FineResponse {
-        val kontrola = kontrolaRepository.findByIdOrNull(request.kontrolaId) ?: throw NotFoundException("Kontrola")
-        val now = Timestamp.valueOf(LocalDateTime.now())
-        val kazna =
-            kaznaRepository.save(
-                Kazna(
-                    dateCreated = now,
-                    id = 0L,
-                    kondukter = authService.getConductor(),
-                    datePayed =
-                        if (request.plateno) {
-                            now
-                        } else {
-                            null
-                        },
-                    iznos = request.iznos,
-                    dokument = request.dokument,
-                    kontrola = kontrola,
-                    plateno = request.plateno,
-                ),
-            )
-
-        if (request.patnikId != null) {
-            val korisnik = korisnikRepository.findByIdOrNull(request.patnikId!!) ?: throw NotFoundException("Korisnik")
-            val patnik = patnikRepository.findByKorisnik(korisnik) ?: throw NotFoundException("Patnik")
-            val kzr =
-                kaznaZaRegistriranRepository.save(
-                    KaznaZaRegistriran(
-                        patnik = patnik,
-                        id = 0L,
-                        kazna = kazna,
-                    ),
-                )
-            return kzr.let { dtoMapper.toFineResponse(kazna = kazna, kzr = kzr, kzn = null) }
-        }
-
-        if (request.adresa != null && request.ime != null && request.telefon != null) {
-            val kzn =
-                kaznaZaNeregistriranRepository.save(
-                    KaznaZaNeregistriran(
-                        id = 0L,
-                        kazna = kazna,
-                        ime = request.ime!!,
-                        telefon = request.telefon!!,
-                        adresa = request.adresa!!,
-                    ),
-                )
-
-            return kzn.let { dtoMapper.toFineResponse(kazna = kazna, kzn = kzn, kzr = null) }
-        }
-        return dtoMapper.toFineResponse(kazna = kazna, kzr = null, kzn = null)
-    }
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/service/KorisnikService.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/service/KorisnikService.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,36 +1,0 @@
-package mk.ukim.finki.busngobackend.service
-
-import mk.ukim.finki.busngobackend.api.responses.UserResponse
-import mk.ukim.finki.busngobackend.domain.entities.Korisnik
-import mk.ukim.finki.busngobackend.mapper.ClassToDtoMapper
-import mk.ukim.finki.busngobackend.repository.KorisnikRepository
-import mk.ukim.finki.busngobackend.repository.PatnikRepository
-import mk.ukim.finki.busngobackend.service.exceptions.UnauthorizedAccessException
-import org.springframework.stereotype.Service
-
-@Service
-class KorisnikService(
-    private val korisnikRepository: KorisnikRepository,
-    private val authService: AuthService,
-    private val mapper: ClassToDtoMapper,
-    private val patnikRepository: PatnikRepository,
-    private val classToDtoMapper: ClassToDtoMapper,
-) {
-    fun getAuthenticatedUser(): UserResponse {
-        val user =
-            authService.getSecurityContext().authentication?.let { auth ->
-                korisnikRepository.findByEmail(auth.name)
-            }
-
-        return user?.let { mapper.toUserResponse(it) } ?: throw UnauthorizedAccessException("Unauthorized access")
-    }
-
-    fun getUser(): Korisnik =
-        authService.getSecurityContext().authentication?.let { auth ->
-            korisnikRepository.findByEmail(auth.name)
-        } ?: throw UnauthorizedAccessException("Unauthorized access")
-
-    fun getAllPassengers(): List<UserResponse> = patnikRepository.findAll().map { classToDtoMapper.toUserResponse(it.korisnik) }
-
-    fun getAllUsers() = korisnikRepository.findAll().map { classToDtoMapper.toAdminUsersResponse(it) }
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/service/LineService.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/service/LineService.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,14 +1,0 @@
-package mk.ukim.finki.busngobackend.service
-
-import mk.ukim.finki.busngobackend.domain.entities.Linija
-import mk.ukim.finki.busngobackend.mapper.ClassToDtoMapper
-import mk.ukim.finki.busngobackend.repository.LinijaRepository
-import org.springframework.stereotype.Service
-
-@Service
-class LineService(
-    private val linijaRepository: LinijaRepository,
-    private val dtoMapper: ClassToDtoMapper,
-) {
-    fun findAllLines(): List<Linija> = this.linijaRepository.findAll()
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/service/MaterializedViewService.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/service/MaterializedViewService.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,34 +1,0 @@
-package mk.ukim.finki.busngobackend.service
-
-import org.springframework.jdbc.core.JdbcTemplate
-import org.springframework.stereotype.Service
-import org.springframework.transaction.annotation.Transactional
-
-@Service
-class MaterializedViewService(
-    private val jdbcTemplate: JdbcTemplate,
-) {
-    @Transactional
-    fun refreshAverageTimeDiffs() {
-        val sql = "REFRESH MATERIALIZED VIEW CONCURRENTLY project.avg_time_diffs;"
-        jdbcTemplate.execute(sql)
-    }
-
-    @Transactional
-    fun refreshCommutesByHour() {
-        val sql = "refresh materialized view concurrently project.most_busy_part_of_the_day;"
-        jdbcTemplate.execute(sql)
-    }
-
-    @Transactional
-    fun refreshFinesPerLine() {
-        val sql = "refresh materialized view concurrently project.kazna_po_linija;"
-        jdbcTemplate.execute(sql)
-    }
-
-    @Transactional
-    fun refreshTotalIncome() {
-        val sql = "refresh materialized view concurrently project.total_income;"
-        jdbcTemplate.execute(sql)
-    }
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/service/RouteInstanceOnStationService.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/service/RouteInstanceOnStationService.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,35 +1,0 @@
-package mk.ukim.finki.busngobackend.service
-
-import mk.ukim.finki.busngobackend.domain.entities.InstancaNaLinijaPostojkaNaLinija
-import mk.ukim.finki.busngobackend.repository.InstancaNaLinijaPostojkaNaLinijaRepository
-import mk.ukim.finki.busngobackend.repository.InstancaNaLinijaRepository
-import mk.ukim.finki.busngobackend.repository.PostojkaNaLinijaRepository
-import mk.ukim.finki.busngobackend.service.exceptions.NotFoundException
-import org.springframework.data.repository.findByIdOrNull
-import org.springframework.stereotype.Service
-import java.sql.Timestamp
-
-@Service
-class RouteInstanceOnStationService(
-    private val instancaNaLinijaPostojkaNaLinijaRepository: InstancaNaLinijaPostojkaNaLinijaRepository,
-    private val instancaNaLinijaRepository: InstancaNaLinijaRepository,
-    private val postojkaNaLinijaRepository: PostojkaNaLinijaRepository,
-) {
-    fun create(
-        routeInstanceId: Long,
-        lineStationId: Long,
-        timestamp: Timestamp,
-    ): InstancaNaLinijaPostojkaNaLinija {
-        val routeInstance =
-            instancaNaLinijaRepository.findByIdOrNull(routeInstanceId) ?: throw NotFoundException("Route instance not found")
-        val lineStation = postojkaNaLinijaRepository.findByIdOrNull(lineStationId) ?: throw NotFoundException("Line station not found")
-        return instancaNaLinijaPostojkaNaLinijaRepository.save(
-            InstancaNaLinijaPostojkaNaLinija(
-                instancaNaLinija = routeInstance,
-                postojkaNaLinija = lineStation,
-                timestamp = timestamp,
-                id = 0L,
-            ),
-        )
-    }
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/service/RouteInstanceService.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/service/RouteInstanceService.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,96 +1,0 @@
-package mk.ukim.finki.busngobackend.service
-
-import mk.ukim.finki.busngobackend.api.requests.StartRouteInstanceRequest
-import mk.ukim.finki.busngobackend.api.responses.RouteInstanceResponse
-import mk.ukim.finki.busngobackend.domain.entities.InstancaNaLinija
-import mk.ukim.finki.busngobackend.domain.enums.RoleEnum
-import mk.ukim.finki.busngobackend.events.StartRouteEvent
-import mk.ukim.finki.busngobackend.mapper.ClassToDtoMapper
-import mk.ukim.finki.busngobackend.repository.*
-import mk.ukim.finki.busngobackend.service.exceptions.NotFoundException
-import mk.ukim.finki.busngobackend.service.exceptions.UnauthorizedAccessException
-import org.springframework.context.ApplicationEventPublisher
-import org.springframework.data.repository.findByIdOrNull
-import org.springframework.stereotype.Service
-import java.sql.Timestamp
-import java.time.LocalDateTime
-
-@Service
-class RouteInstanceService(
-    private val instancaNaLinijaRepository: InstancaNaLinijaRepository,
-    private val linijaRepository: LinijaRepository,
-    private val pravecRepository: PravecRepository,
-    private val linijaPravecRepository: LinijaPravecRepository,
-    private val avtobusRepository: AvtobusRepository,
-    private val authService: AuthService,
-    private val vrabotenRepository: VrabotenRepository,
-    private val vozacRepository: VozacRepository,
-    private val dtoMapper: ClassToDtoMapper,
-    private val publisher: ApplicationEventPublisher,
-    private val postojkaRepository: PostojkaRepository,
-) {
-    fun start(request: StartRouteInstanceRequest): RouteInstanceResponse {
-        if (!authService.isAuthenticated() || !authService.hasAuthority(RoleEnum.ROLE_DRIVER)) {
-            throw UnauthorizedAccessException("Unauthorized access")
-        }
-
-        val korisnik = authService.getAuthenticatedUser()
-        val vraboten = vrabotenRepository.findByKorisnik(korisnik) ?: throw NotFoundException("Korisnik")
-        val vozac = vozacRepository.findByVraboten(vraboten) ?: throw NotFoundException("Vraboten")
-
-        val linija = linijaRepository.findByIdOrNull(request.lineId) ?: throw NotFoundException("Line not found")
-        val pravec =
-            pravecRepository.findByIdOrNull(request.directionId) ?: throw NotFoundException("Direction not found")
-
-        if (!linijaPravecRepository.existsByLinijaAndPravec(linija, pravec)) {
-            throw NotFoundException("Line does not has the specified direction")
-        }
-
-        val avtobus = avtobusRepository.findByIdOrNull(request.busId) ?: throw NotFoundException("Bus Not Found")
-
-        val instanca =
-            InstancaNaLinija(
-                id = 0L,
-                startDate = Timestamp.valueOf(LocalDateTime.now()),
-                linija = linija,
-                pravec = pravec,
-                avtobus = avtobus,
-                vozac = vozac,
-                endDate = null,
-            )
-
-        return instancaNaLinijaRepository
-            .save(instanca)
-            .let {
-                publisher.publishEvent(StartRouteEvent(it))
-                dtoMapper.toRouteInstanceResponse(it)
-            }
-    }
-
-    fun findById(id: Long): InstancaNaLinija = instancaNaLinijaRepository.findByIdOrNull(id) ?: throw NotFoundException("id not found")
-
-    fun stop(id: Long): RouteInstanceResponse {
-        val instance = this.findById(id)
-        if (instance.endDate != null) throw UnauthorizedAccessException("Unauthorized access")
-        instance.endDate = Timestamp.valueOf(LocalDateTime.now())
-        return instancaNaLinijaRepository.save(instance).let { dtoMapper.toRouteInstanceResponse(it) }
-    }
-
-    fun getById(id: Long): RouteInstanceResponse {
-        val ri = this.findById(id)
-        val korisnik = this.authService.getAuthenticatedUser()
-        if (korisnik.id != ri.vozac.vraboten.korisnik.id) throw UnauthorizedAccessException("Unauthorized access")
-        return dtoMapper.toRouteInstanceResponse(this.findById(id))
-    }
-
-    fun getForStation(stationId: Long): List<RouteInstanceResponse> {
-        val station = postojkaRepository.findByIdOrNull(stationId) ?: throw NotFoundException("Station not found")
-        // find all route instances heading to the given station
-        val routeInstanceIds = instancaNaLinijaRepository.findIncomingRouteInstancesForStation(station.id)
-        val routeInstances = instancaNaLinijaRepository.findAllById(routeInstanceIds)
-        return routeInstances.map { dtoMapper.toRouteInstanceResponse(it) }
-    }
-
-    fun getAll(): List<RouteInstanceResponse> =
-        instancaNaLinijaRepository.findAllByEndDateIsNull().map { dtoMapper.toRouteInstanceResponse(it) }
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/service/StationService.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/service/StationService.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,40 +1,0 @@
-package mk.ukim.finki.busngobackend.service
-
-import mk.ukim.finki.busngobackend.domain.entities.Postojka
-import mk.ukim.finki.busngobackend.domain.entities.PostojkaNaLinija
-import mk.ukim.finki.busngobackend.repository.LinijaRepository
-import mk.ukim.finki.busngobackend.repository.PostojkaNaLinijaRepository
-import mk.ukim.finki.busngobackend.repository.PostojkaRepository
-import mk.ukim.finki.busngobackend.repository.PravecRepository
-import mk.ukim.finki.busngobackend.service.exceptions.NotFoundException
-import org.springframework.data.repository.findByIdOrNull
-import org.springframework.stereotype.Service
-
-@Service
-class StationService(
-    private val postojkaRepository: PostojkaRepository,
-    private val postojkaNaLinijaRepository: PostojkaNaLinijaRepository,
-    private val linijaRepository: LinijaRepository,
-    private val pravecRepository: PravecRepository,
-) {
-    fun findStationsByLineId(lineId: Int): List<PostojkaNaLinija> {
-        val linija = linijaRepository.findByIdOrNull(lineId) ?: throw NotFoundException("Linija not found")
-        return this.postojkaNaLinijaRepository.findByLinija(linija)
-    }
-
-    fun findStationsByLineIdAndDirectionId(
-        lineId: Int,
-        directionId: Long?,
-    ): List<PostojkaNaLinija> {
-        if (directionId == null) {
-            return this.findStationsByLineId(lineId)
-        }
-
-        val linija = linijaRepository.findByIdOrNull(lineId) ?: throw NotFoundException("Linija not found")
-        val pravec = pravecRepository.findByIdOrNull(directionId) ?: throw NotFoundException("Pravec not found")
-
-        return postojkaNaLinijaRepository.findByLinijaAndPravec(linija, pravec)
-    }
-
-    fun getAll(): List<Postojka> = this.postojkaRepository.findAll()
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/service/WebSocketService.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/service/WebSocketService.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,16 +1,0 @@
-package mk.ukim.finki.busngobackend.service
-
-import org.springframework.messaging.simp.SimpMessagingTemplate
-import org.springframework.stereotype.Service
-
-@Service
-class WebSocketService(
-    private val messagingTemplate: SimpMessagingTemplate,
-) {
-    fun sendMessage(
-        topicSuffix: String,
-        message: String,
-    ) {
-        messagingTemplate.convertAndSend("/topic/$topicSuffix", message)
-    }
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/service/exceptions/NotFoundException.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/service/exceptions/NotFoundException.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,5 +1,0 @@
-package mk.ukim.finki.busngobackend.service.exceptions
-
-class NotFoundException(
-    message: String,
-) : RuntimeException(message)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/service/exceptions/UnauthorizedAccessException.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/service/exceptions/UnauthorizedAccessException.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,5 +1,0 @@
-package mk.ukim.finki.busngobackend.service.exceptions
-
-class UnauthorizedAccessException(
-    s: String,
-) : RuntimeException(s)
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/simulator/DummyDataPopulator.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/simulator/DummyDataPopulator.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,208 +1,0 @@
-package mk.ukim.finki.busngobackend.simulator
-
-import mk.ukim.finki.busngobackend.domain.entities.*
-import mk.ukim.finki.busngobackend.domain.enums.BiletEnum
-import mk.ukim.finki.busngobackend.domain.enums.VozenjeStatus
-import mk.ukim.finki.busngobackend.repository.*
-import org.springframework.stereotype.Service
-import java.sql.Timestamp
-import java.time.LocalDateTime
-import java.time.ZoneId
-import java.util.concurrent.ThreadLocalRandom
-
-@Service
-class DummyDataPopulator(
-    private val linijaRepository: LinijaRepository,
-    private val vozacRepository: VozacRepository,
-    private val avtobusRepository: AvtobusRepository,
-    private val linijaPravecRepository: LinijaPravecRepository,
-    private val postojkaNaLinijaRepository: PostojkaNaLinijaRepository,
-    private val instancaNaLinijaRepository: InstancaNaLinijaRepository,
-    private val instancaNaLinijaPostojkaNaLinijaRepository: InstancaNaLinijaPostojkaNaLinijaRepository,
-    private val vozenjeRepository: VozenjeRepository,
-    private val patnikRepository: PatnikRepository,
-    private val biletRepository: BiletRepository,
-    private val tipbiletRepository: TipbiletRepository,
-    private val kaznaRepository: KaznaRepository,
-    private val kontrolaRepository: KontrolaRepository,
-    private val kondukterRepository: KondukterRepository,
-    private val kaznaZaNeregistriranRepository: KaznaZaNeregistriranRepository,
-) {
-    fun populateFines() {
-        val routeInstances = instancaNaLinijaRepository.findAll()
-        val kondukters = kondukterRepository.findAll()
-
-        routeInstances.forEach { inl ->
-            run {
-                val kondukter = kondukters.random()
-                val kontrola =
-                    kontrolaRepository.save(
-                        Kontrola(
-                            id = 0L,
-                            instancaNaLinija = inl,
-                            dateCreated = getRandomTimestamp(inl.startDate.toLocalDateTime(), inl.endDate!!.toLocalDateTime()),
-                            kondukter = kondukter,
-                        ),
-                    )
-                for (i in 0..5) {
-                    val kazna =
-                        kaznaRepository.save(
-                            Kazna(
-                                id = 0L,
-                                iznos = 1000.0,
-                                dokument = "DOC " + LocalDateTime.now().toString(),
-                                kontrola = kontrola,
-                                dateCreated = getRandomTimestamp(kontrola.dateCreated.toLocalDateTime(), inl.endDate!!.toLocalDateTime()),
-                                datePayed = getRandomTimestamp(kontrola.dateCreated.toLocalDateTime(), inl.endDate!!.toLocalDateTime()),
-                                kondukter = kondukter,
-                                plateno = true,
-                            ),
-                        )
-
-                    kaznaZaNeregistriranRepository.save(
-                        KaznaZaNeregistriran(
-                            id = 0L,
-                            kazna = kazna,
-                            ime = "Test Ime" + LocalDateTime.now().toString(),
-                            adresa = "Test Adres" + LocalDateTime.now().toString(),
-                            telefon = "+38975123456",
-                        ),
-                    )
-                }
-            }
-        }
-    }
-
-    fun populateCommutes() {
-        val routeInstances = instancaNaLinijaRepository.findAll()
-        routeInstances.forEach { instancaNaLinija ->
-            run {
-                val patnik = patnikRepository.findAll().random()
-                val startDate =
-                    getRandomTimestamp(
-                        instancaNaLinija.startDate.toLocalDateTime(),
-                        instancaNaLinija.endDate!!.toLocalDateTime(),
-                    )
-                val bilet =
-                    biletRepository.findAll().randomOrNull() ?: biletRepository.save(
-                        Bilet(
-                            id = 0L,
-                            datumKupuvanje = startDate,
-                            datumAktivacija = startDate,
-                            status = BiletEnum.ACTIVE,
-                            patnik = patnik,
-                            tip = tipbiletRepository.findAll().random(),
-                        ),
-                    )
-                val postojkaNaLinijaStart =
-                    instancaNaLinijaPostojkaNaLinijaRepository.findByInstancaNaLinijaAndTimestampNearestTo(
-                        instancaNaLinija.id,
-                        startDate,
-                    )
-                vozenjeRepository.save(
-                    Vozenje(
-                        id = 0L,
-                        startDate = startDate,
-                        instancaNaLinija = instancaNaLinija,
-                        postojkaNaLinijaStart =
-                            postojkaNaLinijaStart?.postojkaNaLinija
-                                ?: postojkaNaLinijaRepository.findByLinija(instancaNaLinija.linija).random(),
-                        patnik = patnik,
-                        endDate = instancaNaLinija.endDate,
-                        bilet = bilet,
-                        status = VozenjeStatus.FINISHED,
-                    ),
-                )
-            }
-        }
-    }
-
-    fun populateRouteInstances() {
-        val lines = linijaRepository.findAll()
-        val drivers = vozacRepository.findAll()
-        val buses = avtobusRepository.findAll()
-
-        lines.forEach { randomLine ->
-            run {
-                val directionsForRandomLine = linijaPravecRepository.findAllByLinija(randomLine).map { it.pravec }
-                for (i in 0..10) {
-                    val randomDirection = directionsForRandomLine.random()
-                    val startDate =
-                        getRandomTimestamp(
-                            start = LocalDateTime.of(2020, 1, 1, 0, 0),
-                            end = LocalDateTime.now(),
-                        )
-
-                    val instance =
-                        instancaNaLinijaRepository.save(
-                            InstancaNaLinija(
-                                startDate = startDate,
-                                endDate = null,
-                                id = 0L,
-                                vozac = drivers.random(),
-                                linija = randomLine,
-                                avtobus = buses.random(),
-                                pravec = randomDirection,
-                            ),
-                        )
-
-                    val stationsForRandomLine =
-                        postojkaNaLinijaRepository
-                            .findByLinijaAndPravec(
-                                randomLine,
-                                randomDirection,
-                            ).sortedBy { it.redenBroj }
-                    var lastTime = Timestamp.valueOf(LocalDateTime.now())
-                    stationsForRandomLine.forEach { station ->
-                        run {
-                            if (station.redenBroj.toInt() == 1) {
-                                val start = instance.startDate.toLocalDateTime().plusMinutes(1)
-                                lastTime = getRandomTimestamp(start = start, end = start.plusMinutes(12))
-                            } else {
-                                val start = lastTime.toLocalDateTime().plusMinutes(1)
-                                lastTime = getRandomTimestamp(start = start, end = start.plusMinutes(12))
-                            }
-                            instancaNaLinijaPostojkaNaLinijaRepository.save(
-                                InstancaNaLinijaPostojkaNaLinija(
-                                    id = 0L,
-                                    instancaNaLinija = instance,
-                                    postojkaNaLinija = station,
-                                    timestamp = lastTime,
-                                ),
-                            )
-                        }
-                    }
-                    instance.endDate = lastTime
-                    instancaNaLinijaRepository.save(instance)
-                }
-            }
-        }
-    }
-
-    private fun getRandomTimestamp(
-        start: LocalDateTime,
-        end: LocalDateTime,
-    ): Timestamp {
-        // Define the start time (January 1, 2020, 00:00:00)
-//        val start = LocalDateTime.of(2020, 1, 1, 0, 0)
-        // Get the current time
-//        val end = LocalDateTime.now()
-
-        // Convert LocalDateTime to milliseconds since epoch
-        val startMillis = start.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()
-        val endMillis = end.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()
-
-        // Generate a random time between startMillis and endMillis
-        val randomMillis = ThreadLocalRandom.current().nextLong(startMillis, endMillis)
-
-        // Convert milliseconds back to LocalDateTime
-        val randomLocalDateTime =
-            LocalDateTime.ofInstant(
-                java.time.Instant.ofEpochMilli(randomMillis),
-                ZoneId.systemDefault(),
-            )
-
-        // Convert LocalDateTime to Timestamp
-        return Timestamp.valueOf(randomLocalDateTime)
-    }
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/simulator/RouteInstanceSimulator.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/simulator/RouteInstanceSimulator.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,43 +1,0 @@
-package mk.ukim.finki.busngobackend.simulator
-
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.runBlocking
-import mk.ukim.finki.busngobackend.domain.entities.InstancaNaLinija
-import mk.ukim.finki.busngobackend.domain.entities.PostojkaNaLinija
-import mk.ukim.finki.busngobackend.domain.helpers.RouteInstanceOnStation
-import mk.ukim.finki.busngobackend.events.RouteInstanceOnStationEvent
-import mk.ukim.finki.busngobackend.events.StopRouteInstanceEvent
-import org.springframework.context.ApplicationEventPublisher
-import org.springframework.scheduling.annotation.Async
-import org.springframework.stereotype.Component
-import java.sql.Timestamp
-import java.time.LocalDateTime
-
-@Component
-class RouteInstanceSimulator(
-    private val eventPublisher: ApplicationEventPublisher,
-) {
-    @Async
-    fun simulate(
-        instance: InstancaNaLinija,
-        stations: List<PostojkaNaLinija>,
-    ) {
-        runBlocking {
-            stations.forEach { station ->
-                delay(1000 * 20)
-                eventPublisher.publishEvent(
-                    RouteInstanceOnStationEvent(
-                        RouteInstanceOnStation(
-                            instance,
-                            station,
-                            Timestamp.valueOf(
-                                LocalDateTime.now(),
-                            ),
-                        ),
-                    ),
-                )
-            }
-        }
-        eventPublisher.publishEvent(StopRouteInstanceEvent(instance))
-    }
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/tasks/RefreshMaterializedViews.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/kotlin/mk/ukim/finki/busngobackend/tasks/RefreshMaterializedViews.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,18 +1,0 @@
-package mk.ukim.finki.busngobackend.tasks
-
-import mk.ukim.finki.busngobackend.service.MaterializedViewService
-import org.springframework.scheduling.annotation.Scheduled
-import org.springframework.stereotype.Service
-
-@Service
-class RefreshMaterializedViews(
-    private val materializedViewService: MaterializedViewService,
-) {
-    @Scheduled(fixedRateString = "\${materialized.view.refresh.rate}")
-    fun refreshMaterializedViewTask() {
-        materializedViewService.refreshAverageTimeDiffs()
-        materializedViewService.refreshCommutesByHour()
-        materializedViewService.refreshFinesPerLine()
-        materializedViewService.refreshTotalIncome()
-    }
-}
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/resources/application.properties
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/resources/application.properties	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,23 +1,0 @@
-spring.application.name=bus-n-go-backend
-spring.datasource.url=jdbc:postgresql://localhost:5432/db_202324z_va_prj_busngo
-spring.datasource.username=db_202324z_va_prj_busngo_owner
-spring.datasource.password=d9f924580e7
-#spring.datasource.url=jdbc:postgresql://localhost:5432/bus_go
-#spring.datasource.username=postgres
-#spring.datasource.password=admin
-spring.datasource.driver-class-name=org.postgresql.Driver
-
-
-spring.datasource.hikari.connection-timeout=20000
-spring.datasource.hikari.maximum-pool-size=5
-
-spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
-spring.jpa.properties.hibernate.jdbc.non_contextual_creation=true
-spring.jpa.properties.hibernate.default_schema=project
-
-spring.jpa.hibernate.ddl-auto=validate
-spring.jpa.show-sql=true
-
-materialized.view.refresh.rate=43200000
- #43200000 #12 hours
-spring.flyway.default-schema=project
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/resources/db/migration/R__materialized_views.sql
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/resources/db/migration/R__materialized_views.sql	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,156 +1,0 @@
-set search_path = project;
-
-drop materialized view if exists avg_time_diffs;
-CREATE MATERIALIZED VIEW avg_time_diffs AS
-WITH ordered_instanca AS (SELECT ilpl.instanca_na_linija_id,
-                                 ilpl.postojka_na_linija_id,
-                                 pnl.reden_broj,
-                                 ilpl.timestamp
-                          FROM project.instanca_na_linija_postojka_na_linija ilpl
-                                   JOIN
-                               project.postojka_na_linija pnl ON ilpl.postojka_na_linija_id = pnl.id
-                          ORDER BY ilpl.instanca_na_linija_id,
-                                   pnl.reden_broj),
-     time_differences AS (SELECT o1.instanca_na_linija_id,
-                                 o1.postojka_na_linija_id                          AS start_station_id,
-                                 o1.timestamp                                      AS start_time,
-                                 o2.postojka_na_linija_id                          AS end_station_id,
-                                 o2.timestamp                                      AS end_time,
-                                 EXTRACT(EPOCH FROM (o2.timestamp - o1.timestamp)) AS time_diff
-                          FROM ordered_instanca o1
-                                   JOIN
-                               ordered_instanca o2 ON o1.instanca_na_linija_id = o2.instanca_na_linija_id
-                          WHERE o1.reden_broj + 1 = o2.reden_broj)
-SELECT
-    row_number() over () as id,
-    start_station_id,
-       end_station_id,
-       AVG(time_diff)::double precision AS avg_time_diff_seconds
-FROM time_differences
-GROUP BY start_station_id,
-         end_station_id
-ORDER BY start_station_id,
-         end_station_id;
-
-create unique index avg_time_diffs_index on avg_time_diffs (id);
-
-drop materialized view if exists kazna_po_linija;
-create materialized view kazna_po_linija as
-select row_number() over () as id, l.id as line_id, count(l.id)
-from project.linija l
-         left join project.instanca_na_linija inl on l.id = inl.linija_id
-         left join project.kontrola k on inl.id = k.instanca_na_linija_id
-         left join project.kazna kaz on k.id = kaz.kontrola_id
-where extract(year from kaz.date_created) = extract(year from now())
-group by l.id
-order by count(l.id) desc;
-
-create unique index index_kazna_po_linija on kazna_po_linija(id);
-
-drop materialized view if exists most_busy_part_of_the_day;
-create materialized view most_busy_part_of_the_day as
-select row_number() over () as id, id as linija_id, interval_1h, count(id || '-' || interval_1h) broj_pati
-from (select li.id,
-             (to_char(extract(hour from v.start_date), '00') || ':00 -' || to_char(extract(hour from (v.start_date
-                 + '1 hours'::interval))::int, '00') || ':00') as interval_1h
-      from project.linija li
-               left join project.instanca_na_linija inl on li.id = inl.linija_id
-               left join project.vozenje v on inl.id = v.instanca_na_linija_id
-      where v.start_date between (make_date(extract(year from (now()))::int, 1, 1)) and (make_date(extract(year from (now()))::int, 12, 31))) as hours
-group by id, interval_1h
-order by interval_1h desc;
-
-create unique index index_most_busy_part_of_the_day on most_busy_part_of_the_day(id);
-
-drop materialized view if exists commutes_by_line;
-create materialized view commutes_by_line as
-select row_number() over () as id, l.id as linija_id, count(v.id)
-from project.linija l
-         left join project.instanca_na_linija inl on l.id = inl.linija_id
-         left join project.vozenje v on inl.id = v.instanca_na_linija_id
-where v.start_date between date_trunc('year', now()) and date_trunc('month', date_trunc('year', now())+ interval '7 months')
-group by l.id;
-
-
-drop materialized view if exists number_passengers_per_line_and_station;
-create materialized view number_passengers_per_line_and_station as
-select row_number() over () as id, p.id as station_id, l.id as line_id, count(p.id)
-from project.postojka p
-         join project.postojka_na_linija pnl on p.id = pnl.postojka_id
-         join project.vozenje v on pnl.id = v.postojka_na_linija_start_id
-         join project.patnik pat on v.patnik_id = pat.id
-         join project.linija l on pnl.linija_id = l.id
-where v.start_date between (make_date(extract(year from (now() - '1 years'::interval))::int, 4, 1)) and (make_date(extract(year from (now() - '1 years'::interval))::int, 6, 30))
-group by p.id, l.id
-order by count(p.id) desc;
-
-
-drop materialized view if exists ticket_sales;
-create materialized view ticket_sales as
-select row_number() over () as id, filtered.tip_id, filtered.interval_1h, filtered.broj_pati
-from (select filter.tip_id, interval_1h, count(tip_id || '-' || interval_1h) broj_pati
-      from (select *,
-                   (to_char(extract(hour from b.datum_kupuvanje), '00') || ':00 -' ||
-                    to_char(extract(hour from (b.datum_kupuvanje + '1 hours'::interval))::int, '00') ||
-                    ':00') as interval_1h
-            from project.tipbilet t
-                     left join project.bilet b on t.id = b.tip_id
---     where  b.datum_kupuvanje between (make_date(extract(year from (now() - '1 years'::interval))::int, 1, 1)) and (make_date(extract(year from (now() - '1 years'::interval))::int, 12, 31))
-
-           ) as filter
-      group by filter.tip_id, interval_1h) filtered
-where broj_pati = (select max(filtered.broj_pati)
-                   from (select filter.tip_id, interval_1h, count(tip_id || '-' || interval_1h) broj_pati
-                         from (select *,
-                                      (to_char(extract(hour from b.datum_kupuvanje), '00') || ':00 -' ||
-                                       to_char(extract(hour from (b.datum_kupuvanje + '1 hours'::interval))::int,
-                                               '00') ||
-                                       ':00') as interval_1h
-                               from project.tipbilet t
-                                        left join project.bilet b on t.id = b.tip_id
---     where  b.datum_kupuvanje between (make_date(extract(year from (now() - '1 years'::interval))::int, 1, 1)) and (make_date(extract(year from (now() - '1 years'::interval))::int, 12, 31))
-
-                              ) as filter
-                         group by filter.tip_id, interval_1h) filtered)
-  and tip_id in (select id
-                 from tipbilet
-                 where ime in ('Hourly', 'Daily'));
-
-
-
-drop materialized view if exists total_income;
-create materialized view total_income as
-WITH kazna_sum AS (
-    SELECT
-        EXTRACT(YEAR FROM k.date_payed) AS year,
-        SUM(k.iznos) AS sum_kz
-    FROM
-        project.kazna k
-    WHERE
-        k.plateno = TRUE
-    GROUP BY
-        EXTRACT(YEAR FROM k.date_payed)
-),
-     bilet_sum AS (
-         SELECT
-             EXTRACT(YEAR FROM b.datum_kupuvanje) AS year,
-             SUM(tb.cena) AS sum_b
-         FROM
-             project.bilet b
-                 JOIN tipbilet tb ON tb.id = b.tip_id
-         GROUP BY
-             EXTRACT(YEAR FROM b.datum_kupuvanje)
-     )
-SELECT
-    row_number() over () as id,
-    COALESCE(k.year, b.year)::text AS year,
-    COALESCE(sum_kz, 0) as fines_income,
-    COALESCE(sum_b, 0) as ticket_income,
-    COALESCE(sum_kz, 0) + COALESCE(sum_b, 0) AS total_income
-FROM
-    kazna_sum k
-        FULL OUTER JOIN bilet_sum b ON k.year = b.year
-ORDER BY
-    year desc;
-
-create unique index index_total_income on total_income(id);
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/resources/db/migration/R__triggers_for_start_commute.sql
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/resources/db/migration/R__triggers_for_start_commute.sql	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,49 +1,0 @@
-set search_path = project;
-
-create or replace function check_expiry_date() returns trigger
-as
-    $$
-    begin
-        if exists(
-            select 1
-            from project.vozenje v
-            where v.patnik_id = new.patnik_id and v.end_date is null
-        ) then
-            update project.vozenje set end_date = now(), status = 'FINISHED' where id in (select v.id
-                                                                                  from project.vozenje v
-                                                                                  where v.patnik_id = new.patnik_id and v.end_date is null);
-        end if;
-
-        if exists(
-            select 1
-            from project.bilet
-            where id = new.bilet_id and datum_aktivacija is null
-        ) then
-            update project.bilet set datum_aktivacija = now(), status = 'ACTIVE' where id = new.bilet_id;
-        end if;
-
-        if exists(
-            select 1
-            from project.bilet b
-            join project.tipbilet tb on b.tip_id = tb.id
-            where b.id = new.bilet_id and ((b.datum_aktivacija + (tb.trajnost || ' milliseconds')::interval) < now())
-        ) then
-            update project.bilet set status = 'EXPIRED' where id = new.bilet_id;
-            end if;
-
-        if exists(
-            select 1
-            from project.bilet b
-                     join project.tipbilet tb on b.tip_id = tb.id
-            where b.id = new.bilet_id and ((b.datum_aktivacija + (tb.trajnost || ' milliseconds')::interval) < now())
-        ) then
-            RAISE exception 'Ticket is expired';
-        end if;
-        return new;
-    end;
-    $$ language plpgsql;
-
-create or replace trigger check_validity_of_ticket
-    before insert on vozenje
-    for each row
-    execute function check_expiry_date();
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/resources/db/migration/V1.1__data_init.sql
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/resources/db/migration/V1.1__data_init.sql	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,269 +1,0 @@
-set search_path = project;
-
-INSERT INTO Korisnik (is_admin, adresa, email, ime, lozinka, telefon) VALUES
-                                                                          (true, 'Bulevar Partizanski Odredi 45, Skopje', 'admin@example.com', 'Nikola Stojanovski', 'admin_password', '070123456'),
-                                                                          (false, 'Ulica Makedonija 12, Skopje', 'user1@example.com', 'Elena Petrovska', 'user1_password', '071234567'),
-                                                                          (false, 'Bulevar Sveti Kliment Ohridski 23, Skopje', 'user2@example.com', 'Marija Trajkovska', 'user2_password', '072345678'),
-                                                                          (false, 'Ulica Vasil Glavinov 10, Skopje', 'user3@example.com', 'Ivana Risteska', 'user3_password', '073456789'),
-                                                                          (false, 'Bulevar Krste Misirkov 56, Skopje', 'user4@example.com', 'Stefan Dimitrovski', 'user4_password', '074567890');
-INSERT INTO Role (description, name) VALUES
-                                         ('Administrator with full access rights', 'ROLE_ADMIN'),
-                                         ('Driver responsible for operating the bus', 'ROLE_DRIVER'),
-                                         ('Conductor responsible for checking tickets', 'ROLE_CONDUCTOR'),
-                                         ('Commuter using the public transport services', 'ROLE_PASSENGER');
--- Nikola Stojanovski (Admin)
-INSERT INTO Korisnik_Role (korisnik_id, role_id) VALUES
-    (1, 2),
-    (1, 3),
-    (1, 4),
-    (1, 1); -- Admin role
-
--- Elena Petrovska (Commuter)
-INSERT INTO Korisnik_Role (korisnik_id, role_id) VALUES
-    (2, 4); -- Commuter role
-
--- Marija Trajkovska (Driver)
-INSERT INTO Korisnik_Role (korisnik_id, role_id) VALUES
-    (3, 2); -- Driver role
-
--- Ivana Risteska (Conductor)
-INSERT INTO Korisnik_Role (korisnik_id, role_id) VALUES
-    (4, 3); -- Conductor role
-
--- Stefan Dimitrovski (Commuter)
-INSERT INTO Korisnik_Role (korisnik_id, role_id) VALUES
-    (5, 4); -- Commuter role
-
--- Elena Petrovska (Commuter)
-INSERT INTO Patnik (korisnik_id) VALUES
-    (2);
-
--- Stefan Dimitrovski (Commuter)
-INSERT INTO Patnik (korisnik_id) VALUES
-    (5);
-
--- Nikola Stojanovski (Admin)
-INSERT INTO Patnik (korisnik_id) VALUES
-    (1); -- Assuming Nikola Stojanovski has vraboten_id 1
-
--- Nikola Stojanovski (Admin)
-INSERT INTO Vraboten (datum_na_vrabotuvanje, datum_prekin_vrabotuvanje, plata, korisnik_id) VALUES
-    ('2020-01-01', NULL, 60000, 1);
-
--- Marija Trajkovska (Driver)
-INSERT INTO Vraboten (datum_na_vrabotuvanje, datum_prekin_vrabotuvanje, plata, korisnik_id) VALUES
-    ('2021-05-15', NULL, 35000, 3);
-
--- Ivana Risteska (Conductor)
-INSERT INTO Vraboten (datum_na_vrabotuvanje, datum_prekin_vrabotuvanje, plata, korisnik_id) VALUES
-    ('2022-03-20', NULL, 30000, 4);
-
--- Marija Trajkovska (Driver)
-INSERT INTO Vozac (vraboten_id) VALUES
-    (2); -- Assuming Marija Trajkovska has vraboten_id 2
-
--- Nikola Stojanovski (Admin)
-INSERT INTO Vozac (vraboten_id) VALUES
-    (1); -- Assuming Nikola Stojanovski has vraboten_id 1
-
--- Insert employees into the Kondukter table
-
--- Ivana Risteska (Conductor)
-INSERT INTO Kondukter (vraboten_id) VALUES
-    (3); -- Assuming Ivana Risteska has vraboten_id 3
-
--- Nikola Stojanovski (Admin)
-INSERT INTO Kondukter (vraboten_id) VALUES
-    (1); -- Assuming Nikola Stojanovski has vraboten_id 1
-
-INSERT INTO Avtobus (broj_sedishta, registracija, seriski_broj) VALUES
-                                                                    (50, 'SK-1234-AB', 'SN-000001'),
-                                                                    (45, 'SK-2345-BC', 'SN-000002'),
-                                                                    (50, 'SK-3456-CD', 'SN-000003'),
-                                                                    (40, 'SK-4567-DE', 'SN-000004'),
-                                                                    (50, 'SK-5678-EF', 'SN-000005'),
-                                                                    (55, 'SK-6789-FG', 'SN-000006'),
-                                                                    (50, 'SK-7890-GH', 'SN-000007'),
-                                                                    (45, 'SK-8901-HI', 'SN-000008'),
-                                                                    (50, 'SK-9012-IJ', 'SN-000009'),
-                                                                    (40, 'SK-0123-JK', 'SN-000010'),
-                                                                    (50, 'SK-1234-KL', 'SN-000011'),
-                                                                    (55, 'SK-2345-LM', 'SN-000012'),
-                                                                    (50, 'SK-3456-MN', 'SN-000013'),
-                                                                    (45, 'SK-4567-NO', 'SN-000014'),
-                                                                    (50, 'SK-5678-OP', 'SN-000015'),
-                                                                    (40, 'SK-6789-PQ', 'SN-000016'),
-                                                                    (50, 'SK-7890-QR', 'SN-000017'),
-                                                                    (55, 'SK-8901-RS', 'SN-000018'),
-                                                                    (50, 'SK-9012-ST', 'SN-000019'),
-                                                                    (45, 'SK-0123-TU', 'SN-000020');
-
-INSERT INTO Linija (ime) VALUES
-                                     ('Line 1'),
-                                     ('Line 2'),
-                                     ('Line 3'),
-                                     ('Line 4'),
-                                     ('Line 5'),
-                                     ('Line 6'),
-                                     ('Line 7'),
-                                     ('Line 8'),
-                                     ('Line 9'),
-                                     ('Line 10');
-
-INSERT INTO Pravec (pravec, opis) VALUES
-                                      ('Skopje - Tetovo', 'Skopje to Tetovo'),
-                                      ('Tetovo - Skopje', 'Tetovo to Skopje'),
-                                      ('Skopje - Ohrid', 'Skopje to Ohrid'),
-                                      ('Ohrid - Skopje', 'Ohrid to Skopje'),
-                                      ('Skopje - Bitola', 'Skopje to Bitola'),
-                                      ('Bitola - Skopje', 'Bitola to Skopje'),
-                                      ('Skopje - Kumanovo', 'Skopje to Kumanovo'),
-                                      ('Kumanovo - Skopje', 'Kumanovo to Skopje'),
-                                      ('Skopje - Strumica', 'Skopje to Strumica'),
-                                      ('Strumica - Skopje', 'Strumica to Skopje'),
-                                      ('Skopje - Veles', 'Skopje to Veles'),
-                                      ('Veles - Skopje', 'Veles to Skopje'),
-                                      ('Skopje - Prilep', 'Skopje to Prilep'),
-                                      ('Prilep - Skopje', 'Prilep to Skopje'),
-                                      ('Skopje - Gostivar', 'Skopje to Gostivar'),
-                                      ('Gostivar - Skopje', 'Gostivar to Skopje'),
-                                      ('Skopje - Stip', 'Skopje to Stip'),
-                                      ('Stip - Skopje', 'Stip to Skopje'),
-                                      ('Skopje - Kavadarci', 'Skopje to Kavadarci'),
-                                      ('Kavadarci - Skopje', 'Kavadarci to Skopje');
-
--- Line 1: Skopje - Tetovo
-INSERT INTO linija_pravec (pravec_id, linija_id) VALUES
-                                                     (1, 1), -- Skopje to Tetovo
-                                                     (2, 1); -- Tetovo to Skopje
-
--- Line 2: Skopje - Ohrid
-INSERT INTO linija_pravec (pravec_id, linija_id) VALUES
-                                                     (3, 2), -- Skopje to Ohrid
-                                                     (4, 2); -- Ohrid to Skopje
-
--- Line 3: Skopje - Bitola
-INSERT INTO linija_pravec (pravec_id, linija_id) VALUES
-                                                     (5, 3), -- Skopje to Bitola
-                                                     (6, 3); -- Bitola to Skopje
-
--- Line 4: Skopje - Kumanovo
-INSERT INTO linija_pravec (pravec_id, linija_id) VALUES
-                                                     (7, 4), -- Skopje to Kumanovo
-                                                     (8, 4); -- Kumanovo to Skopje
-
--- Line 5: Skopje - Strumica
-INSERT INTO linija_pravec (pravec_id, linija_id) VALUES
-                                                     (9, 5), -- Skopje to Strumica
-                                                     (10, 5); -- Strumica to Skopje
-
--- Line 6: Skopje - Veles
-INSERT INTO linija_pravec (pravec_id, linija_id) VALUES
-                                                     (11, 6), -- Skopje to Veles
-                                                     (12, 6); -- Veles to Skopje
-
--- Line 7: Skopje - Prilep
-INSERT INTO linija_pravec (pravec_id, linija_id) VALUES
-                                                     (13, 7), -- Skopje to Prilep
-                                                     (14, 7); -- Prilep to Skopje
-
--- Line 8: Skopje - Gostivar
-INSERT INTO linija_pravec (pravec_id, linija_id) VALUES
-                                                     (15, 8), -- Skopje to Gostivar
-                                                     (16, 8); -- Gostivar to Skopje
-
--- Line 9: Skopje - Stip
-INSERT INTO linija_pravec (pravec_id, linija_id) VALUES
-                                                     (17, 9), -- Skopje to Stip
-                                                     (18, 9); -- Stip to Skopje
-
--- Line 10: Skopje - Kavadarci
-INSERT INTO linija_pravec (pravec_id, linija_id) VALUES
-                                                     (19, 10), -- Skopje to Kavadarci
-                                                     (20, 10); -- Kavadarci to Skopje
-
-INSERT INTO Instanca_Na_Linija (linija_id, avtobus_id, start_date, end_date, vozac_id)
-VALUES
--- Line 1: Skopje - Tetovo
-(1, 1, '2024-06-24 08:00:00', '2024-06-24 09:00:00', 1),
-(1, 1, '2024-06-24 09:00:00', '2024-06-24 10:00:00', 1),
-(1, 1, '2024-06-24 10:00:00', '2024-06-24 11:00:00', 1),
-(1, 1, '2024-06-24 11:00:00', '2024-06-24 12:00:00', 1),
-(1, 1, '2024-06-24 12:00:00', '2024-06-24 13:00:00', 1);
-
-
--- Insert stops from Skopje to Tetovo
-INSERT INTO Postojka (lat, lon, ime, opis) VALUES
-                                               (41.9981, 21.4254, 'Skopje', 'Capital city of North Macedonia'),
-                                               (41.9643, 21.6228, 'Gazi Baba', 'Municipality near Skopje'),
-                                               (42.0264, 21.5957, 'Tetovo', 'City in western North Macedonia');
-
--- Insert stops from Tetovo to Skopje
-INSERT INTO Postojka (lat, lon, ime, opis) VALUES
-                                               (42.0264, 21.5957, 'Tetovo', 'City in western North Macedonia'),
-                                               (41.9643, 21.6228, 'Gazi Baba', 'Municipality near Skopje'),
-                                               (41.9981, 21.4254, 'Skopje', 'Capital city of North Macedonia');
-
--- Additional stops for Skopje to Tetovo
-INSERT INTO Postojka (lat, lon, ime, opis) VALUES
-                                               (41.9808, 21.4631, 'Butel', 'Municipality in Skopje'),
-                                               (42.0035, 21.4701, 'Kisela Voda', 'Municipality in Skopje'),
-                                               (41.9866, 21.5666, 'Gostivar', 'City in western North Macedonia'),
-                                               (41.9764, 21.6060, 'Zelino', 'Village near Tetovo'),
-                                               (41.9939, 21.6481, 'Tetovo Bus Station', 'Central bus station in Tetovo'),
-                                               (41.9861, 21.5705, 'Gostivar Train Station', 'Train station in Gostivar'),
-                                               (42.0081, 21.4500, 'Skopje University', 'University campus in Skopje'),
-                                               (42.0070, 21.4421, 'Kapishtec', 'Neighborhood in Skopje'),
-                                               (41.9794, 21.4604, 'Skopje City Mall', 'Shopping mall in Skopje');
-
--- Additional stops for Tetovo to Skopje
-INSERT INTO Postojka (lat, lon, ime, opis) VALUES
-                                               (41.9839, 21.4647, 'Butel', 'Municipality in Skopje'),
-                                               (41.9934, 21.4752, 'Kisela Voda', 'Municipality in Skopje'),
-                                               (41.9901, 21.5804, 'Gostivar', 'City in western North Macedonia'),
-                                               (41.9798, 21.6093, 'Zelino', 'Village near Tetovo'),
-                                               (41.9997, 21.6543, 'Tetovo Bus Station', 'Central bus station in Tetovo'),
-                                               (41.9930, 21.5741, 'Gostivar Train Station', 'Train station in Gostivar'),
-                                               (42.0132, 21.4578, 'Skopje University', 'University campus in Skopje'),
-                                               (42.0111, 21.4491, 'Kapishtec', 'Neighborhood in Skopje'),
-                                               (41.9822, 21.4679, 'Skopje City Mall', 'Shopping mall in Skopje');
-
--- Insert stops for Line 1 (Skopje - Tetovo)
-INSERT INTO Postojka_Na_Linija (linija_id, postojka_id, reden_broj, pravec_id) VALUES
-                                                                        (1, 1, 1, 1),   -- Skopje
-                                                                        (1, 2, 2, 1),   -- Gazi Baba
-                                                                        (1, 8, 3, 1),   -- Skopje University
-                                                                        (1, 7, 4, 1),   -- Kapishtec
-                                                                        (1, 3, 5, 1),   -- Tetovo
-                                                                        (1, 6, 6, 1),   -- Gostivar Train Station
-                                                                        (1, 5, 7, 1),   -- Gostivar
-                                                                        (1, 4, 8, 1),   -- Zelino
-                                                                        (1, 9, 9, 1),   -- Tetovo Bus Station
-                                                                        (1, 10, 10, 1); -- Butel
-
--- Insert stops for Line 1 (Tetovo to Skopje)
-INSERT INTO Postojka_Na_Linija (linija_id, postojka_id, reden_broj, pravec_id) VALUES
-                                                                        (1, 10, 1, 2),   -- Butel
-                                                                        (1, 9, 2, 2),    -- Tetovo Bus Station
-                                                                        (1, 4, 3, 2),    -- Zelino
-                                                                        (1, 5, 4, 2),    -- Gostivar
-                                                                        (1, 6, 5, 2),    -- Gostivar Train Station
-                                                                        (1, 3, 6, 2),    -- Tetovo
-                                                                        (1, 7, 7, 2),    -- Kapishtec
-                                                                        (1, 8, 8, 2),    -- Skopje University
-                                                                        (1, 2, 9, 2),    -- Gazi Baba
-                                                                        (1, 1, 10, 2);   -- Skopje
-
-
--- Insert ticket types
-INSERT INTO TipBilet (cena, trajnost, ime) VALUES
-                                               (50.00, 3600000, 'Hourly'),    -- Hourly ticket (1 hour = 3,600,000 milliseconds)
-                                               (150.00, 86400000, 'Daily'),   -- Daily ticket (1 day = 86,400,000 milliseconds)
-                                               (1000.00, 2592000000, 'Monthly'),  -- Monthly ticket (30 days = 2,592,000,000 milliseconds)
-                                               (10000.00, 31536000000, 'Yearly'); -- Yearly ticket (365 days = 31,536,000,000 milliseconds)
-
--- Add tickets for commuter with patnik_id 1
-INSERT INTO Bilet (datum_kupuvanje, patnik_id, tip_id, status) VALUES
-                                                                   ('2024-06-24 10:00:00', 1, 1, 'INACTIVE'),  -- Hourly ticket (ID 1)
-                                                                   ('2024-06-23 15:00:00', 1, 2, 'ACTIVE');    -- Daily ticket (ID 2)
-
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/resources/db/migration/V1.2__additional_data.sql
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/resources/db/migration/V1.2__additional_data.sql	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,126 +1,0 @@
-set search_path = project;
-
--- Insert stops from Skopje to Ohrid
-INSERT INTO Postojka (lat, lon, ime, opis) VALUES
-                                               (41.9981, 21.4254, 'Skopje', 'Capital city of North Macedonia'),
-                                               (41.8770, 21.0720, 'Tetovo', 'City in western North Macedonia'),
-                                               (41.7150, 20.9620, 'Gostivar', 'City in western North Macedonia'),
-                                               (41.5886, 20.6305, 'Kicevo', 'City in western North Macedonia'),
-                                               (41.5120, 20.2690, 'Struga', 'City in southwestern North Macedonia'),
-                                               (41.1136, 20.8016, 'Ohrid', 'City in southwestern North Macedonia');
--- Insert stops for Line 2 (Skopje - Ohrid)
-INSERT INTO Postojka_Na_Linija (linija_id, postojka_id, reden_broj, pravec_id) VALUES
-                                                                                   (2, 25, 1, 3),  -- Skopje
-                                                                                   (2, 26, 2, 3),  -- Tetovo
-                                                                                   (2, 27, 3, 3),  -- Gostivar
-                                                                                   (2, 28, 4, 3),  -- Kicevo
-                                                                                   (2, 29, 5, 3),  -- Struga
-                                                                                   (2, 30, 6, 3);  -- Ohrid
-
--- Insert stops from Ohrid to Skopje
-INSERT INTO Postojka (lat, lon, ime, opis) VALUES
-                                               (41.1136, 20.8016, 'Ohrid', 'City in southwestern North Macedonia'),
-                                               (41.5910, 20.6520, 'Debarca', 'Municipality near Ohrid'),
-                                               (41.6340, 20.8940, 'Makedonski Brod', 'Town in central North Macedonia'),
-                                               (41.6980, 21.1290, 'Samokov', 'Village in western North Macedonia'),
-                                               (41.7820, 21.3340, 'Tetovo', 'City in western North Macedonia'),
-                                               (41.9981, 21.4254, 'Skopje', 'Capital city of North Macedonia');
--- Insert stops for Line 2 (Ohrid - Skopje)
-INSERT INTO Postojka_Na_Linija (linija_id, postojka_id, reden_broj, pravec_id) VALUES
-                                                                                   (2, 31, 1, 4),  -- Ohrid
-                                                                                   (2, 32, 2, 4),  -- Debarca
-                                                                                   (2, 33, 3, 4),  -- Makedonski Brod
-                                                                                   (2, 34, 4, 4),  -- Samokov
-                                                                                   (2, 35, 5, 4),  -- Tetovo
-                                                                                   (2, 36, 6, 4);  -- Skopje
--- Insert stops from Skopje to Bitola
-INSERT INTO Postojka (lat, lon, ime, opis) VALUES
-                                               (41.9981, 21.4254, 'Skopje', 'Capital city of North Macedonia'),    -- id 37
-                                               (41.9202, 21.5511, 'Veles', 'City in central North Macedonia'),     -- id 38
-                                               (41.7361, 21.7744, 'Prilep', 'City in southern North Macedonia'),   -- id 39
-                                               (41.6130, 21.5523, 'Krushevo', 'Town in southern North Macedonia'), -- id 40
-                                               (41.4442, 21.2761, 'Bitola', 'City in southwestern North Macedonia'); -- id 41
--- Insert stops for Line 3 (Skopje - Bitola)
-INSERT INTO Postojka_Na_Linija (linija_id, postojka_id, reden_broj, pravec_id) VALUES
-                                                                                   (3, 37, 1, 5),  -- Skopje
-                                                                                   (3, 38, 2, 5),  -- Veles
-                                                                                   (3, 39, 3, 5),  -- Prilep
-                                                                                   (3, 40, 4, 5),  -- Krushevo
-                                                                                   (3, 41, 5, 5);  -- Bitola
--- Insert stops from Bitola to Skopje
-INSERT INTO Postojka (lat, lon, ime, opis) VALUES
-                                               (41.4442, 21.2761, 'Bitola', 'City in southwestern North Macedonia'), -- id 42
-                                               (41.6130, 21.5523, 'Krushevo', 'Town in southern North Macedonia'),   -- id 43
-                                               (41.7361, 21.7744, 'Prilep', 'City in southern North Macedonia'),     -- id 44
-                                               (41.9202, 21.5511, 'Veles', 'City in central North Macedonia'),       -- id 45
-                                               (41.9981, 21.4254, 'Skopje', 'Capital city of North Macedonia');      -- id 46
--- Insert stops for Line 3 (Bitola - Skopje)
-INSERT INTO Postojka_Na_Linija (linija_id, postojka_id, reden_broj, pravec_id) VALUES
-                                                                                   (3, 42, 1, 6),  -- Bitola
-                                                                                   (3, 43, 2, 6),  -- Krushevo
-                                                                                   (3, 44, 3, 6),  -- Prilep
-                                                                                   (3, 45, 4, 6),  -- Veles
-                                                                                   (3, 46, 5, 6);  -- Skopje
-
--- Insert stops from Skopje to Kumanovo
-INSERT INTO Postojka (lat, lon, ime, opis) VALUES
-                                               (41.9981, 21.4254, 'Skopje', 'Capital city of North Macedonia'),       -- id 47
-                                               (41.9945, 21.5770, 'Butel', 'Municipality in Skopje'),                 -- id 48
-                                               (42.0153, 21.7000, 'Aracinovo', 'Village near Skopje'),                -- id 49
-                                               (42.0892, 21.7184, 'Lipkovo', 'Village in northeastern North Macedonia'), -- id 50
-                                               (42.1322, 21.7144, 'Kumanovo', 'City in northeastern North Macedonia'); -- id 51
-
--- Insert stops for Line 4 (Skopje - Kumanovo)
-INSERT INTO Postojka_Na_Linija (linija_id, postojka_id, reden_broj, pravec_id) VALUES
-                                                                                   (4, 47, 1, 7),  -- Skopje
-                                                                                   (4, 48, 2, 7),  -- Butel
-                                                                                   (4, 49, 3, 7),  -- Aracinovo
-                                                                                   (4, 50, 4, 7),  -- Lipkovo
-                                                                                   (4, 51, 5, 7);  -- Kumanovo
--- Insert stops from Kumanovo to Skopje
-INSERT INTO Postojka (lat, lon, ime, opis) VALUES
-                                               (42.1322, 21.7144, 'Kumanovo', 'City in northeastern North Macedonia'), -- id 52
-                                               (42.0892, 21.7184, 'Lipkovo', 'Village in northeastern North Macedonia'), -- id 53
-                                               (42.0153, 21.7000, 'Aracinovo', 'Village near Skopje'),                -- id 54
-                                               (41.9945, 21.5770, 'Butel', 'Municipality in Skopje'),                 -- id 55
-                                               (41.9981, 21.4254, 'Skopje', 'Capital city of North Macedonia');       -- id 56
--- Insert stops for Line 4 (Kumanovo - Skopje)
-INSERT INTO Postojka_Na_Linija (linija_id, postojka_id, reden_broj, pravec_id) VALUES
-                                                                                   (4, 52, 1, 8),  -- Kumanovo
-                                                                                   (4, 53, 2, 8),  -- Lipkovo
-                                                                                   (4, 54, 3, 8),  -- Aracinovo
-                                                                                   (4, 55, 4, 8),  -- Butel
-                                                                                   (4, 56, 5, 8);  -- Skopje
--- Insert stops from Skopje to Strumica
-INSERT INTO Postojka (lat, lon, ime, opis) VALUES
-                                               (41.9981, 21.4254, 'Skopje', 'Capital city of North Macedonia'),               -- id 57
-                                               (41.8833, 21.5065, 'Katlanovo', 'Village near Skopje'),                        -- id 58
-                                               (41.7466, 21.3600, 'Veles Rest Area', 'Rest area near Veles'),                 -- id 59
-                                               (41.6165, 22.1796, 'Demir Kapija', 'Town in central North Macedonia'),         -- id 60
-                                               (41.3472, 22.5533, 'Radovish', 'Town in southeastern North Macedonia'),        -- id 61
-                                               (41.4378, 22.6431, 'Strumica', 'City in southeastern North Macedonia');        -- id 62
--- Insert stops for Line 5 (Skopje - Strumica)
-INSERT INTO Postojka_Na_Linija (linija_id, postojka_id, reden_broj, pravec_id) VALUES
-                                                                                   (5, 57, 1, 9),  -- Skopje
-                                                                                   (5, 58, 2, 9),  -- Katlanovo
-                                                                                   (5, 59, 3, 9),  -- Veles Rest Area
-                                                                                   (5, 60, 4, 9),  -- Demir Kapija
-                                                                                   (5, 61, 5, 9),  -- Radovish
-                                                                                   (5, 62, 6, 9);  -- Strumica
--- Insert stops from Strumica to Skopje
-INSERT INTO Postojka (lat, lon, ime, opis) VALUES
-                                               (41.4380, 22.6429, 'Strumica', 'City in southeastern North Macedonia'),       -- id 63
-                                               (41.3480, 22.5525, 'Radovish Park', 'Park in Radovish'),                      -- id 64
-                                               (41.6170, 22.1802, 'Demir Kapija South', 'Southern part of Demir Kapija'),    -- id 65
-                                               (41.7470, 21.3610, 'Veles South Rest Area', 'Rest area south of Veles'),      -- id 66
-                                               (41.8840, 21.5070, 'Katlanovo East', 'Eastern part of Katlanovo'),            -- id 67
-                                               (41.9985, 21.4260, 'Skopje Center', 'Center of Skopje');                      -- id 68
--- Insert stops for Line 5 (Strumica - Skopje)
-INSERT INTO Postojka_Na_Linija (linija_id, postojka_id, reden_broj, pravec_id) VALUES
-                                                                                   (5, 63, 1, 10),  -- Strumica
-                                                                                   (5, 64, 2, 10),  -- Radovish Park
-                                                                                   (5, 65, 3, 10),  -- Demir Kapija South
-                                                                                   (5, 66, 4, 10),  -- Veles South Rest Area
-                                                                                   (5, 67, 5, 10),  -- Katlanovo East
-                                                                                   (5, 68, 6, 10);  -- Skopje Center
-
Index: s-n-go-pavel-216049/bus-n-go-backend/src/main/resources/db/migration/V1__init_db.sql
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/main/resources/db/migration/V1__init_db.sql	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,238 +1,0 @@
-set search_path = project;
-
-drop table if exists Se_simnuva_na;
-drop table if exists KaznaZaRegistriran;
-drop table if exists KaznaZaNeregistriran;
-drop table if exists Kazna;
-drop table if exists Kontroli;
-drop table if exists Vozenje;
-drop table if exists Bilet;
-drop table if exists TipBilet;
-drop table if exists PostojkaNaLinija;
-drop table if exists Postojka;
-drop table if exists Mesto;
-drop table if exists InstancaNaLinija;
-drop table if exists Linija;
-drop table if exists Avtobus;
-drop table if exists Kondukter;
-drop table if exists Vozac;
-drop table if exists Vraboten;
-drop table if exists Patnik;
-drop table if exists KorisnikRole;
-drop table if exists Korisnik;
-drop table if exists Role;
-
-create table Korisnik(
-                         is_admin boolean,
-                         id bigserial primary key,
-                         adresa character varying(255),
-                         email character varying(255),
-                         ime character varying(255),
-                         lozinka character varying(255),
-                         telefon character varying(255)
-);
-
-create table Role (
-                      id bigserial primary key,
-                      description character varying(255),
-                      name character varying(255)
-);
-
-create table Korisnik_Role (
-                               id bigserial primary key,
-                               korisnik_id bigint,
-                               role_id bigint,
-                               foreign key (role_id) references role (id),
-                               foreign key (korisnik_id) references korisnik (id)
-);
-
-create table Patnik(
-                       id bigserial primary key,
-                       korisnik_id bigint,
-                       foreign key (korisnik_id) references korisnik (id)
-);
---	*k_id referencira od Korisnik(k_id)
-
-
-create table Vraboten(
-                         datum_na_vrabotuvanje date,
-                         datum_prekin_vrabotuvanje date,
-                         plata double precision,
-                         id bigserial primary key,
-                         korisnik_id bigint,
-                         foreign key (korisnik_id) references korisnik (id)
-);
---	*k_id referencira od Korisnik(k_id)
-
-
-create table Vozac(
-                      id bigserial primary key,
-                      vraboten_id bigint,
-                      foreign key (vraboten_id) references vraboten (id)
-);
---	*k_id referencira od Korisnik(k_id)
-
-create table Kondukter(
-                          id bigserial primary key,
-                          vraboten_id bigint,
-                          foreign key (vraboten_id) references vraboten (id)
-);
---	*k_id referencira od Korisnik(k_id)
-
-create table Avtobus(
-                        broj_sedishta smallint,
-                        id bigserial primary key,
-                        registracija character varying(255),
-                        seriski_broj character varying(255)
-);
-
-create table Linija(
-                       id serial primary key,
-                       ime character varying(255)
-);
-
-create table Pravec (
-                      id bigserial primary key,
-                      pravec character varying(255),
-                      opis character varying(255)
-);
-
-create table linija_pravec (
-                      id bigserial primary key,
-                      pravec_id bigint,
-                      linija_id integer,
-                      foreign key (pravec_id) references Pravec (id),
-                      foreign key (linija_id) references Linija (id)
-);
-
-create table Instanca_Na_Linija (
-                                  linija_id integer,
-                                  pravec_id bigint,
-                                  avtobus_id bigint,
-                                  end_date timestamp(6) without time zone,
-                                  id bigserial primary key,
-                                  start_date timestamp(6) without time zone,
-                                  vozac_id bigint,
-                                  foreign key (avtobus_id) references avtobus (id),
-                                  foreign key (linija_id) references linija (id),
-                                  foreign key (vozac_id) references vozac (id)
-);
---	*k_id referencira od Korisnik(k_id)
---	^a_registracija referncira od Avtobus(a_registracija)
---	#li_id referencira od Linija(li_id)
-
-create table Postojka (
-                          id serial primary key,
-                          lat double precision,
-                          lon double precision,
-                          ime character varying(255),
-                          opis character varying(255)
-);
---*m_id referncira od Mesto(m_id)
-
-
-create table Postojka_Na_Linija (
-                                  linija_id integer,
-                                  postojka_id integer,
-                                  pravec_id bigint,
-                                  reden_broj smallint,
-                                  id bigserial primary key,
-                                  foreign key (postojka_id) references postojka (id),
-                                  foreign key (linija_id) references linija (id)
-);
---	*li_id referencira od Linija(li_id)
---	^p_id referencira od Postojka(p_id)
-
-create table instanca_na_linija_postojka_na_linija (
-                                  id bigserial primary key,
-                                  instanca_na_linija_id bigint not null,
-                                  postojka_na_linija_id bigint not null,
-                                  timestamp timestamp not null,
-                                  foreign key (instanca_na_linija_id) references instanca_na_linija(id),
-                                  foreign key (postojka_na_linija_id) references postojka_na_linija(id)
-);
-
-create table TipBilet (
-                          cena real,
-                          id bigserial primary key,
-                          trajnost bigint,
-                          ime character varying(255)
-);
-
-
-
-create table Bilet (
-                       datum_kupuvanje timestamp(6) without time zone,
-                       datum_aktivacija timestamp(6) without time zone,
-                       id bigserial primary key,
-                       patnik_id bigint,
-                       tip_id bigint,
-                       status character varying(255),
-                       foreign key (patnik_id) references patnik (id),
-                       foreign key (tip_id) references tipbilet (id)
-);
-
-
-create table Vozenje (
-                         bilet_id bigint,
-                         end_date timestamp(6) without time zone,
-                         id bigserial primary key,
-                         instanca_na_linija_id bigint,
-                         patnik_id bigint,
-                         postojka_na_linija_start_id bigint,
-                         start_date timestamp(6) without time zone,
-                         status character varying(255),
-                         foreign key (patnik_id) references patnik (id),
-                         foreign key (bilet_id) references bilet (id),
-                         foreign key (instanca_na_linija_id) references instanca_na_linija (id),
-                         foreign key (postojka_na_linija_start_id) references postojka_na_linija (id)
-);
-
-
-create table Kontrola (
-                          date_created timestamp(6) without time zone,
-                          id bigserial primary key,
-                          instanca_na_linija_id bigint,
-                          kondukter_id bigint,
-                          foreign key (instanca_na_linija_id) references instanca_na_linija (id),
-                          foreign key (kondukter_id) references kondukter (id)
-);
-
-create table Kazna (
-                       iznos double precision,
-                       plateno boolean,
-                       date_created timestamp(6) without time zone,
-                       date_payed timestamp(6) without time zone,
-                       id bigserial primary key,
-                       kondukter_id bigint,
-                       kontrola_id bigint,
-                       dokument character varying(255),
-                       foreign key (kondukter_id) references Kondukter (id),
-                       foreign key (kontrola_id) references kontrola (id)
-);
-
-
-create table Kazna_Za_Registriran(
-                                   id bigserial primary key,
-                                   kazna_id bigint,
-                                   patnik_id bigint,
-                                   foreign key (patnik_id) references patnik (id),
-                                   foreign key (kazna_id) references kazna (id)
-);
-
-create table kazna_za_neregistriran(
-                                     id bigserial primary key,
-                                     kazna_id bigint,
-                                     adresa character varying(255),
-                                     ime character varying(255),
-                                     telefon character varying(255),
-                                     foreign key (kazna_id) references kazna (id)
-);
-
-create table se_simnuva_na (
-                               id bigserial primary key,
-                               postojka_na_linija_id bigint,
-                               vozenje_id bigint,
-                               foreign key (vozenje_id) references vozenje (id),
-                               foreign key (postojka_na_linija_id) references postojka_na_linija (id)
-);
Index: s-n-go-pavel-216049/bus-n-go-backend/src/test/kotlin/mk/ukim/finki/busngobackend/AvtobusNGoBackendApplicationTests.kt
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-backend/src/test/kotlin/mk/ukim/finki/busngobackend/AvtobusNGoBackendApplicationTests.kt	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,11 +1,0 @@
-package mk.ukim.finki.busngobackend
-
-import org.junit.jupiter.api.Test
-import org.springframework.boot.test.context.SpringBootTest
-
-@SpringBootTest
-class AvtobusNGoBackendApplicationTests {
-    @Test
-    fun contextLoads() {
-    }
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/.editorconfig
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/.editorconfig	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,16 +1,0 @@
-# Editor configuration, see https://editorconfig.org
-root = true
-
-[*]
-charset = utf-8
-indent_style = space
-indent_size = 2
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[*.ts]
-quote_type = single
-
-[*.md]
-max_line_length = off
-trim_trailing_whitespace = false
Index: s-n-go-pavel-216049/bus-n-go-frontend/.gitignore
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/.gitignore	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,42 +1,0 @@
-# See https://docs.github.com/get-started/getting-started-with-git/ignoring-files for more about ignoring files.
-
-# Compiled output
-/dist
-/tmp
-/out-tsc
-/bazel-out
-
-# Node
-/node_modules
-npm-debug.log
-yarn-error.log
-
-# IDEs and editors
-.idea/
-.project
-.classpath
-.c9/
-*.launch
-.settings/
-*.sublime-workspace
-
-# Visual Studio Code
-.vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
-.history/*
-
-# Miscellaneous
-/.angular/cache
-.sass-cache/
-/connect.lock
-/coverage
-/libpeerconnection.log
-testem.log
-/typings
-
-# System files
-.DS_Store
-Thumbs.db
Index: s-n-go-pavel-216049/bus-n-go-frontend/README.md
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/README.md	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,27 +1,0 @@
-# BusNGoFrontend
-
-This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 18.0.4.
-
-## Development server
-
-Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The application will automatically reload if you change any of the source files.
-
-## Code scaffolding
-
-Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.
-
-## Build
-
-Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory.
-
-## Running unit tests
-
-Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
-
-## Running end-to-end tests
-
-Run `ng e2e` to execute the end-to-end tests via a platform of your choice. To use this command, you need to first add a package that implements end-to-end testing capabilities.
-
-## Further help
-
-To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI Overview and Command Reference](https://angular.dev/tools/cli) page.
Index: s-n-go-pavel-216049/bus-n-go-frontend/angular.json
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/angular.json	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,104 +1,0 @@
-{
-  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
-  "version": 1,
-  "newProjectRoot": "projects",
-  "projects": {
-    "bus-n-go-frontend": {
-      "projectType": "application",
-      "schematics": {},
-      "root": "",
-      "sourceRoot": "src",
-      "prefix": "app",
-      "architect": {
-        "build": {
-          "builder": "@angular-devkit/build-angular:application",
-          "options": {
-            "outputPath": "dist/bus-n-go-frontend",
-            "index": "src/index.html",
-            "browser": "src/main.ts",
-            "polyfills": [
-              "zone.js"
-            ],
-            "tsConfig": "tsconfig.app.json",
-            "assets": [
-              {
-                "glob": "**/*",
-                "input": "public"
-              }
-            ],
-            "styles": [
-              "@angular/material/prebuilt-themes/azure-blue.css",
-              "src/styles.css"
-            ],
-            "scripts": []
-          },
-          "configurations": {
-            "production": {
-              "budgets": [
-                {
-                  "type": "initial",
-                  "maximumWarning": "500kB",
-                  "maximumError": "1MB"
-                },
-                {
-                  "type": "anyComponentStyle",
-                  "maximumWarning": "2kB",
-                  "maximumError": "4kB"
-                }
-              ],
-              "outputHashing": "all"
-            },
-            "development": {
-              "optimization": false,
-              "extractLicenses": false,
-              "sourceMap": true
-            }
-          },
-          "defaultConfiguration": "production"
-        },
-        "serve": {
-          "builder": "@angular-devkit/build-angular:dev-server",
-          "options": {
-            "proxyConfig": "src/proxy.conf.json"
-          },
-          "configurations": {
-            "production": {
-              "buildTarget": "bus-n-go-frontend:build:production"
-            },
-            "development": {
-              "buildTarget": "bus-n-go-frontend:build:development"
-            }
-          },
-          "defaultConfiguration": "development"
-        },
-        "extract-i18n": {
-          "builder": "@angular-devkit/build-angular:extract-i18n"
-        },
-        "test": {
-          "builder": "@angular-devkit/build-angular:karma",
-          "options": {
-            "polyfills": [
-              "zone.js",
-              "zone.js/testing"
-            ],
-            "tsConfig": "tsconfig.spec.json",
-            "assets": [
-              {
-                "glob": "**/*",
-                "input": "public"
-              }
-            ],
-            "styles": [
-              "@angular/material/prebuilt-themes/azure-blue.css",
-              "src/styles.css"
-            ],
-            "scripts": []
-          }
-        }
-      }
-    }
-  },
-  "cli": {
-    "analytics": "45bfd673-4c0f-4013-b6f6-1abf912480e8"
-  }
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/package-lock.json
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/package-lock.json	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,14150 +1,0 @@
-{
-  "name": "bus-n-go-frontend",
-  "version": "0.0.0",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "bus-n-go-frontend",
-      "version": "0.0.0",
-      "dependencies": {
-        "@angular/animations": "^18.0.0",
-        "@angular/cdk": "^18.0.4",
-        "@angular/common": "^18.0.0",
-        "@angular/compiler": "^18.0.0",
-        "@angular/core": "^18.0.0",
-        "@angular/forms": "^18.0.0",
-        "@angular/material": "^18.0.4",
-        "@angular/platform-browser": "^18.0.0",
-        "@angular/platform-browser-dynamic": "^18.0.0",
-        "@angular/router": "^18.0.0",
-        "echarts": "^5.5.1",
-        "ngx-echarts": "^18.0.0",
-        "rxjs": "~7.8.0",
-        "tslib": "^2.3.0",
-        "zone.js": "~0.14.3"
-      },
-      "devDependencies": {
-        "@angular-devkit/build-angular": "^18.0.4",
-        "@angular/cli": "^18.0.4",
-        "@angular/compiler-cli": "^18.0.0",
-        "@types/jasmine": "~5.1.0",
-        "jasmine-core": "~5.1.0",
-        "karma": "~6.4.0",
-        "karma-chrome-launcher": "~3.2.0",
-        "karma-coverage": "~2.2.0",
-        "karma-jasmine": "~5.1.0",
-        "karma-jasmine-html-reporter": "~2.1.0",
-        "tailwindcss": "^3.4.4",
-        "typescript": "~5.4.2"
-      }
-    },
-    "node_modules/@alloc/quick-lru": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz",
-      "integrity": "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@ampproject/remapping": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
-      "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/gen-mapping": "^0.3.5",
-        "@jridgewell/trace-mapping": "^0.3.24"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@angular-devkit/architect": {
-      "version": "0.1800.5",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1800.5.tgz",
-      "integrity": "sha512-KliFJTqwAIyRvW10JnJLlpXK86yx683unTgwgvkg9V4gUc/7cNCmWJiOCmYh1+gATpFq+3d3o36EdTzb4QS03g==",
-      "dev": true,
-      "dependencies": {
-        "@angular-devkit/core": "18.0.5",
-        "rxjs": "7.8.1"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@angular-devkit/build-angular": {
-      "version": "18.0.5",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-18.0.5.tgz",
-      "integrity": "sha512-itZN5tAZ+66bHZ4JNxIiPxfbSvQP6Gk4hcCzfGzcs3G0VsahR0rpX0Rg+1CRX1bpDzan3z8AVfwIxlLPKSOBbg==",
-      "dev": true,
-      "dependencies": {
-        "@ampproject/remapping": "2.3.0",
-        "@angular-devkit/architect": "0.1800.5",
-        "@angular-devkit/build-webpack": "0.1800.5",
-        "@angular-devkit/core": "18.0.5",
-        "@angular/build": "18.0.5",
-        "@babel/core": "7.24.5",
-        "@babel/generator": "7.24.5",
-        "@babel/helper-annotate-as-pure": "7.22.5",
-        "@babel/helper-split-export-declaration": "7.24.5",
-        "@babel/plugin-transform-async-generator-functions": "7.24.3",
-        "@babel/plugin-transform-async-to-generator": "7.24.1",
-        "@babel/plugin-transform-runtime": "7.24.3",
-        "@babel/preset-env": "7.24.5",
-        "@babel/runtime": "7.24.5",
-        "@discoveryjs/json-ext": "0.5.7",
-        "@ngtools/webpack": "18.0.5",
-        "@vitejs/plugin-basic-ssl": "1.1.0",
-        "ansi-colors": "4.1.3",
-        "autoprefixer": "10.4.19",
-        "babel-loader": "9.1.3",
-        "browserslist": "^4.21.5",
-        "copy-webpack-plugin": "11.0.0",
-        "critters": "0.0.22",
-        "css-loader": "7.1.1",
-        "esbuild-wasm": "0.21.3",
-        "fast-glob": "3.3.2",
-        "http-proxy-middleware": "3.0.0",
-        "https-proxy-agent": "7.0.4",
-        "inquirer": "9.2.22",
-        "istanbul-lib-instrument": "6.0.2",
-        "jsonc-parser": "3.2.1",
-        "karma-source-map-support": "1.4.0",
-        "less": "4.2.0",
-        "less-loader": "12.2.0",
-        "license-webpack-plugin": "4.0.2",
-        "loader-utils": "3.2.1",
-        "magic-string": "0.30.10",
-        "mini-css-extract-plugin": "2.9.0",
-        "mrmime": "2.0.0",
-        "open": "8.4.2",
-        "ora": "5.4.1",
-        "parse5-html-rewriting-stream": "7.0.0",
-        "picomatch": "4.0.2",
-        "piscina": "4.5.0",
-        "postcss": "8.4.38",
-        "postcss-loader": "8.1.1",
-        "resolve-url-loader": "5.0.0",
-        "rxjs": "7.8.1",
-        "sass": "1.77.2",
-        "sass-loader": "14.2.1",
-        "semver": "7.6.2",
-        "source-map-loader": "5.0.0",
-        "source-map-support": "0.5.21",
-        "terser": "5.31.0",
-        "tree-kill": "1.2.2",
-        "tslib": "2.6.2",
-        "undici": "6.18.0",
-        "vite": "5.2.11",
-        "watchpack": "2.4.1",
-        "webpack": "5.91.0",
-        "webpack-dev-middleware": "7.2.1",
-        "webpack-dev-server": "5.0.4",
-        "webpack-merge": "5.10.0",
-        "webpack-subresource-integrity": "5.1.0"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      },
-      "optionalDependencies": {
-        "esbuild": "0.21.3"
-      },
-      "peerDependencies": {
-        "@angular/compiler-cli": "^18.0.0",
-        "@angular/localize": "^18.0.0",
-        "@angular/platform-server": "^18.0.0",
-        "@angular/service-worker": "^18.0.0",
-        "@web/test-runner": "^0.18.0",
-        "browser-sync": "^3.0.2",
-        "jest": "^29.5.0",
-        "jest-environment-jsdom": "^29.5.0",
-        "karma": "^6.3.0",
-        "ng-packagr": "^18.0.0",
-        "protractor": "^7.0.0",
-        "tailwindcss": "^2.0.0 || ^3.0.0",
-        "typescript": ">=5.4 <5.5"
-      },
-      "peerDependenciesMeta": {
-        "@angular/localize": {
-          "optional": true
-        },
-        "@angular/platform-server": {
-          "optional": true
-        },
-        "@angular/service-worker": {
-          "optional": true
-        },
-        "@web/test-runner": {
-          "optional": true
-        },
-        "browser-sync": {
-          "optional": true
-        },
-        "jest": {
-          "optional": true
-        },
-        "jest-environment-jsdom": {
-          "optional": true
-        },
-        "karma": {
-          "optional": true
-        },
-        "ng-packagr": {
-          "optional": true
-        },
-        "protractor": {
-          "optional": true
-        },
-        "tailwindcss": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular-devkit/build-angular/node_modules/tslib": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
-      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==",
-      "dev": true
-    },
-    "node_modules/@angular-devkit/build-webpack": {
-      "version": "0.1800.5",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1800.5.tgz",
-      "integrity": "sha512-/eiIwlQJBZlCWLsfaoSOsSGFY24cLKCCY4fs/fvcBXxG5/g1FFx24Zt73j0qRoNeK3soUg9+lmCAiRvO6cGpJg==",
-      "dev": true,
-      "dependencies": {
-        "@angular-devkit/architect": "0.1800.5",
-        "rxjs": "7.8.1"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      },
-      "peerDependencies": {
-        "webpack": "^5.30.0",
-        "webpack-dev-server": "^5.0.2"
-      }
-    },
-    "node_modules/@angular-devkit/core": {
-      "version": "18.0.5",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-18.0.5.tgz",
-      "integrity": "sha512-sGtrS0SqkcBvyuv0QkIfyadwPgDhMroz1r51lMh1hwzJaJ0LNuVMLviEeYIybeBnvAdp9YvYC8I1WgB/FUEFBw==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "8.13.0",
-        "ajv-formats": "3.0.1",
-        "jsonc-parser": "3.2.1",
-        "picomatch": "4.0.2",
-        "rxjs": "7.8.1",
-        "source-map": "0.7.4"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      },
-      "peerDependencies": {
-        "chokidar": "^3.5.2"
-      },
-      "peerDependenciesMeta": {
-        "chokidar": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular-devkit/schematics": {
-      "version": "18.0.5",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-18.0.5.tgz",
-      "integrity": "sha512-hZwAq3hwuJzCuh7uqO/7T9IMERhYVxz+ganJlEykpyr58o0IjUM1Q4ZSH5UOYlGRPdBCZJbfiafZ0Sg5w5xBww==",
-      "dev": true,
-      "dependencies": {
-        "@angular-devkit/core": "18.0.5",
-        "jsonc-parser": "3.2.1",
-        "magic-string": "0.30.10",
-        "ora": "5.4.1",
-        "rxjs": "7.8.1"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@angular/animations": {
-      "version": "18.0.4",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-18.0.4.tgz",
-      "integrity": "sha512-xbdtBUvpTGEmVQkCoOad26LBMRy9ddM9pvCidMZBWXiM7NEuc3dfVT99a1cU4MZFiJeiQEvOWQn03iXskbBMGQ==",
-      "dependencies": {
-        "tslib": "^2.3.0"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
-      },
-      "peerDependencies": {
-        "@angular/core": "18.0.4"
-      }
-    },
-    "node_modules/@angular/build": {
-      "version": "18.0.5",
-      "resolved": "https://registry.npmjs.org/@angular/build/-/build-18.0.5.tgz",
-      "integrity": "sha512-6C+azPDYqPWX9/+53OTyvzmAKxrGwgQcDnueC/Sc6NZJOAs2VsOIn5ULPtcRDlrf/Rbo0dGM4OvKCM2q1BRuBg==",
-      "dev": true,
-      "dependencies": {
-        "@ampproject/remapping": "2.3.0",
-        "@angular-devkit/architect": "0.1800.5",
-        "@babel/core": "7.24.5",
-        "@babel/helper-annotate-as-pure": "7.22.5",
-        "@babel/helper-split-export-declaration": "7.24.5",
-        "@vitejs/plugin-basic-ssl": "1.1.0",
-        "ansi-colors": "4.1.3",
-        "browserslist": "^4.23.0",
-        "critters": "0.0.22",
-        "esbuild": "0.21.3",
-        "fast-glob": "3.3.2",
-        "https-proxy-agent": "7.0.4",
-        "inquirer": "9.2.22",
-        "lmdb": "3.0.8",
-        "magic-string": "0.30.10",
-        "mrmime": "2.0.0",
-        "ora": "5.4.1",
-        "parse5-html-rewriting-stream": "7.0.0",
-        "picomatch": "4.0.2",
-        "piscina": "4.5.0",
-        "sass": "1.77.2",
-        "semver": "7.6.2",
-        "undici": "6.18.0",
-        "vite": "5.2.11",
-        "watchpack": "2.4.1"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      },
-      "peerDependencies": {
-        "@angular/compiler-cli": "^18.0.0",
-        "@angular/localize": "^18.0.0",
-        "@angular/platform-server": "^18.0.0",
-        "@angular/service-worker": "^18.0.0",
-        "less": "^4.2.0",
-        "postcss": "^8.4.0",
-        "tailwindcss": "^2.0.0 || ^3.0.0",
-        "typescript": ">=5.4 <5.5"
-      },
-      "peerDependenciesMeta": {
-        "@angular/localize": {
-          "optional": true
-        },
-        "@angular/platform-server": {
-          "optional": true
-        },
-        "@angular/service-worker": {
-          "optional": true
-        },
-        "less": {
-          "optional": true
-        },
-        "postcss": {
-          "optional": true
-        },
-        "tailwindcss": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular/cdk": {
-      "version": "18.0.4",
-      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-18.0.4.tgz",
-      "integrity": "sha512-OCG1EGv/nyZYGcSu7y6IAuarC5gZcZYhhvEQsgMUDrf1TGRSa+0dBN5W2HxRWKs6NsGgDjW1VcK+AC85PYLXPA==",
-      "dependencies": {
-        "tslib": "^2.3.0"
-      },
-      "optionalDependencies": {
-        "parse5": "^7.1.2"
-      },
-      "peerDependencies": {
-        "@angular/common": "^18.0.0 || ^19.0.0",
-        "@angular/core": "^18.0.0 || ^19.0.0",
-        "rxjs": "^6.5.3 || ^7.4.0"
-      }
-    },
-    "node_modules/@angular/cli": {
-      "version": "18.0.5",
-      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-18.0.5.tgz",
-      "integrity": "sha512-w3NOdj6T7QhBmFleavc+AEhcAMyPkt7RsyWW2saufD6x55gzynGQZb9UBZwKDUAR6UtqchBX/HEBWCLNnjbiHg==",
-      "dev": true,
-      "dependencies": {
-        "@angular-devkit/architect": "0.1800.5",
-        "@angular-devkit/core": "18.0.5",
-        "@angular-devkit/schematics": "18.0.5",
-        "@schematics/angular": "18.0.5",
-        "@yarnpkg/lockfile": "1.1.0",
-        "ansi-colors": "4.1.3",
-        "ini": "4.1.2",
-        "inquirer": "9.2.22",
-        "jsonc-parser": "3.2.1",
-        "npm-package-arg": "11.0.2",
-        "npm-pick-manifest": "9.0.1",
-        "ora": "5.4.1",
-        "pacote": "18.0.6",
-        "resolve": "1.22.8",
-        "semver": "7.6.2",
-        "symbol-observable": "4.0.0",
-        "yargs": "17.7.2"
-      },
-      "bin": {
-        "ng": "bin/ng.js"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@angular/common": {
-      "version": "18.0.4",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-18.0.4.tgz",
-      "integrity": "sha512-7WxZKLzSu5QtyLGrtlZrtUQlP3WfDR++yHr5jF9DJZ3IY35UutwiPCegCcq4Qh5X2xWqnRKGm20TLlKVoj0t5Q==",
-      "dependencies": {
-        "tslib": "^2.3.0"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
-      },
-      "peerDependencies": {
-        "@angular/core": "18.0.4",
-        "rxjs": "^6.5.3 || ^7.4.0"
-      }
-    },
-    "node_modules/@angular/compiler": {
-      "version": "18.0.4",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-18.0.4.tgz",
-      "integrity": "sha512-OVPXtJo5SkGQUCioCVxKcRfEw48tz8xCtJGDXjVKWtyOkXnmWl8Y/e54mteiJd1KybXHvPLW0LPtWZYB06Qy7g==",
-      "dependencies": {
-        "tslib": "^2.3.0"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
-      },
-      "peerDependencies": {
-        "@angular/core": "18.0.4"
-      },
-      "peerDependenciesMeta": {
-        "@angular/core": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular/compiler-cli": {
-      "version": "18.0.4",
-      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-18.0.4.tgz",
-      "integrity": "sha512-pUv664JCZHKHsLDvO8iNjWXVHOB2ggKxVoxiowOMNpR4dqxrK/oOLGkPGltYUW/xF6Eajc7Zs0lK/R5uljoYQg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/core": "7.24.7",
-        "@jridgewell/sourcemap-codec": "^1.4.14",
-        "chokidar": "^3.0.0",
-        "convert-source-map": "^1.5.1",
-        "reflect-metadata": "^0.2.0",
-        "semver": "^7.0.0",
-        "tslib": "^2.3.0",
-        "yargs": "^17.2.1"
-      },
-      "bin": {
-        "ng-xi18n": "bundles/src/bin/ng_xi18n.js",
-        "ngc": "bundles/src/bin/ngc.js",
-        "ngcc": "bundles/ngcc/index.js"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
-      },
-      "peerDependencies": {
-        "@angular/compiler": "18.0.4",
-        "typescript": ">=5.4 <5.5"
-      }
-    },
-    "node_modules/@angular/compiler-cli/node_modules/@babel/core": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.7.tgz",
-      "integrity": "sha512-nykK+LEK86ahTkX/3TgauT0ikKoNCfKHEaZYTUVupJdTLzGNvrblu4u6fa7DhZONAltdf8e662t/abY8idrd/g==",
-      "dev": true,
-      "dependencies": {
-        "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.24.7",
-        "@babel/generator": "^7.24.7",
-        "@babel/helper-compilation-targets": "^7.24.7",
-        "@babel/helper-module-transforms": "^7.24.7",
-        "@babel/helpers": "^7.24.7",
-        "@babel/parser": "^7.24.7",
-        "@babel/template": "^7.24.7",
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7",
-        "convert-source-map": "^2.0.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.3",
-        "semver": "^6.3.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/babel"
-      }
-    },
-    "node_modules/@angular/compiler-cli/node_modules/@babel/core/node_modules/convert-source-map": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-      "dev": true
-    },
-    "node_modules/@angular/compiler-cli/node_modules/@babel/core/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/@angular/compiler-cli/node_modules/@babel/generator": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.7.tgz",
-      "integrity": "sha512-oipXieGC3i45Y1A41t4tAqpnEZWgB/lC6Ehh6+rOviR5XWpTtMmLN+fGjz9vOiNRt0p6RtO6DtD0pdU3vpqdSA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.24.7",
-        "@jridgewell/gen-mapping": "^0.3.5",
-        "@jridgewell/trace-mapping": "^0.3.25",
-        "jsesc": "^2.5.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@angular/core": {
-      "version": "18.0.4",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-18.0.4.tgz",
-      "integrity": "sha512-k0AUZbJc0eyzRexvKlR1sR0qNhe54Om9ln6lRn7y1+gAsg+OwFDyF427fFuzqpZVe/MmpvX3CXWdl0twZAYEiA==",
-      "dependencies": {
-        "tslib": "^2.3.0"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
-      },
-      "peerDependencies": {
-        "rxjs": "^6.5.3 || ^7.4.0",
-        "zone.js": "~0.14.0"
-      }
-    },
-    "node_modules/@angular/forms": {
-      "version": "18.0.4",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-18.0.4.tgz",
-      "integrity": "sha512-LM2rVIuJa2fGxP0oCy0uFSGY6h9tyL64gtGp02QqKaVszG4oJ8wue0/VSbBtKyH0xEN4eOXDzOXbiahbtFhRZA==",
-      "dependencies": {
-        "tslib": "^2.3.0"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
-      },
-      "peerDependencies": {
-        "@angular/common": "18.0.4",
-        "@angular/core": "18.0.4",
-        "@angular/platform-browser": "18.0.4",
-        "rxjs": "^6.5.3 || ^7.4.0"
-      }
-    },
-    "node_modules/@angular/material": {
-      "version": "18.0.4",
-      "resolved": "https://registry.npmjs.org/@angular/material/-/material-18.0.4.tgz",
-      "integrity": "sha512-ES4peq3+tMEPKe9RgdQ3pp3CcjM0Cr+vi4f+0ruH2wu1NTBk522/1/ABHncg3A/eCurKS96JJdihqOAjMek4Ow==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.7f224ddd4.0",
-        "@material/auto-init": "15.0.0-canary.7f224ddd4.0",
-        "@material/banner": "15.0.0-canary.7f224ddd4.0",
-        "@material/base": "15.0.0-canary.7f224ddd4.0",
-        "@material/button": "15.0.0-canary.7f224ddd4.0",
-        "@material/card": "15.0.0-canary.7f224ddd4.0",
-        "@material/checkbox": "15.0.0-canary.7f224ddd4.0",
-        "@material/chips": "15.0.0-canary.7f224ddd4.0",
-        "@material/circular-progress": "15.0.0-canary.7f224ddd4.0",
-        "@material/data-table": "15.0.0-canary.7f224ddd4.0",
-        "@material/density": "15.0.0-canary.7f224ddd4.0",
-        "@material/dialog": "15.0.0-canary.7f224ddd4.0",
-        "@material/dom": "15.0.0-canary.7f224ddd4.0",
-        "@material/drawer": "15.0.0-canary.7f224ddd4.0",
-        "@material/elevation": "15.0.0-canary.7f224ddd4.0",
-        "@material/fab": "15.0.0-canary.7f224ddd4.0",
-        "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0",
-        "@material/floating-label": "15.0.0-canary.7f224ddd4.0",
-        "@material/form-field": "15.0.0-canary.7f224ddd4.0",
-        "@material/icon-button": "15.0.0-canary.7f224ddd4.0",
-        "@material/image-list": "15.0.0-canary.7f224ddd4.0",
-        "@material/layout-grid": "15.0.0-canary.7f224ddd4.0",
-        "@material/line-ripple": "15.0.0-canary.7f224ddd4.0",
-        "@material/linear-progress": "15.0.0-canary.7f224ddd4.0",
-        "@material/list": "15.0.0-canary.7f224ddd4.0",
-        "@material/menu": "15.0.0-canary.7f224ddd4.0",
-        "@material/menu-surface": "15.0.0-canary.7f224ddd4.0",
-        "@material/notched-outline": "15.0.0-canary.7f224ddd4.0",
-        "@material/radio": "15.0.0-canary.7f224ddd4.0",
-        "@material/ripple": "15.0.0-canary.7f224ddd4.0",
-        "@material/rtl": "15.0.0-canary.7f224ddd4.0",
-        "@material/segmented-button": "15.0.0-canary.7f224ddd4.0",
-        "@material/select": "15.0.0-canary.7f224ddd4.0",
-        "@material/shape": "15.0.0-canary.7f224ddd4.0",
-        "@material/slider": "15.0.0-canary.7f224ddd4.0",
-        "@material/snackbar": "15.0.0-canary.7f224ddd4.0",
-        "@material/switch": "15.0.0-canary.7f224ddd4.0",
-        "@material/tab": "15.0.0-canary.7f224ddd4.0",
-        "@material/tab-bar": "15.0.0-canary.7f224ddd4.0",
-        "@material/tab-indicator": "15.0.0-canary.7f224ddd4.0",
-        "@material/tab-scroller": "15.0.0-canary.7f224ddd4.0",
-        "@material/textfield": "15.0.0-canary.7f224ddd4.0",
-        "@material/theme": "15.0.0-canary.7f224ddd4.0",
-        "@material/tokens": "15.0.0-canary.7f224ddd4.0",
-        "@material/tooltip": "15.0.0-canary.7f224ddd4.0",
-        "@material/top-app-bar": "15.0.0-canary.7f224ddd4.0",
-        "@material/touch-target": "15.0.0-canary.7f224ddd4.0",
-        "@material/typography": "15.0.0-canary.7f224ddd4.0",
-        "tslib": "^2.3.0"
-      },
-      "peerDependencies": {
-        "@angular/animations": "^18.0.0 || ^19.0.0",
-        "@angular/cdk": "18.0.4",
-        "@angular/common": "^18.0.0 || ^19.0.0",
-        "@angular/core": "^18.0.0 || ^19.0.0",
-        "@angular/forms": "^18.0.0 || ^19.0.0",
-        "@angular/platform-browser": "^18.0.0 || ^19.0.0",
-        "rxjs": "^6.5.3 || ^7.4.0"
-      }
-    },
-    "node_modules/@angular/platform-browser": {
-      "version": "18.0.4",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-18.0.4.tgz",
-      "integrity": "sha512-8TJEPzIRV89s1ZP9T+7g9K7PFNfec+4Xyw5BLaTRBOqjXHmMzk+miRx0L18Lr66rp5r2vbNEE9vojMVHQRwhVA==",
-      "dependencies": {
-        "tslib": "^2.3.0"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
-      },
-      "peerDependencies": {
-        "@angular/animations": "18.0.4",
-        "@angular/common": "18.0.4",
-        "@angular/core": "18.0.4"
-      },
-      "peerDependenciesMeta": {
-        "@angular/animations": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular/platform-browser-dynamic": {
-      "version": "18.0.4",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-18.0.4.tgz",
-      "integrity": "sha512-K36/gamqs8etGlmWew7IwZ/bDJdI5ZeUqvOUmkKjJ9F2I/g5P/zZrB1qExwN/zsxzxd9idkvEhwY+YDeiZEEJg==",
-      "dependencies": {
-        "tslib": "^2.3.0"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
-      },
-      "peerDependencies": {
-        "@angular/common": "18.0.4",
-        "@angular/compiler": "18.0.4",
-        "@angular/core": "18.0.4",
-        "@angular/platform-browser": "18.0.4"
-      }
-    },
-    "node_modules/@angular/router": {
-      "version": "18.0.4",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-18.0.4.tgz",
-      "integrity": "sha512-nr1ZI3lynKBtr3a75APuVkIaiXRG5mEnW/RIyxwzxbKBB14901mby46o0jm9Y/CPb2rH5UpuwZhTKRE6QS/xLw==",
-      "dependencies": {
-        "tslib": "^2.3.0"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
-      },
-      "peerDependencies": {
-        "@angular/common": "18.0.4",
-        "@angular/core": "18.0.4",
-        "@angular/platform-browser": "18.0.4",
-        "rxjs": "^6.5.3 || ^7.4.0"
-      }
-    },
-    "node_modules/@babel/code-frame": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
-      "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.24.7",
-        "picocolors": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/compat-data": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.7.tgz",
-      "integrity": "sha512-qJzAIcv03PyaWqxRgO4mSU3lihncDT296vnyuE2O8uA4w3UHWI4S3hgeZd1L8W1Bft40w9JxJ2b412iDUFFRhw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/core": {
-      "version": "7.24.5",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.5.tgz",
-      "integrity": "sha512-tVQRucExLQ02Boi4vdPp49svNGcfL2GhdTCT9aldhXgCJVAI21EtRfBettiuLUwce/7r6bFdgs6JFkcdTiFttA==",
-      "dev": true,
-      "dependencies": {
-        "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.24.2",
-        "@babel/generator": "^7.24.5",
-        "@babel/helper-compilation-targets": "^7.23.6",
-        "@babel/helper-module-transforms": "^7.24.5",
-        "@babel/helpers": "^7.24.5",
-        "@babel/parser": "^7.24.5",
-        "@babel/template": "^7.24.0",
-        "@babel/traverse": "^7.24.5",
-        "@babel/types": "^7.24.5",
-        "convert-source-map": "^2.0.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.3",
-        "semver": "^6.3.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/babel"
-      }
-    },
-    "node_modules/@babel/core/node_modules/convert-source-map": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-      "dev": true
-    },
-    "node_modules/@babel/core/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/@babel/generator": {
-      "version": "7.24.5",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.5.tgz",
-      "integrity": "sha512-x32i4hEXvr+iI0NEoEfDKzlemF8AmtOP8CcrRaEcpzysWuoEb1KknpcvMsHKPONoKZiDuItklgWhB18xEhr9PA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.24.5",
-        "@jridgewell/gen-mapping": "^0.3.5",
-        "@jridgewell/trace-mapping": "^0.3.25",
-        "jsesc": "^2.5.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz",
-      "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.24.7.tgz",
-      "integrity": "sha512-xZeCVVdwb4MsDBkkyZ64tReWYrLRHlMN72vP7Bdm3OUOuyFZExhsHUUnuWnm2/XOlAJzR0LfPpB56WXZn0X/lA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.7.tgz",
-      "integrity": "sha512-ctSdRHBi20qWOfy27RUb4Fhp07KSJ3sXcuSvTrXrc4aG8NSYDo1ici3Vhg9bg69y5bj0Mr1lh0aeEgTvc12rMg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.24.7",
-        "@babel/helper-validator-option": "^7.24.7",
-        "browserslist": "^4.22.2",
-        "lru-cache": "^5.1.1",
-        "semver": "^6.3.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.7.tgz",
-      "integrity": "sha512-kTkaDl7c9vO80zeX1rJxnuRpEsD5tA81yh11X1gQo+PhSti3JS+7qeZo9U4RHobKRiFPKaGK3svUAeb8D0Q7eg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.24.7",
-        "@babel/helper-environment-visitor": "^7.24.7",
-        "@babel/helper-function-name": "^7.24.7",
-        "@babel/helper-member-expression-to-functions": "^7.24.7",
-        "@babel/helper-optimise-call-expression": "^7.24.7",
-        "@babel/helper-replace-supers": "^7.24.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
-        "@babel/helper-split-export-declaration": "^7.24.7",
-        "semver": "^6.3.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz",
-      "integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz",
-      "integrity": "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.24.7.tgz",
-      "integrity": "sha512-03TCmXy2FtXJEZfbXDTSqq1fRJArk7lX9DOFC/47VthYcxyIOx+eXQmdo6DOQvrbpIix+KfXwvuXdFDZHxt+rA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.24.7",
-        "regexpu-core": "^5.3.1",
-        "semver": "^6.3.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/helper-create-regexp-features-plugin/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz",
-      "integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-create-regexp-features-plugin/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz",
-      "integrity": "sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-compilation-targets": "^7.22.6",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "debug": "^4.1.1",
-        "lodash.debounce": "^4.0.8",
-        "resolve": "^1.14.2"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
-      }
-    },
-    "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz",
-      "integrity": "sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-function-name": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz",
-      "integrity": "sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.24.7",
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz",
-      "integrity": "sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.7.tgz",
-      "integrity": "sha512-LGeMaf5JN4hAT471eJdBs/GK1DoYIJ5GCtZN/EsL6KUiiDZOvO/eKE11AMZJa2zP4zk4qe9V2O/hxAmkRc8p6w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-module-imports": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz",
-      "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.7.tgz",
-      "integrity": "sha512-1fuJEwIrp+97rM4RWdO+qrRsZlAeL1lQJoPqtCYWv0NL115XM93hIH4CSRln2w52SqvmY5hqdtauB6QFCDiZNQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-environment-visitor": "^7.24.7",
-        "@babel/helper-module-imports": "^7.24.7",
-        "@babel/helper-simple-access": "^7.24.7",
-        "@babel/helper-split-export-declaration": "^7.24.7",
-        "@babel/helper-validator-identifier": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz",
-      "integrity": "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.24.7.tgz",
-      "integrity": "sha512-jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.7.tgz",
-      "integrity": "sha512-Rq76wjt7yz9AAc1KnlRKNAi/dMSVWgDRx43FHoJEbcYU6xOWaE2dVPwcdTukJrjxS65GITyfbvEYHvkirZ6uEg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.24.7.tgz",
-      "integrity": "sha512-9pKLcTlZ92hNZMQfGCHImUpDOlAgkkpqalWEeftW5FBya75k8Li2ilerxkM/uBEj01iBZXcCIB/bwvDYgWyibA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.24.7",
-        "@babel/helper-environment-visitor": "^7.24.7",
-        "@babel/helper-wrap-function": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz",
-      "integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-replace-supers": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.24.7.tgz",
-      "integrity": "sha512-qTAxxBM81VEyoAY0TtLrx1oAEJc09ZK67Q9ljQToqCnA+55eNwCORaxlKyu+rNfX86o8OXRUSNUnrtsAZXM9sg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-environment-visitor": "^7.24.7",
-        "@babel/helper-member-expression-to-functions": "^7.24.7",
-        "@babel/helper-optimise-call-expression": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/helper-simple-access": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz",
-      "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.24.7.tgz",
-      "integrity": "sha512-IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.24.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.5.tgz",
-      "integrity": "sha512-5CHncttXohrHk8GWOFCcCl4oRD9fKosWlIRgWm4ql9VYioKm52Mk2xsmoohvm7f3JoiLSM5ZgJuRaf5QZZYd3Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.24.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-string-parser": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.7.tgz",
-      "integrity": "sha512-7MbVt6xrwFQbunH2DNQsAP5sTGxfqQtErvBIvIMi6EQnbgUOuVYanvREcmFrOPhoXBrTtjhhP+lW+o5UfK+tDg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
-      "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-option": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.7.tgz",
-      "integrity": "sha512-yy1/KvjhV/ZCL+SM7hBrvnZJ3ZuT9OuZgIJAGpPEToANvc3iM6iDvBnRjtElWibHU6n8/LPR/EjX9EtIEYO3pw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-wrap-function": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.24.7.tgz",
-      "integrity": "sha512-N9JIYk3TD+1vq/wn77YnJOqMtfWhNewNE+DJV4puD2X7Ew9J4JvrzrFDfTfyv5EgEXVy9/Wt8QiOErzEmv5Ifw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-function-name": "^7.24.7",
-        "@babel/template": "^7.24.7",
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helpers": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.7.tgz",
-      "integrity": "sha512-NlmJJtvcw72yRJRcnCmGvSi+3jDEg8qFu3z0AFoymmzLx5ERVWyzd9kVXr7Th9/8yIJi2Zc6av4Tqz3wFs8QWg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.24.7",
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/highlight": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
-      "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.24.7",
-        "chalk": "^2.4.2",
-        "js-tokens": "^4.0.0",
-        "picocolors": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/parser": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.7.tgz",
-      "integrity": "sha512-9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw==",
-      "dev": true,
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.24.7.tgz",
-      "integrity": "sha512-TiT1ss81W80eQsN+722OaeQMY/G4yTb4G9JrqeiDADs3N8lbPMGldWi9x8tyqCW5NLx1Jh2AvkE6r6QvEltMMQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-environment-visitor": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.24.7.tgz",
-      "integrity": "sha512-unaQgZ/iRu/By6tsjMZzpeBZjChYfLYry6HrEXPoz3KmfF0sVBQ1l8zKMQ4xRGLWVsjuvB8nQfjNP/DcfEOCsg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.7.tgz",
-      "integrity": "sha512-+izXIbke1T33mY4MSNnrqhPXDz01WYhEf3yF5NbnUtkiNnm+XBZJl3kNfoK6NKmYlz/D07+l2GWVK/QfDkNCuQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
-        "@babel/plugin-transform-optional-chaining": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.13.0"
-      }
-    },
-    "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.24.7.tgz",
-      "integrity": "sha512-utA4HuR6F4Vvcr+o4DnjL8fCOlgRFGbeeBEGNg3ZTrLFw6VWG5XmUrvcQ0FjIYMU2ST4XcR2Wsp7t9qOAPnxMg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-environment-visitor": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-private-property-in-object": {
-      "version": "7.21.0-placeholder-for-preset-env.2",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
-      "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-async-generators": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
-      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-class-properties": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
-      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-class-static-block": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
-      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-dynamic-import": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
-      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-export-namespace-from": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
-      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-import-assertions": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.7.tgz",
-      "integrity": "sha512-Ec3NRUMoi8gskrkBe3fNmEQfxDvY8bgfQpz6jlk/41kX9eUjvpyqWU7PBP/pLAvMaSQjbMNKJmvX57jP+M6bPg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-import-attributes": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.24.7.tgz",
-      "integrity": "sha512-hbX+lKKeUMGihnK8nvKqmXBInriT3GVjzXKFriV3YC6APGxMbP8RZNFwy91+hocLXq90Mta+HshoB31802bb8A==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-import-meta": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
-      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-json-strings": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
-      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
-      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-numeric-separator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
-      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-object-rest-spread": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
-      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-optional-catch-binding": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
-      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-optional-chaining": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-private-property-in-object": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
-      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-top-level-await": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
-      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-unicode-sets-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz",
-      "integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-arrow-functions": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.7.tgz",
-      "integrity": "sha512-Dt9LQs6iEY++gXUwY03DNFat5C2NbO48jj+j/bSAz6b3HgPs39qcPiYt77fDObIcFwj3/C2ICX9YMwGflUoSHQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-async-generator-functions": {
-      "version": "7.24.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.24.3.tgz",
-      "integrity": "sha512-Qe26CMYVjpQxJ8zxM1340JFNjZaF+ISWpr1Kt/jGo+ZTUzKkfw/pphEWbRCb+lmSM6k/TOgfYLvmbHkUQ0asIg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/helper-remap-async-to-generator": "^7.22.20",
-        "@babel/plugin-syntax-async-generators": "^7.8.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-async-to-generator": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.1.tgz",
-      "integrity": "sha512-AawPptitRXp1y0n4ilKcGbRYWfbbzFWz2NqNu7dacYDtFtz0CMjG64b3LQsb3KIgnf4/obcUL78hfaOS7iCUfw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-imports": "^7.24.1",
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/helper-remap-async-to-generator": "^7.22.20"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.7.tgz",
-      "integrity": "sha512-yO7RAz6EsVQDaBH18IDJcMB1HnrUn2FJ/Jslc/WtPPWcjhpUJXU/rjbwmluzp7v/ZzWcEhTMXELnnsz8djWDwQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.7.tgz",
-      "integrity": "sha512-Nd5CvgMbWc+oWzBsuaMcbwjJWAcp5qzrbg69SZdHSP7AMY0AbWFqFO0WTFCA1jxhMCwodRwvRec8k0QUbZk7RQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-class-properties": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.24.7.tgz",
-      "integrity": "sha512-vKbfawVYayKcSeSR5YYzzyXvsDFWU2mD8U5TFeXtbCPLFUqe7GyCgvO6XDHzje862ODrOwy6WCPmKeWHbCFJ4w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-class-static-block": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.7.tgz",
-      "integrity": "sha512-HMXK3WbBPpZQufbMG4B46A90PkuuhN9vBCb5T8+VAHqvAqvcLi+2cKoukcpmUYkszLhScU3l1iudhrks3DggRQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.12.0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.7.tgz",
-      "integrity": "sha512-CFbbBigp8ln4FU6Bpy6g7sE8B/WmCmzvivzUC6xDAdWVsjYTXijpuuGJmYkAaoWAzcItGKT3IOAbxRItZ5HTjw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.24.7",
-        "@babel/helper-compilation-targets": "^7.24.7",
-        "@babel/helper-environment-visitor": "^7.24.7",
-        "@babel/helper-function-name": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-replace-supers": "^7.24.7",
-        "@babel/helper-split-export-declaration": "^7.24.7",
-        "globals": "^11.1.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-classes/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz",
-      "integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-classes/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz",
-      "integrity": "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.7.tgz",
-      "integrity": "sha512-25cS7v+707Gu6Ds2oY6tCkUwsJ9YIDbggd9+cu9jzzDgiNq7hR/8dkzxWfKWnTic26vsI3EsCXNd4iEB6e8esQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/template": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.7.tgz",
-      "integrity": "sha512-19eJO/8kdCQ9zISOf+SEUJM/bAUIsvY3YDnXZTupUCQ8LgrWnsG/gFB9dvXqdXnRXMAM8fvt7b0CBKQHNGy1mw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-dotall-regex": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.7.tgz",
-      "integrity": "sha512-ZOA3W+1RRTSWvyqcMJDLqbchh7U4NRGqwRfFSVbOLS/ePIP4vHB5e8T8eXcuqyN1QkgKyj5wuW0lcS85v4CrSw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-duplicate-keys": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.7.tgz",
-      "integrity": "sha512-JdYfXyCRihAe46jUIliuL2/s0x0wObgwwiGxw/UbgJBr20gQBThrokO4nYKgWkD7uBaqM7+9x5TU7NkExZJyzw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-dynamic-import": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.7.tgz",
-      "integrity": "sha512-sc3X26PhZQDb3JhORmakcbvkeInvxz+A8oda99lj7J60QRuPZvNAk9wQlTBS1ZynelDrDmTU4pw1tyc5d5ZMUg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.7.tgz",
-      "integrity": "sha512-Rqe/vSc9OYgDajNIK35u7ot+KeCoetqQYFXM4Epf7M7ez3lWlOjrDjrwMei6caCVhfdw+mIKD4cgdGNy5JQotQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-export-namespace-from": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.24.7.tgz",
-      "integrity": "sha512-v0K9uNYsPL3oXZ/7F9NNIbAj2jv1whUEtyA6aujhekLs56R++JDQuzRcP2/z4WX5Vg/c5lE9uWZA0/iUoFhLTA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.7.tgz",
-      "integrity": "sha512-wo9ogrDG1ITTTBsy46oGiN1dS9A7MROBTcYsfS8DtsImMkHk9JXJ3EWQM6X2SUw4x80uGPlwj0o00Uoc6nEE3g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.24.7.tgz",
-      "integrity": "sha512-U9FcnA821YoILngSmYkW6FjyQe2TyZD5pHt4EVIhmcTkrJw/3KqcrRSxuOo5tFZJi7TE19iDyI1u+weTI7bn2w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-compilation-targets": "^7.24.7",
-        "@babel/helper-function-name": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-json-strings": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.24.7.tgz",
-      "integrity": "sha512-2yFnBGDvRuxAaE/f0vfBKvtnvvqU8tGpMHqMNpTN2oWMKIR3NqFkjaAgGwawhqK/pIN2T3XdjGPdaG0vDhOBGw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-json-strings": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-literals": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.24.7.tgz",
-      "integrity": "sha512-vcwCbb4HDH+hWi8Pqenwnjy+UiklO4Kt1vfspcQYFhJdpthSnW8XvWGyDZWKNVrVbVViI/S7K9PDJZiUmP2fYQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-logical-assignment-operators": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.24.7.tgz",
-      "integrity": "sha512-4D2tpwlQ1odXmTEIFWy9ELJcZHqrStlzK/dAOWYyxX3zT0iXQB6banjgeOJQXzEc4S0E0a5A+hahxPaEFYftsw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.7.tgz",
-      "integrity": "sha512-T/hRC1uqrzXMKLQ6UCwMT85S3EvqaBXDGf0FaMf4446Qx9vKwlghvee0+uuZcDUCZU5RuNi4781UQ7R308zzBw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.7.tgz",
-      "integrity": "sha512-9+pB1qxV3vs/8Hdmz/CulFB8w2tuu6EB94JZFsjdqxQokwGa9Unap7Bo2gGBGIvPmDIVvQrom7r5m/TCDMURhg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-transforms": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.7.tgz",
-      "integrity": "sha512-iFI8GDxtevHJ/Z22J5xQpVqFLlMNstcLXh994xifFwxxGslr2ZXXLWgtBeLctOD63UFDArdvN6Tg8RFw+aEmjQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-transforms": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-simple-access": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.24.7.tgz",
-      "integrity": "sha512-GYQE0tW7YoaN13qFh3O1NCY4MPkUiAH3fiF7UcV/I3ajmDKEdG3l+UOcbAm4zUE3gnvUU+Eni7XrVKo9eO9auw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-hoist-variables": "^7.24.7",
-        "@babel/helper-module-transforms": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-validator-identifier": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.7.tgz",
-      "integrity": "sha512-3aytQvqJ/h9z4g8AsKPLvD4Zqi2qT+L3j7XoFFu1XBlZWEl2/1kWnhmAbxpLgPrHSY0M6UA02jyTiwUVtiKR6A==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-transforms": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.24.7.tgz",
-      "integrity": "sha512-/jr7h/EWeJtk1U/uz2jlsCioHkZk1JJZVcc8oQsJ1dUlaJD83f4/6Zeh2aHt9BIFokHIsSeDfhUmju0+1GPd6g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.7.tgz",
-      "integrity": "sha512-RNKwfRIXg4Ls/8mMTza5oPF5RkOW8Wy/WgMAp1/F1yZ8mMbtwXW+HDoJiOsagWrAhI5f57Vncrmr9XeT4CVapA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.7.tgz",
-      "integrity": "sha512-Ts7xQVk1OEocqzm8rHMXHlxvsfZ0cEF2yomUqpKENHWMF4zKk175Y4q8H5knJes6PgYad50uuRmt3UJuhBw8pQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-numeric-separator": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.24.7.tgz",
-      "integrity": "sha512-e6q1TiVUzvH9KRvicuxdBTUj4AdKSRwzIyFFnfnezpCfP2/7Qmbb8qbU2j7GODbl4JMkblitCQjKYUaX/qkkwA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-object-rest-spread": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.7.tgz",
-      "integrity": "sha512-4QrHAr0aXQCEFni2q4DqKLD31n2DL+RxcwnNjDFkSG0eNQ/xCavnRkfCUjsyqGC2OviNJvZOF/mQqZBw7i2C5Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-compilation-targets": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-object-super": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.7.tgz",
-      "integrity": "sha512-A/vVLwN6lBrMFmMDmPPz0jnE6ZGx7Jq7d6sT/Ev4H65RER6pZ+kczlf1DthF5N0qaPHBsI7UXiE8Zy66nmAovg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-replace-supers": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-optional-catch-binding": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.24.7.tgz",
-      "integrity": "sha512-uLEndKqP5BfBbC/5jTwPxLh9kqPWWgzN/f8w6UwAIirAEqiIVJWWY312X72Eub09g5KF9+Zn7+hT7sDxmhRuKA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-optional-chaining": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.7.tgz",
-      "integrity": "sha512-tK+0N9yd4j+x/4hxF3F0e0fu/VdcxU18y5SevtyM/PCFlQvXbR0Zmlo2eBrKtVipGNFzpq56o8WsIIKcJFUCRQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.7.tgz",
-      "integrity": "sha512-yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-private-methods": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.24.7.tgz",
-      "integrity": "sha512-COTCOkG2hn4JKGEKBADkA8WNb35TGkkRbI5iT845dB+NyqgO8Hn+ajPbSnIQznneJTa3d30scb6iz/DhH8GsJQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-private-property-in-object": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.7.tgz",
-      "integrity": "sha512-9z76mxwnwFxMyxZWEgdgECQglF2Q7cFLm0kMf8pGwt+GSJsY0cONKj/UuO4bOH0w/uAel3ekS4ra5CEAyJRmDA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.24.7",
-        "@babel/helper-create-class-features-plugin": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-private-property-in-object/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz",
-      "integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.7.tgz",
-      "integrity": "sha512-EMi4MLQSHfd2nrCqQEWxFdha2gBCqU4ZcCng4WBGZ5CJL4bBRW0ptdqqDdeirGZcpALazVVNJqRmsO8/+oNCBA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.7.tgz",
-      "integrity": "sha512-lq3fvXPdimDrlg6LWBoqj+r/DEWgONuwjuOuQCSYgRroXDH/IdM1C0IZf59fL5cHLpjEH/O6opIRBbqv7ELnuA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "regenerator-transform": "^0.15.2"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.7.tgz",
-      "integrity": "sha512-0DUq0pHcPKbjFZCfTss/pGkYMfy3vFWydkUBd9r0GHpIyfs2eCDENvqadMycRS9wZCXR41wucAfJHJmwA0UmoQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-runtime": {
-      "version": "7.24.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.24.3.tgz",
-      "integrity": "sha512-J0BuRPNlNqlMTRJ72eVptpt9VcInbxO6iP3jaxr+1NPhC0UkKL+6oeX6VXMEYdADnuqmMmsBspt4d5w8Y/TCbQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-imports": "^7.24.3",
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "babel-plugin-polyfill-corejs2": "^0.4.10",
-        "babel-plugin-polyfill-corejs3": "^0.10.1",
-        "babel-plugin-polyfill-regenerator": "^0.6.1",
-        "semver": "^6.3.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-runtime/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.7.tgz",
-      "integrity": "sha512-KsDsevZMDsigzbA09+vacnLpmPH4aWjcZjXdyFKGzpplxhbeB4wYtury3vglQkg6KM/xEPKt73eCjPPf1PgXBA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.7.tgz",
-      "integrity": "sha512-x96oO0I09dgMDxJaANcRyD4ellXFLLiWhuwDxKZX5g2rWP1bTPkBSwCYv96VDXVT1bD9aPj8tppr5ITIh8hBng==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.7.tgz",
-      "integrity": "sha512-kHPSIJc9v24zEml5geKg9Mjx5ULpfncj0wRpYtxbvKyTtHCYDkVE3aHQ03FrpEo4gEe2vrJJS1Y9CJTaThA52g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.7.tgz",
-      "integrity": "sha512-AfDTQmClklHCOLxtGoP7HkeMw56k1/bTQjwsfhL6pppo/M4TOBSq+jjBUBLmV/4oeFg4GWMavIl44ZeCtmmZTw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.7.tgz",
-      "integrity": "sha512-VtR8hDy7YLB7+Pet9IarXjg/zgCMSF+1mNS/EQEiEaUPoFXCVsHG64SIxcaaI2zJgRiv+YmgaQESUfWAdbjzgg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.7.tgz",
-      "integrity": "sha512-U3ap1gm5+4edc2Q/P+9VrBNhGkfnf+8ZqppY71Bo/pzZmXhhLdqgaUl6cuB07O1+AQJtCLfaOmswiNbSQ9ivhw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-unicode-property-regex": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.24.7.tgz",
-      "integrity": "sha512-uH2O4OV5M9FZYQrwc7NdVmMxQJOCCzFeYudlZSzUAHRFeOujQefa92E74TQDVskNHCzOXoigEuoyzHDhaEaK5w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-unicode-regex": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.7.tgz",
-      "integrity": "sha512-hlQ96MBZSAXUq7ltkjtu3FJCCSMx/j629ns3hA3pXnBXjanNP0LHi+JpPeA81zaWgVK1VGH95Xuy7u0RyQ8kMg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-unicode-sets-regex": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.24.7.tgz",
-      "integrity": "sha512-2G8aAvF4wy1w/AGZkemprdGMRg5o6zPNhbHVImRz3lss55TYCBd6xStN19rt8XJHq20sqV0JbyWjOWwQRwV/wg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/preset-env": {
-      "version": "7.24.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.24.5.tgz",
-      "integrity": "sha512-UGK2ifKtcC8i5AI4cH+sbLLuLc2ktYSFJgBAXorKAsHUZmrQ1q6aQ6i3BvU24wWs2AAKqQB6kq3N9V9Gw1HiMQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.24.4",
-        "@babel/helper-compilation-targets": "^7.23.6",
-        "@babel/helper-plugin-utils": "^7.24.5",
-        "@babel/helper-validator-option": "^7.23.5",
-        "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.24.5",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.24.1",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.24.1",
-        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.24.1",
-        "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/plugin-syntax-class-properties": "^7.12.13",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-        "@babel/plugin-syntax-import-assertions": "^7.24.1",
-        "@babel/plugin-syntax-import-attributes": "^7.24.1",
-        "@babel/plugin-syntax-import-meta": "^7.10.4",
-        "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
-        "@babel/plugin-syntax-top-level-await": "^7.14.5",
-        "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
-        "@babel/plugin-transform-arrow-functions": "^7.24.1",
-        "@babel/plugin-transform-async-generator-functions": "^7.24.3",
-        "@babel/plugin-transform-async-to-generator": "^7.24.1",
-        "@babel/plugin-transform-block-scoped-functions": "^7.24.1",
-        "@babel/plugin-transform-block-scoping": "^7.24.5",
-        "@babel/plugin-transform-class-properties": "^7.24.1",
-        "@babel/plugin-transform-class-static-block": "^7.24.4",
-        "@babel/plugin-transform-classes": "^7.24.5",
-        "@babel/plugin-transform-computed-properties": "^7.24.1",
-        "@babel/plugin-transform-destructuring": "^7.24.5",
-        "@babel/plugin-transform-dotall-regex": "^7.24.1",
-        "@babel/plugin-transform-duplicate-keys": "^7.24.1",
-        "@babel/plugin-transform-dynamic-import": "^7.24.1",
-        "@babel/plugin-transform-exponentiation-operator": "^7.24.1",
-        "@babel/plugin-transform-export-namespace-from": "^7.24.1",
-        "@babel/plugin-transform-for-of": "^7.24.1",
-        "@babel/plugin-transform-function-name": "^7.24.1",
-        "@babel/plugin-transform-json-strings": "^7.24.1",
-        "@babel/plugin-transform-literals": "^7.24.1",
-        "@babel/plugin-transform-logical-assignment-operators": "^7.24.1",
-        "@babel/plugin-transform-member-expression-literals": "^7.24.1",
-        "@babel/plugin-transform-modules-amd": "^7.24.1",
-        "@babel/plugin-transform-modules-commonjs": "^7.24.1",
-        "@babel/plugin-transform-modules-systemjs": "^7.24.1",
-        "@babel/plugin-transform-modules-umd": "^7.24.1",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
-        "@babel/plugin-transform-new-target": "^7.24.1",
-        "@babel/plugin-transform-nullish-coalescing-operator": "^7.24.1",
-        "@babel/plugin-transform-numeric-separator": "^7.24.1",
-        "@babel/plugin-transform-object-rest-spread": "^7.24.5",
-        "@babel/plugin-transform-object-super": "^7.24.1",
-        "@babel/plugin-transform-optional-catch-binding": "^7.24.1",
-        "@babel/plugin-transform-optional-chaining": "^7.24.5",
-        "@babel/plugin-transform-parameters": "^7.24.5",
-        "@babel/plugin-transform-private-methods": "^7.24.1",
-        "@babel/plugin-transform-private-property-in-object": "^7.24.5",
-        "@babel/plugin-transform-property-literals": "^7.24.1",
-        "@babel/plugin-transform-regenerator": "^7.24.1",
-        "@babel/plugin-transform-reserved-words": "^7.24.1",
-        "@babel/plugin-transform-shorthand-properties": "^7.24.1",
-        "@babel/plugin-transform-spread": "^7.24.1",
-        "@babel/plugin-transform-sticky-regex": "^7.24.1",
-        "@babel/plugin-transform-template-literals": "^7.24.1",
-        "@babel/plugin-transform-typeof-symbol": "^7.24.5",
-        "@babel/plugin-transform-unicode-escapes": "^7.24.1",
-        "@babel/plugin-transform-unicode-property-regex": "^7.24.1",
-        "@babel/plugin-transform-unicode-regex": "^7.24.1",
-        "@babel/plugin-transform-unicode-sets-regex": "^7.24.1",
-        "@babel/preset-modules": "0.1.6-no-external-plugins",
-        "babel-plugin-polyfill-corejs2": "^0.4.10",
-        "babel-plugin-polyfill-corejs3": "^0.10.4",
-        "babel-plugin-polyfill-regenerator": "^0.6.1",
-        "core-js-compat": "^3.31.0",
-        "semver": "^6.3.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/preset-env/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/@babel/preset-modules": {
-      "version": "0.1.6-no-external-plugins",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz",
-      "integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/types": "^7.4.4",
-        "esutils": "^2.0.2"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0"
-      }
-    },
-    "node_modules/@babel/regjsgen": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz",
-      "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==",
-      "dev": true
-    },
-    "node_modules/@babel/runtime": {
-      "version": "7.24.5",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.5.tgz",
-      "integrity": "sha512-Nms86NXrsaeU9vbBJKni6gXiEXZ4CVpYVzEjDH9Sb8vmZ3UljyA1GSOJl/6LGPO8EHLuSF9H+IxNXHPX8QHJ4g==",
-      "dev": true,
-      "dependencies": {
-        "regenerator-runtime": "^0.14.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/template": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.7.tgz",
-      "integrity": "sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.24.7",
-        "@babel/parser": "^7.24.7",
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/traverse": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.7.tgz",
-      "integrity": "sha512-yb65Ed5S/QAcewNPh0nZczy9JdYXkkAbIsEo+P7BE7yO3txAY30Y/oPa3QkQ5It3xVG2kpKMg9MsdxZaO31uKA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.24.7",
-        "@babel/generator": "^7.24.7",
-        "@babel/helper-environment-visitor": "^7.24.7",
-        "@babel/helper-function-name": "^7.24.7",
-        "@babel/helper-hoist-variables": "^7.24.7",
-        "@babel/helper-split-export-declaration": "^7.24.7",
-        "@babel/parser": "^7.24.7",
-        "@babel/types": "^7.24.7",
-        "debug": "^4.3.1",
-        "globals": "^11.1.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/traverse/node_modules/@babel/generator": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.7.tgz",
-      "integrity": "sha512-oipXieGC3i45Y1A41t4tAqpnEZWgB/lC6Ehh6+rOviR5XWpTtMmLN+fGjz9vOiNRt0p6RtO6DtD0pdU3vpqdSA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.24.7",
-        "@jridgewell/gen-mapping": "^0.3.5",
-        "@jridgewell/trace-mapping": "^0.3.25",
-        "jsesc": "^2.5.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/traverse/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz",
-      "integrity": "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/types": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.7.tgz",
-      "integrity": "sha512-XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-string-parser": "^7.24.7",
-        "@babel/helper-validator-identifier": "^7.24.7",
-        "to-fast-properties": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@colors/colors": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
-      "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.1.90"
-      }
-    },
-    "node_modules/@discoveryjs/json-ext": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
-      "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.3.tgz",
-      "integrity": "sha512-yTgnwQpFVYfvvo4SvRFB0SwrW8YjOxEoT7wfMT7Ol5v7v5LDNvSGo67aExmxOb87nQNeWPVvaGBNfQ7BXcrZ9w==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "aix"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-arm": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.3.tgz",
-      "integrity": "sha512-bviJOLMgurLJtF1/mAoJLxDZDL6oU5/ztMHnJQRejbJrSc9FFu0QoUoFhvi6qSKJEw9y5oGyvr9fuDtzJ30rNQ==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-arm64": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.3.tgz",
-      "integrity": "sha512-c+ty9necz3zB1Y+d/N+mC6KVVkGUUOcm4ZmT5i/Fk5arOaY3i6CA3P5wo/7+XzV8cb4GrI/Zjp8NuOQ9Lfsosw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-x64": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.3.tgz",
-      "integrity": "sha512-JReHfYCRK3FVX4Ra+y5EBH1b9e16TV2OxrPAvzMsGeES0X2Ndm9ImQRI4Ket757vhc5XBOuGperw63upesclRw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.3.tgz",
-      "integrity": "sha512-U3fuQ0xNiAkXOmQ6w5dKpEvXQRSpHOnbw7gEfHCRXPeTKW9sBzVck6C5Yneb8LfJm0l6le4NQfkNPnWMSlTFUQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/darwin-x64": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.3.tgz",
-      "integrity": "sha512-3m1CEB7F07s19wmaMNI2KANLcnaqryJxO1fXHUV5j1rWn+wMxdUYoPyO2TnAbfRZdi7ADRwJClmOwgT13qlP3Q==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.3.tgz",
-      "integrity": "sha512-fsNAAl5pU6wmKHq91cHWQT0Fz0vtyE1JauMzKotrwqIKAswwP5cpHUCxZNSTuA/JlqtScq20/5KZ+TxQdovU/g==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.3.tgz",
-      "integrity": "sha512-tci+UJ4zP5EGF4rp8XlZIdq1q1a/1h9XuronfxTMCNBslpCtmk97Q/5qqy1Mu4zIc0yswN/yP/BLX+NTUC1bXA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-arm": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.3.tgz",
-      "integrity": "sha512-f6kz2QpSuyHHg01cDawj0vkyMwuIvN62UAguQfnNVzbge2uWLhA7TCXOn83DT0ZvyJmBI943MItgTovUob36SQ==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-arm64": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.3.tgz",
-      "integrity": "sha512-vvG6R5g5ieB4eCJBQevyDMb31LMHthLpXTc2IGkFnPWS/GzIFDnaYFp558O+XybTmYrVjxnryru7QRleJvmZ6Q==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-ia32": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.3.tgz",
-      "integrity": "sha512-HjCWhH7K96Na+66TacDLJmOI9R8iDWDDiqe17C7znGvvE4sW1ECt9ly0AJ3dJH62jHyVqW9xpxZEU1jKdt+29A==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-loong64": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.3.tgz",
-      "integrity": "sha512-BGpimEccmHBZRcAhdlRIxMp7x9PyJxUtj7apL2IuoG9VxvU/l/v1z015nFs7Si7tXUwEsvjc1rOJdZCn4QTU+Q==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.3.tgz",
-      "integrity": "sha512-5rMOWkp7FQGtAH3QJddP4w3s47iT20hwftqdm7b+loe95o8JU8ro3qZbhgMRy0VuFU0DizymF1pBKkn3YHWtsw==",
-      "cpu": [
-        "mips64el"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.3.tgz",
-      "integrity": "sha512-h0zj1ldel89V5sjPLo5H1SyMzp4VrgN1tPkN29TmjvO1/r0MuMRwJxL8QY05SmfsZRs6TF0c/IDH3u7XYYmbAg==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.3.tgz",
-      "integrity": "sha512-dkAKcTsTJ+CRX6bnO17qDJbLoW37npd5gSNtSzjYQr0svghLJYGYB0NF1SNcU1vDcjXLYS5pO4qOW4YbFama4A==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-s390x": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.3.tgz",
-      "integrity": "sha512-vnD1YUkovEdnZWEuMmy2X2JmzsHQqPpZElXx6dxENcIwTu+Cu5ERax6+Ke1QsE814Zf3c6rxCfwQdCTQ7tPuXA==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-x64": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.3.tgz",
-      "integrity": "sha512-IOXOIm9WaK7plL2gMhsWJd+l2bfrhfilv0uPTptoRoSb2p09RghhQQp9YY6ZJhk/kqmeRt6siRdMSLLwzuT0KQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.3.tgz",
-      "integrity": "sha512-uTgCwsvQ5+vCQnqM//EfDSuomo2LhdWhFPS8VL8xKf+PKTCrcT/2kPPoWMTs22aB63MLdGMJiE3f1PHvCDmUOw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.3.tgz",
-      "integrity": "sha512-vNAkR17Ub2MgEud2Wag/OE4HTSI6zlb291UYzHez/psiKarp0J8PKGDnAhMBcHFoOHMXHfExzmjMojJNbAStrQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/sunos-x64": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.3.tgz",
-      "integrity": "sha512-W8H9jlGiSBomkgmouaRoTXo49j4w4Kfbl6I1bIdO/vT0+0u4f20ko3ELzV3hPI6XV6JNBVX+8BC+ajHkvffIJA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-arm64": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.3.tgz",
-      "integrity": "sha512-EjEomwyLSCg8Ag3LDILIqYCZAq/y3diJ04PnqGRgq8/4O3VNlXyMd54j/saShaN4h5o5mivOjAzmU6C3X4v0xw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-ia32": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.3.tgz",
-      "integrity": "sha512-WGiE/GgbsEwR33++5rzjiYsKyHywE8QSZPF7Rfx9EBfK3Qn3xyR6IjyCr5Uk38Kg8fG4/2phN7sXp4NPWd3fcw==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-x64": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.3.tgz",
-      "integrity": "sha512-xRxC0jaJWDLYvcUvjQmHCJSfMrgmUuvsoXgDeU/wTorQ1ngDdUBuFtgY3W1Pc5sprGAvZBtWdJX7RPg/iZZUqA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@inquirer/figures": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.3.tgz",
-      "integrity": "sha512-ErXXzENMH5pJt5/ssXV0DfWUZqly8nGzf0UcBV9xTnP+KyffE2mqyxIMBrZ8ijQck2nU0TQm40EQB53YreyWHw==",
-      "dev": true,
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@isaacs/cliui": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
-      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^5.1.2",
-        "string-width-cjs": "npm:string-width@^4.2.0",
-        "strip-ansi": "^7.0.1",
-        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
-        "wrap-ansi": "^8.1.0",
-        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
-      }
-    },
-    "node_modules/@isaacs/cliui/node_modules/ansi-styles": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
-      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@isaacs/cliui/node_modules/emoji-regex": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-      "dev": true
-    },
-    "node_modules/@isaacs/cliui/node_modules/string-width": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
-      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
-      "dev": true,
-      "dependencies": {
-        "eastasianwidth": "^0.2.0",
-        "emoji-regex": "^9.2.2",
-        "strip-ansi": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
-      }
-    },
-    "node_modules/@isaacs/cliui/node_modules/wrap-ansi": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
-      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^6.1.0",
-        "string-width": "^5.0.1",
-        "strip-ansi": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
-    "node_modules/@istanbuljs/schema": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
-      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
-      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/set-array": "^1.2.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.24"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/resolve-uri": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
-      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/set-array": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
-      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/source-map": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
-      "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/gen-mapping": "^0.3.5",
-        "@jridgewell/trace-mapping": "^0.3.25"
-      }
-    },
-    "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.15",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
-      "dev": true
-    },
-    "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.25",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
-      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/resolve-uri": "^3.1.0",
-        "@jridgewell/sourcemap-codec": "^1.4.14"
-      }
-    },
-    "node_modules/@jsonjoy.com/base64": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@jsonjoy.com/base64/-/base64-1.1.2.tgz",
-      "integrity": "sha512-q6XAnWQDIMA3+FTiOYajoYqySkO+JSat0ytXGSuRdq9uXE7o92gzuQwQM14xaCRlBLGq3v5miDGC4vkVTn54xA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/streamich"
-      },
-      "peerDependencies": {
-        "tslib": "2"
-      }
-    },
-    "node_modules/@jsonjoy.com/json-pack": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@jsonjoy.com/json-pack/-/json-pack-1.0.4.tgz",
-      "integrity": "sha512-aOcSN4MeAtFROysrbqG137b7gaDDSmVrl5mpo6sT/w+kcXpWnzhMjmY/Fh/sDx26NBxyIE7MB1seqLeCAzy9Sg==",
-      "dev": true,
-      "dependencies": {
-        "@jsonjoy.com/base64": "^1.1.1",
-        "@jsonjoy.com/util": "^1.1.2",
-        "hyperdyperid": "^1.2.0",
-        "thingies": "^1.20.0"
-      },
-      "engines": {
-        "node": ">=10.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/streamich"
-      },
-      "peerDependencies": {
-        "tslib": "2"
-      }
-    },
-    "node_modules/@jsonjoy.com/util": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@jsonjoy.com/util/-/util-1.2.0.tgz",
-      "integrity": "sha512-4B8B+3vFsY4eo33DMKyJPlQ3sBMpPFUZK2dr3O3rXrOGKKbYG44J0XSFkDo1VOQiri5HFEhIeVvItjR2xcazmg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/streamich"
-      },
-      "peerDependencies": {
-        "tslib": "2"
-      }
-    },
-    "node_modules/@leichtgewicht/ip-codec": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.5.tgz",
-      "integrity": "sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw==",
-      "dev": true
-    },
-    "node_modules/@ljharb/through": {
-      "version": "2.3.13",
-      "resolved": "https://registry.npmjs.org/@ljharb/through/-/through-2.3.13.tgz",
-      "integrity": "sha512-/gKJun8NNiWGZJkGzI/Ragc53cOdcLNdzjLaIa+GEjguQs0ulsurx8WN0jijdK9yPqDvziX995sMRLyLt1uZMQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/@lmdb/lmdb-darwin-arm64": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-darwin-arm64/-/lmdb-darwin-arm64-3.0.8.tgz",
-      "integrity": "sha512-+lFwFvU+zQ9zVIFETNtmW++syh3Ps5JS8MPQ8zOYtQZoU+dTR8ivWHTaE2QVk1JG2payGDLUAvpndLAjGMdeeA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@lmdb/lmdb-darwin-x64": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-darwin-x64/-/lmdb-darwin-x64-3.0.8.tgz",
-      "integrity": "sha512-T98rfsgfdQMS5/mqdsPb6oHSJ+iBYNa+PQDLtXLh6rzTEBsYP9x2uXxIj6VS4qXVDWXVi8rv85NCOG+UBOsHXQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@lmdb/lmdb-linux-arm": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-arm/-/lmdb-linux-arm-3.0.8.tgz",
-      "integrity": "sha512-gVNCi3bYWatdPMeFpFjuZl6bzVL55FkeZU3sPeU+NsMRXC+Zl3qOx3M6cM4OMlJWbhHjYjf2b8q83K0mczaiWQ==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@lmdb/lmdb-linux-arm64": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-arm64/-/lmdb-linux-arm64-3.0.8.tgz",
-      "integrity": "sha512-uEBGCQIChsixpykL0pjCxfF64btv64vzsb1NoM5u0qvabKvKEvErhXGoqovyldDu9u1T/fswD8Kf6ih0vJEvDQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@lmdb/lmdb-linux-x64": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-x64/-/lmdb-linux-x64-3.0.8.tgz",
-      "integrity": "sha512-6v0B4sa9ulNezmDZtVpLjNHmA0qZzUl3001YJ2RF0naxsuv/Jq/xEwNYpOzfcdizHfpCE0oBkWzk/r+Slr+0zw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@lmdb/lmdb-win32-x64": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-win32-x64/-/lmdb-win32-x64-3.0.8.tgz",
-      "integrity": "sha512-lDLGRIMqdwYD39vinwNqqZUxCdL2m2iIdn+0HyQgIHEiT0g5rIAlzaMKzoGWon5NQumfxXFk9y0DarttkR7C1w==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@material/animation": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/animation/-/animation-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-1GSJaPKef+7HRuV+HusVZHps64cmZuOItDbt40tjJVaikcaZvwmHlcTxRIqzcRoCdt5ZKHh3NoO7GB9Khg4Jnw==",
-      "dependencies": {
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/auto-init": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/auto-init/-/auto-init-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-t7ZGpRJ3ec0QDUO0nJu/SMgLW7qcuG2KqIsEYD1Ej8qhI2xpdR2ydSDQOkVEitXmKoGol1oq4nYSBjTlB65GqA==",
-      "dependencies": {
-        "@material/base": "15.0.0-canary.7f224ddd4.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/banner": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/banner/-/banner-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-g9wBUZzYBizyBcBQXTIafnRUUPi7efU9gPJfzeGgkynXiccP/vh5XMmH+PBxl5v+4MlP/d4cZ2NUYoAN7UTqSA==",
-      "dependencies": {
-        "@material/base": "15.0.0-canary.7f224ddd4.0",
-        "@material/button": "15.0.0-canary.7f224ddd4.0",
-        "@material/dom": "15.0.0-canary.7f224ddd4.0",
-        "@material/elevation": "15.0.0-canary.7f224ddd4.0",
-        "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0",
-        "@material/ripple": "15.0.0-canary.7f224ddd4.0",
-        "@material/rtl": "15.0.0-canary.7f224ddd4.0",
-        "@material/shape": "15.0.0-canary.7f224ddd4.0",
-        "@material/theme": "15.0.0-canary.7f224ddd4.0",
-        "@material/tokens": "15.0.0-canary.7f224ddd4.0",
-        "@material/typography": "15.0.0-canary.7f224ddd4.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/base": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/base/-/base-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-I9KQOKXpLfJkP8MqZyr8wZIzdPHrwPjFvGd9zSK91/vPyE4hzHRJc/0njsh9g8Lm9PRYLbifXX+719uTbHxx+A==",
-      "dependencies": {
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/button": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/button/-/button-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-BHB7iyHgRVH+JF16+iscR+Qaic+p7LU1FOLgP8KucRlpF9tTwIxQA6mJwGRi5gUtcG+vyCmzVS+hIQ6DqT/7BA==",
-      "dependencies": {
-        "@material/density": "15.0.0-canary.7f224ddd4.0",
-        "@material/dom": "15.0.0-canary.7f224ddd4.0",
-        "@material/elevation": "15.0.0-canary.7f224ddd4.0",
-        "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0",
-        "@material/focus-ring": "15.0.0-canary.7f224ddd4.0",
-        "@material/ripple": "15.0.0-canary.7f224ddd4.0",
-        "@material/rtl": "15.0.0-canary.7f224ddd4.0",
-        "@material/shape": "15.0.0-canary.7f224ddd4.0",
-        "@material/theme": "15.0.0-canary.7f224ddd4.0",
-        "@material/tokens": "15.0.0-canary.7f224ddd4.0",
-        "@material/touch-target": "15.0.0-canary.7f224ddd4.0",
-        "@material/typography": "15.0.0-canary.7f224ddd4.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/card": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/card/-/card-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-kt7y9/IWOtJTr3Z/AoWJT3ZLN7CLlzXhx2udCLP9ootZU2bfGK0lzNwmo80bv/pJfrY9ihQKCtuGTtNxUy+vIw==",
-      "dependencies": {
-        "@material/dom": "15.0.0-canary.7f224ddd4.0",
-        "@material/elevation": "15.0.0-canary.7f224ddd4.0",
-        "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0",
-        "@material/ripple": "15.0.0-canary.7f224ddd4.0",
-        "@material/rtl": "15.0.0-canary.7f224ddd4.0",
-        "@material/shape": "15.0.0-canary.7f224ddd4.0",
-        "@material/theme": "15.0.0-canary.7f224ddd4.0",
-        "@material/tokens": "15.0.0-canary.7f224ddd4.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/checkbox": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/checkbox/-/checkbox-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-rURcrL5O1u6hzWR+dNgiQ/n89vk6tdmdP3mZgnxJx61q4I/k1yijKqNJSLrkXH7Rto3bM5NRKMOlgvMvVd7UMQ==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.7f224ddd4.0",
-        "@material/base": "15.0.0-canary.7f224ddd4.0",
-        "@material/density": "15.0.0-canary.7f224ddd4.0",
-        "@material/dom": "15.0.0-canary.7f224ddd4.0",
-        "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0",
-        "@material/focus-ring": "15.0.0-canary.7f224ddd4.0",
-        "@material/ripple": "15.0.0-canary.7f224ddd4.0",
-        "@material/rtl": "15.0.0-canary.7f224ddd4.0",
-        "@material/theme": "15.0.0-canary.7f224ddd4.0",
-        "@material/touch-target": "15.0.0-canary.7f224ddd4.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/chips": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/chips/-/chips-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-AYAivV3GSk/T/nRIpH27sOHFPaSMrE3L0WYbnb5Wa93FgY8a0fbsFYtSH2QmtwnzXveg+B1zGTt7/xIIcynKdQ==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.7f224ddd4.0",
-        "@material/base": "15.0.0-canary.7f224ddd4.0",
-        "@material/checkbox": "15.0.0-canary.7f224ddd4.0",
-        "@material/density": "15.0.0-canary.7f224ddd4.0",
-        "@material/dom": "15.0.0-canary.7f224ddd4.0",
-        "@material/elevation": "15.0.0-canary.7f224ddd4.0",
-        "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0",
-        "@material/focus-ring": "15.0.0-canary.7f224ddd4.0",
-        "@material/ripple": "15.0.0-canary.7f224ddd4.0",
-        "@material/rtl": "15.0.0-canary.7f224ddd4.0",
-        "@material/shape": "15.0.0-canary.7f224ddd4.0",
-        "@material/theme": "15.0.0-canary.7f224ddd4.0",
-        "@material/tokens": "15.0.0-canary.7f224ddd4.0",
-        "@material/touch-target": "15.0.0-canary.7f224ddd4.0",
-        "@material/typography": "15.0.0-canary.7f224ddd4.0",
-        "safevalues": "^0.3.4",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/circular-progress": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/circular-progress/-/circular-progress-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-DJrqCKb+LuGtjNvKl8XigvyK02y36GRkfhMUYTcJEi3PrOE00bwXtyj7ilhzEVshQiXg6AHGWXtf5UqwNrx3Ow==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.7f224ddd4.0",
-        "@material/base": "15.0.0-canary.7f224ddd4.0",
-        "@material/dom": "15.0.0-canary.7f224ddd4.0",
-        "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0",
-        "@material/progress-indicator": "15.0.0-canary.7f224ddd4.0",
-        "@material/rtl": "15.0.0-canary.7f224ddd4.0",
-        "@material/theme": "15.0.0-canary.7f224ddd4.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/data-table": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/data-table/-/data-table-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-/2WZsuBIq9z9RWYF5Jo6b7P6u0fwit+29/mN7rmAZ6akqUR54nXyNfoSNiyydMkzPlZZsep5KrSHododDhBZbA==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.7f224ddd4.0",
-        "@material/base": "15.0.0-canary.7f224ddd4.0",
-        "@material/checkbox": "15.0.0-canary.7f224ddd4.0",
-        "@material/density": "15.0.0-canary.7f224ddd4.0",
-        "@material/dom": "15.0.0-canary.7f224ddd4.0",
-        "@material/elevation": "15.0.0-canary.7f224ddd4.0",
-        "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0",
-        "@material/icon-button": "15.0.0-canary.7f224ddd4.0",
-        "@material/linear-progress": "15.0.0-canary.7f224ddd4.0",
-        "@material/list": "15.0.0-canary.7f224ddd4.0",
-        "@material/menu": "15.0.0-canary.7f224ddd4.0",
-        "@material/rtl": "15.0.0-canary.7f224ddd4.0",
-        "@material/select": "15.0.0-canary.7f224ddd4.0",
-        "@material/shape": "15.0.0-canary.7f224ddd4.0",
-        "@material/theme": "15.0.0-canary.7f224ddd4.0",
-        "@material/tokens": "15.0.0-canary.7f224ddd4.0",
-        "@material/touch-target": "15.0.0-canary.7f224ddd4.0",
-        "@material/typography": "15.0.0-canary.7f224ddd4.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/density": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/density/-/density-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-o9EXmGKVpiQ6mHhyV3oDDzc78Ow3E7v8dlaOhgaDSXgmqaE8v5sIlLNa/LKSyUga83/fpGk3QViSGXotpQx0jA==",
-      "dependencies": {
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/dialog": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/dialog/-/dialog-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-u0XpTlv1JqWC/bQ3DavJ1JguofTelLT2wloj59l3/1b60jv42JQ6Am7jU3I8/SIUB1MKaW7dYocXjDWtWJakLA==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.7f224ddd4.0",
-        "@material/base": "15.0.0-canary.7f224ddd4.0",
-        "@material/button": "15.0.0-canary.7f224ddd4.0",
-        "@material/dom": "15.0.0-canary.7f224ddd4.0",
-        "@material/elevation": "15.0.0-canary.7f224ddd4.0",
-        "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0",
-        "@material/icon-button": "15.0.0-canary.7f224ddd4.0",
-        "@material/ripple": "15.0.0-canary.7f224ddd4.0",
-        "@material/rtl": "15.0.0-canary.7f224ddd4.0",
-        "@material/shape": "15.0.0-canary.7f224ddd4.0",
-        "@material/theme": "15.0.0-canary.7f224ddd4.0",
-        "@material/tokens": "15.0.0-canary.7f224ddd4.0",
-        "@material/touch-target": "15.0.0-canary.7f224ddd4.0",
-        "@material/typography": "15.0.0-canary.7f224ddd4.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/dom": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/dom/-/dom-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-mQ1HT186GPQSkRg5S18i70typ5ZytfjL09R0gJ2Qg5/G+MLCGi7TAjZZSH65tuD/QGOjel4rDdWOTmYbPYV6HA==",
-      "dependencies": {
-        "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0",
-        "@material/rtl": "15.0.0-canary.7f224ddd4.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/drawer": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/drawer/-/drawer-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-qyO0W0KBftfH8dlLR0gVAgv7ZHNvU8ae11Ao6zJif/YxcvK4+gph1z8AO4H410YmC2kZiwpSKyxM1iQCCzbb4g==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.7f224ddd4.0",
-        "@material/base": "15.0.0-canary.7f224ddd4.0",
-        "@material/dom": "15.0.0-canary.7f224ddd4.0",
-        "@material/elevation": "15.0.0-canary.7f224ddd4.0",
-        "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0",
-        "@material/list": "15.0.0-canary.7f224ddd4.0",
-        "@material/ripple": "15.0.0-canary.7f224ddd4.0",
-        "@material/rtl": "15.0.0-canary.7f224ddd4.0",
-        "@material/shape": "15.0.0-canary.7f224ddd4.0",
-        "@material/theme": "15.0.0-canary.7f224ddd4.0",
-        "@material/typography": "15.0.0-canary.7f224ddd4.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/elevation": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/elevation/-/elevation-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-tV6s4/pUBECedaI36Yj18KmRCk1vfue/JP/5yYRlFNnLMRVISePbZaKkn/BHXVf+26I3W879+XqIGlDVdmOoMA==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.7f224ddd4.0",
-        "@material/base": "15.0.0-canary.7f224ddd4.0",
-        "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0",
-        "@material/rtl": "15.0.0-canary.7f224ddd4.0",
-        "@material/theme": "15.0.0-canary.7f224ddd4.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/fab": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/fab/-/fab-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-4h76QrzfZTcPdd+awDPZ4Q0YdSqsXQnS540TPtyXUJ/5G99V6VwGpjMPIxAsW0y+pmI9UkLL/srrMaJec+7r4Q==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.7f224ddd4.0",
-        "@material/dom": "15.0.0-canary.7f224ddd4.0",
-        "@material/elevation": "15.0.0-canary.7f224ddd4.0",
-        "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0",
-        "@material/focus-ring": "15.0.0-canary.7f224ddd4.0",
-        "@material/ripple": "15.0.0-canary.7f224ddd4.0",
-        "@material/rtl": "15.0.0-canary.7f224ddd4.0",
-        "@material/shape": "15.0.0-canary.7f224ddd4.0",
-        "@material/theme": "15.0.0-canary.7f224ddd4.0",
-        "@material/tokens": "15.0.0-canary.7f224ddd4.0",
-        "@material/touch-target": "15.0.0-canary.7f224ddd4.0",
-        "@material/typography": "15.0.0-canary.7f224ddd4.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/feature-targeting": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/feature-targeting/-/feature-targeting-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-SAjtxYh6YlKZriU83diDEQ7jNSP2MnxKsER0TvFeyG1vX/DWsUyYDOIJTOEa9K1N+fgJEBkNK8hY55QhQaspew==",
-      "dependencies": {
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/floating-label": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/floating-label/-/floating-label-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-0KMo5ijjYaEHPiZ2pCVIcbaTS2LycvH9zEhEMKwPPGssBCX7iz5ffYQFk7e5yrQand1r3jnQQgYfHAwtykArnQ==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.7f224ddd4.0",
-        "@material/base": "15.0.0-canary.7f224ddd4.0",
-        "@material/dom": "15.0.0-canary.7f224ddd4.0",
-        "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0",
-        "@material/rtl": "15.0.0-canary.7f224ddd4.0",
-        "@material/theme": "15.0.0-canary.7f224ddd4.0",
-        "@material/typography": "15.0.0-canary.7f224ddd4.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/focus-ring": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/focus-ring/-/focus-ring-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-Jmg1nltq4J6S6A10EGMZnvufrvU3YTi+8R8ZD9lkSbun0Fm2TVdICQt/Auyi6An9zP66oQN6c31eqO6KfIPsDg==",
-      "dependencies": {
-        "@material/dom": "15.0.0-canary.7f224ddd4.0",
-        "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0",
-        "@material/rtl": "15.0.0-canary.7f224ddd4.0"
-      }
-    },
-    "node_modules/@material/form-field": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/form-field/-/form-field-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-fEPWgDQEPJ6WF7hNnIStxucHR9LE4DoDSMqCsGWS2Yu+NLZYLuCEecgR0UqQsl1EQdNRaFh8VH93KuxGd2hiPg==",
-      "dependencies": {
-        "@material/base": "15.0.0-canary.7f224ddd4.0",
-        "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0",
-        "@material/ripple": "15.0.0-canary.7f224ddd4.0",
-        "@material/rtl": "15.0.0-canary.7f224ddd4.0",
-        "@material/theme": "15.0.0-canary.7f224ddd4.0",
-        "@material/typography": "15.0.0-canary.7f224ddd4.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/icon-button": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/icon-button/-/icon-button-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-DcK7IL4ICY/DW+48YQZZs9g0U1kRaW0Wb0BxhvppDMYziHo/CTpFdle4gjyuTyRxPOdHQz5a97ru48Z9O4muTw==",
-      "dependencies": {
-        "@material/base": "15.0.0-canary.7f224ddd4.0",
-        "@material/density": "15.0.0-canary.7f224ddd4.0",
-        "@material/dom": "15.0.0-canary.7f224ddd4.0",
-        "@material/elevation": "15.0.0-canary.7f224ddd4.0",
-        "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0",
-        "@material/focus-ring": "15.0.0-canary.7f224ddd4.0",
-        "@material/ripple": "15.0.0-canary.7f224ddd4.0",
-        "@material/rtl": "15.0.0-canary.7f224ddd4.0",
-        "@material/theme": "15.0.0-canary.7f224ddd4.0",
-        "@material/touch-target": "15.0.0-canary.7f224ddd4.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/image-list": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/image-list/-/image-list-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-voMjG2p80XbjL1B2lmF65zO5gEgJOVKClLdqh4wbYzYfwY/SR9c8eLvlYG7DLdFaFBl/7gGxD8TvvZ329HUFPw==",
-      "dependencies": {
-        "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0",
-        "@material/shape": "15.0.0-canary.7f224ddd4.0",
-        "@material/theme": "15.0.0-canary.7f224ddd4.0",
-        "@material/typography": "15.0.0-canary.7f224ddd4.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/layout-grid": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/layout-grid/-/layout-grid-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-veDABLxMn2RmvfnUO2RUmC1OFfWr4cU+MrxKPoDD2hl3l3eDYv5fxws6r5T1JoSyXoaN+oEZpheS0+M9Ure8Pg==",
-      "dependencies": {
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/line-ripple": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/line-ripple/-/line-ripple-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-f60hVJhIU6I3/17Tqqzch1emUKEcfVVgHVqADbU14JD+oEIz429ZX9ksZ3VChoU3+eejFl+jVdZMLE/LrAuwpg==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.7f224ddd4.0",
-        "@material/base": "15.0.0-canary.7f224ddd4.0",
-        "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0",
-        "@material/theme": "15.0.0-canary.7f224ddd4.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/linear-progress": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/linear-progress/-/linear-progress-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-pRDEwPQielDiC9Sc5XhCXrGxP8wWOnAO8sQlMebfBYHYqy5hhiIzibezS8CSaW4MFQFyXmCmpmqWlbqGYRmiyg==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.7f224ddd4.0",
-        "@material/base": "15.0.0-canary.7f224ddd4.0",
-        "@material/dom": "15.0.0-canary.7f224ddd4.0",
-        "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0",
-        "@material/progress-indicator": "15.0.0-canary.7f224ddd4.0",
-        "@material/rtl": "15.0.0-canary.7f224ddd4.0",
-        "@material/theme": "15.0.0-canary.7f224ddd4.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/list": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/list/-/list-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-Is0NV91sJlXF5pOebYAtWLF4wU2MJDbYqztML/zQNENkQxDOvEXu3nWNb3YScMIYJJXvARO0Liur5K4yPagS1Q==",
-      "dependencies": {
-        "@material/base": "15.0.0-canary.7f224ddd4.0",
-        "@material/density": "15.0.0-canary.7f224ddd4.0",
-        "@material/dom": "15.0.0-canary.7f224ddd4.0",
-        "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0",
-        "@material/ripple": "15.0.0-canary.7f224ddd4.0",
-        "@material/rtl": "15.0.0-canary.7f224ddd4.0",
-        "@material/shape": "15.0.0-canary.7f224ddd4.0",
-        "@material/theme": "15.0.0-canary.7f224ddd4.0",
-        "@material/tokens": "15.0.0-canary.7f224ddd4.0",
-        "@material/typography": "15.0.0-canary.7f224ddd4.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/menu": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/menu/-/menu-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-D11QU1dXqLbh5X1zKlEhS3QWh0b5BPNXlafc5MXfkdJHhOiieb7LC9hMJhbrHtj24FadJ7evaFW/T2ugJbJNnQ==",
-      "dependencies": {
-        "@material/base": "15.0.0-canary.7f224ddd4.0",
-        "@material/dom": "15.0.0-canary.7f224ddd4.0",
-        "@material/elevation": "15.0.0-canary.7f224ddd4.0",
-        "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0",
-        "@material/list": "15.0.0-canary.7f224ddd4.0",
-        "@material/menu-surface": "15.0.0-canary.7f224ddd4.0",
-        "@material/ripple": "15.0.0-canary.7f224ddd4.0",
-        "@material/rtl": "15.0.0-canary.7f224ddd4.0",
-        "@material/shape": "15.0.0-canary.7f224ddd4.0",
-        "@material/theme": "15.0.0-canary.7f224ddd4.0",
-        "@material/tokens": "15.0.0-canary.7f224ddd4.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/menu-surface": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/menu-surface/-/menu-surface-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-7RZHvw0gbwppaAJ/Oh5SWmfAKJ62aw1IMB3+3MRwsb5PLoV666wInYa+zJfE4i7qBeOn904xqT2Nko5hY0ssrg==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.7f224ddd4.0",
-        "@material/base": "15.0.0-canary.7f224ddd4.0",
-        "@material/elevation": "15.0.0-canary.7f224ddd4.0",
-        "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0",
-        "@material/rtl": "15.0.0-canary.7f224ddd4.0",
-        "@material/shape": "15.0.0-canary.7f224ddd4.0",
-        "@material/theme": "15.0.0-canary.7f224ddd4.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/notched-outline": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/notched-outline/-/notched-outline-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-Yg2usuKB2DKlKIBISbie9BFsOVuffF71xjbxPbybvqemxqUBd+bD5/t6H1fLE+F8/NCu5JMigho4ewUU+0RCiw==",
-      "dependencies": {
-        "@material/base": "15.0.0-canary.7f224ddd4.0",
-        "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0",
-        "@material/floating-label": "15.0.0-canary.7f224ddd4.0",
-        "@material/rtl": "15.0.0-canary.7f224ddd4.0",
-        "@material/shape": "15.0.0-canary.7f224ddd4.0",
-        "@material/theme": "15.0.0-canary.7f224ddd4.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/progress-indicator": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/progress-indicator/-/progress-indicator-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-UPbDjE5CqT+SqTs0mNFG6uFEw7wBlgYmh+noSkQ6ty/EURm8lF125dmi4dv4kW0+octonMXqkGtAoZwLIHKf/w==",
-      "dependencies": {
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/radio": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/radio/-/radio-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-wR1X0Sr0KmQLu6+YOFKAI84G3L6psqd7Kys5kfb8WKBM36zxO5HQXC5nJm/Y0rdn22ixzsIz2GBo0MNU4V4k1A==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.7f224ddd4.0",
-        "@material/base": "15.0.0-canary.7f224ddd4.0",
-        "@material/density": "15.0.0-canary.7f224ddd4.0",
-        "@material/dom": "15.0.0-canary.7f224ddd4.0",
-        "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0",
-        "@material/focus-ring": "15.0.0-canary.7f224ddd4.0",
-        "@material/ripple": "15.0.0-canary.7f224ddd4.0",
-        "@material/theme": "15.0.0-canary.7f224ddd4.0",
-        "@material/touch-target": "15.0.0-canary.7f224ddd4.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/ripple": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/ripple/-/ripple-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-JqOsWM1f4aGdotP0rh1vZlPZTg6lZgh39FIYHFMfOwfhR+LAikUJ+37ciqZuewgzXB6iiRO6a8aUH6HR5SJYPg==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.7f224ddd4.0",
-        "@material/base": "15.0.0-canary.7f224ddd4.0",
-        "@material/dom": "15.0.0-canary.7f224ddd4.0",
-        "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0",
-        "@material/rtl": "15.0.0-canary.7f224ddd4.0",
-        "@material/theme": "15.0.0-canary.7f224ddd4.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/rtl": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/rtl/-/rtl-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-UVf14qAtmPiaaZjuJtmN36HETyoKWmsZM/qn1L5ciR2URb8O035dFWnz4ZWFMmAYBno/L7JiZaCkPurv2ZNrGA==",
-      "dependencies": {
-        "@material/theme": "15.0.0-canary.7f224ddd4.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/segmented-button": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/segmented-button/-/segmented-button-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-LCnVRUSAhELTKI/9hSvyvIvQIpPpqF29BV+O9yM4WoNNmNWqTulvuiv7grHZl6Z+kJuxSg4BGbsPxxb9dXozPg==",
-      "dependencies": {
-        "@material/base": "15.0.0-canary.7f224ddd4.0",
-        "@material/elevation": "15.0.0-canary.7f224ddd4.0",
-        "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0",
-        "@material/ripple": "15.0.0-canary.7f224ddd4.0",
-        "@material/theme": "15.0.0-canary.7f224ddd4.0",
-        "@material/touch-target": "15.0.0-canary.7f224ddd4.0",
-        "@material/typography": "15.0.0-canary.7f224ddd4.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/select": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/select/-/select-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-WioZtQEXRpglum0cMSzSqocnhsGRr+ZIhvKb3FlaNrTaK8H3Y4QA7rVjv3emRtrLOOjaT6/RiIaUMTo9AGzWQQ==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.7f224ddd4.0",
-        "@material/base": "15.0.0-canary.7f224ddd4.0",
-        "@material/density": "15.0.0-canary.7f224ddd4.0",
-        "@material/dom": "15.0.0-canary.7f224ddd4.0",
-        "@material/elevation": "15.0.0-canary.7f224ddd4.0",
-        "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0",
-        "@material/floating-label": "15.0.0-canary.7f224ddd4.0",
-        "@material/line-ripple": "15.0.0-canary.7f224ddd4.0",
-        "@material/list": "15.0.0-canary.7f224ddd4.0",
-        "@material/menu": "15.0.0-canary.7f224ddd4.0",
-        "@material/menu-surface": "15.0.0-canary.7f224ddd4.0",
-        "@material/notched-outline": "15.0.0-canary.7f224ddd4.0",
-        "@material/ripple": "15.0.0-canary.7f224ddd4.0",
-        "@material/rtl": "15.0.0-canary.7f224ddd4.0",
-        "@material/shape": "15.0.0-canary.7f224ddd4.0",
-        "@material/theme": "15.0.0-canary.7f224ddd4.0",
-        "@material/tokens": "15.0.0-canary.7f224ddd4.0",
-        "@material/typography": "15.0.0-canary.7f224ddd4.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/shape": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/shape/-/shape-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-8z8l1W3+cymObunJoRhwFPKZ+FyECfJ4MJykNiaZq7XJFZkV6xNmqAVrrbQj93FtLsECn9g4PjjIomguVn/OEw==",
-      "dependencies": {
-        "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0",
-        "@material/rtl": "15.0.0-canary.7f224ddd4.0",
-        "@material/theme": "15.0.0-canary.7f224ddd4.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/slider": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/slider/-/slider-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-QU/WSaSWlLKQRqOhJrPgm29wqvvzRusMqwAcrCh1JTrCl+xwJ43q5WLDfjYhubeKtrEEgGu9tekkAiYfMG7EBw==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.7f224ddd4.0",
-        "@material/base": "15.0.0-canary.7f224ddd4.0",
-        "@material/dom": "15.0.0-canary.7f224ddd4.0",
-        "@material/elevation": "15.0.0-canary.7f224ddd4.0",
-        "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0",
-        "@material/ripple": "15.0.0-canary.7f224ddd4.0",
-        "@material/rtl": "15.0.0-canary.7f224ddd4.0",
-        "@material/theme": "15.0.0-canary.7f224ddd4.0",
-        "@material/tokens": "15.0.0-canary.7f224ddd4.0",
-        "@material/typography": "15.0.0-canary.7f224ddd4.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/snackbar": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/snackbar/-/snackbar-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-sm7EbVKddaXpT/aXAYBdPoN0k8yeg9+dprgBUkrdqGzWJAeCkxb4fv2B3He88YiCtvkTz2KLY4CThPQBSEsMFQ==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.7f224ddd4.0",
-        "@material/base": "15.0.0-canary.7f224ddd4.0",
-        "@material/button": "15.0.0-canary.7f224ddd4.0",
-        "@material/dom": "15.0.0-canary.7f224ddd4.0",
-        "@material/elevation": "15.0.0-canary.7f224ddd4.0",
-        "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0",
-        "@material/icon-button": "15.0.0-canary.7f224ddd4.0",
-        "@material/ripple": "15.0.0-canary.7f224ddd4.0",
-        "@material/rtl": "15.0.0-canary.7f224ddd4.0",
-        "@material/shape": "15.0.0-canary.7f224ddd4.0",
-        "@material/theme": "15.0.0-canary.7f224ddd4.0",
-        "@material/tokens": "15.0.0-canary.7f224ddd4.0",
-        "@material/typography": "15.0.0-canary.7f224ddd4.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/switch": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/switch/-/switch-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-lEDJfRvkVyyeHWIBfoxYjJVl+WlEAE2kZ/+6OqB1FW0OV8ftTODZGhHRSzjVBA1/p4FPuhAtKtoK9jTpa4AZjA==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.7f224ddd4.0",
-        "@material/base": "15.0.0-canary.7f224ddd4.0",
-        "@material/density": "15.0.0-canary.7f224ddd4.0",
-        "@material/dom": "15.0.0-canary.7f224ddd4.0",
-        "@material/elevation": "15.0.0-canary.7f224ddd4.0",
-        "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0",
-        "@material/focus-ring": "15.0.0-canary.7f224ddd4.0",
-        "@material/ripple": "15.0.0-canary.7f224ddd4.0",
-        "@material/rtl": "15.0.0-canary.7f224ddd4.0",
-        "@material/shape": "15.0.0-canary.7f224ddd4.0",
-        "@material/theme": "15.0.0-canary.7f224ddd4.0",
-        "@material/tokens": "15.0.0-canary.7f224ddd4.0",
-        "safevalues": "^0.3.4",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/tab": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/tab/-/tab-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-E1xGACImyCLurhnizyOTCgOiVezce4HlBFAI6YhJo/AyVwjN2Dtas4ZLQMvvWWqpyhITNkeYdOchwCC1mrz3AQ==",
-      "dependencies": {
-        "@material/base": "15.0.0-canary.7f224ddd4.0",
-        "@material/elevation": "15.0.0-canary.7f224ddd4.0",
-        "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0",
-        "@material/focus-ring": "15.0.0-canary.7f224ddd4.0",
-        "@material/ripple": "15.0.0-canary.7f224ddd4.0",
-        "@material/rtl": "15.0.0-canary.7f224ddd4.0",
-        "@material/tab-indicator": "15.0.0-canary.7f224ddd4.0",
-        "@material/theme": "15.0.0-canary.7f224ddd4.0",
-        "@material/tokens": "15.0.0-canary.7f224ddd4.0",
-        "@material/typography": "15.0.0-canary.7f224ddd4.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/tab-bar": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/tab-bar/-/tab-bar-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-p1Asb2NzrcECvAQU3b2SYrpyJGyJLQWR+nXTYzDKE8WOpLIRCXap2audNqD7fvN/A20UJ1J8U01ptrvCkwJ4eA==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.7f224ddd4.0",
-        "@material/base": "15.0.0-canary.7f224ddd4.0",
-        "@material/density": "15.0.0-canary.7f224ddd4.0",
-        "@material/elevation": "15.0.0-canary.7f224ddd4.0",
-        "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0",
-        "@material/tab": "15.0.0-canary.7f224ddd4.0",
-        "@material/tab-indicator": "15.0.0-canary.7f224ddd4.0",
-        "@material/tab-scroller": "15.0.0-canary.7f224ddd4.0",
-        "@material/theme": "15.0.0-canary.7f224ddd4.0",
-        "@material/tokens": "15.0.0-canary.7f224ddd4.0",
-        "@material/typography": "15.0.0-canary.7f224ddd4.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/tab-indicator": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/tab-indicator/-/tab-indicator-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-h9Td3MPqbs33spcPS7ecByRHraYgU4tNCZpZzZXw31RypjKvISDv/PS5wcA4RmWqNGih78T7xg4QIGsZg4Pk4w==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.7f224ddd4.0",
-        "@material/base": "15.0.0-canary.7f224ddd4.0",
-        "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0",
-        "@material/theme": "15.0.0-canary.7f224ddd4.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/tab-scroller": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/tab-scroller/-/tab-scroller-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-LFeYNjQpdXecwECd8UaqHYbhscDCwhGln5Yh+3ctvcEgvmDPNjhKn/DL3sWprWvG8NAhP6sHMrsGhQFVdCWtTg==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.7f224ddd4.0",
-        "@material/base": "15.0.0-canary.7f224ddd4.0",
-        "@material/dom": "15.0.0-canary.7f224ddd4.0",
-        "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0",
-        "@material/tab": "15.0.0-canary.7f224ddd4.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/textfield": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/textfield/-/textfield-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-AExmFvgE5nNF0UA4l2cSzPghtxSUQeeoyRjFLHLy+oAaE4eKZFrSy0zEpqPeWPQpEMDZk+6Y+6T3cOFYBeSvsw==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.7f224ddd4.0",
-        "@material/base": "15.0.0-canary.7f224ddd4.0",
-        "@material/density": "15.0.0-canary.7f224ddd4.0",
-        "@material/dom": "15.0.0-canary.7f224ddd4.0",
-        "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0",
-        "@material/floating-label": "15.0.0-canary.7f224ddd4.0",
-        "@material/line-ripple": "15.0.0-canary.7f224ddd4.0",
-        "@material/notched-outline": "15.0.0-canary.7f224ddd4.0",
-        "@material/ripple": "15.0.0-canary.7f224ddd4.0",
-        "@material/rtl": "15.0.0-canary.7f224ddd4.0",
-        "@material/shape": "15.0.0-canary.7f224ddd4.0",
-        "@material/theme": "15.0.0-canary.7f224ddd4.0",
-        "@material/tokens": "15.0.0-canary.7f224ddd4.0",
-        "@material/typography": "15.0.0-canary.7f224ddd4.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/theme": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/theme/-/theme-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-hs45hJoE9yVnoVOcsN1jklyOa51U4lzWsEnQEuJTPOk2+0HqCQ0yv/q0InpSnm2i69fNSyZC60+8HADZGF8ugQ==",
-      "dependencies": {
-        "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/tokens": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/tokens/-/tokens-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-r9TDoicmcT7FhUXC4eYMFnt9TZsz0G8T3wXvkKncLppYvZ517gPyD/1+yhuGfGOxAzxTrM66S/oEc1fFE2q4hw==",
-      "dependencies": {
-        "@material/elevation": "15.0.0-canary.7f224ddd4.0"
-      }
-    },
-    "node_modules/@material/tooltip": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/tooltip/-/tooltip-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-8qNk3pmPLTnam3XYC1sZuplQXW9xLn4Z4MI3D+U17Q7pfNZfoOugGr+d2cLA9yWAEjVJYB0mj8Yu86+udo4N9w==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.7f224ddd4.0",
-        "@material/base": "15.0.0-canary.7f224ddd4.0",
-        "@material/button": "15.0.0-canary.7f224ddd4.0",
-        "@material/dom": "15.0.0-canary.7f224ddd4.0",
-        "@material/elevation": "15.0.0-canary.7f224ddd4.0",
-        "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0",
-        "@material/rtl": "15.0.0-canary.7f224ddd4.0",
-        "@material/shape": "15.0.0-canary.7f224ddd4.0",
-        "@material/theme": "15.0.0-canary.7f224ddd4.0",
-        "@material/tokens": "15.0.0-canary.7f224ddd4.0",
-        "@material/typography": "15.0.0-canary.7f224ddd4.0",
-        "safevalues": "^0.3.4",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/top-app-bar": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/top-app-bar/-/top-app-bar-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-SARR5/ClYT4CLe9qAXakbr0i0cMY0V3V4pe3ElIJPfL2Z2c4wGR1mTR8m2LxU1MfGKK8aRoUdtfKaxWejp+eNA==",
-      "dependencies": {
-        "@material/animation": "15.0.0-canary.7f224ddd4.0",
-        "@material/base": "15.0.0-canary.7f224ddd4.0",
-        "@material/elevation": "15.0.0-canary.7f224ddd4.0",
-        "@material/ripple": "15.0.0-canary.7f224ddd4.0",
-        "@material/rtl": "15.0.0-canary.7f224ddd4.0",
-        "@material/shape": "15.0.0-canary.7f224ddd4.0",
-        "@material/theme": "15.0.0-canary.7f224ddd4.0",
-        "@material/typography": "15.0.0-canary.7f224ddd4.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/touch-target": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/touch-target/-/touch-target-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-BJo/wFKHPYLGsRaIpd7vsQwKr02LtO2e89Psv0on/p0OephlNIgeB9dD9W+bQmaeZsZ6liKSKRl6wJWDiK71PA==",
-      "dependencies": {
-        "@material/base": "15.0.0-canary.7f224ddd4.0",
-        "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0",
-        "@material/rtl": "15.0.0-canary.7f224ddd4.0",
-        "@material/theme": "15.0.0-canary.7f224ddd4.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/typography": {
-      "version": "15.0.0-canary.7f224ddd4.0",
-      "resolved": "https://registry.npmjs.org/@material/typography/-/typography-15.0.0-canary.7f224ddd4.0.tgz",
-      "integrity": "sha512-kBaZeCGD50iq1DeRRH5OM5Jl7Gdk+/NOfKArkY4ksBZvJiStJ7ACAhpvb8MEGm4s3jvDInQFLsDq3hL+SA79sQ==",
-      "dependencies": {
-        "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0",
-        "@material/theme": "15.0.0-canary.7f224ddd4.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@msgpackr-extract/msgpackr-extract-darwin-arm64": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.3.tgz",
-      "integrity": "sha512-QZHtlVgbAdy2zAqNA9Gu1UpIuI8Xvsd1v8ic6B2pZmeFnFcMWiPLfWXh7TVw4eGEZ/C9TH281KwhVoeQUKbyjw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@msgpackr-extract/msgpackr-extract-darwin-x64": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.3.tgz",
-      "integrity": "sha512-mdzd3AVzYKuUmiWOQ8GNhl64/IoFGol569zNRdkLReh6LRLHOXxU4U8eq0JwaD8iFHdVGqSy4IjFL4reoWCDFw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.3.tgz",
-      "integrity": "sha512-fg0uy/dG/nZEXfYilKoRe7yALaNmHoYeIoJuJ7KJ+YyU2bvY8vPv27f7UKhGRpY6euFYqEVhxCFZgAUNQBM3nw==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm64": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.3.tgz",
-      "integrity": "sha512-YxQL+ax0XqBJDZiKimS2XQaf+2wDGVa1enVRGzEvLLVFeqa5kx2bWbtcSXgsxjQB7nRqqIGFIcLteF/sHeVtQg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@msgpackr-extract/msgpackr-extract-linux-x64": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.3.tgz",
-      "integrity": "sha512-cvwNfbP07pKUfq1uH+S6KJ7dT9K8WOE4ZiAcsrSes+UY55E/0jLYc+vq+DO7jlmqRb5zAggExKm0H7O/CBaesg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@msgpackr-extract/msgpackr-extract-win32-x64": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.3.tgz",
-      "integrity": "sha512-x0fWaQtYp4E6sktbsdAqnehxDgEc/VwM7uLsRCYWaiGu0ykYdZPiS8zCWdnjHwyiumousxfBm4SO31eXqwEZhQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@ngtools/webpack": {
-      "version": "18.0.5",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-18.0.5.tgz",
-      "integrity": "sha512-Dx386WZZn0RwUaBHQYhDW8oi254SxEu8Ty5LHnStqBP6xXdcnsdGel+h9qvJ67He9iu8Rj0PB64EFE4PiklMdQ==",
-      "dev": true,
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      },
-      "peerDependencies": {
-        "@angular/compiler-cli": "^18.0.0",
-        "typescript": ">=5.4 <5.5",
-        "webpack": "^5.54.0"
-      }
-    },
-    "node_modules/@nodelib/fs.scandir": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.stat": "2.0.5",
-        "run-parallel": "^1.1.9"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@nodelib/fs.walk": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.scandir": "2.1.5",
-        "fastq": "^1.6.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@npmcli/agent": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-2.2.2.tgz",
-      "integrity": "sha512-OrcNPXdpSl9UX7qPVRWbmWMCSXrcDa2M9DvrbOTj7ao1S4PlqVFYv9/yLKMkrJKZ/V5A/kDBC690or307i26Og==",
-      "dev": true,
-      "dependencies": {
-        "agent-base": "^7.1.0",
-        "http-proxy-agent": "^7.0.0",
-        "https-proxy-agent": "^7.0.1",
-        "lru-cache": "^10.0.1",
-        "socks-proxy-agent": "^8.0.3"
-      },
-      "engines": {
-        "node": "^16.14.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@npmcli/agent/node_modules/lru-cache": {
-      "version": "10.2.2",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz",
-      "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==",
-      "dev": true,
-      "engines": {
-        "node": "14 || >=16.14"
-      }
-    },
-    "node_modules/@npmcli/fs": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz",
-      "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==",
-      "dev": true,
-      "dependencies": {
-        "semver": "^7.3.5"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@npmcli/git": {
-      "version": "5.0.7",
-      "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-5.0.7.tgz",
-      "integrity": "sha512-WaOVvto604d5IpdCRV2KjQu8PzkfE96d50CQGKgywXh2GxXmDeUO5EWcBC4V57uFyrNqx83+MewuJh3WTR3xPA==",
-      "dev": true,
-      "dependencies": {
-        "@npmcli/promise-spawn": "^7.0.0",
-        "lru-cache": "^10.0.1",
-        "npm-pick-manifest": "^9.0.0",
-        "proc-log": "^4.0.0",
-        "promise-inflight": "^1.0.1",
-        "promise-retry": "^2.0.1",
-        "semver": "^7.3.5",
-        "which": "^4.0.0"
-      },
-      "engines": {
-        "node": "^16.14.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@npmcli/git/node_modules/isexe": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
-      "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=16"
-      }
-    },
-    "node_modules/@npmcli/git/node_modules/lru-cache": {
-      "version": "10.2.2",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz",
-      "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==",
-      "dev": true,
-      "engines": {
-        "node": "14 || >=16.14"
-      }
-    },
-    "node_modules/@npmcli/git/node_modules/which": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
-      "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^3.1.1"
-      },
-      "bin": {
-        "node-which": "bin/which.js"
-      },
-      "engines": {
-        "node": "^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@npmcli/installed-package-contents": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-2.1.0.tgz",
-      "integrity": "sha512-c8UuGLeZpm69BryRykLuKRyKFZYJsZSCT4aVY5ds4omyZqJ172ApzgfKJ5eV/r3HgLdUYgFVe54KSFVjKoe27w==",
-      "dev": true,
-      "dependencies": {
-        "npm-bundled": "^3.0.0",
-        "npm-normalize-package-bin": "^3.0.0"
-      },
-      "bin": {
-        "installed-package-contents": "bin/index.js"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@npmcli/node-gyp": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-3.0.0.tgz",
-      "integrity": "sha512-gp8pRXC2oOxu0DUE1/M3bYtb1b3/DbJ5aM113+XJBgfXdussRAsX0YOrOhdd8WvnAR6auDBvJomGAkLKA5ydxA==",
-      "dev": true,
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@npmcli/package-json": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/package-json/-/package-json-5.2.0.tgz",
-      "integrity": "sha512-qe/kiqqkW0AGtvBjL8TJKZk/eBBSpnJkUWvHdQ9jM2lKHXRYYJuyNpJPlJw3c8QjC2ow6NZYiLExhUaeJelbxQ==",
-      "dev": true,
-      "dependencies": {
-        "@npmcli/git": "^5.0.0",
-        "glob": "^10.2.2",
-        "hosted-git-info": "^7.0.0",
-        "json-parse-even-better-errors": "^3.0.0",
-        "normalize-package-data": "^6.0.0",
-        "proc-log": "^4.0.0",
-        "semver": "^7.5.3"
-      },
-      "engines": {
-        "node": "^16.14.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@npmcli/package-json/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/@npmcli/package-json/node_modules/glob": {
-      "version": "10.4.2",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.2.tgz",
-      "integrity": "sha512-GwMlUF6PkPo3Gk21UxkCohOv0PLcIXVtKyLlpEI28R/cO/4eNOdmLk3CMW1wROV/WR/EsZOWAfBbBOqYvs88/w==",
-      "dev": true,
-      "dependencies": {
-        "foreground-child": "^3.1.0",
-        "jackspeak": "^3.1.2",
-        "minimatch": "^9.0.4",
-        "minipass": "^7.1.2",
-        "package-json-from-dist": "^1.0.0",
-        "path-scurry": "^1.11.1"
-      },
-      "bin": {
-        "glob": "dist/esm/bin.mjs"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/@npmcli/package-json/node_modules/minimatch": {
-      "version": "9.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz",
-      "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/@npmcli/promise-spawn": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-7.0.2.tgz",
-      "integrity": "sha512-xhfYPXoV5Dy4UkY0D+v2KkwvnDfiA/8Mt3sWCGI/hM03NsYIH8ZaG6QzS9x7pje5vHZBZJ2v6VRFVTWACnqcmQ==",
-      "dev": true,
-      "dependencies": {
-        "which": "^4.0.0"
-      },
-      "engines": {
-        "node": "^16.14.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@npmcli/promise-spawn/node_modules/isexe": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
-      "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=16"
-      }
-    },
-    "node_modules/@npmcli/promise-spawn/node_modules/which": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
-      "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^3.1.1"
-      },
-      "bin": {
-        "node-which": "bin/which.js"
-      },
-      "engines": {
-        "node": "^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@npmcli/redact": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@npmcli/redact/-/redact-2.0.1.tgz",
-      "integrity": "sha512-YgsR5jCQZhVmTJvjduTOIHph0L73pK8xwMVaDY0PatySqVM9AZj93jpoXYSJqfHFxFkN9dmqTw6OiqExsS3LPw==",
-      "dev": true,
-      "engines": {
-        "node": "^16.14.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@npmcli/run-script": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-8.1.0.tgz",
-      "integrity": "sha512-y7efHHwghQfk28G2z3tlZ67pLG0XdfYbcVG26r7YIXALRsrVQcTq4/tdenSmdOrEsNahIYA/eh8aEVROWGFUDg==",
-      "dev": true,
-      "dependencies": {
-        "@npmcli/node-gyp": "^3.0.0",
-        "@npmcli/package-json": "^5.0.0",
-        "@npmcli/promise-spawn": "^7.0.0",
-        "node-gyp": "^10.0.0",
-        "proc-log": "^4.0.0",
-        "which": "^4.0.0"
-      },
-      "engines": {
-        "node": "^16.14.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@npmcli/run-script/node_modules/isexe": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
-      "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=16"
-      }
-    },
-    "node_modules/@npmcli/run-script/node_modules/which": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
-      "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^3.1.1"
-      },
-      "bin": {
-        "node-which": "bin/which.js"
-      },
-      "engines": {
-        "node": "^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@pkgjs/parseargs": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
-      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.18.0.tgz",
-      "integrity": "sha512-Tya6xypR10giZV1XzxmH5wr25VcZSncG0pZIjfePT0OVBvqNEurzValetGNarVrGiq66EBVAFn15iYX4w6FKgQ==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ]
-    },
-    "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.18.0.tgz",
-      "integrity": "sha512-avCea0RAP03lTsDhEyfy+hpfr85KfyTctMADqHVhLAF3MlIkq83CP8UfAHUssgXTYd+6er6PaAhx/QGv4L1EiA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ]
-    },
-    "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.18.0.tgz",
-      "integrity": "sha512-IWfdwU7KDSm07Ty0PuA/W2JYoZ4iTj3TUQjkVsO/6U+4I1jN5lcR71ZEvRh52sDOERdnNhhHU57UITXz5jC1/w==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.18.0.tgz",
-      "integrity": "sha512-n2LMsUz7Ynu7DoQrSQkBf8iNrjOGyPLrdSg802vk6XT3FtsgX6JbE8IHRvposskFm9SNxzkLYGSq9QdpLYpRNA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.18.0.tgz",
-      "integrity": "sha512-C/zbRYRXFjWvz9Z4haRxcTdnkPt1BtCkz+7RtBSuNmKzMzp3ZxdM28Mpccn6pt28/UWUCTXa+b0Mx1k3g6NOMA==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.18.0.tgz",
-      "integrity": "sha512-l3m9ewPgjQSXrUMHg93vt0hYCGnrMOcUpTz6FLtbwljo2HluS4zTXFy2571YQbisTnfTKPZ01u/ukJdQTLGh9A==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.18.0.tgz",
-      "integrity": "sha512-rJ5D47d8WD7J+7STKdCUAgmQk49xuFrRi9pZkWoRD1UeSMakbcepWXPF8ycChBoAqs1pb2wzvbY6Q33WmN2ftw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.18.0.tgz",
-      "integrity": "sha512-be6Yx37b24ZwxQ+wOQXXLZqpq4jTckJhtGlWGZs68TgdKXJgw54lUUoFYrg6Zs/kjzAQwEwYbp8JxZVzZLRepQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.18.0.tgz",
-      "integrity": "sha512-hNVMQK+qrA9Todu9+wqrXOHxFiD5YmdEi3paj6vP02Kx1hjd2LLYR2eaN7DsEshg09+9uzWi2W18MJDlG0cxJA==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.18.0.tgz",
-      "integrity": "sha512-ROCM7i+m1NfdrsmvwSzoxp9HFtmKGHEqu5NNDiZWQtXLA8S5HBCkVvKAxJ8U+CVctHwV2Gb5VUaK7UAkzhDjlg==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.18.0.tgz",
-      "integrity": "sha512-0UyyRHyDN42QL+NbqevXIIUnKA47A+45WyasO+y2bGJ1mhQrfrtXUpTxCOrfxCR4esV3/RLYyucGVPiUsO8xjg==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.18.0.tgz",
-      "integrity": "sha512-xuglR2rBVHA5UsI8h8UbX4VJ470PtGCf5Vpswh7p2ukaqBGFTnsfzxUBetoWBWymHMxbIG0Cmx7Y9qDZzr648w==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.18.0.tgz",
-      "integrity": "sha512-LKaqQL9osY/ir2geuLVvRRs+utWUNilzdE90TpyoX0eNqPzWjRm14oMEE+YLve4k/NAqCdPkGYDaDF5Sw+xBfg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.18.0.tgz",
-      "integrity": "sha512-7J6TkZQFGo9qBKH0pk2cEVSRhJbL6MtfWxth7Y5YmZs57Pi+4x6c2dStAUvaQkHQLnEQv1jzBUW43GvZW8OFqA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.18.0.tgz",
-      "integrity": "sha512-Txjh+IxBPbkUB9+SXZMpv+b/vnTEtFyfWZgJ6iyCmt2tdx0OF5WhFowLmnh8ENGNpfUlUZkdI//4IEmhwPieNg==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.18.0.tgz",
-      "integrity": "sha512-UOo5FdvOL0+eIVTgS4tIdbW+TtnBLWg1YBCcU2KWM7nuNwRz9bksDX1bekJJCpu25N1DVWaCwnT39dVQxzqS8g==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@schematics/angular": {
-      "version": "18.0.5",
-      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-18.0.5.tgz",
-      "integrity": "sha512-dV50GIEGl6S5wE6xtAhmHWdLhsOlnNUpAx/v3BPR2AOr90zJvIM03TqAQTzAlnPatxK2WLelRgqVMbPfAVvLAg==",
-      "dev": true,
-      "dependencies": {
-        "@angular-devkit/core": "18.0.5",
-        "@angular-devkit/schematics": "18.0.5",
-        "jsonc-parser": "3.2.1"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@sigstore/bundle": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-2.3.2.tgz",
-      "integrity": "sha512-wueKWDk70QixNLB363yHc2D2ItTgYiMTdPwK8D9dKQMR3ZQ0c35IxP5xnwQ8cNLoCgCRcHf14kE+CLIvNX1zmA==",
-      "dev": true,
-      "dependencies": {
-        "@sigstore/protobuf-specs": "^0.3.2"
-      },
-      "engines": {
-        "node": "^16.14.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@sigstore/core": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@sigstore/core/-/core-1.1.0.tgz",
-      "integrity": "sha512-JzBqdVIyqm2FRQCulY6nbQzMpJJpSiJ8XXWMhtOX9eKgaXXpfNOF53lzQEjIydlStnd/eFtuC1dW4VYdD93oRg==",
-      "dev": true,
-      "engines": {
-        "node": "^16.14.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@sigstore/protobuf-specs": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.3.2.tgz",
-      "integrity": "sha512-c6B0ehIWxMI8wiS/bj6rHMPqeFvngFV7cDU/MY+B16P9Z3Mp9k8L93eYZ7BYzSickzuqAQqAq0V956b3Ju6mLw==",
-      "dev": true,
-      "engines": {
-        "node": "^16.14.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@sigstore/sign": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-2.3.2.tgz",
-      "integrity": "sha512-5Vz5dPVuunIIvC5vBb0APwo7qKA4G9yM48kPWJT+OEERs40md5GoUR1yedwpekWZ4m0Hhw44m6zU+ObsON+iDA==",
-      "dev": true,
-      "dependencies": {
-        "@sigstore/bundle": "^2.3.2",
-        "@sigstore/core": "^1.0.0",
-        "@sigstore/protobuf-specs": "^0.3.2",
-        "make-fetch-happen": "^13.0.1",
-        "proc-log": "^4.2.0",
-        "promise-retry": "^2.0.1"
-      },
-      "engines": {
-        "node": "^16.14.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@sigstore/tuf": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-2.3.4.tgz",
-      "integrity": "sha512-44vtsveTPUpqhm9NCrbU8CWLe3Vck2HO1PNLw7RIajbB7xhtn5RBPm1VNSCMwqGYHhDsBJG8gDF0q4lgydsJvw==",
-      "dev": true,
-      "dependencies": {
-        "@sigstore/protobuf-specs": "^0.3.2",
-        "tuf-js": "^2.2.1"
-      },
-      "engines": {
-        "node": "^16.14.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@sigstore/verify": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@sigstore/verify/-/verify-1.2.1.tgz",
-      "integrity": "sha512-8iKx79/F73DKbGfRf7+t4dqrc0bRr0thdPrxAtCKWRm/F0tG71i6O1rvlnScncJLLBZHn3h8M3c1BSUAb9yu8g==",
-      "dev": true,
-      "dependencies": {
-        "@sigstore/bundle": "^2.3.2",
-        "@sigstore/core": "^1.1.0",
-        "@sigstore/protobuf-specs": "^0.3.2"
-      },
-      "engines": {
-        "node": "^16.14.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@socket.io/component-emitter": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz",
-      "integrity": "sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA==",
-      "dev": true
-    },
-    "node_modules/@tufjs/canonical-json": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-2.0.0.tgz",
-      "integrity": "sha512-yVtV8zsdo8qFHe+/3kw81dSLyF7D576A5cCFCi4X7B39tWT7SekaEFUnvnWJHz+9qO7qJTah1JbrDjWKqFtdWA==",
-      "dev": true,
-      "engines": {
-        "node": "^16.14.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@tufjs/models": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-2.0.1.tgz",
-      "integrity": "sha512-92F7/SFyufn4DXsha9+QfKnN03JGqtMFMXgSHbZOo8JG59WkTni7UzAouNQDf7AuP9OAMxVOPQcqG3sB7w+kkg==",
-      "dev": true,
-      "dependencies": {
-        "@tufjs/canonical-json": "2.0.0",
-        "minimatch": "^9.0.4"
-      },
-      "engines": {
-        "node": "^16.14.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@tufjs/models/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/@tufjs/models/node_modules/minimatch": {
-      "version": "9.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz",
-      "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/@types/body-parser": {
-      "version": "1.19.5",
-      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz",
-      "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==",
-      "dev": true,
-      "dependencies": {
-        "@types/connect": "*",
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/bonjour": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.13.tgz",
-      "integrity": "sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/connect": {
-      "version": "3.4.38",
-      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
-      "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/connect-history-api-fallback": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz",
-      "integrity": "sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==",
-      "dev": true,
-      "dependencies": {
-        "@types/express-serve-static-core": "*",
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/cookie": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz",
-      "integrity": "sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==",
-      "dev": true
-    },
-    "node_modules/@types/cors": {
-      "version": "2.8.17",
-      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.17.tgz",
-      "integrity": "sha512-8CGDvrBj1zgo2qE+oS3pOCyYNqCPryMWY2bGfwA0dcfopWGgxs+78df0Rs3rc9THP4JkOhLsAa+15VdpAqkcUA==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/eslint": {
-      "version": "8.56.10",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.10.tgz",
-      "integrity": "sha512-Shavhk87gCtY2fhXDctcfS3e6FdxWkCx1iUZ9eEUbh7rTqlZT0/IzOkCOVt0fCjcFuZ9FPYfuezTBImfHCDBGQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/estree": "*",
-        "@types/json-schema": "*"
-      }
-    },
-    "node_modules/@types/eslint-scope": {
-      "version": "3.7.7",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
-      "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
-      "dev": true,
-      "dependencies": {
-        "@types/eslint": "*",
-        "@types/estree": "*"
-      }
-    },
-    "node_modules/@types/estree": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
-      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
-      "dev": true
-    },
-    "node_modules/@types/express": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz",
-      "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/body-parser": "*",
-        "@types/express-serve-static-core": "^4.17.33",
-        "@types/qs": "*",
-        "@types/serve-static": "*"
-      }
-    },
-    "node_modules/@types/express-serve-static-core": {
-      "version": "4.19.5",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.5.tgz",
-      "integrity": "sha512-y6W03tvrACO72aijJ5uF02FRq5cgDR9lUxddQ8vyF+GvmjJQqbzDcJngEjURc+ZsG31VI3hODNZJ2URj86pzmg==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*",
-        "@types/qs": "*",
-        "@types/range-parser": "*",
-        "@types/send": "*"
-      }
-    },
-    "node_modules/@types/http-errors": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz",
-      "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==",
-      "dev": true
-    },
-    "node_modules/@types/http-proxy": {
-      "version": "1.17.14",
-      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.14.tgz",
-      "integrity": "sha512-SSrD0c1OQzlFX7pGu1eXxSEjemej64aaNPRhhVYUGqXh0BtldAAx37MG8btcumvpgKyZp1F5Gn3JkktdxiFv6w==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/jasmine": {
-      "version": "5.1.4",
-      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-5.1.4.tgz",
-      "integrity": "sha512-px7OMFO/ncXxixDe1zR13V1iycqWae0MxTaw62RpFlksUi5QuNWgQJFkTQjIOvrmutJbI7Fp2Y2N1F6D2R4G6w==",
-      "dev": true
-    },
-    "node_modules/@types/json-schema": {
-      "version": "7.0.15",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
-      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
-      "dev": true
-    },
-    "node_modules/@types/mime": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz",
-      "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==",
-      "dev": true
-    },
-    "node_modules/@types/node": {
-      "version": "20.14.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.8.tgz",
-      "integrity": "sha512-DO+2/jZinXfROG7j7WKFn/3C6nFwxy2lLpgLjEXJz+0XKphZlTLJ14mo8Vfg8X5BWN6XjyESXq+LcYdT7tR3bA==",
-      "dev": true,
-      "dependencies": {
-        "undici-types": "~5.26.4"
-      }
-    },
-    "node_modules/@types/node-forge": {
-      "version": "1.3.11",
-      "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.11.tgz",
-      "integrity": "sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/qs": {
-      "version": "6.9.15",
-      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.15.tgz",
-      "integrity": "sha512-uXHQKES6DQKKCLh441Xv/dwxOq1TVS3JPUMlEqoEglvlhR6Mxnlew/Xq/LRVHpLyk7iK3zODe1qYHIMltO7XGg==",
-      "dev": true
-    },
-    "node_modules/@types/range-parser": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz",
-      "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==",
-      "dev": true
-    },
-    "node_modules/@types/retry": {
-      "version": "0.12.2",
-      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.2.tgz",
-      "integrity": "sha512-XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow==",
-      "dev": true
-    },
-    "node_modules/@types/send": {
-      "version": "0.17.4",
-      "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz",
-      "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==",
-      "dev": true,
-      "dependencies": {
-        "@types/mime": "^1",
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/serve-index": {
-      "version": "1.9.4",
-      "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.4.tgz",
-      "integrity": "sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug==",
-      "dev": true,
-      "dependencies": {
-        "@types/express": "*"
-      }
-    },
-    "node_modules/@types/serve-static": {
-      "version": "1.15.7",
-      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz",
-      "integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==",
-      "dev": true,
-      "dependencies": {
-        "@types/http-errors": "*",
-        "@types/node": "*",
-        "@types/send": "*"
-      }
-    },
-    "node_modules/@types/sockjs": {
-      "version": "0.3.36",
-      "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.36.tgz",
-      "integrity": "sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/ws": {
-      "version": "8.5.10",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.10.tgz",
-      "integrity": "sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@vitejs/plugin-basic-ssl": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.1.0.tgz",
-      "integrity": "sha512-wO4Dk/rm8u7RNhOf95ZzcEmC9rYOncYgvq4z3duaJrCgjN8BxAnDVyndanfcJZ0O6XZzHz6Q0hTimxTg8Y9g/A==",
-      "dev": true,
-      "engines": {
-        "node": ">=14.6.0"
-      },
-      "peerDependencies": {
-        "vite": "^3.0.0 || ^4.0.0 || ^5.0.0"
-      }
-    },
-    "node_modules/@webassemblyjs/ast": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz",
-      "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/helper-numbers": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
-      }
-    },
-    "node_modules/@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
-      "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/helper-api-error": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
-      "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/helper-buffer": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz",
-      "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/helper-numbers": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
-      "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/floating-point-hex-parser": "1.11.6",
-        "@webassemblyjs/helper-api-error": "1.11.6",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
-      "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/helper-wasm-section": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz",
-      "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-buffer": "1.12.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/wasm-gen": "1.12.1"
-      }
-    },
-    "node_modules/@webassemblyjs/ieee754": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
-      "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
-      "dev": true,
-      "dependencies": {
-        "@xtuc/ieee754": "^1.2.0"
-      }
-    },
-    "node_modules/@webassemblyjs/leb128": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
-      "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
-      "dev": true,
-      "dependencies": {
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@webassemblyjs/utf8": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
-      "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/wasm-edit": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz",
-      "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-buffer": "1.12.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/helper-wasm-section": "1.12.1",
-        "@webassemblyjs/wasm-gen": "1.12.1",
-        "@webassemblyjs/wasm-opt": "1.12.1",
-        "@webassemblyjs/wasm-parser": "1.12.1",
-        "@webassemblyjs/wast-printer": "1.12.1"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-gen": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz",
-      "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/ieee754": "1.11.6",
-        "@webassemblyjs/leb128": "1.11.6",
-        "@webassemblyjs/utf8": "1.11.6"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-opt": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz",
-      "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-buffer": "1.12.1",
-        "@webassemblyjs/wasm-gen": "1.12.1",
-        "@webassemblyjs/wasm-parser": "1.12.1"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-parser": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz",
-      "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-api-error": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/ieee754": "1.11.6",
-        "@webassemblyjs/leb128": "1.11.6",
-        "@webassemblyjs/utf8": "1.11.6"
-      }
-    },
-    "node_modules/@webassemblyjs/wast-printer": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz",
-      "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@xtuc/ieee754": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-      "dev": true
-    },
-    "node_modules/@xtuc/long": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-      "dev": true
-    },
-    "node_modules/@yarnpkg/lockfile": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz",
-      "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==",
-      "dev": true
-    },
-    "node_modules/abbrev": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz",
-      "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==",
-      "dev": true,
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/accepts": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
-      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
-      "dev": true,
-      "dependencies": {
-        "mime-types": "~2.1.34",
-        "negotiator": "0.6.3"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/acorn": {
-      "version": "8.12.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.0.tgz",
-      "integrity": "sha512-RTvkC4w+KNXrM39/lWCUaG0IbRkWdCv7W/IOW9oU6SawyxulvkQy5HQPVTKxEjczcUvapcrw3cFx/60VN/NRNw==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-import-assertions": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
-      "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
-      "dev": true,
-      "peerDependencies": {
-        "acorn": "^8"
-      }
-    },
-    "node_modules/adjust-sourcemap-loader": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz",
-      "integrity": "sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A==",
-      "dev": true,
-      "dependencies": {
-        "loader-utils": "^2.0.0",
-        "regex-parser": "^2.2.11"
-      },
-      "engines": {
-        "node": ">=8.9"
-      }
-    },
-    "node_modules/adjust-sourcemap-loader/node_modules/loader-utils": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
-      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
-      },
-      "engines": {
-        "node": ">=8.9.0"
-      }
-    },
-    "node_modules/agent-base": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
-      "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/aggregate-error": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
-      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
-      "dev": true,
-      "dependencies": {
-        "clean-stack": "^2.0.0",
-        "indent-string": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ajv": {
-      "version": "8.13.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.13.0.tgz",
-      "integrity": "sha512-PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.4.1"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/ajv-formats": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-3.0.1.tgz",
-      "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "ajv": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/ajv-keywords": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3"
-      },
-      "peerDependencies": {
-        "ajv": "^8.8.2"
-      }
-    },
-    "node_modules/ansi-colors": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
-      "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/ansi-escapes": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.21.3"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/ansi-html-community": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
-      "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==",
-      "dev": true,
-      "engines": [
-        "node >= 0.8.0"
-      ],
-      "bin": {
-        "ansi-html": "bin/ansi-html"
-      }
-    },
-    "node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/any-promise": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
-      "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==",
-      "dev": true
-    },
-    "node_modules/anymatch": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
-      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
-      "dev": true,
-      "dependencies": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/anymatch/node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "node_modules/arg": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz",
-      "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==",
-      "dev": true
-    },
-    "node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
-    },
-    "node_modules/array-flatten": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
-      "dev": true
-    },
-    "node_modules/autoprefixer": {
-      "version": "10.4.19",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.19.tgz",
-      "integrity": "sha512-BaENR2+zBZ8xXhM4pUaKUxlVdxZ0EZhjvbopwnXmxRUfqDmwSpC2lAi/QXvx7NRdPCo1WKEcEF6mV64si1z4Ew==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/autoprefixer"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "dependencies": {
-        "browserslist": "^4.23.0",
-        "caniuse-lite": "^1.0.30001599",
-        "fraction.js": "^4.3.7",
-        "normalize-range": "^0.1.2",
-        "picocolors": "^1.0.0",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "bin": {
-        "autoprefixer": "bin/autoprefixer"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/babel-loader": {
-      "version": "9.1.3",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-9.1.3.tgz",
-      "integrity": "sha512-xG3ST4DglodGf8qSwv0MdeWLhrDsw/32QMdTO5T1ZIp9gQur0HkCyFs7Awskr10JKXFXwpAhiCuYX5oGXnRGbw==",
-      "dev": true,
-      "dependencies": {
-        "find-cache-dir": "^4.0.0",
-        "schema-utils": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 14.15.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.12.0",
-        "webpack": ">=5"
-      }
-    },
-    "node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.4.11",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.11.tgz",
-      "integrity": "sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.22.6",
-        "@babel/helper-define-polyfill-provider": "^0.6.2",
-        "semver": "^6.3.1"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
-      }
-    },
-    "node_modules/babel-plugin-polyfill-corejs2/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.10.4",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.4.tgz",
-      "integrity": "sha512-25J6I8NGfa5YkCDogHRID3fVCadIR8/pGl1/spvCkzb6lVn6SR3ojpx9nOn9iEBcUsjY24AmdKm5khcfKdylcg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.6.1",
-        "core-js-compat": "^3.36.1"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
-      }
-    },
-    "node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.2.tgz",
-      "integrity": "sha512-2R25rQZWP63nGwaAswvDazbPXfrM3HwVoBXK6HcqeKrSrL/JqcC/rDcf95l4r7LXLyxDXc8uQDa064GubtCABg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.6.2"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
-      }
-    },
-    "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
-    },
-    "node_modules/base64-js": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/base64id": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz",
-      "integrity": "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==",
-      "dev": true,
-      "engines": {
-        "node": "^4.5.0 || >= 5.9"
-      }
-    },
-    "node_modules/batch": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
-      "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
-      "dev": true
-    },
-    "node_modules/big.js": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/binary-extensions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
-      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/bl": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-      "dev": true,
-      "dependencies": {
-        "buffer": "^5.5.0",
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.4.0"
-      }
-    },
-    "node_modules/body-parser": {
-      "version": "1.20.2",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
-      "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
-      "dev": true,
-      "dependencies": {
-        "bytes": "3.1.2",
-        "content-type": "~1.0.5",
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
-        "on-finished": "2.4.1",
-        "qs": "6.11.0",
-        "raw-body": "2.5.2",
-        "type-is": "~1.6.18",
-        "unpipe": "1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8",
-        "npm": "1.2.8000 || >= 1.4.16"
-      }
-    },
-    "node_modules/body-parser/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/body-parser/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/bonjour-service": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.2.1.tgz",
-      "integrity": "sha512-oSzCS2zV14bh2kji6vNe7vrpJYCHGvcZnlffFQ1MEoX/WOeQ/teD8SYWKR942OI3INjq8OMNJlbPK5LLLUxFDw==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3",
-        "multicast-dns": "^7.2.5"
-      }
-    },
-    "node_modules/boolbase": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
-      "dev": true
-    },
-    "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/braces": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
-      "dev": true,
-      "dependencies": {
-        "fill-range": "^7.1.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/browserslist": {
-      "version": "4.23.1",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.1.tgz",
-      "integrity": "sha512-TUfofFo/KsK/bWZ9TWQ5O26tsWW4Uhmt8IYklbnUa70udB6P2wA7w7o4PY4muaEPBQaAX+CEnmmIA41NVHtPVw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "dependencies": {
-        "caniuse-lite": "^1.0.30001629",
-        "electron-to-chromium": "^1.4.796",
-        "node-releases": "^2.0.14",
-        "update-browserslist-db": "^1.0.16"
-      },
-      "bin": {
-        "browserslist": "cli.js"
-      },
-      "engines": {
-        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-      }
-    },
-    "node_modules/buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
-      }
-    },
-    "node_modules/buffer-from": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-      "dev": true
-    },
-    "node_modules/bundle-name": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bundle-name/-/bundle-name-4.1.0.tgz",
-      "integrity": "sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q==",
-      "dev": true,
-      "dependencies": {
-        "run-applescript": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/bytes": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/cacache": {
-      "version": "18.0.3",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.3.tgz",
-      "integrity": "sha512-qXCd4rh6I07cnDqh8V48/94Tc/WSfj+o3Gn6NZ0aZovS255bUx8O13uKxRFd2eWG0xgsco7+YItQNPaa5E85hg==",
-      "dev": true,
-      "dependencies": {
-        "@npmcli/fs": "^3.1.0",
-        "fs-minipass": "^3.0.0",
-        "glob": "^10.2.2",
-        "lru-cache": "^10.0.1",
-        "minipass": "^7.0.3",
-        "minipass-collect": "^2.0.1",
-        "minipass-flush": "^1.0.5",
-        "minipass-pipeline": "^1.2.4",
-        "p-map": "^4.0.0",
-        "ssri": "^10.0.0",
-        "tar": "^6.1.11",
-        "unique-filename": "^3.0.0"
-      },
-      "engines": {
-        "node": "^16.14.0 || >=18.0.0"
-      }
-    },
-    "node_modules/cacache/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/cacache/node_modules/glob": {
-      "version": "10.4.2",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.2.tgz",
-      "integrity": "sha512-GwMlUF6PkPo3Gk21UxkCohOv0PLcIXVtKyLlpEI28R/cO/4eNOdmLk3CMW1wROV/WR/EsZOWAfBbBOqYvs88/w==",
-      "dev": true,
-      "dependencies": {
-        "foreground-child": "^3.1.0",
-        "jackspeak": "^3.1.2",
-        "minimatch": "^9.0.4",
-        "minipass": "^7.1.2",
-        "package-json-from-dist": "^1.0.0",
-        "path-scurry": "^1.11.1"
-      },
-      "bin": {
-        "glob": "dist/esm/bin.mjs"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/cacache/node_modules/lru-cache": {
-      "version": "10.2.2",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz",
-      "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==",
-      "dev": true,
-      "engines": {
-        "node": "14 || >=16.14"
-      }
-    },
-    "node_modules/cacache/node_modules/minimatch": {
-      "version": "9.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz",
-      "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/call-bind": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
-      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
-      "dev": true,
-      "dependencies": {
-        "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.4",
-        "set-function-length": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/camelcase-css": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz",
-      "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/caniuse-lite": {
-      "version": "1.0.30001636",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001636.tgz",
-      "integrity": "sha512-bMg2vmr8XBsbL6Lr0UHXy/21m84FTxDLWn2FSqMd5PrlbMxwJlQnC2YWYxVgp66PZE+BBNF2jYQUBKCo1FDeZg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ]
-    },
-    "node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/chardet": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
-      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
-      "dev": true
-    },
-    "node_modules/chokidar": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
-      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
-      "dev": true,
-      "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
-      },
-      "engines": {
-        "node": ">= 8.10.0"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/chownr": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/chrome-trace-event": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
-      "integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
-    "node_modules/clean-stack": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-      "dev": true,
-      "dependencies": {
-        "restore-cursor": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cli-spinners": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz",
-      "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/cli-width": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-4.1.0.tgz",
-      "integrity": "sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 12"
-      }
-    },
-    "node_modules/cliui": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.1",
-        "wrap-ansi": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/cliui/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/cliui/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/cliui/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/cliui/node_modules/wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
-    "node_modules/clone": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-      "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/clone-deep": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
-      "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
-      "dev": true,
-      "dependencies": {
-        "is-plain-object": "^2.0.4",
-        "kind-of": "^6.0.2",
-        "shallow-clone": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "dev": true
-    },
-    "node_modules/colorette": {
-      "version": "2.0.20",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
-      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
-      "dev": true
-    },
-    "node_modules/commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true
-    },
-    "node_modules/common-path-prefix": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz",
-      "integrity": "sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==",
-      "dev": true
-    },
-    "node_modules/compressible": {
-      "version": "2.0.18",
-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
-      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
-      "dev": true,
-      "dependencies": {
-        "mime-db": ">= 1.43.0 < 2"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/compression": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
-      "dev": true,
-      "dependencies": {
-        "accepts": "~1.3.5",
-        "bytes": "3.0.0",
-        "compressible": "~2.0.16",
-        "debug": "2.6.9",
-        "on-headers": "~1.0.2",
-        "safe-buffer": "5.1.2",
-        "vary": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/compression/node_modules/bytes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-      "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/compression/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/compression/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/compression/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
-    },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "dev": true
-    },
-    "node_modules/connect": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
-      "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==",
-      "dev": true,
-      "dependencies": {
-        "debug": "2.6.9",
-        "finalhandler": "1.1.2",
-        "parseurl": "~1.3.3",
-        "utils-merge": "1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
-      }
-    },
-    "node_modules/connect-history-api-fallback": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
-      "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/connect/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/connect/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/content-disposition": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
-      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "5.2.1"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/content-type": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
-      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/convert-source-map": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
-      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
-      "dev": true
-    },
-    "node_modules/cookie": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
-      "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/cookie-signature": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
-      "dev": true
-    },
-    "node_modules/copy-anything": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.6.tgz",
-      "integrity": "sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==",
-      "dev": true,
-      "dependencies": {
-        "is-what": "^3.14.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mesqueeb"
-      }
-    },
-    "node_modules/copy-webpack-plugin": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz",
-      "integrity": "sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==",
-      "dev": true,
-      "dependencies": {
-        "fast-glob": "^3.2.11",
-        "glob-parent": "^6.0.1",
-        "globby": "^13.1.1",
-        "normalize-path": "^3.0.0",
-        "schema-utils": "^4.0.0",
-        "serialize-javascript": "^6.0.0"
-      },
-      "engines": {
-        "node": ">= 14.15.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.1.0"
-      }
-    },
-    "node_modules/copy-webpack-plugin/node_modules/glob-parent": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.3"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/core-js-compat": {
-      "version": "3.37.1",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.37.1.tgz",
-      "integrity": "sha512-9TNiImhKvQqSUkOvk/mMRZzOANTiEVC7WaBNhHcKM7x+/5E1l5NvsysR19zuDQScE8k+kfQXWRN3AtS/eOSHpg==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.23.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
-      }
-    },
-    "node_modules/core-util-is": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
-      "dev": true
-    },
-    "node_modules/cors": {
-      "version": "2.8.5",
-      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
-      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
-      "dev": true,
-      "dependencies": {
-        "object-assign": "^4",
-        "vary": "^1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/cosmiconfig": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz",
-      "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==",
-      "dev": true,
-      "dependencies": {
-        "env-paths": "^2.2.1",
-        "import-fresh": "^3.3.0",
-        "js-yaml": "^4.1.0",
-        "parse-json": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/d-fischer"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.9.5"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/critters": {
-      "version": "0.0.22",
-      "resolved": "https://registry.npmjs.org/critters/-/critters-0.0.22.tgz",
-      "integrity": "sha512-NU7DEcQZM2Dy8XTKFHxtdnIM/drE312j2T4PCVaSUcS0oBeyT/NImpRw/Ap0zOr/1SE7SgPK9tGPg1WK/sVakw==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^4.1.0",
-        "css-select": "^5.1.0",
-        "dom-serializer": "^2.0.0",
-        "domhandler": "^5.0.2",
-        "htmlparser2": "^8.0.2",
-        "postcss": "^8.4.23",
-        "postcss-media-query-parser": "^0.2.3"
-      }
-    },
-    "node_modules/critters/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/critters/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/critters/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/critters/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/critters/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/critters/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "dev": true,
-      "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/cross-spawn/node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/css-loader": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-7.1.1.tgz",
-      "integrity": "sha512-OxIR5P2mjO1PSXk44bWuQ8XtMK4dpEqpIyERCx3ewOo3I8EmbcxMPUc5ScLtQfgXtOojoMv57So4V/C02HQLsw==",
-      "dev": true,
-      "dependencies": {
-        "icss-utils": "^5.1.0",
-        "postcss": "^8.4.33",
-        "postcss-modules-extract-imports": "^3.1.0",
-        "postcss-modules-local-by-default": "^4.0.5",
-        "postcss-modules-scope": "^3.2.0",
-        "postcss-modules-values": "^4.0.0",
-        "postcss-value-parser": "^4.2.0",
-        "semver": "^7.5.4"
-      },
-      "engines": {
-        "node": ">= 18.12.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "@rspack/core": "0.x || 1.x",
-        "webpack": "^5.27.0"
-      },
-      "peerDependenciesMeta": {
-        "@rspack/core": {
-          "optional": true
-        },
-        "webpack": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/css-select": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz",
-      "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==",
-      "dev": true,
-      "dependencies": {
-        "boolbase": "^1.0.0",
-        "css-what": "^6.1.0",
-        "domhandler": "^5.0.2",
-        "domutils": "^3.0.1",
-        "nth-check": "^2.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
-      }
-    },
-    "node_modules/css-what": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
-      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
-      }
-    },
-    "node_modules/cssesc": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-      "dev": true,
-      "bin": {
-        "cssesc": "bin/cssesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/custom-event": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
-      "integrity": "sha512-GAj5FOq0Hd+RsCGVJxZuKaIDXDf3h6GQoNEjFgbLLI/trgtavwUbSnZ5pVfg27DVCaWjIohryS0JFwIJyT2cMg==",
-      "dev": true
-    },
-    "node_modules/date-format": {
-      "version": "4.0.14",
-      "resolved": "https://registry.npmjs.org/date-format/-/date-format-4.0.14.tgz",
-      "integrity": "sha512-39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/debug": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
-      "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/default-browser": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-5.2.1.tgz",
-      "integrity": "sha512-WY/3TUME0x3KPYdRRxEJJvXRHV4PyPoUsxtZa78lwItwRQRHhd2U9xOscaT/YTf8uCXIAjeJOFBVEh/7FtD8Xg==",
-      "dev": true,
-      "dependencies": {
-        "bundle-name": "^4.1.0",
-        "default-browser-id": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/default-browser-id": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/default-browser-id/-/default-browser-id-5.0.0.tgz",
-      "integrity": "sha512-A6p/pu/6fyBcA1TRz/GqWYPViplrftcW2gZC9q79ngNCKAeR/X3gcEdXQHl4KNXV+3wgIJ1CPkJQ3IHM6lcsyA==",
-      "dev": true,
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/default-gateway": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
-      "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
-      "dev": true,
-      "dependencies": {
-        "execa": "^5.0.0"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/defaults": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
-      "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==",
-      "dev": true,
-      "dependencies": {
-        "clone": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/define-data-property": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
-      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
-      "dev": true,
-      "dependencies": {
-        "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "gopd": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/define-lazy-prop": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
-      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/depd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/destroy": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
-      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8",
-        "npm": "1.2.8000 || >= 1.4.16"
-      }
-    },
-    "node_modules/detect-libc": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz",
-      "integrity": "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/detect-node": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
-      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
-      "dev": true
-    },
-    "node_modules/di": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
-      "integrity": "sha512-uJaamHkagcZtHPqCIHZxnFrXlunQXgBOsZSUOWwFw31QJCAbyTBoHMW75YOTur5ZNx8pIeAKgf6GWIgaqqiLhA==",
-      "dev": true
-    },
-    "node_modules/didyoumean": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",
-      "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==",
-      "dev": true
-    },
-    "node_modules/dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "dev": true,
-      "dependencies": {
-        "path-type": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/dlv": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
-      "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==",
-      "dev": true
-    },
-    "node_modules/dns-packet": {
-      "version": "5.6.1",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.1.tgz",
-      "integrity": "sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==",
-      "dev": true,
-      "dependencies": {
-        "@leichtgewicht/ip-codec": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/dom-serialize": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz",
-      "integrity": "sha512-Yra4DbvoW7/Z6LBN560ZwXMjoNOSAN2wRsKFGc4iBeso+mpIA6qj1vfdf9HpMaKAqG6wXTy+1SYEzmNpKXOSsQ==",
-      "dev": true,
-      "dependencies": {
-        "custom-event": "~1.0.0",
-        "ent": "~2.2.0",
-        "extend": "^3.0.0",
-        "void-elements": "^2.0.0"
-      }
-    },
-    "node_modules/dom-serializer": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
-      "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
-      "dev": true,
-      "dependencies": {
-        "domelementtype": "^2.3.0",
-        "domhandler": "^5.0.2",
-        "entities": "^4.2.0"
-      },
-      "funding": {
-        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
-      }
-    },
-    "node_modules/domelementtype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ]
-    },
-    "node_modules/domhandler": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
-      "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
-      "dev": true,
-      "dependencies": {
-        "domelementtype": "^2.3.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domhandler?sponsor=1"
-      }
-    },
-    "node_modules/domutils": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
-      "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==",
-      "dev": true,
-      "dependencies": {
-        "dom-serializer": "^2.0.0",
-        "domelementtype": "^2.3.0",
-        "domhandler": "^5.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domutils?sponsor=1"
-      }
-    },
-    "node_modules/eastasianwidth": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
-      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
-      "dev": true
-    },
-    "node_modules/echarts": {
-      "version": "5.5.1",
-      "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.5.1.tgz",
-      "integrity": "sha512-Fce8upazaAXUVUVsjgV6mBnGuqgO+JNDlcgF79Dksy4+wgGpQB2lmYoO4TSweFg/mZITdpGHomw/cNBJZj1icA==",
-      "dependencies": {
-        "tslib": "2.3.0",
-        "zrender": "5.6.0"
-      }
-    },
-    "node_modules/echarts/node_modules/tslib": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
-      "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
-    },
-    "node_modules/ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
-      "dev": true
-    },
-    "node_modules/electron-to-chromium": {
-      "version": "1.4.810",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.810.tgz",
-      "integrity": "sha512-Kaxhu4T7SJGpRQx99tq216gCq2nMxJo+uuT6uzz9l8TVN2stL7M06MIIXAtr9jsrLs2Glflgf2vMQRepxawOdQ==",
-      "dev": true
-    },
-    "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/emojis-list": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/encoding": {
-      "version": "0.1.13",
-      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
-      "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "iconv-lite": "^0.6.2"
-      }
-    },
-    "node_modules/encoding/node_modules/iconv-lite": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/engine.io": {
-      "version": "6.5.5",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.5.5.tgz",
-      "integrity": "sha512-C5Pn8Wk+1vKBoHghJODM63yk8MvrO9EWZUfkAt5HAqIgPE4/8FF0PEGHXtEd40l223+cE5ABWuPzm38PHFXfMA==",
-      "dev": true,
-      "dependencies": {
-        "@types/cookie": "^0.4.1",
-        "@types/cors": "^2.8.12",
-        "@types/node": ">=10.0.0",
-        "accepts": "~1.3.4",
-        "base64id": "2.0.0",
-        "cookie": "~0.4.1",
-        "cors": "~2.8.5",
-        "debug": "~4.3.1",
-        "engine.io-parser": "~5.2.1",
-        "ws": "~8.17.1"
-      },
-      "engines": {
-        "node": ">=10.2.0"
-      }
-    },
-    "node_modules/engine.io-parser": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.2.tgz",
-      "integrity": "sha512-RcyUFKA93/CXH20l4SoVvzZfrSDMOTUS3bWVpTt2FuFP+XYrL8i8oonHP7WInRyVHXh0n/ORtoeiE1os+8qkSw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/enhanced-resolve": {
-      "version": "5.17.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.0.tgz",
-      "integrity": "sha512-dwDPwZL0dmye8Txp2gzFmA6sxALaSvdRDjPH0viLcKrtlOL3tw62nWWweVD1SdILDTJrbrL6tdWVN58Wo6U3eA==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.2.4",
-        "tapable": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/ent": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.1.tgz",
-      "integrity": "sha512-QHuXVeZx9d+tIQAz/XztU0ZwZf2Agg9CcXcgE1rurqvdBeDBrpSwjl8/6XUqMg7tw2Y7uAdKb2sRv+bSEFqQ5A==",
-      "dev": true,
-      "dependencies": {
-        "punycode": "^1.4.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/entities": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
-      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
-      "devOptional": true,
-      "engines": {
-        "node": ">=0.12"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
-    "node_modules/env-paths": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
-      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/err-code": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
-      "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==",
-      "dev": true
-    },
-    "node_modules/errno": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
-      "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "prr": "~1.0.1"
-      },
-      "bin": {
-        "errno": "cli.js"
-      }
-    },
-    "node_modules/error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "dev": true,
-      "dependencies": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "node_modules/es-define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
-      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
-      "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.2.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/es-errors": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
-      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/es-module-lexer": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.3.tgz",
-      "integrity": "sha512-i1gCgmR9dCl6Vil6UKPI/trA69s08g/syhiDK9TG0Nf1RJjjFI+AzoWW7sPufzkgYAn861skuCwJa0pIIHYxvg==",
-      "dev": true
-    },
-    "node_modules/esbuild": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.3.tgz",
-      "integrity": "sha512-Kgq0/ZsAPzKrbOjCQcjoSmPoWhlcVnGAUo7jvaLHoxW1Drto0KGkR1xBNg2Cp43b9ImvxmPEJZ9xkfcnqPsfBw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "bin": {
-        "esbuild": "bin/esbuild"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.21.3",
-        "@esbuild/android-arm": "0.21.3",
-        "@esbuild/android-arm64": "0.21.3",
-        "@esbuild/android-x64": "0.21.3",
-        "@esbuild/darwin-arm64": "0.21.3",
-        "@esbuild/darwin-x64": "0.21.3",
-        "@esbuild/freebsd-arm64": "0.21.3",
-        "@esbuild/freebsd-x64": "0.21.3",
-        "@esbuild/linux-arm": "0.21.3",
-        "@esbuild/linux-arm64": "0.21.3",
-        "@esbuild/linux-ia32": "0.21.3",
-        "@esbuild/linux-loong64": "0.21.3",
-        "@esbuild/linux-mips64el": "0.21.3",
-        "@esbuild/linux-ppc64": "0.21.3",
-        "@esbuild/linux-riscv64": "0.21.3",
-        "@esbuild/linux-s390x": "0.21.3",
-        "@esbuild/linux-x64": "0.21.3",
-        "@esbuild/netbsd-x64": "0.21.3",
-        "@esbuild/openbsd-x64": "0.21.3",
-        "@esbuild/sunos-x64": "0.21.3",
-        "@esbuild/win32-arm64": "0.21.3",
-        "@esbuild/win32-ia32": "0.21.3",
-        "@esbuild/win32-x64": "0.21.3"
-      }
-    },
-    "node_modules/esbuild-wasm": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.21.3.tgz",
-      "integrity": "sha512-DMOV+eeVra0yVq3XIojfczdEQsz+RiFnpEj7lqs8Gux9mlTpN7yIbw0a4KzLspn0Uhw6UVEH3nUAidSqc/rcQg==",
-      "dev": true,
-      "bin": {
-        "esbuild": "bin/esbuild"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/escalade": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
-      "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
-      "dev": true
-    },
-    "node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dev": true,
-      "dependencies": {
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esrecurse/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/etag": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/eventemitter3": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
-      "dev": true
-    },
-    "node_modules/events": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
-      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.x"
-      }
-    },
-    "node_modules/execa": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-      "dev": true,
-      "dependencies": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^6.0.0",
-        "human-signals": "^2.1.0",
-        "is-stream": "^2.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.1",
-        "onetime": "^5.1.2",
-        "signal-exit": "^3.0.3",
-        "strip-final-newline": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
-      }
-    },
-    "node_modules/exponential-backoff": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz",
-      "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==",
-      "dev": true
-    },
-    "node_modules/express": {
-      "version": "4.19.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",
-      "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
-      "dev": true,
-      "dependencies": {
-        "accepts": "~1.3.8",
-        "array-flatten": "1.1.1",
-        "body-parser": "1.20.2",
-        "content-disposition": "0.5.4",
-        "content-type": "~1.0.4",
-        "cookie": "0.6.0",
-        "cookie-signature": "1.0.6",
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "finalhandler": "1.2.0",
-        "fresh": "0.5.2",
-        "http-errors": "2.0.0",
-        "merge-descriptors": "1.0.1",
-        "methods": "~1.1.2",
-        "on-finished": "2.4.1",
-        "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.7",
-        "qs": "6.11.0",
-        "range-parser": "~1.2.1",
-        "safe-buffer": "5.2.1",
-        "send": "0.18.0",
-        "serve-static": "1.15.0",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
-        "type-is": "~1.6.18",
-        "utils-merge": "1.0.1",
-        "vary": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
-      }
-    },
-    "node_modules/express/node_modules/cookie": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
-      "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/express/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/express/node_modules/finalhandler": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
-      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
-      "dev": true,
-      "dependencies": {
-        "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "on-finished": "2.4.1",
-        "parseurl": "~1.3.3",
-        "statuses": "2.0.1",
-        "unpipe": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/express/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/express/node_modules/statuses": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-      "dev": true
-    },
-    "node_modules/external-editor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
-      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
-      "dev": true,
-      "dependencies": {
-        "chardet": "^0.7.0",
-        "iconv-lite": "^0.4.24",
-        "tmp": "^0.0.33"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
-    },
-    "node_modules/fast-glob": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
-      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
-      },
-      "engines": {
-        "node": ">=8.6.0"
-      }
-    },
-    "node_modules/fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
-    },
-    "node_modules/fastq": {
-      "version": "1.17.1",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
-      "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
-      "dev": true,
-      "dependencies": {
-        "reusify": "^1.0.4"
-      }
-    },
-    "node_modules/faye-websocket": {
-      "version": "0.11.4",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
-      "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
-      "dev": true,
-      "dependencies": {
-        "websocket-driver": ">=0.5.1"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/fill-range": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
-      "dev": true,
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
-        "unpipe": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/finalhandler/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/finalhandler/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/finalhandler/node_modules/on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
-      "dev": true,
-      "dependencies": {
-        "ee-first": "1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/find-cache-dir": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-4.0.0.tgz",
-      "integrity": "sha512-9ZonPT4ZAK4a+1pUPVPZJapbi7O5qbbJPdYw/NOQWZZbVLdDTYM3A4R9z/DpAM08IDaFGsvPgiGZ82WEwUDWjg==",
-      "dev": true,
-      "dependencies": {
-        "common-path-prefix": "^3.0.0",
-        "pkg-dir": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=14.16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/find-up": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz",
-      "integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^7.1.0",
-        "path-exists": "^5.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/flat": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
-      "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
-      "dev": true,
-      "bin": {
-        "flat": "cli.js"
-      }
-    },
-    "node_modules/flatted": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
-      "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
-      "dev": true
-    },
-    "node_modules/follow-redirects": {
-      "version": "1.15.6",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
-      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://github.com/sponsors/RubenVerborgh"
-        }
-      ],
-      "engines": {
-        "node": ">=4.0"
-      },
-      "peerDependenciesMeta": {
-        "debug": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/foreground-child": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.2.1.tgz",
-      "integrity": "sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==",
-      "dev": true,
-      "dependencies": {
-        "cross-spawn": "^7.0.0",
-        "signal-exit": "^4.0.1"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/foreground-child/node_modules/signal-exit": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-      "dev": true,
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/forwarded": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
-      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/fraction.js": {
-      "version": "4.3.7",
-      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz",
-      "integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "type": "patreon",
-        "url": "https://github.com/sponsors/rawify"
-      }
-    },
-    "node_modules/fresh": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/fs-extra": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=6 <7 || >=8"
-      }
-    },
-    "node_modules/fs-minipass": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz",
-      "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==",
-      "dev": true,
-      "dependencies": {
-        "minipass": "^7.0.3"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "dev": true
-    },
-    "node_modules/fsevents": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
-    "node_modules/function-bind": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/gensync": {
-      "version": "1.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "dev": true,
-      "engines": {
-        "node": "6.* || 8.* || >= 10.*"
-      }
-    },
-    "node_modules/get-intrinsic": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
-      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
-      "dev": true,
-      "dependencies": {
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "hasown": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/get-stream": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "deprecated": "Glob versions prior to v9 are no longer supported",
-      "dev": true,
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/glob-to-regexp": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
-      "dev": true
-    },
-    "node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/globby": {
-      "version": "13.2.2",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz",
-      "integrity": "sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==",
-      "dev": true,
-      "dependencies": {
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.3.0",
-        "ignore": "^5.2.4",
-        "merge2": "^1.4.1",
-        "slash": "^4.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
-      "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.1.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/graceful-fs": {
-      "version": "4.2.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
-      "dev": true
-    },
-    "node_modules/handle-thing": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
-      "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
-      "dev": true
-    },
-    "node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/has-property-descriptors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
-      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
-      "dev": true,
-      "dependencies": {
-        "es-define-property": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-proto": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
-      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/hasown": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/hosted-git-info": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.2.tgz",
-      "integrity": "sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^10.0.1"
-      },
-      "engines": {
-        "node": "^16.14.0 || >=18.0.0"
-      }
-    },
-    "node_modules/hosted-git-info/node_modules/lru-cache": {
-      "version": "10.2.2",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz",
-      "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==",
-      "dev": true,
-      "engines": {
-        "node": "14 || >=16.14"
-      }
-    },
-    "node_modules/hpack.js": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
-      "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "obuf": "^1.0.0",
-        "readable-stream": "^2.0.1",
-        "wbuf": "^1.1.0"
-      }
-    },
-    "node_modules/hpack.js/node_modules/readable-stream": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
-      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "node_modules/hpack.js/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
-    },
-    "node_modules/hpack.js/node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
-    "node_modules/html-entities": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.5.2.tgz",
-      "integrity": "sha512-K//PSRMQk4FZ78Kyau+mZurHn3FH0Vwr+H36eE0rPbeYkRRi9YxceYPhuN60UwWorxyKHhqoAJl2OFKa4BVtaA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/mdevils"
-        },
-        {
-          "type": "patreon",
-          "url": "https://patreon.com/mdevils"
-        }
-      ]
-    },
-    "node_modules/html-escaper": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
-      "dev": true
-    },
-    "node_modules/htmlparser2": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz",
-      "integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==",
-      "dev": true,
-      "funding": [
-        "https://github.com/fb55/htmlparser2?sponsor=1",
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ],
-      "dependencies": {
-        "domelementtype": "^2.3.0",
-        "domhandler": "^5.0.3",
-        "domutils": "^3.0.1",
-        "entities": "^4.4.0"
-      }
-    },
-    "node_modules/http-cache-semantics": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
-      "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",
-      "dev": true
-    },
-    "node_modules/http-deceiver": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
-      "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==",
-      "dev": true
-    },
-    "node_modules/http-errors": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
-      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
-      "dev": true,
-      "dependencies": {
-        "depd": "2.0.0",
-        "inherits": "2.0.4",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
-        "toidentifier": "1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/http-errors/node_modules/statuses": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/http-parser-js": {
-      "version": "0.5.8",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
-      "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==",
-      "dev": true
-    },
-    "node_modules/http-proxy": {
-      "version": "1.18.1",
-      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
-      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
-      "dev": true,
-      "dependencies": {
-        "eventemitter3": "^4.0.0",
-        "follow-redirects": "^1.0.0",
-        "requires-port": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/http-proxy-agent": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
-      "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
-      "dev": true,
-      "dependencies": {
-        "agent-base": "^7.1.0",
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/http-proxy-middleware": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-3.0.0.tgz",
-      "integrity": "sha512-36AV1fIaI2cWRzHo+rbcxhe3M3jUDCNzc4D5zRl57sEWRAxdXYtw7FSQKYY6PDKssiAKjLYypbssHk+xs/kMXw==",
-      "dev": true,
-      "dependencies": {
-        "@types/http-proxy": "^1.17.10",
-        "debug": "^4.3.4",
-        "http-proxy": "^1.18.1",
-        "is-glob": "^4.0.1",
-        "is-plain-obj": "^3.0.0",
-        "micromatch": "^4.0.5"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/https-proxy-agent": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz",
-      "integrity": "sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==",
-      "dev": true,
-      "dependencies": {
-        "agent-base": "^7.0.2",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/human-signals": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.17.0"
-      }
-    },
-    "node_modules/hyperdyperid": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/hyperdyperid/-/hyperdyperid-1.2.0.tgz",
-      "integrity": "sha512-Y93lCzHYgGWdrJ66yIktxiaGULYc6oGiABxhcO5AufBeOyoIdZF7bIfLaOrbM0iGIOXQQgxxRrFEnb+Y6w1n4A==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.18"
-      }
-    },
-    "node_modules/iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "dev": true,
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/icss-utils": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
-      "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
-      "dev": true,
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/ignore": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
-      "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/ignore-walk": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.5.tgz",
-      "integrity": "sha512-VuuG0wCnjhnylG1ABXT3dAuIpTNDs/G8jlpmwXY03fXoXy/8ZK8/T+hMzt8L4WnrLCJgdybqgPagnF/f97cg3A==",
-      "dev": true,
-      "dependencies": {
-        "minimatch": "^9.0.0"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/ignore-walk/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/ignore-walk/node_modules/minimatch": {
-      "version": "9.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz",
-      "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/image-size": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
-      "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==",
-      "dev": true,
-      "optional": true,
-      "bin": {
-        "image-size": "bin/image-size.js"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/immutable": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.6.tgz",
-      "integrity": "sha512-Ju0+lEMyzMVZarkTn/gqRpdqd5dOPaz1mCZ0SH3JV6iFw81PldE/PEB1hWVEA288HPt4WXW8O7AWxB10M+03QQ==",
-      "dev": true
-    },
-    "node_modules/import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "dev": true,
-      "dependencies": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.19"
-      }
-    },
-    "node_modules/indent-string": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
-      "dev": true,
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
-    "node_modules/ini": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.2.tgz",
-      "integrity": "sha512-AMB1mvwR1pyBFY/nSevUX6y8nJWS63/SzUKD3JyQn97s4xgIdgQPT75IRouIiBAN4yLQBUShNYVW0+UG25daCw==",
-      "dev": true,
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/inquirer": {
-      "version": "9.2.22",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-9.2.22.tgz",
-      "integrity": "sha512-SqLLa/Oe5rZUagTR9z+Zd6izyatHglbmbvVofo1KzuVB54YHleWzeHNLoR7FOICGOeQSqeLh1cordb3MzhGcEw==",
-      "dev": true,
-      "dependencies": {
-        "@inquirer/figures": "^1.0.2",
-        "@ljharb/through": "^2.3.13",
-        "ansi-escapes": "^4.3.2",
-        "chalk": "^5.3.0",
-        "cli-cursor": "^3.1.0",
-        "cli-width": "^4.1.0",
-        "external-editor": "^3.1.0",
-        "lodash": "^4.17.21",
-        "mute-stream": "1.0.0",
-        "ora": "^5.4.1",
-        "run-async": "^3.0.0",
-        "rxjs": "^7.8.1",
-        "string-width": "^4.2.3",
-        "strip-ansi": "^6.0.1",
-        "wrap-ansi": "^6.2.0"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/inquirer/node_modules/chalk": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
-      "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
-      "dev": true,
-      "engines": {
-        "node": "^12.17.0 || ^14.13 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/ip-address": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
-      "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
-      "dev": true,
-      "dependencies": {
-        "jsbn": "1.1.0",
-        "sprintf-js": "^1.1.3"
-      },
-      "engines": {
-        "node": ">= 12"
-      }
-    },
-    "node_modules/ipaddr.js": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.2.0.tgz",
-      "integrity": "sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
-      "dev": true
-    },
-    "node_modules/is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "dev": true,
-      "dependencies": {
-        "binary-extensions": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-core-module": {
-      "version": "2.14.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.14.0.tgz",
-      "integrity": "sha512-a5dFJih5ZLYlRtDc0dZWP7RiKr6xIKzmn/oAYCDvdLThadVgyJwlaoQPmRtMSpz+rk0OGAgIu+TcM9HUF0fk1A==",
-      "dev": true,
-      "dependencies": {
-        "hasown": "^2.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-docker": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
-      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
-      "dev": true,
-      "bin": {
-        "is-docker": "cli.js"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-inside-container": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-inside-container/-/is-inside-container-1.0.0.tgz",
-      "integrity": "sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==",
-      "dev": true,
-      "dependencies": {
-        "is-docker": "^3.0.0"
-      },
-      "bin": {
-        "is-inside-container": "cli.js"
-      },
-      "engines": {
-        "node": ">=14.16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-inside-container/node_modules/is-docker": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz",
-      "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==",
-      "dev": true,
-      "bin": {
-        "is-docker": "cli.js"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-interactive": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
-      "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-lambda": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz",
-      "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==",
-      "dev": true
-    },
-    "node_modules/is-network-error": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-network-error/-/is-network-error-1.1.0.tgz",
-      "integrity": "sha512-tUdRRAnhT+OtCZR/LxZelH/C7QtjtFrTu5tXCA8pl55eTUElUHT+GPYV8MBMBvea/j+NxQqVt3LbWMRir7Gx9g==",
-      "dev": true,
-      "engines": {
-        "node": ">=16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/is-plain-obj": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
-      "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-stream": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-unicode-supported": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
-      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-what": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz",
-      "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==",
-      "dev": true
-    },
-    "node_modules/is-wsl": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-      "dev": true,
-      "dependencies": {
-        "is-docker": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
-      "dev": true
-    },
-    "node_modules/isbinaryfile": {
-      "version": "4.0.10",
-      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.10.tgz",
-      "integrity": "sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/gjtorikian/"
-      }
-    },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-      "dev": true
-    },
-    "node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/istanbul-lib-coverage": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
-      "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/istanbul-lib-instrument": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.2.tgz",
-      "integrity": "sha512-1WUsZ9R1lA0HtBSohTkm39WTPlNKSJ5iFk7UwqXkBLoHQT+hfqPsfsTDVuZdKGaBwn7din9bS7SsnoAr943hvw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/core": "^7.23.9",
-        "@babel/parser": "^7.23.9",
-        "@istanbuljs/schema": "^0.1.3",
-        "istanbul-lib-coverage": "^3.2.0",
-        "semver": "^7.5.4"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/istanbul-lib-report": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
-      "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
-      "dev": true,
-      "dependencies": {
-        "istanbul-lib-coverage": "^3.0.0",
-        "make-dir": "^4.0.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/istanbul-lib-report/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/istanbul-lib-report/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/istanbul-lib-source-maps": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
-      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.1.1",
-        "istanbul-lib-coverage": "^3.0.0",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/istanbul-lib-source-maps/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/istanbul-reports": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
-      "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
-      "dev": true,
-      "dependencies": {
-        "html-escaper": "^2.0.0",
-        "istanbul-lib-report": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jackspeak": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.0.tgz",
-      "integrity": "sha512-JVYhQnN59LVPFCEcVa2C3CrEKYacvjRfqIQl+h8oi91aLYQVWRYbxjPcv1bUiUy/kLmQaANrYfNMCO3kuEDHfw==",
-      "dev": true,
-      "dependencies": {
-        "@isaacs/cliui": "^8.0.2"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      },
-      "optionalDependencies": {
-        "@pkgjs/parseargs": "^0.11.0"
-      }
-    },
-    "node_modules/jasmine-core": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-5.1.2.tgz",
-      "integrity": "sha512-2oIUMGn00FdUiqz6epiiJr7xcFyNYj3rDcfmnzfkBnHyBQ3cBQUs4mmyGsOb7TTLb9kxk7dBcmEmqhDKkBoDyA==",
-      "dev": true
-    },
-    "node_modules/jest-worker": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
-      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      }
-    },
-    "node_modules/jest-worker/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-worker/node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
-      }
-    },
-    "node_modules/jiti": {
-      "version": "1.21.6",
-      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.6.tgz",
-      "integrity": "sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==",
-      "dev": true,
-      "bin": {
-        "jiti": "bin/jiti.js"
-      }
-    },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
-    },
-    "node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/jsbn": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
-      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==",
-      "dev": true
-    },
-    "node_modules/jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "dev": true,
-      "bin": {
-        "jsesc": "bin/jsesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/json-parse-even-better-errors": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.2.tgz",
-      "integrity": "sha512-fi0NG4bPjCHunUJffmLd0gxssIgkNmArMvis4iNah6Owg1MCJjWhEcDLmsK6iGkJq3tHwbDkTlce70/tmXN4cQ==",
-      "dev": true,
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true
-    },
-    "node_modules/json5": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
-      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-      "dev": true,
-      "bin": {
-        "json5": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/jsonc-parser": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz",
-      "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==",
-      "dev": true
-    },
-    "node_modules/jsonfile": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
-      "dev": true,
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/jsonparse": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
-      "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==",
-      "dev": true,
-      "engines": [
-        "node >= 0.2.0"
-      ]
-    },
-    "node_modules/karma": {
-      "version": "6.4.3",
-      "resolved": "https://registry.npmjs.org/karma/-/karma-6.4.3.tgz",
-      "integrity": "sha512-LuucC/RE92tJ8mlCwqEoRWXP38UMAqpnq98vktmS9SznSoUPPUJQbc91dHcxcunROvfQjdORVA/YFviH+Xci9Q==",
-      "dev": true,
-      "dependencies": {
-        "@colors/colors": "1.5.0",
-        "body-parser": "^1.19.0",
-        "braces": "^3.0.2",
-        "chokidar": "^3.5.1",
-        "connect": "^3.7.0",
-        "di": "^0.0.1",
-        "dom-serialize": "^2.2.1",
-        "glob": "^7.1.7",
-        "graceful-fs": "^4.2.6",
-        "http-proxy": "^1.18.1",
-        "isbinaryfile": "^4.0.8",
-        "lodash": "^4.17.21",
-        "log4js": "^6.4.1",
-        "mime": "^2.5.2",
-        "minimatch": "^3.0.4",
-        "mkdirp": "^0.5.5",
-        "qjobs": "^1.2.0",
-        "range-parser": "^1.2.1",
-        "rimraf": "^3.0.2",
-        "socket.io": "^4.7.2",
-        "source-map": "^0.6.1",
-        "tmp": "^0.2.1",
-        "ua-parser-js": "^0.7.30",
-        "yargs": "^16.1.1"
-      },
-      "bin": {
-        "karma": "bin/karma"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/karma-chrome-launcher": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-3.2.0.tgz",
-      "integrity": "sha512-rE9RkUPI7I9mAxByQWkGJFXfFD6lE4gC5nPuZdobf/QdTEJI6EU4yIay/cfU/xV4ZxlM5JiTv7zWYgA64NpS5Q==",
-      "dev": true,
-      "dependencies": {
-        "which": "^1.2.1"
-      }
-    },
-    "node_modules/karma-coverage": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/karma-coverage/-/karma-coverage-2.2.1.tgz",
-      "integrity": "sha512-yj7hbequkQP2qOSb20GuNSIyE//PgJWHwC2IydLE6XRtsnaflv+/OSGNssPjobYUlhVVagy99TQpqUt3vAUG7A==",
-      "dev": true,
-      "dependencies": {
-        "istanbul-lib-coverage": "^3.2.0",
-        "istanbul-lib-instrument": "^5.1.0",
-        "istanbul-lib-report": "^3.0.0",
-        "istanbul-lib-source-maps": "^4.0.1",
-        "istanbul-reports": "^3.0.5",
-        "minimatch": "^3.0.4"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/karma-coverage/node_modules/istanbul-lib-instrument": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
-      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/core": "^7.12.3",
-        "@babel/parser": "^7.14.7",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-coverage": "^3.2.0",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/karma-coverage/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/karma-jasmine": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-5.1.0.tgz",
-      "integrity": "sha512-i/zQLFrfEpRyQoJF9fsCdTMOF5c2dK7C7OmsuKg2D0YSsuZSfQDiLuaiktbuio6F2wiCsZSnSnieIQ0ant/uzQ==",
-      "dev": true,
-      "dependencies": {
-        "jasmine-core": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "peerDependencies": {
-        "karma": "^6.0.0"
-      }
-    },
-    "node_modules/karma-jasmine-html-reporter": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-2.1.0.tgz",
-      "integrity": "sha512-sPQE1+nlsn6Hwb5t+HHwyy0A1FNCVKuL1192b+XNauMYWThz2kweiBVW1DqloRpVvZIJkIoHVB7XRpK78n1xbQ==",
-      "dev": true,
-      "peerDependencies": {
-        "jasmine-core": "^4.0.0 || ^5.0.0",
-        "karma": "^6.0.0",
-        "karma-jasmine": "^5.0.0"
-      }
-    },
-    "node_modules/karma-jasmine/node_modules/jasmine-core": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-4.6.1.tgz",
-      "integrity": "sha512-VYz/BjjmC3klLJlLwA4Kw8ytk0zDSmbbDLNs794VnWmkcCB7I9aAL/D48VNQtmITyPvea2C3jdUMfc3kAoy0PQ==",
-      "dev": true
-    },
-    "node_modules/karma-source-map-support": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/karma-source-map-support/-/karma-source-map-support-1.4.0.tgz",
-      "integrity": "sha512-RsBECncGO17KAoJCYXjv+ckIz+Ii9NCi+9enk+rq6XC81ezYkb4/RHE6CTXdA7IOJqoF3wcaLfVG0CPmE5ca6A==",
-      "dev": true,
-      "dependencies": {
-        "source-map-support": "^0.5.5"
-      }
-    },
-    "node_modules/karma/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/karma/node_modules/cliui": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^7.0.0"
-      }
-    },
-    "node_modules/karma/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/karma/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/karma/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/karma/node_modules/tmp": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz",
-      "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==",
-      "dev": true,
-      "engines": {
-        "node": ">=14.14"
-      }
-    },
-    "node_modules/karma/node_modules/wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
-    "node_modules/karma/node_modules/yargs": {
-      "version": "16.2.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
-      "dev": true,
-      "dependencies": {
-        "cliui": "^7.0.2",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.0",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^20.2.2"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/karma/node_modules/yargs-parser": {
-      "version": "20.2.9",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/launch-editor": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.8.0.tgz",
-      "integrity": "sha512-vJranOAJrI/llyWGRQqiDM+adrw+k83fvmmx3+nV47g3+36xM15jE+zyZ6Ffel02+xSvuM0b2GDRosXZkbb6wA==",
-      "dev": true,
-      "dependencies": {
-        "picocolors": "^1.0.0",
-        "shell-quote": "^1.8.1"
-      }
-    },
-    "node_modules/less": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/less/-/less-4.2.0.tgz",
-      "integrity": "sha512-P3b3HJDBtSzsXUl0im2L7gTO5Ubg8mEN6G8qoTS77iXxXX4Hvu4Qj540PZDvQ8V6DmX6iXo98k7Md0Cm1PrLaA==",
-      "dev": true,
-      "dependencies": {
-        "copy-anything": "^2.0.1",
-        "parse-node-version": "^1.0.1",
-        "tslib": "^2.3.0"
-      },
-      "bin": {
-        "lessc": "bin/lessc"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "optionalDependencies": {
-        "errno": "^0.1.1",
-        "graceful-fs": "^4.1.2",
-        "image-size": "~0.5.0",
-        "make-dir": "^2.1.0",
-        "mime": "^1.4.1",
-        "needle": "^3.1.0",
-        "source-map": "~0.6.0"
-      }
-    },
-    "node_modules/less-loader": {
-      "version": "12.2.0",
-      "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-12.2.0.tgz",
-      "integrity": "sha512-MYUxjSQSBUQmowc0l5nPieOYwMzGPUaTzB6inNW/bdPEG9zOL3eAAD1Qw5ZxSPk7we5dMojHwNODYMV1hq4EVg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 18.12.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "@rspack/core": "0.x || 1.x",
-        "less": "^3.5.0 || ^4.0.0",
-        "webpack": "^5.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@rspack/core": {
-          "optional": true
-        },
-        "webpack": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/less/node_modules/make-dir": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "pify": "^4.0.1",
-        "semver": "^5.6.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/less/node_modules/mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-      "dev": true,
-      "optional": true,
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/less/node_modules/semver": {
-      "version": "5.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-      "dev": true,
-      "optional": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/less/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/license-webpack-plugin": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-4.0.2.tgz",
-      "integrity": "sha512-771TFWFD70G1wLTC4oU2Cw4qvtmNrIw+wRvBtn+okgHl7slJVi7zfNcdmqDL72BojM30VNJ2UHylr1o77U37Jw==",
-      "dev": true,
-      "dependencies": {
-        "webpack-sources": "^3.0.0"
-      },
-      "peerDependenciesMeta": {
-        "webpack": {
-          "optional": true
-        },
-        "webpack-sources": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/lilconfig": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
-      "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/lines-and-columns": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
-      "dev": true
-    },
-    "node_modules/lmdb": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/lmdb/-/lmdb-3.0.8.tgz",
-      "integrity": "sha512-9rp8JT4jPhCRJUL7vRARa2N06OLSYzLwQsEkhC6Qu5XbcLyM/XBLMzDlgS/K7l7c5CdURLdDk9uE+hPFIogHTQ==",
-      "dev": true,
-      "hasInstallScript": true,
-      "dependencies": {
-        "msgpackr": "^1.9.9",
-        "node-addon-api": "^6.1.0",
-        "node-gyp-build-optional-packages": "5.1.1",
-        "ordered-binary": "^1.4.1",
-        "weak-lru-cache": "^1.2.2"
-      },
-      "bin": {
-        "download-lmdb-prebuilds": "bin/download-prebuilds.js"
-      },
-      "optionalDependencies": {
-        "@lmdb/lmdb-darwin-arm64": "3.0.8",
-        "@lmdb/lmdb-darwin-x64": "3.0.8",
-        "@lmdb/lmdb-linux-arm": "3.0.8",
-        "@lmdb/lmdb-linux-arm64": "3.0.8",
-        "@lmdb/lmdb-linux-x64": "3.0.8",
-        "@lmdb/lmdb-win32-x64": "3.0.8"
-      }
-    },
-    "node_modules/loader-runner": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
-      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.11.5"
-      }
-    },
-    "node_modules/loader-utils": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz",
-      "integrity": "sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 12.13.0"
-      }
-    },
-    "node_modules/locate-path": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz",
-      "integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^6.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
-    },
-    "node_modules/lodash.debounce": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-      "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
-      "dev": true
-    },
-    "node_modules/log-symbols": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^4.1.0",
-        "is-unicode-supported": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/log-symbols/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/log-symbols/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/log-symbols/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/log-symbols/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/log-symbols/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/log-symbols/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/log4js": {
-      "version": "6.9.1",
-      "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.9.1.tgz",
-      "integrity": "sha512-1somDdy9sChrr9/f4UlzhdaGfDR2c/SaD2a4T7qEkG4jTS57/B3qmnjLYePwQ8cqWnUHZI0iAKxMBpCZICiZ2g==",
-      "dev": true,
-      "dependencies": {
-        "date-format": "^4.0.14",
-        "debug": "^4.3.4",
-        "flatted": "^3.2.7",
-        "rfdc": "^1.3.0",
-        "streamroller": "^3.1.5"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/lru-cache": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^3.0.2"
-      }
-    },
-    "node_modules/magic-string": {
-      "version": "0.30.10",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.10.tgz",
-      "integrity": "sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.4.15"
-      }
-    },
-    "node_modules/make-dir": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
-      "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
-      "dev": true,
-      "dependencies": {
-        "semver": "^7.5.3"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/make-fetch-happen": {
-      "version": "13.0.1",
-      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz",
-      "integrity": "sha512-cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA==",
-      "dev": true,
-      "dependencies": {
-        "@npmcli/agent": "^2.0.0",
-        "cacache": "^18.0.0",
-        "http-cache-semantics": "^4.1.1",
-        "is-lambda": "^1.0.1",
-        "minipass": "^7.0.2",
-        "minipass-fetch": "^3.0.0",
-        "minipass-flush": "^1.0.5",
-        "minipass-pipeline": "^1.2.4",
-        "negotiator": "^0.6.3",
-        "proc-log": "^4.2.0",
-        "promise-retry": "^2.0.1",
-        "ssri": "^10.0.0"
-      },
-      "engines": {
-        "node": "^16.14.0 || >=18.0.0"
-      }
-    },
-    "node_modules/media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/memfs": {
-      "version": "4.9.3",
-      "resolved": "https://registry.npmjs.org/memfs/-/memfs-4.9.3.tgz",
-      "integrity": "sha512-bsYSSnirtYTWi1+OPMFb0M048evMKyUYe0EbtuGQgq6BVQM1g1W8/KIUJCCvjgI/El0j6Q4WsmMiBwLUBSw8LA==",
-      "dev": true,
-      "dependencies": {
-        "@jsonjoy.com/json-pack": "^1.0.3",
-        "@jsonjoy.com/util": "^1.1.2",
-        "tree-dump": "^1.0.1",
-        "tslib": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 4.0.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/streamich"
-      }
-    },
-    "node_modules/merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==",
-      "dev": true
-    },
-    "node_modules/merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "dev": true
-    },
-    "node_modules/merge2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/methods": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/micromatch": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz",
-      "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==",
-      "dev": true,
-      "dependencies": {
-        "braces": "^3.0.3",
-        "picomatch": "^2.3.1"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
-    "node_modules/micromatch/node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "node_modules/mime": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
-      "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
-      "dev": true,
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "dev": true,
-      "dependencies": {
-        "mime-db": "1.52.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/mini-css-extract-plugin": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.0.tgz",
-      "integrity": "sha512-Zs1YsZVfemekSZG+44vBsYTLQORkPMwnlv+aehcxK/NLKC+EGhDB39/YePYYqx/sTk6NnYpuqikhSn7+JIevTA==",
-      "dev": true,
-      "dependencies": {
-        "schema-utils": "^4.0.0",
-        "tapable": "^2.2.1"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.0.0"
-      }
-    },
-    "node_modules/minimalistic-assert": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
-      "dev": true
-    },
-    "node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/minimist": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
-      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/minipass": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
-      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
-      "dev": true,
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      }
-    },
-    "node_modules/minipass-collect": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-2.0.1.tgz",
-      "integrity": "sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==",
-      "dev": true,
-      "dependencies": {
-        "minipass": "^7.0.3"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      }
-    },
-    "node_modules/minipass-fetch": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz",
-      "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==",
-      "dev": true,
-      "dependencies": {
-        "minipass": "^7.0.3",
-        "minipass-sized": "^1.0.3",
-        "minizlib": "^2.1.2"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      },
-      "optionalDependencies": {
-        "encoding": "^0.1.13"
-      }
-    },
-    "node_modules/minipass-flush": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
-      "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
-      "dev": true,
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/minipass-flush/node_modules/minipass": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/minipass-flush/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/minipass-pipeline": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
-      "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
-      "dev": true,
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/minipass-pipeline/node_modules/minipass": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/minipass-pipeline/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/minipass-sized": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz",
-      "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==",
-      "dev": true,
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/minipass-sized/node_modules/minipass": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/minipass-sized/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/minizlib": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
-      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
-      "dev": true,
-      "dependencies": {
-        "minipass": "^3.0.0",
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/minizlib/node_modules/minipass": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/minizlib/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/mkdirp": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.6"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/mrmime": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.0.tgz",
-      "integrity": "sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/msgpackr": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.10.2.tgz",
-      "integrity": "sha512-L60rsPynBvNE+8BWipKKZ9jHcSGbtyJYIwjRq0VrIvQ08cRjntGXJYW/tmciZ2IHWIY8WEW32Qa2xbh5+SKBZA==",
-      "dev": true,
-      "optionalDependencies": {
-        "msgpackr-extract": "^3.0.2"
-      }
-    },
-    "node_modules/msgpackr-extract": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-3.0.3.tgz",
-      "integrity": "sha512-P0efT1C9jIdVRefqjzOQ9Xml57zpOXnIuS+csaB4MdZbTdmGDLo8XhzBG1N7aO11gKDDkJvBLULeFTo46wwreA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "dependencies": {
-        "node-gyp-build-optional-packages": "5.2.2"
-      },
-      "bin": {
-        "download-msgpackr-prebuilds": "bin/download-prebuilds.js"
-      },
-      "optionalDependencies": {
-        "@msgpackr-extract/msgpackr-extract-darwin-arm64": "3.0.3",
-        "@msgpackr-extract/msgpackr-extract-darwin-x64": "3.0.3",
-        "@msgpackr-extract/msgpackr-extract-linux-arm": "3.0.3",
-        "@msgpackr-extract/msgpackr-extract-linux-arm64": "3.0.3",
-        "@msgpackr-extract/msgpackr-extract-linux-x64": "3.0.3",
-        "@msgpackr-extract/msgpackr-extract-win32-x64": "3.0.3"
-      }
-    },
-    "node_modules/msgpackr-extract/node_modules/node-gyp-build-optional-packages": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.2.2.tgz",
-      "integrity": "sha512-s+w+rBWnpTMwSFbaE0UXsRlg7hU4FjekKU4eyAih5T8nJuNZT1nNsskXpxmeqSK9UzkBl6UgRlnKc8hz8IEqOw==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "detect-libc": "^2.0.1"
-      },
-      "bin": {
-        "node-gyp-build-optional-packages": "bin.js",
-        "node-gyp-build-optional-packages-optional": "optional.js",
-        "node-gyp-build-optional-packages-test": "build-test.js"
-      }
-    },
-    "node_modules/multicast-dns": {
-      "version": "7.2.5",
-      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz",
-      "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==",
-      "dev": true,
-      "dependencies": {
-        "dns-packet": "^5.2.2",
-        "thunky": "^1.0.2"
-      },
-      "bin": {
-        "multicast-dns": "cli.js"
-      }
-    },
-    "node_modules/mute-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-1.0.0.tgz",
-      "integrity": "sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==",
-      "dev": true,
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/mz": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
-      "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
-      "dev": true,
-      "dependencies": {
-        "any-promise": "^1.0.0",
-        "object-assign": "^4.0.1",
-        "thenify-all": "^1.0.0"
-      }
-    },
-    "node_modules/nanoid": {
-      "version": "3.3.7",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
-      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
-    "node_modules/needle": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/needle/-/needle-3.3.1.tgz",
-      "integrity": "sha512-6k0YULvhpw+RoLNiQCRKOl09Rv1dPLr8hHnVjHqdolKwDrdNyk+Hmrthi4lIGPPz3r39dLx0hsF5s40sZ3Us4Q==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "iconv-lite": "^0.6.3",
-        "sax": "^1.2.4"
-      },
-      "bin": {
-        "needle": "bin/needle"
-      },
-      "engines": {
-        "node": ">= 4.4.x"
-      }
-    },
-    "node_modules/needle/node_modules/iconv-lite": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/negotiator": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/neo-async": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-      "dev": true
-    },
-    "node_modules/ngx-echarts": {
-      "version": "18.0.0",
-      "resolved": "https://registry.npmjs.org/ngx-echarts/-/ngx-echarts-18.0.0.tgz",
-      "integrity": "sha512-1rJW7vhMTTQMZNO5AhbHfTDorhP7dcvwRsDH5jFk2SPb/gjIFWvXBY9VSNAOKumuSBnopm2+uSz6BRO5oWxovA==",
-      "dependencies": {
-        "tslib": "^2.3.0"
-      },
-      "peerDependencies": {
-        "echarts": ">=5.0.0"
-      }
-    },
-    "node_modules/nice-napi": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz",
-      "integrity": "sha512-px/KnJAJZf5RuBGcfD+Sp2pAKq0ytz8j+1NehvgIGFkvtvFrDM3T8E4x/JJODXK9WZow8RRGrbA9QQ3hs+pDhA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "!win32"
-      ],
-      "dependencies": {
-        "node-addon-api": "^3.0.0",
-        "node-gyp-build": "^4.2.2"
-      }
-    },
-    "node_modules/nice-napi/node_modules/node-addon-api": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
-      "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/node-addon-api": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz",
-      "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==",
-      "dev": true
-    },
-    "node_modules/node-forge": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
-      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6.13.0"
-      }
-    },
-    "node_modules/node-gyp": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.1.0.tgz",
-      "integrity": "sha512-B4J5M1cABxPc5PwfjhbV5hoy2DP9p8lFXASnEN6hugXOa61416tnTZ29x9sSwAd0o99XNIcpvDDy1swAExsVKA==",
-      "dev": true,
-      "dependencies": {
-        "env-paths": "^2.2.0",
-        "exponential-backoff": "^3.1.1",
-        "glob": "^10.3.10",
-        "graceful-fs": "^4.2.6",
-        "make-fetch-happen": "^13.0.0",
-        "nopt": "^7.0.0",
-        "proc-log": "^3.0.0",
-        "semver": "^7.3.5",
-        "tar": "^6.1.2",
-        "which": "^4.0.0"
-      },
-      "bin": {
-        "node-gyp": "bin/node-gyp.js"
-      },
-      "engines": {
-        "node": "^16.14.0 || >=18.0.0"
-      }
-    },
-    "node_modules/node-gyp-build": {
-      "version": "4.8.1",
-      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.1.tgz",
-      "integrity": "sha512-OSs33Z9yWr148JZcbZd5WiAXhh/n9z8TxQcdMhIOlpN9AhWpLfvVFO73+m77bBABQMaY9XSvIa+qk0jlI7Gcaw==",
-      "dev": true,
-      "optional": true,
-      "bin": {
-        "node-gyp-build": "bin.js",
-        "node-gyp-build-optional": "optional.js",
-        "node-gyp-build-test": "build-test.js"
-      }
-    },
-    "node_modules/node-gyp-build-optional-packages": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.1.1.tgz",
-      "integrity": "sha512-+P72GAjVAbTxjjwUmwjVrqrdZROD4nf8KgpBoDxqXXTiYZZt/ud60dE5yvCSr9lRO8e8yv6kgJIC0K0PfZFVQw==",
-      "dev": true,
-      "dependencies": {
-        "detect-libc": "^2.0.1"
-      },
-      "bin": {
-        "node-gyp-build-optional-packages": "bin.js",
-        "node-gyp-build-optional-packages-optional": "optional.js",
-        "node-gyp-build-optional-packages-test": "build-test.js"
-      }
-    },
-    "node_modules/node-gyp/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/node-gyp/node_modules/glob": {
-      "version": "10.4.2",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.2.tgz",
-      "integrity": "sha512-GwMlUF6PkPo3Gk21UxkCohOv0PLcIXVtKyLlpEI28R/cO/4eNOdmLk3CMW1wROV/WR/EsZOWAfBbBOqYvs88/w==",
-      "dev": true,
-      "dependencies": {
-        "foreground-child": "^3.1.0",
-        "jackspeak": "^3.1.2",
-        "minimatch": "^9.0.4",
-        "minipass": "^7.1.2",
-        "package-json-from-dist": "^1.0.0",
-        "path-scurry": "^1.11.1"
-      },
-      "bin": {
-        "glob": "dist/esm/bin.mjs"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/node-gyp/node_modules/isexe": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
-      "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=16"
-      }
-    },
-    "node_modules/node-gyp/node_modules/minimatch": {
-      "version": "9.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz",
-      "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/node-gyp/node_modules/proc-log": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-3.0.0.tgz",
-      "integrity": "sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==",
-      "dev": true,
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/node-gyp/node_modules/which": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
-      "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^3.1.1"
-      },
-      "bin": {
-        "node-which": "bin/which.js"
-      },
-      "engines": {
-        "node": "^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/node-releases": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
-      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==",
-      "dev": true
-    },
-    "node_modules/nopt": {
-      "version": "7.2.1",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz",
-      "integrity": "sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==",
-      "dev": true,
-      "dependencies": {
-        "abbrev": "^2.0.0"
-      },
-      "bin": {
-        "nopt": "bin/nopt.js"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/normalize-package-data": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-6.0.1.tgz",
-      "integrity": "sha512-6rvCfeRW+OEZagAB4lMLSNuTNYZWLVtKccK79VSTf//yTY5VOCgcpH80O+bZK8Neps7pUnd5G+QlMg1yV/2iZQ==",
-      "dev": true,
-      "dependencies": {
-        "hosted-git-info": "^7.0.0",
-        "is-core-module": "^2.8.1",
-        "semver": "^7.3.5",
-        "validate-npm-package-license": "^3.0.4"
-      },
-      "engines": {
-        "node": "^16.14.0 || >=18.0.0"
-      }
-    },
-    "node_modules/normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/normalize-range": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-      "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/npm-bundled": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-3.0.1.tgz",
-      "integrity": "sha512-+AvaheE/ww1JEwRHOrn4WHNzOxGtVp+adrg2AeZS/7KuxGUYFuBta98wYpfHBbJp6Tg6j1NKSEVHNcfZzJHQwQ==",
-      "dev": true,
-      "dependencies": {
-        "npm-normalize-package-bin": "^3.0.0"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/npm-install-checks": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.3.0.tgz",
-      "integrity": "sha512-W29RiK/xtpCGqn6f3ixfRYGk+zRyr+Ew9F2E20BfXxT5/euLdA/Nm7fO7OeTGuAmTs30cpgInyJ0cYe708YTZw==",
-      "dev": true,
-      "dependencies": {
-        "semver": "^7.1.1"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/npm-normalize-package-bin": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz",
-      "integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==",
-      "dev": true,
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/npm-package-arg": {
-      "version": "11.0.2",
-      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-11.0.2.tgz",
-      "integrity": "sha512-IGN0IAwmhDJwy13Wc8k+4PEbTPhpJnMtfR53ZbOyjkvmEcLS4nCwp6mvMWjS5sUjeiW3mpx6cHmuhKEu9XmcQw==",
-      "dev": true,
-      "dependencies": {
-        "hosted-git-info": "^7.0.0",
-        "proc-log": "^4.0.0",
-        "semver": "^7.3.5",
-        "validate-npm-package-name": "^5.0.0"
-      },
-      "engines": {
-        "node": "^16.14.0 || >=18.0.0"
-      }
-    },
-    "node_modules/npm-packlist": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-8.0.2.tgz",
-      "integrity": "sha512-shYrPFIS/JLP4oQmAwDyk5HcyysKW8/JLTEA32S0Z5TzvpaeeX2yMFfoK1fjEBnCBvVyIB/Jj/GBFdm0wsgzbA==",
-      "dev": true,
-      "dependencies": {
-        "ignore-walk": "^6.0.4"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/npm-pick-manifest": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-9.0.1.tgz",
-      "integrity": "sha512-Udm1f0l2nXb3wxDpKjfohwgdFUSV50UVwzEIpDXVsbDMXVIEF81a/i0UhuQbhrPMMmdiq3+YMFLFIRVLs3hxQw==",
-      "dev": true,
-      "dependencies": {
-        "npm-install-checks": "^6.0.0",
-        "npm-normalize-package-bin": "^3.0.0",
-        "npm-package-arg": "^11.0.0",
-        "semver": "^7.3.5"
-      },
-      "engines": {
-        "node": "^16.14.0 || >=18.0.0"
-      }
-    },
-    "node_modules/npm-registry-fetch": {
-      "version": "17.1.0",
-      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-17.1.0.tgz",
-      "integrity": "sha512-5+bKQRH0J1xG1uZ1zMNvxW0VEyoNWgJpY9UDuluPFLKDfJ9u2JmmjmTJV1srBGQOROfdBMiVvnH2Zvpbm+xkVA==",
-      "dev": true,
-      "dependencies": {
-        "@npmcli/redact": "^2.0.0",
-        "jsonparse": "^1.3.1",
-        "make-fetch-happen": "^13.0.0",
-        "minipass": "^7.0.2",
-        "minipass-fetch": "^3.0.0",
-        "minizlib": "^2.1.2",
-        "npm-package-arg": "^11.0.0",
-        "proc-log": "^4.0.0"
-      },
-      "engines": {
-        "node": "^16.14.0 || >=18.0.0"
-      }
-    },
-    "node_modules/npm-run-path": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-      "dev": true,
-      "dependencies": {
-        "path-key": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/nth-check": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
-      "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
-      "dev": true,
-      "dependencies": {
-        "boolbase": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/nth-check?sponsor=1"
-      }
-    },
-    "node_modules/object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-hash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
-      "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/object-inspect": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
-      "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/obuf": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
-      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
-      "dev": true
-    },
-    "node_modules/on-finished": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
-      "dev": true,
-      "dependencies": {
-        "ee-first": "1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/on-headers": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
-      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "dev": true,
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
-    "node_modules/onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "dev": true,
-      "dependencies": {
-        "mimic-fn": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/open": {
-      "version": "8.4.2",
-      "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
-      "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
-      "dev": true,
-      "dependencies": {
-        "define-lazy-prop": "^2.0.0",
-        "is-docker": "^2.1.1",
-        "is-wsl": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/ora": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
-      "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
-      "dev": true,
-      "dependencies": {
-        "bl": "^4.1.0",
-        "chalk": "^4.1.0",
-        "cli-cursor": "^3.1.0",
-        "cli-spinners": "^2.5.0",
-        "is-interactive": "^1.0.0",
-        "is-unicode-supported": "^0.1.0",
-        "log-symbols": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "wcwidth": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/ora/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/ora/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/ora/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/ora/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/ora/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ora/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ordered-binary": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/ordered-binary/-/ordered-binary-1.5.1.tgz",
-      "integrity": "sha512-5VyHfHY3cd0iza71JepYG50My+YUbrFtGoUz2ooEydPyPM7Aai/JW098juLr+RG6+rDJuzNNTsEQu2DZa1A41A==",
-      "dev": true
-    },
-    "node_modules/os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/p-limit": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
-      "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==",
-      "dev": true,
-      "dependencies": {
-        "yocto-queue": "^1.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-locate": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz",
-      "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^4.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-map": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
-      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
-      "dev": true,
-      "dependencies": {
-        "aggregate-error": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-retry": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-6.2.0.tgz",
-      "integrity": "sha512-JA6nkq6hKyWLLasXQXUrO4z8BUZGUt/LjlJxx8Gb2+2ntodU/SS63YZ8b0LUTbQ8ZB9iwOfhEPhg4ykKnn2KsA==",
-      "dev": true,
-      "dependencies": {
-        "@types/retry": "0.12.2",
-        "is-network-error": "^1.0.0",
-        "retry": "^0.13.1"
-      },
-      "engines": {
-        "node": ">=16.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-retry/node_modules/retry": {
-      "version": "0.13.1",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
-      "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/package-json-from-dist": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz",
-      "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==",
-      "dev": true
-    },
-    "node_modules/pacote": {
-      "version": "18.0.6",
-      "resolved": "https://registry.npmjs.org/pacote/-/pacote-18.0.6.tgz",
-      "integrity": "sha512-+eK3G27SMwsB8kLIuj4h1FUhHtwiEUo21Tw8wNjmvdlpOEr613edv+8FUsTj/4F/VN5ywGE19X18N7CC2EJk6A==",
-      "dev": true,
-      "dependencies": {
-        "@npmcli/git": "^5.0.0",
-        "@npmcli/installed-package-contents": "^2.0.1",
-        "@npmcli/package-json": "^5.1.0",
-        "@npmcli/promise-spawn": "^7.0.0",
-        "@npmcli/run-script": "^8.0.0",
-        "cacache": "^18.0.0",
-        "fs-minipass": "^3.0.0",
-        "minipass": "^7.0.2",
-        "npm-package-arg": "^11.0.0",
-        "npm-packlist": "^8.0.0",
-        "npm-pick-manifest": "^9.0.0",
-        "npm-registry-fetch": "^17.0.0",
-        "proc-log": "^4.0.0",
-        "promise-retry": "^2.0.1",
-        "sigstore": "^2.2.0",
-        "ssri": "^10.0.0",
-        "tar": "^6.1.11"
-      },
-      "bin": {
-        "pacote": "bin/index.js"
-      },
-      "engines": {
-        "node": "^16.14.0 || >=18.0.0"
-      }
-    },
-    "node_modules/parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
-      "dependencies": {
-        "callsites": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/parse-json": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "error-ex": "^1.3.1",
-        "json-parse-even-better-errors": "^2.3.0",
-        "lines-and-columns": "^1.1.6"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/parse-json/node_modules/json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-      "dev": true
-    },
-    "node_modules/parse-node-version": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
-      "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/parse5": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
-      "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
-      "devOptional": true,
-      "dependencies": {
-        "entities": "^4.4.0"
-      },
-      "funding": {
-        "url": "https://github.com/inikulin/parse5?sponsor=1"
-      }
-    },
-    "node_modules/parse5-html-rewriting-stream": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-7.0.0.tgz",
-      "integrity": "sha512-mazCyGWkmCRWDI15Zp+UiCqMp/0dgEmkZRvhlsqqKYr4SsVm/TvnSpD9fCvqCA2zoWJcfRym846ejWBBHRiYEg==",
-      "dev": true,
-      "dependencies": {
-        "entities": "^4.3.0",
-        "parse5": "^7.0.0",
-        "parse5-sax-parser": "^7.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/inikulin/parse5?sponsor=1"
-      }
-    },
-    "node_modules/parse5-sax-parser": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/parse5-sax-parser/-/parse5-sax-parser-7.0.0.tgz",
-      "integrity": "sha512-5A+v2SNsq8T6/mG3ahcz8ZtQ0OUFTatxPbeidoMB7tkJSGDY3tdfl4MHovtLQHkEn5CGxijNWRQHhRQ6IRpXKg==",
-      "dev": true,
-      "dependencies": {
-        "parse5": "^7.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/inikulin/parse5?sponsor=1"
-      }
-    },
-    "node_modules/parseurl": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/path-exists": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz",
-      "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==",
-      "dev": true,
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      }
-    },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
-    },
-    "node_modules/path-scurry": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
-      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^10.2.0",
-        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/path-scurry/node_modules/lru-cache": {
-      "version": "10.2.2",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz",
-      "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==",
-      "dev": true,
-      "engines": {
-        "node": "14 || >=16.14"
-      }
-    },
-    "node_modules/path-to-regexp": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==",
-      "dev": true
-    },
-    "node_modules/path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/picocolors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
-      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
-      "dev": true
-    },
-    "node_modules/picomatch": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
-      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "node_modules/pify": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pirates": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
-      "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/piscina": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/piscina/-/piscina-4.5.0.tgz",
-      "integrity": "sha512-iBaLWI56PFP81cfBSomWTmhOo9W2/yhIOL+Tk8O1vBCpK39cM0tGxB+wgYjG31qq4ohGvysfXSdnj8h7g4rZxA==",
-      "dev": true,
-      "optionalDependencies": {
-        "nice-napi": "^1.0.2"
-      }
-    },
-    "node_modules/pkg-dir": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-7.0.0.tgz",
-      "integrity": "sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=14.16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/postcss": {
-      "version": "8.4.38",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz",
-      "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "dependencies": {
-        "nanoid": "^3.3.7",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.2.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      }
-    },
-    "node_modules/postcss-import": {
-      "version": "15.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz",
-      "integrity": "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.0.0",
-        "read-cache": "^1.0.0",
-        "resolve": "^1.1.7"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.0.0"
-      }
-    },
-    "node_modules/postcss-js": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz",
-      "integrity": "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==",
-      "dev": true,
-      "dependencies": {
-        "camelcase-css": "^2.0.1"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >= 16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4.21"
-      }
-    },
-    "node_modules/postcss-load-config": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.2.tgz",
-      "integrity": "sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "dependencies": {
-        "lilconfig": "^3.0.0",
-        "yaml": "^2.3.4"
-      },
-      "engines": {
-        "node": ">= 14"
-      },
-      "peerDependencies": {
-        "postcss": ">=8.0.9",
-        "ts-node": ">=9.0.0"
-      },
-      "peerDependenciesMeta": {
-        "postcss": {
-          "optional": true
-        },
-        "ts-node": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/postcss-load-config/node_modules/lilconfig": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.2.tgz",
-      "integrity": "sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow==",
-      "dev": true,
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/antonk52"
-      }
-    },
-    "node_modules/postcss-loader": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-8.1.1.tgz",
-      "integrity": "sha512-0IeqyAsG6tYiDRCYKQJLAmgQr47DX6N7sFSWvQxt6AcupX8DIdmykuk/o/tx0Lze3ErGHJEp5OSRxrelC6+NdQ==",
-      "dev": true,
-      "dependencies": {
-        "cosmiconfig": "^9.0.0",
-        "jiti": "^1.20.0",
-        "semver": "^7.5.4"
-      },
-      "engines": {
-        "node": ">= 18.12.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "@rspack/core": "0.x || 1.x",
-        "postcss": "^7.0.0 || ^8.0.1",
-        "webpack": "^5.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@rspack/core": {
-          "optional": true
-        },
-        "webpack": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/postcss-media-query-parser": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
-      "integrity": "sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==",
-      "dev": true
-    },
-    "node_modules/postcss-modules-extract-imports": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz",
-      "integrity": "sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==",
-      "dev": true,
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/postcss-modules-local-by-default": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.5.tgz",
-      "integrity": "sha512-6MieY7sIfTK0hYfafw1OMEG+2bg8Q1ocHCpoWLqOKj3JXlKu4G7btkmM/B7lFubYkYWmRSPLZi5chid63ZaZYw==",
-      "dev": true,
-      "dependencies": {
-        "icss-utils": "^5.0.0",
-        "postcss-selector-parser": "^6.0.2",
-        "postcss-value-parser": "^4.1.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/postcss-modules-scope": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.0.tgz",
-      "integrity": "sha512-oq+g1ssrsZOsx9M96c5w8laRmvEu9C3adDSjI8oTcbfkrTE8hx/zfyobUoWIxaKPO8bt6S62kxpw5GqypEw1QQ==",
-      "dev": true,
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.4"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/postcss-modules-values": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
-      "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
-      "dev": true,
-      "dependencies": {
-        "icss-utils": "^5.0.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/postcss-nested": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.0.1.tgz",
-      "integrity": "sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==",
-      "dev": true,
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.11"
-      },
-      "engines": {
-        "node": ">=12.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.14"
-      }
-    },
-    "node_modules/postcss-selector-parser": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.0.tgz",
-      "integrity": "sha512-UMz42UD0UY0EApS0ZL9o1XnLhSTtvvvLe5Dc2H2O56fvRZi+KulDyf5ctDhhtYJBGKStV2FL1fy6253cmLgqVQ==",
-      "dev": true,
-      "dependencies": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/proc-log": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz",
-      "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==",
-      "dev": true,
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-      "dev": true
-    },
-    "node_modules/promise-inflight": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
-      "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==",
-      "dev": true
-    },
-    "node_modules/promise-retry": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
-      "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
-      "dev": true,
-      "dependencies": {
-        "err-code": "^2.0.2",
-        "retry": "^0.12.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/proxy-addr": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
-      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
-      "dev": true,
-      "dependencies": {
-        "forwarded": "0.2.0",
-        "ipaddr.js": "1.9.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/proxy-addr/node_modules/ipaddr.js": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/prr": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
-      "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/punycode": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-      "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
-      "dev": true
-    },
-    "node_modules/qjobs": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz",
-      "integrity": "sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.9"
-      }
-    },
-    "node_modules/qs": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
-      "dev": true,
-      "dependencies": {
-        "side-channel": "^1.0.4"
-      },
-      "engines": {
-        "node": ">=0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/queue-microtask": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/randombytes": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "node_modules/range-parser": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/raw-body": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
-      "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
-      "dev": true,
-      "dependencies": {
-        "bytes": "3.1.2",
-        "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
-        "unpipe": "1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/read-cache": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
-      "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==",
-      "dev": true,
-      "dependencies": {
-        "pify": "^2.3.0"
-      }
-    },
-    "node_modules/read-cache/node_modules/pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readable-stream": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "dev": true,
-      "dependencies": {
-        "picomatch": "^2.2.1"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "node_modules/reflect-metadata": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.2.2.tgz",
-      "integrity": "sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q==",
-      "dev": true
-    },
-    "node_modules/regenerate": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
-      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
-      "dev": true
-    },
-    "node_modules/regenerate-unicode-properties": {
-      "version": "10.1.1",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz",
-      "integrity": "sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==",
-      "dev": true,
-      "dependencies": {
-        "regenerate": "^1.4.2"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/regenerator-runtime": {
-      "version": "0.14.1",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
-      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
-      "dev": true
-    },
-    "node_modules/regenerator-transform": {
-      "version": "0.15.2",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz",
-      "integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.8.4"
-      }
-    },
-    "node_modules/regex-parser": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.3.0.tgz",
-      "integrity": "sha512-TVILVSz2jY5D47F4mA4MppkBrafEaiUWJO/TcZHEIuI13AqoZMkK1WMA4Om1YkYbTx+9Ki1/tSUXbceyr9saRg==",
-      "dev": true
-    },
-    "node_modules/regexpu-core": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz",
-      "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/regjsgen": "^0.8.0",
-        "regenerate": "^1.4.2",
-        "regenerate-unicode-properties": "^10.1.0",
-        "regjsparser": "^0.9.1",
-        "unicode-match-property-ecmascript": "^2.0.0",
-        "unicode-match-property-value-ecmascript": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/regjsparser": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
-      "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
-      "dev": true,
-      "dependencies": {
-        "jsesc": "~0.5.0"
-      },
-      "bin": {
-        "regjsparser": "bin/parser"
-      }
-    },
-    "node_modules/regjsparser/node_modules/jsesc": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-      "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
-      "dev": true,
-      "bin": {
-        "jsesc": "bin/jsesc"
-      }
-    },
-    "node_modules/require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/require-from-string": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/requires-port": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
-      "dev": true
-    },
-    "node_modules/resolve": {
-      "version": "1.22.8",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
-      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
-      "dev": true,
-      "dependencies": {
-        "is-core-module": "^2.13.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/resolve-url-loader": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-5.0.0.tgz",
-      "integrity": "sha512-uZtduh8/8srhBoMx//5bwqjQ+rfYOUq8zC9NrMUGtjBiGTtFJM42s58/36+hTqeqINcnYe08Nj3LkK9lW4N8Xg==",
-      "dev": true,
-      "dependencies": {
-        "adjust-sourcemap-loader": "^4.0.0",
-        "convert-source-map": "^1.7.0",
-        "loader-utils": "^2.0.0",
-        "postcss": "^8.2.14",
-        "source-map": "0.6.1"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/resolve-url-loader/node_modules/loader-utils": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
-      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
-      },
-      "engines": {
-        "node": ">=8.9.0"
-      }
-    },
-    "node_modules/resolve-url-loader/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/restore-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-      "dev": true,
-      "dependencies": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/retry": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
-      "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-      "dev": true,
-      "engines": {
-        "iojs": ">=1.0.0",
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/rfdc": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz",
-      "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==",
-      "dev": true
-    },
-    "node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "deprecated": "Rimraf versions prior to v4 are no longer supported",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/rollup": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.18.0.tgz",
-      "integrity": "sha512-QmJz14PX3rzbJCN1SG4Xe/bAAX2a6NpCP8ab2vfu2GiUr8AQcr2nCV/oEO3yneFarB67zk8ShlIyWb2LGTb3Sg==",
-      "dev": true,
-      "dependencies": {
-        "@types/estree": "1.0.5"
-      },
-      "bin": {
-        "rollup": "dist/bin/rollup"
-      },
-      "engines": {
-        "node": ">=18.0.0",
-        "npm": ">=8.0.0"
-      },
-      "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.18.0",
-        "@rollup/rollup-android-arm64": "4.18.0",
-        "@rollup/rollup-darwin-arm64": "4.18.0",
-        "@rollup/rollup-darwin-x64": "4.18.0",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.18.0",
-        "@rollup/rollup-linux-arm-musleabihf": "4.18.0",
-        "@rollup/rollup-linux-arm64-gnu": "4.18.0",
-        "@rollup/rollup-linux-arm64-musl": "4.18.0",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.18.0",
-        "@rollup/rollup-linux-riscv64-gnu": "4.18.0",
-        "@rollup/rollup-linux-s390x-gnu": "4.18.0",
-        "@rollup/rollup-linux-x64-gnu": "4.18.0",
-        "@rollup/rollup-linux-x64-musl": "4.18.0",
-        "@rollup/rollup-win32-arm64-msvc": "4.18.0",
-        "@rollup/rollup-win32-ia32-msvc": "4.18.0",
-        "@rollup/rollup-win32-x64-msvc": "4.18.0",
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/run-applescript": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-7.0.0.tgz",
-      "integrity": "sha512-9by4Ij99JUr/MCFBUkDKLWK3G9HVXmabKz9U5MlIAIuvuzkiOicRYs8XJLxX+xahD+mLiiCYDqF9dKAgtzKP1A==",
-      "dev": true,
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/run-async": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-3.0.0.tgz",
-      "integrity": "sha512-540WwVDOMxA6dN6We19EcT9sc3hkXPw5mzRNGM3FkdN/vtE9NFvj5lFAPNwUDmJjXidm3v7TC1cTE7t17Ulm1Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/run-parallel": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "queue-microtask": "^1.2.2"
-      }
-    },
-    "node_modules/rxjs": {
-      "version": "7.8.1",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
-      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
-      "dependencies": {
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
-    },
-    "node_modules/safevalues": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/safevalues/-/safevalues-0.3.4.tgz",
-      "integrity": "sha512-LRneZZRXNgjzwG4bDQdOTSbze3fHm1EAKN/8bePxnlEZiBmkYEDggaHbuvHI9/hoqHbGfsEA7tWS9GhYHZBBsw=="
-    },
-    "node_modules/sass": {
-      "version": "1.77.2",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.2.tgz",
-      "integrity": "sha512-eb4GZt1C3avsX3heBNlrc7I09nyT00IUuo4eFhAbeXWU2fvA7oXI53SxODVAA+zgZCk9aunAZgO+losjR3fAwA==",
-      "dev": true,
-      "dependencies": {
-        "chokidar": ">=3.0.0 <4.0.0",
-        "immutable": "^4.0.0",
-        "source-map-js": ">=0.6.2 <2.0.0"
-      },
-      "bin": {
-        "sass": "sass.js"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/sass-loader": {
-      "version": "14.2.1",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-14.2.1.tgz",
-      "integrity": "sha512-G0VcnMYU18a4N7VoNDegg2OuMjYtxnqzQWARVWCIVSZwJeiL9kg8QMsuIZOplsJgTzZLF6jGxI3AClj8I9nRdQ==",
-      "dev": true,
-      "dependencies": {
-        "neo-async": "^2.6.2"
-      },
-      "engines": {
-        "node": ">= 18.12.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "@rspack/core": "0.x || 1.x",
-        "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0",
-        "sass": "^1.3.0",
-        "sass-embedded": "*",
-        "webpack": "^5.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@rspack/core": {
-          "optional": true
-        },
-        "node-sass": {
-          "optional": true
-        },
-        "sass": {
-          "optional": true
-        },
-        "sass-embedded": {
-          "optional": true
-        },
-        "webpack": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/sax": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz",
-      "integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/schema-utils": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-      "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "ajv": "^8.9.0",
-        "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.1.0"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/schema-utils/node_modules/ajv-formats": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
-      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "ajv": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/select-hose": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
-      "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==",
-      "dev": true
-    },
-    "node_modules/selfsigned": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.4.1.tgz",
-      "integrity": "sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==",
-      "dev": true,
-      "dependencies": {
-        "@types/node-forge": "^1.3.0",
-        "node-forge": "^1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/semver": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
-      "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/send": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
-      "dev": true,
-      "dependencies": {
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "2.0.0",
-        "mime": "1.6.0",
-        "ms": "2.1.3",
-        "on-finished": "2.4.1",
-        "range-parser": "~1.2.1",
-        "statuses": "2.0.1"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/send/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/send/node_modules/debug/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/send/node_modules/mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-      "dev": true,
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/send/node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-      "dev": true
-    },
-    "node_modules/send/node_modules/statuses": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/serialize-javascript": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
-      "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
-      "dev": true,
-      "dependencies": {
-        "randombytes": "^2.1.0"
-      }
-    },
-    "node_modules/serve-index": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
-      "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
-      "dev": true,
-      "dependencies": {
-        "accepts": "~1.3.4",
-        "batch": "0.6.1",
-        "debug": "2.6.9",
-        "escape-html": "~1.0.3",
-        "http-errors": "~1.6.2",
-        "mime-types": "~2.1.17",
-        "parseurl": "~1.3.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/serve-index/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/serve-index/node_modules/depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/serve-index/node_modules/http-errors": {
-      "version": "1.6.3",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-      "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
-      "dev": true,
-      "dependencies": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.0",
-        "statuses": ">= 1.4.0 < 2"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/serve-index/node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
-      "dev": true
-    },
-    "node_modules/serve-index/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/serve-index/node_modules/setprototypeof": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
-      "dev": true
-    },
-    "node_modules/serve-static": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
-      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
-      "dev": true,
-      "dependencies": {
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "parseurl": "~1.3.3",
-        "send": "0.18.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/set-function-length": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
-      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
-      "dev": true,
-      "dependencies": {
-        "define-data-property": "^1.1.4",
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.4",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/setprototypeof": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
-      "dev": true
-    },
-    "node_modules/shallow-clone": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
-      "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dev": true,
-      "dependencies": {
-        "shebang-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/shell-quote": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz",
-      "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/side-channel": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
-      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.4",
-        "object-inspect": "^1.13.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-      "dev": true
-    },
-    "node_modules/sigstore": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-2.3.1.tgz",
-      "integrity": "sha512-8G+/XDU8wNsJOQS5ysDVO0Etg9/2uA5gR9l4ZwijjlwxBcrU6RPfwi2+jJmbP+Ap1Hlp/nVAaEO4Fj22/SL2gQ==",
-      "dev": true,
-      "dependencies": {
-        "@sigstore/bundle": "^2.3.2",
-        "@sigstore/core": "^1.0.0",
-        "@sigstore/protobuf-specs": "^0.3.2",
-        "@sigstore/sign": "^2.3.2",
-        "@sigstore/tuf": "^2.3.4",
-        "@sigstore/verify": "^1.2.1"
-      },
-      "engines": {
-        "node": "^16.14.0 || >=18.0.0"
-      }
-    },
-    "node_modules/slash": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
-      "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/smart-buffer": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
-      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6.0.0",
-        "npm": ">= 3.0.0"
-      }
-    },
-    "node_modules/socket.io": {
-      "version": "4.7.5",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.7.5.tgz",
-      "integrity": "sha512-DmeAkF6cwM9jSfmp6Dr/5/mfMwb5Z5qRrSXLpo3Fq5SqyU8CMF15jIN4ZhfSwu35ksM1qmHZDQ/DK5XTccSTvA==",
-      "dev": true,
-      "dependencies": {
-        "accepts": "~1.3.4",
-        "base64id": "~2.0.0",
-        "cors": "~2.8.5",
-        "debug": "~4.3.2",
-        "engine.io": "~6.5.2",
-        "socket.io-adapter": "~2.5.2",
-        "socket.io-parser": "~4.2.4"
-      },
-      "engines": {
-        "node": ">=10.2.0"
-      }
-    },
-    "node_modules/socket.io-adapter": {
-      "version": "2.5.5",
-      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.5.tgz",
-      "integrity": "sha512-eLDQas5dzPgOWCk9GuuJC2lBqItuhKI4uxGgo9aIV7MYbk2h9Q6uULEh8WBzThoI7l+qU9Ast9fVUmkqPP9wYg==",
-      "dev": true,
-      "dependencies": {
-        "debug": "~4.3.4",
-        "ws": "~8.17.1"
-      }
-    },
-    "node_modules/socket.io-parser": {
-      "version": "4.2.4",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz",
-      "integrity": "sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==",
-      "dev": true,
-      "dependencies": {
-        "@socket.io/component-emitter": "~3.1.0",
-        "debug": "~4.3.1"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/sockjs": {
-      "version": "0.3.24",
-      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
-      "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
-      "dev": true,
-      "dependencies": {
-        "faye-websocket": "^0.11.3",
-        "uuid": "^8.3.2",
-        "websocket-driver": "^0.7.4"
-      }
-    },
-    "node_modules/socks": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz",
-      "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==",
-      "dev": true,
-      "dependencies": {
-        "ip-address": "^9.0.5",
-        "smart-buffer": "^4.2.0"
-      },
-      "engines": {
-        "node": ">= 10.0.0",
-        "npm": ">= 3.0.0"
-      }
-    },
-    "node_modules/socks-proxy-agent": {
-      "version": "8.0.3",
-      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.3.tgz",
-      "integrity": "sha512-VNegTZKhuGq5vSD6XNKlbqWhyt/40CgoEw8XxD6dhnm8Jq9IEa3nIa4HwnM8XOqU0CdB0BwWVXusqiFXfHB3+A==",
-      "dev": true,
-      "dependencies": {
-        "agent-base": "^7.1.1",
-        "debug": "^4.3.4",
-        "socks": "^2.7.1"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/source-map": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/source-map-js": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
-      "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map-loader": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-5.0.0.tgz",
-      "integrity": "sha512-k2Dur7CbSLcAH73sBcIkV5xjPV4SzqO1NJ7+XaQl8if3VODDUj3FNchNGpqgJSKbvUfJuhVdv8K2Eu8/TNl2eA==",
-      "dev": true,
-      "dependencies": {
-        "iconv-lite": "^0.6.3",
-        "source-map-js": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 18.12.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.72.1"
-      }
-    },
-    "node_modules/source-map-loader/node_modules/iconv-lite": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "dev": true,
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map-support": {
-      "version": "0.5.21",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
-      "dev": true,
-      "dependencies": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      }
-    },
-    "node_modules/source-map-support/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/spdx-correct": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
-      "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
-      "dev": true,
-      "dependencies": {
-        "spdx-expression-parse": "^3.0.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "node_modules/spdx-exceptions": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz",
-      "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==",
-      "dev": true
-    },
-    "node_modules/spdx-expression-parse": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
-      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
-      "dev": true,
-      "dependencies": {
-        "spdx-exceptions": "^2.1.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "node_modules/spdx-license-ids": {
-      "version": "3.0.18",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.18.tgz",
-      "integrity": "sha512-xxRs31BqRYHwiMzudOrpSiHtZ8i/GeionCBDSilhYRj+9gIcI8wCZTlXZKu9vZIVqViP3dcp9qE5G6AlIaD+TQ==",
-      "dev": true
-    },
-    "node_modules/spdy": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
-      "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.1.0",
-        "handle-thing": "^2.0.0",
-        "http-deceiver": "^1.2.7",
-        "select-hose": "^2.0.0",
-        "spdy-transport": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/spdy-transport": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
-      "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.1.0",
-        "detect-node": "^2.0.4",
-        "hpack.js": "^2.1.6",
-        "obuf": "^1.1.2",
-        "readable-stream": "^3.0.6",
-        "wbuf": "^1.7.3"
-      }
-    },
-    "node_modules/sprintf-js": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
-      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
-      "dev": true
-    },
-    "node_modules/ssri": {
-      "version": "10.0.6",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz",
-      "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==",
-      "dev": true,
-      "dependencies": {
-        "minipass": "^7.0.3"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/streamroller": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-3.1.5.tgz",
-      "integrity": "sha512-KFxaM7XT+irxvdqSP1LGLgNWbYN7ay5owZ3r/8t77p+EtSUAfUgtl7be3xtqtOmGUl9K9YPO2ca8133RlTjvKw==",
-      "dev": true,
-      "dependencies": {
-        "date-format": "^4.0.14",
-        "debug": "^4.3.4",
-        "fs-extra": "^8.1.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "~5.2.0"
-      }
-    },
-    "node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/string-width-cjs": {
-      "name": "string-width",
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-ansi-cjs": {
-      "name": "strip-ansi",
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-final-newline": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/sucrase": {
-      "version": "3.35.0",
-      "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.35.0.tgz",
-      "integrity": "sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/gen-mapping": "^0.3.2",
-        "commander": "^4.0.0",
-        "glob": "^10.3.10",
-        "lines-and-columns": "^1.1.6",
-        "mz": "^2.7.0",
-        "pirates": "^4.0.1",
-        "ts-interface-checker": "^0.1.9"
-      },
-      "bin": {
-        "sucrase": "bin/sucrase",
-        "sucrase-node": "bin/sucrase-node"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      }
-    },
-    "node_modules/sucrase/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/sucrase/node_modules/commander": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
-      "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/sucrase/node_modules/glob": {
-      "version": "10.4.2",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.2.tgz",
-      "integrity": "sha512-GwMlUF6PkPo3Gk21UxkCohOv0PLcIXVtKyLlpEI28R/cO/4eNOdmLk3CMW1wROV/WR/EsZOWAfBbBOqYvs88/w==",
-      "dev": true,
-      "dependencies": {
-        "foreground-child": "^3.1.0",
-        "jackspeak": "^3.1.2",
-        "minimatch": "^9.0.4",
-        "minipass": "^7.1.2",
-        "package-json-from-dist": "^1.0.0",
-        "path-scurry": "^1.11.1"
-      },
-      "bin": {
-        "glob": "dist/esm/bin.mjs"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/sucrase/node_modules/minimatch": {
-      "version": "9.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz",
-      "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/supports-preserve-symlinks-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/symbol-observable": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz",
-      "integrity": "sha512-b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/tailwindcss": {
-      "version": "3.4.4",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.4.tgz",
-      "integrity": "sha512-ZoyXOdJjISB7/BcLTR6SEsLgKtDStYyYZVLsUtWChO4Ps20CBad7lfJKVDiejocV4ME1hLmyY0WJE3hSDcmQ2A==",
-      "dev": true,
-      "dependencies": {
-        "@alloc/quick-lru": "^5.2.0",
-        "arg": "^5.0.2",
-        "chokidar": "^3.5.3",
-        "didyoumean": "^1.2.2",
-        "dlv": "^1.1.3",
-        "fast-glob": "^3.3.0",
-        "glob-parent": "^6.0.2",
-        "is-glob": "^4.0.3",
-        "jiti": "^1.21.0",
-        "lilconfig": "^2.1.0",
-        "micromatch": "^4.0.5",
-        "normalize-path": "^3.0.0",
-        "object-hash": "^3.0.0",
-        "picocolors": "^1.0.0",
-        "postcss": "^8.4.23",
-        "postcss-import": "^15.1.0",
-        "postcss-js": "^4.0.1",
-        "postcss-load-config": "^4.0.1",
-        "postcss-nested": "^6.0.1",
-        "postcss-selector-parser": "^6.0.11",
-        "resolve": "^1.22.2",
-        "sucrase": "^3.32.0"
-      },
-      "bin": {
-        "tailwind": "lib/cli.js",
-        "tailwindcss": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/tailwindcss/node_modules/glob-parent": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.3"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/tapable": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/tar": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
-      "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
-      "dev": true,
-      "dependencies": {
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.0.0",
-        "minipass": "^5.0.0",
-        "minizlib": "^2.1.1",
-        "mkdirp": "^1.0.3",
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/tar/node_modules/fs-minipass": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
-      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
-      "dev": true,
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/tar/node_modules/fs-minipass/node_modules/minipass": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/tar/node_modules/minipass": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
-      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/tar/node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "dev": true,
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/tar/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/terser": {
-      "version": "5.31.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.0.tgz",
-      "integrity": "sha512-Q1JFAoUKE5IMfI4Z/lkE/E6+SwgzO+x4tq4v1AyBLRj8VSYvRO6A/rQrPg1yud4g0En9EKI1TvFRF2tQFcoUkg==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/source-map": "^0.3.3",
-        "acorn": "^8.8.2",
-        "commander": "^2.20.0",
-        "source-map-support": "~0.5.20"
-      },
-      "bin": {
-        "terser": "bin/terser"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/terser-webpack-plugin": {
-      "version": "5.3.10",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz",
-      "integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.20",
-        "jest-worker": "^27.4.5",
-        "schema-utils": "^3.1.1",
-        "serialize-javascript": "^6.0.1",
-        "terser": "^5.26.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.1.0"
-      },
-      "peerDependenciesMeta": {
-        "@swc/core": {
-          "optional": true
-        },
-        "esbuild": {
-          "optional": true
-        },
-        "uglify-js": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
-      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/thenify": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
-      "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
-      "dev": true,
-      "dependencies": {
-        "any-promise": "^1.0.0"
-      }
-    },
-    "node_modules/thenify-all": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
-      "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==",
-      "dev": true,
-      "dependencies": {
-        "thenify": ">= 3.1.0 < 4"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/thingies": {
-      "version": "1.21.0",
-      "resolved": "https://registry.npmjs.org/thingies/-/thingies-1.21.0.tgz",
-      "integrity": "sha512-hsqsJsFMsV+aD4s3CWKk85ep/3I9XzYV/IXaSouJMYIoDlgyi11cBhsqYe9/geRfB0YIikBQg6raRaM+nIMP9g==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.18"
-      },
-      "peerDependencies": {
-        "tslib": "^2"
-      }
-    },
-    "node_modules/thunky": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
-      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
-      "dev": true
-    },
-    "node_modules/tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-      "dev": true,
-      "dependencies": {
-        "os-tmpdir": "~1.0.2"
-      },
-      "engines": {
-        "node": ">=0.6.0"
-      }
-    },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/toidentifier": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
-      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/tree-dump": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/tree-dump/-/tree-dump-1.0.1.tgz",
-      "integrity": "sha512-WCkcRBVPSlHHq1dc/px9iOfqklvzCbdRwvlNfxGZsrHqf6aZttfPrd7DJTt6oR10dwUfpFFQeVTkPbBIZxX/YA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/streamich"
-      },
-      "peerDependencies": {
-        "tslib": "2"
-      }
-    },
-    "node_modules/tree-kill": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
-      "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
-      "dev": true,
-      "bin": {
-        "tree-kill": "cli.js"
-      }
-    },
-    "node_modules/ts-interface-checker": {
-      "version": "0.1.13",
-      "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz",
-      "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==",
-      "dev": true
-    },
-    "node_modules/tslib": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
-      "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ=="
-    },
-    "node_modules/tuf-js": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-2.2.1.tgz",
-      "integrity": "sha512-GwIJau9XaA8nLVbUXsN3IlFi7WmQ48gBUrl3FTkkL/XLu/POhBzfmX9hd33FNMX1qAsfl6ozO1iMmW9NC8YniA==",
-      "dev": true,
-      "dependencies": {
-        "@tufjs/models": "2.0.1",
-        "debug": "^4.3.4",
-        "make-fetch-happen": "^13.0.1"
-      },
-      "engines": {
-        "node": "^16.14.0 || >=18.0.0"
-      }
-    },
-    "node_modules/type-fest": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/type-is": {
-      "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-      "dev": true,
-      "dependencies": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.24"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/typed-assert": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/typed-assert/-/typed-assert-1.0.9.tgz",
-      "integrity": "sha512-KNNZtayBCtmnNmbo5mG47p1XsCyrx6iVqomjcZnec/1Y5GGARaxPs6r49RnSPeUP3YjNYiU9sQHAtY4BBvnZwg==",
-      "dev": true
-    },
-    "node_modules/typescript": {
-      "version": "5.4.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
-      "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
-      "dev": true,
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=14.17"
-      }
-    },
-    "node_modules/ua-parser-js": {
-      "version": "0.7.38",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.38.tgz",
-      "integrity": "sha512-fYmIy7fKTSFAhG3fuPlubeGaMoAd6r0rSnfEsO5nEY55i26KSLt9EH7PLQiiqPUhNqYIJvSkTy1oArIcXAbPbA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/ua-parser-js"
-        },
-        {
-          "type": "paypal",
-          "url": "https://paypal.me/faisalman"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/faisalman"
-        }
-      ],
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/undici": {
-      "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-6.18.0.tgz",
-      "integrity": "sha512-nT8jjv/fE9Et1ilR6QoW8ingRTY2Pp4l2RUrdzV5Yz35RJDrtPc1DXvuNqcpsJSGIRHFdt3YKKktTzJA6r0fTA==",
-      "dev": true,
-      "engines": {
-        "node": ">=18.17"
-      }
-    },
-    "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
-    },
-    "node_modules/unicode-canonical-property-names-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/unicode-match-property-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
-      "dev": true,
-      "dependencies": {
-        "unicode-canonical-property-names-ecmascript": "^2.0.0",
-        "unicode-property-aliases-ecmascript": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/unicode-match-property-value-ecmascript": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz",
-      "integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/unicode-property-aliases-ecmascript": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
-      "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/unique-filename": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz",
-      "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==",
-      "dev": true,
-      "dependencies": {
-        "unique-slug": "^4.0.0"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/unique-slug": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz",
-      "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==",
-      "dev": true,
-      "dependencies": {
-        "imurmurhash": "^0.1.4"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/universalify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
-    "node_modules/unpipe": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/update-browserslist-db": {
-      "version": "1.0.16",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.16.tgz",
-      "integrity": "sha512-KVbTxlBYlckhF5wgfyZXTWnMn7MMZjMu9XG8bPlliUOP9ThaF4QnhP8qrjrH7DRzHfSk0oQv1wToW+iA5GajEQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "dependencies": {
-        "escalade": "^3.1.2",
-        "picocolors": "^1.0.1"
-      },
-      "bin": {
-        "update-browserslist-db": "cli.js"
-      },
-      "peerDependencies": {
-        "browserslist": ">= 4.21.0"
-      }
-    },
-    "node_modules/uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dev": true,
-      "dependencies": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "node_modules/uri-js/node_modules/punycode": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
-      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
-      "dev": true
-    },
-    "node_modules/utils-merge": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-      "dev": true,
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
-    },
-    "node_modules/validate-npm-package-license": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-      "dev": true,
-      "dependencies": {
-        "spdx-correct": "^3.0.0",
-        "spdx-expression-parse": "^3.0.0"
-      }
-    },
-    "node_modules/validate-npm-package-name": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz",
-      "integrity": "sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==",
-      "dev": true,
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/vary": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/vite": {
-      "version": "5.2.11",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.11.tgz",
-      "integrity": "sha512-HndV31LWW05i1BLPMUCE1B9E9GFbOu1MbenhS58FuK6owSO5qHm7GiCotrNY1YE5rMeQSFBGmT5ZaLEjFizgiQ==",
-      "dev": true,
-      "dependencies": {
-        "esbuild": "^0.20.1",
-        "postcss": "^8.4.38",
-        "rollup": "^4.13.0"
-      },
-      "bin": {
-        "vite": "bin/vite.js"
-      },
-      "engines": {
-        "node": "^18.0.0 || >=20.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/vitejs/vite?sponsor=1"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.3"
-      },
-      "peerDependencies": {
-        "@types/node": "^18.0.0 || >=20.0.0",
-        "less": "*",
-        "lightningcss": "^1.21.0",
-        "sass": "*",
-        "stylus": "*",
-        "sugarss": "*",
-        "terser": "^5.4.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/node": {
-          "optional": true
-        },
-        "less": {
-          "optional": true
-        },
-        "lightningcss": {
-          "optional": true
-        },
-        "sass": {
-          "optional": true
-        },
-        "stylus": {
-          "optional": true
-        },
-        "sugarss": {
-          "optional": true
-        },
-        "terser": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/aix-ppc64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz",
-      "integrity": "sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "aix"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/android-arm": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.2.tgz",
-      "integrity": "sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/android-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz",
-      "integrity": "sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/android-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.2.tgz",
-      "integrity": "sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/darwin-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz",
-      "integrity": "sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/darwin-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz",
-      "integrity": "sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz",
-      "integrity": "sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/freebsd-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz",
-      "integrity": "sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-arm": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz",
-      "integrity": "sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz",
-      "integrity": "sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-ia32": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz",
-      "integrity": "sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-loong64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz",
-      "integrity": "sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-mips64el": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz",
-      "integrity": "sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==",
-      "cpu": [
-        "mips64el"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-ppc64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz",
-      "integrity": "sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-riscv64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz",
-      "integrity": "sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-s390x": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz",
-      "integrity": "sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz",
-      "integrity": "sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/netbsd-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz",
-      "integrity": "sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/openbsd-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz",
-      "integrity": "sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/sunos-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz",
-      "integrity": "sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/win32-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz",
-      "integrity": "sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/win32-ia32": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz",
-      "integrity": "sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/win32-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz",
-      "integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/esbuild": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz",
-      "integrity": "sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==",
-      "dev": true,
-      "hasInstallScript": true,
-      "bin": {
-        "esbuild": "bin/esbuild"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.20.2",
-        "@esbuild/android-arm": "0.20.2",
-        "@esbuild/android-arm64": "0.20.2",
-        "@esbuild/android-x64": "0.20.2",
-        "@esbuild/darwin-arm64": "0.20.2",
-        "@esbuild/darwin-x64": "0.20.2",
-        "@esbuild/freebsd-arm64": "0.20.2",
-        "@esbuild/freebsd-x64": "0.20.2",
-        "@esbuild/linux-arm": "0.20.2",
-        "@esbuild/linux-arm64": "0.20.2",
-        "@esbuild/linux-ia32": "0.20.2",
-        "@esbuild/linux-loong64": "0.20.2",
-        "@esbuild/linux-mips64el": "0.20.2",
-        "@esbuild/linux-ppc64": "0.20.2",
-        "@esbuild/linux-riscv64": "0.20.2",
-        "@esbuild/linux-s390x": "0.20.2",
-        "@esbuild/linux-x64": "0.20.2",
-        "@esbuild/netbsd-x64": "0.20.2",
-        "@esbuild/openbsd-x64": "0.20.2",
-        "@esbuild/sunos-x64": "0.20.2",
-        "@esbuild/win32-arm64": "0.20.2",
-        "@esbuild/win32-ia32": "0.20.2",
-        "@esbuild/win32-x64": "0.20.2"
-      }
-    },
-    "node_modules/void-elements": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
-      "integrity": "sha512-qZKX4RnBzH2ugr8Lxa7x+0V6XD9Sb/ouARtiasEQCHB1EVU4NXtmHsDDrx1dO4ne5fc3J6EW05BP1Dl0z0iung==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.1.tgz",
-      "integrity": "sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==",
-      "dev": true,
-      "dependencies": {
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.1.2"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/wbuf": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
-      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
-      "dev": true,
-      "dependencies": {
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "node_modules/wcwidth": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
-      "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==",
-      "dev": true,
-      "dependencies": {
-        "defaults": "^1.0.3"
-      }
-    },
-    "node_modules/weak-lru-cache": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/weak-lru-cache/-/weak-lru-cache-1.2.2.tgz",
-      "integrity": "sha512-DEAoo25RfSYMuTGc9vPJzZcZullwIqRDSI9LOy+fkCJPi6hykCnfKaXTuPBDuXAUcqHXyOgFtHNp/kB2FjYHbw==",
-      "dev": true
-    },
-    "node_modules/webpack": {
-      "version": "5.91.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.91.0.tgz",
-      "integrity": "sha512-rzVwlLeBWHJbmgTC/8TvAcu5vpJNII+MelQpylD4jNERPwpBJOE2lEcko1zJX3QJeLjTTAnQxn/OJ8bjDzVQaw==",
-      "dev": true,
-      "dependencies": {
-        "@types/eslint-scope": "^3.7.3",
-        "@types/estree": "^1.0.5",
-        "@webassemblyjs/ast": "^1.12.1",
-        "@webassemblyjs/wasm-edit": "^1.12.1",
-        "@webassemblyjs/wasm-parser": "^1.12.1",
-        "acorn": "^8.7.1",
-        "acorn-import-assertions": "^1.9.0",
-        "browserslist": "^4.21.10",
-        "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.16.0",
-        "es-module-lexer": "^1.2.1",
-        "eslint-scope": "5.1.1",
-        "events": "^3.2.0",
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.2.11",
-        "json-parse-even-better-errors": "^2.3.1",
-        "loader-runner": "^4.2.0",
-        "mime-types": "^2.1.27",
-        "neo-async": "^2.6.2",
-        "schema-utils": "^3.2.0",
-        "tapable": "^2.1.1",
-        "terser-webpack-plugin": "^5.3.10",
-        "watchpack": "^2.4.1",
-        "webpack-sources": "^3.2.3"
-      },
-      "bin": {
-        "webpack": "bin/webpack.js"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependenciesMeta": {
-        "webpack-cli": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/webpack-dev-middleware": {
-      "version": "7.2.1",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-7.2.1.tgz",
-      "integrity": "sha512-hRLz+jPQXo999Nx9fXVdKlg/aehsw1ajA9skAneGmT03xwmyuhvF93p6HUKKbWhXdcERtGTzUCtIQr+2IQegrA==",
-      "dev": true,
-      "dependencies": {
-        "colorette": "^2.0.10",
-        "memfs": "^4.6.0",
-        "mime-types": "^2.1.31",
-        "on-finished": "^2.4.1",
-        "range-parser": "^1.2.1",
-        "schema-utils": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 18.12.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.0.0"
-      },
-      "peerDependenciesMeta": {
-        "webpack": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/webpack-dev-server": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-5.0.4.tgz",
-      "integrity": "sha512-dljXhUgx3HqKP2d8J/fUMvhxGhzjeNVarDLcbO/EWMSgRizDkxHQDZQaLFL5VJY9tRBj2Gz+rvCEYYvhbqPHNA==",
-      "dev": true,
-      "dependencies": {
-        "@types/bonjour": "^3.5.13",
-        "@types/connect-history-api-fallback": "^1.5.4",
-        "@types/express": "^4.17.21",
-        "@types/serve-index": "^1.9.4",
-        "@types/serve-static": "^1.15.5",
-        "@types/sockjs": "^0.3.36",
-        "@types/ws": "^8.5.10",
-        "ansi-html-community": "^0.0.8",
-        "bonjour-service": "^1.2.1",
-        "chokidar": "^3.6.0",
-        "colorette": "^2.0.10",
-        "compression": "^1.7.4",
-        "connect-history-api-fallback": "^2.0.0",
-        "default-gateway": "^6.0.3",
-        "express": "^4.17.3",
-        "graceful-fs": "^4.2.6",
-        "html-entities": "^2.4.0",
-        "http-proxy-middleware": "^2.0.3",
-        "ipaddr.js": "^2.1.0",
-        "launch-editor": "^2.6.1",
-        "open": "^10.0.3",
-        "p-retry": "^6.2.0",
-        "rimraf": "^5.0.5",
-        "schema-utils": "^4.2.0",
-        "selfsigned": "^2.4.1",
-        "serve-index": "^1.9.1",
-        "sockjs": "^0.3.24",
-        "spdy": "^4.0.2",
-        "webpack-dev-middleware": "^7.1.0",
-        "ws": "^8.16.0"
-      },
-      "bin": {
-        "webpack-dev-server": "bin/webpack-dev-server.js"
-      },
-      "engines": {
-        "node": ">= 18.12.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.0.0"
-      },
-      "peerDependenciesMeta": {
-        "webpack": {
-          "optional": true
-        },
-        "webpack-cli": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/define-lazy-prop": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz",
-      "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/glob": {
-      "version": "10.4.2",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.2.tgz",
-      "integrity": "sha512-GwMlUF6PkPo3Gk21UxkCohOv0PLcIXVtKyLlpEI28R/cO/4eNOdmLk3CMW1wROV/WR/EsZOWAfBbBOqYvs88/w==",
-      "dev": true,
-      "dependencies": {
-        "foreground-child": "^3.1.0",
-        "jackspeak": "^3.1.2",
-        "minimatch": "^9.0.4",
-        "minipass": "^7.1.2",
-        "package-json-from-dist": "^1.0.0",
-        "path-scurry": "^1.11.1"
-      },
-      "bin": {
-        "glob": "dist/esm/bin.mjs"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/http-proxy-middleware": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
-      "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
-      "dev": true,
-      "dependencies": {
-        "@types/http-proxy": "^1.17.8",
-        "http-proxy": "^1.18.1",
-        "is-glob": "^4.0.1",
-        "is-plain-obj": "^3.0.0",
-        "micromatch": "^4.0.2"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "peerDependencies": {
-        "@types/express": "^4.17.13"
-      },
-      "peerDependenciesMeta": {
-        "@types/express": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/is-wsl": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-3.1.0.tgz",
-      "integrity": "sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==",
-      "dev": true,
-      "dependencies": {
-        "is-inside-container": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/minimatch": {
-      "version": "9.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz",
-      "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/open": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/open/-/open-10.1.0.tgz",
-      "integrity": "sha512-mnkeQ1qP5Ue2wd+aivTD3NHd/lZ96Lu0jgf0pwktLPtx6cTZiH7tyeGRRHs0zX0rbrahXPnXlUnbeXyaBBuIaw==",
-      "dev": true,
-      "dependencies": {
-        "default-browser": "^5.2.1",
-        "define-lazy-prop": "^3.0.0",
-        "is-inside-container": "^1.0.0",
-        "is-wsl": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/rimraf": {
-      "version": "5.0.7",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.7.tgz",
-      "integrity": "sha512-nV6YcJo5wbLW77m+8KjH8aB/7/rxQy9SZ0HY5shnwULfS+9nmTtVXAJET5NdZmCzA4fPI/Hm1wo/Po/4mopOdg==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^10.3.7"
-      },
-      "bin": {
-        "rimraf": "dist/esm/bin.mjs"
-      },
-      "engines": {
-        "node": ">=14.18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/webpack-merge": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.10.0.tgz",
-      "integrity": "sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==",
-      "dev": true,
-      "dependencies": {
-        "clone-deep": "^4.0.1",
-        "flat": "^5.0.2",
-        "wildcard": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/webpack-sources": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
-      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/webpack-subresource-integrity": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-5.1.0.tgz",
-      "integrity": "sha512-sacXoX+xd8r4WKsy9MvH/q/vBtEHr86cpImXwyg74pFIpERKt6FmB8cXpeuh0ZLgclOlHI4Wcll7+R5L02xk9Q==",
-      "dev": true,
-      "dependencies": {
-        "typed-assert": "^1.0.8"
-      },
-      "engines": {
-        "node": ">= 12"
-      },
-      "peerDependencies": {
-        "html-webpack-plugin": ">= 5.0.0-beta.1 < 6",
-        "webpack": "^5.12.0"
-      },
-      "peerDependenciesMeta": {
-        "html-webpack-plugin": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/webpack/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/webpack/node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
-    "node_modules/webpack/node_modules/json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-      "dev": true
-    },
-    "node_modules/webpack/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/webpack/node_modules/schema-utils": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
-      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/websocket-driver": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
-      "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
-      "dev": true,
-      "dependencies": {
-        "http-parser-js": ">=0.5.1",
-        "safe-buffer": ">=5.1.0",
-        "websocket-extensions": ">=0.1.1"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/websocket-extensions": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
-      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
-      }
-    },
-    "node_modules/wildcard": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz",
-      "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==",
-      "dev": true
-    },
-    "node_modules/wrap-ansi": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/wrap-ansi-cjs": {
-      "name": "wrap-ansi",
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
-    "node_modules/wrap-ansi-cjs/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/wrap-ansi-cjs/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/wrap-ansi-cjs/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/wrap-ansi/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "dev": true
-    },
-    "node_modules/ws": {
-      "version": "8.17.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
-      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": ">=5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/y18n": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/yallist": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-      "dev": true
-    },
-    "node_modules/yaml": {
-      "version": "2.4.5",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.5.tgz",
-      "integrity": "sha512-aBx2bnqDzVOyNKfsysjA2ms5ZlnjSAW2eG3/L5G/CSujfjLJTJsEw1bGw8kCf04KodQWk1pxlGnZ56CRxiawmg==",
-      "dev": true,
-      "bin": {
-        "yaml": "bin.mjs"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/yargs": {
-      "version": "17.7.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
-      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
-      "dev": true,
-      "dependencies": {
-        "cliui": "^8.0.1",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.3",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^21.1.1"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/yargs-parser": {
-      "version": "21.1.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/yocto-queue": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
-      "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.20"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/zone.js": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.14.7.tgz",
-      "integrity": "sha512-0w6DGkX2BPuiK/NLf+4A8FLE43QwBfuqz2dVgi/40Rj1WmqUskCqj329O/pwrqFJLG5X8wkeG2RhIAro441xtg=="
-    },
-    "node_modules/zrender": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.6.0.tgz",
-      "integrity": "sha512-uzgraf4njmmHAbEUxMJ8Oxg+P3fT04O+9p7gY+wJRVxo8Ge+KmYv0WJev945EH4wFuc4OY2NLXz46FZrWS9xJg==",
-      "dependencies": {
-        "tslib": "2.3.0"
-      }
-    },
-    "node_modules/zrender/node_modules/tslib": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
-      "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
-    }
-  }
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/package.json
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/package.json	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,43 +1,0 @@
-{
-  "name": "bus-n-go-frontend",
-  "version": "0.0.0",
-  "scripts": {
-    "ng": "ng",
-    "start": "ng serve",
-    "build": "ng build",
-    "watch": "ng build --watch --configuration development",
-    "test": "ng test"
-  },
-  "private": true,
-  "dependencies": {
-    "@angular/animations": "^18.0.0",
-    "@angular/cdk": "^18.0.4",
-    "@angular/common": "^18.0.0",
-    "@angular/compiler": "^18.0.0",
-    "@angular/core": "^18.0.0",
-    "@angular/forms": "^18.0.0",
-    "@angular/material": "^18.0.4",
-    "@angular/platform-browser": "^18.0.0",
-    "@angular/platform-browser-dynamic": "^18.0.0",
-    "@angular/router": "^18.0.0",
-    "echarts": "^5.5.1",
-    "ngx-echarts": "^18.0.0",
-    "rxjs": "~7.8.0",
-    "tslib": "^2.3.0",
-    "zone.js": "~0.14.3"
-  },
-  "devDependencies": {
-    "@angular-devkit/build-angular": "^18.0.4",
-    "@angular/cli": "^18.0.4",
-    "@angular/compiler-cli": "^18.0.0",
-    "@types/jasmine": "~5.1.0",
-    "jasmine-core": "~5.1.0",
-    "karma": "~6.4.0",
-    "karma-chrome-launcher": "~3.2.0",
-    "karma-coverage": "~2.2.0",
-    "karma-jasmine": "~5.1.0",
-    "karma-jasmine-html-reporter": "~2.1.0",
-    "tailwindcss": "^3.4.4",
-    "typescript": "~5.4.2"
-  }
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/app.component.html
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/app.component.html	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,3 +1,0 @@
-<app-navigation></app-navigation>
-<router-outlet></router-outlet>
-<app-footer></app-footer>
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/app.component.spec.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/app.component.spec.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,29 +1,0 @@
-import { TestBed } from '@angular/core/testing';
-import { AppComponent } from './app.component';
-
-describe('AppComponent', () => {
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [AppComponent],
-    }).compileComponents();
-  });
-
-  it('should create the app', () => {
-    const fixture = TestBed.createComponent(AppComponent);
-    const app = fixture.componentInstance;
-    expect(app).toBeTruthy();
-  });
-
-  it(`should have the 'bus-n-go-frontend' title`, () => {
-    const fixture = TestBed.createComponent(AppComponent);
-    const app = fixture.componentInstance;
-    expect(app.title).toEqual('bus-n-go-frontend');
-  });
-
-  it('should render title', () => {
-    const fixture = TestBed.createComponent(AppComponent);
-    fixture.detectChanges();
-    const compiled = fixture.nativeElement as HTMLElement;
-    expect(compiled.querySelector('h1')?.textContent).toContain('Hello, bus-n-go-frontend');
-  });
-});
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/app.component.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/app.component.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,16 +1,0 @@
-import {Component, OnInit} from '@angular/core';
-import { RouterOutlet } from '@angular/router';
-import {MatSlideToggleModule} from "@angular/material/slide-toggle";
-import {NavigationComponent} from "./components/navigation/navigation.component";
-import {FooterComponent} from "./components/footer/footer.component";
-
-@Component({
-  selector: 'app-root',
-  standalone: true,
-  imports: [RouterOutlet, MatSlideToggleModule, NavigationComponent, FooterComponent],
-  templateUrl: './app.component.html',
-  styleUrl: './app.component.css'
-})
-export class AppComponent {
-
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/app.config.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/app.config.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,16 +1,0 @@
-import { ApplicationConfig, provideZoneChangeDetection } from '@angular/core';
-import { provideRouter } from '@angular/router';
-
-import { routes } from './app.routes';
-import { provideAnimationsAsync } from '@angular/platform-browser/animations/async';
-import {provideHttpClient, withInterceptors} from "@angular/common/http";
-import {authInterceptor} from "./interceptors/auth.interceptor";
-
-export const appConfig: ApplicationConfig = {
-  providers: [
-    provideZoneChangeDetection({ eventCoalescing: true }),
-    provideRouter(routes),
-    provideAnimationsAsync(),
-    provideHttpClient(withInterceptors([authInterceptor]))
-  ]
-};
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/app.routes.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/app.routes.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,70 +1,0 @@
-import {Routes} from '@angular/router';
-import {LoginComponent} from "./components/login/login.component";
-import {TicketsPageComponent} from "./components/tickets-page/tickets-page.component";
-import {TicketsBuyComponent} from "./components/tickets-buy/tickets-buy.component";
-import {StartRouteInstanceComponent} from "./components/route-instances/start-route-instnace/start-route-instance.component";
-import {RouteInstanceComponent} from "./components/route-instances/route-instance/route-instance.component";
-import {StartCommuteComponent} from "./components/commutes/start-commute/start-commute.component";
-import {CommuteComponent} from "./components/commutes/commute/commute.component";
-import {StartCcontrolComponent} from "./components/controls/start-ccontrol/start-ccontrol.component";
-import {ControlsComponent} from "./components/controls/controls/controls.component";
-import {ControlComponent} from "./components/controls/control/control.component";
-import {AdminPanelComponent} from "./components/admin/admin-panel/admin-panel.component";
-import {RegisterComponent} from "./components/register/register.component";
-import {authGuard} from "./guards/auth.guard";
-import {authCanmatchGuard} from "./guards/auth-canmatch.guard";
-
-export const routes: Routes = [{
-  path: 'login',
-  component: LoginComponent
-},
-  {
-    path: 'tickets',
-    component: TicketsPageComponent,
-    canActivate: [authGuard],
-    canMatch: [authCanmatchGuard]
-  },
-  {
-    path: 'tickets/buy',
-    component: TicketsBuyComponent,
-  },
-  {
-    path: 'route-instances/start',
-    component: StartRouteInstanceComponent,
-    canActivate: [authGuard],
-    canMatch: [authCanmatchGuard]
-  },
-  {
-    path: 'route-instances/:id',
-    component: RouteInstanceComponent
-  },
-  {
-    path: 'commutes/start',
-    component: StartCommuteComponent
-  },
-  {
-    path: 'commutes/:id',
-    component: CommuteComponent
-  },
-  {
-    path: 'controls/start',
-    component: StartCcontrolComponent
-  },
-  {
-    path: 'controls',
-    component: ControlsComponent
-  },
-  {
-    path: 'controls/:id',
-    component: ControlComponent
-  },
-  {
-    path: 'admin',
-    component: AdminPanelComponent
-  },
-  {
-    path: 'register',
-    component: RegisterComponent
-  }
-
-  ];
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/components/admin/admin-panel/admin-panel.component.html
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/components/admin/admin-panel/admin-panel.component.html	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,63 +1,0 @@
-<div class="flex flex-col gap-5">
-  <table mat-table [dataSource]="users" class="mat-elevation-z8">
-
-    <ng-container matColumnDef="id">
-      <th mat-header-cell *matHeaderCellDef> id </th>
-      <td mat-cell *matCellDef="let element"> {{element.id}} </td>
-    </ng-container>
-
-    <ng-container matColumnDef="name">
-      <th mat-header-cell *matHeaderCellDef> name </th>
-      <td mat-cell *matCellDef="let element"> {{element.name}} </td>
-    </ng-container>
-
-    <!-- Weight Column -->
-    <ng-container matColumnDef="email">
-      <th mat-header-cell *matHeaderCellDef> email </th>
-      <td mat-cell *matCellDef="let element"> {{element.email}} </td>
-    </ng-container>
-
-    <!-- Symbol Column -->
-    <ng-container matColumnDef="address">
-      <th mat-header-cell *matHeaderCellDef> address </th>
-      <td mat-cell *matCellDef="let element"> {{element.address}} </td>
-    </ng-container>
-
-    <ng-container matColumnDef="phoneNumber">
-      <th mat-header-cell *matHeaderCellDef> address </th>
-      <td mat-cell *matCellDef="let element"> {{element.phoneNumber}} </td>
-    </ng-container>
-
-    <ng-container matColumnDef="roles">
-      <th mat-header-cell *matHeaderCellDef> roles </th>
-      <td mat-cell *matCellDef="let element">
-        @for(role of allRoles; track $index){
-          <mat-checkbox [name]="role" [value]="role" (change)="onSelectRole(element.id, $event)" [checked]="checked(role, element.roles)" class="example-margin">{{role}}</mat-checkbox>
-        }
-      </td>
-    </ng-container>
-
-    <ng-container matColumnDef="update">
-      <th mat-header-cell *matHeaderCellDef>Update Roles</th>
-      <td mat-cell *matCellDef="let element">
-        <button mat-flat-button (click)="updateRoles(element.id)">Update</button>
-      </td>
-    </ng-container>
-
-    <tr mat-header-row *matHeaderRowDef="usersColumns"></tr>
-    <tr mat-row *matRowDef="let row; columns: usersColumns;"></tr>
-  </table>
-
-  <div>
-    <app-pie-chart [dataFn]="getFinesPerLine()"></app-pie-chart>
-  </div>
-
-  <div>
-    <app-line-chart [dataFn]="getCommutesByHour()"></app-line-chart>
-  </div>
-
-  <div>
-    <app-income-chart [dataFn]="getTotalIncome()"></app-income-chart>
-  </div>
-
-</div>
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/components/admin/admin-panel/admin-panel.component.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/components/admin/admin-panel/admin-panel.component.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,88 +1,0 @@
-import {Component, OnInit} from '@angular/core';
-import {MatTableModule} from '@angular/material/table';
-import {AdminService} from "../../../services/admin/admin.service";
-import {AdminUsersResponse} from "../../../model/responses/AdminUsersResponse";
-import {MatCheckboxChange, MatCheckboxModule} from '@angular/material/checkbox';
-import {MatButton} from "@angular/material/button";
-import {PieChartComponent} from "../../charts/pie-chart/pie-chart.component";
-import {map, Observable} from "rxjs";
-import {PieChartValues} from "../../../model/PieChartValues";
-import {CommutesByHour, LineChartComponent} from "../../charts/line-chart.component";
-import {IncomeChartComponent, IncomeData} from "../../charts/stacked-bar-chart.component";
-
-@Component({
-  selector: 'app-admin-panel',
-  standalone: true,
-  imports: [MatTableModule, MatCheckboxModule, MatButton, PieChartComponent, LineChartComponent, IncomeChartComponent],
-  templateUrl: './admin-panel.component.html',
-  styleUrl: './admin-panel.component.css'
-})
-export class AdminPanelComponent implements OnInit {
-
-  allRoles = ['ROLE_ADMIN', 'ROLE_DRIVER', 'ROLE_CONDUCTOR', 'ROLE_PASSENGER']
-
-  users: AdminUsersResponse[] = []
-  usersColumns: string[] = ['id', 'name', 'email', 'phoneNumber', 'address', 'roles', 'update'];
-
-  constructor(private adminService: AdminService) {
-
-  }
-
-  ngOnInit() {
-    this.adminService.getAllUsers().subscribe({
-      next: data => {
-        this.users = data
-        console.log(data)
-      }
-    })
-  }
-
-  checked(role: string, roles: string[]): boolean {
-    return roles.includes(role)
-  }
-
-  updateRoles(id: number) {
-    console.log(id)
-    const user = this.users.find(u => u.id === id)
-    console.log(user)
-    if (!user) return;
-    this.adminService.updateRolesToUser(id, user.roles).subscribe({
-      next: value => {
-        console.log(value)
-        this.users = value
-      }
-    })
-  }
-
-  onSelectRole(id: number, event: MatCheckboxChange) {
-    console.log(event)
-    const role = event.source.name
-    if (!role) return;
-    this.users.filter(u => u.id === id).forEach(
-      u => {
-        var index = u.roles.indexOf(role);
-        if (index > -1) {
-          u.roles.splice(index, 1);
-        } else {
-          u.roles.push(role);
-        }
-      }
-    )
-  }
-
-  getFinesPerLine(): Observable<PieChartValues[]> {
-    return this.adminService.getFinesPerLine()
-                .pipe(
-                    map(data => data.flatMap(finePerLine => Object({value: finePerLine.count, name: finePerLine.line.ime}))
-                    )
-                );
-  }
-
-  getCommutesByHour(): Observable<CommutesByHour[]> {
-    return this.adminService.getCommutesByHour();
-  }
-
-  getTotalIncome(): Observable<IncomeData[]> {
-    return this.adminService.getTotalIncome()
-  }
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/components/charts/line-chart.component.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/components/charts/line-chart.component.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,90 +1,0 @@
-import { Component, Input, OnInit, OnDestroy } from '@angular/core';
-import { Observable, Subscription } from 'rxjs';
-import {NGX_ECHARTS_CONFIG, NgxEchartsModule} from "ngx-echarts";
-import {Line} from "../../model/Line";
-
-export interface CommutesByHour {
-   id: number,
-   line: Line,
-   interval: string,
-   numberOfCommutes: number,
-}
-
-@Component({
-  selector: 'app-line-chart',
-  template: `
-    <div echarts [options]="chartOptions" class="chart"></div>`,
-  standalone: true,
-  imports: [NgxEchartsModule],
-  providers: [
-    {
-      provide: NGX_ECHARTS_CONFIG,
-      useFactory: () => ({ echarts: () => import('echarts') }),
-    },
-  ],
-  styles: [`
-    .chart {
-      width: 100%;
-      height: 400px;
-    }
-  `]
-})
-export class LineChartComponent implements OnInit, OnDestroy {
-  @Input() dataFn!: Observable<CommutesByHour[]>; // Required input
-
-  chartOptions: any;
-
-  ngOnInit(): void {
-    if (!this.dataFn) {
-      console.error('Input dataFn is required');
-      return;
-    }
-
-
-      this.dataFn.subscribe(data => {
-        console.log(data)
-        this.chartOptions = {
-          title: {
-            text: 'Number of Activities per Hour',
-            left: 'center'
-          },
-          tooltip: {
-            trigger: 'axis'
-          },
-          legend: {
-            data: ['Number of Activities'],
-            left: 'left'
-          },
-          xAxis: {
-            type: 'category',
-            data: data.sort((x, y) => Number(x.interval.slice(0,3)) - Number(y.interval.slice(0,3))).map(d => d.interval),
-            axisLabel: {
-              rotate: 45
-            }
-          },
-          yAxis: {
-            type: 'value',
-            name: 'Number of Activities'
-          },
-          series: [
-            {
-              name: 'Number of Activities',
-              type: 'line',
-              data: data.map(d => d.numberOfCommutes),
-              smooth: true,
-              lineStyle: {
-                color: '#ff6f61'
-              },
-              itemStyle: {
-                color: '#ff6f61'
-              }
-            }
-          ]
-        };
-      }
-    );
-  }
-
-  ngOnDestroy(): void {
-  }
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/components/charts/pie-chart/pie-chart.component.html
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/components/charts/pie-chart/pie-chart.component.html	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,1 +1,0 @@
-<div echarts [options]="chartOptions" class="chart"></div>>
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/components/charts/pie-chart/pie-chart.component.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/components/charts/pie-chart/pie-chart.component.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,67 +1,0 @@
-import {Component, Input, OnInit} from '@angular/core';
-import {NGX_ECHARTS_CONFIG, NgxEchartsModule} from "ngx-echarts";
-import {Observable} from "rxjs";
-import {PieChartValues} from "../../../model/PieChartValues";
-
-
-
-@Component({
-  selector: 'app-pie-chart',
-  standalone: true,
-  imports: [NgxEchartsModule],
-  providers: [
-    {
-      provide: NGX_ECHARTS_CONFIG,
-      useFactory: () => ({ echarts: () => import('echarts') }),
-    },
-  ],
-  templateUrl: './pie-chart.component.html',
-  styleUrl: './pie-chart.component.css'
-})
-export class PieChartComponent implements OnInit {
-  @Input() dataFn!: Observable<PieChartValues[]>
-  chartOptions: any;
-
-  ngOnInit(): void {
-    this.dataFn.subscribe({
-      next: value => {
-        this.chartOptions = this._getOptions(value)
-      }
-    })
-
-  }
-
-  private _getOptions(value: PieChartValues[]) {
-    return {
-      title: {
-        text: 'Fines per Line',
-          subtext: 'Current Year',
-          left: 'center'
-      },
-      tooltip: {
-        trigger: 'item'
-      },
-      legend: {
-        orient: 'vertical',
-          left: 'left'
-      },
-      series: [
-        {
-          name: 'Fines',
-          type: 'pie',
-          radius: '50%',
-          data: [
-            ...value
-          ],
-          emphasis: {
-            itemStyle: {
-              shadowBlur: 10,
-              shadowOffsetX: 0,
-              shadowColor: 'rgba(0, 0, 0, 0.5)'
-            }
-          }
-        }
-      ]
-    };
-  }
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/components/charts/stacked-bar-chart.component.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/components/charts/stacked-bar-chart.component.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,101 +1,0 @@
-import { Component, Input, OnInit, OnDestroy } from '@angular/core';
-import { Observable, Subscription } from 'rxjs';
-import {NGX_ECHARTS_CONFIG, NgxEchartsModule} from "ngx-echarts";
-
-export interface IncomeData {
-  id: number;
-  year: string;
-  finesIncome: number;
-  ticketIncome: number;
-  totalIncome: number;
-}
-
-@Component({
-  selector: 'app-income-chart',
-  template: `
-    <div echarts [options]="chartOptions" class="chart"></div>`,
-  standalone: true,
-  imports: [NgxEchartsModule],
-  providers: [
-    {
-      provide: NGX_ECHARTS_CONFIG,
-      useFactory: () => ({ echarts: () => import('echarts') }),
-    },
-  ],
-  styles: [`
-    .chart {
-      width: 100%;
-      height: 400px;
-    }
-  `]
-})
-export class IncomeChartComponent implements OnInit, OnDestroy {
-  @Input() dataFn!: Observable<IncomeData[]>; // Required input
-
-  chartOptions: any;
-
-  ngOnInit(): void {
-    if (!this.dataFn) {
-      console.error('Input dataFn is required');
-      return;
-    }
-
-      this.dataFn.subscribe(data => {
-        console.log(data)
-        this.chartOptions = {
-          title: {
-            text: 'Yearly Income from Fines and Tickets',
-            left: 'center'
-          },
-          tooltip: {
-            trigger: 'axis',
-            axisPointer: { type: 'shadow' }
-          },
-          legend: {
-            data: ['Fines Income', 'Ticket Income', 'Total Income'],
-            left: 'left'
-          },
-          xAxis: {
-            type: 'category',
-            data: data.sort((x, y) => Number(x.year) - Number(y.year)).map(d => d.year)
-          },
-          yAxis: {
-            type: 'value',
-            name: 'Income'
-          },
-          series: [
-            {
-              name: 'Fines Income',
-              type: 'bar',
-              stack: 'total',
-              data: data.map(d => d.finesIncome),
-              itemStyle: {
-                color: '#ff6f61'
-              }
-            },
-            {
-              name: 'Ticket Income',
-              type: 'bar',
-              stack: 'total',
-              data: data.map(d => d.ticketIncome),
-              itemStyle: {
-                color: '#61a0a8'
-              }
-            },
-            {
-              name: 'Total Income',
-              type: 'bar',
-              data: data.map(d => d.totalIncome),
-              itemStyle: {
-                color: '#c23531'
-              }
-            }
-          ]
-        };
-      }
-    );
-  }
-
-  ngOnDestroy(): void {
-  }
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/components/commutes/commute/commute.component.html
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/components/commutes/commute/commute.component.html	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,1 +1,0 @@
-<p>commute works!</p>
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/components/commutes/commute/commute.component.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/components/commutes/commute/commute.component.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,12 +1,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'app-commute',
-  standalone: true,
-  imports: [],
-  templateUrl: './commute.component.html',
-  styleUrl: './commute.component.css'
-})
-export class CommuteComponent {
-
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/components/commutes/start-commute/start-commute.component.css
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/components/commutes/start-commute/start-commute.component.css	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,3 +1,0 @@
-::ng-deep .mdc-notched-outline__notch {
-  border-right: none !important;
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/components/commutes/start-commute/start-commute.component.html
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/components/commutes/start-commute/start-commute.component.html	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,41 +1,0 @@
-<div class="w-full h-full flex justify-center items-center">
-
-  <div class="flex flex-col">
-
-
-      <form class="flex flex-col">
-
-        <mat-form-field [appearance]="'outline'">
-          <mat-label>Select ticket</mat-label>
-          <mat-select (selectionChange)="onTicketSelect($event)">
-            @for (t of tickets; track t.id) {
-              <mat-option [value]="t.id">{{ t.tip.ime }}</mat-option>
-            }
-          </mat-select>
-        </mat-form-field>
-
-        <mat-form-field [appearance]="'outline'">
-          <mat-label>Select station</mat-label>
-          <mat-select (selectionChange)="onStationPick($event)">
-            @for (s of stations; track s.id) {
-              <mat-option [value]="s.id">{{ s.ime }}</mat-option>
-            }
-          </mat-select>
-        </mat-form-field>
-
-        <mat-form-field [appearance]="'outline'">
-          <mat-label>Select route</mat-label>
-          <mat-select (selectionChange)="onInstancePick($event)">
-            @for (i of routeInstances; track i.id) {
-              <mat-option [value]="i.id">{{ i.line.ime + ' -> ' + i.direction.pravec }}</mat-option>
-            }
-          </mat-select>
-        </mat-form-field>
-
-        <button mat-flat-button (click)="startCommute()">Start commute</button>
-
-      </form>
-
-  </div>
-
-</div>
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/components/commutes/start-commute/start-commute.component.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/components/commutes/start-commute/start-commute.component.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,127 +1,0 @@
-import {Component, OnInit} from '@angular/core';
-import {RouteInstanceService} from "../../../services/route-instance/route-instance.service";
-import {Station} from "../../../model/Station";
-import {RouteInstanceResponse} from "../../../model/responses/RouteInstanceResponse";
-import {StationService} from "../../../services/station/station.service";
-import {MatButton} from "@angular/material/button";
-import {MatFormField, MatLabel} from "@angular/material/form-field";
-import {MatOption} from "@angular/material/core";
-import {MatSelect, MatSelectChange} from "@angular/material/select";
-import {Subject, switchMap, tap} from "rxjs";
-import {CommuteService} from "../../../services/commute/commute.service";
-import {TicketService} from "../../../services/ticket/ticket.service";
-import {TicketResponse} from "../../../model/responses/TicketResponse";
-import {Router} from "@angular/router";
-import {log} from "@angular-devkit/build-angular/src/builders/ssr-dev-server";
-
-@Component({
-  selector: 'app-start-commute',
-  standalone: true,
-  imports: [
-    MatButton,
-    MatFormField,
-    MatLabel,
-    MatOption,
-    MatSelect
-  ],
-  templateUrl: './start-commute.component.html',
-  styleUrl: './start-commute.component.css'
-})
-export class StartCommuteComponent implements OnInit {
-  tickets: TicketResponse[] = []
-  stations: Station[] = []
-  routeInstances: RouteInstanceResponse[] = []
-
-  station: number | undefined;
-  instance: number | undefined;
-  ticket: number | undefined;
-
-  private _stationSelected$ = new Subject<number>();
-  private _instanceSelected$ = new Subject<number>();
-  private _ticketSelected$ = new Subject<number>();
-  private _startCommute$ = new Subject<void>();
-
-  constructor(private routeInstanceService: RouteInstanceService,
-              private stationService: StationService,
-              private commuteService: CommuteService,
-              private ticketService: TicketService,
-              private _router: Router,
-  ) {
-  }
-
-  ngOnInit(): void {
-    this.ticketService.getTickets().subscribe({
-      next: response => {
-        this.tickets = response
-        console.log(this.tickets)
-      }
-    })
-
-    this.stationService.getAllStations().subscribe({
-      next: response => {
-        this.stations = response;
-        console.log(this.stations)
-      }
-    })
-
-    this._stationSelected$.pipe(
-      switchMap(station => this.routeInstanceService.getForStation(station))
-    ).subscribe({
-      next: response => {
-        this.routeInstances = response;
-        console.log(response);
-      }
-    })
-    // todo: finish logic
-    this._startCommute$.pipe(
-      switchMap(() => {
-          console.log('in switch map');
-          return this.commuteService.startCommute({
-            stationId: this.station!!,
-            routeInstanceId: this.instance!!,
-            ticketId: this.ticket!!
-          });
-        }
-      )
-    ).subscribe({
-      next: response => {
-        console.log(response)
-      },
-      error: err => console.log(err)
-    })
-  }
-
-
-  onStationPick(event: MatSelectChange) {
-    this.station = event.value
-    if (this.station) this._stationSelected$.next(this.station)
-  }
-
-  onInstancePick(event: MatSelectChange) {
-    this.instance = event.value
-    if (this.instance) this._instanceSelected$.next(this.instance)
-  }
-
-  startCommute() {
-    console.log('starting commute');
-    console.log('ticket', this.ticket);
-    console.log('instance', this.instance);
-    console.log('station', this.station);
-    if (this.station && this.ticket && this.instance)
-      this.commuteService.startCommute({
-        stationId: this.station!!,
-        routeInstanceId: this.instance!!,
-        ticketId: this.ticket!!
-      }).pipe(
-        tap(res => console.log(res))
-      ).subscribe(res => {
-        console.log(res)
-        this._router.navigate(['/commutes', res.id])
-      })
-  }
-
-  onTicketSelect(event: MatSelectChange) {
-    this.ticket = event.value
-    if (this.ticket) this._ticketSelected$.next(this.ticket)
-  }
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/components/controls/control/control.component.css
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/components/controls/control/control.component.css	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,3 +1,0 @@
-::ng-deep .mdc-notched-outline__notch {
-  border-right: none !important;
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/components/controls/control/control.component.html
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/components/controls/control/control.component.html	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,78 +1,0 @@
-<div class="flex flex-col justify-center items-center">
-  <div class="w-full flex flex-col justify-center items-center p-10">
-    <h1 class="text-3xl p-5">Create new fine</h1>
-    <div class="w-1/3">
-      <form (ngSubmit)="onSubmit($event)" class="flex flex-wrap gap-x-5" [formGroup]="fineForm">
-        <mat-form-field>
-          <mat-label>Iznos</mat-label>
-          <input formControlName="iznos" matInput placeholder="1000" value="" type="number">
-        </mat-form-field>
-
-        <mat-checkbox class="w-1/3" formControlName="plateno">Plateno</mat-checkbox>
-
-        <mat-form-field>
-          <mat-label>Dokument</mat-label>
-          <input formControlName="dokument" matInput placeholder="DC-1234" value="" type="text">
-        </mat-form-field>
-
-        <mat-form-field (click)="onClick()" [appearance]="'outline'">
-          <mat-label>Select patnik (if is registered)</mat-label>
-          <mat-select formControlName="patnikId">
-            @for (passenger of passengers; track passenger.email) {
-              <mat-option [value]="passenger.id">{{ passenger.name }} -> {{ passenger.email }}</mat-option>
-            }
-          </mat-select>
-        </mat-form-field>
-
-        <mat-form-field>
-          <mat-label>Telefon</mat-label>
-          <input formControlName="telefon" matInput placeholder="07x xxx xxx" value="" type="text">
-        </mat-form-field>
-
-        <mat-form-field>
-          <mat-label>Adresa</mat-label>
-          <input formControlName="adresa" matInput placeholder="ul. Jane Sandanski" value="" type="text">
-        </mat-form-field>
-
-        <mat-form-field>
-          <mat-label>Ime</mat-label>
-          <input formControlName="ime" matInput placeholder="Zoran Stojkovski" value="" type="text">
-        </mat-form-field>
-
-        <button class="w-3/4" type="submit" mat-flat-button>Create new fine</button>
-      </form>
-    </div>
-  </div>
-
-  <div class="relative overflow-x-auto">
-    <table class="w-full text-sm text-left rtl:text-right text-gray-500 dark:text-gray-400">
-      <thead class="text-xs text-gray-700 uppercase bg-gray-50 dark:bg-gray-700 dark:text-gray-400">
-      <tr>
-        <th scope="col" class="px-6 py-3">#</th>
-        <th scope="col" class="px-6 py-3">Conductor</th>
-        <th scope="col" class="px-6 py-3">Passenger</th>
-        <th scope="col" class="px-6 py-3">Date Created</th>
-        <th scope="col" class="px-6 py-3">Payed</th>
-        <th scope="col" class="px-6 py-3">Date Payed</th>
-
-      </tr>
-      </thead>
-      <tbody>
-
-        @for (fine of fines; track fine.id) {
-          <tr>
-            <td class="px-6 py-4">
-              {{ fine.id }}
-            </td>
-            <td class="px-6 py-4">{{ fine.kondukter.name }}</td>
-            <td class="px-6 py-4">{{ fine.ime }}{{ fine.patnik?.name }}</td>
-            <td class="px-6 py-4">{{ fine.dateCreated }}</td>
-            <td class="px-6 py-4">{{ fine.plateno }}</td>
-            <td class="px-6 py-4">{{ fine.datePayed || 'not payed' }}</td>
-          </tr>
-        }
-      </tbody>
-    </table>
-  </div>
-
-</div>
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/components/controls/control/control.component.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/components/controls/control/control.component.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,83 +1,0 @@
-import {Component, OnInit} from '@angular/core';
-import {ActivatedRoute, Router} from "@angular/router";
-import {ControlsService} from "../../../services/controls/controls.service";
-import {FineResponse} from "../../../model/responses/FineResponse";
-import {MatInputModule} from '@angular/material/input';
-import {MatFormFieldModule} from '@angular/material/form-field';
-import {FormControl, FormGroup, FormsModule, ReactiveFormsModule, Validators} from '@angular/forms';
-import {MatOption} from "@angular/material/core";
-import {MatSelect} from "@angular/material/select";
-import {UserService} from "../../../services/user/user.service";
-import {UserResponse} from "../../../model/responses/UserResponse";
-import {MatButton} from "@angular/material/button";
-import {MatCheckbox} from "@angular/material/checkbox";
-import {FineRequest} from "../../../model/requests/FineRequest";
-import {FineService} from "../../../services/fine/fine.service";
-import {Subject, switchMap} from "rxjs";
-
-@Component({
-  selector: 'app-control',
-  standalone: true,
-  imports: [
-    FormsModule, MatFormFieldModule, MatInputModule, ReactiveFormsModule, MatOption, MatSelect, MatButton, MatCheckbox
-  ],
-  templateUrl: './control.component.html',
-  styleUrl: './control.component.css'
-})
-export class ControlComponent implements OnInit {
-  controlId: number = +this.route.snapshot.paramMap.get('id')!!;
-  fines: FineResponse[] = []
-  passengers: UserResponse[] = []
-
-  fineForm: FormGroup = new FormGroup({
-    dokument: new FormControl(null, [Validators.required]),
-    plateno: new FormControl(null, [Validators.required]),
-    iznos: new FormControl(null, [Validators.required]),
-    patnikId: new FormControl(null, []),
-    telefon: new FormControl(null, []),
-    ime: new FormControl(null, []),
-    adresa: new FormControl(null, []),
-    kontrolaId: new FormControl(this.controlId, []),
-  })
-  private refreshFines$ = new Subject<void>();
-
-  constructor(private route: ActivatedRoute, private router: Router,
-              private controlsService: ControlsService,
-              private userService: UserService,
-              private fineService: FineService) {
-  }
-
-  ngOnInit(): void {
-    this.controlId = +this.route.snapshot.paramMap.get('id')!!
-    this.refreshFines$.pipe(
-      switchMap(() => this.controlsService.getControlInfo(this.controlId))
-    ).subscribe({
-      next: response => {
-        this.fines = response
-      }
-    })
-    this.refreshFines$.next()
-  }
-
-
-  onClick() {
-    this.userService.getAllPassengers().subscribe(
-      res => {
-        this.passengers = res;
-      }
-    )
-  }
-
-  protected readonly onsubmit = onsubmit;
-
-  onSubmit($event: any) {
-    console.log($event)
-    console.log(this.fineForm.value)
-    this.fineService.createFine(this.fineForm.value as FineRequest).subscribe({
-      next: res => {
-        console.log(res)
-        this.refreshFines$.next()
-      }
-    })
-  }
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/components/controls/controls/controls.component.css
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/components/controls/controls/controls.component.css	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,3 +1,0 @@
-::ng-deep .mdc-notched-outline__notch {
-  border-right: none !important;
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/components/controls/controls/controls.component.html
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/components/controls/controls/controls.component.html	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,51 +1,0 @@
-<div class="w-full h-full flex flex-col justify-center items-center">
-
-  <div>
-    <div>
-      <mat-form-field (click)="onClick()" [appearance]="'outline'">
-        <mat-label>Select instance</mat-label>
-        <mat-select (selectionChange)="onInstancePick($event)">
-          @for (instance of instances; track instance.id) {
-            <mat-option [value]="instance.id">{{ instance.line.ime }} -> {{instance.direction.pravec}}</mat-option>
-          }
-        </mat-select>
-      </mat-form-field>
-    </div>
-
-      <button mat-flat-button (click)="onStart()">
-        Start new
-      </button>
-
-
-  </div>
-
-
-  <div class="relative overflow-x-auto">
-    <table class="w-full text-sm text-left rtl:text-right text-gray-500 dark:text-gray-400">
-      <thead class="text-xs text-gray-700 uppercase bg-gray-50 dark:bg-gray-700 dark:text-gray-400">
-      <tr>
-        <th scope="col" class="px-6 py-3">Link</th>
-        <th scope="col" class="px-6 py-3">Conductor</th>
-        <th scope="col" class="px-6 py-3">Route Instance</th>
-        <th scope="col" class="px-6 py-3">Date Created</th>
-
-      </tr>
-      </thead>
-      <tbody>
-
-        @for (control of controls; track control.id) {
-          <tr>
-            <td class="px-6 py-4" [routerLink]="[control.id]">
-              <a class="text-blue-700 cursor-pointer">Go to control</a>
-            </td>
-            <td class="px-6 py-4">{{control.kondukter.name}}</td>
-            <td class="px-6 py-4">{{control.instancaNaLinija.line.ime}} - {{control.instancaNaLinija.direction.pravec}} - {{control.instancaNaLinija.driver.name}}</td>
-            <td class="px-6 py-4">{{control.dateCreated}}</td>
-          </tr>
-        }
-      </tbody>
-    </table>
-  </div>
-
-
-</div>
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/components/controls/controls/controls.component.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/components/controls/controls/controls.component.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,61 +1,0 @@
-import {Component, OnInit} from '@angular/core';
-import {ControlsService} from "../../../services/controls/controls.service";
-import {ControlsResponse} from "../../../model/responses/ControlsResponse";
-import {Router, RouterLink} from "@angular/router";
-import {MatButton} from "@angular/material/button";
-import {MatFormField, MatLabel} from "@angular/material/form-field";
-import {MatOption} from "@angular/material/core";
-import {MatSelect, MatSelectChange} from "@angular/material/select";
-import {RouteInstanceService} from "../../../services/route-instance/route-instance.service";
-import {RouteInstanceResponse} from "../../../model/responses/RouteInstanceResponse";
-
-@Component({
-  selector: 'app-controls',
-  standalone: true,
-  imports: [
-    RouterLink,
-    MatButton,
-    MatFormField,
-    MatLabel,
-    MatOption,
-    MatSelect
-  ],
-  templateUrl: './controls.component.html',
-  styleUrl: './controls.component.css'
-})
-export class ControlsComponent implements OnInit {
-  controls: ControlsResponse[] = []
-  instances: RouteInstanceResponse[] = []
-
-  instanceId: number | undefined;
-
-  constructor(private _controlsService: ControlsService,
-              private _routeInstanceService: RouteInstanceService,
-              private router: Router) {
-  }
-
-  ngOnInit() {
-    this._controlsService.getControls().subscribe(controls => {
-      this.controls = controls
-    })
-
-
-  }
-
-  onClick() {
-    this._routeInstanceService.getAll().subscribe(instances => this.instances = instances)
-  }
-
-  onInstancePick(event: MatSelectChange) {
-    this.instanceId = event.value
-  }
-
-  onStart() {
-    if (this.instanceId) {
-      this._controlsService.start(this.instanceId).subscribe(response => {
-        console.log(response);
-        this.router.navigate(['/controls', response.id])
-      })
-    }
-  }
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/components/controls/start-ccontrol/start-ccontrol.component.html
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/components/controls/start-ccontrol/start-ccontrol.component.html	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,1 +1,0 @@
-<p>start-ccontrol works!</p>
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/components/controls/start-ccontrol/start-ccontrol.component.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/components/controls/start-ccontrol/start-ccontrol.component.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,12 +1,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'app-start-ccontrol',
-  standalone: true,
-  imports: [],
-  templateUrl: './start-ccontrol.component.html',
-  styleUrl: './start-ccontrol.component.css'
-})
-export class StartCcontrolComponent {
-
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/components/footer/footer.component.html
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/components/footer/footer.component.html	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,1 +1,0 @@
-<p>footer works!</p>
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/components/footer/footer.component.spec.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/components/footer/footer.component.spec.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,23 +1,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { FooterComponent } from './footer.component';
-
-describe('FooterComponent', () => {
-  let component: FooterComponent;
-  let fixture: ComponentFixture<FooterComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [FooterComponent]
-    })
-    .compileComponents();
-
-    fixture = TestBed.createComponent(FooterComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/components/footer/footer.component.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/components/footer/footer.component.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,12 +1,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'app-footer',
-  standalone: true,
-  imports: [],
-  templateUrl: './footer.component.html',
-  styleUrl: './footer.component.css'
-})
-export class FooterComponent {
-
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/components/input-field/input-field.component.html
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/components/input-field/input-field.component.html	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,17 +1,0 @@
-<div>
-  @if (additionalInfo) {
-    <div class="flex items-center justify-between">
-      <label [for]="id" class="block text-sm font-medium leading-6 text-gray-900">{{label}}</label>
-      <div class="text-sm">
-        <a href="#" class="font-semibold text-indigo-600 hover:text-indigo-500">{{additionalInfo}}</a>
-      </div>
-
-    </div>
-  } @else {
-    <label [for]="id" class="block text-sm font-medium leading-6 text-gray-900">{{label}}</label>
-  }
-
-  <div class="mt-2">
-    <input #input (input)="handleInput(input.value)" [id]="id" [name]="name" [type]="type" [placeholder]="placeholder" [autocomplete]="autocomplete"  [required]="required" [class]="customClass">
-  </div>
-</div>
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/components/input-field/input-field.component.spec.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/components/input-field/input-field.component.spec.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,23 +1,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { InputFieldComponent } from './input-field.component';
-
-describe('InputFieldComponent', () => {
-  let component: InputFieldComponent;
-  let fixture: ComponentFixture<InputFieldComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [InputFieldComponent]
-    })
-    .compileComponents();
-
-    fixture = TestBed.createComponent(InputFieldComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/components/input-field/input-field.component.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/components/input-field/input-field.component.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,25 +1,0 @@
-import {Component, EventEmitter, Input, Output} from '@angular/core';
-
-@Component({
-  selector: 'app-input-field',
-  standalone: true,
-  imports: [],
-  templateUrl: './input-field.component.html',
-  styleUrl: './input-field.component.css'
-})
-export class InputFieldComponent {
-  @Input() name: string | undefined;
-  @Input() type: string | undefined;
-  @Input() placeholder: string | undefined;
-  @Input() id: string | undefined;
-  @Input() customClass: string | undefined;
-  @Input() required: boolean | undefined;
-  @Input() autocomplete: string | undefined;
-  @Input() label: string | undefined;
-  @Input() additionalInfo: string | undefined;
-  @Output() onInputChange: EventEmitter<string | undefined> = new EventEmitter();
-
-  handleInput(value: string) {
-    this.onInputChange.emit(value)
-  }
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/components/login/login.component.html
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/components/login/login.component.html	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,51 +1,0 @@
-<!--
-  This example requires some changes to your config:
-
-  ```
-  // tailwind.config.js
-  module.exports = {
-    // ...
-    plugins: [
-      // ...
-      require('@tailwindcss/forms'),
-    ],
-  }
-  ```
--->
-<!--
-  This example requires updating your template:
-
-  ```
-  <html class="h-full bg-white">
-  <body class="h-full">
-  ```
--->
-<div class="flex min-h-full flex-col justify-center px-6 py-12 lg:px-8">
-  <div class="sm:mx-auto sm:w-full sm:max-w-sm">
-    <img class="mx-auto h-10 w-auto" src="https://tailwindui.com/img/logos/mark.svg?color=indigo&shade=600" alt="Your Company">
-    <h2 class="mt-10 text-center text-2xl font-bold leading-9 tracking-tight text-gray-900">Sign in to your account</h2>
-  </div>
-
-  <div class="mt-10 sm:mx-auto sm:w-full sm:max-w-sm">
-    <form [formGroup]="form" class="space-y-6" (ngSubmit)="onSubmit($event)">
-      <mat-form-field appearance="outline">
-        <label>Email</label>
-        <input matInput formControlName="email" placeholder="john.doe@example.com">
-      </mat-form-field>
-
-      <mat-form-field appearance="outline">
-        <label>Password</label>
-        <input  matInput [type]="'password'" formControlName="password">
-      </mat-form-field>
-
-      <div>
-        <input [disabled]="form.invalid || form.pristine" value="Sign in" type="submit" class="flex w-full justify-center rounded-md bg-indigo-600 px-3 py-1.5 text-sm font-semibold leading-6 text-white shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600">
-      </div>
-    </form>
-
-    <p class="mt-10 text-center text-sm text-gray-500">
-      Not a member?
-      <a [routerLink]="['/register']" class="font-semibold leading-6 text-indigo-600 hover:text-indigo-500">Register now!</a>
-    </p>
-  </div>
-</div>
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/components/login/login.component.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/components/login/login.component.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,56 +1,0 @@
-import { Component } from '@angular/core';
-import {
-  FormControl,
-  FormGroupDirective,
-  NgForm,
-  Validators,
-  FormsModule,
-  ReactiveFormsModule, FormGroup,
-} from '@angular/forms';
-import {MatInputModule} from '@angular/material/input';
-import {MatFormFieldModule} from '@angular/material/form-field';
-import {ErrorStateMatcher} from "@angular/material/core";
-import {Router, RouterLink} from "@angular/router";
-import {InputFieldComponent} from "../input-field/input-field.component";
-import {AuthService} from "../../services/auth/auth.service";
-import {AuthRequest} from "../../model/requests/AuthRequest";
-import {tap} from "rxjs";
-@Component({
-  standalone: true,
-  imports: [FormsModule, MatFormFieldModule, MatInputModule, ReactiveFormsModule, RouterLink, InputFieldComponent],
-  templateUrl: './login.component.html',
-})
-export class LoginComponent {
-
-  form: FormGroup = new FormGroup({
-    email: new FormControl('', [Validators.required, Validators.email]),
-    password: new FormControl('', [Validators.required]),
-  })
-
-  constructor(
-    private router: Router,
-    private service: AuthService
-  ) {
-  }
-
-  onSubmit($event: Event) {
-    console.log(this.form.value as AuthRequest)
-      this.service.login(this.form.value as AuthRequest)
-        .pipe(
-          tap(result => {
-            console.log(result)
-            sessionStorage.setItem('jwt', result.token);
-            this.service.refreshAuth$.next(true);
-          })
-        )
-        .subscribe({
-        next: result => {
-          this.router.navigate(['/'])
-        },
-        error: error => {
-          sessionStorage.removeItem('jwt');
-        }
-      })
-  }
-}
-
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/components/navigation/navigation.component.html
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/components/navigation/navigation.component.html	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,24 +1,0 @@
-<div class="w-full flex justify-center items-center h-[100px] bg-gray-300">
-  <div class="w-4/5 flex justify-between">
-    <div class="flex gap-4">
-      <a [routerLink]="['tickets']">Tickets</a>
-      <a [routerLink]="['route-instances', 'start']">Start Route</a>
-      <a [routerLink]="['commutes', 'start']">Commute</a>
-      <a [routerLink]="['controls']">Controls</a>
-      <a [routerLink]="['admin']">Admin Panel</a>
-    </div>
-    <div>
-      @if (user) {
-        <button mat-button [matMenuTriggerFor]="menu">{{user.email}}</button>
-        <mat-menu #menu="matMenu">
-          <button (click)="signOut()" mat-menu-item>Sign out</button>
-          <button mat-menu-item>Item 2</button>
-        </mat-menu>
-      } @else {
-        <a [routerLink]="['login']">
-          <button mat-flat-button>Log in</button>
-        </a>
-      }
-    </div>
-  </div>
-</div>
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/components/navigation/navigation.component.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/components/navigation/navigation.component.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,66 +1,0 @@
-import {Component, OnInit} from '@angular/core';
-import {AuthService} from "../../services/auth/auth.service";
-import {Router, RouterLink} from "@angular/router";
-import {switchMap} from "rxjs";
-import {UserResponse} from "../../model/responses/UserResponse";
-import {UserService} from "../../services/user/user.service";
-import {MatMenuModule} from '@angular/material/menu';
-import {MatButtonModule} from '@angular/material/button';
-
-@Component({
-  selector: 'app-navigation',
-  standalone: true,
-  imports: [
-    RouterLink, MatButtonModule, MatMenuModule
-  ],
-  templateUrl: './navigation.component.html',
-})
-export class NavigationComponent implements OnInit {
-
-  constructor(
-    private _authService: AuthService,
-    private _router: Router,
-    private _userService: UserService,
-  ) {
-  }
-
-  user: UserResponse | undefined
-
-  ngOnInit(): void {
-    this._authService.refreshAuth$.pipe(
-      switchMap(auth => this._userService.getUser())
-    ).subscribe({
-      next: user => {
-        console.log(user)
-        this.user = user
-      },
-      error: err => {
-        this.user = undefined
-      }
-    })
-
-    this._userService.getUser().subscribe({
-      next: user => {
-        this.user = user
-      }
-    })
-  }
-
-  isMenuOpen = false;
-  isIconMenuOpen = false;
-
-  changeMenuState() {
-    console.log('changeMenuState');
-    this.isMenuOpen = !this.isMenuOpen;
-  }
-
-  changeIconMenuState() {
-    console.log('changeIconMenuState');
-    this.isIconMenuOpen = !this.isIconMenuOpen;
-  }
-
-  signOut() {
-    sessionStorage.clear()
-    this._authService.refreshAuth$.next(false)
-  }
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/components/register/register.component.html
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/components/register/register.component.html	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,37 +1,0 @@
-
-<div class="w-full h-full flex justify-center items-center">
-  <form [formGroup]="form" class="flex flex-col w-1/2" (ngSubmit)="onSubmit()">
-
-  <mat-form-field appearance="outline">
-    <label>Full Name</label>
-    <input matInput formControlName="name" placeholder="John Doe">
-  </mat-form-field>
-
-  <mat-form-field appearance="outline">
-    <label>Email</label>
-    <input matInput formControlName="email" placeholder="john.doe@example.com">
-  </mat-form-field>
-
-  <mat-form-field appearance="outline">
-    <label>Password</label>
-    <input matInput type="password" formControlName="password">
-  </mat-form-field>
-
-  <mat-form-field appearance="outline">
-    <label>Confirm Password</label>
-    <input matInput type="password" formControlName="confirmPassword">
-  </mat-form-field>
-
-  <mat-form-field appearance="outline">
-    <label>Address</label>
-    <input matInput formControlName="address" placeholder="str. Dame Gruev 12">
-  </mat-form-field>
-
-  <mat-form-field appearance="outline">
-    <label>Phone</label>
-    <input matInput formControlName="phoneNumber" placeholder="+3897xxxxxxx">
-  </mat-form-field>
-
-    <button mat-flat-button>Register</button>
-</form>
-</div>
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/components/register/register.component.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/components/register/register.component.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,82 +1,0 @@
-import { Component } from '@angular/core';
-import {MatFormField} from "@angular/material/form-field";
-import {MatInput} from "@angular/material/input";
-import {MatButtonModule} from "@angular/material/button";
-import {
-  AbstractControl,
-  Form,
-  FormControl,
-  FormGroup,
-  ReactiveFormsModule,
-  ValidationErrors,
-  ValidatorFn,
-  Validators
-} from "@angular/forms";
-import {AuthService} from "../../services/auth/auth.service";
-import {RegisterRequest} from "../../model/requests/RegisterRequest";
-import {Router} from "@angular/router";
-
-@Component({
-  selector: 'app-register',
-  standalone: true,
-  imports: [
-    MatFormField,
-    MatInput,
-    ReactiveFormsModule,
-    MatButtonModule,
-  ],
-  templateUrl: './register.component.html',
-  styleUrl: './register.component.css'
-})
-export class RegisterComponent {
-
-  form: FormGroup = new FormGroup({
-    email: new FormControl('', [Validators.required, Validators.email]),
-    password: new FormControl('', [Validators.required]),
-    phoneNumber: new FormControl('', [Validators.required]),
-    name  : new FormControl('', [Validators.required]),
-    address: new FormControl('', [Validators.required]),
-    confirmPassword: new FormControl('', [Validators.required])
-  },
-    {
-      validators: this.matchValidator('password', 'confirmPassword')
-    })
-
-  constructor(private authService: AuthService, private router: Router) {
-  }
-
-  matchValidator(controlName: string, matchingControlName: string): ValidatorFn {
-    return (abstractControl: AbstractControl) => {
-      const control = abstractControl.get(controlName);
-      const matchingControl = abstractControl.get(matchingControlName);
-
-      if (matchingControl!.errors && !matchingControl!.errors?.['confirmedValidator']) {
-        return null;
-      }
-
-      if (control!.value !== matchingControl!.value) {
-        const error = { confirmedValidator: 'Passwords do not match.' };
-        matchingControl!.setErrors(error);
-        return error;
-      } else {
-        matchingControl!.setErrors(null);
-        return null;
-      }
-    }
-
-
-  }
-
-  onSubmit() {
-    this.authService.register(this.form.value as RegisterRequest).subscribe({
-      next: response => {
-        console.log(response)
-        sessionStorage.setItem('jwt', response.token);
-        this.authService.refreshAuth$.next(true);
-        this.router.navigate(['/'])
-      }
-      }
-    )
-  }
-}
-
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/components/route-instances/route-instance/route-instance.component.html
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/components/route-instances/route-instance/route-instance.component.html	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,14 +1,0 @@
-<div class="flex justify-center items-center w-full h-full">
-
-  {{this.routeInstance?.id}}
-  {{routeInstance?.driver?.email}}
-  <div>
-    {{routeInstance?.end}}
-  </div>
-  <div>
-    <button [disabled]="routeInstance?.end" mat-flat-button (click)="endInstance()">
-      End instance
-    </button>
-  </div>
-
-</div>
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/components/route-instances/route-instance/route-instance.component.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/components/route-instances/route-instance/route-instance.component.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,41 +1,0 @@
-import {Component, OnInit} from '@angular/core';
-import {ActivatedRoute} from "@angular/router";
-import {RouteInstanceService} from "../../../services/route-instance/route-instance.service";
-import {RouteInstanceResponse} from "../../../model/responses/RouteInstanceResponse";
-import {MatButton} from "@angular/material/button";
-
-@Component({
-  selector: 'app-route-instance',
-  standalone: true,
-  imports: [
-    MatButton
-  ],
-  templateUrl: './route-instance.component.html',
-})
-export class RouteInstanceComponent implements OnInit {
-  routeInstance: RouteInstanceResponse | undefined
-
-  constructor(private route: ActivatedRoute,
-              private routeInstanceService: RouteInstanceService,) {
-  }
-
-  ngOnInit(): void {
-    const routeInstanceId: number = +this.route.snapshot.paramMap.get('id')!
-    this.routeInstanceService.getById(routeInstanceId).subscribe({
-      next: response => {
-        this.routeInstance = response
-      }
-    })
-
-  }
-
-  endInstance() {
-    if (this.routeInstance) {
-      this.routeInstanceService.stop(this.routeInstance.id).subscribe({
-        next: response => {
-          this.routeInstance = response
-        }
-      })
-    }
-  }
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/components/route-instances/start-route-instnace/start-route-instance.component.css
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/components/route-instances/start-route-instnace/start-route-instance.component.css	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,3 +1,0 @@
-::ng-deep .mdc-notched-outline__notch {
-  border-right: none !important;
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/components/route-instances/start-route-instnace/start-route-instance.component.html
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/components/route-instances/start-route-instnace/start-route-instance.component.html	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,52 +1,0 @@
-<div class="w-full h-full flex justify-center items-center">
-
-  <div class="flex flex-col">
-
-    @if (isDriverFree) {
-      <form class="flex flex-col">
-
-        <mat-form-field [appearance]="'outline'">
-          <mat-label>Select bus</mat-label>
-          <mat-select (selectionChange)="onBusPick($event)">
-            @for (bus of buses; track bus.id) {
-              <mat-option [value]="bus.id">{{ bus.registracija }}</mat-option>
-            }
-          </mat-select>
-        </mat-form-field>
-
-
-        @if (bus) {
-          <mat-form-field [appearance]="'outline'">
-            <mat-label>Select line</mat-label>
-            <mat-select (selectionChange)="onLinePick($event)">
-              @for (line of lines; track line.id) {
-                <mat-option [value]="line.id">{{ line.ime }}</mat-option>
-              }
-            </mat-select>
-          </mat-form-field>
-        }
-
-        @if (line) {
-          <mat-form-field [appearance]="'outline'">
-            <mat-label>Select direction</mat-label>
-            <mat-select (selectionChange)="onDirectionPick($event)">
-              @for (direction of directions; track direction.id) {
-                <mat-option [value]="direction.id">{{ direction.pravec }}</mat-option>
-              }
-            </mat-select>
-          </mat-form-field>
-        }
-
-        <button (click)="onSubmit()" type="button" mat-flat-button>
-          Start
-        </button>
-      </form>
-    } @else {
-      <div>
-        Currently logged in driver is busy!
-      </div>
-
-    }
-  </div>
-
-</div>
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/components/route-instances/start-route-instnace/start-route-instance.component.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/components/route-instances/start-route-instnace/start-route-instance.component.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,111 +1,0 @@
-import {Component, OnInit} from '@angular/core';
-import {LineService} from "../../../services/line/line.service";
-import {BusService} from "../../../services/bus/bus.service";
-import {DirectionService} from "../../../services/direction/direction.service";
-import {Bus} from "../../../model/Bus";
-import {MatButton} from "@angular/material/button";
-import {MatFormField, MatLabel} from "@angular/material/form-field";
-import {MatOption} from "@angular/material/core";
-import {MatSelect, MatSelectChange} from "@angular/material/select";
-import {filter, Subject, switchMap, tap} from "rxjs";
-import {Line} from "../../../model/Line";
-import {Direction} from "../../../model/Direction";
-import {RouteInstanceService} from "../../../services/route-instance/route-instance.service";
-import {Router} from "@angular/router";
-import {AuthService} from "../../../services/auth/auth.service";
-import {log} from "@angular-devkit/build-angular/src/builders/ssr-dev-server";
-
-@Component({
-  selector: 'app-start-route-instnace',
-  standalone: true,
-  imports: [
-    MatButton,
-    MatFormField,
-    MatLabel,
-    MatOption,
-    MatSelect
-  ],
-  templateUrl: './start-route-instance.component.html',
-  styleUrl: './start-route-instance.component.css'
-})
-export class StartRouteInstanceComponent implements OnInit {
-  buses: Bus[] = []
-  lines: Line[] = []
-  directions: Direction[] = []
-  isDriverFree = false
-
-  bus: Bus | undefined
-  line: Line | undefined
-  direction: Direction | undefined
-
-  private _busSelected$ = new Subject<Bus>();
-  private _lineSelected$ = new Subject<Line>();
-
-  constructor(
-    private _lineService: LineService,
-    private _busService: BusService,
-    private _directionService: DirectionService,
-    private _routeInstanceService: RouteInstanceService,
-    private _router: Router,
-    private _authService: AuthService
-  ) {
-  }
-
-  ngOnInit(): void {
-
-    this._authService.isDriverFree().pipe(
-      tap(x => console.log(x)),
-      tap(isDriverFree => this.isDriverFree = isDriverFree),
-      filter(isDriverFree => isDriverFree === true),
-      switchMap(_ => this._busService.getAllFree())
-    ).subscribe({
-      next: response => {
-        console.log('free buses', response)
-        this.buses = response
-      }
-    })
-
-    this._busSelected$.pipe(
-      switchMap(bus => this._lineService.getAll())
-    ).subscribe({
-      next: response => {
-        this.lines = response
-      }
-    })
-    this._lineSelected$.pipe(
-      switchMap(line => this._lineService.getDirections(line))
-    ).subscribe({
-      next: response => {
-        this.directions = response.map(x => x.pravec)
-        console.log(response)
-      }
-    })
-  }
-
-  onBusPick($event: MatSelectChange) {
-    this.bus = this.buses.find(bus => bus.id === $event.value)
-    if (this.bus) this._busSelected$.next(this.bus)
-  }
-
-  onLinePick($event: MatSelectChange) {
-    this.line = this.lines.find(line => line.id === $event.value)
-    if (this.line) this._lineSelected$.next(this.line)
-  }
-
-  onDirectionPick($event: MatSelectChange) {
-    this.direction = this.directions.find(direction => direction.id === $event.value)
-  }
-
-  onSubmit() {
-    if (this.bus && this.line && this.direction)
-      this._routeInstanceService.start({
-        lineId: this.line.id,
-        busId: this.bus.id,
-        directionId: this.direction.id,
-      }).subscribe({
-        next: response => {
-          this._router.navigate(['/route-instances', response.id])
-        }
-      })
-  }
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/components/ticket/ticket.component.html
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/components/ticket/ticket.component.html	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,17 +1,0 @@
-<div>
-  <mat-card appearance="outlined">
-    <mat-card-header>
-      <mat-card-title> {{ticket?.tip?.ime}}</mat-card-title>
-      <mat-card-subtitle>Duration: {{ticket?.tip?.trajnost}}</mat-card-subtitle>
-      <mat-card-subtitle>Date of buying: {{ticket?.datumKupuvanje}}</mat-card-subtitle>
-      <mat-card-subtitle>Date of activation: {{ticket?.datumAktivacija}}</mat-card-subtitle>
-    </mat-card-header>
-    <mat-card-actions>
-      <div class="w-full flex justify-between">
-        <button mat-button>Learn More</button>
-        <button mat-flat-button [disabled]="this.ticket?.datumAktivacija" (click)="activateTicket()">Activate</button>
-
-      </div>
-    </mat-card-actions>
-  </mat-card>
-</div>
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/components/ticket/ticket.component.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/components/ticket/ticket.component.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,37 +1,0 @@
-import {Component, Input} from '@angular/core';
-import { TicketResponse } from '../../model/responses/TicketResponse';
-import {MatButtonModule} from '@angular/material/button';
-import {MatCardModule} from '@angular/material/card';
-import {TicketService} from "../../services/ticket/ticket.service";
-import {Router} from "@angular/router";
-import {MatSnackBar} from '@angular/material/snack-bar';
-import {MatInputModule} from '@angular/material/input';
-import {MatFormFieldModule} from '@angular/material/form-field';
-
-
-@Component({
-  selector: 'app-ticket',
-  standalone: true,
-  imports: [MatCardModule, MatButtonModule],
-  templateUrl: './ticket.component.html',
-})
-export class TicketComponent {
-  @Input() ticket: TicketResponse | undefined;
-
-  constructor(private service: TicketService, private router: Router, private _snackBar: MatSnackBar) {
-  }
-
-  activateTicket() {
-    if(this.ticket) {
-      this.service.activateTicket(this.ticket.id).subscribe({
-        next: () => {
-          this.openSnackBar("Ticket successfully activated!", "Okay");
-        }
-      })
-    }
-  }
-
-  openSnackBar(message: string, action: string) {
-    this._snackBar.open(message, action);
-  }
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/components/tickets-buy/tickets-buy.component.css
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/components/tickets-buy/tickets-buy.component.css	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,3 +1,0 @@
-::ng-deep .mdc-notched-outline__notch {
-  border-right: none !important;
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/components/tickets-buy/tickets-buy.component.html
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/components/tickets-buy/tickets-buy.component.html	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<div class="flex justify-center items-center">
-  <div class="flex flex-col">
-
-    <form class="flex flex-col">
-      <mat-form-field [appearance]="'outline'">
-        <mat-label>Select</mat-label>
-        <mat-select (selectionChange)="onPick($event)">
-          @for (type of types; track type.id) {
-            <mat-option [value]="type.id">{{type.ime}} - {{type.cena}}</mat-option>
-          }
-        </mat-select>
-      </mat-form-field>
-
-      <button (click)="onSubmit()" type="button" mat-flat-button>
-        Buy
-      </button>
-    </form>
-  </div>
-</div>
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/components/tickets-buy/tickets-buy.component.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/components/tickets-buy/tickets-buy.component.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,50 +1,0 @@
-import {Component, OnInit} from '@angular/core';
-import {MatSelectChange, MatSelectModule} from '@angular/material/select';
-import {MatInputModule} from '@angular/material/input';
-import {MatFormFieldModule} from '@angular/material/form-field';
-import {TicketTypeService} from "../../services/ticket-type/ticket-type.service";
-import {Tipbilet} from "../../model/Tipbilet";
-import {MatButtonModule} from '@angular/material/button';
-import {TicketService} from "../../services/ticket/ticket.service";
-
-@Component({
-  selector: 'app-tickets-buy',
-  standalone: true,
-  imports: [MatFormFieldModule, MatInputModule, MatSelectModule, MatButtonModule],
-  templateUrl: './tickets-buy.component.html',
-  styleUrl: './tickets-buy.component.css'
-})
-export class TicketsBuyComponent implements OnInit {
-  types: Tipbilet[] = []
-  selectedType: number | undefined;
-
-  constructor(private ticketTypesService: TicketTypeService, private ticketService: TicketService) {
-  }
-
-  ngOnInit(): void {
-    this.ticketTypesService.getTypes().subscribe({
-      next: response => {
-        console.log(response)
-        this.types = response
-      }
-    })
-  }
-
-  protected readonly onsubmit = onsubmit;
-
-  onSubmit() {
-    if (this.selectedType)
-      this.ticketService.buyTicket({
-        type: this.selectedType,
-      }).subscribe({
-        next: response => {
-          console.log(response)
-        }
-      })
-  }
-
-  onPick($event: MatSelectChange) {
-    console.log($event)
-    this.selectedType = $event.value
-  }
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/components/tickets-page/tickets-page.component.html
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/components/tickets-page/tickets-page.component.html	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,15 +1,0 @@
-<div class="flex justify-center items-center flex-col">
-  <div>Tickets</div>
-  <div>
-    <button mat-flat-button>
-      <a [routerLink]="['buy']">Buy Ticket</a>
-    </button>
-  </div>
-
-  <div>
-    @for (ticket of tickets; track ticket.id) {
-      <app-ticket [ticket]="ticket"></app-ticket>
-    }
-  </div>
-
-</div>
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/components/tickets-page/tickets-page.component.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/components/tickets-page/tickets-page.component.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,34 +1,0 @@
-import {Component, OnInit} from '@angular/core';
-import {TicketService} from "../../services/ticket/ticket.service";
-import {TicketResponse} from "../../model/responses/TicketResponse";
-import {TicketComponent} from "../ticket/ticket.component";
-import {RouterLink} from "@angular/router";
-import {MatButton, MatButtonModule} from "@angular/material/button";
-
-@Component({
-  selector: 'app-tickets-page',
-  standalone: true,
-  imports: [
-    TicketComponent,
-    RouterLink,
-    MatButtonModule
-  ],
-  templateUrl: './tickets-page.component.html',
-})
-export class TicketsPageComponent implements OnInit{
-
-  tickets: TicketResponse[] = []
-
-    constructor(private service: TicketService) {
-    }
-
-    ngOnInit(): void {
-        this.service.getTickets().subscribe({
-          next: response => {
-            console.log(response);
-            this.tickets = response
-          }
-        })
-    }
-
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/guards/auth-canmatch.guard.spec.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/guards/auth-canmatch.guard.spec.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,17 +1,0 @@
-import { TestBed } from '@angular/core/testing';
-import { CanActivateFn } from '@angular/router';
-
-import { authCanmatchGuard } from './auth-canmatch.guard';
-
-describe('authCanmatchGuard', () => {
-  const executeGuard: CanActivateFn = (...guardParameters) => 
-      TestBed.runInInjectionContext(() => authCanmatchGuard(...guardParameters));
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-  });
-
-  it('should be created', () => {
-    expect(executeGuard).toBeTruthy();
-  });
-});
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/guards/auth-canmatch.guard.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/guards/auth-canmatch.guard.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,15 +1,0 @@
-import {CanActivateFn, Router} from '@angular/router';
-import {inject} from "@angular/core";
-import {AuthService} from "../services/auth/auth.service";
-
-export const authCanmatchGuard: CanActivateFn = (route, state) => {
-  let service = inject(AuthService);
-  let router = inject(Router)
-  if (service.isAuthenticated()) {
-    return true;
-  }
-  else {
-    router.navigate(['/login'])
-    return false;
-  }
-};
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/guards/auth.guard.spec.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/guards/auth.guard.spec.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,17 +1,0 @@
-import { TestBed } from '@angular/core/testing';
-import { CanActivateFn } from '@angular/router';
-
-import { authGuard } from './auth.guard';
-
-describe('authGuard', () => {
-  const executeGuard: CanActivateFn = (...guardParameters) => 
-      TestBed.runInInjectionContext(() => authGuard(...guardParameters));
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-  });
-
-  it('should be created', () => {
-    expect(executeGuard).toBeTruthy();
-  });
-});
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/guards/auth.guard.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/guards/auth.guard.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,15 +1,0 @@
-import {CanActivateFn, Router} from '@angular/router';
-import {AuthService} from "../services/auth/auth.service";
-import {inject} from "@angular/core";
-
-export const authGuard: CanActivateFn = (route, state) => {
-  let service = inject(AuthService);
-  let router = inject(Router)
-  if (service.isAuthenticated()) {
-    return true;
-  }
-  else {
-    router.navigate(['/login'])
-    return false;
-  }
-};
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/interceptors/auth.interceptor.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/interceptors/auth.interceptor.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,14 +1,0 @@
-import {HttpInterceptorFn} from '@angular/common/http';
-
-export const authInterceptor: HttpInterceptorFn = (req, next) => {
-  const jwt = sessionStorage.getItem('jwt');
-  if (jwt && jwt.length > 0) {
-    const newReq = req.clone({
-      setHeaders: {
-        Authorization: `Bearer ${sessionStorage.getItem('jwt')}`,
-      },
-    });
-    return next(newReq);
-  }
-  return next(req);
-};
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/model/Bus.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/model/Bus.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,6 +1,0 @@
-export interface Bus {
-  id: number,
-  registracija: string,
-  seriskiBroj: string,
-  brojSedishta: number
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/model/Direction.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/model/Direction.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,5 +1,0 @@
-export interface Direction {
-  id: number,
-  pravec: string,
-  opis: string
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/model/FinesPerLine.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/model/FinesPerLine.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,7 +1,0 @@
-import {Line} from "./Line";
-
-export interface FinesPerLine {
-  id: number,
-  line: Line,
-  count: number,
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/model/Line.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/model/Line.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,4 +1,0 @@
-export interface Line {
-  id: number,
-  ime: string
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/model/LineDirection.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/model/LineDirection.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,8 +1,0 @@
-import {Line} from "./Line";
-import {Direction} from "./Direction";
-
-export interface LineDirection {
-  linija: Line;
-  pravec: Direction;
-  id: number;
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/model/LineStation.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/model/LineStation.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,11 +1,0 @@
-import {Line} from "./Line";
-import {Station} from "./Station";
-import {Direction} from "./Direction";
-
-export interface LineStation {
-  id: number,
-  redenBroj: number,
-  linija: Line,
-  postojka: Station,
-  pravec: Direction,
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/model/PieChartValues.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/model/PieChartValues.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,4 +1,0 @@
-export interface PieChartValues {
-  value: number;
-  name: string;
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/model/Station.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/model/Station.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,7 +1,0 @@
-export interface Station {
-  id: number,
-  ime: string,
-  lat: number,
-  lon: number,
-  opis: string,
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/model/Tipbilet.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/model/Tipbilet.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,6 +1,0 @@
-export interface Tipbilet{
-  id: number,
-  trajnost: number,
-  cena: number,
-  ime: string
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/model/requests/AuthRequest.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/model/requests/AuthRequest.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,4 +1,0 @@
-export interface AuthRequest {
-  email: string,
-  password: string,
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/model/requests/FineRequest.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/model/requests/FineRequest.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,10 +1,0 @@
-export interface FineRequest {
-   iznos: number,
-   plateno: boolean,
-   dokument: string,
-   kontrolaId: number,
-   telefon: string | undefined,
-   ime: string | undefined,
-   adresa: string | undefined,
-   patnikId: number | undefined,
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/model/requests/RegisterRequest.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/model/requests/RegisterRequest.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,8 +1,0 @@
-export interface RegisterRequest {
-  email: string;
-  password: string;
-  confirmPassword: string;
-  name: string;
-  address: string;
-  phoneNumber: string;
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/model/requests/StartCommuteRequest.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/model/requests/StartCommuteRequest.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,5 +1,0 @@
-export interface StartCommuteRequest {
-  ticketId: number;
-  routeInstanceId: number;
-  stationId: number;
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/model/requests/StartRouteInstanceRequest.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/model/requests/StartRouteInstanceRequest.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,5 +1,0 @@
-export interface StartRouteInstanceRequest {
-  lineId: number,
-  busId: number,
-  directionId: number,
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/model/requests/TicketBuyRequest.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/model/requests/TicketBuyRequest.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,3 +1,0 @@
-export interface TicketBuyRequest {
-  type: number
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/model/responses/AdminUsersResponse.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/model/responses/AdminUsersResponse.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,8 +1,0 @@
-export interface AdminUsersResponse {
-  email: string
-  name: string
-  address: string
-  phoneNumber: string
-  id: number
-  roles: string[]
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/model/responses/AuthResponse.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/model/responses/AuthResponse.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,3 +1,0 @@
-export interface AuthResponse {
-  token: string
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/model/responses/CommuteResponse.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/model/responses/CommuteResponse.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,13 +1,0 @@
-import {TicketResponse} from "./TicketResponse";
-import {UserResponse} from "./UserResponse";
-import {LineStation} from "../LineStation";
-
-export interface CommuteResponse {
-commuter: UserResponse,
-   ticket: TicketResponse,
-   stationStart: LineStation,
-   status: String,
-   startDate: Date,
-   endDate: Date | null,
-   id: number,
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/model/responses/ControlsResponse.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/model/responses/ControlsResponse.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,9 +1,0 @@
-import {UserResponse} from "./UserResponse";
-import {RouteInstanceResponse} from "./RouteInstanceResponse";
-
-export interface ControlsResponse {
-  id: number,
-  dateCreated: Date,
-  kondukter: UserResponse,
-  instancaNaLinija: RouteInstanceResponse,
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/model/responses/FineResponse.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/model/responses/FineResponse.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,17 +1,0 @@
-import {UserResponse} from "./UserResponse";
-import {ControlsResponse} from "./ControlsResponse";
-
-export interface FineResponse {
-    id: number,
-    iznos: number,
-    plateno: boolean,
-     dateCreated: Date,
-    datePayed: Date | undefined,
-    dokument: string,
-     kondukter: UserResponse,
-     kontrola: ControlsResponse,
-     patnik: UserResponse | undefined,
-    telefon: string | undefined,
-    ime: string | undefined,
-    adresa: string | undefined,
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/model/responses/RouteInstanceResponse.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/model/responses/RouteInstanceResponse.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,14 +1,0 @@
-import {Bus} from "../Bus";
-import {Direction} from "../Direction";
-import {Line} from "../Line";
-import {UserResponse} from "./UserResponse";
-
-export interface RouteInstanceResponse {
-  bus: Bus,
-  direction: Direction,
-  line: Line,
-  driver: UserResponse,
-  start: Date,
-  end: Date | undefined,
-  id: number
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/model/responses/TicketResponse.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/model/responses/TicketResponse.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,9 +1,0 @@
-import {Tipbilet} from "../Tipbilet";
-
-export interface TicketResponse {
-  id: number,
-  datumKupuvanje: Date,
-  datumAktivacija: Date | undefined,
-  status: string,
-  tip: Tipbilet,
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/model/responses/UserResponse.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/model/responses/UserResponse.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,7 +1,0 @@
-export interface UserResponse {
-  email: string
-  name: string
-  address: string
-  phoneNumber: string
-  id: number
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/services/admin/admin.service.spec.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/services/admin/admin.service.spec.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,16 +1,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { AdminService } from './admin.service';
-
-describe('AdminService', () => {
-  let service: AdminService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(AdminService);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-});
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/services/admin/admin.service.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/services/admin/admin.service.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,37 +1,0 @@
-import { Injectable } from '@angular/core';
-import {HttpClient, HttpHeaders} from "@angular/common/http";
-import {Observable} from "rxjs";
-import {AdminUsersResponse} from "../../model/responses/AdminUsersResponse";
-import {FinesPerLine} from "../../model/FinesPerLine";
-import {CommutesByHour} from "../../components/charts/line-chart.component";
-import {IncomeData} from "../../components/charts/stacked-bar-chart.component";
-
-@Injectable({
-  providedIn: 'root'
-})
-export class AdminService {
-  private url = '/api/admin'
-  constructor(private http: HttpClient) { }
-
-  getAllUsers(): Observable<AdminUsersResponse[]> {
-    return this.http.get<AdminUsersResponse[]>(`${this.url}/all-users`)
-  }
-
-  updateRolesToUser(id: number, roles: string[]): Observable<AdminUsersResponse[]> {
-    return this.http.post<AdminUsersResponse[]>(`${this.url}/update-roles/${id}`, JSON.stringify(roles), {
-      headers: new HttpHeaders({'Content-Type': 'application/json'})
-    })
-  }
-
-  getFinesPerLine() {
-    return this.http.get<FinesPerLine[]>(`${this.url}/fines-by-line`);
-  }
-
-  getCommutesByHour() {
-    return this.http.get<CommutesByHour[]>(`${this.url}/commutes-by-hour`);
-  }
-
-  getTotalIncome() {
-    return this.http.get<IncomeData[]>(`${this.url}/total-income`);
-  }
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/services/auth/auth.service.spec.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/services/auth/auth.service.spec.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,16 +1,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { AuthService } from './auth.service';
-
-describe('AuthService', () => {
-  let service: AuthService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(AuthService);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-});
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/services/auth/auth.service.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/services/auth/auth.service.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,45 +1,0 @@
-import { Injectable } from '@angular/core';
-import {Observable, Subject} from "rxjs";
-import {HttpClient, HttpHeaders} from "@angular/common/http";
-import {AuthResponse} from "../../model/responses/AuthResponse";
-import {AuthRequest} from "../../model/requests/AuthRequest";
-import {RegisterRequest} from "../../model/requests/RegisterRequest";
-
-@Injectable({
-  providedIn: 'root'
-})
-export class AuthService {
-  refreshAuth$ = new Subject<boolean>();
-  private url = '/api/auth';
-
-  constructor(private http: HttpClient) { }
-
-  login(authRequest: AuthRequest): Observable<AuthResponse> {
-    return this.http.post<AuthResponse>(
-      `${this.url}`,
-      JSON.stringify(authRequest),
-      {
-        headers: new HttpHeaders({ 'Content-Type': 'application/json' })
-      }
-    )
-  }
-
-  register(registerRequest: RegisterRequest): Observable<AuthResponse> {
-    return this.http.post<AuthResponse>(
-      `${this.url}/register`,
-      JSON.stringify(registerRequest),
-      {
-        headers: new HttpHeaders({ 'Content-Type': 'application/json' })
-      }
-    )
-  }
-
-  isAuthenticated(): Observable<boolean> {
-    return this.http.get<boolean>(`${this.url}`);
-  }
-
-  isDriverFree(): Observable<boolean> {
-    return this.http.get<boolean>(`${this.url}/is-driver-free`);
-  }
-
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/services/bus/bus.service.spec.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/services/bus/bus.service.spec.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,16 +1,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { BusService } from './bus.service';
-
-describe('BusService', () => {
-  let service: BusService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(BusService);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-});
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/services/bus/bus.service.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/services/bus/bus.service.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,20 +1,0 @@
-import { Injectable } from '@angular/core';
-import {Observable} from "rxjs";
-import {HttpClient} from "@angular/common/http";
-import {Bus} from "../../model/Bus";
-
-@Injectable({
-  providedIn: 'root'
-})
-export class BusService {
-  private _url = '/api/buses'
-  constructor(private _http: HttpClient) { }
-
-  getAll(): Observable<Bus[]> {
-    return this._http.get<Bus[]>(`${this._url}`)
-  }
-
-  getAllFree() {
-    return this._http.get<Bus[]>(`${this._url}/free`)
-  }
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/services/commute/commute.service.spec.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/services/commute/commute.service.spec.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,16 +1,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { CommuteService } from './commute.service';
-
-describe('CommuteService', () => {
-  let service: CommuteService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(CommuteService);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-});
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/services/commute/commute.service.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/services/commute/commute.service.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,24 +1,0 @@
-import { Injectable } from '@angular/core';
-import {HttpClient, HttpHeaders} from "@angular/common/http";
-import {StartCommuteRequest} from "../../model/requests/StartCommuteRequest";
-import {Observable, tap} from "rxjs";
-import {CommuteResponse} from "../../model/responses/CommuteResponse";
-import {RouteInstanceResponse} from "../../model/responses/RouteInstanceResponse";
-
-@Injectable({
-  providedIn: 'root'
-})
-export class CommuteService {
-
-  private url = '/api/commutes'
-
-  constructor(private http: HttpClient) { }
-
-  startCommute(request: StartCommuteRequest): Observable<CommuteResponse> {
-    return this.http.put<CommuteResponse>(`${this.url}/start`, JSON.stringify(request), {
-      headers: new HttpHeaders({'Content-Type': 'application/json'})
-    }).pipe(
-      tap(res => console.log(res))
-    )
-  }
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/services/controls/controls.service.spec.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/services/controls/controls.service.spec.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,16 +1,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { ControlsService } from './controls.service';
-
-describe('ControlsService', () => {
-  let service: ControlsService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(ControlsService);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-});
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/services/controls/controls.service.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/services/controls/controls.service.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,29 +1,0 @@
-import { Injectable } from '@angular/core';
-import {Observable} from "rxjs";
-import {HttpClient, HttpHeaders} from "@angular/common/http";
-import {ControlsResponse} from "../../model/responses/ControlsResponse";
-import {FineResponse} from "../../model/responses/FineResponse";
-import {FineRequest} from "../../model/requests/FineRequest";
-
-@Injectable({
-  providedIn: 'root'
-})
-export class ControlsService {
-  private url = '/api/controls'
-
-  constructor(private http: HttpClient) { }
-
-  getControls(): Observable<ControlsResponse[]> {
-    return this.http.get<ControlsResponse[]>(`${this.url}`)
-  }
-
-  start(routeInstanceId: number): Observable<ControlsResponse> {
-    return this.http.put<ControlsResponse>(`${this.url}/start`, JSON.stringify(routeInstanceId), {
-      headers: new HttpHeaders({'Content-Type': 'application/json'})
-    })
-  }
-
-  getControlInfo(controlId: number): Observable<FineResponse[]> {
-    return this.http.get<FineResponse[]>(`${this.url}/${controlId}/fines`)
-  }
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/services/direction/direction.service.spec.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/services/direction/direction.service.spec.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,16 +1,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { DirectionService } from './direction.service';
-
-describe('DirectionService', () => {
-  let service: DirectionService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(DirectionService);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-});
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/services/direction/direction.service.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/services/direction/direction.service.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,9 +1,0 @@
-import { Injectable } from '@angular/core';
-
-@Injectable({
-  providedIn: 'root'
-})
-export class DirectionService {
-
-  constructor() { }
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/services/driver/driver.service.spec.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/services/driver/driver.service.spec.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,16 +1,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { DriverService } from './driver.service';
-
-describe('DriverService', () => {
-  let service: DriverService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(DriverService);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-});
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/services/driver/driver.service.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/services/driver/driver.service.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,9 +1,0 @@
-import { Injectable } from '@angular/core';
-
-@Injectable({
-  providedIn: 'root'
-})
-export class DriverService {
-  private url = '/api/drivers'
-  constructor() { }
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/services/fine/fine.service.spec.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/services/fine/fine.service.spec.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,16 +1,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { FineService } from './fine.service';
-
-describe('FineService', () => {
-  let service: FineService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(FineService);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-});
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/services/fine/fine.service.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/services/fine/fine.service.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,20 +1,0 @@
-import { Injectable } from '@angular/core';
-import {Observable} from "rxjs";
-import {FineResponse} from "../../model/responses/FineResponse";
-import {FineRequest} from "../../model/requests/FineRequest";
-import {HttpClient, HttpHeaders} from "@angular/common/http";
-
-@Injectable({
-  providedIn: 'root'
-})
-export class FineService {
-  private url = '/api/fines'
-
-  constructor(private http: HttpClient) { }
-
-  createFine(request: FineRequest): Observable<FineResponse> {
-    return this.http.put<FineResponse>(`${this.url}`, JSON.stringify(request), {
-      headers: new HttpHeaders({'Content-Type': 'application/json'})
-    })
-  }
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/services/line/line.service.spec.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/services/line/line.service.spec.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,16 +1,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { LineService } from './line.service';
-
-describe('LineService', () => {
-  let service: LineService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(LineService);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-});
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/services/line/line.service.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/services/line/line.service.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,22 +1,0 @@
-import { Injectable } from '@angular/core';
-import {Observable} from "rxjs";
-import {HttpClient} from "@angular/common/http";
-import {Line} from "../../model/Line";
-import {Direction} from "../../model/Direction";
-import {LineDirection} from "../../model/LineDirection";
-
-@Injectable({
-  providedIn: 'root'
-})
-export class LineService {
-  private url = '/api/lines'
-  constructor(private _http: HttpClient) { }
-
-  getAll(): Observable<Line[]> {
-    return this._http.get<Line[]>(`${this.url}`)
-  }
-
-  getDirections(line: Line): Observable<LineDirection[]> {
-    return this._http.get<LineDirection[]>(`${this.url}/${line.id}/directions`)
-  }
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/services/route-instance/route-instance.service.spec.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/services/route-instance/route-instance.service.spec.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,16 +1,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { RouteInstanceService } from './route-instance.service';
-
-describe('RouteInstanceService', () => {
-  let service: RouteInstanceService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(RouteInstanceService);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-});
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/services/route-instance/route-instance.service.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/services/route-instance/route-instance.service.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,41 +1,0 @@
-import {Injectable} from '@angular/core';
-import {Observable} from "rxjs";
-import {StartRouteInstanceRequest} from "../../model/requests/StartRouteInstanceRequest";
-import {RouteInstanceResponse} from "../../model/responses/RouteInstanceResponse";
-import {HttpClient, HttpHeaders} from "@angular/common/http";
-import {StartCommuteRequest} from "../../model/requests/StartCommuteRequest";
-import {CommuteResponse} from "../../model/responses/CommuteResponse";
-
-@Injectable({
-  providedIn: 'root'
-})
-export class RouteInstanceService {
-  private url = '/api/route-instances'
-
-  constructor(private http: HttpClient) {
-  }
-
-  start(request: StartRouteInstanceRequest): Observable<RouteInstanceResponse> {
-    return this.http.post<RouteInstanceResponse>(`${this.url}/start`, JSON.stringify(request), {
-      headers: new HttpHeaders({'Content-Type': 'application/json'})
-    })
-  }
-
-  getById(id: number): Observable<RouteInstanceResponse> {
-    return this.http.get<RouteInstanceResponse>(`${this.url}/${id}`)
-  }
-
-  stop(id: number): Observable<RouteInstanceResponse> {
-    return this.http.patch<RouteInstanceResponse>(`${this.url}/stop`, JSON.stringify(id), {
-      headers: new HttpHeaders({'Content-Type': 'application/json'})
-    })
-  }
-
-  getForStation(id: number): Observable<RouteInstanceResponse[]> {
-    return this.http.get<RouteInstanceResponse[]>(`${this.url}/station/${id}`)
-  }
-
-  getAll(): Observable<RouteInstanceResponse[]> {
-    return this.http.get<RouteInstanceResponse[]>(`${this.url}`)
-  }
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/services/station/station.service.spec.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/services/station/station.service.spec.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,16 +1,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { StationService } from './station.service';
-
-describe('StationService', () => {
-  let service: StationService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(StationService);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-});
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/services/station/station.service.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/services/station/station.service.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,16 +1,0 @@
-import { Injectable } from '@angular/core';
-import {Observable} from "rxjs";
-import {Station} from "../../model/Station";
-import {HttpClient} from "@angular/common/http";
-
-@Injectable({
-  providedIn: 'root'
-})
-export class StationService {
-  private url = '/api/stations'
-  constructor(private http: HttpClient) { }
-
-  getAllStations(): Observable<Station[]> {
-    return this.http.get<Station[]>(this.url);
-  }
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/services/ticket-type/ticket-type.service.spec.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/services/ticket-type/ticket-type.service.spec.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,16 +1,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { TicketTypeService } from './ticket-type.service';
-
-describe('TicketTypeService', () => {
-  let service: TicketTypeService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(TicketTypeService);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-});
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/services/ticket-type/ticket-type.service.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/services/ticket-type/ticket-type.service.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,18 +1,0 @@
-import { Injectable } from '@angular/core';
-import {Observable} from "rxjs";
-import {Tipbilet} from "../../model/Tipbilet";
-import {HttpClient} from "@angular/common/http";
-
-@Injectable({
-  providedIn: 'root'
-})
-export class TicketTypeService {
-
-  private _url = '/api/ticket-types';
-
-  constructor(private http: HttpClient) { }
-
-  getTypes(): Observable<Tipbilet[]> {
-    return this.http.get<Tipbilet[]>(`${this._url}`)
-  }
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/services/ticket/ticket.service.spec.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/services/ticket/ticket.service.spec.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,16 +1,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { TicketService } from './ticket.service';
-
-describe('TicketService', () => {
-  let service: TicketService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(TicketService);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-});
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/services/ticket/ticket.service.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/services/ticket/ticket.service.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,31 +1,0 @@
-import { Injectable } from '@angular/core';
-import {HttpClient, HttpHeaders} from "@angular/common/http";
-import {Observable} from "rxjs";
-import {TicketBuyRequest} from "../../model/requests/TicketBuyRequest";
-import {TicketResponse} from "../../model/responses/TicketResponse";
-
-@Injectable({
-  providedIn: 'root'
-})
-export class TicketService {
-
-  private _url = '/api/tickets'
-
-  constructor(private http: HttpClient) { }
-
-  getTickets(): Observable<TicketResponse[]> {
-    return this.http.get<TicketResponse[]>(`${this._url}`)
-  }
-
-  activateTicket(id: number): Observable<TicketResponse> {
-    return this.http.patch<TicketResponse>(`${this._url}/activate/${id}`, JSON.stringify({}), {
-      headers: new HttpHeaders({'Content-Type': 'application/json'})
-    })
-  }
-
-  buyTicket(request: TicketBuyRequest): Observable<TicketResponse> {
-    return this.http.post<TicketResponse>(`${this._url}/buy`, JSON.stringify(request), {
-      headers: new HttpHeaders({'Content-Type': 'application/json'})
-    })
-  }
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/services/user/user.service.spec.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/services/user/user.service.spec.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,16 +1,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { UserService } from './user.service';
-
-describe('UserService', () => {
-  let service: UserService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(UserService);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-});
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/app/services/user/user.service.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/app/services/user/user.service.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,21 +1,0 @@
-import { Injectable } from '@angular/core';
-import {HttpClient} from "@angular/common/http";
-import {Observable} from "rxjs";
-import {UserResponse} from "../../model/responses/UserResponse";
-
-@Injectable({
-  providedIn: 'root'
-})
-export class UserService {
-  private _url= '/api/users'
-
-  constructor(private _http: HttpClient) { }
-
-  getUser(): Observable<UserResponse | undefined> {
-    return this._http.get<UserResponse>(`${this._url}`)
-  }
-
-  getAllPassengers(): Observable<UserResponse[]> {
-    return this._http.get<UserResponse[]>(`${this._url}/passengers`)
-  }
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/index.html
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/index.html	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,15 +1,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-  <meta charset="utf-8">
-  <title>BusNGoFrontend</title>
-  <base href="/">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="icon" type="image/x-icon" href="favicon.ico">
-  <link href="https://fonts.googleapis.com/css2?family=Roboto:wght@300;400;500&display=swap" rel="stylesheet">
-  <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
-</head>
-<body>
-  <app-root></app-root>
-</body>
-</html>
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/main.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/main.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,6 +1,0 @@
-import { bootstrapApplication } from '@angular/platform-browser';
-import { appConfig } from './app/app.config';
-import { AppComponent } from './app/app.component';
-
-bootstrapApplication(AppComponent, appConfig)
-  .catch((err) => console.error(err));
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/proxy.conf.json
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/proxy.conf.json	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,6 +1,0 @@
-{
-  "/api": {
-    "target": "http://localhost:8080",
-    "secure": false
-  }
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/styles.css
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/styles.css	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,7 +1,0 @@
-/* You can add global styles to this file, and also import other style files */
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-
-html, body { height: 100%; }
-body { margin: 0; font-family: Roboto, "Helvetica Neue", sans-serif; }
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/typings.d.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/typings.d.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,2 +1,0 @@
-// declare module 'stompjs';
-// declare module 'sockjs-client';
Index: s-n-go-pavel-216049/bus-n-go-frontend/src/window-global-fix.ts
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/src/window-global-fix.ts	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,4 +1,0 @@
-// (window as any).global = window;
-// (window as any).process = {
-//   env: { DEBUG: undefined },
-// };
Index: s-n-go-pavel-216049/bus-n-go-frontend/tailwind.config.js
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/tailwind.config.js	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,8 +1,0 @@
-/** @type {import('tailwindcss').Config} */
-module.exports = {
-  content: ["./src/**/*.{html,js}"],
-  theme: {
-    extend: {},
-  },
-  plugins: [],
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/tsconfig.app.json
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/tsconfig.app.json	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,16 +1,0 @@
-/* To learn more about Typescript configuration file: https://www.typescriptlang.org/docs/handbook/tsconfig-json.html. */
-/* To learn more about Angular compiler options: https://angular.dev/reference/configs/angular-compiler-options. */
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "outDir": "./out-tsc/app",
-    "types": []
-  },
-  "files": [
-    "src/window-global-fix.ts",
-    "src/main.ts"
-  ],
-  "include": [
-    "src/**/*.d.ts"
-  ]
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/tsconfig.json
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/tsconfig.json	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,33 +1,0 @@
-/* To learn more about Typescript configuration file: https://www.typescriptlang.org/docs/handbook/tsconfig-json.html. */
-/* To learn more about Angular compiler options: https://angular.dev/reference/configs/angular-compiler-options. */
-{
-  "compileOnSave": false,
-  "compilerOptions": {
-    "outDir": "./dist/out-tsc",
-    "strict": true,
-    "noImplicitOverride": true,
-    "noPropertyAccessFromIndexSignature": true,
-    "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true,
-    "skipLibCheck": true,
-    "esModuleInterop": true,
-    "sourceMap": true,
-    "declaration": false,
-    "experimentalDecorators": true,
-    "moduleResolution": "bundler",
-    "importHelpers": true,
-    "target": "ES2022",
-    "module": "ES2022",
-    "useDefineForClassFields": false,
-    "lib": [
-      "ES2022",
-      "dom"
-    ]
-  },
-  "angularCompilerOptions": {
-    "enableI18nLegacyMessageIdFormat": false,
-    "strictInjectionParameters": true,
-    "strictInputAccessModifiers": true,
-    "strictTemplates": true
-  }
-}
Index: s-n-go-pavel-216049/bus-n-go-frontend/tsconfig.spec.json
===================================================================
--- bus-n-go-pavel-216049/bus-n-go-frontend/tsconfig.spec.json	(revision bfb90ddf8442e7029efb393fbb20aae6ad198e7c)
+++ 	(revision )
@@ -1,15 +1,0 @@
-/* To learn more about Typescript configuration file: https://www.typescriptlang.org/docs/handbook/tsconfig-json.html. */
-/* To learn more about Angular compiler options: https://angular.dev/reference/configs/angular-compiler-options. */
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "outDir": "./out-tsc/spec",
-    "types": [
-      "jasmine"
-    ]
-  },
-  "include": [
-    "src/**/*.spec.ts",
-    "src/**/*.d.ts"
-  ]
-}
