From 05eee5c3891aaf0593906fd7561e98bc4c6cf5d5 Mon Sep 17 00:00:00 2001 From: Vivian Lee Date: Tue, 12 Feb 2019 17:44:37 -0800 Subject: [PATCH 1/3] Added WhatevModel --- Pipfile | 1 - Pipfile.lock | 18 ++++++++++++++++++ web_server/Pipfile | 1 - web_server/Pipfile.lock | 15 ++++++--------- web_server/web_server/models/Whatever.py | 9 +++++++++ 5 files changed, 33 insertions(+), 11 deletions(-) create mode 100644 Pipfile.lock create mode 100644 web_server/web_server/models/Whatever.py diff --git a/Pipfile b/Pipfile index 9c7ae7b..40367ee 100644 --- a/Pipfile +++ b/Pipfile @@ -8,4 +8,3 @@ verify_ssl = true [packages] [requires] -python_version = "3.5" diff --git a/Pipfile.lock b/Pipfile.lock new file mode 100644 index 0000000..d2c2cba --- /dev/null +++ b/Pipfile.lock @@ -0,0 +1,18 @@ +{ + "_meta": { + "hash": { + "sha256": "ebffa69a1fa192d1cef7cb42ad79231ca976565c5ce371a70160b3048d3cbc06" + }, + "pipfile-spec": 6, + "requires": {}, + "sources": [ + { + "name": "pypi", + "url": "https://pypi.org/simple", + "verify_ssl": true + } + ] + }, + "default": {}, + "develop": {} +} diff --git a/web_server/Pipfile b/web_server/Pipfile index e8697e4..fa3f6ab 100644 --- a/web_server/Pipfile +++ b/web_server/Pipfile @@ -11,4 +11,3 @@ python-dotenv = "*" pygithub = "*" [requires] -python_version = "3.5" diff --git a/web_server/Pipfile.lock b/web_server/Pipfile.lock index d5d9c87..870a62e 100644 --- a/web_server/Pipfile.lock +++ b/web_server/Pipfile.lock @@ -1,12 +1,10 @@ { "_meta": { "hash": { - "sha256": "8925bc1d2138d78a31072ec3743d1d29c174968f82cd4ce86c686ff233ff0789" + "sha256": "47c6eee846a7988a67c2ba03c6fb9d7310e2d488a45e8af47746ac6c2c38ac0f" }, "pipfile-spec": 6, - "requires": { - "python_version": "3.5" - }, + "requires": {}, "sources": [ { "name": "pypi", @@ -39,11 +37,11 @@ }, "django": { "hashes": [ - "sha256:a32c22af23634e1d11425574dce756098e015a165be02e4690179889b207c7a8", - "sha256:d6393918da830530a9516bbbcbf7f1214c3d733738779f06b0f649f49cc698c3" + "sha256:275bec66fd2588dd517ada59b8bfb23d4a9abc5a362349139ddda3c7ff6f5ade", + "sha256:939652e9d34d7d53d74d5d8ef82a19e5f8bb2de75618f7e5360691b6e9667963" ], "index": "pypi", - "version": "==2.1.5" + "version": "==2.1.7" }, "idna": { "hashes": [ @@ -97,8 +95,7 @@ }, "wrapt": { "hashes": [ - "sha256:4aea003270831cceb8a90ff27c4031da6ead7ec1886023b80ce0dfe0adf61533", - "sha256:bd2751cd97c62c1d34ced93534512e610d469254efccc09c6f4c7e872951c39d" + "sha256:4aea003270831cceb8a90ff27c4031da6ead7ec1886023b80ce0dfe0adf61533" ], "version": "==1.11.1" } diff --git a/web_server/web_server/models/Whatever.py b/web_server/web_server/models/Whatever.py new file mode 100644 index 0000000..6fe6812 --- /dev/null +++ b/web_server/web_server/models/Whatever.py @@ -0,0 +1,9 @@ +from django.db import models + +class User(models.Model): + github_username = models.CharField(max_length=30) + id = models.IntField(primary_key=TRUE) + github_id = models.CharField(max_length=30) + is_auth = models.BooleanField(default=False) + is_maintainer = models.BooleanField(default=False) + created_at = models.DateField() From db14417874b1fa4a38c480e31d59d0b1f8081da2 Mon Sep 17 00:00:00 2001 From: Vivian Lee Date: Tue, 12 Feb 2019 17:50:57 -0800 Subject: [PATCH 2/3] Added WhatevModel --- web_server/web_server/models/{Whatever.py => Mod.py} | 0 web_server/web_server/models/__init__.py | 1 + 2 files changed, 1 insertion(+) rename web_server/web_server/models/{Whatever.py => Mod.py} (100%) diff --git a/web_server/web_server/models/Whatever.py b/web_server/web_server/models/Mod.py similarity index 100% rename from web_server/web_server/models/Whatever.py rename to web_server/web_server/models/Mod.py diff --git a/web_server/web_server/models/__init__.py b/web_server/web_server/models/__init__.py index 50c9444..1a175a4 100644 --- a/web_server/web_server/models/__init__.py +++ b/web_server/web_server/models/__init__.py @@ -1,2 +1,3 @@ from .Doggo import Doggo from .Owner import Owner +from .Mod import Mod From dd6e106e378f17883df92931e3405c28f268c0e1 Mon Sep 17 00:00:00 2001 From: Vivian Lee Date: Tue, 12 Feb 2019 17:57:48 -0800 Subject: [PATCH 3/3] added model --- web_server/web_server/models/Mod.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web_server/web_server/models/Mod.py b/web_server/web_server/models/Mod.py index 6fe6812..979517b 100644 --- a/web_server/web_server/models/Mod.py +++ b/web_server/web_server/models/Mod.py @@ -1,8 +1,8 @@ from django.db import models -class User(models.Model): +class Mod(models.Model): github_username = models.CharField(max_length=30) - id = models.IntField(primary_key=TRUE) + id = models.IntegerField(primary_key=True) github_id = models.CharField(max_length=30) is_auth = models.BooleanField(default=False) is_maintainer = models.BooleanField(default=False)