diff --git a/cookbook/admin.py b/cookbook/admin.py index d2b5c31a..82324628 100644 --- a/cookbook/admin.py +++ b/cookbook/admin.py @@ -60,9 +60,9 @@ admin.site.register(UserSpace, UserSpaceAdmin) class UserPreferenceAdmin(admin.ModelAdmin): - list_display = ('name', 'theme', 'nav_color', 'default_page',) + list_display = ('name', 'theme', 'default_page') search_fields = ('user__username',) - list_filter = ('theme', 'nav_color', 'default_page',) + list_filter = ('theme', 'default_page',) date_hierarchy = 'created_at' filter_horizontal = ('plan_share', 'shopping_share',) @@ -108,11 +108,16 @@ class SupermarketCategoryInline(admin.TabularInline): class SupermarketAdmin(admin.ModelAdmin): + list_display = ('name', 'space',) inlines = (SupermarketCategoryInline,) +class SupermarketCategoryAdmin(admin.ModelAdmin): + list_display = ('name', 'space',) + + admin.site.register(Supermarket, SupermarketAdmin) -admin.site.register(SupermarketCategory) +admin.site.register(SupermarketCategory, SupermarketCategoryAdmin) class SyncLogAdmin(admin.ModelAdmin): @@ -163,10 +168,18 @@ def delete_unattached_steps(modeladmin, request, queryset): class StepAdmin(admin.ModelAdmin): - list_display = ('name', 'order',) - search_fields = ('name',) + list_display = ('recipe_and_name', 'order', 'space') + ordering = ('recipe__name', 'name', 'space',) + search_fields = ('name', 'recipe__name') actions = [delete_unattached_steps] + @staticmethod + @admin.display(description="Name") + def recipe_and_name(obj): + if not obj.recipe_set.exists(): + return f"Orphaned Step{'':s if not obj.name else f': {obj.name}'}" + return f"{obj.recipe_set.first().name}: {obj.name}" if obj.name else obj.recipe_set.first().name + admin.site.register(Step, StepAdmin) @@ -183,8 +196,9 @@ def rebuild_index(modeladmin, request, queryset): class RecipeAdmin(admin.ModelAdmin): - list_display = ('name', 'internal', 'created_by', 'storage') + list_display = ('name', 'internal', 'created_by', 'storage', 'space') search_fields = ('name', 'created_by__username') + ordering = ('name', 'created_by__username',) list_filter = ('internal',) date_hierarchy = 'created_at' @@ -198,7 +212,14 @@ class RecipeAdmin(admin.ModelAdmin): admin.site.register(Recipe, RecipeAdmin) -admin.site.register(Unit) + +class UnitAdmin(admin.ModelAdmin): + list_display = ('name', 'space') + ordering = ('name', 'space',) + search_fields = ('name',) + + +admin.site.register(Unit, UnitAdmin) # admin.site.register(FoodInheritField) @@ -229,10 +250,16 @@ def delete_unattached_ingredients(modeladmin, request, queryset): class IngredientAdmin(admin.ModelAdmin): - list_display = ('food', 'amount', 'unit') - search_fields = ('food__name', 'unit__name') + list_display = ('recipe_name', 'amount', 'unit', 'food', 'space') + search_fields = ('food__name', 'unit__name', 'step__recipe__name') actions = [delete_unattached_ingredients] + @staticmethod + @admin.display(description="Recipe") + def recipe_name(obj): + recipes = obj.step_set.first().recipe_set.all() if obj.step_set.exists() else None + return recipes.first().name if recipes else 'Orphaned Ingredient' + admin.site.register(Ingredient, IngredientAdmin) @@ -258,7 +285,7 @@ admin.site.register(RecipeImport, RecipeImportAdmin) class RecipeBookAdmin(admin.ModelAdmin): - list_display = ('name', 'user_name') + list_display = ('name', 'user_name', 'space') search_fields = ('name', 'created_by__username') @staticmethod @@ -334,11 +361,11 @@ class ShoppingListEntryAdmin(admin.ModelAdmin): admin.site.register(ShoppingListEntry, ShoppingListEntryAdmin) -class ShoppingListAdmin(admin.ModelAdmin): - list_display = ('id', 'created_by', 'created_at') +# class ShoppingListAdmin(admin.ModelAdmin): +# list_display = ('id', 'created_by', 'created_at') -admin.site.register(ShoppingList, ShoppingListAdmin) +# admin.site.register(ShoppingList, ShoppingListAdmin) class ShareLinkAdmin(admin.ModelAdmin): diff --git a/cookbook/forms.py b/cookbook/forms.py index 36b35ed5..dd62aa0b 100644 --- a/cookbook/forms.py +++ b/cookbook/forms.py @@ -33,64 +33,6 @@ class DateWidget(forms.DateInput): super().__init__(**kwargs) -class UserPreferenceForm(forms.ModelForm): - prefix = 'preference' - - def __init__(self, *args, **kwargs): - space = kwargs.pop('space') - super().__init__(*args, **kwargs) - self.fields['plan_share'].queryset = User.objects.filter(userspace__space=space).all() - - class Meta: - model = UserPreference - fields = ( - 'default_unit', 'use_fractions', 'use_kj', 'theme', 'nav_color', - 'sticky_navbar', 'default_page', 'plan_share', 'ingredient_decimals', 'comments', 'left_handed', 'show_step_ingredients', - ) - - labels = { - 'default_unit': _('Default unit'), - 'use_fractions': _('Use fractions'), - 'use_kj': _('Use KJ'), - 'theme': _('Theme'), - 'nav_color': _('Navbar color'), - 'sticky_navbar': _('Sticky navbar'), - 'default_page': _('Default page'), - 'plan_share': _('Plan sharing'), - 'ingredient_decimals': _('Ingredient decimal places'), - 'shopping_auto_sync': _('Shopping list auto sync period'), - 'comments': _('Comments'), - 'left_handed': _('Left-handed mode'), - 'show_step_ingredients': _('Show step ingredients table') - } - - help_texts = { - 'nav_color': _('Color of the top navigation bar. Not all colors work with all themes, just try them out!'), - 'default_unit': _('Default Unit to be used when inserting a new ingredient into a recipe.'), - 'use_fractions': _( - 'Enables support for fractions in ingredient amounts (e.g. convert decimals to fractions automatically)'), - 'use_kj': _('Display nutritional energy amounts in joules instead of calories'), - 'plan_share': _('Users with whom newly created meal plans should be shared by default.'), - 'shopping_share': _('Users with whom to share shopping lists.'), - 'ingredient_decimals': _('Number of decimals to round ingredients.'), - 'comments': _('If you want to be able to create and see comments underneath recipes.'), - 'shopping_auto_sync': _( - 'Setting to 0 will disable auto sync. When viewing a shopping list the list is updated every set seconds to sync changes someone else might have made. Useful when shopping with multiple people but might use a little bit ' - 'of mobile data. If lower than instance limit it is reset when saving.' - ), - 'sticky_navbar': _('Makes the navbar stick to the top of the page.'), - 'mealplan_autoadd_shopping': _('Automatically add meal plan ingredients to shopping list.'), - 'mealplan_autoexclude_onhand': _('Exclude ingredients that are on hand.'), - 'left_handed': _('Will optimize the UI for use with your left hand.'), - 'show_step_ingredients': _('Add ingredients table next to recipe steps. Applies at creation time for manually created and URL imported recipes. Individual steps can be overridden in the edit recipe view.') - } - - widgets = { - 'plan_share': MultiSelectWidget, - 'shopping_share': MultiSelectWidget, - } - - class UserNameForm(forms.ModelForm): prefix = 'name' diff --git a/cookbook/locale/ar/LC_MESSAGES/django.mo b/cookbook/locale/ar/LC_MESSAGES/django.mo index fb42d5ab..fef6bf7a 100644 Binary files a/cookbook/locale/ar/LC_MESSAGES/django.mo and b/cookbook/locale/ar/LC_MESSAGES/django.mo differ diff --git a/cookbook/locale/de/LC_MESSAGES/django.mo b/cookbook/locale/de/LC_MESSAGES/django.mo index 78118e92..0f91aaee 100644 Binary files a/cookbook/locale/de/LC_MESSAGES/django.mo and b/cookbook/locale/de/LC_MESSAGES/django.mo differ diff --git a/cookbook/locale/es/LC_MESSAGES/django.mo b/cookbook/locale/es/LC_MESSAGES/django.mo index a5a17f3c..4861f551 100644 Binary files a/cookbook/locale/es/LC_MESSAGES/django.mo and b/cookbook/locale/es/LC_MESSAGES/django.mo differ diff --git a/cookbook/locale/fr/LC_MESSAGES/django.mo b/cookbook/locale/fr/LC_MESSAGES/django.mo index ff2ecd18..d70b35cf 100644 Binary files a/cookbook/locale/fr/LC_MESSAGES/django.mo and b/cookbook/locale/fr/LC_MESSAGES/django.mo differ diff --git a/cookbook/locale/he/LC_MESSAGES/django.mo b/cookbook/locale/he/LC_MESSAGES/django.mo new file mode 100644 index 00000000..a9c3e676 Binary files /dev/null and b/cookbook/locale/he/LC_MESSAGES/django.mo differ diff --git a/cookbook/locale/hu_HU/LC_MESSAGES/django.mo b/cookbook/locale/hu_HU/LC_MESSAGES/django.mo index b35f518b..e1d02267 100644 Binary files a/cookbook/locale/hu_HU/LC_MESSAGES/django.mo and b/cookbook/locale/hu_HU/LC_MESSAGES/django.mo differ diff --git a/cookbook/locale/pt/LC_MESSAGES/django.mo b/cookbook/locale/pt/LC_MESSAGES/django.mo index adefc9fd..28b0ca1b 100644 Binary files a/cookbook/locale/pt/LC_MESSAGES/django.mo and b/cookbook/locale/pt/LC_MESSAGES/django.mo differ diff --git a/cookbook/locale/pt_BR/LC_MESSAGES/django.mo b/cookbook/locale/pt_BR/LC_MESSAGES/django.mo index 181b78e7..6cd5196b 100644 Binary files a/cookbook/locale/pt_BR/LC_MESSAGES/django.mo and b/cookbook/locale/pt_BR/LC_MESSAGES/django.mo differ diff --git a/cookbook/migrations/0200_alter_propertytype_options_remove_keyword_icon_and_more.py b/cookbook/migrations/0200_alter_propertytype_options_remove_keyword_icon_and_more.py index 104d6a72..a57ad977 100644 --- a/cookbook/migrations/0200_alter_propertytype_options_remove_keyword_icon_and_more.py +++ b/cookbook/migrations/0200_alter_propertytype_options_remove_keyword_icon_and_more.py @@ -1,7 +1,7 @@ # Generated by Django 4.1.10 on 2023-08-29 11:59 from django.db import migrations -from django.db.models import F, Value +from django.db.models import F, Value, Count from django.db.models.functions import Concat from django_scopes import scopes_disabled @@ -13,9 +13,24 @@ def migrate_icons(apps, schema_editor): PropertyType = apps.get_model('cookbook', 'PropertyType') RecipeBook = apps.get_model('cookbook', 'RecipeBook') + duplicate_meal_types = MealType.objects.values('name').annotate(name_count=Count('name')).exclude(name_count=1).all() + if len(duplicate_meal_types) > 0: + raise RuntimeError(f'Duplicate MealTypes found, please remove/rename them and run migrations again/restart the container. {duplicate_meal_types}') MealType.objects.update(name=Concat(F('icon'), Value(' '), F('name'))) + + duplicate_meal_types = Keyword.objects.values('name').annotate(name_count=Count('name')).exclude(name_count=1).all() + if len(duplicate_meal_types) > 0: + raise RuntimeError(f'Duplicate Keyword found, please remove/rename them and run migrations again/restart the container. {duplicate_meal_types}') Keyword.objects.update(name=Concat(F('icon'), Value(' '), F('name'))) + + duplicate_meal_types = PropertyType.objects.values('name').annotate(name_count=Count('name')).exclude(name_count=1).all() + if len(duplicate_meal_types) > 0: + raise RuntimeError(f'Duplicate PropertyType found, please remove/rename them and run migrations again/restart the container. {duplicate_meal_types}') PropertyType.objects.update(name=Concat(F('icon'), Value(' '), F('name'))) + + duplicate_meal_types = RecipeBook.objects.values('name').annotate(name_count=Count('name')).exclude(name_count=1).all() + if len(duplicate_meal_types) > 0: + raise RuntimeError(f'Duplicate RecipeBook found, please remove/rename them and run migrations again/restart the container. {duplicate_meal_types}') RecipeBook.objects.update(name=Concat(F('icon'), Value(' '), F('name'))) @@ -25,10 +40,7 @@ class Migration(migrations.Migration): ] operations = [ - - migrations.RunPython( - migrate_icons - ), + migrations.RunPython( migrate_icons), migrations.AlterModelOptions( name='propertytype', options={'ordering': ('order',)}, diff --git a/cookbook/migrations/0204_propertytype_fdc_id.py b/cookbook/migrations/0204_propertytype_fdc_id.py index 1744cc9b..70598463 100644 --- a/cookbook/migrations/0204_propertytype_fdc_id.py +++ b/cookbook/migrations/0204_propertytype_fdc_id.py @@ -1,15 +1,23 @@ # Generated by Django 4.2.7 on 2023-11-27 21:09 from django.db import migrations, models +from django_scopes import scopes_disabled + + +def fix_fdc_ids(apps, schema_editor): + with scopes_disabled(): + # in case any food had a non digit fdc ID before this migration, remove it + Food = apps.get_model('cookbook', 'Food') + Food.objects.exclude(fdc_id__regex=r'^\d+$').exclude(fdc_id=None).update(fdc_id=None) class Migration(migrations.Migration): - dependencies = [ ('cookbook', '0203_alter_unique_contstraints'), ] operations = [ + migrations.RunPython(fix_fdc_ids), migrations.AddField( model_name='propertytype', name='fdc_id', diff --git a/cookbook/migrations/0206_rename_sticky_navbar_userpreference_nav_sticky_and_more.py b/cookbook/migrations/0206_rename_sticky_navbar_userpreference_nav_sticky_and_more.py new file mode 100644 index 00000000..fb949029 --- /dev/null +++ b/cookbook/migrations/0206_rename_sticky_navbar_userpreference_nav_sticky_and_more.py @@ -0,0 +1,128 @@ +# Generated by Django 4.2.7 on 2024-01-01 18:44 +import django +from django.db import migrations, models +from django_scopes import scopes_disabled + +TANDOOR = 'TANDOOR' +TANDOOR_DARK = 'TANDOOR_DARK' +BOOTSTRAP = 'BOOTSTRAP' +DARKLY = 'DARKLY' +FLATLY = 'FLATLY' +SUPERHERO = 'SUPERHERO' + +PRIMARY = 'PRIMARY' +SECONDARY = 'SECONDARY' +SUCCESS = 'SUCCESS' +INFO = 'INFO' +WARNING = 'WARNING' +DANGER = 'DANGER' +LIGHT = 'LIGHT' +DARK = 'DARK' + + +# ['light', 'warning', 'info', 'success'] --> light (theming_tags L45) +def get_nav_bg_color(theme, nav_color): + if theme == TANDOOR: # primary not actually primary color but override existed before update, same for dark + return {PRIMARY: '#ddbf86', SECONDARY: '#b55e4f', SUCCESS: '#82aa8b', INFO: '#385f84', WARNING: '#eaaa21', DANGER: '#a7240e', LIGHT: '#cfd5cd', DARK: '#221e1e'}[nav_color] + if theme == TANDOOR_DARK: + return {PRIMARY: '#ddbf86', SECONDARY: '#b55e4f', SUCCESS: '#82aa8b', INFO: '#385f84', WARNING: '#eaaa21', DANGER: '#a7240e', LIGHT: '#cfd5cd', DARK: '#221e1e'}[nav_color] + if theme == BOOTSTRAP: + return {PRIMARY: '#007bff', SECONDARY: '#6c757d', SUCCESS: '#28a745', INFO: '#17a2b8', WARNING: '#ffc107', DANGER: '#dc3545', LIGHT: '#f8f9fa', DARK: '#343a40'}[nav_color] + if theme == DARKLY: + return {PRIMARY: '#375a7f', SECONDARY: '#444', SUCCESS: '#00bc8c', INFO: '#3498DB', WARNING: '#F39C12', DANGER: '#E74C3C', LIGHT: '#999', DARK: '#303030'}[nav_color] + if theme == FLATLY: + return {PRIMARY: '#2C3E50', SECONDARY: '#95a5a6', SUCCESS: '#18BC9C', INFO: '#3498DB', WARNING: '#F39C12', DANGER: '#E74C3C', LIGHT: '#ecf0f1', DARK: '#7b8a8b'}[nav_color] + if theme == SUPERHERO: + return {PRIMARY: '#DF691A', SECONDARY: '#4E5D6C', SUCCESS: '#5cb85c', INFO: '#5bc0de', WARNING: '#f0ad4e', DANGER: '#d9534f', LIGHT: '#abb6c2', DARK: '#4E5D6C'}[nav_color] + + +def get_nav_text_color(theme, nav_color): + if theme == TANDOOR: + return {PRIMARY: DARK, SECONDARY: DARK, SUCCESS: DARK, INFO: DARK, WARNING: DARK, DANGER: DARK, LIGHT: DARK, DARK: DARK}[nav_color] + if theme == TANDOOR_DARK: + return {PRIMARY: DARK, SECONDARY: DARK, SUCCESS: DARK, INFO: DARK, WARNING: DARK, DANGER: DARK, LIGHT: DARK, DARK: DARK}[nav_color] + if theme == BOOTSTRAP: + return {PRIMARY: DARK, SECONDARY: DARK, SUCCESS: DARK, INFO: DARK, WARNING: DARK, DANGER: DARK, LIGHT: DARK, DARK: DARK}[nav_color] + if theme == DARKLY: + return {PRIMARY: DARK, SECONDARY: DARK, SUCCESS: DARK, INFO: DARK, WARNING: DARK, DANGER: DARK, LIGHT: DARK, DARK: DARK}[nav_color] + if theme == FLATLY: + return {PRIMARY: DARK, SECONDARY: DARK, SUCCESS: LIGHT, INFO: LIGHT, WARNING: LIGHT, DANGER: DARK, LIGHT: LIGHT, DARK: DARK}[nav_color] + if theme == SUPERHERO: + return {PRIMARY: DARK, SECONDARY: DARK, SUCCESS: LIGHT, INFO: LIGHT, WARNING: LIGHT, DANGER: DARK, LIGHT: LIGHT, DARK: DARK}[nav_color] + + +def get_current_colors(apps, schema_editor): + with scopes_disabled(): + # in case any food had a non digit fdc ID before this migration, remove it + UserPreference = apps.get_model('cookbook', 'UserPreference') + + update_ups = [] + for up in UserPreference.objects.all(): + if up.theme != TANDOOR or up.nav_color != PRIMARY: + up.nav_bg_color = get_nav_bg_color(up.theme, up.nav_color) + up.nav_text_color = get_nav_text_color(up.theme, up.nav_color) + up.nav_show_logo = (up.theme == TANDOOR or up.theme == TANDOOR_DARK) + update_ups.append(up) + + UserPreference.objects.bulk_update(update_ups, ['nav_bg_color', 'nav_text_color', 'nav_show_logo']) + + +class Migration(migrations.Migration): + dependencies = [ + ('cookbook', '0205_alter_food_fdc_id_alter_propertytype_fdc_id'), + ] + + operations = [ + migrations.RenameField( + model_name='userpreference', + old_name='sticky_navbar', + new_name='nav_sticky', + ), + migrations.AddField( + model_name='userpreference', + name='nav_bg_color', + field=models.CharField(default='#ddbf86', max_length=8), + ), + migrations.AddField( + model_name='userpreference', + name='nav_text_color', + field=models.CharField(choices=[('LIGHT', 'Light'), ('DARK', 'Dark')], default='DARK', max_length=16), + ), + migrations.AddField( + model_name='userpreference', + name='nav_show_logo', + field=models.BooleanField(default=True), + ), + migrations.RunPython(get_current_colors), + migrations.RemoveField( + model_name='userpreference', + name='nav_color', + ), + migrations.AddField( + model_name='space', + name='nav_bg_color', + field=models.CharField(blank=True, default='', max_length=8), + ), + migrations.AddField( + model_name='space', + name='nav_logo', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='space_nav_logo', to='cookbook.userfile'), + ), + migrations.AddField( + model_name='space', + name='nav_text_color', + field=models.CharField(choices=[('BLANK', '-------'), ('LIGHT', 'Light'), ('DARK', 'Dark')], default='BLANK', max_length=16), + ), + migrations.AddField( + model_name='space', + name='space_theme', + field=models.CharField(choices=[('BLANK', '-------'), ('TANDOOR', 'Tandoor'), ('BOOTSTRAP', 'Bootstrap'), ('DARKLY', 'Darkly'), ('FLATLY', 'Flatly'), ('SUPERHERO', 'Superhero'), ('TANDOOR_DARK', 'Tandoor Dark (INCOMPLETE)')], + default='BLANK', + max_length=128), + ), + migrations.AddField( + model_name='space', + name='custom_space_theme', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='space_theme', to='cookbook.userfile'), + ), + ] diff --git a/cookbook/models.py b/cookbook/models.py index c40bb41f..a1162cff 100644 --- a/cookbook/models.py +++ b/cookbook/models.py @@ -251,8 +251,44 @@ class FoodInheritField(models.Model, PermissionModelMixin): class Space(ExportModelOperationsMixin('space'), models.Model): + # TODO remove redundant theming constants + # Themes + BLANK = 'BLANK' + TANDOOR = 'TANDOOR' + TANDOOR_DARK = 'TANDOOR_DARK' + BOOTSTRAP = 'BOOTSTRAP' + DARKLY = 'DARKLY' + FLATLY = 'FLATLY' + SUPERHERO = 'SUPERHERO' + + THEMES = ( + (BLANK, '-------'), + (TANDOOR, 'Tandoor'), + (BOOTSTRAP, 'Bootstrap'), + (DARKLY, 'Darkly'), + (FLATLY, 'Flatly'), + (SUPERHERO, 'Superhero'), + (TANDOOR_DARK, 'Tandoor Dark (INCOMPLETE)'), + ) + + LIGHT = 'LIGHT' + DARK = 'DARK' + + NAV_TEXT_COLORS = ( + (BLANK, '-------'), + (LIGHT, 'Light'), + (DARK, 'Dark') + ) + name = models.CharField(max_length=128, default='Default') + image = models.ForeignKey("UserFile", on_delete=models.SET_NULL, null=True, blank=True, related_name='space_image') + space_theme = models.CharField(choices=THEMES, max_length=128, default=TANDOOR) + custom_space_theme = models.ForeignKey("UserFile", on_delete=models.SET_NULL, null=True, blank=True, related_name='space_theme') + nav_logo = models.ForeignKey("UserFile", on_delete=models.SET_NULL, null=True, blank=True, related_name='space_nav_logo') + nav_bg_color = models.CharField(max_length=8, default='', blank=True, ) + nav_text_color = models.CharField(max_length=16, choices=NAV_TEXT_COLORS, default=DARK) + created_by = models.ForeignKey(User, on_delete=models.PROTECT, null=True) created_at = models.DateTimeField(auto_now_add=True) message = models.CharField(max_length=512, default='', blank=True) @@ -338,22 +374,10 @@ class UserPreference(models.Model, PermissionModelMixin): ) # Nav colors - PRIMARY = 'PRIMARY' - SECONDARY = 'SECONDARY' - SUCCESS = 'SUCCESS' - INFO = 'INFO' - WARNING = 'WARNING' - DANGER = 'DANGER' LIGHT = 'LIGHT' DARK = 'DARK' - COLORS = ( - (PRIMARY, 'Primary'), - (SECONDARY, 'Secondary'), - (SUCCESS, 'Success'), - (INFO, 'Info'), - (WARNING, 'Warning'), - (DANGER, 'Danger'), + NAV_TEXT_COLORS = ( (LIGHT, 'Light'), (DARK, 'Dark') ) @@ -371,8 +395,13 @@ class UserPreference(models.Model, PermissionModelMixin): user = AutoOneToOneField(User, on_delete=models.CASCADE, primary_key=True) image = models.ForeignKey("UserFile", on_delete=models.SET_NULL, null=True, blank=True, related_name='user_image') + theme = models.CharField(choices=THEMES, max_length=128, default=TANDOOR) - nav_color = models.CharField(choices=COLORS, max_length=128, default=PRIMARY) + nav_bg_color = models.CharField(max_length=8, default='#ddbf86') + nav_text_color = models.CharField(max_length=16, choices=NAV_TEXT_COLORS, default=DARK) + nav_show_logo = models.BooleanField(default=True) + nav_sticky = models.BooleanField(default=STICKY_NAV_PREF_DEFAULT) + default_unit = models.CharField(max_length=32, default='g') use_fractions = models.BooleanField(default=FRACTION_PREF_DEFAULT) use_kj = models.BooleanField(default=KJ_PREF_DEFAULT) @@ -382,7 +411,6 @@ class UserPreference(models.Model, PermissionModelMixin): ingredient_decimals = models.IntegerField(default=2) comments = models.BooleanField(default=COMMENT_PREF_DEFAULT) shopping_auto_sync = models.IntegerField(default=5) - sticky_navbar = models.BooleanField(default=STICKY_NAV_PREF_DEFAULT) mealplan_autoadd_shopping = models.BooleanField(default=False) mealplan_autoexclude_onhand = models.BooleanField(default=True) mealplan_autoinclude_related = models.BooleanField(default=True) @@ -718,6 +746,9 @@ class Ingredient(ExportModelOperationsMixin('ingredient'), models.Model, Permiss space = models.ForeignKey(Space, on_delete=models.CASCADE) objects = ScopedManager(space='space') + def __str__(self): + return f'{self.pk}: {self.amount} {self.food.name} {self.unit.name}' + class Meta: ordering = ['order', 'pk'] indexes = ( @@ -745,7 +776,9 @@ class Step(ExportModelOperationsMixin('step'), models.Model, PermissionModelMixi return render_instructions(self) def __str__(self): - return f'{self.pk} {self.name}' + if not self.recipe_set.exists(): + return f"{self.pk}: {_('Orphaned Step')}" + return f"{self.pk}: {self.name}" if self.name else f"Step: {self.pk}" class Meta: ordering = ['order', 'pk'] diff --git a/cookbook/serializer.py b/cookbook/serializer.py index ff4e2dfc..c1796351 100644 --- a/cookbook/serializer.py +++ b/cookbook/serializer.py @@ -212,7 +212,7 @@ class UserFileSerializer(serializers.ModelSerializer): Image.open(obj.file.file.file) return self.context['request'].build_absolute_uri(obj.file.url) except Exception: - traceback.print_exc() + # traceback.print_exc() return "" def check_file_limit(self, validated_data): @@ -260,7 +260,7 @@ class UserFileViewSerializer(serializers.ModelSerializer): Image.open(obj.file.file.file) return self.context['request'].build_absolute_uri(obj.file.url) except Exception: - traceback.print_exc() + # traceback.print_exc() return "" def create(self, validated_data): @@ -281,6 +281,8 @@ class SpaceSerializer(WritableNestedModelSerializer): file_size_mb = serializers.SerializerMethodField('get_file_size_mb') food_inherit = FoodInheritFieldSerializer(many=True) image = UserFileViewSerializer(required=False, many=False, allow_null=True) + nav_logo = UserFileViewSerializer(required=False, many=False, allow_null=True) + custom_space_theme = UserFileViewSerializer(required=False, many=False, allow_null=True) def get_user_count(self, obj): return UserSpace.objects.filter(space=obj).count() @@ -302,7 +304,7 @@ class SpaceSerializer(WritableNestedModelSerializer): fields = ( 'id', 'name', 'created_by', 'created_at', 'message', 'max_recipes', 'max_file_storage_mb', 'max_users', 'allow_sharing', 'demo', 'food_inherit', 'user_count', 'recipe_count', 'file_size_mb', - 'image', 'use_plural',) + 'image', 'nav_logo', 'space_theme', 'custom_space_theme', 'nav_bg_color', 'nav_text_color', 'use_plural',) read_only_fields = ( 'id', 'created_by', 'created_at', 'max_recipes', 'max_file_storage_mb', 'max_users', 'allow_sharing', 'demo',) @@ -372,8 +374,8 @@ class UserPreferenceSerializer(WritableNestedModelSerializer): class Meta: model = UserPreference fields = ( - 'user', 'image', 'theme', 'nav_color', 'default_unit', 'default_page', 'use_fractions', 'use_kj', - 'plan_share', 'sticky_navbar', + 'user', 'image', 'theme', 'nav_bg_color', 'nav_text_color', 'nav_show_logo', 'default_unit', 'default_page', 'use_fractions', 'use_kj', + 'plan_share', 'nav_sticky', 'ingredient_decimals', 'comments', 'shopping_auto_sync', 'mealplan_autoadd_shopping', 'food_inherit_default', 'default_delay', 'mealplan_autoinclude_related', 'mealplan_autoexclude_onhand', 'shopping_share', 'shopping_recent_days', diff --git a/cookbook/static/themes/tandoor.min.css b/cookbook/static/themes/tandoor.min.css index a7740b7f..5744a8d8 100644 --- a/cookbook/static/themes/tandoor.min.css +++ b/cookbook/static/themes/tandoor.min.css @@ -4457,28 +4457,28 @@ input[type=button].btn-block, input[type=reset].btn-block, input[type=submit].bt } .navbar-light .navbar-brand, .navbar-light .navbar-brand:focus, .navbar-light .navbar-brand:hover { - color: rgba(46, 46, 46, .9) + color: rgba(0, 0, 0, .9) } .navbar-light .navbar-nav .nav-link { - color: rgba(46, 46, 46, .5) + color: rgba(0, 0, 0, .5) } .navbar-light .navbar-nav .nav-link:focus, .navbar-light .navbar-nav .nav-link:hover { - color: rgba(46, 46, 46, .7) + color: rgba(0, 0, 0, .7) } .navbar-light .navbar-nav .nav-link.disabled { - color: rgba(46, 46, 46, .3) + color: rgba(0, 0, 0, .3) } .navbar-light .navbar-nav .active > .nav-link, .navbar-light .navbar-nav .nav-link.active, .navbar-light .navbar-nav .nav-link.show, .navbar-light .navbar-nav .show > .nav-link { - color: rgba(46, 46, 46, .9) + color: rgba(0, 0, 0, .9) } .navbar-light .navbar-toggler { - color: rgba(46, 46, 46, .5); - border-color: rgba(46, 46, 46, .1) + color: rgba(0, 0, 0, .5); + border-color: rgba(0, 0, 0, .1) } .navbar-light .navbar-toggler-icon { @@ -4486,11 +4486,7 @@ input[type=button].btn-block, input[type=reset].btn-block, input[type=submit].bt } .navbar-light .navbar-text { - color: rgba(46, 46, 46, .5) -} - -.navbar-light .navbar-text a, .navbar-light .navbar-text a:focus, .navbar-light .navbar-text a:hover { - color: rgba(46, 46, 46, .9) + color: rgba(0, 0, 0, .5) } .navbar-dark .navbar-brand, .navbar-dark .navbar-brand:focus, .navbar-dark .navbar-brand:hover { @@ -4498,24 +4494,24 @@ input[type=button].btn-block, input[type=reset].btn-block, input[type=submit].bt } .navbar-dark .navbar-nav .nav-link { - color: hsla(0, 0%, 18%, .5) + color: rgba(255, 255, 255, .5) } .navbar-dark .navbar-nav .nav-link:focus, .navbar-dark .navbar-nav .nav-link:hover { - color: hsla(0, 0%, 18%, .75) + color: rgba(255, 255, 255, .75) } .navbar-dark .navbar-nav .nav-link.disabled { - color: hsla(0, 0%, 18%, .25) + color: rgba(255, 255, 255, .25) } .navbar-dark .navbar-nav .active > .nav-link, .navbar-dark .navbar-nav .nav-link.active, .navbar-dark .navbar-nav .nav-link.show, .navbar-dark .navbar-nav .show > .nav-link { - color: #2e2e2e + color: #FFF } .navbar-dark .navbar-toggler { - color: rgba(46, 46, 46, 0.5); - border-color: rgba(46, 46, 46, 0.5); + color: rgba(255, 255, 255, .5); + border-color: rgba(255, 255, 255, .1) } .navbar-dark .navbar-toggler-icon { @@ -4523,7 +4519,7 @@ input[type=button].btn-block, input[type=reset].btn-block, input[type=submit].bt } .navbar-dark .navbar-text { - color: hsla(0, 0%, 18%, .5) + color: rgba(255, 255, 255, .5) } .navbar-dark .navbar-text a, .navbar-dark .navbar-text a:focus, .navbar-dark .navbar-text a:hover { diff --git a/cookbook/static/themes/tandoor_dark.min.css b/cookbook/static/themes/tandoor_dark.min.css index 97c9cf6c..68a14037 100644 --- a/cookbook/static/themes/tandoor_dark.min.css +++ b/cookbook/static/themes/tandoor_dark.min.css @@ -4460,28 +4460,28 @@ input[type=button].btn-block, input[type=reset].btn-block, input[type=submit].bt } .navbar-light .navbar-brand, .navbar-light .navbar-brand:focus, .navbar-light .navbar-brand:hover { - color: rgba(46, 46, 46, .9) + color: rgba(0, 0, 0, .9) } .navbar-light .navbar-nav .nav-link { - color: rgba(46, 46, 46, .5) + color: rgba(0, 0, 0, .5) } .navbar-light .navbar-nav .nav-link:focus, .navbar-light .navbar-nav .nav-link:hover { - color: rgba(46, 46, 46, .7) + color: rgba(0, 0, 0, .7) } .navbar-light .navbar-nav .nav-link.disabled { - color: rgba(46, 46, 46, .3) + color: rgba(0, 0, 0, .3) } .navbar-light .navbar-nav .active > .nav-link, .navbar-light .navbar-nav .nav-link.active, .navbar-light .navbar-nav .nav-link.show, .navbar-light .navbar-nav .show > .nav-link { - color: rgba(46, 46, 46, .9) + color: rgba(0, 0, 0, .9) } .navbar-light .navbar-toggler { - color: rgba(46, 46, 46, .5); - border-color: rgba(46, 46, 46, .1) + color: rgba(0, 0, 0, .5); + border-color: rgba(0, 0, 0, .1) } .navbar-light .navbar-toggler-icon { @@ -4489,11 +4489,11 @@ input[type=button].btn-block, input[type=reset].btn-block, input[type=submit].bt } .navbar-light .navbar-text { - color: rgba(46, 46, 46, .5) + color: rgba(0, 0, 0, .5) } .navbar-light .navbar-text a, .navbar-light .navbar-text a:focus, .navbar-light .navbar-text a:hover { - color: rgba(46, 46, 46, .9) + color: rgba(0, 0, 0, .9) } .navbar-dark .navbar-brand, .navbar-dark .navbar-brand:focus, .navbar-dark .navbar-brand:hover { @@ -4501,24 +4501,24 @@ input[type=button].btn-block, input[type=reset].btn-block, input[type=submit].bt } .navbar-dark .navbar-nav .nav-link { - color: hsla(0, 0%, 5%, .5) + color: rgba(255, 255, 255, .5) } .navbar-dark .navbar-nav .nav-link:focus, .navbar-dark .navbar-nav .nav-link:hover { - color: hsla(0, 0%, 5%, .75) + color: rgba(255, 255, 255, .75) } .navbar-dark .navbar-nav .nav-link.disabled { - color: hsla(0, 0%, 5%, .25) + color: rgba(255, 255, 255, .25) } .navbar-dark .navbar-nav .active > .nav-link, .navbar-dark .navbar-nav .nav-link.active, .navbar-dark .navbar-nav .nav-link.show, .navbar-dark .navbar-nav .show > .nav-link { - color: #1E1E1E + color: #FFF } .navbar-dark .navbar-toggler { - color: rgba(46, 46, 46, 0.5); - border-color: rgba(46, 46, 46, 0.5); + color: rgba(255, 255, 255, .5); + border-color: rgba(255, 255, 255, .1) } .navbar-dark .navbar-toggler-icon { @@ -4526,7 +4526,7 @@ input[type=button].btn-block, input[type=reset].btn-block, input[type=submit].bt } .navbar-dark .navbar-text { - color: hsla(0, 0%, 18%, .5) + color: rgba(255, 255, 255, .5) } .navbar-dark .navbar-text a, .navbar-dark .navbar-text a:focus, .navbar-dark .navbar-text a:hover { diff --git a/cookbook/templates/base.html b/cookbook/templates/base.html index 21049230..db70ed89 100644 --- a/cookbook/templates/base.html +++ b/cookbook/templates/base.html @@ -33,6 +33,11 @@ + {% if request.user.is_authenticated and request.space.custom_space_theme %} + + {% endif %} + + @@ -74,12 +79,12 @@ -