diff --git a/frontend/src/App.js b/frontend/src/App.js index f3ebec2..12ab09a 100644 --- a/frontend/src/App.js +++ b/frontend/src/App.js @@ -1,5 +1,4 @@ import React from "react"; -import 'normalize.css'; import "./styles/styles.scss"; import { library } from "@fortawesome/fontawesome-svg-core"; import { fas } from "@fortawesome/free-solid-svg-icons"; diff --git a/frontend/src/components/Dept/Dept.js b/frontend/src/components/Dept/Dept.js index 7175587..bd55faa 100644 --- a/frontend/src/components/Dept/Dept.js +++ b/frontend/src/components/Dept/Dept.js @@ -3,6 +3,7 @@ import Container from "react-bootstrap/Container"; import Card from "react-bootstrap/Card"; import { CardColumns } from "react-bootstrap"; import Button from "react-bootstrap/Button"; +import { Link } from "react-router-dom"; const axios = require("axios"); export default class Dept extends Component { diff --git a/node_modules/normalize.css/CHANGELOG.md b/node_modules/normalize.css/CHANGELOG.md deleted file mode 100644 index 922f6e3..0000000 --- a/node_modules/normalize.css/CHANGELOG.md +++ /dev/null @@ -1,175 +0,0 @@ -# Changes to normalize.css - -### 8.0.1 (November 4, 2018) - -* Fix regression in IE rendering of `main` element. - -### 8.0.0 (February 2, 2018) - -* Remove support for older browsers Android 4, lte IE 9, lte Safari 7. -* Don't remove search input cancel button in Chrome/Safari. -* Form inputs inherit `font-family`. -* Fix text decoration in Safari 8+. - -### 7.0.0 (May 2, 2017) - -* Revert changes in `body` and form elements styles introduced by v6 - -### 6.0.0 (March 26, 2017) - -* Remove all opinionated rules -* Correct document heading comment -* Update `abbr[title]` support - -### 5.0.0 (October 3, 2016) - -* Add normalized sections not already present from - https://html.spec.whatwg.org/multipage/. -* Move unsorted rules into their respective sections. -* Update the `summary` style in all browsers. -* Remove `::placeholder` styles due to a bug in Edge. -* More explicitly define font resets on form controls. -* Remove the `optgroup` normalization needed by the previous font reset. -* Update text-size-adjust documentation
 for IE on Windows Phone -* Update OS X reference to macOS -* Update the semver strategy. - -### 4.2.0 (June 30, 2016) - -* Correct the `line-height` in all browsers. -* Restore `optgroup` font inheritance. -* Update normalize.css heading. - -### 4.1.1 (April 12, 2016) - -* Update normalize.css heading. - -### 4.1.0 (April 11, 2016) - -* Normalize placeholders in Chrome, Edge, and Safari. -* Normalize `text-decoration-skip` property in Safari. -* Normalize file select buttons. -* Normalize search input outlines in Safari. -* Limit Firefox focus normalizations to buttons. -* Restore `main` to package.json. -* Restore proper overflow to certain `select` elements. -* Remove opinionated cursor styles on buttons. -* Update stylelint configuration. -* Update tests. - -### 4.0.0 (March 19, 2016) - -* Add the correct font weight for `b` and `strong` in Chrome, Edge, and Safari. -* Correct inconsistent `overflow` for `hr` in Edge and IE. -* Correct inconsistent `box-sizing` for `hr` in Firefox. -* Correct inconsistent `text-decoration` and `border-bottom` for `abbr[title]` - in Chrome, Edge, Firefox IE, Opera, and Safari. -* Correct inheritance and scaling of `font-size` for preformatted text. -* Correct `legend` text wrapping not present in Edge and IE. -* Remove unnecessary normalization of `line-height` for `input`. -* Remove unnecessary normalization of `color` for form controls. -* Remove unnecessary `box-sizing` for `input[type="search"]` in Chrome, Edge, - Firefox, IE, and Safari. -* Remove opinionated table resets. -* Remove opinionated `pre` overflow. -* Remove selector weight from some input selectors. -* Update normalization of `border-style` for `img`. -* Update normalization of `color` inheritance for `legend`. -* Update normalization of `background-color` for `mark`. -* Update normalization of `outline` for `:-moz-focusring` removed by a previous - normalization in Firefox. -* Update opinionated style of `outline-width` for `a:active` and `a:hover`. -* Update comments to identify opinionated styles. -* Update comments to specify browser/versions affected by all changes. -* Update comments to use one voice. - ---- - -### 3.0.3 (March 30, 2015) - -* Remove unnecessary vendor prefixes. -* Add `main` property. - -### 3.0.2 (October 4, 2014) - -* Only alter `background-color` of links in IE 10. -* Add `menu` element to HTML5 display definitions. - -### 3.0.1 (March 27, 2014) - -* Add package.json for npm support. - -### 3.0.0 (January 28, 2014) - -### 3.0.0-rc.1 (January 26, 2014) - -* Explicit tests for each normalization. -* Fix i18n for `q` element. -* Fix `pre` text formatting and overflow. -* Fix vertical alignment of `progress`. -* Address `button` overflow in IE 8/9/10. -* Revert `textarea` alignment modification. -* Fix number input button cursor in Chrome on OS X. -* Remove `a:focus` outline normalization. -* Fix `figure` margin normalization. -* Normalize `optgroup`. -* Remove default table cell padding. -* Set correct display for `progress` in IE 8/9. -* Fix `font` and `color` inheritance for forms. - ---- - -### 2.1.3 (August 26, 2013) - -* Fix component.json. -* Remove the gray background color from active links in IE 10. - -### 2.1.2 (May 11, 2013) - -* Revert root `color` and `background` normalizations. - -### 2.1.1 (April 8, 2013) - -* Normalize root `color` and `background` to counter the effects of system - color schemes. - -### 2.1.0 (January 21, 2013) - -* Normalize `text-transform` for `button` and `select`. -* Normalize `h1` margin when within HTML5 sectioning elements. -* Normalize `hr` element. -* Remove unnecessary `pre` styles. -* Add `main` element to HTML5 display definitions. -* Fix cursor style for disabled button `input`. - -### 2.0.1 (August 20, 2012) - -* Remove stray IE 6/7 `inline-block` hack from HTML5 display settings. - -### 2.0.0 (August 19, 2012) - -* Remove legacy browser form normalizations. -* Remove all list normalizations. -* Add `quotes` normalizations. -* Remove all heading normalizations except `h1` font size. -* Form elements automatically inherit `font-family` from ancestor. -* Drop support for IE 6/7, Firefox < 4, and Safari < 5. - ---- - -### 1.0.1 (August 19, 2012) - -* Adjust `small` font size normalization. - -### 1.0.0 (August 14, 2012) - -(Only the notable changes since public release) - -* Add MIT License. -* Hide `audio` elements without controls in iOS 5. -* Normalize heading margins and font size. -* Move font-family normalization from `body` to `html`. -* Remove scrollbar normalization. -* Remove excess padding from checkbox and radio inputs in IE 7. -* Add IE9 correction for SVG overflow. -* Add fix for legend not inheriting color in IE 6/7/8/9. diff --git a/node_modules/normalize.css/LICENSE.md b/node_modules/normalize.css/LICENSE.md deleted file mode 100644 index 43b5ddc..0000000 --- a/node_modules/normalize.css/LICENSE.md +++ /dev/null @@ -1,21 +0,0 @@ -# The MIT License (MIT) - -Copyright © Nicolas Gallagher and Jonathan Neal - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do -so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/node_modules/normalize.css/README.md b/node_modules/normalize.css/README.md deleted file mode 100644 index 71954f2..0000000 --- a/node_modules/normalize.css/README.md +++ /dev/null @@ -1,102 +0,0 @@ -# normalize.css - -Normalize Logo - -> A modern alternative to CSS resets - -[![npm][npm-image]][npm-url] [![license][license-image]][license-url] -[![changelog][changelog-image]][changelog-url] -[![gitter][gitter-image]][gitter-url] - - -**NPM** - -```sh -npm install --save normalize.css -``` - -**CDN** - -See https://yarnpkg.com/en/package/normalize.css - -**Download** - -See https://necolas.github.io/normalize.css/latest/normalize.css - - -## What does it do? - -* Preserves useful defaults, unlike many CSS resets. -* Normalizes styles for a wide range of elements. -* Corrects bugs and common browser inconsistencies. -* Improves usability with subtle modifications. -* Explains what code does using detailed comments. - - -## Browser support - -* Chrome -* Edge -* Firefox ESR+ -* Internet Explorer 10+ -* Safari 8+ -* Opera - - -## Extended details and known issues - -Additional detail and explanation of the esoteric parts of normalize.css. - -#### `pre, code, kbd, samp` - -The `font-family: monospace, monospace` hack fixes the inheritance and scaling -of font-size for preformatted text. The duplication of `monospace` is -intentional. [Source](https://en.wikipedia.org/wiki/User:Davidgothberg/Test59). - -#### `sub, sup` - -Normally, using `sub` or `sup` affects the line-box height of text in all -browsers. [Source](https://gist.github.com/413930). - -#### `select` - -By default, Chrome on OS X and Safari on OS X allow very limited styling of -`select`, unless a border property is set. The default font weight on `optgroup` -elements cannot safely be changed in Chrome on OSX and Safari on OS X. - -#### `[type="checkbox"]` - -It is recommended that you do not style checkbox and radio inputs as Firefox's -implementation does not respect box-sizing, padding, or width. - -#### `[type="number"]` - -Certain font size values applied to number inputs cause the cursor style of the -decrement button to change from `default` to `text`. - -#### `[type="search"]` - -The search input is not fully stylable by default. In Chrome and Safari on -OSX/iOS you can't control `font`, `padding`, `border`, or `background`. In -Chrome and Safari on Windows you can't control `border` properly. It will apply -`border-width` but will only show a border color (which cannot be controlled) -for the outer 1px of that border. Applying `-webkit-appearance: textfield` -addresses these issues without removing the benefits of search inputs (e.g. -showing past searches). - -## Contributing - -Please read the [contribution guidelines](CONTRIBUTING.md) in order to make the -contribution process easy and effective for everyone involved. - - -[changelog-image]: https://img.shields.io/badge/changelog-md-blue.svg?style=flat-square -[changelog-url]: CHANGELOG.md -[license-image]: https://img.shields.io/npm/l/normalize.css.svg?style=flat-square -[license-url]: LICENSE.md -[npm-image]: https://img.shields.io/npm/v/normalize.css.svg?style=flat-square -[npm-url]: https://www.npmjs.com/package/normalize.css -[gitter-image]: https://img.shields.io/badge/chat-gitter-blue.svg?style=flat-square -[gitter-url]: https://gitter.im/necolas/normalize.css diff --git a/node_modules/normalize.css/normalize.css b/node_modules/normalize.css/normalize.css deleted file mode 100644 index 192eb9c..0000000 --- a/node_modules/normalize.css/normalize.css +++ /dev/null @@ -1,349 +0,0 @@ -/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */ - -/* Document - ========================================================================== */ - -/** - * 1. Correct the line height in all browsers. - * 2. Prevent adjustments of font size after orientation changes in iOS. - */ - -html { - line-height: 1.15; /* 1 */ - -webkit-text-size-adjust: 100%; /* 2 */ -} - -/* Sections - ========================================================================== */ - -/** - * Remove the margin in all browsers. - */ - -body { - margin: 0; -} - -/** - * Render the `main` element consistently in IE. - */ - -main { - display: block; -} - -/** - * Correct the font size and margin on `h1` elements within `section` and - * `article` contexts in Chrome, Firefox, and Safari. - */ - -h1 { - font-size: 2em; - margin: 0.67em 0; -} - -/* Grouping content - ========================================================================== */ - -/** - * 1. Add the correct box sizing in Firefox. - * 2. Show the overflow in Edge and IE. - */ - -hr { - box-sizing: content-box; /* 1 */ - height: 0; /* 1 */ - overflow: visible; /* 2 */ -} - -/** - * 1. Correct the inheritance and scaling of font size in all browsers. - * 2. Correct the odd `em` font sizing in all browsers. - */ - -pre { - font-family: monospace, monospace; /* 1 */ - font-size: 1em; /* 2 */ -} - -/* Text-level semantics - ========================================================================== */ - -/** - * Remove the gray background on active links in IE 10. - */ - -a { - background-color: transparent; -} - -/** - * 1. Remove the bottom border in Chrome 57- - * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. - */ - -abbr[title] { - border-bottom: none; /* 1 */ - text-decoration: underline; /* 2 */ - text-decoration: underline dotted; /* 2 */ -} - -/** - * Add the correct font weight in Chrome, Edge, and Safari. - */ - -b, -strong { - font-weight: bolder; -} - -/** - * 1. Correct the inheritance and scaling of font size in all browsers. - * 2. Correct the odd `em` font sizing in all browsers. - */ - -code, -kbd, -samp { - font-family: monospace, monospace; /* 1 */ - font-size: 1em; /* 2 */ -} - -/** - * Add the correct font size in all browsers. - */ - -small { - font-size: 80%; -} - -/** - * Prevent `sub` and `sup` elements from affecting the line height in - * all browsers. - */ - -sub, -sup { - font-size: 75%; - line-height: 0; - position: relative; - vertical-align: baseline; -} - -sub { - bottom: -0.25em; -} - -sup { - top: -0.5em; -} - -/* Embedded content - ========================================================================== */ - -/** - * Remove the border on images inside links in IE 10. - */ - -img { - border-style: none; -} - -/* Forms - ========================================================================== */ - -/** - * 1. Change the font styles in all browsers. - * 2. Remove the margin in Firefox and Safari. - */ - -button, -input, -optgroup, -select, -textarea { - font-family: inherit; /* 1 */ - font-size: 100%; /* 1 */ - line-height: 1.15; /* 1 */ - margin: 0; /* 2 */ -} - -/** - * Show the overflow in IE. - * 1. Show the overflow in Edge. - */ - -button, -input { /* 1 */ - overflow: visible; -} - -/** - * Remove the inheritance of text transform in Edge, Firefox, and IE. - * 1. Remove the inheritance of text transform in Firefox. - */ - -button, -select { /* 1 */ - text-transform: none; -} - -/** - * Correct the inability to style clickable types in iOS and Safari. - */ - -button, -[type="button"], -[type="reset"], -[type="submit"] { - -webkit-appearance: button; -} - -/** - * Remove the inner border and padding in Firefox. - */ - -button::-moz-focus-inner, -[type="button"]::-moz-focus-inner, -[type="reset"]::-moz-focus-inner, -[type="submit"]::-moz-focus-inner { - border-style: none; - padding: 0; -} - -/** - * Restore the focus styles unset by the previous rule. - */ - -button:-moz-focusring, -[type="button"]:-moz-focusring, -[type="reset"]:-moz-focusring, -[type="submit"]:-moz-focusring { - outline: 1px dotted ButtonText; -} - -/** - * Correct the padding in Firefox. - */ - -fieldset { - padding: 0.35em 0.75em 0.625em; -} - -/** - * 1. Correct the text wrapping in Edge and IE. - * 2. Correct the color inheritance from `fieldset` elements in IE. - * 3. Remove the padding so developers are not caught out when they zero out - * `fieldset` elements in all browsers. - */ - -legend { - box-sizing: border-box; /* 1 */ - color: inherit; /* 2 */ - display: table; /* 1 */ - max-width: 100%; /* 1 */ - padding: 0; /* 3 */ - white-space: normal; /* 1 */ -} - -/** - * Add the correct vertical alignment in Chrome, Firefox, and Opera. - */ - -progress { - vertical-align: baseline; -} - -/** - * Remove the default vertical scrollbar in IE 10+. - */ - -textarea { - overflow: auto; -} - -/** - * 1. Add the correct box sizing in IE 10. - * 2. Remove the padding in IE 10. - */ - -[type="checkbox"], -[type="radio"] { - box-sizing: border-box; /* 1 */ - padding: 0; /* 2 */ -} - -/** - * Correct the cursor style of increment and decrement buttons in Chrome. - */ - -[type="number"]::-webkit-inner-spin-button, -[type="number"]::-webkit-outer-spin-button { - height: auto; -} - -/** - * 1. Correct the odd appearance in Chrome and Safari. - * 2. Correct the outline style in Safari. - */ - -[type="search"] { - -webkit-appearance: textfield; /* 1 */ - outline-offset: -2px; /* 2 */ -} - -/** - * Remove the inner padding in Chrome and Safari on macOS. - */ - -[type="search"]::-webkit-search-decoration { - -webkit-appearance: none; -} - -/** - * 1. Correct the inability to style clickable types in iOS and Safari. - * 2. Change font properties to `inherit` in Safari. - */ - -::-webkit-file-upload-button { - -webkit-appearance: button; /* 1 */ - font: inherit; /* 2 */ -} - -/* Interactive - ========================================================================== */ - -/* - * Add the correct display in Edge, IE 10+, and Firefox. - */ - -details { - display: block; -} - -/* - * Add the correct display in all browsers. - */ - -summary { - display: list-item; -} - -/* Misc - ========================================================================== */ - -/** - * Add the correct display in IE 10+. - */ - -template { - display: none; -} - -/** - * Add the correct display in IE 10. - */ - -[hidden] { - display: none; -} diff --git a/node_modules/normalize.css/package.json b/node_modules/normalize.css/package.json deleted file mode 100644 index bf6227b..0000000 --- a/node_modules/normalize.css/package.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "_from": "normalize.css", - "_id": "normalize.css@8.0.1", - "_inBundle": false, - "_integrity": "sha512-qizSNPO93t1YUuUhP22btGOo3chcvDFqFaj2TRybP0DMxkHOCTYwp3n34fel4a31ORXy4m1Xq0Gyqpb5m33qIg==", - "_location": "/normalize.css", - "_phantomChildren": {}, - "_requested": { - "type": "tag", - "registry": true, - "raw": "normalize.css", - "name": "normalize.css", - "escapedName": "normalize.css", - "rawSpec": "", - "saveSpec": null, - "fetchSpec": "latest" - }, - "_requiredBy": [ - "#USER", - "/" - ], - "_resolved": "https://registry.npmjs.org/normalize.css/-/normalize.css-8.0.1.tgz", - "_shasum": "9b98a208738b9cc2634caacbc42d131c97487bf3", - "_spec": "normalize.css", - "_where": "E:\\React Js\\DU_Hackathon", - "bugs": { - "url": "https://github.com/necolas/normalize.css/issues" - }, - "bundleDependencies": false, - "deprecated": false, - "description": "A modern alternative to CSS resets", - "files": [ - "LICENSE.md", - "normalize.css" - ], - "homepage": "https://necolas.github.io/normalize.css", - "license": "MIT", - "main": "normalize.css", - "name": "normalize.css", - "repository": { - "type": "git", - "url": "git+https://github.com/necolas/normalize.css.git" - }, - "style": "normalize.css", - "version": "8.0.1" -} diff --git a/package-lock.json b/package-lock.json deleted file mode 100644 index d9aa74a..0000000 --- a/package-lock.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "requires": true, - "lockfileVersion": 1, - "dependencies": { - "normalize.css": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/normalize.css/-/normalize.css-8.0.1.tgz", - "integrity": "sha512-qizSNPO93t1YUuUhP22btGOo3chcvDFqFaj2TRybP0DMxkHOCTYwp3n34fel4a31ORXy4m1Xq0Gyqpb5m33qIg==" - } - } -} diff --git a/server/accounts/migrations/0001_initial.py b/server/accounts/migrations/0001_initial.py index 4a40574..6e7554c 100644 --- a/server/accounts/migrations/0001_initial.py +++ b/server/accounts/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.2 on 2020-11-12 00:04 +# Generated by Django 3.1.2 on 2020-11-14 14:11 import django.contrib.auth.models import django.contrib.auth.validators @@ -13,8 +13,8 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('auth', '0012_alter_user_first_name_max_length'), ('universities', '0001_initial'), + ('auth', '0012_alter_user_first_name_max_length'), ] operations = [ diff --git a/server/items/migrations/0001_initial.py b/server/items/migrations/0001_initial.py index 0facc5a..4fee16c 100644 --- a/server/items/migrations/0001_initial.py +++ b/server/items/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.2 on 2020-11-12 12:36 +# Generated by Django 3.1.2 on 2020-11-14 14:11 from django.conf import settings from django.db import migrations, models @@ -10,8 +10,8 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('sections', '0001_initial'), migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('sections', '0001_initial'), ] operations = [ diff --git a/server/notifications/migrations/0001_initial.py b/server/notifications/migrations/0001_initial.py index 445f6ea..d9a2ec5 100644 --- a/server/notifications/migrations/0001_initial.py +++ b/server/notifications/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.2 on 2020-11-12 00:04 +# Generated by Django 3.1.2 on 2020-11-14 14:11 from django.conf import settings from django.db import migrations, models diff --git a/server/requirements.txt b/server/requirements.txt index e453d71..acd2a43 100644 --- a/server/requirements.txt +++ b/server/requirements.txt @@ -13,7 +13,7 @@ django-allauth==0.43.0 django-cors-headers==3.2.1 djangorestframework==3.12.1 djangorestframework-jwt==1.11.0 -djangorestframework-simplejwt==4.4.0 +djangorestframework-simplejwt==4.6.0 idna==2.10 isort==4.3.21 lazy-object-proxy==1.4.2 @@ -21,9 +21,6 @@ mccabe==0.6.1 mpmath==1.1.0 oauthlib==3.1.0 pbr==5.4.3 -Pillow==7.0.0 -psycopg2==2.8.5 -psycopg2-binary==2.8.5 pycodestyle==2.5.0 pycparser==2.20 PyJWT==1.7.1 @@ -38,7 +35,6 @@ six==1.12.0 sqlparse==0.4.1 stevedore==1.31.0 sympy==1.4 -typed-ast==1.4.0 urllib3==1.25.11 virtualenv==16.7.6 virtualenv-clone==0.5.3 diff --git a/server/rooms/migrations/0001_initial.py b/server/rooms/migrations/0001_initial.py index 4266468..5357b2c 100644 --- a/server/rooms/migrations/0001_initial.py +++ b/server/rooms/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.2 on 2020-11-12 00:04 +# Generated by Django 3.1.2 on 2020-11-14 14:11 from django.conf import settings import django.core.validators @@ -12,8 +12,8 @@ class Migration(migrations.Migration): initial = True dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), ('universities', '0001_initial'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ @@ -34,6 +34,7 @@ class Migration(migrations.Migration): name='PendingRequests', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('user_status', models.CharField(max_length=13, null=True)), ('room', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='rooms.room')), ('user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ], diff --git a/server/sections/migrations/0001_initial.py b/server/sections/migrations/0001_initial.py index f902c86..798054c 100644 --- a/server/sections/migrations/0001_initial.py +++ b/server/sections/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.2 on 2020-11-12 00:04 +# Generated by Django 3.1.2 on 2020-11-14 14:11 from django.db import migrations, models import django.db.models.deletion diff --git a/server/server/settings.py b/server/server/settings.py index 992e310..2d55fad 100644 --- a/server/server/settings.py +++ b/server/server/settings.py @@ -192,11 +192,11 @@ EMAIL_HOST = 'smtp.gmail.com' EMAIL_PORT = 587 EMAIL_USE_TLS = True -EMAIL_HOST_USER = os.environ.get('APP_EMAIL_USER') -EMAIL_HOST_PASSWORD = os.environ.get('APP_EMAIL_PASS') +# EMAIL_HOST_USER = os.environ.get('APP_EMAIL_USER') +# EMAIL_HOST_PASSWORD = os.environ.get('APP_EMAIL_PASS') -#EMAIL_HOST_USER = "emonrahman186@gmail.com" -#EMAIL_HOST_PASSWORD = "allah...123" +EMAIL_HOST_USER = "whyblankistaken@gmail.com" +EMAIL_HOST_PASSWORD = "llrnecuoqscezmua" OLD_PASSWORD_FIELD_ENABLED = True diff --git a/server/universities/migrations/0001_initial.py b/server/universities/migrations/0001_initial.py index bebacf0..72fe636 100644 --- a/server/universities/migrations/0001_initial.py +++ b/server/universities/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.2 on 2020-11-12 00:04 +# Generated by Django 3.1.2 on 2020-11-14 14:11 from django.db import migrations, models import django.db.models.deletion