Merge pull request #36 from sentemon/workout-service

Mock Workout Service Design

Author: sentemon

backend/src/AuthService/AuthService.Api/GraphQL/Mutation.cs

@@ -36,6 +36,7 @@ public async Task<KeycloakTokenResponse> Register(RegisterDto input, [Service] R
             HttpOnly = false,
             Secure = false,
             SameSite = SameSiteMode.Strict,
+            MaxAge = TimeSpan.FromSeconds(result.Response.ExpiresIn)
         });
 
         return result.Response;
@@ -56,7 +57,8 @@ public async Task<KeycloakTokenResponse> Login(LoginDto input, [Service] LoginCo
             Path = "/",
             HttpOnly = false,
             Secure = false,
-            SameSite = SameSiteMode.Strict
+            SameSite = SameSiteMode.Strict,
+            MaxAge = TimeSpan.FromSeconds(result.Response.ExpiresIn)
         });
 
         return result.Response;

backend/src/AuthService/AuthService.Api/Program.cs

@@ -9,25 +9,9 @@
 
 var hostingUrl = builder.Configuration[AppSettingsConstants.WebHostUrl];
 var connectionString = builder.Configuration[AppSettingsConstants.DatabaseConnectionString];
-var allowedOrigins = builder.Configuration.GetSection(AppSettingsConstants.AllowedOrigins).Get<string[]>();
 
 builder.WebHost.UseUrls(hostingUrl ?? throw new ArgumentNullException(nameof(hostingUrl), "Hosting URL is not configured."));
 
-// ToDo: move to extension method
-builder.Services
-    .AddCors(options =>
-    {
-        options.AddPolicy("CorsPolicy", policyBuilder =>
-        {
-            policyBuilder
-                .WithOrigins(allowedOrigins ?? throw new ArgumentNullException(nameof(allowedOrigins),
-                    "Allowed Origin URLs are not configured."))
-                .AllowCredentials()
-                .AllowAnyHeader()
-                .AllowAnyMethod();
-        });
-    });
-
 builder.Services.AddHttpContextAccessor();
 
 builder.Services
@@ -56,8 +40,6 @@
 
 // app.UseHttpsRedirection();
 
-app.UseCors("CorsPolicy");
-
 app.UseAuthentication();
 app.UseAuthorization();
 

backend/src/AuthService/AuthService.Api/appsettings.json

@@ -8,7 +8,6 @@
     }
   },
   "AllowedHosts": "*",
-  "AllowedOrigins": [ "http://localhost:4000", "http://localhost:4200", "http://localhost:8080" ],
   "DatabaseConnectionString": "Host=localhost;Port=5432;Username=postgres;Password=mysecretpasswordfordevelopment;Database=AuthDb",
   "WebHostUrl": "http://0.0.0.0:8001",
   "Keycloak": {

backend/src/AuthService/AuthService.Domain/Constants/AppSettingsConstants.cs

@@ -3,8 +3,6 @@ namespace AuthService.Domain.Constants;
 public static class AppSettingsConstants
 {
     public const string WebHostUrl = "WebHostUrl";
-
-    public const string AllowedOrigins = "AllowedOrigins";
 
     public const string DatabaseConnectionString = "DatabaseConnectionString";
 

backend/src/Gateway/Gateway/Constants/AppSettingsConstants.cs

@@ -1,6 +1,6 @@
 namespace Gateway.Constants;
 
-public class AppSettingsConstants
+public static class AppSettingsConstants
 {
     public const string WebHostUrl = "WebHostUrl";
     public const string AllowedOrigins = "AllowedOrigins";

backend/src/PostService/PostService.Api/Program.cs

@@ -7,26 +7,11 @@
 
 var builder = WebApplication.CreateBuilder(args);
 
-var allowedOrigins = builder.Configuration.GetSection(AppSettingsConstants.AllowedOrigins).Get<string[]>();
 var hostingUrl = builder.Configuration[AppSettingsConstants.WebHostUrl];
 var connectionString = builder.Configuration[AppSettingsConstants.DatabaseConnectionString];
 
 builder.WebHost.UseUrls(hostingUrl ?? throw new ArgumentNullException(nameof(hostingUrl), "Hosting URL is not configured."));
 
-builder.Services
-    .AddCors(options =>
-    {
-        options.AddPolicy("CorsPolicy", policyBuilder =>
-        {
-            policyBuilder
-                .WithOrigins(allowedOrigins ?? throw new ArgumentNullException(nameof(allowedOrigins),
-                    "Allowed Origin URLs are not configured."))
-                .AllowCredentials()
-                .AllowAnyHeader()
-                .AllowAnyMethod();
-        });
-    });
-
 builder.Services.AddHttpContextAccessor();
 
 builder.Services
@@ -57,10 +42,6 @@
     app.UseHttpsRedirection();
 }
 
-app.UseStaticFiles();
-
-app.UseCors("CorsPolicy");
-
 app.UseAuthentication();
 app.UseAuthorization();
 

backend/src/PostService/PostService.Api/appsettings.json

@@ -6,7 +6,6 @@
     }
   },
   "AllowedHosts": "*",
-  "AllowedOrigins": [ "http://localhost:4000", "http://localhost:4200", "http://localhost:8080" ],
   "DatabaseConnectionString": "Host=localhost;Port=5432;Username=postgres;Password=mysecretpasswordfordevelopment;Database=PostsDb",
   "WebHostUrl": "http://0.0.0.0:8002",
   "Keycloak": {

backend/src/PostService/PostService.Domain/Constants/AppSettingsConstants.cs

@@ -2,7 +2,6 @@ namespace PostService.Domain.Constants;
 
 public static class AppSettingsConstants
 {
-    public const string AllowedOrigins = "AllowedOrigins";
     public const string WebHostUrl = "WebHostUrl";
     public const string DatabaseConnectionString = "DatabaseConnectionString";
 

frontend/package-lock.json

@@ -19,8 +19,10 @@
     "@angular/platform-browser-dynamic": "^18.2.0",
     "@angular/router": "^18.2.0",
     "@apollo/client": "^3.11.10",
+    "@primeng/themes": "^19.0.5",
     "apollo-angular": "^8.0.0",
     "graphql": "^16.9.0",
+    "primeng": "^18.0.0",
     "rxjs": "~7.8.0",
     "tslib": "^2.3.0",
     "zone.js": "~0.14.10"

frontend/package.json

@@ -6,13 +6,26 @@ import {RegisterComponent} from "./features/auth/componets/register/register.com
 import {ProfileComponent} from "./features/auth/componets/profile/profile.component";
 import {CreatePostComponent} from "./features/posts/components/create-post/create-post.component";
 import {PostListComponent} from "./features/posts/components/post-list/post-list.component";
+import {SetUpProfileComponent} from "./features/workouts/components/set-up-profile/set-up-profile.component";
+import {WorkoutsListComponent} from "./features/workouts/components/workouts-list/workouts-list.component";
+import {SetUpGuard} from "./features/workouts/services/set-up.guard";
+import {WorkoutComponent} from "./features/workouts/components/workout/workout.component";
+import {NotFoundComponent} from "./shared/not-found/not-found.component";
+import {NewWorkoutComponent} from "./features/workouts/components/new-workout/new-workout.component";
+import {CreateWorkoutComponent} from "./features/workouts/components/create-workout/create-workout.component";
 
 const routes: Routes = [
   {path: '', component: PostListComponent, canActivate: [AuthGuard] },
   { path: 'login', component: LoginComponent },
   { path: 'register', component: RegisterComponent },
   { path: 'sentemon', component: ProfileComponent },
-  { path: 'create-post', component: CreatePostComponent },
+  { path: 'create-post', component: CreatePostComponent, canActivate: [AuthGuard] },
+  { path: 'workouts', component: WorkoutsListComponent, canActivate: [AuthGuard, SetUpGuard] },
+  { path: 'workouts/new', component: NewWorkoutComponent, canActivate: [AuthGuard] },
+  { path: 'workouts/create', component: CreateWorkoutComponent, canActivate: [AuthGuard] },
+  { path: 'workouts/:workout-name', component: WorkoutComponent, canActivate: [AuthGuard] },
+  { path: 'setup-profile', component: SetUpProfileComponent, canActivate: [AuthGuard] },
+  { path: 'not-found', component: NotFoundComponent },
   { path: '**', redirectTo: '', pathMatch: 'full' }
 ];
 

frontend/src/app/app-routing.module.ts

@@ -12,6 +12,7 @@ import {SharedModule} from "./shared/shared.module";
 import {graphql} from "./graphql.config";
 import {HTTP_INTERCEPTORS, HttpClientModule} from "@angular/common/http";
 import {AuthInterceptor} from "./core/services/auth.interceptor";
+import {WorkoutsModule} from "./features/workouts/workouts.module";
 
 @NgModule({
   declarations: [
@@ -22,6 +23,7 @@ import {AuthInterceptor} from "./core/services/auth.interceptor";
     AppRoutingModule,
     AuthModule,
     PostsModule,
+    WorkoutsModule,
     SharedModule,
     HttpClientModule,
     ApolloModule

frontend/src/app/app.module.ts

@@ -22,7 +22,8 @@ import { PostOptionsComponent } from './components/post-options/post-options.com
     PostOptionsComponent,
   ],
   exports: [
-    PostListComponent
+    PostListComponent,
+    CreatePostComponent
   ],
   imports: [
     CommonModule,

frontend/src/app/features/posts/posts.module.ts

@@ -0,0 +1,42 @@
+<app-back></app-back>
+
+<div class="create-workout">
+  <div class="workout-header">
+    <p>Title</p>
+    <input type="text" class="workout-input">
+
+    <p>Description</p>
+    <input type="text" class="workout-input">
+
+    <p>Image</p>
+    <input id="file-image" type="file" class="workout-input">
+    <label for="file-image">Upload Image</label>
+
+    <p>Time</p>
+    <input type="text" class="workout-input">
+
+    <p>Level</p>
+    <input type="text" class="workout-input">
+  </div>
+
+  <div class="create-exercise">
+    <div class="exercise-header">
+      <p>Exercise Name</p>
+      <input type="text" class="exercise-input">
+    </div>
+
+    <div class="create-set">
+      <div class="set-header">
+        <p>Reps</p>
+        <input type="number" class="set-input">
+
+        <p>Weight</p>
+        <input type="number" class="set-input">
+      </div>
+
+      <button class="set-button">Add Set</button>
+    </div>
+
+    <button class="exercise-button">Add Exercise</button>
+  </div>
+</div>