Merge pull request #70 from Tako64tako/hoge

fix:docker-compose.yml
Tako64tako · Jan 11, 2022 · 544fdb7 · 544fdb7
2 parents 588fa0b + f3a47f8
commit 544fdb7
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 259 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,10 +2,7 @@ version: '3.7'
 
 volumes:
   pgdata:
-    driver_opts:
-      type: none
-      device: $PWD/dbdata
-      o: bind
+
 services:
   nginx:
     image: nginx
@@ -40,4 +37,4 @@ services:
       - POSTGRES_USER=postgres
       - POSTGRES_PASSWORD=postgres
     volumes:
-      - ./db/postgres:/var/lib/postgresql/data
+      - "pgdata:/var/lib/postgresql/data"
diff --git a/src/accounts/templates/login.html b/src/accounts/templates/login.html
@@ -17,12 +17,13 @@
 
 <!-- ログインのフォームを配置 -->
 <!--<form method="post" name="form-login">-->
-{% csrf_token %}  
+
 <h1 class="h3 mb-3 fw-normal">Please Log in</h1>
 <!-- Usernameのラベル(非表示) -->
 
 <div id="login">
        <form method="POST" name='form-login'>
+        {% csrf_token %}  
          <!--<span class="fontawesome-user"></span>-->
            <input type="text" id="user" placeholder="Username">
 

diff --git a/src/top/migrations/0001_initial.py b/src/top/migrations/0001_initial.py
@@ -1,7 +1,8 @@
-# Generated by Django 3.2.8 on 2021-11-06 13:58
+# Generated by Django 3.2.9 on 2021-12-14 09:35
 
 from django.db import migrations, models
-import django.utils.timezone
+import stdimage.models
+import top.models
 
 
 class Migration(migrations.Migration):
@@ -13,12 +14,17 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.CreateModel(
-            name='TodoModel',
+            name='Cloth',
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('title', models.CharField(max_length=50)),
-                ('content', models.TextField()),
-                ('deadline', models.DateTimeField(default=django.utils.timezone.now)),
+                ('number', models.CharField(max_length=100, primary_key=True, serialize=False)),
+                ('name', models.CharField(max_length=200)),
+                ('gender', models.CharField(max_length=30)),
+                ('kind', models.CharField(max_length=30)),
+                ('size', models.CharField(max_length=30)),
+                ('color', models.CharField(max_length=30)),
+                ('picture_detail_url', models.URLField(max_length=1000)),
+                ('picture_url', models.URLField(max_length=1000)),
+                ('picture', stdimage.models.StdImageField(blank=True, upload_to=top.models.image_directory_path)),
             ],
         ),
     ]
diff --git a/src/top/migrations/0002_auto_20211106_2342.py b/src/top/migrations/0002_auto_20211106_2342.py
diff --git a/src/top/migrations/0003_auto_20211107_0026.py b/src/top/migrations/0003_auto_20211107_0026.py
diff --git a/src/top/migrations/0004_auto_20211107_0035.py b/src/top/migrations/0004_auto_20211107_0035.py
diff --git a/src/top/migrations/0005_image.py b/src/top/migrations/0005_image.py
diff --git a/src/top/migrations/0006_auto_20211111_0611.py b/src/top/migrations/0006_auto_20211111_0611.py
diff --git a/src/top/migrations/0007_remove_cloth_img.py b/src/top/migrations/0007_remove_cloth_img.py
diff --git a/src/top/migrations/0008_cloth_img.py b/src/top/migrations/0008_cloth_img.py
diff --git a/src/top/migrations/0009_auto_20211128_0055.py b/src/top/migrations/0009_auto_20211128_0055.py