From 4585a34bd895120ce8cbbe5262b98025e82a4c58 Mon Sep 17 00:00:00 2001 From: amandatong Date: Fri, 5 Feb 2021 16:14:42 -0500 Subject: [PATCH 01/25] faq page and limited rankings --- .idea/.gitignore | 8 + .idea/helpqueue.iml | 28 +++ .idea/inspectionProfiles/Project_Default.xml | 6 + .../inspectionProfiles/profiles_settings.xml | 6 + .idea/misc.xml | 7 + .idea/modules.xml | 8 + .idea/vcs.xml | 6 + client/src/App.css | 6 + client/src/App.tsx | 2 + client/src/AppHeader.tsx | 5 + client/src/components/FAQPage.tsx | 79 ++++++++ client/src/components/QueueMentor.tsx | 12 +- env.sh | 16 ++ package.json | 5 +- server/__init__.py | 4 + server/app.py | 10 + server/controllers/users.py | 12 +- yarn.lock | 178 ++++++++++-------- 18 files changed, 317 insertions(+), 81 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/helpqueue.iml create mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 .idea/inspectionProfiles/profiles_settings.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 client/src/components/FAQPage.tsx create mode 100755 env.sh diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..4aa91ea --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml +# Editor-based HTTP Client requests +/httpRequests/ diff --git a/.idea/helpqueue.iml b/.idea/helpqueue.iml new file mode 100644 index 0000000..4e00284 --- /dev/null +++ b/.idea/helpqueue.iml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..03d9549 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml new file mode 100644 index 0000000..105ce2d --- /dev/null +++ b/.idea/inspectionProfiles/profiles_settings.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..2edb3a9 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..07fd44d --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..9661ac7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/client/src/App.css b/client/src/App.css index 37b3b5d..3e089e5 100644 --- a/client/src/App.css +++ b/client/src/App.css @@ -75,3 +75,9 @@ .ui.label.label{ background-color: #FFDF3F } + +/* FAQ PAGE STYLING */ + +.App .accordion { + text-align:left; +} diff --git a/client/src/App.tsx b/client/src/App.tsx index de4a16a..4d66b0b 100644 --- a/client/src/App.tsx +++ b/client/src/App.tsx @@ -11,6 +11,7 @@ import QueueRequest from "./components/QueueRequest"; import QueueMentor from "./components/QueueMentor"; import AdminPage from "./components/AdminPage"; import ProfilePage from "./components/ProfilePage"; +import FAQPage from "./components/FAQPage"; import Alert from "react-s-alert"; @@ -31,6 +32,7 @@ const App: React.FC = () => { + diff --git a/client/src/AppHeader.tsx b/client/src/AppHeader.tsx index e1863e9..237f56f 100644 --- a/client/src/AppHeader.tsx +++ b/client/src/AppHeader.tsx @@ -68,6 +68,11 @@ const AppHeader: React.FC = () => { setIsOpen(open => !open)} />