From 257ac83e4e6fb18056f00dae8c0a66a39846ad97 Mon Sep 17 00:00:00 2001 From: Jason Hoang Date: Sun, 20 Nov 2022 11:09:36 -0700 Subject: [PATCH 1/3] Pull from main --- frontend/src/feedback.jsx | 2 +- storyTellingBackend/storyTellingBackend/settings.py | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/frontend/src/feedback.jsx b/frontend/src/feedback.jsx index 3da5486c..6d6d63f0 100644 --- a/frontend/src/feedback.jsx +++ b/frontend/src/feedback.jsx @@ -124,7 +124,7 @@ export default class Feedback extends React.Component { async componentDidMount() { const response = await getAllFeedback(); - const myData = response.results; + const myData = response; this.setState({ data: myData }); this.setState({ current: myData }); const myKeys = []; diff --git a/storyTellingBackend/storyTellingBackend/settings.py b/storyTellingBackend/storyTellingBackend/settings.py index 34f204b8..636f5505 100644 --- a/storyTellingBackend/storyTellingBackend/settings.py +++ b/storyTellingBackend/storyTellingBackend/settings.py @@ -55,8 +55,6 @@ REST_FRAMEWORK = { - 'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.PageNumberPagination', - 'PAGE_SIZE': 5, 'DEFAULT_PERMISSION_CLASSES': ['rest_framework.permissions.IsAuthenticated'], 'DEFAULT_AUTHENTICATION_CLASSES': [ @@ -109,7 +107,7 @@ 'ENGINE': 'django.db.backends.mysql', 'NAME': 'nstep_database', 'USER': 'root', - 'PASSWORD': 'mypassword', + 'PASSWORD': 'Callmemicrosoft123', 'HOST': 'localhost', 'PORT': '', } From df80c43d246565b80da53c732697bcf45e83048e Mon Sep 17 00:00:00 2001 From: Jason Hoang Date: Sun, 20 Nov 2022 12:15:29 -0700 Subject: [PATCH 2/3] Save work --- frontend/src/components/Selection.jsx | 2 +- frontend/src/styles/Navbar.css | 4 ++++ storyTellingBackend/storyTellingBackend/settings.py | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/Selection.jsx b/frontend/src/components/Selection.jsx index 976ee3c4..61c60d7f 100644 --- a/frontend/src/components/Selection.jsx +++ b/frontend/src/components/Selection.jsx @@ -51,7 +51,7 @@ export default function Selection() { return (
- + Program