rushilwiz/spaceout
1
0
Fork 0
mirror of https://github.com/Rushilwiz/spaceout.git synced 2025-04-17 01:50:18 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

World says hello

Browse Source
This commit is contained in:
Praneeth Bhandaru 2020-12-12 22:10:06 -05:00
parent 82041ab193
commit 244e52cf7f
3 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
site/Pipfile.lock generated
View File

@ -1,7 +1,7 @@
{ {
"_meta": { "_meta": {
"hash": { "hash": {
"sha256": "ac51b6731aade9f78bba7f8e9820da0f07fb2b69d2cd96136fdafb920246c033" "sha256": "7e2539a7fd9ce199e0113ff7ed5d20406cde458b139a14b45af5e54746387934"
}, },
"pipfile-spec": 6, "pipfile-spec": 6,
"requires": { "requires": {
@ -137,14 +137,6 @@
"index": "pypi", "index": "pypi",
"version": "==3.1.2" "version": "==3.1.2"
}, },
"django-cors-headers": {
"hashes": [
"sha256:9322255c296d5f75089571f29e520c83ff9693df17aa3cf9f6a4bea7c6740169",
"sha256:db82b2840f667d47872ae3e4a4e0a0d72fbecb42779b8aa233fa8bb965f7836a"
],
"index": "pypi",
"version": "==3.5.0"
},
"django-templated-mail": { "django-templated-mail": {
"hashes": [ "hashes": [
"sha256:8db807effebb42a532622e2d142dfd453dafcd0d7794c4c3332acb90656315f9", "sha256:8db807effebb42a532622e2d142dfd453dafcd0d7794c4c3332acb90656315f9",
@ -391,7 +383,7 @@
"sha256:19188f96923873c92ccb987120ec4acaa12f0461fa9ce5d3d0772bc965a39e08", "sha256:19188f96923873c92ccb987120ec4acaa12f0461fa9ce5d3d0772bc965a39e08",
"sha256:d8ff90d979214d7b4f8ce956e80f4028fc6860e4431f731ea4a8c08f23f99473" "sha256:d8ff90d979214d7b4f8ce956e80f4028fc6860e4431f731ea4a8c08f23f99473"
], ],
"markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_full_version < '4.0.0'", "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'",
"version": "==1.26.2" "version": "==1.26.2"
} }
}, },

4
site/api/serializers.py
View File

@ -1,4 +1,6 @@
from djoser.serializers import TokenSerializer
from rest_framework import serializers from rest_framework import serializers
from djoser.conf import settings as djoser_settings
from .models import * from .models import *
@ -17,4 +19,4 @@ class ProfileSerializer(serializers.ModelSerializer):
class ClassroomSerializer(serializers.ModelSerializer): class ClassroomSerializer(serializers.ModelSerializer):
class Meta: class Meta:
model = Classroom model = Classroom
fields = '__all__' fields = '__all__'

29
site/config/settings.py
View File

@ -57,7 +57,6 @@ REST_FRAMEWORK = {
} }
MIDDLEWARE = [ MIDDLEWARE = [
'corsheaders.middleware.CorsMiddleware',
'django.middleware.security.SecurityMiddleware', 'django.middleware.security.SecurityMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.common.CommonMiddleware', 'django.middleware.common.CommonMiddleware',
@ -92,24 +91,24 @@ WSGI_APPLICATION = 'config.wsgi.application'
# Database # Database
# https://docs.djangoproject.com/en/3.1/ref/settings/#databases # https://docs.djangoproject.com/en/3.1/ref/settings/#databases
# DATABASES = {
# 'default': {
# 'ENGINE': 'django.db.backends.sqlite3',
# 'NAME': BASE_DIR / 'db.sqlite3',
# }
# }
DATABASES = { DATABASES = {
'default': { 'default': {
'ENGINE' : 'django_cockroachdb', 'ENGINE': 'django.db.backends.sqlite3',
'NAME' : 'spaceout', 'NAME': BASE_DIR / 'db.sqlite3',
'USER' : 'spaceout',
'PASSWORD': 'spaceout',
'HOST' : 'localhost',
'PORT' : 35767,
} }
} }
# DATABASES = {
# 'default': {
# 'ENGINE' : 'django_cockroachdb',
# 'NAME' : 'spaceout',
# 'USER' : 'spaceout',
# 'PASSWORD': 'spaceout',
# 'HOST' : 'localhost',
# 'PORT' : 35767,
# }
# }
# Password validation # Password validation
# https://docs.djangoproject.com/en/3.1/ref/settings/#auth-password-validators # https://docs.djangoproject.com/en/3.1/ref/settings/#auth-password-validators
@ -148,5 +147,3 @@ USE_TZ = True
# https://docs.djangoproject.com/en/3.1/howto/static-files/ # https://docs.djangoproject.com/en/3.1/howto/static-files/
STATIC_URL = '/static/' STATIC_URL = '/static/'
## Custom