pre-deploy

.dockerignore

@@ -0,0 +1,2 @@
+**/bin
+**/obj

.github/workflows/docker-push.yml

@@ -0,0 +1,28 @@
+name: docker-push
+
+on:
+workflow_dispatch:
+
+  # push:
+  #   branches:
+  #     - 'main'
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      -
+        name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          push: true
+          tags: dayosql/reactivities:latest

API/Controllers/FallbackController.cs

@@ -0,0 +1,16 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace API.Controllers
+{
+    [AllowAnonymous]
+    public class FallbackController: Controller
+    {
+        public IActionResult Index()
+        {
+            return PhysicalFile(Path.Combine(
+            Directory.GetCurrentDirectory(),
+            "wwwroot", "index.html"), "text/HTML");
+        }
+    }
+}

API/Controllers/WeatherForecastController.cs

@@ -23,7 +23,7 @@ public IEnumerable<WeatherForecast> Get()
     {
         return Enumerable.Range(1, 5).Select(index => new WeatherForecast
         {
-            Date = DateOnly.FromDateTime(DateTime.Now.AddDays(index)),
+            Date = DateOnly.FromDateTime(DateTime.UtcNow.AddDays(index)),
             TemperatureC = Random.Shared.Next(-20, 55),
             Summary = Summaries[Random.Shared.Next(Summaries.Length)]
         })

API/Extensions/ApplicationServiceExtensions.cs

@@ -18,10 +18,45 @@ public static IServiceCollection AddApplicationServices(this IServiceCollection
             // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
             services.AddEndpointsApiExplorer();
             services.AddSwaggerGen();
-            services.AddDbContext<DataContext>(opt=>
-            {
-                opt.UseSqlite(config.GetConnectionString("DefaultConnection"));
-            });
+            services.AddDbContext<DataContext>(options =>
+{
+    var env = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT");
+
+    string connStr;
+
+    // Depending on if in development or production, use either FlyIO
+    // connection string, or development connection string from env var.
+    if (env == "Development")
+    {
+        // Use connection string from file.
+        connStr = config.GetConnectionString("DefaultConnection");
+    }
+    else
+    {
+        // Use connection string provided at runtime by FlyIO.
+        var connUrl = Environment.GetEnvironmentVariable("DATABASE_URL");
+
+        // Parse connection URL to connection string for Npgsql
+        connUrl = connUrl.Replace("postgres://", string.Empty);
+        var pgUserPass = connUrl.Split("@")[0];
+        var pgHostPortDb = connUrl.Split("@")[1];
+        var pgHostPort = pgHostPortDb.Split("/")[0];
+        var pgDb = pgHostPortDb.Split("/")[1];
+        var pgUser = pgUserPass.Split(":")[0];
+        var pgPass = pgUserPass.Split(":")[1];
+        var pgHost = pgHostPort.Split(":")[0];
+        var pgPort = pgHostPort.Split(":")[1];
+	var updatedHost = pgHost.Replace("flycast", "internal");
+
+        connStr = $"Server={updatedHost};Port={pgPort};User Id={pgUser};Password={pgPass};Database={pgDb};";
+    }
+
+    // Whether the connection string came from the local development configuration file
+    // or from the environment variable from FlyIO, use it to set up your DbContext.
+    options.UseNpgsql(connStr);
+});
+
+
 
                 services.Configure<CookiePolicyOptions>(options =>
         {

API/Program.cs

@@ -39,7 +39,9 @@
 app.UseAuthentication();
 app.UseAuthorization();
 
-
+app.UseDefaultFiles();
+app.UseStaticFiles();
+app.MapFallbackToController("Index", "Fallback");
 
 app.MapControllers();
 

API/appsettings.Development.json

@@ -6,7 +6,7 @@
     }
   },
   "ConnectionStrings": {
-    "DefaultConnection": "Data Source=reactivities.db"
+    "DefaultConnection": "Server=localhost; Port=5432; User Id=admin; Password=secret; Database=reactivities"
   },
   "TokenKey":"super secret key"
 }

API/wwwroot/index.html

@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Reactivities</title>
+    <script type="module" crossorigin src="/assets/index-1e8ecb79.js"></script>
+    <link rel="stylesheet" href="/assets/index-bc0962bb.css">
+  </head>
+  <body>
+    <div id="root"></div>
+
+  </body>
+</html>

Application/Profiles/ListActivities.cs

@@ -45,15 +45,15 @@ public async Task<Result<List<UserActivityDto>>> Handle(Query request, Cancellat
 
                  if(request.Predicate =="past")
                  {
-                    query = query.Where(x=>x.Date <= DateTime.Now);
+                    query = query.Where(x=>x.Date <= DateTime.UtcNow);
                  }
 
                else if(request.Predicate =="hosting")
                 {
                     query = query.Where(a=>a.HostUsername ==_userAccessor.GetUsername());
                 }
                 else {
-                    query = query.Where(x=>x.Date>= DateTime.Now);
+                    query = query.Where(x=>x.Date>= DateTime.UtcNow);
                 }
 
                 var activities = await query.ToListAsync();

Dockerfile

@@ -0,0 +1,25 @@
+FROM mcr.microsoft.com/dotnet/sdk:7.0 as build-env
+WORKDIR /app
+EXPOSE 8080
+
+
+# copy .csproj and restore as distinct layers
+COPY "Reactivities.sln" "Reactivities.sln"
+COPY "API/API.csproj" "API/API.csproj"
+COPY "Application/Application.csproj" "Application/Application.csproj"
+COPY "Persistence/Persistence.csproj" "Persistence/Persistence.csproj"
+COPY "Domain/Domain.csproj" "Domain/Domain.csproj"
+COPY "Infrastructure/Infrastructure.csproj" "Infrastructure/Infrastructure.csproj"
+
+RUN dotnet restore "Reactivities.sln"
+
+# copy everything else build
+COPY . .
+WORKDIR /app
+RUN dotnet publish -c Release -o out
+
+#build a runtine image
+FROM mcr.microsoft.com/dotnet/aspnet:7.0
+WORKDIR /app
+COPY --from=build-env /app/out .
+ENTRYPOINT [ "dotnet", "API.dll" ]