diff --git a/api/Migrations/20260322011947_AddItems.Designer.cs b/api/Migrations/20260322011947_AddItems.Designer.cs
new file mode 100644
index 0000000..b40ce57
--- /dev/null
+++ b/api/Migrations/20260322011947_AddItems.Designer.cs
@@ -0,0 +1,306 @@
+//
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace agologum_api.Migrations
+{
+ [DbContext(typeof(AppDbContext))]
+ [Migration("20260322011947_AddItems")]
+ partial class AddItems
+ {
+ ///
+ protected override void BuildTargetModel(ModelBuilder modelBuilder)
+ {
+#pragma warning disable 612, 618
+ modelBuilder
+ .HasAnnotation("ProductVersion", "10.0.5")
+ .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+ NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("text");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasColumnType("text");
+
+ b.Property("Name")
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)");
+
+ b.Property("NormalizedName")
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)");
+
+ b.HasKey("Id");
+
+ b.HasIndex("NormalizedName")
+ .IsUnique()
+ .HasDatabaseName("RoleNameIndex");
+
+ b.ToTable("AspNetRoles", (string)null);
+ });
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("integer");
+
+ NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
+
+ b.Property("ClaimType")
+ .HasColumnType("text");
+
+ b.Property("ClaimValue")
+ .HasColumnType("text");
+
+ b.Property("RoleId")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.HasKey("Id");
+
+ b.HasIndex("RoleId");
+
+ b.ToTable("AspNetRoleClaims", (string)null);
+ });
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("integer");
+
+ NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
+
+ b.Property("ClaimType")
+ .HasColumnType("text");
+
+ b.Property("ClaimValue")
+ .HasColumnType("text");
+
+ b.Property("UserId")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.HasKey("Id");
+
+ b.HasIndex("UserId");
+
+ b.ToTable("AspNetUserClaims", (string)null);
+ });
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b =>
+ {
+ b.Property("LoginProvider")
+ .HasColumnType("text");
+
+ b.Property("ProviderKey")
+ .HasColumnType("text");
+
+ b.Property("ProviderDisplayName")
+ .HasColumnType("text");
+
+ b.Property("UserId")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.HasKey("LoginProvider", "ProviderKey");
+
+ b.HasIndex("UserId");
+
+ b.ToTable("AspNetUserLogins", (string)null);
+ });
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b =>
+ {
+ b.Property("UserId")
+ .HasColumnType("text");
+
+ b.Property("RoleId")
+ .HasColumnType("text");
+
+ b.HasKey("UserId", "RoleId");
+
+ b.HasIndex("RoleId");
+
+ b.ToTable("AspNetUserRoles", (string)null);
+ });
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b =>
+ {
+ b.Property("UserId")
+ .HasColumnType("text");
+
+ b.Property("LoginProvider")
+ .HasColumnType("text");
+
+ b.Property("Name")
+ .HasColumnType("text");
+
+ b.Property("Value")
+ .HasColumnType("text");
+
+ b.HasKey("UserId", "LoginProvider", "Name");
+
+ b.ToTable("AspNetUserTokens", (string)null);
+ });
+
+ modelBuilder.Entity("agologumApi.Models.Item", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("integer");
+
+ NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
+
+ b.Property("CreatedAt")
+ .HasColumnType("timestamp with time zone");
+
+ b.Property("Description")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("LastEditedAt")
+ .HasColumnType("timestamp with time zone");
+
+ b.Property("Name")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.HasKey("Id");
+
+ b.ToTable("Items");
+ });
+
+ modelBuilder.Entity("agologumApi.Models.User", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("text");
+
+ b.Property("AccessFailedCount")
+ .HasColumnType("integer");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasColumnType("text");
+
+ b.Property("CreatedAt")
+ .HasColumnType("timestamp with time zone");
+
+ b.Property("Email")
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)");
+
+ b.Property("EmailConfirmed")
+ .HasColumnType("boolean");
+
+ b.Property("LockoutEnabled")
+ .HasColumnType("boolean");
+
+ b.Property("LockoutEnd")
+ .HasColumnType("timestamp with time zone");
+
+ b.Property("NormalizedEmail")
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)");
+
+ b.Property("NormalizedUserName")
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)");
+
+ b.Property("PasswordHash")
+ .HasColumnType("text");
+
+ b.Property("PhoneNumber")
+ .HasColumnType("text");
+
+ b.Property("PhoneNumberConfirmed")
+ .HasColumnType("boolean");
+
+ b.Property("SecurityStamp")
+ .HasColumnType("text");
+
+ b.Property("TwoFactorEnabled")
+ .HasColumnType("boolean");
+
+ b.Property("UserName")
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)");
+
+ b.HasKey("Id");
+
+ b.HasIndex("NormalizedEmail")
+ .HasDatabaseName("EmailIndex");
+
+ b.HasIndex("NormalizedUserName")
+ .IsUnique()
+ .HasDatabaseName("UserNameIndex");
+
+ b.ToTable("AspNetUsers", (string)null);
+ });
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b =>
+ {
+ b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+ .WithMany()
+ .HasForeignKey("RoleId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+ });
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b =>
+ {
+ b.HasOne("agologumApi.Models.User", null)
+ .WithMany()
+ .HasForeignKey("UserId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+ });
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b =>
+ {
+ b.HasOne("agologumApi.Models.User", null)
+ .WithMany()
+ .HasForeignKey("UserId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+ });
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b =>
+ {
+ b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+ .WithMany()
+ .HasForeignKey("RoleId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.HasOne("agologumApi.Models.User", null)
+ .WithMany()
+ .HasForeignKey("UserId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+ });
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b =>
+ {
+ b.HasOne("agologumApi.Models.User", null)
+ .WithMany()
+ .HasForeignKey("UserId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+ });
+#pragma warning restore 612, 618
+ }
+ }
+}
diff --git a/api/Migrations/20260322011947_AddItems.cs b/api/Migrations/20260322011947_AddItems.cs
new file mode 100644
index 0000000..324af3d
--- /dev/null
+++ b/api/Migrations/20260322011947_AddItems.cs
@@ -0,0 +1,39 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace agologum_api.Migrations
+{
+ ///
+ public partial class AddItems : Migration
+ {
+ ///
+ protected override void Up(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.CreateTable(
+ name: "Items",
+ columns: table => new
+ {
+ Id = table.Column(type: "integer", nullable: false)
+ .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+ Name = table.Column(type: "text", nullable: false),
+ Description = table.Column(type: "text", nullable: false),
+ CreatedAt = table.Column(type: "timestamp with time zone", nullable: false),
+ LastEditedAt = table.Column(type: "timestamp with time zone", nullable: false)
+ },
+ constraints: table =>
+ {
+ table.PrimaryKey("PK_Items", x => x.Id);
+ });
+ }
+
+ ///
+ protected override void Down(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.DropTable(
+ name: "Items");
+ }
+ }
+}
diff --git a/api/Migrations/AppDbContextModelSnapshot.cs b/api/Migrations/AppDbContextModelSnapshot.cs
index 04564b3..aa5eef9 100644
--- a/api/Migrations/AppDbContextModelSnapshot.cs
+++ b/api/Migrations/AppDbContextModelSnapshot.cs
@@ -153,6 +153,33 @@ namespace agologum_api.Migrations
b.ToTable("AspNetUserTokens", (string)null);
});
+ modelBuilder.Entity("agologumApi.Models.Item", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("integer");
+
+ NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
+
+ b.Property("CreatedAt")
+ .HasColumnType("timestamp with time zone");
+
+ b.Property("Description")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("LastEditedAt")
+ .HasColumnType("timestamp with time zone");
+
+ b.Property("Name")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.HasKey("Id");
+
+ b.ToTable("Items");
+ });
+
modelBuilder.Entity("agologumApi.Models.User", b =>
{
b.Property("Id")
diff --git a/api/Program.cs b/api/Program.cs
index fbf5bc5..8f51fb4 100644
--- a/api/Program.cs
+++ b/api/Program.cs
@@ -21,7 +21,7 @@ builder.Services.AddDbContext(options =>
builder.Services.AddControllers();
// services
-builder.Services.AddScoped();
+builder.Services.AddScoped();
builder.Services.AddScoped();
// configuration for jwt authentication
diff --git a/api/src/Controllers/AuthController.cs b/api/src/Controllers/AuthController.cs
index 6daca44..a28fe7e 100644
--- a/api/src/Controllers/AuthController.cs
+++ b/api/src/Controllers/AuthController.cs
@@ -14,14 +14,12 @@ public class AuthController : ControllerBase {
private readonly UserManager userManager_;
private readonly SignInManager signInManager_;
- private readonly UserService users_;
private readonly JwtService jwt_;
- public AuthController(UserManager userManager, SignInManager signInManager, UserService users, JwtService jwt) {
+ public AuthController(UserManager userManager, SignInManager signInManager, JwtService jwt) {
userManager_ = userManager;
signInManager_ = signInManager;
- users_ = users;
jwt_ = jwt;
}
diff --git a/api/src/Controllers/UsersController.cs b/api/src/Controllers/ItemsController.cs
similarity index 54%
rename from api/src/Controllers/UsersController.cs
rename to api/src/Controllers/ItemsController.cs
index 7962381..86991f5 100644
--- a/api/src/Controllers/UsersController.cs
+++ b/api/src/Controllers/ItemsController.cs
@@ -7,39 +7,39 @@ using agologumApi.Services;
[ApiController]
[Route("api/[controller]")]
-public class UsersController : ControllerBase {
+public class ItemsController : ControllerBase {
- private readonly UserService service_;
+ private readonly ItemService service_;
- public UsersController(UserService service) {
+ public ItemsController(ItemService service) {
service_ = service;
}
[AllowAnonymous] // accessible if not authorized
[HttpGet]
- public async Task>> getUsers() {
+ public async Task>> getItemss() {
return Ok(await service_.GetAll());
}
[AllowAnonymous]
[HttpGet("{id:int}")]
- public async Task> getUser(int id) {
+ public async Task> getItem(int id) {
- var user = await service_.Get(id);
+ var item = await service_.Get(id);
- if (user == null) return NotFound();
+ if (item == null) return NotFound();
- return Ok(user);
+ return Ok(item);
}
[Authorize] // testing the authorization
[HttpPost]
- public async Task> createUser(User user) {
+ public async Task> createItem(Item item) {
- var created = await service_.Create(user);
+ var created = await service_.Create(item);
return CreatedAtAction(
- nameof(getUser),
+ nameof(getItem),
new { id = created.Id },
created
);
@@ -47,9 +47,9 @@ public class UsersController : ControllerBase {
[Authorize]
[HttpPut("{id}")]
- public async Task> updateUser(int id, User user) {
+ public async Task> updateItem(int id, Item item) {
- var updated = await service_.Update(user);
+ var updated = await service_.Update(item);
if (updated == null) return NotFound();
@@ -58,7 +58,7 @@ public class UsersController : ControllerBase {
[Authorize]
[HttpDelete("{id}")]
- public async Task deleteUser(int id) {
+ public async Task deleteItem(int id) {
var success = await service_.Delete(id);
diff --git a/api/src/Data/AppDbContext.cs b/api/src/Data/AppDbContext.cs
index 22d1e54..66e7998 100644
--- a/api/src/Data/AppDbContext.cs
+++ b/api/src/Data/AppDbContext.cs
@@ -10,4 +10,7 @@ public class AppDbContext : IdentityDbContext {
}
+ // Db set for each model besides Users (DbSet is already defined in IdenityDbContext)
+ public DbSet- Items { get; set; }
+
}
\ No newline at end of file
diff --git a/api/src/Models/Dto.cs b/api/src/Models/Dto.cs
index a740896..dc84f6f 100644
--- a/api/src/Models/Dto.cs
+++ b/api/src/Models/Dto.cs
@@ -13,3 +13,10 @@ public class LoginDto {
public string Password { get; set; } = "";
}
+
+public class ItemDto {
+
+ public String Name { get; set; } = "";
+ public String Description { get; set; } = "";
+
+}
diff --git a/api/src/Models/Item.cs b/api/src/Models/Item.cs
new file mode 100644
index 0000000..9fd670d
--- /dev/null
+++ b/api/src/Models/Item.cs
@@ -0,0 +1,12 @@
+
+namespace agologumApi.Models;
+
+public class Item {
+
+ public int Id { get; set; }
+ public String Name { get; set; } = "";
+ public String Description { get; set; } = "";
+ public DateTime CreatedAt { get; set; }
+ public DateTime LastEditedAt { get; set; }
+
+};
\ No newline at end of file
diff --git a/api/src/Services/ItemService.cs b/api/src/Services/ItemService.cs
new file mode 100644
index 0000000..eeacadb
--- /dev/null
+++ b/api/src/Services/ItemService.cs
@@ -0,0 +1,51 @@
+
+using Microsoft.EntityFrameworkCore;
+
+using agologumApi.Models;
+
+namespace agologumApi.Services;
+
+public class ItemService {
+
+ private readonly AppDbContext db_;
+
+ public ItemService(AppDbContext db) {
+ db_ = db;
+ }
+
+ public async Task
> GetAll() {
+ return await db_.Items.ToListAsync();
+ }
+
+ public async Task- Get(int id) {
+ return await db_.Items.FindAsync(id);
+ }
+
+ public async Task
- Get(string name) {
+ return await db_.Items.FirstOrDefaultAsync(u => u.Name == name);
+ }
+
+ public async Task
- Create(Item item) {
+ db_.Items.Add(item);
+ await db_.SaveChangesAsync();
+ return item;
+ }
+
+ public async Task
- Update(Item item) {
+ db_.Items.Update(item);
+ await db_.SaveChangesAsync();
+ return item;
+ }
+
+ public async Task Delete(int id) {
+ Item? item = await db_.Items.FindAsync(id);
+ if(item != null) {
+ db_.Items.Remove(item);
+ await db_.SaveChangesAsync();
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/api/src/Services/UserService.cs b/api/src/Services/UserService.cs
deleted file mode 100644
index 1e6c104..0000000
--- a/api/src/Services/UserService.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-
-using Microsoft.EntityFrameworkCore;
-
-using agologumApi.Models;
-
-namespace agologumApi.Services;
-
-public class UserService {
-
- private readonly AppDbContext db_;
-
- public UserService(AppDbContext db) {
- db_ = db;
- }
-
- public async Task
> GetAll() {
- return await db_.Users.ToListAsync();
- }
-
- public async Task Get(int id) {
- return await db_.Users.FindAsync(id);
- }
-
- public async Task Get(string username) {
- return await db_.Users.FirstOrDefaultAsync(u => u.UserName == username);
- }
-
- public async Task Create(User user) {
- db_.Users.Add(user);
- await db_.SaveChangesAsync();
- return user;
- }
-
- public async Task Update(User user) {
- db_.Users.Update(user);
- await db_.SaveChangesAsync();
- return user;
- }
-
- public async Task Delete(int id) {
- User? user = await db_.Users.FindAsync(id);
- if(user != null) {
- db_.Users.Remove(user);
- await db_.SaveChangesAsync();
- return true;
- } else {
- return false;
- }
- }
-
-}
\ No newline at end of file
diff --git a/client/src/api/AuthApi.ts b/client/src/api/AuthApi.ts
index f57cc48..028e9a6 100644
--- a/client/src/api/AuthApi.ts
+++ b/client/src/api/AuthApi.ts
@@ -11,7 +11,6 @@ export const register = async (user: RegisterDto) => {
try {
console.log(user);
- const response = await api.post(`${API_URL}/register`, user);
// TODO: if valid