fnschool 20251027.81653.841__tar.gz → 20251027.82134.859__tar.gz

{fnschool-20251027.81653.841/src/fnschool.egg-info → fnschool-20251027.82134.859}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fnschool
-Version: 20251027.81653.841
+Version: 20251027.82134.859
 Summary: Just some school related scripts, without any ambition.
 Author-email: larryw3i <larryw3i@163.com>, Larry Wei <larryw3i@126.com>, Larry W3i <larryw3i@yeah.net>
 Maintainer-email: larryw3i <larryw3i@163.com>, Larry Wei <larryw3i@126.com>

{fnschool-20251027.81653.841 → fnschool-20251027.82134.859}/src/fnschoo1/__init__.py

@@ -6,4 +6,4 @@ import random
 import sys
 from pathlib import Path
 
-__version__ = "20251027.81653.841"
+__version__ = "20251027.82134.859"

{fnschool-20251027.81653.841 → fnschool-20251027.82134.859}/src/fnschoo1/fnprofile/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 4.2.25 on 2025-10-26 14:18
+# Generated by Django 4.2.25 on 2025-10-27 13:10
 
 import django.contrib.auth.models
 import django.contrib.auth.validators

fnschool-20251027.82134.859/src/fnschoo1/fnprofile/migrations/0003_alter_fnuser_options_alter_fnuser_groups_and_more.py

@@ -0,0 +1,45 @@
+# Generated by Django 4.2.25 on 2025-10-27 13:34
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("auth", "0012_alter_user_first_name_max_length"),
+        ("fnprofile", "0002_auto_20251026_2235"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="fnuser",
+            options={
+                "verbose_name": "用户信息",
+                "verbose_name_plural": "用户信息",
+            },
+        ),
+        migrations.AlterField(
+            model_name="fnuser",
+            name="groups",
+            field=models.ManyToManyField(
+                blank=True,
+                help_text="这个用户所属的组。",
+                related_name="fn_user_groups",
+                related_query_name="fn_user",
+                to="auth.group",
+                verbose_name="groups",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="fnuser",
+            name="user_permissions",
+            field=models.ManyToManyField(
+                blank=True,
+                help_text="给这个用户指定权限。",
+                related_name="fn_user_permissions",
+                related_query_name="fn_user",
+                to="auth.permission",
+                verbose_name="user permissions",
+            ),
+        ),
+    ]

{fnschool-20251027.81653.841 → fnschool-20251027.82134.859}/src/fnschoo1/fnprofile/views.py

@@ -58,7 +58,7 @@ def fnprofile_edit(request):
         if form.is_valid():
             form.save()
             messages.success(
-                request, _("Fnuser has been updated successfully!")
+                request, _("Your information has been updated successfully!")
             )
             return redirect("home")
     else:

{fnschool-20251027.81653.841 → fnschool-20251027.82134.859}/src/fnschoo1/fnschool/settings.py

@@ -49,7 +49,7 @@ INSTALLED_APPS = [
     # fnschool apps.
     "fnschool",
     "fnprofile",
-    "profiles",
+    # "profiles",
     "canteen",
 ]
 
@@ -108,7 +108,7 @@ DATABASES = {
 # Password validation
 # https://docs.djangoproject.com/en/4.2/ref/settings/#auth-password-validators
 AUTH_USER_MODEL = "fnprofile.Fnuser"
-## AUTH_USER_MODEL = "profiles.Profile"
+## AUTH_USER_MODEL = "auth.User"
 AUTH_PASSWORD_VALIDATORS = [
     {
         "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator",

{fnschool-20251027.81653.841 → fnschool-20251027.82134.859}/src/fnschoo1/static/js/fnschool.js

@@ -3,7 +3,7 @@ $(document).ready(function () {
   if (messages.length) {
     messages.css({
       position: 'absolute',
-      top: $('.navbar').height(),
+      top: $('.navbar').height() * 1.45,
       width: '100%',
     })
     setTimeout(function () {

{fnschool-20251027.81653.841 → fnschool-20251027.82134.859}/src/fnschoo1/templates/includes/_header.html

@@ -92,7 +92,7 @@
 {% if messages %}
   <div class="messages">
     {% for message in messages %}
-      <div class="alert alert-{{ message.tags }}">
+      <div class="alert alert-{{ message.tags }} p-2">
         {{ message }}
         <span class="btn-close mx-2" title="{% trans "Hide messages." %}"></span>
       </div>

{fnschool-20251027.81653.841 → fnschool-20251027.82134.859/src/fnschool.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fnschool
-Version: 20251027.81653.841
+Version: 20251027.82134.859
 Summary: Just some school related scripts, without any ambition.
 Author-email: larryw3i <larryw3i@163.com>, Larry Wei <larryw3i@126.com>, Larry W3i <larryw3i@yeah.net>
 Maintainer-email: larryw3i <larryw3i@163.com>, Larry Wei <larryw3i@126.com>

{fnschool-20251027.81653.841 → fnschool-20251027.82134.859}/src/fnschool.egg-info/SOURCES.txt

@@ -62,7 +62,7 @@ src/fnschoo1/fnprofile/urls.py
 src/fnschoo1/fnprofile/views.py
 src/fnschoo1/fnprofile/migrations/0001_initial.py
 src/fnschoo1/fnprofile/migrations/0002_auto_20251026_2235.py
-src/fnschoo1/fnprofile/migrations/0003_alter_fnuser_options.py
+src/fnschoo1/fnprofile/migrations/0003_alter_fnuser_options_alter_fnuser_groups_and_more.py
 src/fnschoo1/fnprofile/migrations/__init__.py
 src/fnschoo1/fnprofile/templates/fnprofile/create.html
 src/fnschoo1/fnprofile/templates/fnprofile/detail.html
@@ -73,7 +73,6 @@ src/fnschoo1/fnschool/__init__.py
 src/fnschoo1/fnschool/_settings.py
 src/fnschoo1/fnschool/asgi.py
 src/fnschoo1/fnschool/settings.py
-src/fnschoo1/fnschool/settings_fn_profile_migration_0001.py
 src/fnschoo1/fnschool/urls.py
 src/fnschoo1/fnschool/views.py
 src/fnschoo1/fnschool/wsgi.py

fnschool-20251027.81653.841/src/fnschoo1/fnprofile/migrations/0003_alter_fnuser_options.py

@@ -1,20 +0,0 @@
-# Generated by Django 4.2.25 on 2025-10-26 15:42
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("fnprofile", "0002_auto_20251026_2235"),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name="fnuser",
-            options={
-                "verbose_name": "User Information",
-                "verbose_name_plural": "User Information",
-            },
-        ),
-    ]

fnschool-20251027.81653.841/src/fnschoo1/fnschool/settings_fn_profile_migration_0001.py

@@ -1,180 +0,0 @@
-"""
-Django settings for fnschool project.
-
-Generated by 'django-admin startproject' using Django 4.2.24.
-
-For more information on this file, see
-https://docs.djangoproject.com/en/4.2/topics/settings/
-
-For the full list of settings and their values, see
-https://docs.djangoproject.com/en/4.2/ref/settings/
-"""
-
-import os
-from pathlib import Path
-
-from django.urls import reverse_lazy
-from django.utils.translation import gettext_lazy as _
-
-# Build paths inside the project like this: BASE_DIR / 'subdir'.
-BASE_DIR = Path(__file__).resolve().parent.parent
-
-
-# Quick-start development settings - unsuitable for production
-# See https://docs.djangoproject.com/en/4.2/howto/deployment/checklist/
-
-# SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = (
-    "django-insecure-vt(#owf#cbx)yo$9m^=%&-heu&txuc23&a5b=a=u@=274)2!9w"
-)
-
-# SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
-
-ALLOWED_HOSTS = []
-
-
-# Application definition
-
-INSTALLED_APPS = [
-    "django.contrib.admin",
-    "django.contrib.auth",
-    "django.contrib.contenttypes",
-    "django.contrib.sessions",
-    "django.contrib.messages",
-    "django.contrib.staticfiles",
-    # site apps.
-    "crispy_forms",
-    "crispy_bootstrap5",  # For Bootstrap 5
-    # fnschool apps.
-    "fnschool",
-    "fnprofile",
-    "profiles",
-    "canteen",
-]
-
-CRISPY_ALLOWED_TEMPLATE_PACKS = "bootstrap5"
-CRISPY_TEMPLATE_PACK = "bootstrap5"
-
-MIDDLEWARE = [
-    "django.middleware.security.SecurityMiddleware",
-    "django.contrib.sessions.middleware.SessionMiddleware",
-    "django.middleware.locale.LocaleMiddleware",
-    "django.middleware.common.CommonMiddleware",
-    "django.middleware.csrf.CsrfViewMiddleware",
-    "django.contrib.auth.middleware.AuthenticationMiddleware",
-    "django.contrib.messages.middleware.MessageMiddleware",
-    "django.middleware.clickjacking.XFrameOptionsMiddleware",
-]
-
-ROOT_URLCONF = "fnschool.urls"
-
-TEMPLATES = [
-    {
-        "BACKEND": "django.template.backends.django.DjangoTemplates",
-        "DIRS": [
-            os.path.join(BASE_DIR, "templates"),
-        ],
-        "APP_DIRS": True,
-        "OPTIONS": {
-            "context_processors": [
-                "django.template.context_processors.debug",
-                "django.template.context_processors.request",
-                "django.contrib.auth.context_processors.auth",
-                "django.contrib.messages.context_processors.messages",
-                "django.template.context_processors.i18n",
-            ],
-            "builtins": [
-                "django.templatetags.i18n",
-            ],
-        },
-    },
-]
-
-WSGI_APPLICATION = "fnschool.wsgi.application"
-
-
-# Database
-# https://docs.djangoproject.com/en/4.2/ref/settings/#databases
-
-DATABASES = {
-    "default": {
-        "ENGINE": "django.db.backends.sqlite3",
-        "NAME": BASE_DIR / "db.sqlite3",
-    }
-}
-
-
-# Password validation
-# https://docs.djangoproject.com/en/4.2/ref/settings/#auth-password-validators
-## AUTH_USER_MODEL = "fn_profile.FnUser"
-AUTH_USER_MODEL = "profiles.Profile"
-AUTH_PASSWORD_VALIDATORS = [
-    {
-        "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator",
-    },
-    {
-        "NAME": "django.contrib.auth.password_validation.MinimumLengthValidator",
-    },
-    {
-        "NAME": "django.contrib.auth.password_validation.CommonPasswordValidator",
-    },
-    {
-        "NAME": "django.contrib.auth.password_validation.NumericPasswordValidator",
-    },
-]
-
-
-# Internationalization
-# https://docs.djangoproject.com/en/4.2/topics/i18n/
-
-USE_TZ = True
-TIME_ZONE = "Asia/Shanghai"
-
-USE_I18N = True
-USE_L10N = True
-
-LANGUAGE_CODE = "zh-hans"
-
-LANGUAGES = [
-    ("en", _("English")),
-    ("es", _("Spanish")),
-    ("fr", _("French")),
-    ("zh-hans", _("Simplified Chinese")),
-]
-LOCALE_PATHS = [
-    os.path.join(BASE_DIR, "locale"),
-]
-
-USE_TZ = True
-
-
-# Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/4.2/howto/static-files/
-
-STATIC_URL = "/static/"
-STATICFILES_DIRS = [
-    os.path.join(BASE_DIR, "static")
-]  # Optional: for additional static directories
-STATIC_ROOT = os.path.join(BASE_DIR, "static_collected")
-
-# Default primary key field type
-# https://docs.djangoproject.com/en/4.2/ref/settings/#default-auto-field
-
-DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
-
-MEDIA_URL = "/media/"
-MEDIA_ROOT = os.path.join(BASE_DIR, "media")
-
-LOGIN_URL = reverse_lazy("profile:log_in")
-
-_settings_path = Path(__file__).parent / "_settings.py"
-if _settings_path.exists():
-    print(
-        ('Custom configuration "{_settings_path}" has been used.').format(
-            _settings_path=_settings_path.as_posix()
-        )
-    )
-    from ._settings import *
-
-# The end.