diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 00000000..e01959c9
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,90 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: circleci/node:12.18.3
+    steps:
+      - checkout
+      - setup_remote_docker
+      - run:
+          name: Set env variables
+          command: echo 'export VERSION=$(echo $CIRCLE_SHA1 | cut -c -7)' >> $BASH_ENV
+      - run:
+          name: Docker build knowledge-checklist
+          command: |
+            docker build -t codeyourfuture/knowledge-checklist:$VERSION --build-arg version=$VERSION .
+            docker tag codeyourfuture/knowledge-checklist:$VERSION codeyourfuture/knowledge-checklist:latest
+      - run:
+          name: Docker login
+          command: echo "$DOCKER_PASS" | docker login -u $DOCKER_USER --password-stdin
+      - run:
+          name: Docker push frontend
+          command: docker push codeyourfuture/knowledge-checklist
+
+  db-build:
+    docker:
+      - image: circleci/node:12.18.3
+    steps:
+      - checkout
+      - run:
+          name: install packages
+          command: npm ci
+      - run:
+          name: deploy db
+          command: npm run db-migrate-production
+      - run:
+          name: load learning objectives
+          command: npm run db-loadfixtures-production
+
+  deploy_production:
+    docker:
+      - image: circleci/python:2.7-jessie
+    working_directory: ~/repo
+    steps:
+      - setup_remote_docker
+      - run:
+          name: Set env variables
+          command: echo 'export VERSION=$(echo $CIRCLE_SHA1 | cut -c -7)' >> $BASH_ENV
+      - run:
+          name: Install awscli
+          command: sudo pip install awscli
+      - run:
+          name: Install kubectl
+          command: |
+            curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl
+            chmod +x kubectl
+      - run:
+          name: Install gnupg
+          command: sudo apt-get -y install gnupg
+      - run:
+          name: Get kubeconfig
+          command: aws s3 cp s3://$SECRETS_BUCKET/kubectl/config_cyfbot.gpg ./config.gpg
+      - run:
+          name: Decrypt kubeconfig and set KUBECONFIG
+          command: gpg --yes --passphrase="$GPG_KEY" config.gpg
+      - run:
+          name: Update k8s deployments
+          command: |
+            KUBECONFIG=$(pwd)/config ./kubectl set image deployment/knowledge-checklist-dep knowledge-checklist=codeyourfuture/knowledge-checklist:$VERSION
+workflows:
+  version: 2
+  build-deploy:
+    jobs:
+      - build:
+          context: build
+      - deploy_production:
+          context: deployments
+          requires:
+            - build
+          filters:
+            branches:
+              only:
+                - master
+      - db-build:
+          context: deployments
+          requires:
+            - build
+          filters:
+            branches:
+              only:
+                - master
diff --git a/.env.example b/.env.example
index 55a9fa3d..dfb10d52 100644
--- a/.env.example
+++ b/.env.example
@@ -1,4 +1,10 @@
-jwtSecret=
+
 db_user=
 db_password=
-db_port=
\ No newline at end of file
+db_port=
+cookieSessionKey=
+
+## to get these variables you need to create github app:
+github_client_id=
+github_client_secret=
+
diff --git a/Dockerfile b/Dockerfile
index 75832a6b..e5ed2f70 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,6 +15,7 @@ RUN npm ci
 COPY ./.babelrc .
 COPY ./client /client
 COPY ./server /server
+RUN touch .env
 
 RUN npm run build
 
diff --git a/README.md b/README.md
index 77b72b65..914e0b03 100644
--- a/README.md
+++ b/README.md
@@ -2,36 +2,41 @@
 
 - clone repo
 - npm install
-- setup your local Postgres SQL database and create a database with database.sql file found in server folder
-- connect the server with local db
-- change config of db according to your database( please note: port in project should match your db)
-- copy example from .env.example to .env file and fill in values eg: jwtSecret=password
+- setup your local Postgres SQL database
+  -to create tables use these db-migration commands:
+  -create github app to login to the knowledge-checklist
+  -create `.env` file and use `.env.example` for reference of configuration
+
+  ### Local db:
+
+  1-for tables use =>`npm run db-migrate`,
+  2-to add learning objectives use => `npm run db-loadfixtures`
+  -In order to connect the server with local db, add configuration from `.env.example` to `.env` file
 
 ## Entry points in the app to get started adding features:
 
 - Client folder ---> src contains all the front-end code.
 - Server Folder contains all the back-end code.
 
-## Design considerations or Trade offs
+# Design considerations or Trade offs
 
 - To keep with Code Your Futures brand colours
 - Frontend:-
   - React Hooks - list available in package json
 - Backend:-
-  - bcrypt : js hashing generator
-  - jsonwebtoken : used for authoration and verification
+  - cookiesesseion : used for authorisation and verification
   - nodejs express : Works well with postgre sql
   - Postgres SQL: open source relational database
 
-## Features or things to add/change/remove in the future
+# Features or things to add/change/remove in the future
 
-- Replace local storage with cookies
-- Add a GitHub or a different 0auth2 to register or login
 - Add a registration policy for mentors (to be be clarified)
 - Add a simple user profile with account settings
 - Mentors view - Add a class overview of skills
+- Add Mongodb and its learning objectives
+- Graphical representation of modules covered for each student
 
-## Scripts
+# Scripts
 
 Various scripts are provided in the package file, but many are helpers for other scripts; here are the ones you'll
 commonly use:
@@ -41,7 +46,19 @@ commonly use:
 - `lint`: runs ESLint against all the JavaScript in the project.
 - `serve`: builds and starts the app in production mode locally.
 
-### Debugging
+## Scripts for db staging and production
+
+### Heroku(staging) db:
+
+- `heroku login`: to Login to Heroku db from any terminal
+- `npm run db-migrate-staging`: to add tables
+- `npm run db-loadfixtures-staging`: to add learning objectives
+
+### Production db:
+
+-For the production there is config file called `config.yml` this will update the db automatically once you push to master branch.
+
+# Debugging
 
 While running the dev mode using `npm run dev`, you can attach the Node debugger to the server process via port 9229.
 If you're using VS Code, a debugging configuration is provided for this.
diff --git a/client/src/App.css b/client/src/App.css
index dfd6b409..7c5a82c9 100644
--- a/client/src/App.css
+++ b/client/src/App.css
@@ -30,8 +30,7 @@ body {
 }
 
 .header-img {
-  margin-left: 5vw;
-  height: 50%;
+  width: 20vw;
 }
 
 .logout-img {
@@ -46,26 +45,38 @@ body {
   flex-direction: column;
   align-items: center;
   justify-content: space-between;
-  padding: 2%;
+  padding: 0.4rem 0 0.4rem 0;
   font-size: larger;
-  margin-bottom: 65px;
-  border-bottom: 5px solid #000;
+  box-shadow: 5px 10px #888888;
 }
 
-.signup-form-container {
-  flex-grow: 1;
-}
-
-.signup-container {
-  display: flex;
+input {
+  border-radius: 10%;
 }
 
 .sign-form label {
   margin-top: 2vh;
 }
+.style-select {
+  border-radius: 10%;
+  padding: 0.3rem 0 0.3rem 0;
+  width: 13rem;
+  box-shadow: 1px 2px #888888;
+}
 
-input {
+.role-select {
   border-radius: 10%;
+  padding: 0.25rem 0 0.25rem 0;
+  width: 13rem;
+  box-shadow: 1px 2px #888888;
+}
+.signup-form-container {
+  flex-grow: 1;
+}
+
+.signup-container {
+  display: flex;
+  border-bottom: 5px solid #000;
 }
 
 .submit {
@@ -117,31 +128,41 @@ input {
   color: #ff0033;
 }
 .register {
-  text-align: center;
-  color: #219653;
-  font-size: large;
+  padding: 1vw 3.5vw !important;
 }
 .register:hover {
-  color: #219653;
+  color: #c7c7c7 !important;
 }
+
 .signup-link {
   text-align: center;
   color: #219653;
+}
+
+.student-progress {
+  background-color: #495464;
+  color: white;
+  padding: 10px;
+  border-radius: 10px;
   font-size: large;
+  margin-left: 20px;
 }
+
 a:link {
   text-decoration: none;
 }
-.signup-link:hover {
-  background-color: #495464;
+.student-progress:hover {
+  background-color: #333c49;
   color: white;
   padding: 10px;
-  border-bottom: none;
 }
 .signup-prompt {
   display: flex;
-  flex-direction: row;
-  margin: 0 auto;
+  justify-content: center;
+  margin-top: 3vw;
+}
+.signup-prompt:hover {
+  color: #b6b9be;
 }
 .edit-lo-container {
   float: right;
@@ -170,7 +191,6 @@ li {
   margin-top: 10vh;
   padding-right: 20px;
   margin-left: 20px;
-  /* max-width: 100%; */
 }
 .lo-wrapper {
   background-color: #efefef;
@@ -187,7 +207,6 @@ li {
 .default-skill-display {
   color: rgb(255, 255, 255);
   font-size: 24px;
-  line-height: 50px;
 }
 
 .default-skill-display:hover {
@@ -199,6 +218,7 @@ li {
   background-color: rgb(255, 255, 255);
   padding: 8px;
   border-radius: 5px;
+  padding-right: 0px;
 }
 .skills-container A {
   display: flex;
@@ -207,21 +227,13 @@ li {
   font-size: larger;
   font-weight: 600;
 }
-/* .skills-container A:focus {
-  background-color: white;
-  color: #db4437;
-  font-weight: bolder;
-  border-radius: 4px;
-  text-decoration: none;
-} */
-
 .skills-container .edit-btn:not A:hover {
   border-radius: 4px;
   color: white;
   text-decoration: none;
   border-bottom: 1px solid whites;
   text-align: center;
-}
+} */
 
 .skills-container {
   background-color: #495464;
@@ -281,6 +293,47 @@ li {
 .modal-body .modal-footer {
   font-size: larger;
 }
+.active {
+  padding: 3px 0px 3px 5px;
+  color: rgb(228, 9, 9);
+  background-color: rgba(255, 255, 255, 0.842);
+  transition: 0.3s;
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-radius: 5px;
+}
+
+.name-list {
+  width: 100%;
+}
+.inactive {
+  color: #d1d1d1;
+  margin-right: 10px;
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.students-name {
+  font-family: Arial, Helvetica, sans-serif;
+  font-weight: 300;
+  width: 100%;
+}
+
+.inactive:hover {
+  color: rgb(235, 67, 55);
+}
+
+.student-list {
+  padding-left: 10px;
+}
+
+.name-list:hover {
+  color: rgb(235, 67, 55);
+}
 
 .modal-footer button {
   background-color: #db4437;
@@ -324,22 +377,13 @@ li {
   color: #efefef;
 }
 
-/* .skill-name {
-  margin-bottom: 10%;
-} */
-
-.name-list {
+.nav-features {
   display: flex;
   justify-content: space-between;
 }
 
-/* .student-list {
-  position: relative;
-} */
-
-/* .students-name {
-  position: absolute;
-  margin-left: 10%;
+/* .skill-name {
+  margin-bottom: 10%;
 } */
 
 .app-message__input {
diff --git a/client/src/App.js b/client/src/App.js
index 723fc97f..cdf5f9f6 100644
--- a/client/src/App.js
+++ b/client/src/App.js
@@ -1,17 +1,13 @@
-import React, { useEffect, useState } from "react";
+import React, { useState } from "react";
 
-//import { getMessage } from "./service";
 import { BrowserRouter, Route, Link, Switch } from "react-router-dom";
 import SignupForm from "./components/SignupForm";
 import LoginForm from "./components/LoginForm";
 import SkillsNav from "./Pages/SkillsNav";
-import Modal from "./components/Modal";
 import MentorsView from "./Pages/MentorsView";
-import MentorsEdit from "./Pages/MentorsEdit";
+import MentorsEditLearningObj from "./Pages/MentorsEditLearningObj";
 
 export function App() {
-  const [message, setMessage] = useState("Loading...");
-
   return (
     <BrowserRouter>
       <main role="main">
@@ -19,11 +15,14 @@ export function App() {
           <Switch>
             <Route exact path="/" component={LoginForm} />
             <Route path="/signup" component={SignupForm} />
-
+   
             <Route path="/skills" component={SkillsNav} />
 
             <Route path="/MentorsView" component={MentorsView} />
-            <Route path="/MentorsEdit/:id?" component={MentorsEdit} />
+            <Route
+              path="/MentorsEditLearningObj/:id?"
+              component={MentorsEditLearningObj}
+            />
           </Switch>
         </div>
       </main>
diff --git a/client/src/Pages/MentorsEdit.js b/client/src/Pages/MentorsEdit.js
index f8cc76e3..3f95ebc4 100644
--- a/client/src/Pages/MentorsEdit.js
+++ b/client/src/Pages/MentorsEdit.js
@@ -5,7 +5,7 @@ import {
   Route,
   NavLink,
 } from "react-router-dom";
-import EditBox from "../components/EditBox";
+import MentorEditLearningObj from "../components/MentorEditLearningObj";
 import Header from "../components/Header";
 import Footer from "../components/Footer";
 // import { skills, skillLabel } from "../components/consts/skillsConst";
@@ -96,7 +96,10 @@ export default function MentorsEdit() {
         </div>
 
         <Switch>
-          <Route path="/mentorsedit/:id" children={<EditBox />} />
+          <Route
+            path="/mentorsedit/:skill"
+            children={<MentorEditLearningObj />}
+          />
         </Switch>
       </div>
       <Footer />
diff --git a/client/src/Pages/MentorsEditLearningObj.js b/client/src/Pages/MentorsEditLearningObj.js
new file mode 100644
index 00000000..d3b18faa
--- /dev/null
+++ b/client/src/Pages/MentorsEditLearningObj.js
@@ -0,0 +1,63 @@
+import React, { useEffect, useState }  from "react";
+import {
+  BrowserRouter as Router,
+  Switch,
+  Route,
+  useHistory,
+  NavLink,
+} from "react-router-dom";
+
+import EditBox from "../components/EditBox";
+import Header from "../components/Header";
+import Footer from "../components/Footer";
+import { skills, skillLabel } from "../components/consts/skillsConst";
+
+export default function MentorsEditLearningObj() {
+   let history = useHistory();
+  useEffect(() => {
+    fetch(`/api/verify`)
+      .then((res) => {
+        if (res.status !== 200) {
+          history.push("/");
+        }
+        return res.json();
+      })
+      .then((data) => {
+        if (data == "not authorized" || data.role == "Student") {
+          history.push("/");
+        }
+      })
+      .catch((error) => console.log(error));
+  }, []);
+  let back = "Students Progress";
+
+  return (
+    <Router>
+      <Header back={back} />
+      <div className="mentorsedit-page"></div>
+
+      <div className="edit-display-container">
+        <div className="skillNav-display ">
+          <ul>
+            {skills.map((skill, index) => (
+              <li key={index}>
+                <NavLink
+                  to={`/MentorsEditLearningObj/${skill}`}
+                  activeClassName="active-skill-display"
+                  className="default-skill-display"
+                >
+                  {skillLabel(skill)}
+                </NavLink>
+              </li>
+            ))}
+          </ul>
+        </div>
+
+        <Switch>
+          <Route path="/MentorsEditLearningObj/:id" children={<EditBox />} />
+        </Switch>
+      </div>
+      <Footer />
+    </Router>
+  );
+}
diff --git a/client/src/Pages/MentorsView.js b/client/src/Pages/MentorsView.js
index 6b4b6d3b..183e6b57 100644
--- a/client/src/Pages/MentorsView.js
+++ b/client/src/Pages/MentorsView.js
@@ -1,24 +1,19 @@
 import React, { useState, useEffect } from "react";
 import StudentResultsContainer from "../components/StudentResultsContainer";
-import { Link, useHistory, useLocation } from "react-router-dom";
+import { Link, useHistory } from "react-router-dom";
 import Header from "../components/Header";
 import Footer from "../components/Footer";
-
-function useQuery() {
-  return new URLSearchParams(useLocation().search);
-}
+import useQuery from "../components/useQuery";
 
 function MentorsView() {
   const [studentList, setStudentList] = useState([]);
+  const [bg, setBg] = useState("");
 
   let history = useHistory();
-  const token = window.localStorage.getItem("token");
+  const [mentorName, setMentorName] = useState(null);
+
   useEffect(() => {
-    console.log(token);
-    if (!token) {
-      history.push("/");
-    }
-    fetch(`/api/verify`, { headers: { token } })
+    fetch(`/api/verify`)
       .then((res) => {
         if (res.status !== 200) {
           history.push("/");
@@ -26,8 +21,7 @@ function MentorsView() {
         return res.json();
       })
       .then((data) => {
-        console.log(data);
-        window.localStorage.setItem("role", data.role);
+        setMentorName(data.name);
         if (data == "not authorized" || data.role == "Student") {
           history.push("/");
         }
@@ -36,7 +30,7 @@ function MentorsView() {
   }, []);
 
   useEffect(() => {
-    fetch(`/api/students`, { headers: { token } })
+    fetch(`/api/students`)
       .then((res) => res.json())
       .then((data) => {
         setStudentList(data);
@@ -44,8 +38,7 @@ function MentorsView() {
   }, []);
 
   let studentName = "";
-  console.log(studentList);
-  const studentId = useQuery().get("studentId");
+  const studentId = useQuery("studentId");
   if (studentId && studentList) {
     const student = studentList.filter(
       (student) => student.user_id == studentId
@@ -55,64 +48,37 @@ function MentorsView() {
       studentName = `${student.first_name} ${student.last_name}`;
     }
   }
-  console.log(studentList);
-
-  // let editLoImg =  <img
-  //         className="edit-btn crud"
-  //         src="https://i.ibb.co/nrkVG9b/edit-1.png"
-  //         alt="edit"
-  //         border="0"
-  //       ></img>
   const editLearningObjectives = (
-    <a href="/mentorsedit" className="signup-link">
+    <a className="student-progress" href="/MentorsEditLearningObj">
       Edit Learning Objectives
     </a>
   );
-  let logout = (
-    <a href="/">
-      <img
-        src="https://www.flaticon.com/svg/static/icons/svg/159/159707.svg"
-        alt="logout"
-        className="logout-img"
-      ></img>
-    </a>
-  );
 
   return (
     <div className="mentorsview-page">
-      <Header editLearningObjectives={editLearningObjectives} logout={logout} />
-      <h1 className="welcome-msg">
-        Welcome {window.localStorage.getItem("name")}
-      </h1>
+      <Header editLearningObjectives={editLearningObjectives} />
+      <h1 className="welcome-msg">Welcome {mentorName}😊</h1>
       <div className="main-container-mentorView">
         <div className="studentName-Container">
-          {/* <ul>
-            {studentList.map(({ user_id, first_name, last_name }) => {
-              return (
-                <li key={user_id} className="students-name">
-                  <Link
-                    to={`./MentorsView?studentId=${user_id}`}
-                    className="name-list"
-                  >
-                    {`${first_name} ${last_name}`}
-                  </Link>
-                </li>
-              );
-            })}
-          </ul> */}
-
           <h2 className="mentor-greet">Students List:</h2>
           <ul className="student-list">
             {studentList.map(({ user_id, first_name, last_name }) => {
               return (
-                <li key={user_id} className="students-name ">
+                <li key={user_id} className="students-name">
                   <Link
+                    onClick={() => setBg({ activeIndex: user_id })}
                     to={`./MentorsView?studentId=${user_id}`}
-                    className="name-list"
+                    className="name-list d-flex"
                   >
-                    <div>{`${first_name} ${last_name}`}</div>
-                    <div>
-                      <i class="fas fa-arrow-right"></i>
+                    <div
+                      className={`${
+                        user_id == bg.activeIndex ? "active" : "inactive"
+                      }`}
+                    >
+                      <div>{`${first_name} ${last_name}`}</div>
+                      <div className="icon">
+                        <i class="fas fa-arrow-right "></i>
+                      </div>
                     </div>
                   </Link>
                 </li>
diff --git a/client/src/Pages/SkillsNav.js b/client/src/Pages/SkillsNav.js
index 3817997d..88495458 100644
--- a/client/src/Pages/SkillsNav.js
+++ b/client/src/Pages/SkillsNav.js
@@ -1,4 +1,4 @@
-import React, { useEffect } from "react";
+import React, { useEffect, useState } from "react";
 import SkillTracker from "./SkillsTracker";
 import { useHistory, Route, NavLink } from "react-router-dom";
 import Header from "../components/Header";
@@ -7,12 +7,14 @@ import { skills, skillLabel } from "../components/consts/skillsConst";
 
 export default function SkillsNav() {
   let history = useHistory();
+  const [userName, setUserName] = useState({});
+
+
+
+
+
   useEffect(() => {
-    const token = window.localStorage.getItem("token");
-    if (!token) {
-      history.push("/");
-    }
-    fetch(`/api/verify`, { headers: { token } })
+    fetch(`/api/verify`)
       .then((res) => {
         if (res.status !== 200) {
           history.push("/");
@@ -20,34 +22,24 @@ export default function SkillsNav() {
         return res.json();
       })
       .then((data) => {
-        window.localStorage.setItem("role", data.role);
+        setUserName(data);
         if (data == "not authorized" || data.role == "Mentor") {
           history.push("/");
         }
       });
   }, []);
-  let logout = (
-    <a href="/">
-      <img
-        src="https://www.flaticon.com/svg/static/icons/svg/159/159707.svg"
-        alt="logout"
-        className="logout-img"
-      ></img>
-    </a>
-  );
 
   return (
     <div className="skillsnav-page">
       <div>
-        <Header logout={logout} />
+        <Header />
       </div>
-      <h1 className="welcome-msg">
-        Welcome {window.localStorage.getItem("name")}
-      </h1>
+      <h1 className="welcome-msg">Welcome {userName.name}😊</h1>
       <div className="skills-main-container">
         <div className="skills-container">
-          {skills.map((skill) => (
+          {skills.map((skill, index) => (
             <NavLink
+              key={index}
               to={`/skills/${skill}`}
               activeClassName="active-skill-display"
               className="default-skill-display"
@@ -58,8 +50,9 @@ export default function SkillsNav() {
         </div>
 
         <div>
-          {skills.map((skill) => (
+          {skills.map((skill, index) => (
             <Route
+              key={index}
               path={`/skills/${skill}`}
               component={() => <SkillTracker skill={skill} />}
             />
diff --git a/client/src/Pages/SkillsTracker.js b/client/src/Pages/SkillsTracker.js
index 62ff9799..518bf82c 100644
--- a/client/src/Pages/SkillsTracker.js
+++ b/client/src/Pages/SkillsTracker.js
@@ -1,14 +1,10 @@
 import React, { useEffect, useState } from "react";
-import BtnContainer from "../components/BtnContainer";
+import ProgressTrackingButtons from "../components/ProgressTrackingButtons";
 
 export default function Html({ skill }) {
   const [learningObjectives, setLearningObjectives] = useState([]);
-
   const fetchLearningObj = () => {
-    const token = window.localStorage.getItem("token");
-    fetch(`/api/learningobjectives/${localStorage.getItem("user")}/${skill}`, {
-      headers: { token },
-    })
+    fetch(`/api/learningobjectives/${skill}`)
       .then((response) => response.json())
       .then((data) => {
         if (data.error) {
@@ -19,13 +15,11 @@ export default function Html({ skill }) {
   };
   useEffect(fetchLearningObj, [skill]);
   // call fetch here
-
   function updateAchievement(newAbility, id) {
     fetch(`/api/abilities`, {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
-        token: window.localStorage.getItem("token"),
       },
       body: JSON.stringify({
         ability: newAbility,
@@ -52,22 +46,26 @@ export default function Html({ skill }) {
   return (
     <div className="learning-objective-container">
       <ul>
-        {learningObjectives.map(({ description, id, ability }, index) => {
-          function updateAbility(newAbility) {
-            updateAchievement(newAbility, id);
-          }
-          return (
-            <li key={index}>
-              {description}
+        {learningObjectives.map(
+          ({ description, id, ability, student_id }, index) => {
+            function updateAbility(newAbility) {
+              updateAchievement(newAbility, id);
+            }
+
+            return (
+              <li key={index}>
+                {description}
 
-              <BtnContainer
-                ability={ability}
-                updateAbility={updateAbility}
-                learningObjId={id}
-              />
-            </li>
-          );
-        })}
+                <ProgressTrackingButtons
+                  ability={ability}
+                  updateAbility={updateAbility}
+                  learningObjId={id}
+                  student_id={student_id}
+                />
+              </li>
+            );
+          }
+        )}
       </ul>
     </div>
   );
diff --git a/client/src/components/BtnContainer.css b/client/src/components/BtnContainer.css
index 99ff5a1d..556368aa 100644
--- a/client/src/components/BtnContainer.css
+++ b/client/src/components/BtnContainer.css
@@ -11,6 +11,10 @@
   background-color: blue;
 }
 
+.btn-white{
+  background-color: white;
+}
+
 .btn-container {
   display: flex;
   justify-content: space-around;
diff --git a/client/src/components/BtnContainer.js b/client/src/components/BtnContainer.js
deleted file mode 100644
index 03589805..00000000
--- a/client/src/components/BtnContainer.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import React from "react";
-import TrackBtn from "./TrackBtn";
-import "./BtnContainer.css";
-export default function BtnContainer({ ability, updateAbility }) {
-  return (
-    <div className="btn-container">
-      <TrackBtn
-        classNameBtn={ability === 0 ? "btn-red" : ""}
-        onClick={() => updateAbility(0)}
-        btnText={"Not Confident"}
-      />
-      <TrackBtn
-        classNameBtn={ability === 1 ? "btn-yellow" : ""}
-        onClick={() => updateAbility(1)}
-        btnText={"Still learning"}
-      />
-
-      <TrackBtn
-        classNameBtn={ability === 2 ? "btn-green" : ""}
-        onClick={() => updateAbility(2)}
-        btnText={"Confident"}
-      />
-    </div>
-  );
-}
diff --git a/client/src/components/CityDropDownOptions.js b/client/src/components/CityDropDownOptions.js
new file mode 100644
index 00000000..6779d1af
--- /dev/null
+++ b/client/src/components/CityDropDownOptions.js
@@ -0,0 +1,50 @@
+import React from "react";
+
+export default function CityDropDownOptions({ city, handleChange }) {
+  const cities = {
+    "Cape Town": [1, 2, 3],
+    London: [1, 2, 3, 4, 5, 6, 7],
+    "North West": [1, 2, 3, 4],
+    Rome: [1, 2, 3],
+    Scotland: [1, 2, 3, 4, 5],
+    "West Midlands": [1, 2, 3, 4],
+  };
+  const cityDropDown = () => {
+    if (city) {
+      return (
+        <>
+          <label for="userClassId">Choose a Class</label>
+          <select
+            className="style-select"
+            name="userClassId"
+            onChange={handleChange}
+          >
+            <option value="select">Select</option>
+            {cities[city].map((cohort, index) => (
+              <option key={index} value={cohort}>
+                {cohort}
+              </option>
+            ))}
+          </select>
+        </>
+      );
+    }
+  };
+
+  return (
+    <>
+      <label for="cyfCity">Location</label>
+      <select className="style-select" name="cyfCity" onChange={handleChange}>
+        <option value="select"> Select </option>
+
+        {Object.keys(cities).map((city, index) => (
+          <option key={index} value={city}>
+            {city}
+          </option>
+        ))}
+      </select>
+
+      {cityDropDown()}
+    </>
+  );
+}
diff --git a/client/src/components/DeleteBtn.js b/client/src/components/DeleteBtn.js
deleted file mode 100644
index 010fbd2f..00000000
--- a/client/src/components/DeleteBtn.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import React, { useEffect, useState } from 'react'
-
-// export default function DeleteBtn(id) {
-//     //console.log(id)
-//     const [deleteBtn, setDeleteBtn] = useState()
-//     const deleteLearningOb = (id)=> {
-//         console.log(id)
-//         useEffect(()=>{
-//             fetch(`/learningobjective/${id}`, {
-//                 method: "DELETE"
-//               })
-//                 .then(res => res.json())
-//                 .then(data =>data);
-//             }, [])
-            
-          
-//     }
-//     return (
-//         <div>
-//              <button
-//                     onClick={() =>deleteLearningOb}
-//                     className="sumbit delete-btn"
-//                     type="submit"
-//                     variant="secondary"
-//                   >delete</button>
-//         </div>
-//     )
-// }
diff --git a/client/src/components/Header.js b/client/src/components/Header.js
index 5e5fb6a5..ddd0722d 100644
--- a/client/src/components/Header.js
+++ b/client/src/components/Header.js
@@ -1,30 +1,60 @@
 import React from "react";
-import { Link, useHistory, useLocation } from "react-router-dom";
+import { useLocation } from "react-router-dom";
+export default function Header({ editLearningObjectives, back, logout }) {
+  const location = useLocation();
 
-export default function Header({ editLearningObjectives, logout, back }) {
-  // export default function Header({ editLoImg, back }) {
-  return (
-    <div className="header">
-      <img
-        src="https://codeyourfuture.io/wp-content/uploads/2019/03/cyf_brand.png"
-        alt="code your future"
-        className="header-img"
-      ></img>
+  let logoLink = "";
 
-      <h3>{editLearningObjectives}</h3>
+  if (location.pathname.includes("skills")) {
+    logoLink = "/skills";
+  } else if (location.pathname.includes("Mentors")) {
+    logoLink = "/MentorsView";
+  }
 
-      <a href="/MentorsView">
-        <h3 className="signup-link">{back}</h3>
-      </a>
-      {/* <a href="/mentorsedit">{editLoImg}</a> */}
-      {logout}
-      {/* <a href="/">
-        <img
-          src="https://www.flaticon.com/svg/static/icons/svg/159/159707.svg"
-          alt="logout"
-          className="logout-img"
-        ></img>
-      </a> */}
-    </div>
+  return (
+    <nav className="navbar navbar-expand-lg navbar-light bg-light">
+      <div className="container-fluid">
+        <a className="nav-link" href={logoLink}>
+          <img
+            src="https://codeyourfuture.io/wp-content/uploads/2019/03/cyf_brand.png"
+            alt="code your future"
+            className="header-img"
+          ></img>
+        </a>
+        <button
+          className="navbar-toggler"
+          type="button"
+          data-bs-toggle="collapse"
+          data-bs-target="#navbarSupportedContent"
+          aria-controls="navbarSupportedContent"
+          aria-expanded="false"
+          aria-label="Toggle navigation"
+        >
+          <span className="navbar-toggler-icon"></span>
+        </button>
+        <div className="collapse navbar-collapse" id="navbarSupportedContent">
+          <ul className="navbar-nav me-auto mb-2 mb-lg-0">
+            <li className="nav-item">
+              {back ? (
+                <a className="student-progress" href="/MentorsView">
+                  {back}
+                </a>
+              ) : (
+                editLearningObjectives
+              )}
+            </li>
+          </ul>
+          {location.pathname !== "/" && (
+            <a href="/api/logout">
+              <img
+                src="https://www.flaticon.com/svg/static/icons/svg/159/159707.svg"
+                alt="logout"
+                className="logout-img"
+              ></img>
+            </a>
+          )}
+        </div>
+      </div>
+    </nav>
   );
 }
diff --git a/client/src/components/AddForm.js b/client/src/components/LearningObjectiveAddForm.js
similarity index 71%
rename from client/src/components/AddForm.js
rename to client/src/components/LearningObjectiveAddForm.js
index 3a7c2f17..843129e2 100644
--- a/client/src/components/AddForm.js
+++ b/client/src/components/LearningObjectiveAddForm.js
@@ -1,7 +1,7 @@
-import React, { useState, useEffect } from "react";
+import React, { useState } from "react";
+import { skills, skillLabel } from "./consts/skillsConst";
+export default function LearningObjectiveAddForm({ getLearningObj }) {
 
-export default function AddForm({ getLearningObj }) {
-  const token = window.localStorage.getItem("token");
   const initialDescription = {
     skill: "",
     description: "",
@@ -13,7 +13,7 @@ export default function AddForm({ getLearningObj }) {
       [event.target.name]: event.target.value,
     };
     setAddDescription(updateInput);
-    console.log(updateInput);
+ 
   }
   async function hadleSubmit(e) {
     e.preventDefault();
@@ -22,7 +22,7 @@ export default function AddForm({ getLearningObj }) {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
-        token,
+       
       },
       body: JSON.stringify({
         skill: addDescription.skill,
@@ -30,8 +30,6 @@ export default function AddForm({ getLearningObj }) {
       }),
     })
       .then((response) => response.json())
-      .then((data) => console.log(data));
-
     setAddDescription(initialDescription);
     getLearningObj();
   }
@@ -43,14 +41,10 @@ export default function AddForm({ getLearningObj }) {
         <br />
 
         <select name="skill" onChange={handleChange} className="dropdown-skill">
-          <option value="select">Select</option>
-          <option value="html">HTML</option>
-          <option value="css">CSS</option>
-          <option value="git">GIT</option>
-          <option value="javascript">Javascript</option>
-          <option value="react">React</option>
-          <option value="node">Node</option>
-          <option value="sql">SQL</option>
+          <option>Select a skill</option>
+          {skills.map((skill) => (
+            <option value={skill}>{skillLabel(skill)}</option>
+          ))}
         </select>
         <br />
         <label className="input-label">Add your learning objective</label>
diff --git a/client/src/components/LoginForm.js b/client/src/components/LoginForm.js
index b9ba705f..b0c472e8 100644
--- a/client/src/components/LoginForm.js
+++ b/client/src/components/LoginForm.js
@@ -1,59 +1,22 @@
 import React, { useState, useEffect } from "react";
-import { Container, Form } from "react-bootstrap";
+import { Container } from "react-bootstrap";
 import Footer from "./Footer";
 import Header from "./Header";
 import LoginImage from "../login-image.jpg";
-import useFormValidation from "./useFormValidation";
 import "../App.css";
-import loginValidation from "./loginValidation";
-import { Link, useHistory } from "react-router-dom";
 
 export default function LoginForm() {
-  let history = useHistory();
-  const [serverError, setServerError] = useState("");
-  const intialState = {
-    userEmail: "",
-    userPassword: "",
-  };
-  const {
-    handleChange,
-    input,
-    handleSubmit,
-    errors,
-    isValid,
-  } = useFormValidation(loginValidation, intialState);
-
-  useEffect(() => {
-    if (isValid) {
-      fetch(`/api/login`, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-        },
-        body: JSON.stringify({
-          userEmail: input.userEmail,
-          userPassword: input.userPassword,
-        }),
-      })
-        .then((response) => response.json())
-        .then((data) => {
-          if (data.error) {
-            throw data;
-          }
+  const [clientId, setClientId] = useState();
 
-          window.localStorage.setItem("token", data.token);
+  const getClientId = () => {
+    fetch("/api/github-client-id")
+      .then((res) => res.json())
+      .then((data) => {
+        setClientId(data.github_client_id);
+      });
+  };
 
-          window.localStorage.setItem("user", data.id);
-          window.localStorage.setItem("name", data.name);
-          window.localStorage.setItem("role", data.role);
-          let role = data.role;
-          role === "Student"
-            ? history.push("/skills")
-            : history.push("/MentorsView");
-        })
-        .catch(({ error }) => setServerError(error));
-    }
-  }, [isValid]);
+  useEffect(getClientId, []);
 
   return (
     <div className="login-container">
@@ -66,39 +29,14 @@ export default function LoginForm() {
       ></img>
 
       <Container className="main-container">
-        <Form onSubmit={handleSubmit} className="login-page">
-          <p className="error">{serverError}</p>
-          <label>Email</label>
-          <input
-            type="email"
-            placeholder="Email"
-            name="userEmail"
-            onChange={handleChange}
-            value={input.userEmail}
-          />
-          {errors.userEmail && <p className="error">*{errors.userEmail} </p>}
-          <label>Password</label>
-          <input
-            type="password"
-            placeholder="Password"
-            name="userPassword"
-            onChange={handleChange}
-            value={input.userPassword}
-          />
-          {errors.userPassword && (
-            <p className="error">*{errors.userPassword} </p>
-          )}
-          <button className="submit " type="submit" size="lg">
-            Login
-          </button>
-          <br />
-          <div className="signup-prompt">
-            <em>Don't have an account? &nbsp;</em>
-            <Link to="/signup" className="register">
-              Signup
-            </Link>
-          </div>
-        </Form>
+        <div className="signup-prompt ">
+          <a
+            href={`https://github.com/login/oauth/authorize?client_id=${clientId}`}
+            className="register text-white btn btn-dark   text-center "
+          >
+            <i className="fab fa-github"></i> Sign in with Github
+          </a>
+        </div>
       </Container>
 
       <Footer />
diff --git a/client/src/components/EditBox.js b/client/src/components/MentorEditLearningObj.js
similarity index 89%
rename from client/src/components/EditBox.js
rename to client/src/components/MentorEditLearningObj.js
index 1684f79b..2dc912ac 100644
--- a/client/src/components/EditBox.js
+++ b/client/src/components/MentorEditLearningObj.js
@@ -1,21 +1,17 @@
 import React, { useState, useEffect } from "react";
-// import fakeData from "../fakeData.json";
-import AddForm from "./AddForm";
+
+import LearningObjectiveAddForm from "./LearningObjectiveAddForm";
+
 import { useParams } from "react-router-dom";
-import { skills } from "../components/consts/skillsConst";
 
 export default function EditBox() {
   let { id } = useParams();
-  // const skills = fakeData[id];
-  const [deleted, setDeleted] = useState(skills);
   const [learningObj, setLearningObj] = useState([]);
   const [updateLO, setUpdateLO] = useState("");
   const [text, setText] = useState("");
 
-  const token = window.localStorage.getItem("token");
-
   const getLearningObj = () => {
-    fetch(`/api/learningobjectives/${id}`, { headers: { token } })
+    fetch(`/api/learningobjectives/${id}`)
       .then((response) => response.json())
       .then((data) => {
         if (data.error) {
@@ -27,14 +23,11 @@ export default function EditBox() {
   };
   useEffect(() => {
     getLearningObj();
-  }, [id]);
+  }, [skill]);
 
   const deleteLearningOb = (LearningID) => {
     fetch(`/api/learningobjectives/${LearningID}`, {
       method: "DELETE",
-      headers: {
-        token,
-      },
     }).then(() => {
       let newData = learningObj.filter((p) => p.id !== LearningID);
       setLearningObj(newData);
@@ -50,7 +43,6 @@ export default function EditBox() {
         }),
         headers: {
           "Content-Type": "application/json",
-          token,
         },
       })
         .then((res) => res.json())
@@ -138,7 +130,7 @@ export default function EditBox() {
           })}
         </ul>
         <div className="add-btn-container">
-          <AddForm getLearningObj={getLearningObj} />
+          <LearningObjectiveAddForm getLearningObj={getLearningObj} />
         </div>
       </div>
     </div>
diff --git a/client/src/components/Modal.js b/client/src/components/Modal.js
index 59200af3..904ef81b 100644
--- a/client/src/components/Modal.js
+++ b/client/src/components/Modal.js
@@ -4,7 +4,6 @@ import Container from "react-bootstrap/Container";
 import { Link } from "react-router-dom";
 
 export default function Modal({ role }) {
-  console.log(role);
   return (
     <Jumbotron>
       <Container>
diff --git a/client/src/components/ProgressTrackingButtons.js b/client/src/components/ProgressTrackingButtons.js
new file mode 100644
index 00000000..5a182e88
--- /dev/null
+++ b/client/src/components/ProgressTrackingButtons.js
@@ -0,0 +1,29 @@
+import React from "react";
+import TrackBtn from "./TrackBtn";
+import "./BtnContainer.css";
+export default function ProgressTrackingButtons({
+  ability,
+  updateAbility,
+}) {
+
+  return (
+    <div className="btn-container">
+      <TrackBtn
+        classNameBtn={ability === 0 ? "btn-red" : "btn-white"}
+        onClick={() => (ability === 0 ? updateAbility(null) : updateAbility(0))}
+        btnText={"Not Confident"}
+      />
+      <TrackBtn
+        classNameBtn={ability === 1 ? "btn-yellow" : "btn-white"}
+        onClick={() => (ability === 1 ? updateAbility(null) : updateAbility(1))}
+        btnText={"Still learning"}
+      />
+
+      <TrackBtn
+        classNameBtn={ability === 2 ? "btn-green" : "btn-white"}
+        onClick={() => (ability === 2 ? updateAbility(null) : updateAbility(2))}
+        btnText={"Confident"}
+      />
+    </div>
+  );
+}
diff --git a/client/src/components/SignupForm.js b/client/src/components/SignupForm.js
index adce2714..f736d4a6 100644
--- a/client/src/components/SignupForm.js
+++ b/client/src/components/SignupForm.js
@@ -5,6 +5,9 @@ import "../App.css";
 import validate from "./SignupValidation";
 import Footer from "./Footer";
 import Header from "./Header";
+import useQuery from "../components/useQuery";
+import CityDropDownOptions from "./CityDropDownOptions";
+
 const SignupForm = () => {
   const [hasRegistered, setHasRegistered] = useState(false);
   const [serverError, setServerError] = useState("");
@@ -14,13 +17,12 @@ const SignupForm = () => {
     lastName: "",
     userRole: "",
     userEmail: "",
-    userPassword: "",
-    confirmPassword: "",
     cyfCity: "",
     userClassId: "",
-    userGithub: "",
+    userGithub: useQuery("githubUserName") ?? "",
     userSlack: "",
   };
+
   const {
     handleChange,
     input,
@@ -28,7 +30,6 @@ const SignupForm = () => {
     errors,
     isValid,
   } = useFormValidation(validate, intialState);
-  console.log(errors);
 
   useEffect(() => {
     if (isValid) {
@@ -43,7 +44,6 @@ const SignupForm = () => {
           userRole: input.userRole,
           userEmail: input.userEmail,
           userSlack: input.userSlack,
-          userPassword: input.userPassword,
           userGithub: input.userGithub,
           userClassId: input.userClassId,
           cyfCity: input.cyfCity,
@@ -54,11 +54,6 @@ const SignupForm = () => {
           if (data.error) {
             throw new Error(data.error);
           }
-          window.localStorage.setItem("token", data.token);
-
-          window.localStorage.setItem("user", data.id);
-          window.localStorage.setItem("role", data.role);
-          window.localStorage.setItem("name", data.name);
           setHasRegistered(true);
         })
         .catch((error) => {
@@ -115,48 +110,7 @@ const SignupForm = () => {
               {errors.userEmail && (
                 <p className="error">*{errors.userEmail} </p>
               )}
-              <label for="userPassword">Password</label>
-              <input
-                type="password"
-                placeholder="Password"
-                value={input.userPassword}
-                onChange={handleChange}
-                name="userPassword"
-              />
-              {errors.userPassword && (
-                <p className="error">*{errors.userPassword} </p>
-              )}
-              <label for="">Confirm Password</label>
-              <input
-                type="password"
-                placeholder="Confirm Password"
-                value={input.confirmPassword}
-                onChange={handleChange}
-                name="confirmPassword"
-              />
-              {errors.confirmPassword && (
-                <p className="error">*{errors.confirmPassword} </p>
-              )}
-              <label for="cyfCity">City</label>
-              <input
-                type="text"
-                placeholder="City"
-                value={input.cyfCity}
-                onChange={handleChange}
-                name="cyfCity"
-              />
-              {errors.cyfCity && <p className="error">*{errors.cyfCity} </p>}
-              <label for="userClassId">Class</label>
-              <input
-                type="number"
-                placeholder="Class"
-                value={input.userClassId}
-                onChange={handleChange}
-                name="userClassId"
-              />
-              {errors.userClassId && (
-                <p className="error">*{errors.userClassId} </p>
-              )}
+
               <label for="userGithub">Github Name</label>
               <input
                 type="text"
@@ -173,9 +127,17 @@ const SignupForm = () => {
                 onChange={handleChange}
                 name="userSlack"
               />
+              <CityDropDownOptions
+                city={input.cyfCity}
+                handleChange={handleChange}
+              />
 
               <label for="userRole">Please select a role</label>
-              <select name="userRole" onChange={handleChange}>
+              <select
+                className="role-select"
+                name="userRole"
+                onChange={handleChange}
+              >
                 <option value="select">Select</option>
                 <option value="Student">Student</option>
                 <option value="Mentor">Mentor</option>
diff --git a/client/src/components/SignupValidation.js b/client/src/components/SignupValidation.js
index cc55db9c..f6dec93c 100644
--- a/client/src/components/SignupValidation.js
+++ b/client/src/components/SignupValidation.js
@@ -1,5 +1,5 @@
 export default function SignupValidation(input, isValid) {
-  console.log(isValid);
+
 
   let errors = {};
 
@@ -12,18 +12,6 @@ export default function SignupValidation(input, isValid) {
   } else if (!/\S+@\S+\.\S+/.test(input.userEmail)) {
     errors.userEmail = "Email address is invalid";
   }
-
-  if (!input.userPassword) {
-    errors.userPassword = "Password id required";
-  } else if (input.userPassword.length < 2) {
-    errors.userPassword = "Password need to be 6 characters or more";
-  }
-  if (!input.confirmPassword) {
-    errors.confirmPassword = "Password is required";
-  } else if (input.confirmPassword !== input.userPassword) {
-    errors.confirmPassword = "Password do not match";
-  }
-
   if (!input.cyfCity.trim()) {
     errors.cyfCity = "city required";
   }
diff --git a/client/src/components/StudentResultsContainer.js b/client/src/components/StudentResultsContainer.js
index e8963796..6c2f4632 100644
--- a/client/src/components/StudentResultsContainer.js
+++ b/client/src/components/StudentResultsContainer.js
@@ -4,27 +4,20 @@ import StudentResultsDisplay from "./StudentResultsDisplay";
 
 function StudentResultsContainer({ studentId, studentName }) {
   const [studentDetail, setStudentDetail] = useState([]);
-  //const [isClicked, setIsClicked] = useState(false);
 
-  const token = window.localStorage.getItem("token");
   const fetchDetails = (skill) => {
-    fetch(`/api/abilities/${studentId}`, {
-      headers: { token },
-    })
+    fetch(`/api/abilities/${studentId}`, {})
       .then((response) => response.json())
       .then((data) => {
         if (data.error) {
           throw data;
         }
-        console.log(data);
         setStudentDetail(data);
       });
   };
 
   useEffect(fetchDetails, [studentId]);
   const abilityLength = [];
-  console.log(abilityLength);
-
   return (
     <Container className="learning-objective-container">
       <h2>{studentName}</h2>
diff --git a/client/src/components/StudentResultsDisplay.js b/client/src/components/StudentResultsDisplay.js
index 2c54f553..574f3792 100644
--- a/client/src/components/StudentResultsDisplay.js
+++ b/client/src/components/StudentResultsDisplay.js
@@ -85,6 +85,7 @@ export default function StudentResultsDisplay({ studentDetail }) {
   return (
     <Accordion>
       {skills.map((skill, index) => {
+      
         return (
           <Card>
             <Card.Header>
diff --git a/client/src/components/consts/skillsConst.js b/client/src/components/consts/skillsConst.js
index 2793f043..560655ec 100644
--- a/client/src/components/consts/skillsConst.js
+++ b/client/src/components/consts/skillsConst.js
@@ -1,13 +1,11 @@
-export const  skillsLabelsBySkill =  {
-    html: "HTML",
-    css: "CSS",
-    git: "Git",
-    javascript: "JavaScript",
-    react: "React",
-    node: "Node.js",
-    sql: "SQL",
-  };
-  export const skills = Object.keys(skillsLabelsBySkill);
-  export const skillLabel = (skill) => skillsLabelsBySkill[skill];
-      
-  
\ No newline at end of file
+export const skillsLabelsBySkill = {
+  html: "HTML",
+  css: "CSS",
+  git: "Git",
+  javascript: "JavaScript",
+  react: "React",
+  node: "Node.js",
+  sql: "SQL",
+};
+export const skills = Object.keys(skillsLabelsBySkill);
+export const skillLabel = (skill) => skillsLabelsBySkill[skill];
diff --git a/client/src/components/useFormValidation.js b/client/src/components/useFormValidation.js
index 94076658..8a4ce8c2 100644
--- a/client/src/components/useFormValidation.js
+++ b/client/src/components/useFormValidation.js
@@ -1,7 +1,6 @@
-import { useState, useEffect } from "react";
+import { useState } from "react";
 
-
-function useFormValidation(validate, intialState)  {
+function useFormValidation(validate, intialState) {
   const [errors, setErrors] = useState({});
   const [input, setInput] = useState(intialState);
   const [isValid, setIsValid] = useState(false);
@@ -11,8 +10,8 @@ function useFormValidation(validate, intialState)  {
       ...input,
       [event.target.name]: event.target.value,
     };
-    setInput(updateInput)
-    setIsValid(false)
+    setInput(updateInput);
+    setIsValid(false);
   }
 
   function handleSubmit(event) {
@@ -20,13 +19,12 @@ function useFormValidation(validate, intialState)  {
 
     const newError = validate(input, isValid);
     setErrors(newError);
-    console.log(errors, newError);
+  
     if (JSON.stringify(newError) == JSON.stringify({})) {
-      //setInput(intialState);
       setIsValid(true);
     }
   }
 
   return { handleChange, input, handleSubmit, errors, isValid };
-};
+}
 export default useFormValidation;
diff --git a/client/src/components/useQuery.js b/client/src/components/useQuery.js
new file mode 100644
index 00000000..c4c0e817
--- /dev/null
+++ b/client/src/components/useQuery.js
@@ -0,0 +1,5 @@
+import { useLocation } from "react-router-dom";
+
+export default function useQuery(term) {
+  return new URLSearchParams(useLocation().search).get(term);
+}
diff --git a/client/src/components/useRedirectNonMentors.js b/client/src/components/useRedirectNonMentors.js
index 2fe410b6..24fb47e0 100644
--- a/client/src/components/useRedirectNonMentors.js
+++ b/client/src/components/useRedirectNonMentors.js
@@ -3,14 +3,9 @@ import { useHistory } from "react-router-dom";
 
 export function useRedirectNonMentors(callBack = () => {}) {
   let history = useHistory();
-  const token = window.localStorage.getItem("token");
 
   useEffect(() => {
-    console.log(token);
-    if (!token) {
-      history.push("/");
-    }
-    fetch(`/api/verify`, { headers: { token } })
+    fetch(`/api/verify`)
       .then((res) => {
         if (res.status !== 200) {
           history.push("/");
@@ -18,8 +13,6 @@ export function useRedirectNonMentors(callBack = () => {}) {
         return res.json();
       })
       .then((data) => {
-        console.log(data);
-        window.localStorage.setItem("role", data.role);
         if (data == "not authorized" || data.role == "Student") {
           history.push("/");
         } else {
diff --git a/client/src/index.html b/client/src/index.html
index 8164dcdd..9874c2da 100644
--- a/client/src/index.html
+++ b/client/src/index.html
@@ -1,15 +1,28 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/css/bootstrap.min.css"
-      integrity="sha384-TX8t27EcRE3e/ihU7zmQxVncDAy5uIKz4rEkgIXeMed4M0jlfIDPvg6uqKI2xXr2" crossorigin="anonymous">
-    
+  <head>
+    <meta charset="UTF-8" />
+
     <title>CYF Knowledge Checklist</title>
-    <!-- <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.3/css/bootstrap.min.css" integrity="sha384-TX8t27EcRE3e/ihU7zmQxVncDAy5uIKz4rEkgIXeMed4M0jlfIDPvg6uqKI2xXr2" crossorigin="anonymous"> -->
-<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.15.2/css/all.css" integrity="sha384-vSIIfh2YWi9wW0r9iZe7RJPrKwp6bG+s9QZMoITbCckVJqGCCRhc+ccxNcdpHuYu" crossorigin="anonymous">
-</head>
-<body>
+    <link
+      rel="stylesheet"
+      href="https://use.fontawesome.com/releases/v5.15.2/css/all.css"
+      integrity="sha384-vSIIfh2YWi9wW0r9iZe7RJPrKwp6bG+s9QZMoITbCckVJqGCCRhc+ccxNcdpHuYu"
+      crossorigin="anonymous"
+    />
+    <link
+      href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta2/dist/css/bootstrap.min.css"
+      rel="stylesheet"
+      integrity="sha384-BmbxuPwQa2lc/FVzBcNJ7UAyJxM6wuqIj61tLrc4wSX0szH/Ev+nYRRuWlolflfl"
+      crossorigin="anonymous"
+    />
+    <script
+      src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta2/dist/js/bootstrap.bundle.min.js"
+      integrity="sha384-b5kHyXgcpbZJO/tY9Ul7kGkf1S0CWuKcCD38l8YkeH8z8QjE0GmW1gYU5S9FOnJ0"
+      crossorigin="anonymous"
+    ></script>
+  </head>
+  <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>
     <script
@@ -17,5 +30,5 @@
       type="text/javascript"
       src="https://polyfill.io/v3/polyfill.min.js?flags=gated&features=es6"
     ></script>
-</body>
+  </body>
 </html>
diff --git a/client/webpack/common.config.js b/client/webpack/common.config.js
index 91395956..9305dc5f 100644
--- a/client/webpack/common.config.js
+++ b/client/webpack/common.config.js
@@ -1,34 +1,33 @@
 const HtmlWebpackPlugin = require("html-webpack-plugin");
-// const Dotenv = require('dotenv-webpack');
+const Dotenv = require("dotenv-webpack");
 
 module.exports = {
-	entry: "./client/src/index.js",
-	module: {
-		rules: [
-			{
-				test: /\.js$/,
-				exclude: /node_modules/,
-				loader: "babel-loader?cacheDirectory",
-			},
-			{
-				test: /\.(png|svg|jpe?g|gif)$/,
-				loader: "file-loader",
-			},
-			{
-				test: /\.css$/,
-				use: ["style-loader", "css-loader"],
-			},
-		],
-	},
-	output: {
-		publicPath: "/",
-	},
-	plugins: [
-		new HtmlWebpackPlugin({
-			favicon: "./client/src/favicon.ico",
-			template: "./client/src/index.html",
-			
-		}),
-		//new Dotenv({})
-	],
+  entry: "./client/src/index.js",
+  module: {
+    rules: [
+      {
+        test: /\.js$/,
+        exclude: /node_modules/,
+        loader: "babel-loader?cacheDirectory",
+      },
+      {
+        test: /\.(png|svg|jpe?g|gif)$/,
+        loader: "file-loader",
+      },
+      {
+        test: /\.css$/,
+        use: ["style-loader", "css-loader"],
+      },
+    ],
+  },
+  output: {
+    publicPath: "/",
+  },
+  plugins: [
+    new HtmlWebpackPlugin({
+      favicon: "./client/src/favicon.ico",
+      template: "./client/src/index.html",
+    }),
+    new Dotenv(),
+  ],
 };
diff --git a/database.json b/database.json
new file mode 100644
index 00000000..ebfc1419
--- /dev/null
+++ b/database.json
@@ -0,0 +1,31 @@
+
+{
+"defaultEnv": "local",
+  
+  "local": {
+    "driver": "pg",
+    "user": {"ENV": "db_user"},
+    "password": {"ENV": "db_password"},
+    "host": "localhost",
+    "database": "cyf_knowledge_checklist",
+    "port": {"ENV": "db_port"}  
+
+  },
+
+  "dev": {
+    "driver": "pg",
+    "url": {"ENV": "DATABASE_URL"},
+    "ssl": {
+      "rejectUnauthorized": false
+    }
+  },
+
+  "production": {
+    "driver": "pg",
+    "user": {"ENV": "db_name"},
+    "password": {"ENV": "db_password"},
+    "host": {"ENV": "db_host"},
+    "database": {"ENV": "db_database"},
+    "port": {"ENV": "db_port"} 
+  }
+}
diff --git a/db_data/learningOjectiveData.json b/db_data/learningOjectiveData.json
new file mode 100644
index 00000000..987063cd
--- /dev/null
+++ b/db_data/learningOjectiveData.json
@@ -0,0 +1,811 @@
+[
+  {
+    "skill": "html",
+    "description": "Can answer: What is an HTML tag?"
+  },
+  {
+    "skill": "html",
+    "description": "Can: identify opening and closing tags."
+  },
+  {
+    "skill": "html",
+    "description": "Can answer: What is an HTML attribute?"
+  },
+  {
+    "skill": "html",
+    "description": "Can: identify attribute names and attribute values."
+  },
+  {
+    "skill": "html",
+    "description": "Can answer: What is an HTML element?"
+  },
+
+  {
+    "skill": "html",
+    "description": " Can answer: What are 'parent' and 'child' elements?"
+  },
+  {
+    "skill": "html",
+    "description": " Can: identify parent and children elements."
+  },
+
+  {
+    "skill": "html",
+    "description": " Can: identify first child of an element."
+  },
+
+  {
+    "skill": "html",
+    "description": " Can: write a simple html fragment, correctly observing syntax when nesting one tag within another."
+  },
+
+  {
+    "skill": "html",
+    "description": " Can: recognise when elements are incorrectly nested, in a short HTML extract."
+  },
+  {
+    "skill": "html",
+    "description": " Can answer: What is semantic HTML?"
+  },
+
+  {
+    "skill": "html",
+    "description": " Can answer: What are some semantic HTML tags we can use for the main sections of a typical web page?"
+  },
+  {
+    "skill": "html",
+    "description": " Can answer: What are some semantic HTML tags we can use for text content?"
+  },
+
+  {
+    "skill": "html",
+    "description": " Can answer: What attribute must we use with every <img> tag?"
+  },
+
+  {
+    "skill": "html",
+    "description": " Can answer: Why do we separate HTML, CSS and JavaScript?"
+  },
+
+  {
+    "skill": "html",
+    "description": "  Can: recognise a link element linking a css file, and can explain its purpose."
+  },
+  {
+    "skill": "html",
+    "description": " Can: add a link element to an HTML file to link to a provided CSS or JS file."
+  },
+
+  {
+    "skill": "html",
+    "description": " Can answer: what are HTML forms used for?"
+  },
+
+  {
+    "skill": "html",
+    "description": " Can: create a HTML form field"
+  },
+
+  {
+    "skill": "html",
+    "description": " Can: create a HTML form label"
+  },
+
+  {
+    "skill": "html",
+    "description": " Can: create a HTML form button"
+  },
+
+  {
+    "skill": "html",
+    "description": " Can answer: what happens when the user clicks on a form's Submit button?"
+  },
+  {
+    "skill": "html",
+    "description": " Can: identify different field types"
+  },
+
+  {
+    "skill": "html",
+    "description": " Can: identify the type of form input likely in use in a sample form."
+  },
+  {
+    "skill": "html",
+    "description": " Can: select the correct form inputs when building a simple form."
+  },
+
+  {
+    "skill": "html",
+    "description": " Can answer: what are HTML fieldsets"
+  },
+
+  {
+    "skill": "html",
+    "description": " Can answer: what are HTML form field attributes"
+  },
+
+  {
+    "skill": "html",
+    "description": " Can answer: What's the purpose of a form field's required attribute?"
+  },
+
+  {
+    "skill": "html",
+    "description": " Can answer: What's the purpose of a form field's ‘readonly’ ‘value’, or ‘checked’ attributes? "
+  },
+
+  {
+    "skill": "html",
+    "description": "Can answer: When should you use GET or POST as a form's method attribute?"
+  },
+
+  {
+    "skill": "html",
+    "description": "Can: answer: What are some ways to make an HTML form more accessible to someone who needs to use a screen reader?"
+  },
+
+  {
+    "skill": "html",
+    "description": "Can: manually locate the source of a specific piece of text from a page's rendered view in the source HTML, for a simple case."
+  },
+
+  {
+    "skill": "html",
+    "description": "Can: use the browser's inspector to automatically locate the corresponding source for a given element of the rendered view."
+  },
+
+  {
+    "skill": "html",
+    "description": "Can: discover the current box model attributes of an element, using the inspector."
+  },
+
+  {
+    "skill": "css",
+    "description": " Can answer: What is a selector in CSS?"
+  },
+
+  {
+    "skill": "css",
+    "description": "Can answer: What is the difference between a tag, class, and ID selector?"
+  },
+
+  {
+    "skill": "css",
+    "description": "Can answer: What is an attribute selector in CSS and how does it relate to the HTML code?"
+  },
+
+  {
+    "skill": "css",
+    "description": "Can: recognise some simple attribute selectors and state their purpose."
+  },
+
+  {
+    "skill": "css",
+    "description": " Can answer: What is a property in CSS?"
+  },
+  {
+    "skill": "css",
+    "description": "Can answer: What is the cascade?"
+  },
+  {
+    "skill": "css",
+    "description": "Can answer: What is the CSS box model?"
+  },
+
+  {
+    "skill": "css",
+    "description": "Can answer: What properties modify the box model in CSS?"
+  },
+
+  {
+    "skill": "css",
+    "description": "Can: identify a diverse set of devices for the web (phone, tablet, laptop, desktop, tv, game console, etc.)"
+  },
+  {
+    "skill": "css",
+    "description": "Can answer: What is responsive web design?"
+  },
+
+  {
+    "skill": "css",
+    "description": "Can answer: what are some ways we might want to have a layout change as we reduce or increase screen size?"
+  },
+
+  {
+    "skill": "css",
+    "description": "Can answer: What is a media query?"
+  },
+
+  {
+    "skill": "css",
+    "description": "Can answer: When would you use a media query?"
+  },
+
+  {
+    "skill": "css",
+    "description": "Can answer: How can I test how a website looks on different screen sizes?"
+  },
+
+  {
+    "skill": "css",
+    "description": "Can answer: What is flexbox?"
+  },
+  {
+    "skill": "css",
+    "description": "Can answer: When would you use flexbox?"
+  },
+  {
+    "skill": "css",
+    "description": "Can answer: What are the different ways to arrange elements using flexbox?"
+  },
+  {
+    "skill": "css",
+    "description": "Can answer: In what ways can you position individual items using flexbox?"
+  },
+  {
+    "skill": "css",
+    "description": "Can answer: In what ways can you position individual items using flexbox?"
+  },
+
+  {
+    "skill": "git",
+    "description": "Can: Explain why Git is a useful tool."
+  },
+
+  {
+    "skill": "git",
+    "description": "Can clone a repository."
+  },
+
+  {
+    "skill": "git",
+    "description": "Can: commit, fork a repository, and push changes."
+  },
+
+  {
+    "skill": "git",
+    "description": "Can: use GitHub's pull request workflows, and push further changes."
+  },
+
+  {
+    "skill": "git",
+    "description": "Can: use Git's history log."
+  },
+
+  {
+    "skill": "git",
+    "description": "Can: fork a project on GitHub"
+  },
+
+  {
+    "skill": "git",
+    "description": "Can: commit changes locally and push to their fork"
+  },
+  {
+    "skill": "git",
+    "description": "Git Merge Conflicts"
+  },
+
+  {
+    "skill": "javascript",
+    "description": "Can use console.log() to print information to the console"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can assign data to variables using let and const"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can define what expressions and statements are and describe the difference"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can write and call functions in JavaScript"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can manipulate strings with concatenation and interpolation techniques"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can manipulate numbers with mathematical operators and using the Math library"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can define the difference between console.log() and return"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can call functions within functions"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can search and read documentation to help when you are stuck"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can define what was a conditional is"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can define what for and while loops are and define the difference"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can write an if statement using a conditional"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can define comparator operators and list the different types"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can use comparator operators in an if statement"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can define what a logical operator is and give examples"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can write functionality that uses the assert module"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can describe what an array is and write code that interacts with them"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can Describe what an array method is and use them to manipulate an array"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can write code that chains array methods together"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can define what a callback is"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can write code that uses a callback to run code"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can define what an anonymous function is"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can write code that uses an anonymous function as a callback"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can define what an object is in JavaScript"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can be able to write code that can use an object to store data"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can be able to write code that changes the properties of an object"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can Be able to write code that can retrieve data from an object"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can write and call methods inside JavaScript objects"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can use Objects when contained inside an array"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can write code that uses objects built-in methods"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can write code that can iterate through an object"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can define what the DOM is and what it does"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can use query selectors to retrieve elements from the DOM"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can use event listeners to respond to events that happen on the DOM"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can create DOM elements using JavaScript and add them to the DOM"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can manipulate DOM elements using JavaScript to change their properties"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can define the difference between synchronous and asynchronous code"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can describe why writing asynchronous code is important when working with the internet"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can write code that is able to pass a function to another function as a parameter and run it"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can use callbacks to run code at some point in the future"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can define a client's and server's role in the client/server architecture"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can describe the difference between a GET and POST request"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can explain how resources are loaded on the internet using GET and POST"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can list the steps that a browser does when loading a website from the internet"
+  },
+
+  {
+    "skill": "javascript",
+    "description": "Can understand the value of thorough and comprehensive debugging"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can use error messages to debug simple logical or syntactical errors in their code"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can modify an existing program to solve errors"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can answer : what the acronym API means"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can define what an API's purpose is and why it is useful"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can edit the structure of a API URL and to change the data retrieved from the server"
+  },
+  {
+    "skill": "javascript",
+    "description": "The learner should be able to define what a Promise is"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can answer: what fetch is and what it is used for"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can use fetch to retrieve JSON from an API"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can parse the JSON and extract data from it"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can use DOM manipulation to add content to the DOM"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can understand window.onload and document.onload and should be able to assign functions to run at specific life cycle events"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can understand the concept of variable scope and be able to define them in global, local and block scope"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can use destructuring to extract data from arrays"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can describe why you would want to use array destructuring"
+  },
+  {
+    "skill": "javascript",
+    "description": "Can describe why you would want to use array destructuring"
+  },
+
+  {
+    "skill": "react",
+    "description": "Create a React application with create-react-app"
+  },
+  {
+    "skill": "react",
+    "description": "Create a React function component"
+  },
+  {
+    "skill": "react",
+    "description": "Can use interpolation ({}) to insert JavaScript expressions into JSX"
+  },
+  {
+    "skill": "react",
+    "description": "Can distinguish between them when reading"
+  },
+  {
+    "skill": "react",
+    "description": "Can render a list using the .map method"
+  },
+  {
+    "skill": "react",
+    "description": "Can render components conditionally using ternary operator and logical AND (&&)"
+  },
+  {
+    "skill": "react",
+    "description": "Can add styles to elements using className (instead of class attribute)"
+  },
+  {
+    "skill": "react",
+    "description": "Can explain why calling event handlers in JSX (e.g. onClick={handleClick()}) is incorrect"
+  },
+  {
+    "skill": "react",
+    "description": "Can pass functions to event handlers"
+  },
+  {
+    "skill": "react",
+    "description": "Can log to the console when a button is clicked"
+  },
+  {
+    "skill": "react",
+    "description": "Can pass a props"
+  },
+  {
+    "skill": "react",
+    "description": "Can explain that React handles updating the DOM when components are re-rendered."
+  },
+  {
+    "skill": "react",
+    "description": "Can explain that this makes code more understandable, as we don't need to worry about managing the DOM."
+  },
+  {
+    "skill": "react",
+    "description": "Can import useState from the React package."
+  },
+  {
+    "skill": "react",
+    "description": "Can initialise with a value with useState(initialValue)."
+  },
+  {
+    "skill": "react",
+    "description": "Can destructure state variable into [stateValue, setStateValue]."
+  },
+  {
+    "skill": "react",
+    "description": "Can render state variables to the view."
+  },
+  {
+    "skill": "react",
+    "description": "Can update with a new value with setStateValue(newValue)."
+  },
+  {
+    "skill": "react",
+    "description": "Can identify when to use props or state."
+  },
+  {
+    "skill": "react",
+    "description": "Can explain why a loading state is necessary when fetching data as the result is not available on the initial render."
+  },
+  {
+    "skill": "react",
+    "description": "Can trigger fetch() using the useEffect() callback, with an empty array ([]) as the 2nd dependencies argument."
+  },
+  {
+    "skill": "react",
+    "description": "Can store data from a successful API call in state."
+  },
+  {
+    "skill": "react",
+    "description": "Can explain why a component with an effect dependent on props is broken with empty useEffect() dependencies ([])."
+  },
+  {
+    "skill": "react",
+    "description": "Can fix a component with an effect dependent on props using the useEffect() dependencies."
+  },
+
+  {
+    "skill": "react",
+    "description": "Can describe the 'lifecycle' of a component with useEffect() when props change."
+  },
+  {
+    "skill": "react",
+    "description": "Can Create a simple form in React using the controlled component pattern."
+  },
+  {
+    "skill": "react",
+    "description": "Can initialise state with useState()."
+  },
+  {
+    "skill": "react",
+    "description": "Can set the input value to the state variable."
+  },
+  {
+    "skill": "react",
+    "description": "Can explain why the input does not change when typing if onChange is not set."
+  },
+  {
+    "skill": "react",
+    "description": "Can update the state using an onChange handler."
+  },
+  {
+    "skill": "react",
+    "description": "Can use data from a submitted form to update the application."
+  },
+  {
+    "skill": "react",
+    "description": "Can collect the form state variables and use them (setting state, POST request)."
+  },
+
+  {
+    "skill": "node",
+    "description": "Can define what an API is used for"
+  },
+  {
+    "skill": "node",
+    "description": "Can use Glitch to deploy and edit express servers"
+  },
+
+  {
+    "skill": "node",
+    "description": "Can use ‘npm’ to start a node server"
+  },
+  {
+    "skill": "node",
+    "description": "Can: Explain what ‘express’ is and what it is used for"
+  },
+  {
+    "skill": "node",
+    "description": "Can use express to create an API that will accept a ‘GET’ request that returns JSON"
+  },
+
+  {
+    "skill": "node",
+    "description": "Can: implement routing to return different resources depending on URL"
+  },
+
+  {
+    "skill": "node",
+    "description": "Can: implement query params to return different content ‘(?query=ses)’"
+  },
+  {
+    "skill": "node",
+    "description": "Can: Define what each part of CRUD is and what it does"
+  },
+
+  {
+    "skill": "node",
+    "description": "Can: Process a GET request using Express and Node to retrieve data from memory"
+  },
+
+  {
+    "skill": "node",
+    "description": "Can: Process a POST request using Express and Node and store data in memory"
+  },
+
+  {
+    "skill": "node",
+    "description": "Can: Process a DELETE request using Express and Node to remove data from memory"
+  },
+
+  {
+    "skill": "node",
+    "description": "Can: Install a third party library using npm"
+  },
+
+  {
+    "skill": "node",
+    "description": "Can: Process an PUT request using Express and Node to update data in memory"
+  },
+
+  {
+    "skill": "node",
+    "description": "Can: Upload their node app to the internet so it can be accessed anywhere using Heroku"
+  },
+
+  {
+    "skill": "sql",
+    "description": "Can explain why databases are needed in Web Development"
+  },
+  {
+    "skill": "sql",
+    "description": "Can define what SQL is and what it is used for"
+  },
+  {
+    "skill": "sql",
+    "description": "Can describe what table, rows and columns are used for in a relational database"
+  },
+  {
+    "skill": "sql",
+    "description": "Can install and create a database using PostgreSQL"
+  },
+  {
+    "skill": "sql",
+    "description": "Can create a table in a database using PostgreSQL"
+  },
+  {
+    "skill": "sql",
+    "description": "Can insert data into a table using PostgreSQL"
+  },
+  {
+    "skill": "sql",
+    "description": "Can retrieve data from a table using PostgreSQL"
+  },
+  {
+    "skill": "sql",
+    "description": "Can retrieve data from a table using conditionals in PostgreSQL"
+  },
+  {
+    "skill": "sql",
+    "description": "Can list the different kinds of data that can be held in a PostgreSQL database"
+  },
+  {
+    "skill": "sql",
+    "description": "Can add and remove columns in a pre-existing table using PostgreSQL using ALTER"
+  },
+  {
+    "skill": "sql",
+    "description": "Be able to rename tables and columns in a pre-existing table using PostgreSQL using DELETE"
+  },
+  {
+    "skill": "sql",
+    "description": "Can update rows in a pre-existing table using PostgreSQL using UPDATE"
+  },
+  {
+    "skill": "sql",
+    "description": "Can combine tables together using PostgreSQL using INNER JOIN"
+  },
+  {
+    "skill": "sql",
+    "description": "Can connect a PostgreSQL database to a NodeJS application"
+  },
+  {
+    "skill": "sql",
+    "description": "Can retrieve data from a PostgreSQL database in a NodeJS application"
+  },
+  {
+    "skill": "sql",
+    "description": "Can create an API endpoint that can add data to a database"
+  },
+  {
+    "skill": "sql",
+    "description": "Can write code that effectively validates data before adding it to a database"
+  },
+  {
+    "skill": "sql",
+    "description": "Can be dangers of SQL injection attacks, and how to avoid them"
+  },
+  {
+    "skill": "sql",
+    "description": "Can create an API endpoint that can retrieve data from a database with multiple parameters"
+  },
+  {
+    "skill": "sql",
+    "description": "Can create an API endpoint that can update data in a database"
+  },
+  {
+    "skill": "sql",
+    "description": "Can Create an API endpoint that can delete data in a database"
+  }
+]
diff --git a/migrations/20210228114609-initial-migration.js b/migrations/20210228114609-initial-migration.js
new file mode 100644
index 00000000..6004a594
--- /dev/null
+++ b/migrations/20210228114609-initial-migration.js
@@ -0,0 +1,95 @@
+"use strict";
+
+var dbm;
+var type;
+var seed;
+
+/**
+ * We receive the dbmigrate dependency from dbmigrate initially.
+ * This enables us to not have to rely on NODE_PATH.
+ */
+exports.setup = function (options, seedLink) {
+  dbm = options.dbmigrate;
+  type = dbm.dataType;
+  seed = seedLink;
+};
+
+exports.up = function (db) {
+  const userPromise = db.createTable("users", {
+    user_id: { type: "int", primaryKey: true, autoIncrement: true },
+    first_name: { type: "string", notNull: true, length: 255 },
+    last_name: { type: "string", notNull: true, length: 255 },
+    user_role: { type: "string", notNull: true, length: 255 },
+    user_email: { type: "string", notNull: true, length: 255, unique: true },
+    user_slack: { type: "string", length: 255 },
+    user_githib: { type: "string", length: 255 },
+    class_id: { type: "int", notNull: true },
+    github_id: { type: "int", notNull: true, unique: true },
+  });
+
+  const learningObjectivePromise = db.createTable("learning_objective", {
+    id: { type: "int", primaryKey: true, autoIncrement: true },
+    skill: { type: "string", notNull: true, length: 255 },
+    description: { type: "string", notNull: true, length: 255 },
+  });
+
+  const achievementsPromise = db.createTable("achievements", {
+    id: { type: "int", primaryKey: true, autoIncrement: true },
+    student_id: {
+      type: "int",
+      foreignKey: {
+        name: "users_id_achievements_student_id_fk",
+        table: "users",
+        rules: {
+          onDelete: "CASCADE",
+        },
+        mapping: {
+          student_id: "user_id",
+        },
+      },
+    },
+    learning_obj_id: {
+      type: "int",
+      foreignKey: {
+        name: "learning_obj_id_achievements_learning_ id_fk",
+        table: "learning_objective",
+        rules: {
+          onDelete: "CASCADE",
+        },
+        mapping: {
+          learning_obj_id: "id",
+        },
+      },
+    },
+
+    ability: { type: "int" },
+
+    date_added: {
+      type: "date",
+      notNull: true,
+      defaultValue: new String("current_date"),
+    },
+  });
+
+  return Promise.all([
+    userPromise,
+    learningObjectivePromise,
+    achievementsPromise,
+  ]);
+};
+
+exports.down = function (db) {
+  const userPromise = db.dropTable("users");
+  const learningObjectivePromise = db.dropTable("learning_objective");
+  const achievementsPromise = db.dropTable("achievements");
+
+  return Promise.all([
+    userPromise,
+    learningObjectivePromise,
+    achievementsPromise,
+  ]);
+};
+
+exports._meta = {
+  version: 1,
+};
diff --git a/migrations/20210308191741-autoincrement-ids.js b/migrations/20210308191741-autoincrement-ids.js
new file mode 100644
index 00000000..900e0125
--- /dev/null
+++ b/migrations/20210308191741-autoincrement-ids.js
@@ -0,0 +1,37 @@
+"use strict";
+
+var dbm;
+var type;
+var seed;
+
+/**
+ * We receive the dbmigrate dependency from dbmigrate initially.
+ * This enables us to not have to rely on NODE_PATH.
+ */
+exports.setup = function (options, seedLink) {
+  dbm = options.dbmigrate;
+  type = dbm.dataType;
+  seed = seedLink;
+};
+
+exports.up = function (db) {
+  const columnPromise = db.addColumn("users", "cyf_city", {
+    type: "string",
+    notNull: true,
+    length: 255,
+  });
+  const renamePromise = db.renameColumn("users", "user_githib", "user_github");
+
+  return Promise.all([columnPromise, renamePromise]);
+};
+
+exports.down = function (db) {
+  const columnPromise = db.removeColumn("users", "cyf_city");
+  const renamePromise = db.renameColumn("users", "user_github", "user_githib");
+
+  return Promise.all([columnPromise, renamePromise]);
+};
+
+exports._meta = {
+  version: 1,
+};
diff --git a/package-lock.json b/package-lock.json
index 288f82ef..e0b5ab0f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1802,7 +1802,8 @@
     "abbrev": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+      "dev": true
     },
     "accepts": {
       "version": "1.3.7",
@@ -1903,7 +1904,8 @@
     "ansi-regex": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "dev": true
     },
     "ansi-styles": {
       "version": "3.2.1",
@@ -1938,16 +1940,8 @@
     "aproba": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
-    },
-    "are-we-there-yet": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
-      "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
-      "requires": {
-        "delegates": "^1.0.0",
-        "readable-stream": "^2.0.6"
-      }
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+      "dev": true
     },
     "argparse": {
       "version": "1.0.10",
@@ -2034,6 +2028,15 @@
         "function-bind": "^1.1.1"
       }
     },
+    "asn1": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
+      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+      "dev": true,
+      "requires": {
+        "safer-buffer": "~2.1.0"
+      }
+    },
     "asn1.js": {
       "version": "4.10.1",
       "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
@@ -2080,6 +2083,12 @@
         }
       }
     },
+    "assert-options": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/assert-options/-/assert-options-0.7.0.tgz",
+      "integrity": "sha512-7q9uNH/Dh8gFgpIIb9ja8PJEWA5AQy3xnBC8jtKs8K/gNVCr1K6kIvlm59HUyYgvM7oEDoLzGgPcGd9FqhtXEQ==",
+      "dev": true
+    },
     "assign-symbols": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
@@ -2092,6 +2101,12 @@
       "integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0=",
       "dev": true
     },
+    "async": {
+      "version": "0.9.2",
+      "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
+      "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
+      "dev": true
+    },
     "async-each": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
@@ -2114,7 +2129,6 @@
       "version": "0.21.1",
       "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
       "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
-      "dev": true,
       "requires": {
         "follow-redirects": "^1.10.0"
       },
@@ -2122,8 +2136,7 @@
         "follow-redirects": {
           "version": "1.13.2",
           "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.2.tgz",
-          "integrity": "sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA==",
-          "dev": true
+          "integrity": "sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA=="
         }
       }
     },
@@ -2280,7 +2293,8 @@
     "balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "dev": true
     },
     "base": {
       "version": "0.11.2",
@@ -2357,15 +2371,6 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
-    "bcrypt": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-5.0.0.tgz",
-      "integrity": "sha512-jB0yCBl4W/kVHM2whjfyqnxTmOHkCX4kHEa5nYKSoGeYe8YrjTYTc87/6bwt1g8cmV0QrbhKriETg9jWtcREhg==",
-      "requires": {
-        "node-addon-api": "^3.0.0",
-        "node-pre-gyp": "0.15.0"
-      }
-    },
     "big-integer": {
       "version": "1.6.48",
       "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.48.tgz",
@@ -2396,8 +2401,7 @@
     "bluebird": {
       "version": "3.7.2",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
-      "dev": true
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
     },
     "bn.js": {
       "version": "5.1.2",
@@ -2491,12 +2495,6 @@
         "widest-line": "^3.1.0"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-          "dev": true
-        },
         "ansi-styles": {
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -2531,44 +2529,12 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-          "dev": true
-        },
         "has-flag": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^5.0.0"
-          }
-        },
         "supports-color": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -2584,6 +2550,7 @@
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
       "requires": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -2741,11 +2708,6 @@
         "isarray": "^1.0.0"
       }
     },
-    "buffer-equal-constant-time": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
-      "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk="
-    },
     "buffer-from": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
@@ -3056,7 +3018,8 @@
     "chownr": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+      "dev": true
     },
     "chrome-trace-event": {
       "version": "1.0.2",
@@ -3193,11 +3156,6 @@
         "mimic-response": "^1.0.0"
       }
     },
-    "code-point-at": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
-    },
     "collection-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
@@ -3229,6 +3187,12 @@
       "integrity": "sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==",
       "dev": true
     },
+    "colors": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
+      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
+      "dev": true
+    },
     "commander": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
@@ -3305,7 +3269,8 @@
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
     },
     "concat-stream": {
       "version": "1.6.2",
@@ -3390,11 +3355,6 @@
       "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
       "dev": true
     },
-    "console-control-strings": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
-    },
     "constants-browserify": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
@@ -3433,11 +3393,52 @@
       "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
       "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="
     },
+    "cookie-session": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/cookie-session/-/cookie-session-1.4.0.tgz",
+      "integrity": "sha512-0hhwD+BUIwMXQraiZP/J7VP2YFzqo6g4WqZlWHtEHQ22t0MeZZrNBSCxC1zcaLAs8ApT3BzAKizx9gW/AP9vNA==",
+      "requires": {
+        "cookies": "0.8.0",
+        "debug": "2.6.9",
+        "on-headers": "~1.0.2"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        }
+      }
+    },
     "cookie-signature": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
       "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
     },
+    "cookies": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/cookies/-/cookies-0.8.0.tgz",
+      "integrity": "sha512-8aPsApQfebXnuI+537McwYsDtjVxGm8gTIzQI3FDW6t5t/DAhERxtnbEPN/8RX+uZthoz4eCOgloXaE5cYyNow==",
+      "requires": {
+        "depd": "~2.0.0",
+        "keygrip": "~1.1.0"
+      },
+      "dependencies": {
+        "depd": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
+        }
+      }
+    },
     "copy-concurrently": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
@@ -3484,7 +3485,8 @@
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+      "dev": true
     },
     "create-ecdh": {
       "version": "4.0.3",
@@ -3697,6 +3699,12 @@
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.3.tgz",
       "integrity": "sha512-jPl+wbWPOWJ7SXsWyqGRk3lGecbar0Cb0OvZF/r/ZU011R4YqiRehgkQ9p4eQfo9DSDLqLL3wHwfxeJiuIsNag=="
     },
+    "cycle": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz",
+      "integrity": "sha1-IegLK+hYD5i0aPN5QwZisEbDStI=",
+      "dev": true
+    },
     "cyclist": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
@@ -3720,10 +3728,191 @@
       "integrity": "sha512-sAJVKx/FqrLYHAQeN7VpJrPhagZc9R4ImZIWYRFZaaohR3KzmuK88touwsSwSVT8Qcbd4zoDsnGfX4GFB4imyQ==",
       "dev": true
     },
+    "db-migrate": {
+      "version": "0.11.12",
+      "resolved": "https://registry.npmjs.org/db-migrate/-/db-migrate-0.11.12.tgz",
+      "integrity": "sha512-HUS8T5A3sKGCi+hz9XMKMwAKfU9sqhpDufW9nbVSRc5wxDO695uxA5lDe+If0OdvwwQOVxOnEZqkzAAxgyeFWg==",
+      "dev": true,
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "bluebird": "^3.1.1",
+        "db-migrate-shared": "^1.2.0",
+        "deep-extend": "^0.6.0",
+        "dotenv": "^5.0.1",
+        "final-fs": "^1.6.0",
+        "inflection": "^1.10.0",
+        "mkdirp": "~0.5.0",
+        "parse-database-url": "~0.3.0",
+        "prompt": "^1.0.0",
+        "rc": "^1.2.8",
+        "resolve": "^1.1.6",
+        "semver": "^5.3.0",
+        "tunnel-ssh": "^4.0.0",
+        "yargs": "^15.3.1"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "cliui": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+          "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+          "dev": true,
+          "requires": {
+            "string-width": "^4.2.0",
+            "strip-ansi": "^6.0.0",
+            "wrap-ansi": "^6.2.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "dotenv": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-5.0.1.tgz",
+          "integrity": "sha512-4As8uPrjfwb7VXC+WnLCbXK7y+Ueb2B3zgNCePYfhxS1PYeaO1YTeplffTEcbfLhvFNGLAz90VvJs9yomG7bow==",
+          "dev": true
+        },
+        "find-up": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^5.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^4.1.0"
+          }
+        },
+        "p-locate": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.2.0"
+          }
+        },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.0"
+          }
+        },
+        "wrap-ansi": {
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+          "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.0.0",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "yargs": {
+          "version": "15.4.1",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+          "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+          "dev": true,
+          "requires": {
+            "cliui": "^6.0.0",
+            "decamelize": "^1.2.0",
+            "find-up": "^4.1.0",
+            "get-caller-file": "^2.0.1",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^2.0.0",
+            "set-blocking": "^2.0.0",
+            "string-width": "^4.2.0",
+            "which-module": "^2.0.0",
+            "y18n": "^4.0.0",
+            "yargs-parser": "^18.1.2"
+          }
+        },
+        "yargs-parser": {
+          "version": "18.1.3",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+          "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+          "dev": true,
+          "requires": {
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
+          }
+        }
+      }
+    },
+    "db-migrate-base": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/db-migrate-base/-/db-migrate-base-2.3.1.tgz",
+      "integrity": "sha512-HewYQ3HPmy7NOWmhhMLg9TzN1StEtSqGL3w8IbBRCxEsJ+oM3bDUQ/z5fqpYKfIUK07mMXieCmZYwFpwWkSHDw==",
+      "requires": {
+        "bluebird": "^3.1.1"
+      }
+    },
+    "db-migrate-pg": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/db-migrate-pg/-/db-migrate-pg-1.2.2.tgz",
+      "integrity": "sha512-+rgrhGNWC2SzcfweopyZqOQ1Igz1RVFMUZwUs6SviHpOUzFwb0NZWkG0pw1GaO+JxTxS7VJjckUWkOwZbVYVag==",
+      "requires": {
+        "bluebird": "^3.1.1",
+        "db-migrate-base": "^2.3.0",
+        "pg": "^8.0.3",
+        "semver": "^5.0.3"
+      }
+    },
+    "db-migrate-shared": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/db-migrate-shared/-/db-migrate-shared-1.2.0.tgz",
+      "integrity": "sha512-65k86bVeHaMxb2L0Gw3y5V+CgZSRwhVQMwDMydmw5MvIpHHwD6SmBciqIwHsZfzJ9yzV/yYhdRefRM6FV5/siw==",
+      "dev": true
+    },
     "debug": {
       "version": "3.2.6",
       "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
       "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+      "dev": true,
       "requires": {
         "ms": "^2.1.1"
       }
@@ -3766,7 +3955,8 @@
     "deep-extend": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="
+      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+      "dev": true
     },
     "deep-is": {
       "version": "0.1.3",
@@ -3872,11 +4062,6 @@
         }
       }
     },
-    "delegates": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
-    },
     "depd": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
@@ -3903,11 +4088,6 @@
       "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
       "dev": true
     },
-    "detect-libc": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-      "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups="
-    },
     "detect-node": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
@@ -4105,38 +4285,36 @@
         "stream-shift": "^1.0.0"
       }
     },
-    "ecdsa-sig-formatter": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
-      "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
-      "requires": {
-        "safe-buffer": "^5.0.1"
-      }
-    },
     "ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
       "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
     },
     "elliptic": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz",
-      "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==",
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.4.0",
-        "brorand": "^1.0.1",
+        "bn.js": "^4.11.9",
+        "brorand": "^1.1.0",
         "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.0"
+        "hmac-drbg": "^1.0.1",
+        "inherits": "^2.0.4",
+        "minimalistic-assert": "^1.0.1",
+        "minimalistic-crypto-utils": "^1.0.1"
       },
       "dependencies": {
         "bn.js": {
-          "version": "4.11.9",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true
+        },
+        "inherits": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
           "dev": true
         }
       }
@@ -5068,6 +5246,12 @@
         }
       }
     },
+    "eyes": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz",
+      "integrity": "sha1-Ys8SAjTGg3hdkCNIqADvPgzCC8A=",
+      "dev": true
+    },
     "fast-json-stable-stringify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
@@ -5185,6 +5369,16 @@
         }
       }
     },
+    "final-fs": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/final-fs/-/final-fs-1.6.1.tgz",
+      "integrity": "sha1-1tzZLvb+T+jAer1WjHE1YQ7eMjY=",
+      "dev": true,
+      "requires": {
+        "node-fs": "~0.1.5",
+        "when": "~2.0.1"
+      }
+    },
     "finalhandler": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
@@ -5335,14 +5529,6 @@
         "readable-stream": "^2.0.0"
       }
     },
-    "fs-minipass": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz",
-      "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==",
-      "requires": {
-        "minipass": "^2.6.0"
-      }
-    },
     "fs-readdir-recursive": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz",
@@ -5364,7 +5550,8 @@
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
     },
     "fsevents": {
       "version": "1.2.12",
@@ -5994,21 +6181,6 @@
       "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
       "dev": true
     },
-    "gauge": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
-      "requires": {
-        "aproba": "^1.0.3",
-        "console-control-strings": "^1.0.0",
-        "has-unicode": "^2.0.0",
-        "object-assign": "^4.1.0",
-        "signal-exit": "^3.0.0",
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1",
-        "wide-align": "^1.1.0"
-      }
-    },
     "gensync": {
       "version": "1.0.0-beta.1",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz",
@@ -6059,6 +6231,7 @@
       "version": "7.1.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
       "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+      "dev": true,
       "requires": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -6232,11 +6405,6 @@
       "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=",
       "dev": true
     },
-    "has-unicode": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
-    },
     "has-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
@@ -6414,11 +6582,6 @@
         "parse-passwd": "^1.0.0"
       }
     },
-    "hookrouter": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/hookrouter/-/hookrouter-1.2.5.tgz",
-      "integrity": "sha512-9OLve2u+JZDCOgPnxJu5dvg/mU1w2ZWWlSOFxCKcGQKRSH1MXI8tMwEgm64mQfjZLET/7yFRTUrZ4hUYoK0ezw=="
-    },
     "hosted-git-info": {
       "version": "2.8.5",
       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.5.tgz",
@@ -6628,6 +6791,12 @@
       "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
       "dev": true
     },
+    "i": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/i/-/i-0.3.6.tgz",
+      "integrity": "sha1-2WyScyB28HJxG2sQ/X1PZa2O4j0=",
+      "dev": true
+    },
     "iconv-lite": {
       "version": "0.4.24",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
@@ -6669,14 +6838,6 @@
       "integrity": "sha1-SMptcvbGo68Aqa1K5odr44ieKwk=",
       "dev": true
     },
-    "ignore-walk": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz",
-      "integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==",
-      "requires": {
-        "minimatch": "^3.0.4"
-      }
-    },
     "import-fresh": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz",
@@ -6721,10 +6882,17 @@
       "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
       "dev": true
     },
+    "inflection": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/inflection/-/inflection-1.12.0.tgz",
+      "integrity": "sha1-ogCTVlbW9fa8TcdQLhrstwMihBY=",
+      "dev": true
+    },
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
       "requires": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -6738,7 +6906,8 @@
     "ini": {
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+      "dev": true
     },
     "internal-ip": {
       "version": "4.3.0",
@@ -7087,7 +7256,8 @@
     "isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
     },
     "isexe": {
       "version": "2.0.0",
@@ -7101,6 +7271,12 @@
       "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
       "dev": true
     },
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
+      "dev": true
+    },
     "joi": {
       "version": "17.3.0",
       "resolved": "https://registry.npmjs.org/joi/-/joi-17.3.0.tgz",
@@ -7174,23 +7350,6 @@
         "minimist": "^1.2.5"
       }
     },
-    "jsonwebtoken": {
-      "version": "8.5.1",
-      "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz",
-      "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==",
-      "requires": {
-        "jws": "^3.2.2",
-        "lodash.includes": "^4.3.0",
-        "lodash.isboolean": "^3.0.3",
-        "lodash.isinteger": "^4.0.4",
-        "lodash.isnumber": "^3.0.3",
-        "lodash.isplainobject": "^4.0.6",
-        "lodash.isstring": "^4.0.1",
-        "lodash.once": "^4.0.0",
-        "ms": "^2.1.1",
-        "semver": "^5.6.0"
-      }
-    },
     "jsx-ast-utils": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-2.4.1.tgz",
@@ -7201,23 +7360,12 @@
         "object.assign": "^4.1.0"
       }
     },
-    "jwa": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz",
-      "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==",
-      "requires": {
-        "buffer-equal-constant-time": "1.0.1",
-        "ecdsa-sig-formatter": "1.0.11",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "jws": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz",
-      "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==",
+    "keygrip": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/keygrip/-/keygrip-1.1.0.tgz",
+      "integrity": "sha512-iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ==",
       "requires": {
-        "jwa": "^1.4.1",
-        "safe-buffer": "^5.0.1"
+        "tsscmp": "1.0.6"
       }
     },
     "keyv": {
@@ -7323,40 +7471,11 @@
       "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.15.tgz",
       "integrity": "sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ=="
     },
-    "lodash.includes": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz",
-      "integrity": "sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8="
-    },
-    "lodash.isboolean": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",
-      "integrity": "sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY="
-    },
-    "lodash.isinteger": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz",
-      "integrity": "sha1-YZwK89A/iwTDH1iChAt3sRzWg0M="
-    },
-    "lodash.isnumber": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz",
-      "integrity": "sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w="
-    },
-    "lodash.isplainobject": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs="
-    },
-    "lodash.isstring": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
-      "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE="
-    },
-    "lodash.once": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
-      "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w="
+    "lodash.defaults": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
+      "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=",
+      "dev": true
     },
     "loglevel": {
       "version": "1.6.8",
@@ -7571,6 +7690,7 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
       "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
       "requires": {
         "brace-expansion": "^1.1.7"
       }
@@ -7578,24 +7698,8 @@
     "minimist": {
       "version": "1.2.5",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
-    },
-    "minipass": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
-      "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
-      "requires": {
-        "safe-buffer": "^5.1.2",
-        "yallist": "^3.0.0"
-      }
-    },
-    "minizlib": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz",
-      "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
-      "requires": {
-        "minipass": "^2.9.0"
-      }
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "dev": true
     },
     "mississippi": {
       "version": "3.0.0",
@@ -7640,10 +7744,17 @@
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz",
       "integrity": "sha512-P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg==",
+      "dev": true,
       "requires": {
         "minimist": "^1.2.5"
       }
     },
+    "mongodb-uri": {
+      "version": "0.9.7",
+      "resolved": "https://registry.npmjs.org/mongodb-uri/-/mongodb-uri-0.9.7.tgz",
+      "integrity": "sha1-D3ca0W9IOuZfQoeWlCjp+8SqYYE=",
+      "dev": true
+    },
     "morgan": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz",
@@ -7722,6 +7833,12 @@
       "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=",
       "dev": true
     },
+    "mute-stream": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
+      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
+      "dev": true
+    },
     "nan": {
       "version": "2.14.0",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
@@ -7754,15 +7871,11 @@
       "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
       "dev": true
     },
-    "needle": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/needle/-/needle-2.6.0.tgz",
-      "integrity": "sha512-KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg==",
-      "requires": {
-        "debug": "^3.2.6",
-        "iconv-lite": "^0.4.4",
-        "sax": "^1.2.4"
-      }
+    "ncp": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ncp/-/ncp-1.0.1.tgz",
+      "integrity": "sha1-0VNn5cuHQyuhF9K/gP30Wuz7QkY=",
+      "dev": true
     },
     "negotiator": {
       "version": "0.6.2",
@@ -7804,11 +7917,6 @@
       "resolved": "https://registry.npmjs.org/nocache/-/nocache-2.1.0.tgz",
       "integrity": "sha512-0L9FvHG3nfnnmaEQPjT9xhfN4ISk0A8/2j4M37Np4mcDesJjHgEUfgPhdCyZuFI954tjokaIj/A3NdpFNdEh4Q=="
     },
-    "node-addon-api": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.0.2.tgz",
-      "integrity": "sha512-+D4s2HCnxPd5PjjI0STKwncjXTUKKqm74MDMz9OPXavjsGmjkvwgLtA5yoxJUdmpj52+2u+RrXgPipahKczMKg=="
-    },
     "node-environment-flags": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz",
@@ -7825,6 +7933,12 @@
       "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==",
       "dev": true
     },
+    "node-fs": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/node-fs/-/node-fs-0.1.7.tgz",
+      "integrity": "sha1-MjI8zLRsn78PwRgS1FAhzDHTJbs=",
+      "dev": true
+    },
     "node-libs-browser": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
@@ -7870,42 +7984,6 @@
       "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=",
       "dev": true
     },
-    "node-pre-gyp": {
-      "version": "0.15.0",
-      "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.15.0.tgz",
-      "integrity": "sha512-7QcZa8/fpaU/BKenjcaeFF9hLz2+7S9AqyXFhlH/rilsQ/hPZKK32RtR5EQHJElgu+q5RfbJ34KriI79UWaorA==",
-      "requires": {
-        "detect-libc": "^1.0.2",
-        "mkdirp": "^0.5.3",
-        "needle": "^2.5.0",
-        "nopt": "^4.0.1",
-        "npm-packlist": "^1.1.6",
-        "npmlog": "^4.0.2",
-        "rc": "^1.2.7",
-        "rimraf": "^2.6.1",
-        "semver": "^5.3.0",
-        "tar": "^4.4.2"
-      },
-      "dependencies": {
-        "nopt": {
-          "version": "4.0.3",
-          "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
-          "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
-          "requires": {
-            "abbrev": "1",
-            "osenv": "^0.1.4"
-          }
-        },
-        "rimraf": {
-          "version": "2.7.1",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        }
-      }
-    },
     "node-sql-parser": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/node-sql-parser/-/node-sql-parser-3.1.0.tgz",
@@ -7973,29 +8051,6 @@
       "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==",
       "dev": true
     },
-    "npm-bundled": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz",
-      "integrity": "sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==",
-      "requires": {
-        "npm-normalize-package-bin": "^1.0.1"
-      }
-    },
-    "npm-normalize-package-bin": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz",
-      "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA=="
-    },
-    "npm-packlist": {
-      "version": "1.4.8",
-      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz",
-      "integrity": "sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==",
-      "requires": {
-        "ignore-walk": "^3.0.1",
-        "npm-bundled": "^1.0.1",
-        "npm-normalize-package-bin": "^1.0.1"
-      }
-    },
     "npm-run-path": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
@@ -8005,17 +8060,6 @@
         "path-key": "^2.0.0"
       }
     },
-    "npmlog": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
-      "requires": {
-        "are-we-there-yet": "~1.1.2",
-        "console-control-strings": "~1.1.0",
-        "gauge": "~2.7.3",
-        "set-blocking": "~2.0.0"
-      }
-    },
     "nth-check": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
@@ -8025,11 +8069,6 @@
         "boolbase": "~1.0.0"
       }
     },
-    "number-is-nan": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
-    },
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -8292,6 +8331,7 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
       "requires": {
         "wrappy": "1"
       }
@@ -8334,25 +8374,6 @@
       "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
       "dev": true
     },
-    "os-homedir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
-    },
-    "os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
-    },
-    "osenv": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
-      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
-      "requires": {
-        "os-homedir": "^1.0.0",
-        "os-tmpdir": "^1.0.0"
-      }
-    },
     "p-cancelable": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz",
@@ -8487,6 +8508,15 @@
         "safe-buffer": "^5.1.1"
       }
     },
+    "parse-database-url": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/parse-database-url/-/parse-database-url-0.3.0.tgz",
+      "integrity": "sha1-NpZmMh6SfJreY838Gqr2+zdFPQ0=",
+      "dev": true,
+      "requires": {
+        "mongodb-uri": ">= 0.9.7"
+      }
+    },
     "parse-json": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
@@ -8553,7 +8583,8 @@
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true
     },
     "path-is-inside": {
       "version": "1.0.2",
@@ -8615,11 +8646,29 @@
       "resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz",
       "integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw=="
     },
+    "pg-minify": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/pg-minify/-/pg-minify-1.6.2.tgz",
+      "integrity": "sha512-1KdmFGGTP6jplJoI8MfvRlfvMiyBivMRP7/ffh4a11RUFJ7kC2J0ZHlipoKiH/1hz+DVgceon9U2qbaHpPeyPg==",
+      "dev": true
+    },
     "pg-pool": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.2.2.tgz",
       "integrity": "sha512-ORJoFxAlmmros8igi608iVEbQNNZlp89diFVx6yV5v+ehmpMY9sK6QgpmgoXbmkNaBAx8cOOZh9g80kJv1ooyA=="
     },
+    "pg-promise": {
+      "version": "10.9.4",
+      "resolved": "https://registry.npmjs.org/pg-promise/-/pg-promise-10.9.4.tgz",
+      "integrity": "sha512-LvsKCb3mbeqHxFXFLSHVkRM8WKS067YIjFLVYsfR/z4InTEJcYL4pr2nwGK/WGLE4qNEhRMR9PIEAhjsjggX/A==",
+      "dev": true,
+      "requires": {
+        "assert-options": "0.7.0",
+        "pg": "8.5.1",
+        "pg-minify": "1.6.2",
+        "spex": "3.2.0"
+      }
+    },
     "pg-protocol": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.4.0.tgz",
@@ -8858,7 +8907,8 @@
     "process-nextick-args": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
+      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
+      "dev": true
     },
     "progress": {
       "version": "2.0.3",
@@ -8872,6 +8922,19 @@
       "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
       "dev": true
     },
+    "prompt": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/prompt/-/prompt-1.1.0.tgz",
+      "integrity": "sha512-ec1vUPXCplDBDUVD8uPa3XGA+OzLrO40Vxv3F1uxoiZGkZhdctlK2JotcHq5X6ExjocDOGwGdCSXloGNyU5L1Q==",
+      "dev": true,
+      "requires": {
+        "colors": "^1.1.2",
+        "read": "1.0.x",
+        "revalidator": "0.1.x",
+        "utile": "0.3.x",
+        "winston": "2.x"
+      }
+    },
     "prop-types": {
       "version": "15.7.2",
       "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
@@ -9044,6 +9107,7 @@
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
       "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+      "dev": true,
       "requires": {
         "deep-extend": "^0.6.0",
         "ini": "~1.3.0",
@@ -9181,6 +9245,15 @@
         "prop-types": "^15.6.2"
       }
     },
+    "read": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
+      "integrity": "sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=",
+      "dev": true,
+      "requires": {
+        "mute-stream": "~0.0.4"
+      }
+    },
     "read-pkg": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-4.0.1.tgz",
@@ -9204,6 +9277,7 @@
       "version": "2.3.6",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
       "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+      "dev": true,
       "requires": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -9527,6 +9601,12 @@
       "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=",
       "dev": true
     },
+    "revalidator": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz",
+      "integrity": "sha1-/s5hv6DBtSoga9axgZgYS91SOjs=",
+      "dev": true
+    },
     "rimraf": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
@@ -9583,11 +9663,6 @@
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
-    "sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
-    },
     "scheduler": {
       "version": "0.19.1",
       "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz",
@@ -9755,7 +9830,8 @@
     "set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+      "dev": true
     },
     "set-value": {
       "version": "2.0.1",
@@ -9838,7 +9914,8 @@
     "signal-exit": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+      "dev": true
     },
     "slash": {
       "version": "2.0.0",
@@ -10209,6 +10286,12 @@
         }
       }
     },
+    "spex": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/spex/-/spex-3.2.0.tgz",
+      "integrity": "sha512-9srjJM7NaymrpwMHvSmpDeIK5GoRMX/Tq0E8aOlDPS54dDnDUIp30DrP9SphMPEETDLzEM9+4qo+KipmbtPecg==",
+      "dev": true
+    },
     "split-string": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
@@ -10244,6 +10327,26 @@
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
       "dev": true
     },
+    "ssh2": {
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/ssh2/-/ssh2-0.5.4.tgz",
+      "integrity": "sha1-G/a2soyW6u8mf01sRqWiUXpZnic=",
+      "dev": true,
+      "requires": {
+        "ssh2-streams": "~0.1.15"
+      }
+    },
+    "ssh2-streams": {
+      "version": "0.1.20",
+      "resolved": "https://registry.npmjs.org/ssh2-streams/-/ssh2-streams-0.1.20.tgz",
+      "integrity": "sha1-URGNFUVV31Rp7h9n4M8efoosDjo=",
+      "dev": true,
+      "requires": {
+        "asn1": "~0.2.0",
+        "semver": "^5.1.0",
+        "streamsearch": "~0.1.2"
+      }
+    },
     "ssri": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
@@ -10253,6 +10356,12 @@
         "figgy-pudding": "^3.5.1"
       }
     },
+    "stack-trace": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
+      "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
+      "dev": true
+    },
     "static-extend": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
@@ -10318,22 +10427,48 @@
       "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
       "dev": true
     },
+    "streamsearch": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz",
+      "integrity": "sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo=",
+      "dev": true
+    },
     "string-width": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.1.tgz",
+      "integrity": "sha512-LL0OLyN6AnfV9xqGQpDBwedT2Rt63737LxvsRxbcwpa2aIeynBApG2Sm//F3TaLHIR1aJBN52DWklc06b94o5Q==",
+      "dev": true,
       "requires": {
-        "code-point-at": "^1.0.0",
-        "is-fullwidth-code-point": "^1.0.0",
-        "strip-ansi": "^3.0.0"
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
       },
       "dependencies": {
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "dev": true
+        },
+        "emoji-regex": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+          "dev": true
+        },
         "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+          "dev": true,
           "requires": {
-            "number-is-nan": "^1.0.0"
+            "ansi-regex": "^5.0.0"
           }
         }
       }
@@ -10518,6 +10653,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
       "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "dev": true,
       "requires": {
         "ansi-regex": "^2.0.0"
       }
@@ -10531,7 +10667,8 @@
     "strip-json-comments": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+      "dev": true
     },
     "style-loader": {
       "version": "1.3.0",
@@ -10595,30 +10732,12 @@
             "uri-js": "^4.2.2"
           }
         },
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-          "dev": true
-        },
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-          "dev": true
-        },
         "fast-deep-equal": {
           "version": "3.1.3",
           "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
           "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
           "dev": true
         },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-          "dev": true
-        },
         "json-schema-traverse": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
@@ -10630,26 +10749,6 @@
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
           "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
           "dev": true
-        },
-        "string-width": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^5.0.0"
-          }
         }
       }
     },
@@ -10659,20 +10758,6 @@
       "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
       "dev": true
     },
-    "tar": {
-      "version": "4.4.13",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz",
-      "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==",
-      "requires": {
-        "chownr": "^1.1.1",
-        "fs-minipass": "^1.2.5",
-        "minipass": "^2.8.6",
-        "minizlib": "^1.2.1",
-        "mkdirp": "^0.5.0",
-        "safe-buffer": "^5.1.2",
-        "yallist": "^3.0.3"
-      }
-    },
     "term-size": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.0.tgz",
@@ -10876,12 +10961,45 @@
       "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
       "dev": true
     },
+    "tsscmp": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.6.tgz",
+      "integrity": "sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA=="
+    },
     "tty-browserify": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
       "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
       "dev": true
     },
+    "tunnel-ssh": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/tunnel-ssh/-/tunnel-ssh-4.1.4.tgz",
+      "integrity": "sha512-CjBqboGvAbM7iXSX2F95kzoI+c2J81YkrHbyyo4SWNKCzU6w5LfEvXBCHu6PPriYaNvfhMKzD8bFf5Vl14YTtg==",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.9",
+        "lodash.defaults": "^4.1.0",
+        "ssh2": "0.5.4"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        }
+      }
+    },
     "type-check": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -11242,6 +11360,37 @@
       "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=",
       "dev": true
     },
+    "utile": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/utile/-/utile-0.3.0.tgz",
+      "integrity": "sha1-E1LDQOuCDk2N26A5pPv6oy7U7zo=",
+      "dev": true,
+      "requires": {
+        "async": "~0.9.0",
+        "deep-equal": "~0.2.1",
+        "i": "0.3.x",
+        "mkdirp": "0.x.x",
+        "ncp": "1.0.x",
+        "rimraf": "2.x.x"
+      },
+      "dependencies": {
+        "deep-equal": {
+          "version": "0.2.2",
+          "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-0.2.2.tgz",
+          "integrity": "sha1-hLdFiW80xoTpjyzg5Cq69Du6AX0=",
+          "dev": true
+        },
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
+      }
+    },
     "utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
@@ -11706,6 +11855,12 @@
       "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
       "dev": true
     },
+    "when": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/when/-/when-2.0.1.tgz",
+      "integrity": "sha1-jYcv4V5oQkyRtLck6EjggH2rZkI=",
+      "dev": true
+    },
     "which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -11721,14 +11876,6 @@
       "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
       "dev": true
     },
-    "wide-align": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
-      "requires": {
-        "string-width": "^1.0.2 || 2"
-      }
-    },
     "widest-line": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz",
@@ -11736,46 +11883,6 @@
       "dev": true,
       "requires": {
         "string-width": "^4.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-          "dev": true
-        },
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^5.0.0"
-          }
-        }
       }
     },
     "wildcard": {
@@ -11784,6 +11891,34 @@
       "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==",
       "dev": true
     },
+    "winston": {
+      "version": "2.4.5",
+      "resolved": "https://registry.npmjs.org/winston/-/winston-2.4.5.tgz",
+      "integrity": "sha512-TWoamHt5yYvsMarGlGEQE59SbJHqGsZV8/lwC+iCcGeAe0vUaOh+Lv6SYM17ouzC/a/LB1/hz/7sxFBtlu1l4A==",
+      "dev": true,
+      "requires": {
+        "async": "~1.0.0",
+        "colors": "1.0.x",
+        "cycle": "1.0.x",
+        "eyes": "0.1.x",
+        "isstream": "0.1.x",
+        "stack-trace": "0.0.x"
+      },
+      "dependencies": {
+        "async": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz",
+          "integrity": "sha1-+PwEyjoTeErenhZBr5hXjPvWR6k=",
+          "dev": true
+        },
+        "colors": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
+          "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=",
+          "dev": true
+        }
+      }
+    },
     "word-wrap": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
@@ -11841,7 +11976,8 @@
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
     },
     "write-file-atomic": {
       "version": "3.0.3",
@@ -11889,7 +12025,8 @@
     "yallist": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true
     },
     "yargs": {
       "version": "13.3.2",
diff --git a/package.json b/package.json
index 8a848926..f29f9174 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,13 @@
     "lint": "eslint .",
     "preserve": "npm run build",
     "serve": "npm start",
-    "start": "node dist/server.js"
+    "start": "node dist/server.js",
+    "db-migrate": "db-migrate",
+    "db-loadfixtures" : "node scripts/loadDatabaseFixtures.js",
+    "db-migrate-staging" : "DATABASE_URL=$(heroku config:get DATABASE_URL --app cyf-knowledge-checklist) db-migrate up --env dev",
+    "db-loadfixtures-staging" : "DATABASE_URL=$(heroku config:get DATABASE_URL --app cyf-knowledge-checklist) node scripts/loadDatabaseFixtures.js",
+    "db-migrate-production" : "db-migrate up --env production",
+    "db-loadfixtures-production": "node scripts/loadDatabaseFixtures.js"
   },
   "repository": {
     "type": "git",
@@ -37,12 +43,12 @@
     "@babel/preset-env": "^7.10.4",
     "@babel/preset-react": "^7.10.4",
     "@codeyourfuture/eslint-config-standard": "^2.0.1",
-    "axios": "^0.21.1",
     "babel-eslint": "^10.1.0",
     "babel-loader": "^8.1.0",
     "concurrently": "^5.2.0",
     "cross-env": "^7.0.2",
     "css-loader": "^4.1.0",
+    "db-migrate": "^0.11.12",
     "eslint": "^7.5.0",
     "eslint-plugin-jsx-a11y": "^6.3.1",
     "eslint-plugin-react": "^7.20.5",
@@ -60,19 +66,20 @@
     "webpack": "^4.44.0",
     "webpack-cli": "^3.3.12",
     "webpack-dev-server": "^3.11.0",
-    "webpack-merge": "^5.0.9"
+    "webpack-merge": "^5.0.9",
+    "pg-promise": "^10.9.4"
   },
   "dependencies": {
     "@babel/runtime": "^7.10.5",
-    "bcrypt": "^5.0.0",
+    "axios": "^0.21.1",
     "body-parser": "^1.19.0",
-    "bootstrap": "^4.5.3",
+    "bootstrap": "^4.6.0",
+    "cookie-session": "^1.4.0",
+    "db-migrate-pg": "^1.2.2",
     "dotenv": "^8.2.0",
     "dotenv-webpack": "^4.0.0",
     "express": "^4.17.1",
     "helmet": "^3.23.3",
-    "hookrouter": "^1.2.3",
-    "jsonwebtoken": "^8.5.1",
     "morgan": "^1.10.0",
     "node-sql-parser": "^3.1.0",
     "pg": "^8.4.1",
diff --git a/scripts/loadDatabaseFixtures.js b/scripts/loadDatabaseFixtures.js
new file mode 100644
index 00000000..c9e40a84
--- /dev/null
+++ b/scripts/loadDatabaseFixtures.js
@@ -0,0 +1,42 @@
+require("dotenv").config();
+const { config } = require("../server/db");
+const fs = require("fs");
+const path = require("path");
+const pgp = require("pg-promise")({
+  capSQL: true, // generate capitalized SQL
+});
+
+const getFixtures = () => {
+  let jsonData = JSON.parse(
+    fs.readFileSync(
+      path.resolve(__dirname, "../db_data/learningOjectiveData.json")
+    )
+  );
+
+  return jsonData;
+};
+
+const loadFixturesToDb = () => {
+  const db = pgp(config);
+  const cs = new pgp.helpers.ColumnSet(["skill", "description"], {
+    table: "learning_objective",
+  });
+  let data = getFixtures();
+  const insert = pgp.helpers.insert(data, cs);
+  const update =
+    ' ON CONFLICT ON CONSTRAINT "learning_objective_pkey" DO UPDATE SET skill = excluded.skill, description = excluded.description';
+  db.none(insert + update)
+    .then(() => {
+      console.log("success");
+    })
+    .catch((error) => {
+      console.log(error);
+    });
+  //let queryString = `insert into learning_objective(id, skill, description) values ?`;
+  //   let refineData = data
+  //     .map((x) => `(${x.id}, '${x.skill}', '${x.description}')`)
+  //     .join(",");
+};
+if (require.main === module) {
+  loadFixturesToDb();
+}
diff --git a/server/api.js b/server/api.js
index 0ea27042..0d3c2ba8 100644
--- a/server/api.js
+++ b/server/api.js
@@ -2,10 +2,9 @@ import { Router } from "express";
 import { Connection } from "./db";
 import { mentorsOnly } from "./middleware/mentorsOnly";
 const router = new Router();
-const bcrypt = require("bcrypt");
-const jwtGenerator = require("./utils/jwtGenerator");
-const validInfo = require("./middleware/validInfo");
-const authorization = require("./middleware/authorization");
+import validInfo from "./middleware/validInfo";
+import authorization from "./middleware/authorization";
+import exchangeCodeForGithubUser from "./utils/exchangeCodeForGithubUser";
 
 router.get("/", (_, res, next) => {
   Connection.connect((err) => {
@@ -16,12 +15,6 @@ router.get("/", (_, res, next) => {
   });
 });
 
-// router.get("/learningobjectives", (req, res) => {
-//   Connection.query("select * from learning_objective ", (error, results) => {
-//     res.json(results.rows);
-//   });
-// });
-
 router.get("/", (_, res, next) => {
   Connection.connect((err) => {
     if (err) {
@@ -34,9 +27,6 @@ router.get("/", (_, res, next) => {
 
 router.get("/abilities/:id", authorization, mentorsOnly, (req, res) => {
   const userId = Number(req.params.id);
-  const role = req.user.role;
-  const id = req.user.id;
-
   const queryLo = `select lo.id, lo.skill, description, ability, date_added, a.student_id  from learning_objective lo 
   left join achievements a on lo.id = a.learning_obj_id and a.student_id =$1
   where (a.student_id = $1 or a.student_id is null) order by lo.id;`;
@@ -45,21 +35,16 @@ router.get("/abilities/:id", authorization, mentorsOnly, (req, res) => {
     if (err) {
       console.log(err);
     }
-    //console.log(results.rows);
     res.json(results.rows);
   });
 });
-//<--Get endpoint for learning objectives students view and mentor------------------>
+//<--Get endpoint for learning objectives students view------------------>
 
-router.get("/learningobjectives/:id/:skill", authorization, (req, res) => {
-  const userId = Number(req.params.id);
+router.get("/learningobjectives/:skill", authorization, (req, res) => {
   const skill = req.params.skill;
-  const role = req.user.role;
-  const id = req.user.id;
 
-  if (role === "Student" && id !== userId) {
-    return res.status(401).json("not authorized");
-  }
+  const userId = req.session.user.id;
+
   const queryLo = `select lo.id, lo.skill, description, ability, date_added, a.student_id  from learning_objective lo 
   left join achievements a on lo.id = a.learning_obj_id and a.student_id = $2
   where lo.skill = $1 and (a.student_id = $2 or a.student_id is null) order by lo.id;`;
@@ -68,7 +53,6 @@ router.get("/learningobjectives/:id/:skill", authorization, (req, res) => {
     if (err) {
       console.log(err);
     }
-    //console.log(results.rows);
     res.json(results.rows);
   });
 });
@@ -149,12 +133,13 @@ router.post("/learningobjectives", authorization, mentorsOnly, (req, res) => {
 
 router.post("/abilities", authorization, async (req, res) => {
   const learning_obj_id = Number(req.body.learning_obj_id);
-  const ability = Number(req.body.ability);
-  const student_id = req.user.id;
+  const ability = req.body.ability;
+  const student_id = req.session.user.id;
   const querySelect = `SELECT * from achievements where learning_obj_id = $1 
                        and student_id = $2  `;
   const queryPost = `INSERT INTO achievements (ability, learning_obj_id, student_id)
                      values($1, $2, $3)`;
+
   const queryUpdate = `update achievements set  ability= $1
                       where learning_obj_id = $2 and student_id =$3`;
 
@@ -165,13 +150,17 @@ router.post("/abilities", authorization, async (req, res) => {
 
   if (results.rowCount > 0) {
     await Connection.query(queryUpdate, [ability, learning_obj_id, student_id]);
-
     res.json("updated");
-  } else {
+  }
+  
+  
+  else {
     await Connection.query(queryPost, [ability, learning_obj_id, student_id]);
     res.json("inserted");
+    console.log("insert", ability);
   }
 });
+
 //<-------------------Delete end point from learning objective---------------------->
 router.delete(
   "/learningobjectives/:id",
@@ -213,50 +202,44 @@ router.post("/register", validInfo, async (req, res) => {
     userRole,
     userEmail,
     userSlack,
-    userPassword,
     userGithub,
     userClassId,
     cyfCity,
   } = req.body;
+
   try {
     const user = await Connection.query(
-      "SELECT * FROM users WHERE user_email = $1",
-      [userEmail]
+      "SELECT * FROM users WHERE github_id = $1",
+      [req.session.githubId]
     );
     if (user.rows.length !== 0) {
       return res.status(401).json({ error: "User already exist!" });
     }
 
-    const salt = await bcrypt.genSalt(10);
-    const bcryptPassword = await bcrypt.hash(userPassword, salt);
-
     let newUser = await Connection.query(
-      "INSERT INTO users (first_name, last_name, user_role,user_email,user_slack,user_password,user_github,class_id, cyf_city)" +
+      "INSERT INTO users (first_name, last_name, user_role,user_email,github_id,user_slack,user_github,class_id, cyf_city)" +
         " VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9) returning *",
       [
         firstName,
         lastName,
         userRole,
         userEmail,
+        req.session.githubId,
         userSlack,
-        bcryptPassword,
         userGithub,
         userClassId,
         cyfCity,
       ]
     );
-    const token = jwtGenerator(
-      newUser.rows[0].user_id,
-      newUser.rows[0].user_role,
-      newUser.rows[0].first_name
-    );
-    console.log("here is the token");
-    res.json({
-      token: token,
-      message: "Registered",
+
+    req.session.user = {
       id: newUser.rows[0].user_id,
       role: newUser.rows[0].user_role,
       name: newUser.rows[0].first_name,
+    };
+
+    res.json({
+      message: "Registered",
     });
   } catch (err) {
     console.error(err.message);
@@ -265,56 +248,65 @@ router.post("/register", validInfo, async (req, res) => {
   }
 });
 
-//login route
+///github authorization
 
-router.post("/login", validInfo, async (req, res) => {
-  const { userEmail, userPassword } = req.body;
+router.get("/githubAuth", async (req, res) => {
+  const {
+    id: githubId,
+    login: githubUserName,
+  } = await exchangeCodeForGithubUser(req.query.code);
   try {
     const user = await Connection.query(
-      "select * from users where user_email=$1",
-      [userEmail]
+      "select * from users where github_id=$1",
+      [githubId]
     );
+
     if (user.rows.length === 0) {
-      return res.status(401).json({ error: "Email is not registered" });
-    }
-    const validPassword = await bcrypt.compare(
-      userPassword,
-      user.rows[0].user_password
-    );
-    if (!validPassword) {
-      return res.status(401).json({ error: "Password or Email is incorrect" });
+      req.session.githubId = githubId;
+      const params = new URLSearchParams({
+        githubUserName,
+        githubId,
+      }).toString();
+
+      res.redirect(`/signup?${params}`);
+      return;
     }
 
-    const token = jwtGenerator(
-      user.rows[0].user_id,
-      user.rows[0].user_role,
-      user.rows[0].first_name
-    );
-    res.json({
-      token: token,
-      message: "login successful",
+    req.session.user = {
       id: user.rows[0].user_id,
-      role: user.rows[0].user_role,
       name: user.rows[0].first_name,
-    });
-  } catch (err) {
-    console.error(err.message);
-    res.status(500).send("server error");
+      role: user.rows[0].user_role,
+    };
+
+    res.redirect(
+      req.session.user.role === "Student" ? "/skills" : "/MentorsView"
+    );
+  } catch (error) {
+    console.error(error);
+    res.status(500).send("server error auth");
   }
 });
 
 router.get("/verify", authorization, async (req, res) => {
   try {
-    console.log("passed the authorization");
-    res.json({
-      id: req.user.id,
-      role: req.user.role,
-      name: req.user.first_name,
-    });
+    res.set("cache-control", "no-store");
+    res.json(req.session.user);
   } catch (err) {
     console.error("error", err.message);
     res.status(500).send("Server error");
   }
 });
+//Logout
+router.all("/logout", (req, res) => {
+  req.session = null;
+  res.redirect("/");
+});
+
+//callback github link
 
+router.get("/github-client-id", (req, res) => {
+  res.json({
+    github_client_id: process.env.REACT_APP_GITHUB_CLIENT_ID,
+  });
+});
 export default router;
diff --git a/server/app.js b/server/app.js
index 1822626b..20e512d7 100644
--- a/server/app.js
+++ b/server/app.js
@@ -2,35 +2,42 @@ import express from "express";
 import helmet from "helmet";
 import morgan from "morgan";
 import path from "path";
-import jwsAuth from "./routes/jwtAuth";
 
 import router from "./api";
-import { httpsOnly, logErrors, pushStateRouting } from "./middleware/middleware";
-
+import {
+  httpsOnly,
+  logErrors,
+  pushStateRouting,
+} from "./middleware/middleware";
+import cookieSession from "cookie-session";
+var app = express();
+
+app.set("trust proxy", 1); // trust first proxy
+
+app.use(
+  cookieSession({
+    name: "session",
+    keys: [process.env.cookieSessionKey],
+  })
+);
 const apiRoot = "/api";
 const staticDir = path.join(__dirname, "static");
 
-
-
-const app = express();
 //Routes
 //register and login rout
 
-
 //routes.initialize(app);
-const bodyParser = require('body-parser');
+const bodyParser = require("body-parser");
 app.use(bodyParser.json());
-app.use(require('./routes/jwtAuth'))
-//app.use(require('./routes/dashboard'))
+
 app.use(express.json());
 app.use(helmet());
 app.use(logErrors());
 app.use(morgan("dev"));
 
-
 if (app.get("env") === "production") {
-	app.enable("trust proxy");
-	app.use(httpsOnly());
+  app.enable("trust proxy");
+  app.use(httpsOnly());
 }
 
 app.use(apiRoot, router);
diff --git a/server/database.sql b/server/database.sql
index 060ab9bd..b6f75b93 100644
--- a/server/database.sql
+++ b/server/database.sql
@@ -117,3 +117,6 @@ INSERT into learning_objective(skill, description)
       ('sql', 'Be able to delete rows'),
       ('sql', 'Be able to join tables');
 
+--Altered the user table 
+ALTER TABLE users ADD COLUMN github_id INT;
+create UNIQUE index on users (github_id);
\ No newline at end of file
diff --git a/server/db.js b/server/db.js
index cdf040f6..7357f9ed 100644
--- a/server/db.js
+++ b/server/db.js
@@ -25,4 +25,4 @@ if (process.env.DATABASE_URL) {
 pool = new Pool(config);
 
 exports.Connection = pool;
-//module.exports = pool;
+exports.config = config;
diff --git a/server/middleware/authorization.js b/server/middleware/authorization.js
index 6042350d..af7ecd85 100644
--- a/server/middleware/authorization.js
+++ b/server/middleware/authorization.js
@@ -1,23 +1,7 @@
-const jwt = require("jsonwebtoken");
+export default function authorization (req, res, next) {
+  if (!req.session.user) {
+    return res.status(403).json("not authorized");
+  }
 
-
-module.exports = async (req, res, next) => {
-    try {
-        const jwtToken =await req.header("token")
-        if (!jwtToken) {
-            return res.status(403).json("not authorized");
-        }
-         console.log("verify endpoint has been hit");
-        const payload = jwt.verify(jwtToken, process.env.jwtSecret);
-        console.log(payload);
-        req.user = payload.user;
-        next();
-        console.log(req.user);
-       
-    }
-    catch (err) {
-        console.log(err.message)
-        return res.status(403).json("not authorized");
-    }
-}
-    
+  next();
+};
diff --git a/server/middleware/mentorsOnly.js b/server/middleware/mentorsOnly.js
index 5007ddae..1812b2f1 100644
--- a/server/middleware/mentorsOnly.js
+++ b/server/middleware/mentorsOnly.js
@@ -1,5 +1,5 @@
 export function mentorsOnly(req, res, next) {
-     const role = req.user.role;
+     const role = req.session.user.role;
      if (role !== "Mentor") {
        return res.status(401).json("not authorized");
      }
diff --git a/server/middleware/validInfo.js b/server/middleware/validInfo.js
index 8c9e7f3b..cdfd42e8 100644
--- a/server/middleware/validInfo.js
+++ b/server/middleware/validInfo.js
@@ -1,19 +1,18 @@
 module.exports = function(req, res, next) {
-   const { firstName, lastName, userRole, userEmail, userSlack, userPassword, userGithub, userClassId ,username,userPhone,cyfCity,userDateOfBirth} = req.body;
+   const {  userEmail } = req.body;
 
   function validEmail(userEmail) {
     return /^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/.test(userEmail);
   }
 
   if (req.path === "/register") {
-    // console.log(!userEmail.length);
-    if (![userEmail, userPassword].every(Boolean)) {
+    if (![userEmail].every(Boolean)) {
       return res.json("Missing Credentials");
     } else if (!validEmail(userEmail)) {
       return res.json("Invalid Email");
     }
   } else if (req.path === "/login") {
-    if (![userEmail, userPassword].every(Boolean)) {
+    if (![userEmail].every(Boolean)) {
       return res.json("Missing Credentials");
     } else if (!validEmail(userEmail)) {
       return res.json("Invalid Email");
diff --git a/server/routes/dashboard.js b/server/routes/dashboard.js
deleted file mode 100644
index 8b137891..00000000
--- a/server/routes/dashboard.js
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/server/routes/jwtAuth.js b/server/routes/jwtAuth.js
deleted file mode 100644
index fefbe97c..00000000
--- a/server/routes/jwtAuth.js
+++ /dev/null
@@ -1,94 +0,0 @@
-
-import pool from '../db';
-const express = require('express');
-const router = express.Router();
-const bcrypt = require("bcrypt");
-const jwtGenerator = require('../utils/jwtGenerator');
-const validInfo = require("../middleware/validInfo");
-const authorization = require('../middleware/authorization');
-
-
-
-
- 
-  router.post("/register",validInfo, async (req, res) => {
-    const { firstName, lastName, userRole, userEmail, userSlack, userPassword, userGithub, userClassId ,username,userPhone,cyfCity,userDateOfBirth} = req.body;
-    try {
-      
-      const user = await pool.query("SELECT * FROM users WHERE user_email = $1", [
-        userEmail
-      ]);
-       if (user.rows.length !== 0) {
-       return res.status(401).json("User already exist!");
-      }
-      
-      const salt = await bcrypt.genSalt(10);
-      const bcryptPassword = await bcrypt.hash(userPassword, salt);
-
-      let newUser = await pool.query(
-        'INSERT INTO users (first_name, last_name, user_role,user_email,user_slack,user_password,user_github,class_id,username,user_phone,cyf_city,user_date_of_birth)'+
-        ' VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12) returning *' ,
-        [firstName, lastName, userRole, userEmail, userSlack, bcryptPassword, userGithub, userClassId, username, userPhone, cyfCity, userDateOfBirth]
-        );
-     const token = jwtGenerator(newUser.rows[0].user_id);
-      res.json({ token });
-    }
-    
-
-    catch (err) {
-    console.error(err.message);
-    res.status(500).send("Server error");
-    }
-    });
-//login route
-           router.post("/login",validInfo, async (req, res) => {
-     
-    
-
-             const { userEmail, userPassword } = req.body;
-             try{
-      
-         const user = await pool.query("select * from users where user_email=$1", [userEmail]);
-        if (user.rows.length === 0) {
-          return res.status(401).json("password is incorrect");
-        }
-               const validPassword = await bcrypt.compare(userPassword, user.rows[0].user_password);
-               if (!validPassword) {
-                 return res.status(401).json("password or emil is incorrect");
-               }
-               const token = jwtGenerator(user.rows[0].user_id);
-               res.json({ token })  
-      }
-        catch (err) {
-        console.error(err.message);
-        res.status(500).send("server error");
-        
-      }
-           })
-    
-  router.get("/verify",authorization, async (req, res) => {
-    try {
-      console.log("passed the authorization");
-     res.json(true);
-  } catch (err) {
-    console.error(err.message);
-    res.status(500).send("Server error");
-  }
-});
-  
-
-router.get("/dashboard",authorization , async (req, res) => {
-    try {
-        const user = await pool.query("select * from users where user_id=$1", [req.user.id]);
-        res.json(user.rows[0]);
-    }
-    catch (err) {
-        console.error(err.message);
-        res.status(500).json("server error");
-    }
-})
-
-
-
-
-module.exports= router;
\ No newline at end of file
diff --git a/server/utils/exchangeCodeForGithubUser.js b/server/utils/exchangeCodeForGithubUser.js
new file mode 100644
index 00000000..d83c8356
--- /dev/null
+++ b/server/utils/exchangeCodeForGithubUser.js
@@ -0,0 +1,18 @@
+import axios from "axios";
+
+export default async function exchangeCodeForGithubUser(code) {
+  axios.defaults.headers.common.accept = "application/json";
+  const { data } = await axios.post(
+    "https://github.com/login/oauth/access_token",
+    {
+      client_id: process.env.REACT_APP_GITHUB_CLIENT_ID,
+      client_secret: process.env.github_client_secret,
+      code,
+    }
+  );
+  return (
+    await axios.get("https://api.github.com/user", {
+      headers: { Authorization: `token ${data.access_token}` },
+    })
+  ).data;
+}
diff --git a/server/utils/jwtGenerator.js b/server/utils/jwtGenerator.js
deleted file mode 100644
index 4ae2bebd..00000000
--- a/server/utils/jwtGenerator.js
+++ /dev/null
@@ -1,16 +0,0 @@
-const jwt = require("jsonwebtoken");
-require("dotenv").config();
-
-function jwtGenerator(user_id, user_role, first_name) {
-  const payload = {
-    user: {
-      id: user_id,
-      role: user_role,
-      name: first_name,
-    },
-  };
-
-  return jwt.sign(payload, process.env.jwtSecret, { expiresIn: "5h" });
-}
-
-module.exports = jwtGenerator;