Index: itignore =================================================================== --- .gitignore (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,31 +1,0 @@ -# Java / Maven -target/ -!.mvn/wrapper/maven-wrapper.jar -*.class - -# IntelliJ -.idea/ -*.iml -*.iws -out/ - -# Node -node_modules/ -dist/ -.vite/ - -# Environment -.env -.env.local - -# OS -.DS_Store -Thumbs.db - -# Logs -*.log - -# Credentials and local tooling - never commit -tunnel_scripta.cmd -*.ppk -plink.exe Index: TP_SMOKE_TEST.http =================================================================== --- HTTP_SMOKE_TEST.http (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,104 +1,0 @@ -### Nutritioneer - click the green arrows in IntelliJ, top to bottom. -### The token from step 2 is captured into a variable and reused. - -@host = http://localhost:8080 - -### 1. Register a fresh account (409 if you run it twice - that is correct) -POST {{host}}/api/auth/register -Content-Type: application/json - -{ "email": "test.user@example.com", "username": "test_user", "password": "testPass@1" } - -### 2. Log in as a seeded account -# @name login -POST {{host}}/api/auth/login -Content-Type: application/json - -{ "email": "marija.trajkovska@gmail.com", "password": "testPass@1" } - -> {% client.global.set("token", response.body.token); %} - -### 3. The public feed -GET {{host}}/api/posts/feed -Authorization: Bearer {{token}} - -### 4. UC1001 - create a recipe. No kcal is sent; the server derives it. -# @name newRecipe -POST {{host}}/api/recipes -Authorization: Bearer {{token}} -Content-Type: application/json - -{ - "name": "Test Bean Stew", - "guide": "1. Boil the beans.\n2. Fry the onion.\n3. Combine and bake.", - "servings": 4, - "ingredients": [ - { "ingredientName": "Dry white beans", "quantity": 400 }, - { "ingredientName": "Onion", "quantity": 150 }, - { "ingredientName": "Olive oil", "quantity": 30 } - ], - "restrictionIds": [] -} - -> {% client.global.set("recipeId", response.body.id); %} - -### 5. UC1004 - share it. Running this twice returns 409 (uq_post_recipe). -POST {{host}}/api/posts -Authorization: Bearer {{token}} -Content-Type: application/json - -{ "recipeId": {{recipeId}}, "isPrivate": false, "isFavourite": false, "status": "published" } - -### 6. UC1002 - log a meal (attach post id 1 from the seed data) -POST {{host}}/api/planner -Authorization: Bearer {{token}} -Content-Type: application/json - -{ "notes": "Smoke test lunch", "postIds": [1], "consumed": true } - -### 7. Daily totals -GET {{host}}/api/planner/daily?from=2026-01-20&to=2026-02-05 -Authorization: Bearer {{token}} - -### 8. UC1003 - grocery list from a recipe plus one item -POST {{host}}/api/grocery-lists -Authorization: Bearer {{token}} -Content-Type: application/json - -{ - "notes": "Smoke test list", - "bulkRecipeIds": [1], - "singleItems": [{ "ingredientName": "Apple", "buyQuantity": 1000 }] -} - -### 9. Biometrics -POST {{host}}/api/biometrics -Authorization: Bearer {{token}} -Content-Type: application/json - -{ "date": "2026-02-02", "weight": 72.0, "height": 168, "age": 29, "muscleFatRatio": 1.97 } - -### 10. Should be 403 - a regular user is not an administrator -GET {{host}}/api/admin/accounts -Authorization: Bearer {{token}} - -### 11. Log in as the trainer -# @name trainerLogin -POST {{host}}/api/auth/login -Content-Type: application/json - -{ "email": "viktor.ilievski@nutritioneer.mk", "password": "testPass@1" } - -> {% client.global.set("trainerToken", response.body.token); %} - -### 12. UC3001 - client weekly intake -GET {{host}}/api/trainer/clients/marija.trajkovska@gmail.com/intake?from=2026-01-22&to=2026-01-29 -Authorization: Bearer {{trainerToken}} - -### 13. UC3004 - protein density ranking -GET {{host}}/api/trainer/analysis/nutrient-density?nutrient=Protein&limit=5 -Authorization: Bearer {{trainerToken}} - -### 14. UC3003 - feed filtered by restriction -GET {{host}}/api/posts/feed/by-restriction?type=gluten_free&avoid=Contains tree nuts -Authorization: Bearer {{trainerToken}} Index: README.md =================================================================== --- README.md (revision 33b72d451e8daa85c40201d8170702f80bc3aea6) +++ README.md (revision 33b72d451e8daa85c40201d8170702f80bc3aea6) @@ -0,0 +1,2 @@ +# Nutritioneer +Проект по предметот Бази на податоци 2026з - ментор: проф. Вангел Ајановски Index: ckend/.mvn/wrapper/maven-wrapper.properties =================================================================== --- backend/.mvn/wrapper/maven-wrapper.properties (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,2 +1,0 @@ -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar Index: ckend/package-lock.json =================================================================== --- backend/package-lock.json (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,6 +1,0 @@ -{ - "name": "backend", - "lockfileVersion": 3, - "requires": true, - "packages": {} -} Index: ckend/pom.xml =================================================================== --- backend/pom.xml (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,110 +1,0 @@ - - - 4.0.0 - - - org.springframework.boot - spring-boot-starter-parent - 3.4.2 - - - - mk.finki - nutritioneer - 0.1.0-SNAPSHOT - nutritioneer - Nutrient tracking, recipe sharing and meal planning - - - 21 - 0.12.6 - 2.7.0 - - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.springframework.boot - spring-boot-starter-security - - - org.springframework.boot - spring-boot-starter-validation - - - - org.postgresql - postgresql - runtime - - - - - io.jsonwebtoken - jjwt-api - ${jjwt.version} - - - io.jsonwebtoken - jjwt-impl - ${jjwt.version} - runtime - - - io.jsonwebtoken - jjwt-jackson - ${jjwt.version} - runtime - - - - - org.springdoc - springdoc-openapi-starter-webmvc-ui - ${springdoc.version} - - - - org.projectlombok - lombok - true - - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.security - spring-security-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - org.projectlombok - lombok - - - - - - - Index: ckend/src/main/java/mk/finki/nutritioneer/NutritioneerApplication.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/NutritioneerApplication.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,12 +1,0 @@ -package mk.finki.nutritioneer; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class NutritioneerApplication { - - public static void main(String[] args) { - SpringApplication.run(NutritioneerApplication.class, args); - } -} Index: ckend/src/main/java/mk/finki/nutritioneer/config/OpenApiConfig.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/config/OpenApiConfig.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,32 +1,0 @@ -package mk.finki.nutritioneer.config; - -import io.swagger.v3.oas.models.Components; -import io.swagger.v3.oas.models.OpenAPI; -import io.swagger.v3.oas.models.info.Info; -import io.swagger.v3.oas.models.security.SecurityRequirement; -import io.swagger.v3.oas.models.security.SecurityScheme; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - - -@Configuration -public class OpenApiConfig { - - private static final String SCHEME = "bearerAuth"; - - @Bean - public OpenAPI nutritioneerOpenApi() { - return new OpenAPI() - .info(new Info() - .title("Nutritioneer API") - .version("0.1.0") - .description("Nutrient tracking, recipe sharing and meal planning.")) - .addSecurityItem(new SecurityRequirement().addList(SCHEME)) - .components(new Components().addSecuritySchemes(SCHEME, - new SecurityScheme() - .name(SCHEME) - .type(SecurityScheme.Type.HTTP) - .scheme("bearer") - .bearerFormat("JWT"))); - } -} Index: ckend/src/main/java/mk/finki/nutritioneer/config/SecurityConfig.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/config/SecurityConfig.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,82 +1,0 @@ -package mk.finki.nutritioneer.config; - -import lombok.RequiredArgsConstructor; -import mk.finki.nutritioneer.security.JwtAuthenticationFilter; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.http.HttpMethod; -import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration; -import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.http.SessionCreationPolicy; -import org.springframework.security.crypto.password.NoOpPasswordEncoder; -import org.springframework.security.crypto.password.PasswordEncoder; -import org.springframework.security.web.SecurityFilterChain; -import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; -import org.springframework.web.cors.CorsConfiguration; -import org.springframework.web.cors.CorsConfigurationSource; -import org.springframework.web.cors.UrlBasedCorsConfigurationSource; - -import java.util.Arrays; -import java.util.List; - -@Configuration -@EnableMethodSecurity // enables @PreAuthorize on the admin and trainer endpoints -@RequiredArgsConstructor -public class SecurityConfig { - - private final JwtAuthenticationFilter jwtFilter; - - @Value("${app.cors.allowed-origins}") - private String allowedOrigins; - - @Bean - public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { - http - // Stateless JWT API: no session to protect, so CSRF is switched off. - .csrf(csrf -> csrf.disable()) - .cors(cors -> cors.configurationSource(corsConfigurationSource())) - .sessionManagement(s -> s.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) - .authorizeHttpRequests(auth -> auth - .requestMatchers("/api/auth/**").permitAll() - .requestMatchers("/v3/api-docs/**", "/swagger-ui/**", "/swagger-ui.html").permitAll() - .requestMatchers(HttpMethod.GET, "/api/catalog/**").permitAll() - .requestMatchers("/api/admin/**").hasRole("ADMINISTRATOR") - .requestMatchers("/api/trainer/**").hasAnyRole("TRAINER", "ADMINISTRATOR") - .anyRequest().authenticated()) - .addFilterBefore(jwtFilter, UsernamePasswordAuthenticationFilter.class); - - return http.build(); - } - - @Bean - public CorsConfigurationSource corsConfigurationSource() { - CorsConfiguration config = new CorsConfiguration(); - config.setAllowedOrigins(Arrays.asList(allowedOrigins.split(","))); - config.setAllowedMethods(List.of("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS")); - config.setAllowedHeaders(List.of("*")); - config.setAllowCredentials(true); - - UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); - source.registerCorsConfiguration("/**", config); - return source; - } - - /** - * Моментална состојва на passwords е plain text - понатаму ќе се замени со - * BCryptPasswordEncoder функција за хеширање поради безбедност. - */ - @Bean - @SuppressWarnings("deprecation") - public PasswordEncoder passwordEncoder() { - return NoOpPasswordEncoder.getInstance(); - } - - @Bean - public AuthenticationManager authenticationManager(AuthenticationConfiguration config) - throws Exception { - return config.getAuthenticationManager(); - } -} Index: ckend/src/main/java/mk/finki/nutritioneer/domain/AppUser.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/domain/AppUser.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,28 +1,0 @@ -package mk.finki.nutritioneer.domain; - -import jakarta.persistence.*; -import lombok.*; -import org.hibernate.annotations.JdbcTypeCode; -import org.hibernate.type.SqlTypes; - -@Entity -@Table(name = "\"user\"") -@Getter @Setter @NoArgsConstructor @AllArgsConstructor @Builder -public class AppUser { - - @Id - @Column(name = "email", nullable = false) - private String email; - - @Column(name = "username", nullable = false, unique = true) - private String username; - - - @Column(name = "password", nullable = false) - private String password; - - @Enumerated(EnumType.STRING) - @JdbcTypeCode(SqlTypes.NAMED_ENUM) - @Column(name = "role", nullable = false, columnDefinition = "user_role") - private UserRole role; -} Index: ckend/src/main/java/mk/finki/nutritioneer/domain/Biometrics.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/domain/Biometrics.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,49 +1,0 @@ -package mk.finki.nutritioneer.domain; - -import jakarta.persistence.*; -import lombok.*; - -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.time.LocalDate; - -@Entity -@Table(name = "biometrics") -@Getter @Setter @NoArgsConstructor @AllArgsConstructor @Builder -public class Biometrics { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") - private Long id; - - @Column(name = "date", nullable = false) - private LocalDate date; - - /** kg */ - @Column(name = "weight") - private BigDecimal weight; - - /** cm */ - @Column(name = "height") - private BigDecimal height; - - @Column(name = "age") - private BigDecimal age; - - @Column(name = "muscle_fat_ratio") - private BigDecimal muscleFatRatio; - - @ManyToOne(fetch = FetchType.LAZY, optional = false) - @JoinColumn(name = "user_email", nullable = false) - private AppUser owner; - - @Transient - public BigDecimal getBmi() { - if (weight == null || height == null || height.signum() == 0) { - return null; - } - BigDecimal metres = height.divide(BigDecimal.valueOf(100), 4, RoundingMode.HALF_UP); - return weight.divide(metres.multiply(metres), 1, RoundingMode.HALF_UP); - } -} Index: ckend/src/main/java/mk/finki/nutritioneer/domain/Comment.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/domain/Comment.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,38 +1,0 @@ -package mk.finki.nutritioneer.domain; - -import jakarta.persistence.*; -import lombok.*; - -import java.time.LocalDateTime; - -@Entity -@Table(name = "comment") -@Getter @Setter @NoArgsConstructor @AllArgsConstructor @Builder -public class Comment { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") - private Long id; - - @Column(name = "description", nullable = false) - private String description; - - @Column(name = "created_at", nullable = false) - private LocalDateTime createdAt; - - @ManyToOne(fetch = FetchType.LAZY, optional = false) - @JoinColumn(name = "post_id", nullable = false) - private Post post; - - @ManyToOne(fetch = FetchType.EAGER, optional = false) - @JoinColumn(name = "created_by", nullable = false) - private AppUser author; - - @PrePersist - void onCreate() { - if (createdAt == null) { - createdAt = LocalDateTime.now(); - } - } -} Index: ckend/src/main/java/mk/finki/nutritioneer/domain/GroceryItem.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/domain/GroceryItem.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,47 +1,0 @@ -package mk.finki.nutritioneer.domain; - -import jakarta.persistence.*; -import lombok.*; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Objects; - -@Entity -@Table(name = "grocery_list_single_add_ingredient") -@IdClass(GroceryItem.Key.class) -@Getter @Setter @NoArgsConstructor @AllArgsConstructor @Builder -public class GroceryItem { - - @Id - @ManyToOne(fetch = FetchType.LAZY, optional = false) - @JoinColumn(name = "list_id", nullable = false) - private GroceryList list; - - @Id - @ManyToOne(fetch = FetchType.EAGER, optional = false) - @JoinColumn(name = "ingredient_name", nullable = false) - private Ingredient ingredient; - - @Column(name = "buy_quantity", nullable = false) - private BigDecimal buyQuantity; - - @Getter @Setter @NoArgsConstructor @AllArgsConstructor - public static class Key implements Serializable { - private Long list; - private String ingredient; - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof Key key)) return false; - return Objects.equals(list, key.list) - && Objects.equals(ingredient, key.ingredient); - } - - @Override - public int hashCode() { - return Objects.hash(list, ingredient); - } - } -} Index: ckend/src/main/java/mk/finki/nutritioneer/domain/GroceryList.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/domain/GroceryList.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,58 +1,0 @@ -package mk.finki.nutritioneer.domain; - -import jakarta.persistence.*; -import lombok.*; - -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.LinkedHashSet; -import java.util.Set; - -@Entity -@Table(name = "grocery_list") -@Getter @Setter @NoArgsConstructor @AllArgsConstructor @Builder -public class GroceryList { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") - private Long id; - - @Column(name = "date_time", nullable = false) - private LocalDateTime dateTime; - - @Column(name = "notes") - private String notes; - - @Column(name = "is_bought", nullable = false) - private boolean isBought; - - @Column(name = "kcal", nullable = false) - private BigDecimal kcal; - - @ManyToOne(fetch = FetchType.LAZY, optional = false) - @JoinColumn(name = "user_email", nullable = false) - private AppUser owner; - - @ManyToMany(fetch = FetchType.LAZY) - @JoinTable( - name = "grocery_list_bulk_add_ingredient", - joinColumns = @JoinColumn(name = "list_id"), - inverseJoinColumns = @JoinColumn(name = "recipe_id")) - @Builder.Default - private Set bulkRecipes = new LinkedHashSet<>(); - - @OneToMany(mappedBy = "list", cascade = CascadeType.ALL, orphanRemoval = true) - @Builder.Default - private Set singleItems = new LinkedHashSet<>(); - - @PrePersist - void onCreate() { - if (dateTime == null) { - dateTime = LocalDateTime.now(); - } - if (kcal == null) { - kcal = BigDecimal.ZERO; - } - } -} Index: ckend/src/main/java/mk/finki/nutritioneer/domain/Ingredient.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/domain/Ingredient.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,32 +1,0 @@ -package mk.finki.nutritioneer.domain; - -import jakarta.persistence.*; -import lombok.*; -import org.hibernate.annotations.JdbcTypeCode; -import org.hibernate.type.SqlTypes; - -import java.math.BigDecimal; - -@Entity -@Table(name = "ingredient") -@Getter @Setter @NoArgsConstructor @AllArgsConstructor @Builder -public class Ingredient { - - @Id - @Column(name = "name", nullable = false) - private String name; - - @Column(name = "description", nullable = false) - private String description; - - @Column(name = "energy", nullable = false) - private BigDecimal energy; - - @Column(name = "kcal", nullable = false) - private BigDecimal kcal; - - @Enumerated(EnumType.STRING) - @JdbcTypeCode(SqlTypes.NAMED_ENUM) - @Column(name = "type", nullable = false, columnDefinition = "ingredient_type") - private IngredientType type; -} Index: ckend/src/main/java/mk/finki/nutritioneer/domain/IngredientNutrient.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/domain/IngredientNutrient.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,47 +1,0 @@ -package mk.finki.nutritioneer.domain; - -import jakarta.persistence.*; -import lombok.*; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Objects; - -@Entity -@Table(name = "ingredient_contains_nutrient") -@IdClass(IngredientNutrient.Key.class) -@Getter @Setter @NoArgsConstructor @AllArgsConstructor @Builder -public class IngredientNutrient { - - @Id - @ManyToOne(fetch = FetchType.LAZY, optional = false) - @JoinColumn(name = "ingredient_name", nullable = false) - private Ingredient ingredient; - - @Id - @ManyToOne(fetch = FetchType.EAGER, optional = false) - @JoinColumn(name = "nutrient_id", nullable = false) - private Nutrient nutrient; - - @Column(name = "quantity", nullable = false) - private BigDecimal quantity; - - @Getter @Setter @NoArgsConstructor @AllArgsConstructor - public static class Key implements Serializable { - private String ingredient; - private Long nutrient; - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof Key key)) return false; - return Objects.equals(ingredient, key.ingredient) - && Objects.equals(nutrient, key.nutrient); - } - - @Override - public int hashCode() { - return Objects.hash(ingredient, nutrient); - } - } -} Index: ckend/src/main/java/mk/finki/nutritioneer/domain/IngredientType.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/domain/IngredientType.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,6 +1,0 @@ -package mk.finki.nutritioneer.domain; - -public enum IngredientType { - dairy, meat, fish, herb, carb, vegetable, fruit, legume, - nut, seed, oil, spice, beverage, other -} Index: ckend/src/main/java/mk/finki/nutritioneer/domain/IntakePlanner.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/domain/IntakePlanner.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,55 +1,0 @@ -package mk.finki.nutritioneer.domain; - -import jakarta.persistence.*; -import lombok.*; - -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.LinkedHashSet; -import java.util.Set; - - -@Entity -@Table(name = "intake_planner") -@Getter @Setter @NoArgsConstructor @AllArgsConstructor @Builder -public class IntakePlanner { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") - private Long id; - - @Column(name = "date_time", nullable = false) - private LocalDateTime dateTime; - - @Column(name = "notes") - private String notes; - - @Column(name = "kcal", nullable = false) - private BigDecimal kcal; - - @Column(name = "is_consumed", nullable = false) - private boolean isConsumed; - - @ManyToOne(fetch = FetchType.LAZY, optional = false) - @JoinColumn(name = "user_email", nullable = false) - private AppUser owner; - - @ManyToMany(fetch = FetchType.LAZY) - @JoinTable( - name = "intake_planner_save_to_list_post", - joinColumns = @JoinColumn(name = "planner_id"), - inverseJoinColumns = @JoinColumn(name = "post_id")) - @Builder.Default - private Set savedPosts = new LinkedHashSet<>(); - - @PrePersist - void onCreate() { - if (dateTime == null) { - dateTime = LocalDateTime.now(); - } - if (kcal == null) { - kcal = BigDecimal.ZERO; - } - } -} Index: ckend/src/main/java/mk/finki/nutritioneer/domain/Nutrient.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/domain/Nutrient.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,35 +1,0 @@ -package mk.finki.nutritioneer.domain; - -import jakarta.persistence.*; -import lombok.*; -import org.hibernate.annotations.JdbcTypeCode; -import org.hibernate.type.SqlTypes; - -import java.math.BigDecimal; - -@Entity -@Table(name = "nutrient") -@Getter @Setter @NoArgsConstructor @AllArgsConstructor @Builder -public class Nutrient { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") - private Long id; - - @Column(name = "quantity", nullable = false) - private BigDecimal quantity; - - @Column(name = "description", nullable = false, unique = true) - private String description; - - @Enumerated(EnumType.STRING) - @JdbcTypeCode(SqlTypes.NAMED_ENUM) - @Column(name = "unit", nullable = false, columnDefinition = "nutrient_unit") - private NutrientUnit unit; - - @Enumerated(EnumType.STRING) - @JdbcTypeCode(SqlTypes.NAMED_ENUM) - @Column(name = "type", nullable = false, columnDefinition = "nutrient_type") - private NutrientType type; -} Index: ckend/src/main/java/mk/finki/nutritioneer/domain/NutrientType.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/domain/NutrientType.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,5 +1,0 @@ -package mk.finki.nutritioneer.domain; - -public enum NutrientType { - macro, micro -} Index: ckend/src/main/java/mk/finki/nutritioneer/domain/NutrientUnit.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/domain/NutrientUnit.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,5 +1,0 @@ -package mk.finki.nutritioneer.domain; - -public enum NutrientUnit { - milligram, gram, microgram -} Index: ckend/src/main/java/mk/finki/nutritioneer/domain/Post.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/domain/Post.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,66 +1,0 @@ -package mk.finki.nutritioneer.domain; - -import jakarta.persistence.*; -import lombok.*; -import org.hibernate.annotations.JdbcTypeCode; -import org.hibernate.type.SqlTypes; - -import java.time.LocalDateTime; - -@Entity -@Table(name = "post") -@Getter @Setter @NoArgsConstructor @AllArgsConstructor @Builder -public class Post { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") - private Long id; - - /** - Не е детално тестирано и имплементирано додавање на media - - ќе се додаде накнадно - */ - @JdbcTypeCode(SqlTypes.VARBINARY) - @Basic(fetch = FetchType.LAZY) - @Column(name = "media", columnDefinition = "bytea") - private byte[] media; - - @Column(name = "media_type") - private String mediaType; - - @Column(name = "media_name") - private String mediaName; - - @Column(name = "is_private", nullable = false) - private boolean isPrivate; - - @Column(name = "is_favourite", nullable = false) - private boolean isFavourite; - - @Enumerated(EnumType.STRING) - @JdbcTypeCode(SqlTypes.NAMED_ENUM) - @Column(name = "status", nullable = false, columnDefinition = "post_status") - private PostStatus status; - - @Column(name = "created_at", nullable = false) - private LocalDateTime createdAt; - - @ManyToOne(fetch = FetchType.EAGER, optional = false) - @JoinColumn(name = "created_by", nullable = false) - private AppUser author; - - @OneToOne(fetch = FetchType.EAGER) - @JoinColumn(name = "recipe_id", unique = true) - private Recipe recipe; - - @PrePersist - void onCreate() { - if (createdAt == null) { - createdAt = LocalDateTime.now(); - } - if (status == null) { - status = PostStatus.draft; - } - } -} Index: ckend/src/main/java/mk/finki/nutritioneer/domain/PostStatus.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/domain/PostStatus.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,5 +1,0 @@ -package mk.finki.nutritioneer.domain; - -public enum PostStatus { - published, draft, archived -} Index: ckend/src/main/java/mk/finki/nutritioneer/domain/Recipe.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/domain/Recipe.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,56 +1,0 @@ -package mk.finki.nutritioneer.domain; - -import jakarta.persistence.*; -import lombok.*; - -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.LinkedHashSet; -import java.util.Set; - -@Entity -@Table(name = "recipe") -@Getter @Setter @NoArgsConstructor @AllArgsConstructor @Builder -public class Recipe { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") - private Long id; - - @Column(name = "name", nullable = false) - private String name; - - @Column(name = "guide", nullable = false) - private String guide; - - @Column(name = "kcal_sum", nullable = false) - private BigDecimal kcalSum; - - @Column(name = "servings", nullable = false) - private BigDecimal servings; - - @ManyToOne(fetch = FetchType.LAZY, optional = false) - @JoinColumn(name = "user_email", nullable = false) - private AppUser owner; - - @OneToMany(mappedBy = "recipe", cascade = CascadeType.ALL, orphanRemoval = true) - @Builder.Default - private Set ingredients = new LinkedHashSet<>(); - - @ManyToMany(fetch = FetchType.LAZY) - @JoinTable( - name = "recipe_contains_restriction", - joinColumns = @JoinColumn(name = "recipe_id"), - inverseJoinColumns = @JoinColumn(name = "restriction_id")) - @Builder.Default - private Set restrictions = new LinkedHashSet<>(); - - @Transient - public BigDecimal getKcalPerServing() { - if (kcalSum == null || servings == null || servings.signum() == 0) { - return BigDecimal.ZERO; - } - return kcalSum.divide(servings, 2, RoundingMode.HALF_UP); - } -} Index: ckend/src/main/java/mk/finki/nutritioneer/domain/RecipeIngredient.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/domain/RecipeIngredient.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,48 +1,0 @@ -package mk.finki.nutritioneer.domain; - -import jakarta.persistence.*; -import lombok.*; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Objects; - - -@Entity -@Table(name = "recipe_contains_ingredient") -@IdClass(RecipeIngredient.Key.class) -@Getter @Setter @NoArgsConstructor @AllArgsConstructor @Builder -public class RecipeIngredient { - - @Id - @ManyToOne(fetch = FetchType.LAZY, optional = false) - @JoinColumn(name = "recipe_id", nullable = false) - private Recipe recipe; - - @Id - @ManyToOne(fetch = FetchType.EAGER, optional = false) - @JoinColumn(name = "ingredient_name", nullable = false) - private Ingredient ingredient; - - @Column(name = "ingredient_quantity", nullable = false) - private BigDecimal quantity; - - @Getter @Setter @NoArgsConstructor @AllArgsConstructor - public static class Key implements Serializable { - private Long recipe; - private String ingredient; - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof Key key)) return false; - return Objects.equals(recipe, key.recipe) - && Objects.equals(ingredient, key.ingredient); - } - - @Override - public int hashCode() { - return Objects.hash(recipe, ingredient); - } - } -} Index: ckend/src/main/java/mk/finki/nutritioneer/domain/Restriction.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/domain/Restriction.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,25 +1,0 @@ -package mk.finki.nutritioneer.domain; - -import jakarta.persistence.*; -import lombok.*; -import org.hibernate.annotations.JdbcTypeCode; -import org.hibernate.type.SqlTypes; - -@Entity -@Table(name = "restriction") -@Getter @Setter @NoArgsConstructor @AllArgsConstructor @Builder -public class Restriction { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") - private Long id; - - @Column(name = "description", nullable = false, unique = true) - private String description; - - @Enumerated(EnumType.STRING) - @JdbcTypeCode(SqlTypes.NAMED_ENUM) - @Column(name = "type", nullable = false, columnDefinition = "restriction_type") - private RestrictionType type; -} Index: ckend/src/main/java/mk/finki/nutritioneer/domain/RestrictionType.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/domain/RestrictionType.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,6 +1,0 @@ -package mk.finki.nutritioneer.domain; - -public enum RestrictionType { - vegan, vegetarian, halal, kosher, pescatarian, allergen, keto, - paleo, gluten_free, lactose_free, diabetic, low_sodium, other -} Index: ckend/src/main/java/mk/finki/nutritioneer/domain/UserRole.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/domain/UserRole.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,12 +1,0 @@ -package mk.finki.nutritioneer.domain; - - -public enum UserRole { - user, - administrator, - trainer; - - public String authority() { - return "ROLE_" + name().toUpperCase(); - } -} Index: ckend/src/main/java/mk/finki/nutritioneer/exception/ApiException.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/exception/ApiException.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,34 +1,0 @@ -package mk.finki.nutritioneer.exception; - -import org.springframework.http.HttpStatus; - -/** Carries the HTTP status the client should see, so services stay web-agnostic. */ -public class ApiException extends RuntimeException { - - private final HttpStatus status; - - public ApiException(HttpStatus status, String message) { - super(message); - this.status = status; - } - - public HttpStatus getStatus() { - return status; - } - - public static ApiException notFound(String what) { - return new ApiException(HttpStatus.NOT_FOUND, what + " not found"); - } - - public static ApiException conflict(String message) { - return new ApiException(HttpStatus.CONFLICT, message); - } - - public static ApiException forbidden(String message) { - return new ApiException(HttpStatus.FORBIDDEN, message); - } - - public static ApiException badRequest(String message) { - return new ApiException(HttpStatus.BAD_REQUEST, message); - } -} Index: ckend/src/main/java/mk/finki/nutritioneer/exception/ApiExceptionHandler.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/exception/ApiExceptionHandler.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,89 +1,0 @@ -package mk.finki.nutritioneer.exception; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.dao.DataIntegrityViolationException; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.security.authentication.BadCredentialsException; -import org.springframework.web.bind.MethodArgumentNotValidException; -import org.springframework.web.bind.annotation.ExceptionHandler; -import org.springframework.web.bind.annotation.RestControllerAdvice; - -import java.time.Instant; -import java.util.HashMap; -import java.util.Map; - -/** - * Turns exceptions into a single JSON shape. Database constraint violations are - * translated rather than leaked: every CHECK and UNIQUE in the DDL is a business - * rule, so a violation is a 409 with a readable message, not a 500. - */ -@Slf4j -@RestControllerAdvice -public class ApiExceptionHandler { - - @ExceptionHandler(ApiException.class) - public ResponseEntity> handleApi(ApiException ex) { - return build(ex.getStatus(), ex.getMessage()); - } - - @ExceptionHandler(BadCredentialsException.class) - public ResponseEntity> handleBadCredentials(BadCredentialsException ex) { - return build(HttpStatus.UNAUTHORIZED, "Invalid email or password"); - } - - @ExceptionHandler(MethodArgumentNotValidException.class) - public ResponseEntity> handleValidation(MethodArgumentNotValidException ex) { - Map body = base(HttpStatus.BAD_REQUEST, "Validation failed"); - Map fields = new HashMap<>(); - ex.getBindingResult().getFieldErrors() - .forEach(e -> fields.put(e.getField(), e.getDefaultMessage())); - body.put("fields", fields); - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(body); - } - - @ExceptionHandler(DataIntegrityViolationException.class) - public ResponseEntity> handleConstraint(DataIntegrityViolationException ex) { - String raw = ex.getMostSpecificCause().getMessage(); - return build(HttpStatus.CONFLICT, translate(raw)); - } - - private String translate(String raw) { - if (raw == null) { - return "The request violates a database constraint"; - } - if (raw.contains("uq_post_recipe")) { - return "This recipe has already been shared as a post"; - } - if (raw.contains("uq_user_username")) { - return "That username is already taken"; - } - if (raw.contains("uq_biometrics_user_date")) { - return "A measurement for that date already exists"; - } - if (raw.contains("uq_nutrient_description")) { - return "That nutrient already exists in the catalogue"; - } - if (raw.contains("ck_recipe_servings")) { - return "Servings must be greater than zero"; - } - if (raw.contains("ck_user_email_format")) { - return "That email address is not valid"; - } - log.warn("Unmapped constraint violation: {}", raw); - return "The request violates a database constraint"; - } - - private ResponseEntity> build(HttpStatus status, String message) { - return ResponseEntity.status(status).body(base(status, message)); - } - - private Map base(HttpStatus status, String message) { - Map body = new HashMap<>(); - body.put("timestamp", Instant.now().toString()); - body.put("status", status.value()); - body.put("error", status.getReasonPhrase()); - body.put("message", message); - return body; - } -} Index: ckend/src/main/java/mk/finki/nutritioneer/repo/AppUserRepository.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/repo/AppUserRepository.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,13 +1,0 @@ -package mk.finki.nutritioneer.repo; - -import mk.finki.nutritioneer.domain.AppUser; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.Optional; - -public interface AppUserRepository extends JpaRepository { - - Optional findByUsername(String username); - - boolean existsByUsername(String username); -} Index: ckend/src/main/java/mk/finki/nutritioneer/repo/BiometricsRepository.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/repo/BiometricsRepository.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,15 +1,0 @@ -package mk.finki.nutritioneer.repo; - -import mk.finki.nutritioneer.domain.Biometrics; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.time.LocalDate; -import java.util.List; -import java.util.Optional; - -public interface BiometricsRepository extends JpaRepository { - - List findByOwnerEmailOrderByDate(String email); - - Optional findByOwnerEmailAndDate(String email, LocalDate date); -} Index: ckend/src/main/java/mk/finki/nutritioneer/repo/CommentRepository.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/repo/CommentRepository.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,10 +1,0 @@ -package mk.finki.nutritioneer.repo; - -import mk.finki.nutritioneer.domain.Comment; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; - -public interface CommentRepository extends JpaRepository { - List findByPostIdOrderByCreatedAt(Long postId); -} Index: ckend/src/main/java/mk/finki/nutritioneer/repo/GroceryListRepository.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/repo/GroceryListRepository.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,60 +1,0 @@ -package mk.finki.nutritioneer.repo; - -import mk.finki.nutritioneer.domain.GroceryList; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - -import java.util.List; - -public interface GroceryListRepository extends JpaRepository { - - List findByOwnerEmailOrderByDateTimeDesc(String email); - - /** bulk-added recipes plus individually added items. */ - @Modifying(clearAutomatically = true, flushAutomatically = true) - @Query(value = """ - UPDATE grocery_list g - SET kcal = ROUND( - COALESCE((SELECT SUM(r.kcal_sum) - FROM grocery_list_bulk_add_ingredient b - JOIN recipe r ON r.id = b.recipe_id - WHERE b.list_id = g.id), 0) - + COALESCE((SELECT SUM(i.kcal * s.buy_quantity / 100.0) - FROM grocery_list_single_add_ingredient s - JOIN ingredient i ON i.name = s.ingredient_name - WHERE s.list_id = g.id), 0) - , 2) - WHERE g.id = :listId - """, nativeQuery = true) - void recalculateKcal(@Param("listId") Long listId); - - /** - * The consolidated shopping list: everything pulled in through a recipe, - * unioned with everything added by hand, summed per ingredient. - */ - @Query(value = """ - SELECT i.type::text AS "type", i.name AS "name", SUM(x.quantity) AS "totalGrams" - FROM ( - SELECT rci.ingredient_name AS name, rci.ingredient_quantity AS quantity - FROM grocery_list_bulk_add_ingredient b - JOIN recipe_contains_ingredient rci ON rci.recipe_id = b.recipe_id - WHERE b.list_id = :listId - UNION ALL - SELECT s.ingredient_name, s.buy_quantity - FROM grocery_list_single_add_ingredient s - WHERE s.list_id = :listId - ) AS x - JOIN ingredient i ON i.name = x.name - GROUP BY i.type, i.name - ORDER BY i.type, i.name - """, nativeQuery = true) - List consolidate(@Param("listId") Long listId); - - interface ShoppingRow { - String getType(); - String getName(); - java.math.BigDecimal getTotalGrams(); - } -} Index: ckend/src/main/java/mk/finki/nutritioneer/repo/IngredientRepository.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/repo/IngredientRepository.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,14 +1,0 @@ -package mk.finki.nutritioneer.repo; - -import mk.finki.nutritioneer.domain.Ingredient; -import mk.finki.nutritioneer.domain.IngredientType; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; - -public interface IngredientRepository extends JpaRepository { - - List findByNameContainingIgnoreCaseOrderByName(String fragment); - - List findByTypeOrderByName(IngredientType type); -} Index: ckend/src/main/java/mk/finki/nutritioneer/repo/IntakePlannerRepository.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/repo/IntakePlannerRepository.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,91 +1,0 @@ -package mk.finki.nutritioneer.repo; - -import mk.finki.nutritioneer.domain.IntakePlanner; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.List; - -public interface IntakePlannerRepository extends JpaRepository { - - List findByOwnerEmailOrderByDateTimeDesc(String email); - - List findByOwnerEmailAndDateTimeBetweenOrderByDateTime( - String email, LocalDateTime from, LocalDateTime to); - - /** - * one portion of every attached meal. - * COALESCE - an entry with no attached post would otherwise - * write NULL into a NOT NULL column. - */ - @Modifying(clearAutomatically = true, flushAutomatically = true) - @Query(value = """ - UPDATE intake_planner ip - SET kcal = ROUND(COALESCE(( - SELECT SUM(r.kcal_sum / r.servings) - FROM intake_planner_save_to_list_post sp - JOIN post p ON p.id = sp.post_id - JOIN recipe r ON r.id = p.recipe_id - WHERE sp.planner_id = ip.id - ), 0), 2) - WHERE ip.id = :plannerId - """, nativeQuery = true) - void recalculateKcal(@Param("plannerId") Long plannerId); - - /** daily totals for a client over a period. */ - @Query(value = """ - SELECT ip.date_time::date AS "day", - ROUND(SUM(ip.kcal)) AS "kcalConsumed", - COUNT(*) AS "mealsLogged" - FROM intake_planner ip - WHERE ip.user_email = :email - AND ip.is_consumed = TRUE - AND ip.date_time >= :from - AND ip.date_time < :to - GROUP BY 1 - ORDER BY 1 - """, nativeQuery = true) - List dailyIntake(@Param("email") String email, - @Param("from") LocalDateTime from, - @Param("to") LocalDateTime to); - - /** macronutrients supplied by the meals logged in a period. */ - @Query(value = """ - SELECT n.description AS "nutrient", - n.unit::text AS "unit", - ROUND(SUM(icn.quantity * rci.ingredient_quantity / 100.0 / r.servings), 1) AS "total" - FROM intake_planner ip - JOIN intake_planner_save_to_list_post sp ON sp.planner_id = ip.id - JOIN post p ON p.id = sp.post_id - JOIN recipe r ON r.id = p.recipe_id - JOIN recipe_contains_ingredient rci ON rci.recipe_id = r.id - JOIN ingredient_contains_nutrient icn ON icn.ingredient_name = rci.ingredient_name - JOIN nutrient n ON n.id = icn.nutrient_id - WHERE ip.user_email = :email - AND ip.is_consumed = TRUE - AND n.type = 'macro' - AND ip.date_time >= :from - AND ip.date_time < :to - GROUP BY n.description, n.unit - ORDER BY n.description - """, nativeQuery = true) - List macroTotals(@Param("email") String email, - @Param("from") LocalDateTime from, - @Param("to") LocalDateTime to); - - interface DailyIntakeRow { - LocalDate getDay(); - java.math.BigDecimal getKcalConsumed(); - Long getMealsLogged(); - } - - interface NutrientTotalRow { - String getNutrient(); - String getUnit(); - java.math.BigDecimal getTotal(); - } -} Index: ckend/src/main/java/mk/finki/nutritioneer/repo/NutrientRepository.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/repo/NutrientRepository.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,10 +1,0 @@ -package mk.finki.nutritioneer.repo; - -import mk.finki.nutritioneer.domain.Nutrient; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.Optional; - -public interface NutrientRepository extends JpaRepository { - Optional findByDescription(String description); -} Index: ckend/src/main/java/mk/finki/nutritioneer/repo/PostRepository.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/repo/PostRepository.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,50 +1,0 @@ -package mk.finki.nutritioneer.repo; - -import mk.finki.nutritioneer.domain.Post; -import mk.finki.nutritioneer.domain.PostStatus; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - -import java.util.List; -import java.util.Optional; - -public interface PostRepository extends JpaRepository { - - Page findByStatusAndIsPrivateFalseOrderByCreatedAtDesc(PostStatus status, - Pageable pageable); - - List findByAuthorEmailOrderByCreatedAtDesc(String email); - - Optional findByRecipeId(Long recipeId); - - boolean existsByRecipeId(Long recipeId); - - /** - * the feed filtered by a dietary restriction type, with - * recipes carrying an unwanted allergen excluded. Native, because the pair - * of correlated EXISTS clauses over a link table is far clearer in SQL - * than in JPQL - and this is the exact statement verified against the - * seed data. - */ - @Query(value = """ - SELECT p.* - FROM post p - JOIN recipe r ON r.id = p.recipe_id - WHERE p.status = 'published' - AND p.is_private = FALSE - AND EXISTS ( - SELECT 1 FROM recipe_contains_restriction rcr - JOIN restriction res ON res.id = rcr.restriction_id - WHERE rcr.recipe_id = r.id AND res.type::text = :type) - AND NOT EXISTS ( - SELECT 1 FROM recipe_contains_restriction rcr - JOIN restriction res ON res.id = rcr.restriction_id - WHERE rcr.recipe_id = r.id AND res.description IN (:avoid)) - ORDER BY r.kcal_sum / r.servings - """, nativeQuery = true) - List feedByRestriction(@Param("type") String type, - @Param("avoid") List avoid); -} Index: ckend/src/main/java/mk/finki/nutritioneer/repo/RecipeIngredientRepository.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/repo/RecipeIngredientRepository.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,14 +1,0 @@ -package mk.finki.nutritioneer.repo; - -import mk.finki.nutritioneer.domain.RecipeIngredient; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; - -public interface RecipeIngredientRepository - extends JpaRepository { - - List findByRecipeId(Long recipeId); - - void deleteByRecipeId(Long recipeId); -} Index: ckend/src/main/java/mk/finki/nutritioneer/repo/RecipeRepository.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/repo/RecipeRepository.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,61 +1,0 @@ -package mk.finki.nutritioneer.repo; - -import mk.finki.nutritioneer.domain.Recipe; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - -import java.util.List; - -public interface RecipeRepository extends JpaRepository { - - List findByOwnerEmailOrderByNameAsc(String email); - - List findByNameContainingIgnoreCaseOrderByNameAsc(String fragment); - - /** - * Refreshes the derived column recipe.kcal_sum from the ingredient rows. - * keeping the calculation in one place means a recipe edited through the API - * and a recipe loaded from the seed file are computed identically. - */ - @Modifying(clearAutomatically = true, flushAutomatically = true) - @Query(value = """ - UPDATE recipe r - SET kcal_sum = ROUND(COALESCE(( - SELECT SUM(i.kcal * rci.ingredient_quantity / 100.0) - FROM recipe_contains_ingredient rci - JOIN ingredient i ON i.name = rci.ingredient_name - WHERE rci.recipe_id = r.id - ), 0), 2) - WHERE r.id = :recipeId - """, nativeQuery = true) - void recalculateKcalSum(@Param("recipeId") Long recipeId); - - /** rank recipes by how much of a nutrient they deliver per 100 kcal. */ - @Query(value = """ - SELECT r.name AS "name", - ROUND(r.kcal_sum / r.servings) AS "kcalPerServing", - ROUND(SUM(icn.quantity * rci.ingredient_quantity / 100.0) - / r.servings, 1) AS "amountPerServing", - ROUND(SUM(icn.quantity * rci.ingredient_quantity / 100.0) - / NULLIF(r.kcal_sum, 0) * 100, 2) AS "amountPer100Kcal" - FROM recipe r - JOIN recipe_contains_ingredient rci ON rci.recipe_id = r.id - JOIN ingredient_contains_nutrient icn ON icn.ingredient_name = rci.ingredient_name - JOIN nutrient n ON n.id = icn.nutrient_id - WHERE n.description = :nutrient - GROUP BY r.id, r.name, r.kcal_sum, r.servings - ORDER BY "amountPer100Kcal" DESC - LIMIT :limit - """, nativeQuery = true) - List rankByNutrientDensity(@Param("nutrient") String nutrient, - @Param("limit") int limit); - - interface NutrientDensityRow { - String getName(); - java.math.BigDecimal getKcalPerServing(); - java.math.BigDecimal getAmountPerServing(); - java.math.BigDecimal getAmountPer100Kcal(); - } -} Index: ckend/src/main/java/mk/finki/nutritioneer/repo/RestrictionRepository.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/repo/RestrictionRepository.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,11 +1,0 @@ -package mk.finki.nutritioneer.repo; - -import mk.finki.nutritioneer.domain.Restriction; -import mk.finki.nutritioneer.domain.RestrictionType; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; - -public interface RestrictionRepository extends JpaRepository { - List findByType(RestrictionType type); -} Index: ckend/src/main/java/mk/finki/nutritioneer/security/AppUserDetailsService.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/security/AppUserDetailsService.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,31 +1,0 @@ -package mk.finki.nutritioneer.security; - -import lombok.RequiredArgsConstructor; -import mk.finki.nutritioneer.domain.AppUser; -import mk.finki.nutritioneer.repo.AppUserRepository; -import org.springframework.security.core.authority.SimpleGrantedAuthority; -import org.springframework.security.core.userdetails.User; -import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.core.userdetails.UserDetailsService; -import org.springframework.security.core.userdetails.UsernameNotFoundException; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -@RequiredArgsConstructor -public class AppUserDetailsService implements UserDetailsService { - - private final AppUserRepository users; - - @Override - public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException { - AppUser user = users.findById(email) - .orElseThrow(() -> new UsernameNotFoundException("No account for " + email)); - - return new User( - user.getEmail(), - user.getPassword(), - List.of(new SimpleGrantedAuthority(user.getRole().authority()))); - } -} Index: ckend/src/main/java/mk/finki/nutritioneer/security/JwtAuthenticationFilter.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/security/JwtAuthenticationFilter.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,48 +1,0 @@ -package mk.finki.nutritioneer.security; - -import jakarta.servlet.FilterChain; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import lombok.RequiredArgsConstructor; -import org.springframework.lang.NonNull; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.web.authentication.WebAuthenticationDetailsSource; -import org.springframework.stereotype.Component; -import org.springframework.web.filter.OncePerRequestFilter; - -import java.io.IOException; - -@Component -@RequiredArgsConstructor -public class JwtAuthenticationFilter extends OncePerRequestFilter { - - private final JwtService jwt; - private final AppUserDetailsService userDetailsService; - - @Override - protected void doFilterInternal(@NonNull HttpServletRequest request, - @NonNull HttpServletResponse response, - @NonNull FilterChain chain) - throws ServletException, IOException { - - String header = request.getHeader("Authorization"); - if (header == null || !header.startsWith("Bearer ")) { - chain.doFilter(request, response); - return; - } - - String token = header.substring(7); - if (jwt.isValid(token) && SecurityContextHolder.getContext().getAuthentication() == null) { - UserDetails details = userDetailsService.loadUserByUsername(jwt.extractEmail(token)); - var authentication = new UsernamePasswordAuthenticationToken( - details, null, details.getAuthorities()); - authentication.setDetails(new WebAuthenticationDetailsSource().buildDetails(request)); - SecurityContextHolder.getContext().setAuthentication(authentication); - } - - chain.doFilter(request, response); - } -} Index: ckend/src/main/java/mk/finki/nutritioneer/security/JwtService.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/security/JwtService.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,62 +1,0 @@ -package mk.finki.nutritioneer.security; - -import io.jsonwebtoken.Claims; -import io.jsonwebtoken.Jwts; -import io.jsonwebtoken.security.Keys; -import mk.finki.nutritioneer.domain.AppUser; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; - -import javax.crypto.SecretKey; -import java.nio.charset.StandardCharsets; -import java.util.Date; - -@Service -public class JwtService { - - private final SecretKey key; - private final long expirationMillis; - - public JwtService(@Value("${app.jwt.secret}") String secret, - @Value("${app.jwt.expiration-minutes}") long expirationMinutes) { - this.key = Keys.hmacShaKeyFor(secret.getBytes(StandardCharsets.UTF_8)); - this.expirationMillis = expirationMinutes * 60_000; - } - - public String issue(AppUser user) { - Date now = new Date(); - return Jwts.builder() - .subject(user.getEmail()) - .claim("username", user.getUsername()) - .claim("role", user.getRole().name()) - .issuedAt(now) - .expiration(new Date(now.getTime() + expirationMillis)) - .signWith(key) - .compact(); - } - - public String extractEmail(String token) { - return parse(token).getSubject(); - } - - public boolean isValid(String token) { - try { - parse(token); - return true; - } catch (Exception e) { - return false; - } - } - - private Claims parse(String token) { - return Jwts.parser() - .verifyWith(key) - .build() - .parseSignedClaims(token) - .getPayload(); - } - - public long getExpirationMillis() { - return expirationMillis; - } -} Index: ckend/src/main/java/mk/finki/nutritioneer/service/AdminService.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/service/AdminService.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,49 +1,0 @@ -package mk.finki.nutritioneer.service; - -import lombok.RequiredArgsConstructor; -import mk.finki.nutritioneer.domain.AppUser; -import mk.finki.nutritioneer.domain.UserRole; -import mk.finki.nutritioneer.exception.ApiException; -import mk.finki.nutritioneer.repo.AppUserRepository; -import mk.finki.nutritioneer.repo.PostRepository; -import mk.finki.nutritioneer.repo.RecipeRepository; -import mk.finki.nutritioneer.web.dto.AdminDtos.AccountView; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - -@Service -@RequiredArgsConstructor -public class AdminService { - - private final AppUserRepository users; - private final RecipeRepository recipes; - private final PostRepository posts; - private final CurrentUser currentUser; - - @Transactional(readOnly = true) - public List accounts() { - return users.findAll().stream() - .map(u -> new AccountView( - u.getEmail(), - u.getUsername(), - u.getRole(), - recipes.findByOwnerEmailOrderByNameAsc(u.getEmail()).size(), - posts.findByAuthorEmailOrderByCreatedAtDesc(u.getEmail()).size())) - .toList(); - } - - @Transactional - public AccountView changeRole(String email, UserRole role) { - if (email.equals(currentUser.email())) { - throw ApiException.badRequest("You cannot change your own role"); - } - AppUser user = users.findById(email) - .orElseThrow(() -> ApiException.notFound("Account")); - user.setRole(role); - return new AccountView(user.getEmail(), user.getUsername(), role, - recipes.findByOwnerEmailOrderByNameAsc(email).size(), - posts.findByAuthorEmailOrderByCreatedAtDesc(email).size()); - } -} Index: ckend/src/main/java/mk/finki/nutritioneer/service/AuthService.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/service/AuthService.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,64 +1,0 @@ -package mk.finki.nutritioneer.service; - -import lombok.RequiredArgsConstructor; -import mk.finki.nutritioneer.domain.AppUser; -import mk.finki.nutritioneer.domain.UserRole; -import mk.finki.nutritioneer.exception.ApiException; -import mk.finki.nutritioneer.repo.AppUserRepository; -import mk.finki.nutritioneer.security.JwtService; -import mk.finki.nutritioneer.web.dto.AuthDtos.*; -import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.crypto.password.PasswordEncoder; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -@Service -@RequiredArgsConstructor -public class AuthService { - - private final AppUserRepository users; - private final PasswordEncoder encoder; - private final JwtService jwt; - private final AuthenticationManager authenticationManager; - - @Transactional - public TokenResponse register(RegisterRequest request) { - if (users.existsById(request.email())) { - throw ApiException.conflict("An account with that email already exists"); - } - if (users.existsByUsername(request.username())) { - throw ApiException.conflict("That username is already taken"); - } - - AppUser user = AppUser.builder() - .email(request.email()) - .username(request.username()) - .password(encoder.encode(request.password())) - .role(UserRole.user) // self-registration never grants a privileged role - .build(); - - users.save(user); - return token(user); - } - - public TokenResponse login(LoginRequest request) { - // BadCredentialsException - 401 handler. - authenticationManager.authenticate( - new UsernamePasswordAuthenticationToken(request.email(), request.password())); - - AppUser user = users.findById(request.email()) - .orElseThrow(() -> ApiException.notFound("Account")); - return token(user); - } - - private TokenResponse token(AppUser user) { - return new TokenResponse( - jwt.issue(user), - "Bearer", - jwt.getExpirationMillis(), - user.getEmail(), - user.getUsername(), - user.getRole().name()); - } -} Index: ckend/src/main/java/mk/finki/nutritioneer/service/BiometricsService.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/service/BiometricsService.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,72 +1,0 @@ -package mk.finki.nutritioneer.service; - -import lombok.RequiredArgsConstructor; -import mk.finki.nutritioneer.domain.Biometrics; -import mk.finki.nutritioneer.exception.ApiException; -import mk.finki.nutritioneer.repo.BiometricsRepository; -import mk.finki.nutritioneer.web.dto.BiometricsDtos.*; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; - -@Service -@RequiredArgsConstructor -public class BiometricsService { - - private final BiometricsRepository biometrics; - private final CurrentUser currentUser; - - @Transactional - public MeasurementView record(RecordRequest request) { - String email = currentUser.email(); - - // uq_biometrics_user_date allows one measurement per day, so a second - // entry for the same date updates the first rather than failing. - Biometrics entry = biometrics.findByOwnerEmailAndDate(email, request.date()) - .orElseGet(() -> Biometrics.builder() - .owner(currentUser.get()) - .date(request.date()) - .build()); - - entry.setWeight(request.weight()); - entry.setHeight(request.height()); - entry.setAge(request.age()); - entry.setMuscleFatRatio(request.muscleFatRatio()); - - Biometrics saved = biometrics.save(entry); - return new MeasurementView(saved.getId(), saved.getDate(), saved.getWeight(), - saved.getHeight(), saved.getMuscleFatRatio(), saved.getBmi(), null); - } - - @Transactional(readOnly = true) - public List history(String email) { - List rows = biometrics.findByOwnerEmailOrderByDate(email); - List out = new ArrayList<>(rows.size()); - - BigDecimal previousWeight = null; - for (Biometrics b : rows) { - BigDecimal change = (previousWeight == null || b.getWeight() == null) - ? null - : b.getWeight().subtract(previousWeight); - out.add(new MeasurementView(b.getId(), b.getDate(), b.getWeight(), - b.getHeight(), b.getMuscleFatRatio(), b.getBmi(), change)); - if (b.getWeight() != null) { - previousWeight = b.getWeight(); - } - } - return out; - } - - @Transactional - public void delete(Long id) { - Biometrics entry = biometrics.findById(id) - .orElseThrow(() -> ApiException.notFound("Measurement")); - if (!entry.getOwner().getEmail().equals(currentUser.email())) { - throw ApiException.forbidden("You can only delete your own measurements"); - } - biometrics.delete(entry); - } -} Index: ckend/src/main/java/mk/finki/nutritioneer/service/CatalogService.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/service/CatalogService.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,59 +1,0 @@ -package mk.finki.nutritioneer.service; - -import lombok.RequiredArgsConstructor; -import mk.finki.nutritioneer.domain.*; -import mk.finki.nutritioneer.exception.ApiException; -import mk.finki.nutritioneer.repo.*; -import mk.finki.nutritioneer.web.dto.AdminDtos.*; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - -@Service -@RequiredArgsConstructor -public class CatalogService { - - private final IngredientRepository ingredients; - private final NutrientRepository nutrients; - private final RestrictionRepository restrictions; - - public List searchIngredients(String query) { - if (query == null || query.isBlank()) { - return ingredients.findAll(org.springframework.data.domain.Sort.by("name")); - } - return ingredients.findByNameContainingIgnoreCaseOrderByName(query); - } - - public List allNutrients() { - return nutrients.findAll(); - } - - public List allRestrictions() { - return restrictions.findAll(); - } - - @Transactional - public Ingredient createIngredient(CreateIngredientRequest request) { - if (ingredients.existsById(request.name())) { - throw ApiException.conflict("An ingredient with that name already exists"); - } - return ingredients.save(Ingredient.builder() - .name(request.name()) - .description(request.description()) - .energy(request.energy()) - .kcal(request.kcal()) - .type(request.type()) - .build()); - } - - @Transactional - public Nutrient createNutrient(CreateNutrientRequest request) { - return nutrients.save(Nutrient.builder() - .description(request.description()) - .quantity(request.quantity()) - .unit(request.unit()) - .type(request.type()) - .build()); - } -} Index: ckend/src/main/java/mk/finki/nutritioneer/service/CurrentUser.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/service/CurrentUser.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,29 +1,0 @@ -package mk.finki.nutritioneer.service; - -import lombok.RequiredArgsConstructor; -import mk.finki.nutritioneer.domain.AppUser; -import mk.finki.nutritioneer.exception.ApiException; -import mk.finki.nutritioneer.repo.AppUserRepository; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.stereotype.Component; - - -@Component -@RequiredArgsConstructor -public class CurrentUser { - - private final AppUserRepository users; - - public String email() { - var authentication = SecurityContextHolder.getContext().getAuthentication(); - if (authentication == null || !authentication.isAuthenticated()) { - throw ApiException.forbidden("Not authenticated"); - } - return authentication.getName(); - } - - public AppUser get() { - return users.findById(email()) - .orElseThrow(() -> ApiException.notFound("Account")); - } -} Index: ckend/src/main/java/mk/finki/nutritioneer/service/GroceryService.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/service/GroceryService.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,100 +1,0 @@ -package mk.finki.nutritioneer.service; - -import lombok.RequiredArgsConstructor; -import mk.finki.nutritioneer.domain.GroceryItem; -import mk.finki.nutritioneer.domain.GroceryList; -import mk.finki.nutritioneer.domain.Ingredient; -import mk.finki.nutritioneer.domain.Recipe; -import mk.finki.nutritioneer.exception.ApiException; -import mk.finki.nutritioneer.repo.GroceryListRepository; -import mk.finki.nutritioneer.repo.IngredientRepository; -import mk.finki.nutritioneer.repo.RecipeRepository; -import mk.finki.nutritioneer.web.dto.GroceryDtos.*; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; - -@Service -@RequiredArgsConstructor -public class GroceryService { - - private final GroceryListRepository lists; - private final RecipeRepository recipes; - private final IngredientRepository ingredients; - private final CurrentUser currentUser; - - @Transactional - public ListView create(CreateListRequest request) { - GroceryList list = GroceryList.builder() - .owner(currentUser.get()) - .dateTime(request.dateTime() == null ? LocalDateTime.now() : request.dateTime()) - .notes(request.notes()) - .isBought(false) - .kcal(BigDecimal.ZERO) - .build(); - - if (request.bulkRecipeIds() != null && !request.bulkRecipeIds().isEmpty()) { - Set bulk = new LinkedHashSet<>(recipes.findAllById(request.bulkRecipeIds())); - list.setBulkRecipes(bulk); - } - - if (request.singleItems() != null) { - for (SingleItem item : request.singleItems()) { - Ingredient ingredient = ingredients.findById(item.ingredientName()) - .orElseThrow(() -> ApiException.badRequest( - "Unknown ingredient: " + item.ingredientName())); - list.getSingleItems().add(GroceryItem.builder() - .list(list) - .ingredient(ingredient) - .buyQuantity(item.buyQuantity()) - .build()); - } - } - - GroceryList saved = lists.save(list); - lists.recalculateKcal(saved.getId()); - - return view(lists.findById(saved.getId()).orElseThrow()); - } - - @Transactional(readOnly = true) - public List mine() { - return lists.findByOwnerEmailOrderByDateTimeDesc(currentUser.email()) - .stream().map(this::view).toList(); - } - - @Transactional(readOnly = true) - public ListView get(Long id) { - return view(ownedList(id)); - } - - @Transactional - public void markBought(Long id, boolean bought) { - ownedList(id).setBought(bought); - } - - private GroceryList ownedList(Long id) { - GroceryList list = lists.findById(id) - .orElseThrow(() -> ApiException.notFound("Grocery list")); - if (!list.getOwner().getEmail().equals(currentUser.email())) { - throw ApiException.forbidden("You can only open your own lists"); - } - return list; - } - - private ListView view(GroceryList l) { - List lines = lists.consolidate(l.getId()).stream() - .map(r -> new ShoppingLine(r.getType(), r.getName(), r.getTotalGrams())) - .toList(); - - List bulk = l.getBulkRecipes().stream().map(Recipe::getName).toList(); - - return new ListView(l.getId(), l.getDateTime(), l.getNotes(), l.isBought(), - l.getKcal(), bulk, lines); - } -} Index: ckend/src/main/java/mk/finki/nutritioneer/service/PlannerService.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/service/PlannerService.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,98 +1,0 @@ -package mk.finki.nutritioneer.service; - -import lombok.RequiredArgsConstructor; -import mk.finki.nutritioneer.domain.IntakePlanner; -import mk.finki.nutritioneer.domain.Post; -import mk.finki.nutritioneer.exception.ApiException; -import mk.finki.nutritioneer.repo.IntakePlannerRepository; -import mk.finki.nutritioneer.repo.PostRepository; -import mk.finki.nutritioneer.web.dto.PlannerDtos.*; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.math.BigDecimal; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; - -@Service -@RequiredArgsConstructor -public class PlannerService { - - private final IntakePlannerRepository planner; - private final PostRepository posts; - private final CurrentUser currentUser; - - @Transactional - public PlannerEntryView log(LogMealRequest request) { - boolean hasMeals = request.postIds() != null && !request.postIds().isEmpty(); - - IntakePlanner entry = IntakePlanner.builder() - .owner(currentUser.get()) - .dateTime(request.dateTime() == null ? LocalDateTime.now() : request.dateTime()) - .notes(request.notes()) - .isConsumed(request.consumed()) - // An entry with no attached meal keeps whatever the user typed; - // one with meals has its energy derived and the manual figure ignored. - .kcal(hasMeals || request.manualKcal() == null - ? BigDecimal.ZERO - : request.manualKcal()) - .build(); - - if (hasMeals) { - Set meals = new LinkedHashSet<>(posts.findAllById(request.postIds())); - if (meals.size() != request.postIds().size()) { - throw ApiException.badRequest("One or more of the selected meals does not exist"); - } - entry.setSavedPosts(meals); - } - - IntakePlanner saved = planner.save(entry); - - if (hasMeals) { - planner.recalculateKcal(saved.getId()); - } - - return view(planner.findById(saved.getId()).orElseThrow()); - } - - @Transactional(readOnly = true) - public List mine() { - return planner.findByOwnerEmailOrderByDateTimeDesc(currentUser.email()) - .stream().map(this::view).toList(); - } - - @Transactional(readOnly = true) - public List dailyTotals(String email, LocalDate from, LocalDate to) { - return planner.dailyIntake(email, from.atStartOfDay(), to.atStartOfDay()).stream() - .map(r -> new DailyTotalView(r.getDay(), r.getKcalConsumed(), r.getMealsLogged())) - .toList(); - } - - @Transactional(readOnly = true) - public List macroTotals(String email, LocalDate from, LocalDate to) { - return planner.macroTotals(email, from.atStartOfDay(), to.atStartOfDay()).stream() - .map(r -> new NutrientTotalView(r.getNutrient(), r.getUnit(), r.getTotal())) - .toList(); - } - - @Transactional - public void markConsumed(Long id, boolean consumed) { - IntakePlanner entry = planner.findById(id) - .orElseThrow(() -> ApiException.notFound("Planner entry")); - if (!entry.getOwner().getEmail().equals(currentUser.email())) { - throw ApiException.forbidden("You can only change your own planner"); - } - entry.setConsumed(consumed); - } - - private PlannerEntryView view(IntakePlanner e) { - List meals = e.getSavedPosts().stream() - .map(p -> p.getRecipe() == null ? "(photo post)" : p.getRecipe().getName()) - .toList(); - return new PlannerEntryView(e.getId(), e.getDateTime(), e.getNotes(), - e.getKcal(), e.isConsumed(), meals); - } -} Index: ckend/src/main/java/mk/finki/nutritioneer/service/PostService.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/service/PostService.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,128 +1,0 @@ -package mk.finki.nutritioneer.service; - -import lombok.RequiredArgsConstructor; -import mk.finki.nutritioneer.domain.*; -import mk.finki.nutritioneer.exception.ApiException; -import mk.finki.nutritioneer.repo.*; -import mk.finki.nutritioneer.web.dto.PostDtos.*; -import org.springframework.data.domain.PageRequest; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.math.BigDecimal; -import java.util.List; - -@Service -@RequiredArgsConstructor -public class PostService { - - private final PostRepository posts; - private final RecipeRepository recipes; - private final CommentRepository comments; - private final CurrentUser currentUser; - - @Transactional - public PostView share(SharePostRequest request) { - AppUser author = currentUser.get(); - Recipe recipe = recipes.findById(request.recipeId()) - .orElseThrow(() -> ApiException.notFound("Recipe")); - - if (!recipe.getOwner().getEmail().equals(author.getEmail())) { - throw ApiException.forbidden("You can only share your own recipes"); - } - // uq_post_recipe would reject this anyway; checking first gives a clearer message. - if (posts.existsByRecipeId(recipe.getId())) { - throw ApiException.conflict("This recipe has already been shared as a post"); - } - - Post post = Post.builder() - .recipe(recipe) - .author(author) - .isPrivate(request.isPrivate()) - .isFavourite(request.isFavourite()) - .status(request.status() == null - ? PostStatus.published - : PostStatus.valueOf(request.status())) - .build(); - - return view(posts.save(post)); - } - - @Transactional(readOnly = true) - public List feed(int page, int size) { - return posts.findByStatusAndIsPrivateFalseOrderByCreatedAtDesc( - PostStatus.published, PageRequest.of(page, size)) - .map(this::view) - .getContent(); - } - - @Transactional(readOnly = true) - public List mine() { - return posts.findByAuthorEmailOrderByCreatedAtDesc(currentUser.email()) - .stream().map(this::view).toList(); - } - - /** UseCase3003 - the feed filtered by dietary restriction. */ - @Transactional(readOnly = true) - public List feedByRestriction(RestrictionType type, List avoid) { - List exclusions = (avoid == null || avoid.isEmpty()) - ? List.of("__none__") // IN () is not valid SQL, so pass a value that matches nothing - : avoid; - return posts.feedByRestriction(type.name(), exclusions) - .stream().map(this::view).toList(); - } - - @Transactional - public CommentView comment(Long postId, CommentRequest request) { - Post post = posts.findById(postId) - .orElseThrow(() -> ApiException.notFound("Post")); - - Comment comment = comments.save(Comment.builder() - .post(post) - .author(currentUser.get()) - .description(request.description()) - .build()); - - return new CommentView(comment.getId(), comment.getDescription(), - comment.getAuthor().getUsername(), comment.getCreatedAt()); - } - - @Transactional(readOnly = true) - public List comments(Long postId) { - return comments.findByPostIdOrderByCreatedAt(postId).stream() - .map(c -> new CommentView(c.getId(), c.getDescription(), - c.getAuthor().getUsername(), c.getCreatedAt())) - .toList(); - } - - /** UseCase2003 - moderation. Archiving keeps the post for its author. */ - @Transactional - public void setStatus(Long postId, PostStatus status) { - Post post = posts.findById(postId) - .orElseThrow(() -> ApiException.notFound("Post")); - post.setStatus(status); - } - - @Transactional - public void deleteComment(Long commentId) { - if (!comments.existsById(commentId)) { - throw ApiException.notFound("Comment"); - } - comments.deleteById(commentId); - } - - private PostView view(Post p) { - Recipe r = p.getRecipe(); - return new PostView( - p.getId(), - r == null ? null : r.getId(), - r == null ? null : r.getName(), - r == null ? BigDecimal.ZERO : r.getKcalPerServing(), - p.getAuthor().getUsername(), - p.getStatus().name(), - p.isPrivate(), - p.isFavourite(), - p.getCreatedAt(), - comments.findByPostIdOrderByCreatedAt(p.getId()).size()); - } -} Index: ckend/src/main/java/mk/finki/nutritioneer/service/RecipeService.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/service/RecipeService.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,129 +1,0 @@ -package mk.finki.nutritioneer.service; - -import lombok.RequiredArgsConstructor; -import mk.finki.nutritioneer.domain.*; -import mk.finki.nutritioneer.exception.ApiException; -import mk.finki.nutritioneer.repo.*; -import mk.finki.nutritioneer.web.dto.RecipeDtos.*; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; - -@Service -@RequiredArgsConstructor -public class RecipeService { - - private static final BigDecimal HUNDRED = BigDecimal.valueOf(100); - - private final RecipeRepository recipes; - private final IngredientRepository ingredients; - private final RestrictionRepository restrictions; - private final CurrentUser currentUser; - - @Transactional - public RecipeView create(CreateRecipeRequest request) { - AppUser owner = currentUser.get(); - - Recipe recipe = Recipe.builder() - .name(request.name()) - .guide(request.guide()) - .servings(request.servings()) - .kcalSum(BigDecimal.ZERO) // derived below, never taken from the client - .owner(owner) - .build(); - - for (IngredientLine line : request.ingredients()) { - Ingredient ingredient = ingredients.findById(line.ingredientName()) - .orElseThrow(() -> ApiException.badRequest( - "Unknown ingredient: " + line.ingredientName())); - - recipe.getIngredients().add(RecipeIngredient.builder() - .recipe(recipe) - .ingredient(ingredient) - .quantity(line.quantity()) - .build()); - } - - if (request.restrictionIds() != null && !request.restrictionIds().isEmpty()) { - Set tags = new LinkedHashSet<>( - restrictions.findAllById(request.restrictionIds())); - recipe.setRestrictions(tags); - } - - Recipe saved = recipes.save(recipe); - - // The energy of the recipe is computed by the database from the rows we - // just wrote, using the same statement as the DML script. - recipes.recalculateKcalSum(saved.getId()); - - return view(recipes.findById(saved.getId()).orElseThrow()); - } - - @Transactional(readOnly = true) - public RecipeView get(Long id) { - return view(recipes.findById(id).orElseThrow(() -> ApiException.notFound("Recipe"))); - } - - @Transactional(readOnly = true) - public List search(String query) { - List found = (query == null || query.isBlank()) - ? recipes.findAll() - : recipes.findByNameContainingIgnoreCaseOrderByNameAsc(query); - return found.stream().map(this::summary).toList(); - } - - @Transactional(readOnly = true) - public List mine() { - return recipes.findByOwnerEmailOrderByNameAsc(currentUser.email()) - .stream().map(this::summary).toList(); - } - - @Transactional - public void delete(Long id) { - Recipe recipe = recipes.findById(id) - .orElseThrow(() -> ApiException.notFound("Recipe")); - if (!recipe.getOwner().getEmail().equals(currentUser.email())) { - throw ApiException.forbidden("You can only delete your own recipes"); - } - recipes.delete(recipe); - } - - /** UseCase3004 - rank recipes by nutrient density. */ - @Transactional(readOnly = true) - public List rankByNutrient(String nutrient, int limit) { - return recipes.rankByNutrientDensity(nutrient, limit).stream() - .map(r -> new NutrientDensityView( - r.getName(), r.getKcalPerServing(), - r.getAmountPerServing(), r.getAmountPer100Kcal())) - .toList(); - } - - private RecipeSummary summary(Recipe r) { - return new RecipeSummary(r.getId(), r.getName(), r.getKcalPerServing(), - r.getOwner().getUsername()); - } - - private RecipeView view(Recipe r) { - List lines = r.getIngredients().stream() - .map(ri -> new IngredientLineView( - ri.getIngredient().getName(), - ri.getQuantity(), - ri.getIngredient().getKcal(), - ri.getIngredient().getKcal() - .multiply(ri.getQuantity()) - .divide(HUNDRED, 2, RoundingMode.HALF_UP))) - .toList(); - - List tags = r.getRestrictions().stream() - .map(Restriction::getDescription) - .toList(); - - return new RecipeView(r.getId(), r.getName(), r.getGuide(), r.getKcalSum(), - r.getServings(), r.getKcalPerServing(), r.getOwner().getUsername(), lines, tags); - } -} Index: ckend/src/main/java/mk/finki/nutritioneer/web/AdminController.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/web/AdminController.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,72 +1,0 @@ -package mk.finki.nutritioneer.web; - -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; -import lombok.RequiredArgsConstructor; -import mk.finki.nutritioneer.domain.Ingredient; -import mk.finki.nutritioneer.domain.Nutrient; -import mk.finki.nutritioneer.domain.PostStatus; -import mk.finki.nutritioneer.service.AdminService; -import mk.finki.nutritioneer.service.CatalogService; -import mk.finki.nutritioneer.service.PostService; -import mk.finki.nutritioneer.web.dto.AdminDtos.*; -import org.springframework.http.HttpStatus; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - - -@RestController -@RequestMapping("/api/admin") -@RequiredArgsConstructor -@PreAuthorize("hasRole('ADMINISTRATOR')") -@Tag(name = "Administration", description = "UseCase2001 - UseCase2004") -public class AdminController { - - private final CatalogService catalog; - private final AdminService admin; - private final PostService posts; - - @PostMapping("/ingredients") - @ResponseStatus(HttpStatus.CREATED) - @Operation(summary = "UseCase2001 - add an ingredient to the catalogue") - public Ingredient addIngredient(@Valid @RequestBody CreateIngredientRequest request) { - return catalog.createIngredient(request); - } - - @PostMapping("/nutrients") - @ResponseStatus(HttpStatus.CREATED) - @Operation(summary = "UseCase2002 - add a nutrient and its reference daily intake") - public Nutrient addNutrient(@Valid @RequestBody CreateNutrientRequest request) { - return catalog.createNutrient(request); - } - - @GetMapping("/accounts") - @Operation(summary = "UseCase2004 - accounts with their role and activity") - public List accounts() { - return admin.accounts(); - } - - @PatchMapping("/accounts/{email}/role") - @Operation(summary = "UseCase2004 - promote or demote an account") - public AccountView changeRole(@PathVariable String email, - @Valid @RequestBody ChangeRoleRequest request) { - return admin.changeRole(email, request.role()); - } - - @PatchMapping("/posts/{id}/status") - @ResponseStatus(HttpStatus.NO_CONTENT) - @Operation(summary = "UseCase2003 - archive a post instead of deleting it") - public void moderatePost(@PathVariable Long id, @RequestParam PostStatus status) { - posts.setStatus(id, status); - } - - @DeleteMapping("/comments/{id}") - @ResponseStatus(HttpStatus.NO_CONTENT) - @Operation(summary = "UseCase2003 - delete an individual comment") - public void deleteComment(@PathVariable Long id) { - posts.deleteComment(id); - } -} Index: ckend/src/main/java/mk/finki/nutritioneer/web/AuthController.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/web/AuthController.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,32 +1,0 @@ -package mk.finki.nutritioneer.web; - -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.security.SecurityRequirements; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; -import lombok.RequiredArgsConstructor; -import mk.finki.nutritioneer.service.AuthService; -import mk.finki.nutritioneer.web.dto.AuthDtos.*; -import org.springframework.web.bind.annotation.*; - -@RestController -@RequestMapping("/api/auth") -@RequiredArgsConstructor -@Tag(name = "Authentication") -@SecurityRequirements -public class AuthController { - - private final AuthService auth; - - @PostMapping("/register") - @Operation(summary = "Create an account and receive a JWT") - public TokenResponse register(@Valid @RequestBody RegisterRequest request) { - return auth.register(request); - } - - @PostMapping("/login") - @Operation(summary = "Exchange email and password for a JWT") - public TokenResponse login(@Valid @RequestBody LoginRequest request) { - return auth.login(request); - } -} Index: ckend/src/main/java/mk/finki/nutritioneer/web/BiometricsController.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/web/BiometricsController.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,43 +1,0 @@ -package mk.finki.nutritioneer.web; - -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; -import lombok.RequiredArgsConstructor; -import mk.finki.nutritioneer.service.BiometricsService; -import mk.finki.nutritioneer.service.CurrentUser; -import mk.finki.nutritioneer.web.dto.BiometricsDtos.*; -import org.springframework.http.HttpStatus; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/api/biometrics") -@RequiredArgsConstructor -@Tag(name = "Biometrics") -public class BiometricsController { - - private final BiometricsService biometrics; - private final CurrentUser currentUser; - - @PostMapping - @ResponseStatus(HttpStatus.CREATED) - @Operation(summary = "Record a measurement; one per day, a repeat updates it") - public MeasurementView record(@Valid @RequestBody RecordRequest request) { - return biometrics.record(request); - } - - @GetMapping - @Operation(summary = "History with BMI and the change since the previous measurement") - public List mine() { - return biometrics.history(currentUser.email()); - } - - @DeleteMapping("/{id}") - @ResponseStatus(HttpStatus.NO_CONTENT) - @Operation(summary = "Delete one of your own measurements") - public void delete(@PathVariable Long id) { - biometrics.delete(id); - } -} Index: ckend/src/main/java/mk/finki/nutritioneer/web/CatalogController.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/web/CatalogController.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,39 +1,0 @@ -package mk.finki.nutritioneer.web; - -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import mk.finki.nutritioneer.domain.Ingredient; -import mk.finki.nutritioneer.domain.Nutrient; -import mk.finki.nutritioneer.domain.Restriction; -import mk.finki.nutritioneer.service.CatalogService; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/api/catalog") -@RequiredArgsConstructor -@Tag(name = "Catalogue") -public class CatalogController { - - private final CatalogService catalog; - - @GetMapping("/ingredients") - @Operation(summary = "Search the ingredient catalogue") - public List ingredients(@RequestParam(required = false) String q) { - return catalog.searchIngredients(q); - } - - @GetMapping("/nutrients") - @Operation(summary = "List nutrients with their reference daily intake") - public List nutrients() { - return catalog.allNutrients(); - } - - @GetMapping("/restrictions") - @Operation(summary = "List dietary restrictions and allergen warnings") - public List restrictions() { - return catalog.allRestrictions(); - } -} Index: ckend/src/main/java/mk/finki/nutritioneer/web/GroceryController.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/web/GroceryController.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,47 +1,0 @@ -package mk.finki.nutritioneer.web; - -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; -import lombok.RequiredArgsConstructor; -import mk.finki.nutritioneer.service.GroceryService; -import mk.finki.nutritioneer.web.dto.GroceryDtos.*; -import org.springframework.http.HttpStatus; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/api/grocery-lists") -@RequiredArgsConstructor -@Tag(name = "Grocery lists", description = "UseCase1003") -public class GroceryController { - - private final GroceryService grocery; - - @PostMapping - @ResponseStatus(HttpStatus.CREATED) - @Operation(summary = "Create a list from whole recipes plus individual items") - public ListView create(@Valid @RequestBody CreateListRequest request) { - return grocery.create(request); - } - - @GetMapping - @Operation(summary = "The signed-in user's lists") - public List mine() { - return grocery.mine(); - } - - @GetMapping("/{id}") - @Operation(summary = "One list with its consolidated shopping lines") - public ListView get(@PathVariable Long id) { - return grocery.get(id); - } - - @PatchMapping("/{id}/bought") - @ResponseStatus(HttpStatus.NO_CONTENT) - @Operation(summary = "Mark the list as bought") - public void markBought(@PathVariable Long id, @RequestParam boolean value) { - grocery.markBought(id, value); - } -} Index: ckend/src/main/java/mk/finki/nutritioneer/web/PlannerController.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/web/PlannerController.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,61 +1,0 @@ -package mk.finki.nutritioneer.web; - -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; -import lombok.RequiredArgsConstructor; -import mk.finki.nutritioneer.service.CurrentUser; -import mk.finki.nutritioneer.service.PlannerService; -import mk.finki.nutritioneer.web.dto.PlannerDtos.*; -import org.springframework.format.annotation.DateTimeFormat; -import org.springframework.http.HttpStatus; -import org.springframework.web.bind.annotation.*; - -import java.time.LocalDate; -import java.util.List; - -@RestController -@RequestMapping("/api/planner") -@RequiredArgsConstructor -@Tag(name = "Intake planner", description = "UseCase1002") -public class PlannerController { - - private final PlannerService planner; - private final CurrentUser currentUser; - - @PostMapping - @ResponseStatus(HttpStatus.CREATED) - @Operation(summary = "Log a meal; energy is derived as one portion per attached meal") - public PlannerEntryView log(@Valid @RequestBody LogMealRequest request) { - return planner.log(request); - } - - @GetMapping - @Operation(summary = "The signed-in user's diary, newest first") - public List mine() { - return planner.mine(); - } - - @GetMapping("/daily") - @Operation(summary = "Daily totals for the signed-in user over a period") - public List daily( - @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate from, - @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate to) { - return planner.dailyTotals(currentUser.email(), from, to); - } - - @GetMapping("/macros") - @Operation(summary = "Macronutrients supplied by the meals logged in a period") - public List macros( - @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate from, - @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate to) { - return planner.macroTotals(currentUser.email(), from, to); - } - - @PatchMapping("/{id}/consumed") - @ResponseStatus(HttpStatus.NO_CONTENT) - @Operation(summary = "Flip a planned meal to consumed, or back") - public void markConsumed(@PathVariable Long id, @RequestParam boolean value) { - planner.markConsumed(id, value); - } -} Index: ckend/src/main/java/mk/finki/nutritioneer/web/PostController.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/web/PostController.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,63 +1,0 @@ -package mk.finki.nutritioneer.web; - -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; -import lombok.RequiredArgsConstructor; -import mk.finki.nutritioneer.domain.RestrictionType; -import mk.finki.nutritioneer.service.PostService; -import mk.finki.nutritioneer.web.dto.PostDtos.*; -import org.springframework.http.HttpStatus; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/api/posts") -@RequiredArgsConstructor -@Tag(name = "Feed and posts", description = "UseCase1004, UseCase3003") -public class PostController { - - private final PostService postService; - - @PostMapping - @ResponseStatus(HttpStatus.CREATED) - @Operation(summary = "Share one of your recipes as a post (1:1 - a recipe can be shared once)") - public PostView share(@Valid @RequestBody SharePostRequest request) { - return postService.share(request); - } - - @GetMapping("/feed") - @Operation(summary = "The public feed, newest first") - public List feed(@RequestParam(defaultValue = "0") int page, - @RequestParam(defaultValue = "20") int size) { - return postService.feed(page, size); - } - - @GetMapping("/mine") - @Operation(summary = "Posts created by the signed-in user, any status") - public List mine() { - return postService.mine(); - } - - @GetMapping("/feed/by-restriction") - @Operation(summary = "Feed filtered by a dietary restriction, excluding unwanted allergens") - public List byRestriction(@RequestParam RestrictionType type, - @RequestParam(required = false) List avoid) { - return postService.feedByRestriction(type, avoid); - } - - @PostMapping("/{id}/comments") - @ResponseStatus(HttpStatus.CREATED) - @Operation(summary = "Comment on a post") - public CommentView comment(@PathVariable Long id, - @Valid @RequestBody CommentRequest request) { - return postService.comment(id, request); - } - - @GetMapping("/{id}/comments") - @Operation(summary = "Read the comment thread of a post") - public List comments(@PathVariable Long id) { - return postService.comments(id); - } -} Index: ckend/src/main/java/mk/finki/nutritioneer/web/RecipeController.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/web/RecipeController.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,53 +1,0 @@ -package mk.finki.nutritioneer.web; - -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; -import lombok.RequiredArgsConstructor; -import mk.finki.nutritioneer.service.RecipeService; -import mk.finki.nutritioneer.web.dto.RecipeDtos.*; -import org.springframework.http.HttpStatus; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/api/recipes") -@RequiredArgsConstructor -@Tag(name = "Recipes", description = "UseCase1001") -public class RecipeController { - - private final RecipeService recipes; - - @PostMapping - @ResponseStatus(HttpStatus.CREATED) - @Operation(summary = "Create a recipe; the server derives its energy from the ingredients") - public RecipeView create(@Valid @RequestBody CreateRecipeRequest request) { - return recipes.create(request); - } - - @GetMapping - @Operation(summary = "Search all recipes") - public List search(@RequestParam(required = false) String q) { - return recipes.search(q); - } - - @GetMapping("/mine") - @Operation(summary = "Recipes owned by the signed-in user") - public List mine() { - return recipes.mine(); - } - - @GetMapping("/{id}") - @Operation(summary = "Full recipe with ingredients, tags and per-portion energy") - public RecipeView get(@PathVariable Long id) { - return recipes.get(id); - } - - @DeleteMapping("/{id}") - @ResponseStatus(HttpStatus.NO_CONTENT) - @Operation(summary = "Delete one of your own recipes") - public void delete(@PathVariable Long id) { - recipes.delete(id); - } -} Index: ckend/src/main/java/mk/finki/nutritioneer/web/TrainerController.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/web/TrainerController.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,63 +1,0 @@ -package mk.finki.nutritioneer.web; - -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import mk.finki.nutritioneer.service.BiometricsService; -import mk.finki.nutritioneer.service.PlannerService; -import mk.finki.nutritioneer.service.RecipeService; -import mk.finki.nutritioneer.web.dto.BiometricsDtos.MeasurementView; -import mk.finki.nutritioneer.web.dto.PlannerDtos.DailyTotalView; -import mk.finki.nutritioneer.web.dto.PlannerDtos.NutrientTotalView; -import mk.finki.nutritioneer.web.dto.RecipeDtos.NutrientDensityView; -import org.springframework.format.annotation.DateTimeFormat; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import java.time.LocalDate; -import java.util.List; - - -@RestController -@RequestMapping("/api/trainer") -@RequiredArgsConstructor -@PreAuthorize("hasAnyRole('TRAINER','ADMINISTRATOR')") -@Tag(name = "Trainer", description = "UseCase3001 - UseCase3004") -public class TrainerController { - - private final PlannerService planner; - private final BiometricsService biometrics; - private final RecipeService recipes; - - @GetMapping("/clients/{email}/intake") - @Operation(summary = "UseCase3001 - a client's daily energy intake over a period") - public List clientIntake( - @PathVariable String email, - @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate from, - @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate to) { - return planner.dailyTotals(email, from, to); - } - - @GetMapping("/clients/{email}/macros") - @Operation(summary = "UseCase3001 - macronutrients a client's meals supplied") - public List clientMacros( - @PathVariable String email, - @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate from, - @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate to) { - return planner.macroTotals(email, from, to); - } - - @GetMapping("/clients/{email}/progress") - @Operation(summary = "UseCase3002 - a client's biometric history with BMI and deltas") - public List clientProgress(@PathVariable String email) { - return biometrics.history(email); - } - - @GetMapping("/analysis/nutrient-density") - @Operation(summary = "UseCase3004 - rank recipes by nutrient per 100 kcal") - public List nutrientDensity( - @RequestParam(defaultValue = "Protein") String nutrient, - @RequestParam(defaultValue = "10") int limit) { - return recipes.rankByNutrient(nutrient, limit); - } -} Index: ckend/src/main/java/mk/finki/nutritioneer/web/dto/AdminDtos.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/web/dto/AdminDtos.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,41 +1,0 @@ -package mk.finki.nutritioneer.web.dto; - -import jakarta.validation.constraints.*; -import mk.finki.nutritioneer.domain.IngredientType; -import mk.finki.nutritioneer.domain.NutrientType; -import mk.finki.nutritioneer.domain.NutrientUnit; -import mk.finki.nutritioneer.domain.UserRole; - -import java.math.BigDecimal; - -public final class AdminDtos { - - private AdminDtos() { - } - - public record CreateIngredientRequest( - @NotBlank String name, - @NotBlank String description, - @NotNull @PositiveOrZero BigDecimal energy, - @NotNull @PositiveOrZero BigDecimal kcal, - @NotNull IngredientType type) { - } - - public record CreateNutrientRequest( - @NotBlank String description, - @NotNull @Positive BigDecimal quantity, - @NotNull NutrientUnit unit, - @NotNull NutrientType type) { - } - - public record ChangeRoleRequest(@NotNull UserRole role) { - } - - public record AccountView( - String email, - String username, - UserRole role, - long recipes, - long posts) { - } -} Index: ckend/src/main/java/mk/finki/nutritioneer/web/dto/AuthDtos.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/web/dto/AuthDtos.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,32 +1,0 @@ -package mk.finki.nutritioneer.web.dto; - -import jakarta.validation.constraints.Email; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Size; - -public final class AuthDtos { - - private AuthDtos() { - } - - public record RegisterRequest( - @NotBlank @Email String email, - @NotBlank @Size(min = 3, max = 40) String username, - @NotBlank @Size(min = 8, message = "Password must be at least 8 characters") - String password) { - } - - public record LoginRequest( - @NotBlank @Email String email, - @NotBlank String password) { - } - - public record TokenResponse( - String token, - String tokenType, - long expiresInMs, - String email, - String username, - String role) { - } -} Index: ckend/src/main/java/mk/finki/nutritioneer/web/dto/BiometricsDtos.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/web/dto/BiometricsDtos.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,30 +1,0 @@ -package mk.finki.nutritioneer.web.dto; - -import jakarta.validation.constraints.NotNull; - -import java.math.BigDecimal; -import java.time.LocalDate; - -public final class BiometricsDtos { - - private BiometricsDtos() { - } - - public record RecordRequest( - @NotNull LocalDate date, - BigDecimal weight, - BigDecimal height, - BigDecimal age, - BigDecimal muscleFatRatio) { - } - - public record MeasurementView( - Long id, - LocalDate date, - BigDecimal weight, - BigDecimal height, - BigDecimal muscleFatRatio, - BigDecimal bmi, - BigDecimal changeSincePrevious) { - } -} Index: ckend/src/main/java/mk/finki/nutritioneer/web/dto/GroceryDtos.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/web/dto/GroceryDtos.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,44 +1,0 @@ -package mk.finki.nutritioneer.web.dto; - -import jakarta.validation.Valid; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Positive; - -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.List; - -public final class GroceryDtos { - - private GroceryDtos() { - } - - public record SingleItem( - @NotBlank String ingredientName, - @NotNull @Positive BigDecimal buyQuantity) { - } - - public record CreateListRequest( - LocalDateTime dateTime, - String notes, - List bulkRecipeIds, - @Valid List singleItems) { - } - - public record ListView( - Long id, - LocalDateTime dateTime, - String notes, - boolean bought, - BigDecimal kcal, - List bulkRecipes, - List shoppingLines) { - } - - public record ShoppingLine( - String category, - String ingredient, - BigDecimal totalGrams) { - } -} Index: ckend/src/main/java/mk/finki/nutritioneer/web/dto/PlannerDtos.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/web/dto/PlannerDtos.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,44 +1,0 @@ -package mk.finki.nutritioneer.web.dto; - -import jakarta.validation.constraints.PositiveOrZero; - -import java.math.BigDecimal; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.List; - -public final class PlannerDtos { - - private PlannerDtos() { - } - - public record LogMealRequest( - LocalDateTime dateTime, - String notes, - List postIds, - boolean consumed, - /* Only used when no meal is attached, e.g. "coffee and fruit". */ - @PositiveOrZero BigDecimal manualKcal) { - } - - public record PlannerEntryView( - Long id, - LocalDateTime dateTime, - String notes, - BigDecimal kcal, - boolean consumed, - List meals) { - } - - public record DailyTotalView( - LocalDate day, - BigDecimal kcalConsumed, - long mealsLogged) { - } - - public record NutrientTotalView( - String nutrient, - String unit, - BigDecimal total) { - } -} Index: ckend/src/main/java/mk/finki/nutritioneer/web/dto/PostDtos.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/web/dto/PostDtos.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,43 +1,0 @@ -package mk.finki.nutritioneer.web.dto; - -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; - -import java.math.BigDecimal; -import java.time.LocalDateTime; - -public final class PostDtos { - - private PostDtos() { - } - - public record SharePostRequest( - @NotNull Long recipeId, - boolean isPrivate, - boolean isFavourite, - String status) { - } - - public record PostView( - Long id, - Long recipeId, - String recipeName, - BigDecimal kcalPerServing, - String authorUsername, - String status, - boolean isPrivate, - boolean isFavourite, - LocalDateTime createdAt, - long commentCount) { - } - - public record CommentRequest(@NotBlank String description) { - } - - public record CommentView( - Long id, - String description, - String authorUsername, - LocalDateTime createdAt) { - } -} Index: ckend/src/main/java/mk/finki/nutritioneer/web/dto/RecipeDtos.java =================================================================== --- backend/src/main/java/mk/finki/nutritioneer/web/dto/RecipeDtos.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,59 +1,0 @@ -package mk.finki.nutritioneer.web.dto; - -import jakarta.validation.Valid; -import jakarta.validation.constraints.*; - -import java.math.BigDecimal; -import java.util.List; - -public final class RecipeDtos { - - private RecipeDtos() { - } - - public record IngredientLine( - @NotBlank String ingredientName, - @NotNull @Positive BigDecimal quantity) { - } - - public record CreateRecipeRequest( - @NotBlank String name, - @NotBlank String guide, - @NotNull @Positive BigDecimal servings, - @NotEmpty @Valid List ingredients, - List restrictionIds) { - } - - public record IngredientLineView( - String ingredientName, - BigDecimal quantity, - BigDecimal kcalPer100g, - BigDecimal kcalContributed) { - } - - public record RecipeView( - Long id, - String name, - String guide, - BigDecimal kcalSum, - BigDecimal servings, - BigDecimal kcalPerServing, - String ownerUsername, - List ingredients, - List restrictions) { - } - - public record RecipeSummary( - Long id, - String name, - BigDecimal kcalPerServing, - String ownerUsername) { - } - - public record NutrientDensityView( - String recipe, - BigDecimal kcalPerServing, - BigDecimal amountPerServing, - BigDecimal amountPer100Kcal) { - } -} Index: ckend/src/main/resources/application-local.yml =================================================================== --- backend/src/main/resources/application-local.yml (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,8 +1,0 @@ -# Local development against the Docker database instead of the faculty -# server. Activate with: --spring.profiles.active=local -# or in IntelliJ: Run > Edit Configurations > Active profiles: local -spring: - datasource: - url: jdbc:postgresql://localhost:5433/nutritioneer - username: postgres - password: postgres Index: ckend/src/main/resources/application.yml =================================================================== --- backend/src/main/resources/application.yml (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,54 +1,0 @@ -server: - port: 8080 - -spring: - application: - name: nutritioneer - - datasource: - url: ${DB_URL:jdbc:postgresql://localhost:9999/db_202526z_prj_nutritioneer} - username: ${DB_USER:db_202526z_prj_nutritioneer_owner} - password: ${DB_PASSWORD:4da5d69c3fc5} - hikari: - - maximum-pool-size: ${DB_POOL_SIZE:5} - minimum-idle: 1 - max-lifetime: 300000 # 5 min, shorter than most SSH idle timeouts - idle-timeout: 120000 - connection-timeout: 10000 - validation-timeout: 5000 - keepalive-time: 60000 - - jpa: - hibernate: - # The schema is owned by the SQL scripts in /sql, never by Hibernate. - ddl-auto: none - open-in-view: false - properties: - hibernate: - format_sql: true - default_schema: ${DB_SCHEMA:public} - jdbc: - time_zone: UTC - show-sql: ${SHOW_SQL:false} - - jackson: - default-property-inclusion: non_null - -app: - jwt: - # Override in production. Must be at least 32 bytes for HS256. - secret: ${JWT_SECRET:change-me-in-production-this-is-a-dev-only-secret-key} - expiration-minutes: ${JWT_EXPIRATION_MINUTES:120} - cors: - allowed-origins: ${CORS_ORIGINS:http://localhost:5173} - -springdoc: - swagger-ui: - path: /swagger-ui.html - operations-sorter: alpha - tags-sorter: alpha - -logging: - level: - mk.finki.nutritioneer: DEBUG Index: ckend/src/test/java/mk/finki/nutritioneer/ApplicationContextTest.java =================================================================== --- backend/src/test/java/mk/finki/nutritioneer/ApplicationContextTest.java (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,17 +1,0 @@ -package mk.finki.nutritioneer; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -/** - * Smoke test: the context loads, which means every bean, repository query and - * security rule is at least wirable. Needs a running database, because the - * repositories validate their native queries against it. - */ -@SpringBootTest -class ApplicationContextTest { - - @Test - void contextLoads() { - } -} Index: cker-compose.yml =================================================================== --- docker-compose.yml (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,23 +1,0 @@ -# OPTIONAL - local database for working offline, without the faculty tunnel. -# Runs on 5433 so it cannot collide with a PostgreSQL service installed on -# Windows (which holds 5432). Use it with the Spring profile "local". -# docker compose up -d -# run the app with --spring.profiles.active=local -services: - db: - image: postgres:16 - container_name: nutritioneer-db - environment: - POSTGRES_DB: nutritioneer - POSTGRES_USER: postgres - POSTGRES_PASSWORD: postgres - ports: - - "5433:5432" - volumes: - - nutritioneer-data:/var/lib/postgresql/data - # Both scripts run automatically the first time the volume is created, - # in filename order. Delete the volume to reload them. - - ./sql:/docker-entrypoint-initdb.d:ro - -volumes: - nutritioneer-data: Index: ontend/index.html =================================================================== --- frontend/index.html (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,12 +1,0 @@ - - - - - - Nutritioneer - - -
- - - Index: ontend/package-lock.json =================================================================== --- frontend/package-lock.json (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,1815 +1,0 @@ -{ - "name": "nutritioneer-frontend", - "version": "0.1.0", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "name": "nutritioneer-frontend", - "version": "0.1.0", - "dependencies": { - "react": "^18.3.1", - "react-dom": "^18.3.1" - }, - "devDependencies": { - "@vitejs/plugin-react": "^4.3.4", - "vite": "^6.0.7" - } - }, - "node_modules/@babel/code-frame": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.7.tgz", - "integrity": "sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-validator-identifier": "^7.29.7", - "js-tokens": "^4.0.0", - "picocolors": "^1.1.1" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/compat-data": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.29.7.tgz", - "integrity": "sha512-locTkQyKvwIEgBzVrn8693ebc97F2U8ZHjbXwDXJ5Fn2TCpNwTlKcaKLkdHop5c/icOFE7qt7Q9JC5hnKNa6Gg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/core": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.7.tgz", - "integrity": "sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/code-frame": "^7.29.7", - "@babel/generator": "^7.29.7", - "@babel/helper-compilation-targets": "^7.29.7", - "@babel/helper-module-transforms": "^7.29.7", - "@babel/helpers": "^7.29.7", - "@babel/parser": "^7.29.7", - "@babel/template": "^7.29.7", - "@babel/traverse": "^7.29.7", - "@babel/types": "^7.29.7", - "@jridgewell/remapping": "^2.3.5", - "convert-source-map": "^2.0.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.2", - "json5": "^2.2.3", - "semver": "^6.3.1" - }, - "engines": { - "node": ">=6.9.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/babel" - } - }, - "node_modules/@babel/generator": { - "version": "7.29.8", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.8.tgz", - "integrity": "sha512-gZbepsdh3WDtgZKWL+vTPh71LSBrm/Y4/QDZBVCcYfmeTEEuoOYwlSy+G1StfJg+/Zy550u/3TATbm7qDbbMtg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/parser": "^7.29.8", - "@babel/types": "^7.29.8", - "@jridgewell/gen-mapping": "^0.3.12", - "@jridgewell/trace-mapping": "^0.3.28", - "jsesc": "^3.0.2" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-compilation-targets": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.29.7.tgz", - "integrity": "sha512-wem6WaBj4NaVYVdNhLPPVacES6ZJ+KBBfSkTMD3YZxbP3rm3Di85tJU5ljaUNhaOynt+Aj0xruhYuzQBt8n71g==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/compat-data": "^7.29.7", - "@babel/helper-validator-option": "^7.29.7", - "browserslist": "^4.24.0", - "lru-cache": "^5.1.1", - "semver": "^6.3.1" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-globals": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.29.7.tgz", - "integrity": "sha512-3nQVUAtvkKH9zahfWgw96Jc/uFOmjACE1kQz82E2lqWmHBgjzbNlsC22nuQTfahmWeQtTq5nQ/4Nnd2A1wj4zA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-module-imports": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.29.7.tgz", - "integrity": "sha512-ejHwrQQYcm9xnTivShn2IDOlIzInN34AXskvq9QicvCtEzq1Vzclu/tKF8Jq1Cg8JG2GL6/EmjgsCT7lXepE3g==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/traverse": "^7.29.7", - "@babel/types": "^7.29.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-module-transforms": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.29.7.tgz", - "integrity": "sha512-UPUVSyXbOh627KiCIGQSgwWzGeBKLkaJ9PJEdrngIwMSzxLR4jS4+f1f1jb7VzBbg8nFLaYotvVPFCTqdrmTAg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-module-imports": "^7.29.7", - "@babel/helper-validator-identifier": "^7.29.7", - "@babel/traverse": "^7.29.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" - } - }, - "node_modules/@babel/helper-plugin-utils": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.29.7.tgz", - "integrity": "sha512-G7sHYigPY17oO5SYWnfD/0MTBwVR781S/JI643e/JhUYgVgWE/61SoW3NH9KWUKyKq5LVh3npif99Wkt6j86Jw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-string-parser": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.29.7.tgz", - "integrity": "sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-validator-identifier": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz", - "integrity": "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-validator-option": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.29.7.tgz", - "integrity": "sha512-N9ZErrD+yW5geCDtBqnOoxmR8+tNKiGuxKlDpuJxfsqpa2dFcexaziGAE/qoHLiDDreVNMupxGmSoNlyvsA3gw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helpers": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.29.7.tgz", - "integrity": "sha512-1k2lAGRMfHTcwuNYcCNUmaUffmQv8KWMfh2iJUUeRlwlwH4FdNG7mfPI10NPfLHJFThE4Tyr4mv7kTNZOiPuBg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/template": "^7.29.7", - "@babel/types": "^7.29.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/parser": { - "version": "7.29.8", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.8.tgz", - "integrity": "sha512-E8lTAYNB1KW+FH+VGJuZM1ioAx2E6oVlvQFRrf5P8ZZmsiJXYAD9vTFV7yyEURNzgh1dFqMZuO6tUwcARbqFCA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/types": "^7.29.8" - }, - "bin": { - "parser": "bin/babel-parser.js" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@babel/plugin-transform-react-jsx-self": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.29.7.tgz", - "integrity": "sha512-TL0hMc9xzy86VD31nUiwzd5otRAcyEPcsegCxolO0PvcXuH1v0kECe/UIznYFihpkvU5wg/jk4v0TTEFfm53fw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.29.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-react-jsx-source": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.29.7.tgz", - "integrity": "sha512-06IyK09H3wi4cGbhDBwp5gUGo0IKtnYa8tyTiephirPCK6fbobVGiXMMI5zLQ4aKEYP3wZ3ArU44o+8KMrSG/Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.29.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/template": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.29.7.tgz", - "integrity": "sha512-puq+Gf35oI24FeN11LkoUQFqv9uwNeWpxXZi/Ji3rRIoKAzKnxRaZ+Gkj0vKS9ZCiTESfng1N9LyOyXvo+m+Gg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/code-frame": "^7.29.7", - "@babel/parser": "^7.29.7", - "@babel/types": "^7.29.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/traverse": { - "version": "7.29.8", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.8.tgz", - "integrity": "sha512-I5z7H3bf/41ktsNVLtpN0wAa336HkqIHQ5BuPLEhTkt1jVSyZpeNKIzTgEWmlxjdg81R0IgUCcaE+Ok3NvrfZg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/code-frame": "^7.29.7", - "@babel/generator": "^7.29.8", - "@babel/helper-globals": "^7.29.7", - "@babel/parser": "^7.29.8", - "@babel/template": "^7.29.7", - "@babel/types": "^7.29.8", - "debug": "^4.3.1" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/types": { - "version": "7.29.8", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.8.tgz", - "integrity": "sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-string-parser": "^7.29.7", - "@babel/helper-validator-identifier": "^7.29.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@esbuild/aix-ppc64": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.12.tgz", - "integrity": "sha512-Hhmwd6CInZ3dwpuGTF8fJG6yoWmsToE+vYgD4nytZVxcu1ulHpUQRAB1UJ8+N1Am3Mz4+xOByoQoSZf4D+CpkA==", - "cpu": [ - "ppc64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "aix" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/android-arm": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.12.tgz", - "integrity": "sha512-VJ+sKvNA/GE7Ccacc9Cha7bpS8nyzVv0jdVgwNDaR4gDMC/2TTRc33Ip8qrNYUcpkOHUT5OZ0bUcNNVZQ9RLlg==", - "cpu": [ - "arm" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/android-arm64": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.12.tgz", - "integrity": "sha512-6AAmLG7zwD1Z159jCKPvAxZd4y/VTO0VkprYy+3N2FtJ8+BQWFXU+OxARIwA46c5tdD9SsKGZ/1ocqBS/gAKHg==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/android-x64": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.12.tgz", - "integrity": "sha512-5jbb+2hhDHx5phYR2By8GTWEzn6I9UqR11Kwf22iKbNpYrsmRB18aX/9ivc5cabcUiAT/wM+YIZ6SG9QO6a8kg==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/darwin-arm64": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.12.tgz", - "integrity": "sha512-N3zl+lxHCifgIlcMUP5016ESkeQjLj/959RxxNYIthIg+CQHInujFuXeWbWMgnTo4cp5XVHqFPmpyu9J65C1Yg==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/darwin-x64": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.12.tgz", - "integrity": "sha512-HQ9ka4Kx21qHXwtlTUVbKJOAnmG1ipXhdWTmNXiPzPfWKpXqASVcWdnf2bnL73wgjNrFXAa3yYvBSd9pzfEIpA==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/freebsd-arm64": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.12.tgz", - "integrity": "sha512-gA0Bx759+7Jve03K1S0vkOu5Lg/85dou3EseOGUes8flVOGxbhDDh/iZaoek11Y8mtyKPGF3vP8XhnkDEAmzeg==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/freebsd-x64": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.12.tgz", - "integrity": "sha512-TGbO26Yw2xsHzxtbVFGEXBFH0FRAP7gtcPE7P5yP7wGy7cXK2oO7RyOhL5NLiqTlBh47XhmIUXuGciXEqYFfBQ==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-arm": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.12.tgz", - "integrity": "sha512-lPDGyC1JPDou8kGcywY0YILzWlhhnRjdof3UlcoqYmS9El818LLfJJc3PXXgZHrHCAKs/Z2SeZtDJr5MrkxtOw==", - "cpu": [ - "arm" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-arm64": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.12.tgz", - "integrity": "sha512-8bwX7a8FghIgrupcxb4aUmYDLp8pX06rGh5HqDT7bB+8Rdells6mHvrFHHW2JAOPZUbnjUpKTLg6ECyzvas2AQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-ia32": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.12.tgz", - "integrity": "sha512-0y9KrdVnbMM2/vG8KfU0byhUN+EFCny9+8g202gYqSSVMonbsCfLjUO+rCci7pM0WBEtz+oK/PIwHkzxkyharA==", - "cpu": [ - "ia32" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-loong64": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.12.tgz", - "integrity": "sha512-h///Lr5a9rib/v1GGqXVGzjL4TMvVTv+s1DPoxQdz7l/AYv6LDSxdIwzxkrPW438oUXiDtwM10o9PmwS/6Z0Ng==", - "cpu": [ - "loong64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-mips64el": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.12.tgz", - "integrity": "sha512-iyRrM1Pzy9GFMDLsXn1iHUm18nhKnNMWscjmp4+hpafcZjrr2WbT//d20xaGljXDBYHqRcl8HnxbX6uaA/eGVw==", - "cpu": [ - "mips64el" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-ppc64": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.12.tgz", - "integrity": "sha512-9meM/lRXxMi5PSUqEXRCtVjEZBGwB7P/D4yT8UG/mwIdze2aV4Vo6U5gD3+RsoHXKkHCfSxZKzmDssVlRj1QQA==", - "cpu": [ - "ppc64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-riscv64": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.12.tgz", - "integrity": "sha512-Zr7KR4hgKUpWAwb1f3o5ygT04MzqVrGEGXGLnj15YQDJErYu/BGg+wmFlIDOdJp0PmB0lLvxFIOXZgFRrdjR0w==", - "cpu": [ - "riscv64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-s390x": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.12.tgz", - "integrity": "sha512-MsKncOcgTNvdtiISc/jZs/Zf8d0cl/t3gYWX8J9ubBnVOwlk65UIEEvgBORTiljloIWnBzLs4qhzPkJcitIzIg==", - "cpu": [ - "s390x" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-x64": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.12.tgz", - "integrity": "sha512-uqZMTLr/zR/ed4jIGnwSLkaHmPjOjJvnm6TVVitAa08SLS9Z0VM8wIRx7gWbJB5/J54YuIMInDquWyYvQLZkgw==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/netbsd-arm64": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.12.tgz", - "integrity": "sha512-xXwcTq4GhRM7J9A8Gv5boanHhRa/Q9KLVmcyXHCTaM4wKfIpWkdXiMog/KsnxzJ0A1+nD+zoecuzqPmCRyBGjg==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "netbsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/netbsd-x64": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.12.tgz", - "integrity": "sha512-Ld5pTlzPy3YwGec4OuHh1aCVCRvOXdH8DgRjfDy/oumVovmuSzWfnSJg+VtakB9Cm0gxNO9BzWkj6mtO1FMXkQ==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "netbsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/openbsd-arm64": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.12.tgz", - "integrity": "sha512-fF96T6KsBo/pkQI950FARU9apGNTSlZGsv1jZBAlcLL1MLjLNIWPBkj5NlSz8aAzYKg+eNqknrUJ24QBybeR5A==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "openbsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/openbsd-x64": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.12.tgz", - "integrity": "sha512-MZyXUkZHjQxUvzK7rN8DJ3SRmrVrke8ZyRusHlP+kuwqTcfWLyqMOE3sScPPyeIXN/mDJIfGXvcMqCgYKekoQw==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "openbsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/openharmony-arm64": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.12.tgz", - "integrity": "sha512-rm0YWsqUSRrjncSXGA7Zv78Nbnw4XL6/dzr20cyrQf7ZmRcsovpcRBdhD43Nuk3y7XIoW2OxMVvwuRvk9XdASg==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "openharmony" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/sunos-x64": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.12.tgz", - "integrity": "sha512-3wGSCDyuTHQUzt0nV7bocDy72r2lI33QL3gkDNGkod22EsYl04sMf0qLb8luNKTOmgF/eDEDP5BFNwoBKH441w==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "sunos" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/win32-arm64": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.12.tgz", - "integrity": "sha512-rMmLrur64A7+DKlnSuwqUdRKyd3UE7oPJZmnljqEptesKM8wx9J8gx5u0+9Pq0fQQW8vqeKebwNXdfOyP+8Bsg==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/win32-ia32": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.12.tgz", - "integrity": "sha512-HkqnmmBoCbCwxUKKNPBixiWDGCpQGVsrQfJoVGYLPT41XWF8lHuE5N6WhVia2n4o5QK5M4tYr21827fNhi4byQ==", - "cpu": [ - "ia32" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/win32-x64": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.12.tgz", - "integrity": "sha512-alJC0uCZpTFrSL0CCDjcgleBXPnCrEAhTBILpeAp7M/OFgoqtAetfBzX0xM00MUsVVPpVjlPuMbREqnZCXaTnA==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.13", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz", - "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jridgewell/sourcemap-codec": "^1.5.0", - "@jridgewell/trace-mapping": "^0.3.24" - } - }, - "node_modules/@jridgewell/remapping": { - "version": "2.3.5", - "resolved": "https://registry.npmjs.org/@jridgewell/remapping/-/remapping-2.3.5.tgz", - "integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jridgewell/gen-mapping": "^0.3.5", - "@jridgewell/trace-mapping": "^0.3.24" - } - }, - "node_modules/@jridgewell/resolve-uri": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", - "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.6.0.tgz", - "integrity": "sha512-T7jf+5zgsZHwNJ4lvQ7/aezbyk0nNX+zJVWpmHA7VYsEx7a7qr5Rg5IbtJFqkgze5Y2sruq1RUY8Q837Od7iFw==", - "dev": true, - "license": "MIT" - }, - "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.31", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz", - "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jridgewell/resolve-uri": "^3.1.0", - "@jridgewell/sourcemap-codec": "^1.4.14" - } - }, - "node_modules/@napi-rs/lzma-linux-x64-gnu": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/@napi-rs/lzma-linux-x64-gnu/-/lzma-linux-x64-gnu-1.5.1.tgz", - "integrity": "sha512-oTXEIha4SsuXdTA4Iyskj0kpdx2yVXdhd75c2v3xGrHFfVMsbhTPZU/nMPL4sWKo4pBHm3aucLaqGlF696dTyQ==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": "^22.20 || ^24.12 || >=25" - } - }, - "node_modules/@rolldown/pluginutils": { - "version": "1.0.0-beta.27", - "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-beta.27.tgz", - "integrity": "sha512-+d0F4MKMCbeVUJwG96uQ4SgAznZNSq93I3V+9NHA4OpvqG8mRCpGdKmK8l/dl02h2CCDHwW2FqilnTyDcAnqjA==", - "dev": true, - "license": "MIT" - }, - "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.63.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.63.3.tgz", - "integrity": "sha512-w3Jnvi1ocaVm/c7yVPpfB98XeSRBMyzp6njL5MVVbGyXjpmUkN+s6Hp4t0PqhGCCaI1ZHMKXt/w0lA1RCaLVcw==", - "cpu": [ - "arm" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "android" - ] - }, - "node_modules/@rollup/rollup-android-arm64": { - "version": "4.63.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.63.3.tgz", - "integrity": "sha512-uI/ESiaIbbRYAEhzy8PCUWDp1hB0bjAqM06mW9flOoNO4Q8DQpeoREhBR5Hegfl+wpXiguyJv6XSPzEN7OxyHQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "android" - ] - }, - "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.63.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.63.3.tgz", - "integrity": "sha512-oxhrd1jmXLwWZ83eQYDXxuqRdkqkzrjR3JobKeuUyfdNZo11FuQIvqEOZhyIT7OBHxXoGslDDjN0cQcM6T0TqQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ] - }, - "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.63.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.63.3.tgz", - "integrity": "sha512-7/YiIMghVE8DrxKvNdorAaJVdriOFgOIpdStnPx8ppx5zfTwC3jBCSEAIzB7JD5404m65THl6H93UTTVUvypmg==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ] - }, - "node_modules/@rollup/rollup-freebsd-arm64": { - "version": "4.63.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.63.3.tgz", - "integrity": "sha512-GXFZRRoMAytaI5z6N3Zhfw0WL18Q0M8r95D5hlC4GqE/lGk8pbSJNUBoOWDfbm6dTciqHj2nU87tI5f6XhQiOg==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ] - }, - "node_modules/@rollup/rollup-freebsd-x64": { - "version": "4.63.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.63.3.tgz", - "integrity": "sha512-77W+8X3ddYgPxUpB8nZFQs2Mq+wc4HVlcSRtApXLjYBcnPMkttrSnU8VwKQjeWYhMsITHFs5cWBQ8vz1Q+5RHQ==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ] - }, - "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.63.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.63.3.tgz", - "integrity": "sha512-FVkwK+iUC+mq+GipVK46rRVticfAPtvPUNlqlGXUDxdVk/UGjQiiiUVPUrEXdSpU2ufU0XxLGyTqDtBidDOVmg==", - "cpu": [ - "arm" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-arm-musleabihf": { - "version": "4.63.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.63.3.tgz", - "integrity": "sha512-+aGU1t3398yQOVj1Bz8o3e+KtswxAPvO+mtxtNdfXYMkXIHu7XhhkCD7/DEH9q8tF8uhDnMWvfpUKI8y1sZJsg==", - "cpu": [ - "arm" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.63.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.63.3.tgz", - "integrity": "sha512-cR0kjpRXR2KJ2oQK8E2KTPtphs+b9hZ8IhTZubNryt/RsqgdOZBQ2Zq0q5UedtiIi0rs3jVhJh55RE1ZHUVGUA==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.63.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.63.3.tgz", - "integrity": "sha512-y1RYi4Q3/9ByVWSSt9kX2ustE0B7kFYbJ6zZdVZVyqopZs3yhCTwRfrjIX4vezUJInma/Gs6BOFDJg7yZmJ0IQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-loong64-gnu": { - "version": "4.63.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.63.3.tgz", - "integrity": "sha512-DNhEA5viIj3Z5bZLE4z4oV8N5ozWqDwyt7T6KG7VdLDJ0nW+rNOYlphBl4/3HQkK75qipPLsVOfStHHOwN9WSg==", - "cpu": [ - "loong64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-loong64-musl": { - "version": "4.63.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.63.3.tgz", - "integrity": "sha512-17gQCqrIpXBX2Cmi9/TygnVOqGbzsba/iaqcYSL8FY7lNugg+7AiYNs5c5nKWD+NRQha36Sa0CqkJqH4XVHwnQ==", - "cpu": [ - "loong64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-ppc64-gnu": { - "version": "4.63.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.63.3.tgz", - "integrity": "sha512-6LwVnZRIyINpdku/yOcI8Tm9YqLmhHK5emmlOOnW9tO0SYEm1FmKPcsSAGp0NBlqR2P04xaND4jvN6sTHqhq8A==", - "cpu": [ - "ppc64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-ppc64-musl": { - "version": "4.63.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.63.3.tgz", - "integrity": "sha512-xMUqkTXlEUtI/p5AAukMwBRr1enU3efsTeF+bskeFfk8t1C9rcC8sLREcZXmTfAXEbvRdJVSonVJez3TMlbR3w==", - "cpu": [ - "ppc64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.63.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.63.3.tgz", - "integrity": "sha512-S3E94co9F9WRRqEaUoQZ38K1gCz6KiM+nL7/3ijq7fDGF3OznjS5TasgYITlvl27GQKtu4lOAOsr5MFwkijvOA==", - "cpu": [ - "riscv64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-riscv64-musl": { - "version": "4.63.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.63.3.tgz", - "integrity": "sha512-1QtRDwG42x5BJI3s9mxu5rEjDnfbSnk20HQ9/ylTAYnSwYwxMVb+Vgu34wzzTQ7ogqBybebgQNUDAvZVQ38DbA==", - "cpu": [ - "riscv64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.63.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.63.3.tgz", - "integrity": "sha512-BQhejF6ZXOpxbngiNTP12GCGQeaDVL2QXGeBVViKIYzFHM5RKxTxwUMB1fr1BeNFphFMpnRqC5QSXFSa4z6UQw==", - "cpu": [ - "s390x" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.63.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.63.3.tgz", - "integrity": "sha512-SXagRwnI2Wlwlitllu59UK/nGVbD1CKPcNqDplHwIC4BqJcpXFjD32d1R/RbuISa95HdQrZM3/7v4bKiowFaLA==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.63.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.63.3.tgz", - "integrity": "sha512-2IPozoEALRCziGqE8O9KMK60PMu5TS1huv4fwoeCexj+WjmcwFtX9CTOVbfXCUqcELAubEwRFPYlzb/WvwY2HQ==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-openbsd-x64": { - "version": "4.63.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.63.3.tgz", - "integrity": "sha512-AoxqosUHT9IX54hFn2TiN6A7d6ZKTtE6pd2bqWtqkkNJ6HJGaU6FRouGX8L1O7R/ZwsnCnpQrHzb4pDEx+UHRQ==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "openbsd" - ] - }, - "node_modules/@rollup/rollup-openharmony-arm64": { - "version": "4.63.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.63.3.tgz", - "integrity": "sha512-d+CaftKgmkFBzCwezMqqy1d0QNNYugqLCMcYVQWBy5SS2YfeMP8Q8ripkgx9O8IyBXXLHrJ+aaCV4U96usv6Yg==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "openharmony" - ] - }, - "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.63.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.63.3.tgz", - "integrity": "sha512-xXlDF6nR1eOuXbdDy5Hl5fmtY7teUDevF/k0O7IPoZe4Tpmdv+lgdE5JRsnhQtt37ql9P0VF2kAN9a0OCZdo+Q==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.63.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.63.3.tgz", - "integrity": "sha512-YtXAgLN+JP7Ay6qG3eWhc7IHMQPzLc8r3uvhAvlJIoCz/4Q32+Bl9Fmnywidh8v1GOIMmymjovfqY9ETAtysvA==", - "cpu": [ - "ia32" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/@rollup/rollup-win32-x64-gnu": { - "version": "4.63.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.63.3.tgz", - "integrity": "sha512-WuWtSJRNo549vzcfZyEgfqb6zeSgn1F+UE5kQ+BCjzz0W4MGCjntUHkZVc1VRuAM7+ULaSyhiPxD1spyewFvkQ==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.63.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.63.3.tgz", - "integrity": "sha512-+lIKX7O0+IGe7WuhATaAMMeT7B76vfhXH/l9wLQL+nvyhbw2ohYCKIdWL56JfDu75CWt5oKRP4QFH/jkMtBquA==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/@types/babel__core": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz", - "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/parser": "^7.20.7", - "@babel/types": "^7.20.7", - "@types/babel__generator": "*", - "@types/babel__template": "*", - "@types/babel__traverse": "*" - } - }, - "node_modules/@types/babel__generator": { - "version": "7.27.0", - "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.27.0.tgz", - "integrity": "sha512-ufFd2Xi92OAVPYsy+P4n7/U7e68fex0+Ee8gSG9KX7eo084CWiQ4sdxktvdl0bOPupXtVJPY19zk6EwWqUQ8lg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/types": "^7.0.0" - } - }, - "node_modules/@types/babel__template": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz", - "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/parser": "^7.1.0", - "@babel/types": "^7.0.0" - } - }, - "node_modules/@types/babel__traverse": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.28.0.tgz", - "integrity": "sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/types": "^7.28.2" - } - }, - "node_modules/@types/estree": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.9.tgz", - "integrity": "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==", - "dev": true, - "license": "MIT" - }, - "node_modules/@vitejs/plugin-react": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.7.0.tgz", - "integrity": "sha512-gUu9hwfWvvEDBBmgtAowQCojwZmJ5mcLn3aufeCsitijs3+f2NsrPtlAWIR6OPiqljl96GVCUbLe0HyqIpVaoA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/core": "^7.28.0", - "@babel/plugin-transform-react-jsx-self": "^7.27.1", - "@babel/plugin-transform-react-jsx-source": "^7.27.1", - "@rolldown/pluginutils": "1.0.0-beta.27", - "@types/babel__core": "^7.20.5", - "react-refresh": "^0.17.0" - }, - "engines": { - "node": "^14.18.0 || >=16.0.0" - }, - "peerDependencies": { - "vite": "^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0" - } - }, - "node_modules/baseline-browser-mapping": { - "version": "2.11.24", - "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.11.24.tgz", - "integrity": "sha512-hYrgxie335U08WqICoGqKRzV1HFXv6zdxwJE4ekCb80CM9a0SVVsN4QPwT67RraRo+9h8IATk6uxHJw7QSkdOg==", - "dev": true, - "license": "Apache-2.0", - "bin": { - "baseline-browser-mapping": "dist/cli.cjs" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/browserslist": { - "version": "4.29.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.29.0.tgz", - "integrity": "sha512-3GSvyjvDI4Dur1Meg2BekJquu5uF+9R9a1+5M1Mde192eZoXbeXjzgOsgqPS2V8D5wrrip0gR5Hf/GhWQ9ZzaA==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/browserslist" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "license": "MIT", - "dependencies": { - "baseline-browser-mapping": "^2.11.23", - "caniuse-lite": "^1.0.30001810", - "electron-to-chromium": "^1.5.427", - "node-releases": "^2.0.55", - "update-browserslist-db": "^1.3.3" - }, - "bin": { - "browserslist": "cli.js" - }, - "engines": { - "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" - } - }, - "node_modules/caniuse-lite": { - "version": "1.0.30001810", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001810.tgz", - "integrity": "sha512-TITQPUkaz+aVk5GL6NhOdwk1aEaNTSDPsGFWrTuhKGtjTF70jL/Oht2W4c6rXUe5fu7Ie19VIahAXHIIiWWNeg==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/caniuse-lite" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "license": "CC-BY-4.0" - }, - "node_modules/convert-source-map": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", - "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", - "dev": true, - "license": "MIT" - }, - "node_modules/debug": { - "version": "4.4.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", - "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ms": "^2.1.3" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/electron-to-chromium": { - "version": "1.5.430", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.430.tgz", - "integrity": "sha512-e1QEj72Y4zd8RlNZVmoTg+iCOSVwpk05IOiiQwdrkwCSVlZfPthevErhE+nckGd2YbsXfp1SkisznhGVIXP2NQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/esbuild": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.12.tgz", - "integrity": "sha512-bbPBYYrtZbkt6Os6FiTLCTFxvq4tt3JKall1vRwshA3fdVztsLAatFaZobhkBC8/BrPetoa0oksYoKXoG4ryJg==", - "dev": true, - "hasInstallScript": true, - "license": "MIT", - "bin": { - "esbuild": "bin/esbuild" - }, - "engines": { - "node": ">=18" - }, - "optionalDependencies": { - "@esbuild/aix-ppc64": "0.25.12", - "@esbuild/android-arm": "0.25.12", - "@esbuild/android-arm64": "0.25.12", - "@esbuild/android-x64": "0.25.12", - "@esbuild/darwin-arm64": "0.25.12", - "@esbuild/darwin-x64": "0.25.12", - "@esbuild/freebsd-arm64": "0.25.12", - "@esbuild/freebsd-x64": "0.25.12", - "@esbuild/linux-arm": "0.25.12", - "@esbuild/linux-arm64": "0.25.12", - "@esbuild/linux-ia32": "0.25.12", - "@esbuild/linux-loong64": "0.25.12", - "@esbuild/linux-mips64el": "0.25.12", - "@esbuild/linux-ppc64": "0.25.12", - "@esbuild/linux-riscv64": "0.25.12", - "@esbuild/linux-s390x": "0.25.12", - "@esbuild/linux-x64": "0.25.12", - "@esbuild/netbsd-arm64": "0.25.12", - "@esbuild/netbsd-x64": "0.25.12", - "@esbuild/openbsd-arm64": "0.25.12", - "@esbuild/openbsd-x64": "0.25.12", - "@esbuild/openharmony-arm64": "0.25.12", - "@esbuild/sunos-x64": "0.25.12", - "@esbuild/win32-arm64": "0.25.12", - "@esbuild/win32-ia32": "0.25.12", - "@esbuild/win32-x64": "0.25.12" - } - }, - "node_modules/escalade": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", - "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/fdir": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", - "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12.0.0" - }, - "peerDependencies": { - "picomatch": "^3 || ^4" - }, - "peerDependenciesMeta": { - "picomatch": { - "optional": true - } - } - }, - "node_modules/fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "dev": true, - "hasInstallScript": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, - "node_modules/gensync": { - "version": "1.0.0-beta.2", - "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", - "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "license": "MIT" - }, - "node_modules/jsesc": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz", - "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==", - "dev": true, - "license": "MIT", - "bin": { - "jsesc": "bin/jsesc" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/json5": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", - "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", - "dev": true, - "license": "MIT", - "bin": { - "json5": "lib/cli.js" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/loose-envify": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", - "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", - "license": "MIT", - "dependencies": { - "js-tokens": "^3.0.0 || ^4.0.0" - }, - "bin": { - "loose-envify": "cli.js" - } - }, - "node_modules/lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "dev": true, - "license": "ISC", - "dependencies": { - "yallist": "^3.0.2" - } - }, - "node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true, - "license": "MIT" - }, - "node_modules/nanoid": { - "version": "3.3.19", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.19.tgz", - "integrity": "sha512-Y2tUNy4ouw6tq5oDSKeQYGOyhkUBhNOcGV/02KC+6kd9eDGqdZd++mjMiIDilrBYvjEnCYvVtsuHCuP+okSfug==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "license": "MIT", - "bin": { - "nanoid": "bin/nanoid.cjs" - }, - "engines": { - "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" - } - }, - "node_modules/node-releases": { - "version": "2.0.55", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.55.tgz", - "integrity": "sha512-mIrE/Cw9y+9Au6dS5vDKDhQza9YvG6w+ZrS6X+ZzA7yFW/soAeaups4Qzn1bL6g5FVy8WtP79+0j82oPIbqRjQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=18" - } - }, - "node_modules/picocolors": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", - "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", - "dev": true, - "license": "ISC" - }, - "node_modules/picomatch": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.7.tgz", - "integrity": "sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, - "node_modules/postcss": { - "version": "8.5.28", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.28.tgz", - "integrity": "sha512-RRuzqDtt5Y9h3quz5hWhK+TPnsmVs6WwSU6LkJMeY4HstUEDuYTG8UJSdawMRzmzAtV+KEoG8N3Qg2qLy5vM/A==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/postcss" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "license": "MIT", - "dependencies": { - "nanoid": "^3.3.18", - "picocolors": "^1.1.1", - "source-map-js": "^1.2.1" - }, - "engines": { - "node": "^10 || ^12 || >=14" - } - }, - "node_modules/react": { - "version": "18.3.1", - "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz", - "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==", - "license": "MIT", - "dependencies": { - "loose-envify": "^1.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/react-dom": { - "version": "18.3.1", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz", - "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==", - "license": "MIT", - "dependencies": { - "loose-envify": "^1.1.0", - "scheduler": "^0.23.2" - }, - "peerDependencies": { - "react": "^18.3.1" - } - }, - "node_modules/react-refresh": { - "version": "0.17.0", - "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.17.0.tgz", - "integrity": "sha512-z6F7K9bV85EfseRCp2bzrpyQ0Gkw1uLoCel9XBVWPg/TjRj94SkJzUTGfOa4bs7iJvBWtQG0Wq7wnI0syw3EBQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/rollup": { - "version": "4.63.3", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.63.3.tgz", - "integrity": "sha512-1i2XreiAoMMXuPGD6Msj2xWrMMkHojNRKivInxGQcg7/1KuPuYlfUutLyh4drnOxUTHX9cHI4wFoat8D/NKaBw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/estree": "1.0.9" - }, - "bin": { - "rollup": "dist/bin/rollup" - }, - "engines": { - "node": ">=18.0.0", - "npm": ">=8.0.0" - }, - "optionalDependencies": { - "@napi-rs/lzma-linux-x64-gnu": "1.5.1", - "@rollup/rollup-android-arm-eabi": "4.63.3", - "@rollup/rollup-android-arm64": "4.63.3", - "@rollup/rollup-darwin-arm64": "4.63.3", - "@rollup/rollup-darwin-x64": "4.63.3", - "@rollup/rollup-freebsd-arm64": "4.63.3", - "@rollup/rollup-freebsd-x64": "4.63.3", - "@rollup/rollup-linux-arm-gnueabihf": "4.63.3", - "@rollup/rollup-linux-arm-musleabihf": "4.63.3", - "@rollup/rollup-linux-arm64-gnu": "4.63.3", - "@rollup/rollup-linux-arm64-musl": "4.63.3", - "@rollup/rollup-linux-loong64-gnu": "4.63.3", - "@rollup/rollup-linux-loong64-musl": "4.63.3", - "@rollup/rollup-linux-ppc64-gnu": "4.63.3", - "@rollup/rollup-linux-ppc64-musl": "4.63.3", - "@rollup/rollup-linux-riscv64-gnu": "4.63.3", - "@rollup/rollup-linux-riscv64-musl": "4.63.3", - "@rollup/rollup-linux-s390x-gnu": "4.63.3", - "@rollup/rollup-linux-x64-gnu": "4.63.3", - "@rollup/rollup-linux-x64-musl": "4.63.3", - "@rollup/rollup-openbsd-x64": "4.63.3", - "@rollup/rollup-openharmony-arm64": "4.63.3", - "@rollup/rollup-win32-arm64-msvc": "4.63.3", - "@rollup/rollup-win32-ia32-msvc": "4.63.3", - "@rollup/rollup-win32-x64-gnu": "4.63.3", - "@rollup/rollup-win32-x64-msvc": "4.63.3", - "fsevents": "~2.3.2" - } - }, - "node_modules/scheduler": { - "version": "0.23.2", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz", - "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==", - "license": "MIT", - "dependencies": { - "loose-envify": "^1.1.0" - } - }, - "node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/source-map-js": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", - "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/tinyglobby": { - "version": "0.2.17", - "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.17.tgz", - "integrity": "sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==", - "dev": true, - "license": "MIT", - "dependencies": { - "fdir": "^6.5.0", - "picomatch": "^4.0.4" - }, - "engines": { - "node": ">=12.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/SuperchupuDev" - } - }, - "node_modules/update-browserslist-db": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.3.3.tgz", - "integrity": "sha512-pJ2sYawQS0R/WI928Gj5GlPhTGzbMelq0+4INtSYNDV9ErKJcX6xjGWkoG/VnB3dpUm00zALaqkrUD77pO5TDQ==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/browserslist" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "license": "MIT", - "dependencies": { - "escalade": "^3.2.0", - "picocolors": "^1.1.1" - }, - "bin": { - "update-browserslist-db": "cli.js" - }, - "peerDependencies": { - "browserslist": ">= 4.21.0" - } - }, - "node_modules/vite": { - "version": "6.4.3", - "resolved": "https://registry.npmjs.org/vite/-/vite-6.4.3.tgz", - "integrity": "sha512-NTKlcQjlAK7MlQoyb6LgaqHc8sso/pVyUJYWMws3jg21uTJw/LddqIFPcPqP6PzpgbIcZyKI85sFE4HBrQDA8A==", - "dev": true, - "license": "MIT", - "dependencies": { - "esbuild": "^0.25.0", - "fdir": "^6.4.4", - "picomatch": "^4.0.2", - "postcss": "^8.5.3", - "rollup": "^4.34.9", - "tinyglobby": "^0.2.13" - }, - "bin": { - "vite": "bin/vite.js" - }, - "engines": { - "node": "^18.0.0 || ^20.0.0 || >=22.0.0" - }, - "funding": { - "url": "https://github.com/vitejs/vite?sponsor=1" - }, - "optionalDependencies": { - "fsevents": "~2.3.3" - }, - "peerDependencies": { - "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0", - "jiti": ">=1.21.0", - "less": "*", - "lightningcss": "^1.21.0", - "sass": "*", - "sass-embedded": "*", - "stylus": "*", - "sugarss": "*", - "terser": "^5.16.0", - "tsx": "^4.8.1", - "yaml": "^2.4.2" - }, - "peerDependenciesMeta": { - "@types/node": { - "optional": true - }, - "jiti": { - "optional": true - }, - "less": { - "optional": true - }, - "lightningcss": { - "optional": true - }, - "sass": { - "optional": true - }, - "sass-embedded": { - "optional": true - }, - "stylus": { - "optional": true - }, - "sugarss": { - "optional": true - }, - "terser": { - "optional": true - }, - "tsx": { - "optional": true - }, - "yaml": { - "optional": true - } - } - }, - "node_modules/yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", - "dev": true, - "license": "ISC" - } - } -} Index: ontend/package.json =================================================================== --- frontend/package.json (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,19 +1,0 @@ -{ - "name": "nutritioneer-frontend", - "private": true, - "version": "0.1.0", - "type": "module", - "scripts": { - "dev": "vite", - "build": "vite build", - "preview": "vite preview" - }, - "dependencies": { - "react": "^18.3.1", - "react-dom": "^18.3.1" - }, - "devDependencies": { - "@vitejs/plugin-react": "^4.3.4", - "vite": "^6.0.7" - } -} Index: ontend/src/App.jsx =================================================================== --- frontend/src/App.jsx (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,57 +1,0 @@ -import { useState } from 'react' -import { auth } from './lib/api.js' -import Login from './pages/Login.jsx' -import Feed from './pages/Feed.jsx' -import Recipes from './pages/Recipes.jsx' -import Planner from './pages/Planner.jsx' -import Grocery from './pages/Grocery.jsx' -import Biometrics from './pages/Biometrics.jsx' -import Trainer from './pages/Trainer.jsx' - -const TABS = [ - { key: 'feed', label: 'Feed', component: Feed }, - { key: 'recipes', label: 'Recipes', component: Recipes }, - { key: 'planner', label: 'Planner', component: Planner }, - { key: 'grocery', label: 'Grocery', component: Grocery }, - { key: 'biometrics', label: 'Biometrics', component: Biometrics }, - { key: 'trainer', label: 'Trainer', component: Trainer, roles: ['trainer', 'administrator'] } -] - -export default function App() { - const [user, setUser] = useState(auth.user()) - const [tab, setTab] = useState('feed') - - if (!user) return - - const visible = TABS.filter(t => !t.roles || t.roles.includes(user.role)) - const Active = (visible.find(t => t.key === tab) || visible[0]).component - - const signOut = () => { - auth.clear() - setUser(null) - } - - return ( -
-
-

Nutritioneer

- prototype - - {user.username} ({user.role}) - -
- - - - -
- ) -} Index: ontend/src/lib/api.js =================================================================== --- frontend/src/lib/api.js (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,60 +1,0 @@ -// Thin wrapper over fetch: attaches the JWT, unwraps JSON, surfaces the -// backend's error message instead of a bare "500". - -const TOKEN_KEY = 'nutritioneer.token' -const USER_KEY = 'nutritioneer.user' - -export const auth = { - token: () => localStorage.getItem(TOKEN_KEY), - user: () => { - const raw = localStorage.getItem(USER_KEY) - return raw ? JSON.parse(raw) : null - }, - save: (res) => { - localStorage.setItem(TOKEN_KEY, res.token) - localStorage.setItem(USER_KEY, JSON.stringify({ - email: res.email, username: res.username, role: res.role - })) - }, - clear: () => { - localStorage.removeItem(TOKEN_KEY) - localStorage.removeItem(USER_KEY) - } -} - -async function request(method, path, body) { - const headers = { 'Content-Type': 'application/json' } - const token = auth.token() - if (token) headers.Authorization = `Bearer ${token}` - - const res = await fetch(`/api${path}`, { - method, - headers, - body: body === undefined ? undefined : JSON.stringify(body) - }) - - if (res.status === 204) return null - - const text = await res.text() - const data = text ? JSON.parse(text) : null - - if (res.status === 401) { - // A 401 while signing in means the credentials were rejected. Only treat - // it as an expired session if we actually sent a token. - if (token) { - auth.clear() - throw new Error(data?.message || 'Session expired, please sign in again') - } - throw new Error(data?.message || 'Invalid email or password') - } - - if (!res.ok) throw new Error(data?.message || `Request failed (${res.status})`) - return data -} - -export const api = { - get: (p) => request('GET', p), - post: (p, b) => request('POST', p, b), - patch: (p, b) => request('PATCH', p, b), - del: (p) => request('DELETE', p) -} Index: ontend/src/main.jsx =================================================================== --- frontend/src/main.jsx (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,10 +1,0 @@ -import React from 'react' -import ReactDOM from 'react-dom/client' -import App from './App.jsx' -import './styles.css' - -ReactDOM.createRoot(document.getElementById('root')).render( - - - -) Index: ontend/src/pages/Biometrics.jsx =================================================================== --- frontend/src/pages/Biometrics.jsx (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,80 +1,0 @@ -import { useEffect, useState } from 'react' -import { api } from '../lib/api.js' - -export default function Biometrics() { - const [rows, setRows] = useState([]) - const [error, setError] = useState(null) - const [form, setForm] = useState({ - date: new Date().toISOString().slice(0, 10), - weight: '', height: '', age: '', muscleFatRatio: '' - }) - - const load = () => api.get('/biometrics').then(setRows).catch(e => setError(e.message)) - useEffect(() => { load() }, []) - - const set = (k) => (e) => setForm({ ...form, [k]: e.target.value }) - - const save = async () => { - setError(null) - try { - await api.post('/biometrics', { - date: form.date, - weight: form.weight ? Number(form.weight) : null, - height: form.height ? Number(form.height) : null, - age: form.age ? Number(form.age) : null, - muscleFatRatio: form.muscleFatRatio ? Number(form.muscleFatRatio) : null - }) - load() - } catch (e) { setError(e.message) } - } - - return ( -
- {error &&
{error}
} - -
-

Record a measurement

-

One per day. Saving the same date again updates that entry.

-
- - - - - - -
-
- -
-

Progress

- - - - - - {rows.map(r => ( - - - - - - - - - ))} - -
dateweightchangeBMImuscle/fat
{r.date}{r.weight} - {r.changeSincePrevious ?? '—'} - {r.bmi ?? '—'}{r.muscleFatRatio ?? '—'} - -
- {rows.length === 0 &&

No measurements yet.

} -
-
- ) -} Index: ontend/src/pages/Feed.jsx =================================================================== --- frontend/src/pages/Feed.jsx (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,70 +1,0 @@ -import { useEffect, useState } from 'react' -import { api } from '../lib/api.js' - -export default function Feed() { - const [posts, setPosts] = useState([]) - const [openId, setOpenId] = useState(null) - const [comments, setComments] = useState([]) - const [draft, setDraft] = useState('') - const [error, setError] = useState(null) - - const load = () => api.get('/posts/feed').then(setPosts).catch(e => setError(e.message)) - useEffect(() => { load() }, []) - - const open = async (id) => { - setOpenId(id) - setComments(await api.get(`/posts/${id}/comments`)) - } - - const send = async () => { - if (!draft.trim()) return - try { - await api.post(`/posts/${openId}/comments`, { description: draft }) - setDraft('') - setComments(await api.get(`/posts/${openId}/comments`)) - load() - } catch (e) { setError(e.message) } - } - - return ( -
- {error &&
{error}
} - {posts.length === 0 &&

Nothing published yet.

} - - {posts.map(p => ( -
-
-

{p.recipeName || '(photo post)'}

- {p.kcalPerServing} kcal / portion -
-
- by {p.authorUsername} · {new Date(p.createdAt).toLocaleString()} · {p.commentCount} comments - {p.isFavourite && ' · favourite'} -
-
- -
- - {openId === p.id && ( -
- {comments.map(c => ( -
- {c.authorUsername} - {new Date(c.createdAt).toLocaleString()} -
{c.description}
-
- ))} -
- setDraft(e.target.value)} /> - -
-
- )} -
- ))} -
- ) -} Index: ontend/src/pages/Grocery.jsx =================================================================== --- frontend/src/pages/Grocery.jsx (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,110 +1,0 @@ -import { useEffect, useState } from 'react' -import { api } from '../lib/api.js' - -export default function Grocery() { - const [lists, setLists] = useState([]) - const [recipes, setRecipes] = useState([]) - const [catalog, setCatalog] = useState([]) - const [open, setOpen] = useState(null) - const [error, setError] = useState(null) - const [notes, setNotes] = useState('') - const [bulk, setBulk] = useState([]) - const [item, setItem] = useState({ ingredientName: '', buyQuantity: '' }) - - const load = () => api.get('/grocery-lists').then(setLists).catch(e => setError(e.message)) - - useEffect(() => { - load() - api.get('/recipes').then(setRecipes).catch(() => {}) - api.get('/catalog/ingredients').then(setCatalog).catch(() => {}) - }, []) - - const create = async () => { - setError(null) - try { - const created = await api.post('/grocery-lists', { - notes, - bulkRecipeIds: bulk.map(Number), - singleItems: item.ingredientName && item.buyQuantity - ? [{ ingredientName: item.ingredientName, buyQuantity: Number(item.buyQuantity) }] - : [] - }) - setOpen(created) - setNotes(''); setBulk([]); setItem({ ingredientName: '', buyQuantity: '' }) - load() - } catch (e) { setError(e.message) } - } - - return ( -
- {error &&
{error}
} - -
-

New grocery list

-
- setNotes(e.target.value)} /> - Add whole recipes: - - Plus one item on its own: -
- - setItem({ ...item, buyQuantity: e.target.value })} /> -
- -
-
- - {open && ( -
-

Shopping list #{open.id}

-
- {open.notes} · total {open.kcal} kcal - {open.bulkRecipes.length > 0 && <> · from: {open.bulkRecipes.join(', ')}} -
- - - - {open.shoppingLines.map(l => ( - - - - - - ))} - -
categoryingredientgrams
{l.category}{l.ingredient}{l.totalGrams}
-
- )} - -
-

My lists

- - - {lists.map(l => ( - - - - - - - - ))} - -
{new Date(l.dateTime).toLocaleDateString()}{l.notes}{l.kcal} kcal{l.bought ? 'bought' : 'open'} - -
-
-
- ) -} Index: ontend/src/pages/Login.jsx =================================================================== --- frontend/src/pages/Login.jsx (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,62 +1,0 @@ -import { useState } from 'react' -import { api, auth } from '../lib/api.js' - -export default function Login({ onSignedIn }) { - const [mode, setMode] = useState('login') - const [form, setForm] = useState({ email: '', username: '', password: '' }) - const [error, setError] = useState(null) - const [busy, setBusy] = useState(false) - - const set = (k) => (e) => setForm({ ...form, [k]: e.target.value }) - - const submit = async () => { - setBusy(true) - setError(null) - try { - const body = mode === 'login' - ? { email: form.email, password: form.password } - : form - const res = await api.post(`/auth/${mode}`, body) - auth.save(res) - onSignedIn(auth.user()) - } catch (e) { - setError(e.message) - } finally { - setBusy(false) - } - } - - return ( -
-

Nutritioneer

prototype
- -
-

{mode === 'login' ? 'Sign in' : 'Create an account'}

- {error &&
{error}
} - -
- - {mode === 'register' && - } - - -
- - -
-
- -

- Seed accounts use the password testPass@1, for example{' '} - marija.trajkovska@gmail.com or admin@nutritioneer.mk. -

-
-
- ) -} Index: ontend/src/pages/Planner.jsx =================================================================== --- frontend/src/pages/Planner.jsx (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,109 +1,0 @@ -import { useEffect, useState } from 'react' -import { api } from '../lib/api.js' - -export default function Planner() { - const [entries, setEntries] = useState([]) - const [feed, setFeed] = useState([]) - const [daily, setDaily] = useState([]) - const [macros, setMacros] = useState([]) - const [error, setError] = useState(null) - const [pick, setPick] = useState([]) - const [notes, setNotes] = useState('') - - const today = new Date().toISOString().slice(0, 10) - const weekAgo = new Date(Date.now() - 7 * 864e5).toISOString().slice(0, 10) - - const load = () => { - api.get('/planner').then(setEntries).catch(e => setError(e.message)) - api.get(`/planner/daily?from=${weekAgo}&to=${today}`).then(setDaily).catch(() => {}) - api.get(`/planner/macros?from=${weekAgo}&to=${today}`).then(setMacros).catch(() => {}) - } - - useEffect(() => { - load() - api.get('/posts/feed').then(setFeed).catch(() => {}) - }, []) - - const log = async () => { - setError(null) - try { - await api.post('/planner', { - notes, - postIds: pick.map(Number), - consumed: true - }) - setNotes('') - setPick([]) - load() - } catch (e) { setError(e.message) } - } - - return ( -
- {error &&
{error}
} - -
-

Log a meal

-
- setNotes(e.target.value)} /> - - One portion is counted per selected meal. - -
-
- -
-

Last 7 days

- - - - {daily.map(d => ( - - - - ))} - -
daykcalmeals
{d.day}{d.kcalConsumed}{d.mealsLogged}
- {daily.length === 0 &&

Nothing logged in the last week.

} -
- - {macros.length > 0 && ( -
-

Macronutrients supplied this week

- - - {macros.map(m => ( - - ))} - -
{m.nutrient}{m.total} {m.unit}
-
- )} - -
-

Diary

- - - {entries.map(e => ( - - - - - - - - ))} - -
{new Date(e.dateTime).toLocaleString()}{e.notes}{e.meals.join(', ')}{e.kcal}{e.consumed ? 'eaten' : 'planned'}
-
-
- ) -} Index: ontend/src/pages/Recipes.jsx =================================================================== --- frontend/src/pages/Recipes.jsx (revision 98cd519d004627b2c74881b58f5ffaae3de2622c) +++ (revision ) @@ -1,146 +1,0 @@ -import { useEffect, useState } from 'react' -import { api } from '../lib/api.js' - -export default function Recipes() { - const [mine, setMine] = useState([]) - const [catalog, setCatalog] = useState([]) - const [restrictions, setRestrictions] = useState([]) - const [detail, setDetail] = useState(null) - const [error, setError] = useState(null) - const [form, setForm] = useState({ name: '', guide: '', servings: 4, restrictionIds: [] }) - const [lines, setLines] = useState([{ ingredientName: '', quantity: '' }]) - - const load = () => api.get('/recipes/mine').then(setMine).catch(e => setError(e.message)) - - useEffect(() => { - load() - api.get('/catalog/ingredients').then(setCatalog).catch(() => {}) - api.get('/catalog/restrictions').then(setRestrictions).catch(() => {}) - }, []) - - const setLine = (i, key) => (e) => { - const copy = [...lines] - copy[i] = { ...copy[i], [key]: e.target.value } - setLines(copy) - } - - const create = async () => { - setError(null) - try { - const body = { - name: form.name, - guide: form.guide, - servings: Number(form.servings), - ingredients: lines - .filter(l => l.ingredientName && l.quantity) - .map(l => ({ ingredientName: l.ingredientName, quantity: Number(l.quantity) })), - restrictionIds: form.restrictionIds.map(Number) - } - const created = await api.post('/recipes', body) - setDetail(created) - setForm({ name: '', guide: '', servings: 4, restrictionIds: [] }) - setLines([{ ingredientName: '', quantity: '' }]) - load() - } catch (e) { setError(e.message) } - } - - const share = async (id) => { - setError(null) - try { - await api.post('/posts', { recipeId: id, isPrivate: false, isFavourite: false, status: 'published' }) - alert('Shared to the feed') - } catch (e) { setError(e.message) } - } - - return ( -
- {error &&
{error}
} - -
-

New recipe

-

- Energy is not entered: the server sums it from the ingredients and divides by servings. -

-
- setForm({ ...form, name: e.target.value })} /> -