Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions DataAccess/CategoryPostDAO.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ namespace DataAccess
public class CategoryPostDAO
{
#region Variables
private readonly FBLADbContext db;
private readonly BackToMeDbContext db;
#endregion

#region Constructor
public CategoryPostDAO(FBLADbContext db)
public CategoryPostDAO(BackToMeDbContext db)
{
this.db = db;
}
Expand Down
4 changes: 2 additions & 2 deletions DataAccess/ChatDAO.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ namespace DataAccess
public class ChatDAO
{
#region Variables
private readonly FBLADbContext db;
private readonly BackToMeDbContext db;
#endregion

#region Constructor
public ChatDAO(FBLADbContext db)
public ChatDAO(BackToMeDbContext db)
{
this.db = db;
}
Expand Down
4 changes: 2 additions & 2 deletions DataAccess/MatchDAO.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ namespace DataAccess
public class MatchDAO
{
#region Variables
private readonly FBLADbContext db;
private readonly BackToMeDbContext db;
#endregion

#region Constructor
public MatchDAO(FBLADbContext db)
public MatchDAO(BackToMeDbContext db)
{
this.db = db;
}
Expand Down
4 changes: 2 additions & 2 deletions DataAccess/MessageChatDAO.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ namespace DataAccess
public class MessageChatDAO
{
#region Variables
private readonly FBLADbContext db;
private readonly BackToMeDbContext db;
#endregion

#region Constructor
public MessageChatDAO(FBLADbContext db)
public MessageChatDAO(BackToMeDbContext db)
{
this.db = db;
}
Expand Down
4 changes: 2 additions & 2 deletions DataAccess/NotificationsDAO.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ namespace DataAccess
public class NotificationsDAO
{
#region Variables
private readonly FBLADbContext db;
private readonly BackToMeDbContext db;
private readonly UsersDAO usersDAO;
#endregion

#region Constructor
public NotificationsDAO(FBLADbContext db, UsersDAO usersDAO)
public NotificationsDAO(BackToMeDbContext db, UsersDAO usersDAO)
{
this.db = db;
this.usersDAO = usersDAO;
Expand Down
4 changes: 2 additions & 2 deletions DataAccess/PickUpRequestDAO.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ namespace DataAccess
public class PickUpRequestDAO
{
#region Variables
private readonly FBLADbContext db;
private readonly BackToMeDbContext db;
#endregion

#region Constructor
public PickUpRequestDAO(FBLADbContext db)
public PickUpRequestDAO(BackToMeDbContext db)
{
this.db = db;
}
Expand Down
4 changes: 2 additions & 2 deletions DataAccess/PostDAO.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ namespace DataAccess
public class PostDAO
{
#region Variables
private readonly FBLADbContext db;
private readonly BackToMeDbContext db;
private readonly UsersDAO usersDAO;
#endregion

#region Constructor
public PostDAO(FBLADbContext db, UsersDAO usersDAO)
public PostDAO(BackToMeDbContext db, UsersDAO usersDAO)
{
this.db = db;
this.usersDAO = usersDAO;
Expand Down
4 changes: 2 additions & 2 deletions DataAccess/StudentDAO.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ namespace DataAccess
public class StudentDAO
{
#region Variables
private readonly FBLADbContext db;
private readonly BackToMeDbContext db;
#endregion

#region Constructor
public StudentDAO(FBLADbContext db)
public StudentDAO(BackToMeDbContext db)
{
this.db = db;
}
Expand Down
4 changes: 2 additions & 2 deletions DataAccess/TransferRequestDAO.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ namespace DataAccess
public class TransferRequestDAO
{
#region Variables
private readonly FBLADbContext db;
private readonly BackToMeDbContext db;
#endregion

#region Constructor
public TransferRequestDAO(FBLADbContext db)
public TransferRequestDAO(BackToMeDbContext db)
{
this.db = db;
}
Expand Down
4 changes: 2 additions & 2 deletions DataAccess/UsersDAO.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ namespace DataAccess
public class UsersDAO
{
#region Variables
private readonly FBLADbContext db;
private readonly BackToMeDbContext db;
#endregion

#region Constructor
public UsersDAO(FBLADbContext db)
public UsersDAO(BackToMeDbContext db)
{
this.db = db;
}
Expand Down
4 changes: 2 additions & 2 deletions DataAccess/VerificationCodeDAO.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ namespace DataAccess
public class VerificationCodeDAO
{
#region Variables
private readonly FBLADbContext db;
private readonly BackToMeDbContext db;
#endregion

#region Constructor
public VerificationCodeDAO(FBLADbContext db)
public VerificationCodeDAO(BackToMeDbContext db)
{
this.db = db;
}
Expand Down
2 changes: 1 addition & 1 deletion LostFound_API/Controllers/CategoryPostController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

// For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860

namespace FBLA_API.Controllers
namespace LostFound_API.Controllers
{
[Route("api/[controller]")]
[ApiController]
Expand Down
2 changes: 1 addition & 1 deletion LostFound_API/Controllers/CheckAuthController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

// For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860

namespace FBLA_API.Controllers
namespace LostFound_API.Controllers
{
[Route("api/[controller]")]
[ApiController]
Expand Down
6 changes: 3 additions & 3 deletions LostFound_API/Controllers/MatchController.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using FBLA_API.DTOs.Match;
using FBLA_API.DTOs.VerificationCodes;
using LostFound_API.DTOs.Match;
using LostFound_API.DTOs.VerificationCodes;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
Expand All @@ -11,7 +11,7 @@

// For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860

namespace FBLA_API.Controllers
namespace LostFound_API.Controllers
{
[Route("api/[controller]")]
[ApiController]
Expand Down
4 changes: 2 additions & 2 deletions LostFound_API/Controllers/MessageChatController.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using FBLA_API.DTOs.Chat;
using LostFound_API.DTOs.Chat;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.SignalR;
Expand All @@ -12,7 +12,7 @@

// For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860

namespace FBLA_API.Controllers
namespace LostFound_API.Controllers
{
[Route("api/[controller]")]
[ApiController]
Expand Down
2 changes: 1 addition & 1 deletion LostFound_API/Controllers/NotificationController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

// For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860

namespace FBLA_API.Controllers
namespace LostFound_API.Controllers
{
[Route("api/[controller]")]
[ApiController]
Expand Down
6 changes: 3 additions & 3 deletions LostFound_API/Controllers/PickUpRequestController.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using DataAccess;
using FBLA_API.DTOs.Posts;
using FBLA_API.DTOs.Users;
using LostFound_API.DTOs.Posts;
using LostFound_API.DTOs.Users;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.SignalR;
Expand All @@ -14,7 +14,7 @@

// For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860

namespace FBLA_API.Controllers
namespace LostFound_API.Controllers
{
[Route("api/[controller]")]
[ApiController]
Expand Down
8 changes: 4 additions & 4 deletions LostFound_API/Controllers/PostController.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using DataAccess;
using FBLA_API.DTOs.Match;
using LostFound_API.DTOs.Match;
using Microsoft.AspNetCore.Mvc;
using ObjectBusiness;
using Repository;
Expand All @@ -10,13 +10,13 @@
using Microsoft.AspNetCore;
using Microsoft.EntityFrameworkCore;
using Microsoft.AspNetCore.Authorization;
using FBLA_API.DTOs.Users;
using LostFound_API.DTOs.Users;
using Microsoft.Extensions.Hosting;
using FBLA_API.DTOs.Posts;
using LostFound_API.DTOs.Posts;

// For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860

namespace FBLA_API.Controllers
namespace LostFound_API.Controllers
{
[Route("api/[controller]")]
[ApiController]
Expand Down
4 changes: 2 additions & 2 deletions LostFound_API/Controllers/TransferRequestsController.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using FBLA_API.DTOs.Users;
using LostFound_API.DTOs.Users;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
Expand All @@ -8,7 +8,7 @@

// For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860

namespace FBLA_API.Controllers
namespace LostFound_API.Controllers
{
[Route("api/[controller]")]
[ApiController]
Expand Down
6 changes: 3 additions & 3 deletions LostFound_API/Controllers/UsersController.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using FBLA_API.DTOs.Auth;
using FBLA_API.DTOs.Users;
using LostFound_API.DTOs.Auth;
using LostFound_API.DTOs.Users;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.SignalR;
Expand All @@ -19,7 +19,7 @@

// For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860

namespace FBLA_API.Controllers
namespace LostFound_API.Controllers
{
[Route("api/[controller]")]
[ApiController]
Expand Down
2 changes: 1 addition & 1 deletion LostFound_API/DTOs/Auth/SignInRequestDTO.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace FBLA_API.DTOs.Auth
namespace LostFound_API.DTOs.Auth
{
public class SignInRequestDTO
{
Expand Down
2 changes: 1 addition & 1 deletion LostFound_API/DTOs/Chat/MessageChatDTO.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.ComponentModel.DataAnnotations.Schema;
using System.ComponentModel.DataAnnotations;

namespace FBLA_API.DTOs.Chat
namespace LostFound_API.DTOs.Chat
{
public class MessageChatDTO
{
Expand Down
2 changes: 1 addition & 1 deletion LostFound_API/DTOs/Match/MatchDTO.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace FBLA_API.DTOs.Match
namespace LostFound_API.DTOs.Match
{
public class MatchDTO
{
Expand Down
2 changes: 1 addition & 1 deletion LostFound_API/DTOs/Match/MatchSuggestionDTO.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using ObjectBusiness;

namespace FBLA_API.DTOs.Match
namespace LostFound_API.DTOs.Match
{
public class MatchSuggestionDTO
{
Expand Down
2 changes: 1 addition & 1 deletion LostFound_API/DTOs/Posts/PostDTO.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using ObjectBusiness;

namespace FBLA_API.DTOs.Posts
namespace LostFound_API.DTOs.Posts
{
public class PostDTO
{
Expand Down
2 changes: 1 addition & 1 deletion LostFound_API/DTOs/Users/UserDTO.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace FBLA_API.DTOs.Users
namespace LostFound_API.DTOs.Users
{
public class UserDTO
{
Expand Down
2 changes: 1 addition & 1 deletion LostFound_API/DTOs/Users/UserHandOverAdminDTO.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace FBLA_API.DTOs.Users
namespace LostFound_API.DTOs.Users
{
public class UserHandOverAdminDTO
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace FBLA_API.DTOs.VerificationCodes
namespace LostFound_API.DTOs.VerificationCodes
{
public class VerificationCodesDTO
{
Expand Down
12 changes: 6 additions & 6 deletions LostFound_API/Program.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using DataAccess;
using FBLA_API.DTOs.Chat;
using FBLA_API.DTOs.Match;
using FBLA_API.DTOs.Posts;
using FBLA_API.DTOs.Users;
using FBLA_API.DTOs.VerificationCodes;
using LostFound_API.DTOs.Chat;
using LostFound_API.DTOs.Match;
using LostFound_API.DTOs.Posts;
using LostFound_API.DTOs.Users;
using LostFound_API.DTOs.VerificationCodes;
using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.EntityFrameworkCore;
using Microsoft.IdentityModel.Tokens;
Expand Down Expand Up @@ -118,7 +118,7 @@
builder.Services.AddHostedService<HolderReminderService>();

// Connect to SQL Server
builder.Services.AddDbContext<FBLADbContext>(options =>
builder.Services.AddDbContext<BackToMeDbContext>(options =>
{
options.UseSqlServer(builder.Configuration.GetConnectionString("MyConnection"));
});
Expand Down
13 changes: 0 additions & 13 deletions LostFound_API/WeatherForecast.cs

This file was deleted.

4 changes: 2 additions & 2 deletions LostFound_API/appsettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
},
"AllowedHosts": "*",
"ConnectionStrings": {
"MyConnection": "Data Source=DESKTOP-A6BFNON\\ANSQLSERVER;Database=FBLADB;User Id=sa;Password=Baoan123.cntt;TrustServerCertificate=true;Encrypt=false;"
//"MyConnection": "Data Source=my-sqlserver.cnoi0okmult3.ap-southeast-2.rds.amazonaws.com,1433;Database=FBLADB;User Id=admin;Password=Baoan123.cntt;TrustServerCertificate=true;Encrypt=false;"
"MyConnection": "Data Source=DESKTOP-A6BFNON\\ANSQLSERVER;Database=BackToMeDB;User Id=sa;Password=Baoan123.cntt;TrustServerCertificate=true;Encrypt=false;"
//"MyConnection": "Data Source=my-sqlserver.cnoi0okmult3.ap-southeast-2.rds.amazonaws.com,1433;Database=BackToMeDB;User Id=admin;Password=Baoan123.cntt;TrustServerCertificate=true;Encrypt=false;"
},
"AzureSignalR": {
"ConnectionString": "Endpoint=https://lostandfound-signalr.service.signalr.net;AccessKey=5H02R43oOOa5BOEnT0vq477WDuiU2aQYtcvs53CGsEoKqzgxdF93JQQJ99CAAC1i4TkXJ3w3AAAAASRSY1Xq;Version=1.0;"
Expand Down
Loading
Loading