Merge remote-tracking branch 'origin/add-job-pages' into add-job-pages

updated packages to the latest versions

barkmanAPI/Migrations/20260719204137_changedOrderToJob.Designer.cs

@@ -0,0 +1,295 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using barkmanapi;
+
+#nullable disable
+
+namespace barkmanapi.Migrations
+{
+    [DbContext(typeof(BarkContext))]
+    [Migration("20260719204137_changedOrderToJob")]
+    partial class changedOrderToJob
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "9.0.1")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("barkmanapi.Customers", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Address")
+                        .HasColumnType("text")
+                        .HasColumnName("address");
+
+                    b.Property<string>("BillingTerms")
+                        .HasColumnType("text")
+                        .HasColumnName("billing_terms");
+
+                    b.Property<string>("Company")
+                        .HasColumnType("text")
+                        .HasColumnName("company");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("email");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("Notes")
+                        .HasColumnType("text")
+                        .HasColumnName("notes");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("text")
+                        .HasColumnName("phone_number");
+
+                    b.HasKey("Id")
+                        .HasName("pk_customers");
+
+                    b.ToTable("customers", (string)null);
+                });
+
+            modelBuilder.Entity("barkmanapi.InventoryItems", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Barcode")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("barcode");
+
+                    b.Property<string>("Brand")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("brand");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("Notes")
+                        .HasColumnType("text")
+                        .HasColumnName("notes");
+
+                    b.Property<float?>("RentalPrice")
+                        .HasColumnType("real")
+                        .HasColumnName("rental_price");
+
+                    b.Property<float?>("ReplacementCost")
+                        .HasColumnType("real")
+                        .HasColumnName("replacement_cost");
+
+                    b.Property<string>("SerialNumber")
+                        .HasColumnType("text")
+                        .HasColumnName("serial_number");
+
+                    b.Property<string>("StatusId")
+                        .HasColumnType("text")
+                        .HasColumnName("status_id");
+
+                    b.Property<float?>("Weight")
+                        .HasColumnType("real")
+                        .HasColumnName("weight");
+
+                    b.HasKey("Id")
+                        .HasName("pk_inventory");
+
+                    b.HasIndex("Barcode")
+                        .IsUnique()
+                        .HasDatabaseName("ix_inventory_barcode");
+
+                    b.HasIndex("StatusId")
+                        .HasDatabaseName("ix_inventory_status_id");
+
+                    b.ToTable("inventory", (string)null);
+                });
+
+            modelBuilder.Entity("barkmanapi.ItemStatus", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("pk_item_status");
+
+                    b.ToTable("item_status", (string)null);
+                });
+
+            modelBuilder.Entity("barkmanapi.JobItems", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ItemId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("item_id");
+
+                    b.Property<int?>("JobsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("jobs_id");
+
+                    b.Property<string>("OrderId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("order_id");
+
+                    b.Property<int>("Quantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("quantity");
+
+                    b.HasKey("Id")
+                        .HasName("pk_job_items");
+
+                    b.HasIndex("JobsId")
+                        .HasDatabaseName("ix_job_items_jobs_id");
+
+                    b.ToTable("job_items", (string)null);
+                });
+
+            modelBuilder.Entity("barkmanapi.JobStatus", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text")
+                        .HasColumnName("id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("pk_job_status");
+
+                    b.ToTable("job_status", (string)null);
+                });
+
+            modelBuilder.Entity("barkmanapi.Jobs", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Address")
+                        .HasColumnType("text")
+                        .HasColumnName("address");
+
+                    b.Property<string>("CustomerId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("customer_id");
+
+                    b.Property<DateTimeOffset>("EndDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("end_date");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("Notes")
+                        .HasColumnType("text")
+                        .HasColumnName("notes");
+
+                    b.Property<DateTimeOffset>("StartDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("start_date");
+
+                    b.Property<string>("StatusId")
+                        .HasColumnType("text")
+                        .HasColumnName("status_id");
+
+                    b.Property<decimal>("TotalPrice")
+                        .HasColumnType("numeric")
+                        .HasColumnName("total_price");
+
+                    b.Property<string>("Venue")
+                        .HasColumnType("text")
+                        .HasColumnName("venue");
+
+                    b.HasKey("Id")
+                        .HasName("pk_jobs");
+
+                    b.HasIndex("StatusId")
+                        .HasDatabaseName("ix_jobs_status_id");
+
+                    b.ToTable("jobs", (string)null);
+                });
+
+            modelBuilder.Entity("barkmanapi.InventoryItems", b =>
+                {
+                    b.HasOne("barkmanapi.ItemStatus", "Status")
+                        .WithMany()
+                        .HasForeignKey("StatusId")
+                        .HasConstraintName("fk_inventory_item_status_status_id");
+
+                    b.Navigation("Status");
+                });
+
+            modelBuilder.Entity("barkmanapi.JobItems", b =>
+                {
+                    b.HasOne("barkmanapi.Jobs", null)
+                        .WithMany("Items")
+                        .HasForeignKey("JobsId")
+                        .HasConstraintName("fk_job_items_jobs_jobs_id");
+                });
+
+            modelBuilder.Entity("barkmanapi.Jobs", b =>
+                {
+                    b.HasOne("barkmanapi.JobStatus", "Status")
+                        .WithMany()
+                        .HasForeignKey("StatusId")
+                        .HasConstraintName("fk_jobs_job_status_status_id");
+
+                    b.Navigation("Status");
+                });
+
+            modelBuilder.Entity("barkmanapi.Jobs", b =>
+                {
+                    b.Navigation("Items");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

barkmanAPI/Migrations/20260719204137_changedOrderToJob.cs

@@ -0,0 +1,176 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace barkmanapi.Migrations
+{
+    /// <inheritdoc />
+    public partial class changedOrderToJob : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "order_items");
+
+            migrationBuilder.DropTable(
+                name: "orders");
+
+            migrationBuilder.DropTable(
+                name: "order_status");
+
+            migrationBuilder.CreateTable(
+                name: "job_status",
+                columns: table => new
+                {
+                    id = table.Column<string>(type: "text", nullable: false),
+                    name = table.Column<string>(type: "text", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_job_status", x => x.id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "jobs",
+                columns: table => new
+                {
+                    id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    customer_id = table.Column<string>(type: "text", nullable: false),
+                    name = table.Column<string>(type: "text", nullable: false),
+                    status_id = table.Column<string>(type: "text", nullable: true),
+                    start_date = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: false),
+                    end_date = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: false),
+                    total_price = table.Column<decimal>(type: "numeric", nullable: false),
+                    venue = table.Column<string>(type: "text", nullable: true),
+                    address = table.Column<string>(type: "text", nullable: true),
+                    notes = table.Column<string>(type: "text", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_jobs", x => x.id);
+                    table.ForeignKey(
+                        name: "fk_jobs_job_status_status_id",
+                        column: x => x.status_id,
+                        principalTable: "job_status",
+                        principalColumn: "id");
+                });
+
+            migrationBuilder.CreateTable(
+                name: "job_items",
+                columns: table => new
+                {
+                    id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    order_id = table.Column<string>(type: "text", nullable: false),
+                    item_id = table.Column<string>(type: "text", nullable: false),
+                    quantity = table.Column<int>(type: "integer", nullable: false),
+                    jobs_id = table.Column<int>(type: "integer", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_job_items", x => x.id);
+                    table.ForeignKey(
+                        name: "fk_job_items_jobs_jobs_id",
+                        column: x => x.jobs_id,
+                        principalTable: "jobs",
+                        principalColumn: "id");
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "ix_job_items_jobs_id",
+                table: "job_items",
+                column: "jobs_id");
+
+            migrationBuilder.CreateIndex(
+                name: "ix_jobs_status_id",
+                table: "jobs",
+                column: "status_id");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "job_items");
+
+            migrationBuilder.DropTable(
+                name: "jobs");
+
+            migrationBuilder.DropTable(
+                name: "job_status");
+
+            migrationBuilder.CreateTable(
+                name: "order_status",
+                columns: table => new
+                {
+                    id = table.Column<string>(type: "text", nullable: false),
+                    name = table.Column<string>(type: "text", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_order_status", x => x.id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "orders",
+                columns: table => new
+                {
+                    id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    status_id = table.Column<string>(type: "text", nullable: true),
+                    address = table.Column<string>(type: "text", nullable: true),
+                    customer_id = table.Column<string>(type: "text", nullable: false),
+                    end_date = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: false),
+                    name = table.Column<string>(type: "text", nullable: false),
+                    notes = table.Column<string>(type: "text", nullable: true),
+                    start_date = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: false),
+                    total_price = table.Column<decimal>(type: "numeric", nullable: false),
+                    venue = table.Column<string>(type: "text", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_orders", x => x.id);
+                    table.ForeignKey(
+                        name: "fk_orders_order_status_status_id",
+                        column: x => x.status_id,
+                        principalTable: "order_status",
+                        principalColumn: "id");
+                });
+
+            migrationBuilder.CreateTable(
+                name: "order_items",
+                columns: table => new
+                {
+                    id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    item_id = table.Column<string>(type: "text", nullable: false),
+                    order_id = table.Column<string>(type: "text", nullable: false),
+                    orders_id = table.Column<int>(type: "integer", nullable: true),
+                    quantity = table.Column<int>(type: "integer", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_order_items", x => x.id);
+                    table.ForeignKey(
+                        name: "fk_order_items_orders_orders_id",
+                        column: x => x.orders_id,
+                        principalTable: "orders",
+                        principalColumn: "id");
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "ix_order_items_orders_id",
+                table: "order_items",
+                column: "orders_id");
+
+            migrationBuilder.CreateIndex(
+                name: "ix_orders_status_id",
+                table: "orders",
+                column: "status_id");
+        }
+    }
+}

barkmanAPI/Program.cs

@@ -51,6 +51,18 @@ var customerGroup = app.MapGroup(prefix: "/customers")
     .WithTags("Customers")
     .WithDescription("Endpoints for managing customers");
 
+var jobGroup = app.MapGroup(prefix: "/jobs")
+    .WithTags("Jobs")
+    .WithDescription("Endpoints for managing jobs");
+
+var jobStatusGroup = app.MapGroup(prefix: "/jobstatus")
+    .WithTags("Job Status")
+    .WithDescription("Endpoints for managing job status");
+
+var jobItemGroup = app.MapGroup(prefix: "/jobitems")
+    .WithTags("Job Items")
+    .WithDescription("Endpoints for managing job items");
+
 inventoryGroup.MapGet("", async (BarkContext db) =>
     await db.Inventory.OrderBy(item => item.Barcode).ToListAsync());
 
@@ -144,7 +156,7 @@ itemStatusGroup.MapPut("/{id}", async (string id, ItemStatus updatedStatus, Bark
     var existingStatus = await db.ItemStatus.FindAsync(id);
     if (existingStatus == null)
     {
-        return Results.NotFound(new { Message = "Inventory item not found" });
+        return Results.NotFound(new { Message = "Item status not found" });
     }
 
     existingStatus.Id = updatedStatus.Id;
@@ -232,6 +244,154 @@ customerGroup.MapDelete("/{id}", async (int id, BarkContext db) =>
     return Results.Ok(new { Message = "Customer deleted successfully" });
 });
 
+jobGroup.MapGet("", async (BarkContext db) =>
+    await db.Jobs.OrderBy(jobs => jobs.Id).ToListAsync()); 
+
+jobGroup.MapGet("/{id}", async (int id, BarkContext db) =>
+{
+    var job = await db.Jobs
+        .FirstOrDefaultAsync(i => i.Id == id);
+    
+    if (job == null)
+    {
+        return Results.NotFound(new { Message = "Job not found" });
+    }
+
+    return Results.Ok(job);
+});
+
+jobGroup.MapPut("/{id}", async (int id, Jobs updatedJob, BarkContext db) =>
+{
+    var existingJob = await db.Jobs.FindAsync(id);
+    if (existingJob == null)
+    {
+        return Results.NotFound(new { Message = "Job not found" });
+    }
+
+    existingJob.Name = updatedJob.Name;
+    existingJob.StartDate = updatedJob.StartDate;
+    existingJob.EndDate = updatedJob.EndDate;
+    existingJob.TotalPrice = updatedJob.TotalPrice;
+    existingJob.Venue = updatedJob.Venue;
+    existingJob.Address = updatedJob.Address;
+    existingJob.Notes = updatedJob.Notes;
+
+    await db.SaveChangesAsync();
+    return Results.Ok(existingJob);
+});
+
+jobGroup.MapPost("", async (Jobs newJobInput, BarkContext db) =>
+{
+    var newJob = new Jobs()
+    {
+        CustomerId = newJobInput.CustomerId,
+        Name =  newJobInput.Name,
+        StartDate = newJobInput.StartDate,
+        EndDate = newJobInput.EndDate,
+        Venue = newJobInput.Venue,
+        Address = newJobInput.Address,
+    };
+
+    db.Jobs.Add(newJob);
+    await db.SaveChangesAsync();
+    return Results.Created($"/jobs/{newJob.Id}", newJob);
+});
+
+jobStatusGroup.MapGet("/", async (BarkContext db) =>
+    await db.JobStatus.ToListAsync());
+
+jobStatusGroup.MapPost("/", async (JobStatus newJobStatus, BarkContext db) =>
+{
+    db.JobStatus.Add(newJobStatus);
+    await db.SaveChangesAsync();
+    return Results.Created($"/jobstatus/{newJobStatus.Id}", newJobStatus);
+});
+
+jobStatusGroup.MapGet("/{id}", async (string id, BarkContext db) =>
+{
+    var jobStatus = await db.JobStatus.FindAsync(id);
+    if (jobStatus == null)
+    {
+        return Results.NotFound(new { Message = "Job Status not found" });
+    }
+
+    return Results.Ok(jobStatus);
+});
+
+jobStatusGroup.MapPut("/{id}", async (string id, JobStatus updatedStatus, BarkContext db) =>
+{
+    var existingStatus = await db.JobStatus.FindAsync(id);
+    if (existingStatus == null)
+    {
+        return Results.NotFound(new { Message = "Job status not found" });
+    }
+
+    existingStatus.Id = updatedStatus.Id;
+    existingStatus.Name = updatedStatus.Name;
+
+    await db.SaveChangesAsync();
+    return Results.Ok(existingStatus);
+});
+
+jobStatusGroup.MapDelete("/{id}", async (string id, BarkContext db) =>
+{
+    var jobStatus = await db.JobStatus.FindAsync(id);
+    if (jobStatus == null)
+    {
+        return Results.NotFound(new { Message = "Job status not found" });
+    }
+
+    db.JobStatus.Remove(jobStatus);
+    await db.SaveChangesAsync();
+    return Results.Ok(new { Message = "Job status deleted successfully" });
+});
+
+jobItemGroup.MapGet("", async (BarkContext db) =>
+    await db.JobItems.OrderBy(items => items.Id).ToListAsync()); 
+
+jobItemGroup.MapGet("/{id}", async (int id, BarkContext db) =>
+{
+    var jobItems = await db.JobItems
+        .FirstOrDefaultAsync(i => i.Id == id);
+    
+    if (jobItems == null)
+    {
+        return Results.NotFound(new { Message = "Job Items not found" });
+    }
+
+    return Results.Ok(jobItems);
+});
+
+jobItemGroup.MapPut("/{id}", async (int id, JobItems updatedJobItems, BarkContext db) =>
+{
+    var existingJobItems = await db.JobItems.FindAsync(id);
+    if (existingJobItems == null)
+    {
+        return Results.NotFound(new { Message = "Job Items not found" });
+    }
+
+    existingJobItems.OrderId = updatedJobItems.OrderId;
+    existingJobItems.ItemId = updatedJobItems.ItemId;
+    existingJobItems.Quantity = updatedJobItems.Quantity;
+    
+    await db.SaveChangesAsync();
+    return Results.Ok(existingJobItems);
+});
+
+jobItemGroup.MapPost("", async (JobItems newJobItemsInput, BarkContext db) =>
+{
+    var newJobItem = new JobItems()
+    {
+        OrderId = newJobItemsInput.OrderId,
+        ItemId = newJobItemsInput.ItemId,
+        Quantity = newJobItemsInput.Quantity,
+    };
+
+    db.JobItems.Add(newJobItem);
+    await db.SaveChangesAsync();
+    return Results.Created($"/jobItems/{newJobItem.Id}", newJobItem);
+});
+
 using (var serviceScope = app.Services.CreateScope())
 {
     var dbContext = serviceScope.ServiceProvider.GetRequiredService<BarkContext>();

barkmanui/.nvmrc

@@ -0,0 +1 @@
+22.22.1

barkmanui/package.json

@@ -10,34 +10,35 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@mantine/core": "^7.16.0",
+    "@mantine/core": "^9.4.2",
-    "@mantine/form": "^7.16.0",
+    "@mantine/dates": "^9.4.2",
-    "@mantine/hooks": "^7.16.0",
+    "@mantine/form": "^9.4.2",
-    "@mantine/notifications": "^7.16.2",
+    "@mantine/hooks": "^9.4.2",
-    "@tabler/icons-react": "^3.29.0",
+    "@mantine/notifications": "^9.4.2",
-    "@tanstack/react-query": "^5.64.1",
+    "@tabler/icons-react": "^3.45.0",
-    "@tanstack/react-query-devtools": "^5.64.1",
+    "@tanstack/react-query": "^5.101.4",
-    "axios": "^1.7.9",
+    "@tanstack/react-query-devtools": "^5.101.4",
-    "react": "^18.3.1",
+    "axios": "^1.18.1",
-    "react-dom": "^18.3.1",
+    "react": "^19.2.8",
-    "react-router": "^7.1.1",
+    "react-dom": "^19.2.8",
-    "react-router-dom": "^7.1.1"
+    "react-router": "^8.3.0"
   },
   "devDependencies": {
-    "@eslint/js": "^9.17.0",
+    "@eslint/js": "^9.39.5",
-    "@tanstack/eslint-plugin-query": "^5.62.16",
+    "@tanstack/eslint-plugin-query": "^5.101.4",
-    "@types/react": "^18.3.18",
+    "@types/node": "^26.1.1",
-    "@types/react-dom": "^18.3.5",
+    "@types/react": "^19.2.17",
-    "@vitejs/plugin-react": "^4.3.4",
+    "@types/react-dom": "^19.2.3",
-    "eslint": "^9.17.0",
+    "@vitejs/plugin-react": "^6.0.4",
-    "eslint-plugin-react-hooks": "^5.0.0",
+    "eslint": "^9.39.5",
-    "eslint-plugin-react-refresh": "^0.4.16",
+    "eslint-plugin-react-hooks": "^7.1.1",
-    "globals": "^15.14.0",
+    "eslint-plugin-react-refresh": "^0.5.3",
-    "postcss": "^8.5.1",
+    "globals": "^17.7.0",
-    "postcss-preset-mantine": "^1.17.0",
+    "postcss": "^8.5.22",
+    "postcss-preset-mantine": "^1.18.0",
     "postcss-simple-vars": "^7.0.1",
-    "typescript": "~5.6.2",
+    "typescript": "^6.0.3",
-    "typescript-eslint": "^8.18.2",
+    "typescript-eslint": "^8.65.0",
-    "vite": "^6.0.5"
+    "vite": "^8.1.5"
   }
 }

barkmanui/src/features/jobs/AddJob.tsx

@@ -1,4 +1,5 @@
-import {Button, Group, TextInput, Container, Title, Flex} from '@mantine/core';
+import {Button, Group, TextInput, NumberInput, Container, Title, Flex} from '@mantine/core';
+import { DateTimePicker } from '@mantine/dates';
 import {useForm} from '@mantine/form';
 import {useMutation} from "@tanstack/react-query";
 import {NewJob} from "./types.ts";
@@ -12,25 +13,27 @@ function AddJob() {
 
     const navigate = useNavigate();
 
-    const customerQuery = useCustomerList();
+    const customerQuery = useJobList();
 
     const newJobForm = useForm<NewJob>({
         mode: 'uncontrolled',
         initialValues: {
+            customerId: 0,
             name: "",
-            company: "",
+            startDate: new Date(),
-            email: "",
+            endDate: new Date(),
-            phone: "",
             address: "",
+            venue: "",
+            notes: "",
         },
 
         validate: {},
     });
 
-    const updateCustomer = useMutation({
+    const updateJob = useMutation({
-        mutationFn: async (values: newJob) => {
+        mutationFn: async (values: NewJob) => {
 
-            const result = await fetch(import.meta.env.VITE_API_URL + '/customers', {
+            const result = await fetch(import.meta.env.VITE_API_URL + '/jobs', {
                 method: 'POST',
                 body: JSON.stringify(values),
                 headers: {
@@ -43,10 +46,10 @@ function AddJob() {
                     icon: <IconCheck size={20}/>,
                     color: "teal",
                     title: "All good!",
-                    message: "Customer Created",
+                    message: "Job Created",
                     position: 'top-center',
                 });
-                navigate("/customers");
+                navigate("/jobs");
 
             }
 
@@ -58,7 +61,7 @@ function AddJob() {
                     message: "Something went wrong",
                     position: 'top-center',
                 });
-                throw new Error('Failed to create customer');
+                throw new Error('Failed to create job');
             }
 
         },
@@ -74,8 +77,8 @@ function AddJob() {
 
     return (
         <>
-            <form onSubmit={newCustomerForm.onSubmit(async (values) => await
+            <form onSubmit={newJobForm.onSubmit(async (values) => await
-                updateCustomer.mutateAsync(values))}>
+                updateJob.mutateAsync(values))}>
                 <Container m="lg">
                     <Flex mih={50}
                           gap="md"
@@ -85,16 +88,20 @@ function AddJob() {
                           wrap="wrap">
 
                         <Title order={1}>Add Item</Title>
-                        <TextInput withAsterisk key={newCustomerForm.key('name')} size="md" label="Name"
+                        <NumberInput withAsterisk key={newJobForm.key('customerId')} size="md" label="Customer ID"
-                                   placeholder="Name" {...newCustomerForm.getInputProps('name')}/>
+                                     placeholder="Customer ID" {...newJobForm.getInputProps('customerId')}/>
-                        <TextInput size="md" key={newCustomerForm.key('company')} label="Company"
+                        <TextInput withAsterisk key={newJobForm.key('name')} size="md" label="Name"
-                                   placeholder="Company"{...newCustomerForm.getInputProps('company')}/>
+                                   placeholder="Name" {...newJobForm.getInputProps('name')}/>
-                        <TextInput withAsterisk size="md" key={newCustomerForm.key('email')} label="Email"
+                        <DateTimePicker withAsterisk key={newJobForm.key('startDate')} size="md" label="Start Date"
-                                     placeholder="Email" {...newCustomerForm.getInputProps('email')}/>
+                                   placeholder="Start Date" {...newJobForm.getInputProps('startDate')}/>
-                        <TextInput size="md" key={newCustomerForm.key('phone')} label="Phone"
+                        <DateTimePicker withAsterisk key={newJobForm.key('endDate')} size="md" label="End Date"
-                                     placeholder="Phone" {...newCustomerForm.getInputProps('phone')}/>
+                                        placeholder="End Date" {...newJobForm.getInputProps('endDate')}/>
-                        <TextInput size="md" key={newCustomerForm.key('address')} label="Address"
+                        <TextInput size="md" key={newJobForm.key('address')} label="Address"
-                                     placeholder="Address" {...newCustomerForm.getInputProps('address')}/>
+                                   placeholder="Address" {...newJobForm.getInputProps('address')}/>
+                        <TextInput size="md" key={newJobForm.key('venue')} label="Venue"
+                                   placeholder="Venue"{...newJobForm.getInputProps('venue')}/>
+                        <TextInput size="md" key={newJobForm.key('notes')} label="Notes"
+                                     placeholder="Notes" {...newJobForm.getInputProps('notes')}/>
 
                         <Group justify="flex-end" mt="md">
                             <Button type="submit">Submit</Button>
@@ -106,4 +113,4 @@ function AddJob() {
     );
 }
 
-export default AddCustomer;
+export default AddJob;

barkmanui/src/features/jobs/types.ts

@@ -7,8 +7,8 @@ export interface Job {
     startDate: Date;
     endDate: Date;
     totalPrice: string,
-    venue: number,
+    venue: string,
-    address: number,
+    address: string,
     notes: string,
 }
 
@@ -17,7 +17,7 @@ export interface NewJob {
     name: string,
     startDate: Date;
     endDate: Date;
-    venue: number,
+    venue: string,
-    address: number,
+    address: string,
     notes: string,
 }

barkmanui/tsconfig.app.json

@@ -22,7 +22,6 @@
     "noFallthroughCasesInSwitch": true,
     "noUncheckedSideEffectImports": true,
 
-    "baseUrl": ".",
     "paths": {
       "@/*": ["./src/*"]
     }