Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Commit trophy icons

Roland Geiderdb362bf94dd1
diff --git a/wger/trophies/fixtures/initial_trophies.json b/wger/trophies/fixtures/initial_trophies.json
index f8986a99d..b1e0fe1a1 100644
--- a/wger/trophies/fixtures/initial_trophies.json
+++ b/wger/trophies/fixtures/initial_trophies.json
@@ -297,7 +297,7 @@
"trophy_type": "time",
"checker_class": "time_based",
"checker_params": {"before": "06:00"},
- "is_hidden": false,
+ "is_hidden": true,
"is_progressive": false,
"is_active": true,
"order": 17,
@@ -311,11 +311,11 @@
"fields": {
"uuid": "2b00ff1e-69f8-47f0-b8df-976a4127a425",
"name": "Night Owl",
- "description": "Complete a workout after 9:00 PM",
+ "description": "Complete a workout after 11:00 PM",
"trophy_type": "time",
"checker_class": "time_based",
- "checker_params": {"after": "21:00"},
- "is_hidden": false,
+ "checker_params": {"after": "23:00"},
+ "is_hidden": true,
"is_progressive": false,
"is_active": true,
"order": 18,
diff --git a/wger/trophies/migrations/0002_load_initial_trophies.py b/wger/trophies/migrations/0002_load_initial_trophies.py
index 59dc066b0..f663d31d3 100644
--- a/wger/trophies/migrations/0002_load_initial_trophies.py
+++ b/wger/trophies/migrations/0002_load_initial_trophies.py
@@ -172,18 +172,18 @@ trophies_data = [
'trophy_type': 'time',
'checker_class': 'time_based',
'checker_params': {'before': '06:00'},
- 'is_hidden': False,
+ 'is_hidden': True,
'is_progressive': False,
'order': 17,
},
{
'uuid': '2b00ff1e-69f8-47f0-b8df-976a4127a425',
'name': 'Night Owl',
- 'description': 'Complete a workout after 9:00 PM',
+ 'description': 'Complete a workout after 11:00 PM',
'trophy_type': 'time',
'checker_class': 'time_based',
- 'checker_params': {'after': '21:00'},
- 'is_hidden': False,
+ 'checker_params': {'after': '23:00'},
+ 'is_hidden': True,
'is_progressive': False,
'order': 18,
},
diff --git a/wger/trophies/models/trophy.py b/wger/trophies/models/trophy.py
index fc41a7dd0..1014f4d24 100644
--- a/wger/trophies/models/trophy.py
+++ b/wger/trophies/models/trophy.py
@@ -156,5 +156,4 @@ class Trophy(models.Model):
"""
Returns the relative (to the static folder) path to the trophy image
"""
- return 'trophies/placeholder.png'
- # return f'trophies/{self.trophy_type}/{self.uuid}.png'
+ return f'trophies/{self.trophy_type}/{self.uuid}.png'
diff --git a/wger/trophies/static/trophies/count/0d2e3f4a-5b6c-47d8-9e0f-1a2b3c4d5e6f.png b/wger/trophies/static/trophies/count/0d2e3f4a-5b6c-47d8-9e0f-1a2b3c4d5e6f.png
new file mode 100644
index 000000000..546fe139d
Binary files /dev/null and b/wger/trophies/static/trophies/count/0d2e3f4a-5b6c-47d8-9e0f-1a2b3c4d5e6f.png differ
diff --git a/wger/trophies/static/trophies/count/4b6f9c2d-3e1a-4f5b-8c7d-2e3f4a5b6c7d.png b/wger/trophies/static/trophies/count/4b6f9c2d-3e1a-4f5b-8c7d-2e3f4a5b6c7d.png
new file mode 100644
index 000000000..0dd582ba3
Binary files /dev/null and b/wger/trophies/static/trophies/count/4b6f9c2d-3e1a-4f5b-8c7d-2e3f4a5b6c7d.png differ
diff --git a/wger/trophies/static/trophies/count/9f1c7c7e-3b2a-4b6f-9b5f-1c3e2d4f5a60.png b/wger/trophies/static/trophies/count/9f1c7c7e-3b2a-4b6f-9b5f-1c3e2d4f5a60.png
new file mode 100644
index 000000000..48cab531e
Binary files /dev/null and b/wger/trophies/static/trophies/count/9f1c7c7e-3b2a-4b6f-9b5f-1c3e2d4f5a60.png differ
diff --git a/wger/trophies/static/trophies/count/a5b6c7d8-e9f0-41a2-9b3c-4d5e6f7a8b9c.png b/wger/trophies/static/trophies/count/a5b6c7d8-e9f0-41a2-9b3c-4d5e6f7a8b9c.png
new file mode 100644
index 000000000..4ac773995
Binary files /dev/null and b/wger/trophies/static/trophies/count/a5b6c7d8-e9f0-41a2-9b3c-4d5e6f7a8b9c.png differ
diff --git a/wger/trophies/static/trophies/count/d2c3b4a5-6f7e-48d9-8c0b-2a3c4d5e6f7b.png b/wger/trophies/static/trophies/count/d2c3b4a5-6f7e-48d9-8c0b-2a3c4d5e6f7b.png
new file mode 100644
index 000000000..82e3d0e2b
Binary files /dev/null and b/wger/trophies/static/trophies/count/d2c3b4a5-6f7e-48d9-8c0b-2a3c4d5e6f7b.png differ
diff --git a/wger/trophies/static/trophies/count/e3f4a5b6-c7d8-49e0-9f1a-2b3c4d5e6f7a.png b/wger/trophies/static/trophies/count/e3f4a5b6-c7d8-49e0-9f1a-2b3c4d5e6f7a.png
new file mode 100644
index 000000000..263f44b3d
Binary files /dev/null and b/wger/trophies/static/trophies/count/e3f4a5b6-c7d8-49e0-9f1a-2b3c4d5e6f7a.png differ
diff --git a/wger/trophies/static/trophies/count/f4a5b6c7-d8e9-40f1-9a2b-3c4d5e6f7a8b.png b/wger/trophies/static/trophies/count/f4a5b6c7-d8e9-40f1-9a2b-3c4d5e6f7a8b.png
new file mode 100644
index 000000000..ed0a873c3
Binary files /dev/null and b/wger/trophies/static/trophies/count/f4a5b6c7-d8e9-40f1-9a2b-3c4d5e6f7a8b.png differ
diff --git a/wger/trophies/static/trophies/date/31a71d9a-bf26-4f18-b82f-afefe6f50df2.png b/wger/trophies/static/trophies/date/31a71d9a-bf26-4f18-b82f-afefe6f50df2.png
new file mode 100644
index 000000000..738bcb6b3
Binary files /dev/null and b/wger/trophies/static/trophies/date/31a71d9a-bf26-4f18-b82f-afefe6f50df2.png differ
diff --git a/wger/trophies/static/trophies/other/32bb12da-b25f-4e18-81e4-b695eb65283e.png b/wger/trophies/static/trophies/other/32bb12da-b25f-4e18-81e4-b695eb65283e.png
new file mode 100644
index 000000000..2fd9d3d45
Binary files /dev/null and b/wger/trophies/static/trophies/other/32bb12da-b25f-4e18-81e4-b695eb65283e.png differ
diff --git a/wger/trophies/static/trophies/placeholder.png b/wger/trophies/static/trophies/placeholder.png
deleted file mode 100644
index c7ff8a4cb..000000000
Binary files a/wger/trophies/static/trophies/placeholder.png and /dev/null differ
diff --git a/wger/trophies/static/trophies/pr/d4a5dbe7-7e15-4f7c-8560-a19f5f27eb2e.png b/wger/trophies/static/trophies/pr/d4a5dbe7-7e15-4f7c-8560-a19f5f27eb2e.png
new file mode 100644
index 000000000..7b3f2c7d0
Binary files /dev/null and b/wger/trophies/static/trophies/pr/d4a5dbe7-7e15-4f7c-8560-a19f5f27eb2e.png differ
diff --git a/wger/trophies/static/trophies/promt.md b/wger/trophies/static/trophies/promt.md
new file mode 100644
index 000000000..073f310b8
--- /dev/null
+++ b/wger/trophies/static/trophies/promt.md
@@ -0,0 +1,66 @@
+# Promt for generating trophy icons
+
+(these are the promts used to generate the trophy icons. As with everything AI, this can change
+at any time in the future, so it's best to also just update one of the ones we already have so that
+the design remains somewhat consistent)
+
+Available background shapes:
+
+* Circle (for basic trophies)
+* Squircle (for special trophies)
+* Shield (for milestone trophies)
+* Star (for other trophies)
+* Diamond (for other trophies)
+
+
+## Promt
+
+You are an expert graphic designer specializing in creating trophy icons for fitness applications.
+Your task is to design a set of visually appealing and easily recognizable trophy icons that
+represent various fitness achievements.
+
+The icons should be modern, minimalist, and easily recognizable, even at smaller sizes.
+
+The icons should be consistent in style and color to create a cohesive set.
+
+Base shape (container): We're using solid, geometric shapes as the background, but not a hexagon, as it's already used in the app.
+
+Aesthetics: Flat design. No gradients, shadows, or textures. Clean edges, but friendly.
+
+Iconography: The icons inside are simplified, bold, and use clear metaphors (chains, weights, watches, etc.).
+
+Typography: Text within the icons should be avoided, numbers (e.g. "5000 kg") are ok though
+
+Color palette: Background shape: A fresh blue #2A4C7D. Text: white.
+Other colors can be used for the icons inside to make them stand out and visually appealing.
+
+The following is a list of trophies we want:
+
+Group "number of workouts":
+name: "Beginner", description: "Complete your first workout", type: "count", shape: "circle"
+name: "Consistent", description: "Complete 10 workouts", type: "count", shape: "circle"
+name: "Dedicated", description: "Complete 50 workouts", type: "count", shape: "circle"
+name: "Obsessed", description: "Complete 100 workouts", type: "count", shape: "Squircle"
+name: "Legend", description: "Complete 200 workouts", type: "count", shape: "Squircle"
+name: "Veteran", description: "Complete 500 workouts", type: "count", shape: "Shield"
+name: "Legend", description: "Complete 1000 workouts", type: "count", shape: "Shield"
+
+Group "workout streaks":
+name: "Unstoppable", description: "Maintain a 30-day workout streak", type: "sequence", shape: "circle"
+
+Group "others":
+name: "Weekend Warrior", description: "Work out on Saturday and Sunday for 4 consecutive weekends", type: "sequence", shape: "circle"
+name: "Early Bird", description: "Complete a workout before 6:00 AM", type: "time", shape: "Diamond"
+name: "Night Owl", description: "Complete a workout after 9:00 PM", type: "time", shape: "Diamond"
+name: "New Year, New Me", description: "Work out on January 1st", type: "date", shape: "Star"
+name: "Phoenix", description: "Return to training after being inactive for 30 days", type: "other", shape: "Star"
+name: "Personal Record", description: "Repeatable Personal Record (PR) trophy", type: "pr", shape: "circle"
+
+Group "cumulative weight lifted":
+name: "Elephant lifter", description: "Lift a cumulative total of 5.000 kg", type: "volume", shape: "circle"
+name: "Bus lifter", description: "Lift a cumulative total of 20.000 kg", type: "volume", shape: "circle"
+name: "Plane lifter", description: "Lift a cumulative total of 50.000 kg", type: "volume", shape: "Squircle"
+name: "Blue whale lifter", description: "Lift a cumulative total of 150.000 kg", type: "volume", shape: "Squircle"
+name: "Space Station lifter", description: "Lift a cumulative total of 450.000 kg", type: "volume", shape: "Shield"
+name: "Millionaire", description: "Lift a cumulative total of 1.000.000 kg (that's a fully loaded space shuttle!)", type: "volume", shape: "Shield"
+name: "Atlas", description: "Lift a cumulative total of 10.000.000 kg", type: "volume", shape: "Shield"
diff --git a/wger/trophies/static/trophies/sequence/b605b6a1-953d-41fb-87c9-a2f88b5f5907.png b/wger/trophies/static/trophies/sequence/b605b6a1-953d-41fb-87c9-a2f88b5f5907.png
new file mode 100644
index 000000000..b37ddc20e
Binary files /dev/null and b/wger/trophies/static/trophies/sequence/b605b6a1-953d-41fb-87c9-a2f88b5f5907.png differ
diff --git a/wger/trophies/static/trophies/sequence/bf60e051-a9a5-4bf5-ac4b-1aa713febca7.png b/wger/trophies/static/trophies/sequence/bf60e051-a9a5-4bf5-ac4b-1aa713febca7.png
new file mode 100644
index 000000000..3bd63e7e7
Binary files /dev/null and b/wger/trophies/static/trophies/sequence/bf60e051-a9a5-4bf5-ac4b-1aa713febca7.png differ
diff --git a/wger/trophies/static/trophies/time/2b00ff1e-69f8-47f0-b8df-976a4127a425.png b/wger/trophies/static/trophies/time/2b00ff1e-69f8-47f0-b8df-976a4127a425.png
new file mode 100644
index 000000000..94cb3bf3c
Binary files /dev/null and b/wger/trophies/static/trophies/time/2b00ff1e-69f8-47f0-b8df-976a4127a425.png differ
diff --git a/wger/trophies/static/trophies/time/cc833c0b-1fd9-4cde-baa5-3bff9cd97d0c.png b/wger/trophies/static/trophies/time/cc833c0b-1fd9-4cde-baa5-3bff9cd97d0c.png
new file mode 100644
index 000000000..2f45eca5f
Binary files /dev/null and b/wger/trophies/static/trophies/time/cc833c0b-1fd9-4cde-baa5-3bff9cd97d0c.png differ
diff --git a/wger/trophies/static/trophies/volume/2c770528-3528-4f0a-9d1a-342d96935bdf.png b/wger/trophies/static/trophies/volume/2c770528-3528-4f0a-9d1a-342d96935bdf.png
new file mode 100644
index 000000000..efdd67277
Binary files /dev/null and b/wger/trophies/static/trophies/volume/2c770528-3528-4f0a-9d1a-342d96935bdf.png differ
diff --git a/wger/trophies/static/trophies/volume/3b4521ee-14bc-4a31-a3d8-e6859e183a35.png b/wger/trophies/static/trophies/volume/3b4521ee-14bc-4a31-a3d8-e6859e183a35.png
new file mode 100644
index 000000000..31ebb4221
Binary files /dev/null and b/wger/trophies/static/trophies/volume/3b4521ee-14bc-4a31-a3d8-e6859e183a35.png differ
diff --git a/wger/trophies/static/trophies/volume/3c53887b-feba-4d73-8022-e446f46395c8.png b/wger/trophies/static/trophies/volume/3c53887b-feba-4d73-8022-e446f46395c8.png
new file mode 100644
index 000000000..b3c19f20f
Binary files /dev/null and b/wger/trophies/static/trophies/volume/3c53887b-feba-4d73-8022-e446f46395c8.png differ
diff --git a/wger/trophies/static/trophies/volume/5353989b-adc0-481b-a9bc-64365a9179e8.png b/wger/trophies/static/trophies/volume/5353989b-adc0-481b-a9bc-64365a9179e8.png
new file mode 100644
index 000000000..2ec9b119e
Binary files /dev/null and b/wger/trophies/static/trophies/volume/5353989b-adc0-481b-a9bc-64365a9179e8.png differ
diff --git a/wger/trophies/static/trophies/volume/70ee1605-20b8-4c8d-87a1-3787b9b3939d.png b/wger/trophies/static/trophies/volume/70ee1605-20b8-4c8d-87a1-3787b9b3939d.png
new file mode 100644
index 000000000..505752965
Binary files /dev/null and b/wger/trophies/static/trophies/volume/70ee1605-20b8-4c8d-87a1-3787b9b3939d.png differ
diff --git a/wger/trophies/static/trophies/volume/e414c29d-5828-4ca3-83b5-4837a71ed48f.png b/wger/trophies/static/trophies/volume/e414c29d-5828-4ca3-83b5-4837a71ed48f.png
new file mode 100644
index 000000000..09a16d63d
Binary files /dev/null and b/wger/trophies/static/trophies/volume/e414c29d-5828-4ca3-83b5-4837a71ed48f.png differ
diff --git a/wger/trophies/static/trophies/volume/f0a5fd12-2508-4654-89aa-3d6dbb29c7e3.png b/wger/trophies/static/trophies/volume/f0a5fd12-2508-4654-89aa-3d6dbb29c7e3.png
new file mode 100644
index 000000000..22dfdb70d
Binary files /dev/null and b/wger/trophies/static/trophies/volume/f0a5fd12-2508-4654-89aa-3d6dbb29c7e3.png differ
diff --git a/wger/trophies/static/trophies/xn_convert.bat b/wger/trophies/static/trophies/xn_convert.bat
new file mode 100644
index 000000000..d19d72cc6
--- /dev/null
+++ b/wger/trophies/static/trophies/xn_convert.bat
@@ -0,0 +1 @@
+nconvert -ratio -rtype lanczos -resize 800 800 -dither -colors 64 -out png -clevel 9
\ No newline at end of file