piotr/innercontext
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: piotr:ef8334b93c7daa9319915e27a7210b62117cd078
Branches Tags
piotr:main
piotr:feature/multi-user-authelia-oidc
..
compare: piotr:a3753d0929fa599b826ddd374ac9c42131bc531d
Branches Tags
piotr:feature/multi-user-authelia-oidc
piotr:main

No commits in common. "ef8334b93c7daa9319915e27a7210b62117cd078" and "a3753d0929fa599b826ddd374ac9c42131bc531d" have entirely different histories.
ef8334b93c ... a3753d0929

4 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backend/innercontext/api/products.py
View file

@ -271,7 +271,7 @@ actives[].functions (array, pick applicable):
"humectant" | "emollient" | "occlusive" | "exfoliant_aha" | "exfoliant_bha" | \ "humectant" | "emollient" | "occlusive" | "exfoliant_aha" | "exfoliant_bha" | \
"exfoliant_pha" | "retinoid" | "antioxidant" | "soothing" | "barrier_support" | \ "exfoliant_pha" | "retinoid" | "antioxidant" | "soothing" | "barrier_support" | \
"brightening" | "anti_acne" | "ceramide" | "niacinamide" | "sunscreen" | "peptide" | \ "brightening" | "anti_acne" | "ceramide" | "niacinamide" | "sunscreen" | "peptide" | \
"hair_growth_stimulant" | "prebiotic" | "vitamin_c" | "anti_aging" "hair_growth_stimulant" | "prebiotic" | "vitamin_c"
actives[].strength_level: 1 (low) | 2 (medium) | 3 (high) actives[].strength_level: 1 (low) | 2 (medium) | 3 (high)
actives[].irritation_potential: 1 (low) | 2 (medium) | 3 (high) actives[].irritation_potential: 1 (low) | 2 (medium) | 3 (high)

1
backend/innercontext/models/enums.py
View file

@ -93,7 +93,6 @@ class IngredientFunction(str, Enum):
HAIR_GROWTH_STIMULANT = "hair_growth_stimulant" HAIR_GROWTH_STIMULANT = "hair_growth_stimulant"
PREBIOTIC = "prebiotic" PREBIOTIC = "prebiotic"
VITAMIN_C = "vitamin_c" VITAMIN_C = "vitamin_c"
ANTI_AGING = "anti_aging"
class TextureType(str, Enum): class TextureType(str, Enum):

2
frontend/src/lib/components/ProductForm.svelte
View file

@ -35,7 +35,7 @@
'exfoliant_aha', 'exfoliant_bha', 'exfoliant_pha', 'exfoliant_aha', 'exfoliant_bha', 'exfoliant_pha',
'retinoid', 'antioxidant', 'soothing', 'barrier_support', 'retinoid', 'antioxidant', 'soothing', 'barrier_support',
'brightening', 'anti_acne', 'ceramide', 'niacinamide', 'brightening', 'anti_acne', 'ceramide', 'niacinamide',
'sunscreen', 'peptide', 'hair_growth_stimulant', 'prebiotic', 'vitamin_c', 'anti_aging' 'sunscreen', 'peptide', 'hair_growth_stimulant', 'prebiotic', 'vitamin_c'
]; ];
const interactionScopes: InteractionScope[] = ['same_step', 'same_day', 'same_period']; const interactionScopes: InteractionScope[] = ['same_step', 'same_day', 'same_period'];
const tristate = [ const tristate = [

3
frontend/src/lib/types.ts
View file

@ -23,8 +23,7 @@ export type IngredientFunction =
| 'peptide' | 'peptide'
| 'hair_growth_stimulant' | 'hair_growth_stimulant'
| 'prebiotic' | 'prebiotic'
| 'vitamin_c' | 'vitamin_c';
| 'anti_aging';
export type InteractionScope = 'same_step' | 'same_day' | 'same_period'; export type InteractionScope = 'same_step' | 'same_day' | 'same_period';
export type MedicationKind = 'prescription' | 'otc' | 'supplement' | 'herbal' | 'other'; export type MedicationKind = 'prescription' | 'otc' | 'supplement' | 'herbal' | 'other';
export type OverallSkinState = 'excellent' | 'good' | 'fair' | 'poor'; export type OverallSkinState = 'excellent' | 'good' | 'fair' | 'poor';