Merge pull request #12 from RiccardoSenica/dependabot/npm_and_yarn/client/npm_and_yarn-59d0d51f9e

Bump the npm_and_yarn group across 2 directories with 4 updates

client/package.json

@@ -24,7 +24,7 @@
     "react-dom": "^17.0.1",
     "react-router": "^5.2.0",
     "react-router-dom": "^5.2.0",
-    "react-scripts": "4.0.1",
+    "react-scripts": "5.0.1",
     "subscriptions-transport-ws": "^0.9.18",
     "web-vitals": "^0.2.4"
   },

client/src/components/App.js

@@ -1,12 +1,10 @@
 import React from 'react';
 import Header from './layout/Header';
-import Login from './Login';
 import AppointmentList from './appointment/AppointmentList';
 import CreateAppointment from './appointment/CreateAppointment';
 import UpdateAppointemnt from './appointment/UpdateAppointment';
 import Calendar from './Calendar';
 import { Switch, Route } from 'react-router-dom';
-// import ProductList from './ProductList';
 
 const App = () => {
   return (
@@ -14,11 +12,9 @@ const App = () => {
       <Header />
       <div className="ph3 pv1 background-gray">
         <Switch>
-          {/* <Route exact path="/" component={ProductList} /> */}
           <Route exact path="/" component={AppointmentList} />
           <Route exact path="/create" component={CreateAppointment} />
           <Route exact path="/update/:_id" component={UpdateAppointemnt} />
-          <Route exact path="/login" component={Login} />
           <Route exact path="/calendar" component={Calendar} />
         </Switch>
       </div>
@@ -27,42 +23,3 @@ const App = () => {
 };
 
 export default App;
-
-
-// // import logo from './../logo.svg';
-// // import './../styles/App.css';
-
-// import React, { Component } from 'react';
-// import AppointmentList from './AppointmentList';
-// import CreateAppointment from './CreateAppointment'
-// // import Header from './Header';
-// import Login from './Login'
-// import Search from './Search';
-// import { Redirect, Route, Switch } from 'react-router-dom';
-
-// const App = () => {
-//   return (
-//     <div className="center w85">
-//       <Header />
-//       <div className="ph3 pv1 background-gray">
-//         <Switch>
-//           <Route exact path="/" component={AppointmentList} />
-//           <Route
-//             exact
-//             path="/create"
-//             component={CreateAppointment}
-//           />
-//           <Route exact path="/login" component={Login} />
-//           <Route exact path="/search" component={Search} />
-//           <Route
-//             exact
-//             path="/new/:page"
-//             component={AppointmentList}
-//           />
-//         </Switch>
-//       </div>
-//     </div>
-//   );
-// };
-
-// export default App;

client/src/components/Login.js

@@ -1,133 +0,0 @@
-import React, { useState } from 'react';
-import { useHistory } from 'react-router';
-import { useMutation, gql } from '@apollo/client';
-import { AUTH_TOKEN } from '../constants';
-
-const SIGNUP_MUTATION = gql`
-  mutation SignupMutation(
-    $email: String!
-    $password: String!
-    $name: String!
-  ) {
-    signup(
-      email: $email
-      password: $password
-      username: $name
-    ) {
-      token
-    }
-  }
-`;
-
-const LOGIN_MUTATION = gql`
-  mutation LoginMutation(
-    $email: String!
-    $password: String!
-  ) {
-    login(email: $email, password: $password) {
-      token
-    }
-  }
-`;
-
-const Login = () => {
-    const history = useHistory();
-
-    const [formState, setFormState] = useState({
-        login: true,
-        email: '',
-        password: '',
-        name: ''
-    });
-
-    const [login] = useMutation(LOGIN_MUTATION, {
-        variables: {
-            email: formState.email,
-            password: formState.password
-        },
-        onCompleted: ({ login }) => {
-            localStorage.setItem(AUTH_TOKEN, login.token);
-            history.push('/');
-        }
-    });
-
-    const [signup] = useMutation(SIGNUP_MUTATION, {
-        variables: {
-            name: formState.name,
-            email: formState.email,
-            password: formState.password
-        },
-        onCompleted: ({ signup }) => {
-            localStorage.setItem(AUTH_TOKEN, signup.token);
-            history.push('/');
-        }
-    });
-
-    return (
-        <div>
-            <h4 className="mv3">
-                {formState.login ? 'Login' : 'Sign Up'}
-            </h4>
-            <div className="flex flex-column">
-                {!formState.login && (
-                    <input
-                        value={formState.name}
-                        onChange={(e) =>
-                            setFormState({
-                                ...formState,
-                                name: e.target.value
-                            })
-                        }
-                        type="text"
-                        placeholder="Your name"
-                    />
-                )}
-                <input
-                    value={formState.email}
-                    onChange={(e) =>
-                        setFormState({
-                            ...formState,
-                            email: e.target.value
-                        })
-                    }
-                    type="text"
-                    placeholder="Your email address"
-                />
-                <input
-                    value={formState.password}
-                    onChange={(e) =>
-                        setFormState({
-                            ...formState,
-                            password: e.target.value
-                        })
-                    }
-                    type="password"
-                    placeholder="Choose a safe password"
-                />
-            </div>
-            <div className="flex mt3">
-                <button
-                    className="pointer mr2 button"
-                    onClick={formState.login ? login : signup}
-                >
-                    {formState.login ? 'login' : 'create account'}
-                </button>
-                <button
-                    className="pointer button"
-                    onClick={(e) =>
-                        setFormState({
-                            ...formState,
-                            login: !formState.login
-                        })
-                    }
-                >
-                    {formState.login
-                        ? 'need to create an account?'
-                        : 'already have an account?'}
-                </button>
-            </div>
-        </div>
-    );
-};
-
-export default Login;

client/src/components/Product.js

@@ -1,14 +0,0 @@
-import React from 'react';
-
-const Product = (props) => {
-    const { product } = props;
-    return (
-        <div>
-            <div>
-                <b>{product.title}</b>: only {product.qty}!
-      </div>
-        </div>
-    );
-};
-
-export default Product;

client/src/components/ProductList.js

@@ -1,40 +0,0 @@
-import React from 'react';
-import Product from './Product';
-import { useQuery, gql } from '@apollo/client';
-
-const FEED_QUERY = gql`
-  {
-    allProducts{
-      title
-      qty
-    }
-  }
-`;
-
-const ProductList = () => {
-
-  const { data } = useQuery(FEED_QUERY);
-
-  console.log("Data:", data);
-
-  if (data !== undefined) {
-    return (
-      <div>
-        {
-          data.allProducts.map((product) => (
-            <Product key={product.id} product={product} />
-          ))
-        }
-      </div>
-    );
-  } else {
-    return (
-      <div>
-        Rendering...
-      </div>
-    )
-  }
-
-};
-
-export default ProductList;

client/src/components/Search.js

@@ -1,9 +1,6 @@
 import React, { useState } from 'react';
-import { useMutation } from '@apollo/client';
 import { useLazyQuery } from '@apollo/client';
 import gql from 'graphql-tag';
-import Appointment from './Appointment';
-import { Link } from 'react-router-dom';
 
 const FEED_SEARCH_QUERY = gql`
   query FeedSearchQuery($filter: String!) {
@@ -14,16 +11,6 @@ const FEED_SEARCH_QUERY = gql`
         title
         description
         type
-        createdBy {
-          id
-          username
-        }
-        # follows {
-        #   id
-        #   user {
-        #     id
-        #   }
-        # }
       }
     }
   }
@@ -52,10 +39,6 @@ const Search = () => {
           OK
         </button>
       </div>
-      {/* {data &&
-        data.feed.appointments.map((appointment, index) => (
-          <Link key={appointment.id} link={appointment} index={index} />
-        ))} */}
     </>
   );
 };

client/src/components/appointment/Appointment.js

@@ -36,100 +36,3 @@ const Appointment = (props) => {
 };
 
 export default Appointment;
-
-// import { AUTH_TOKEN, APPOINTMENTS_PER_PAGE } from '../constants';
-// import { timeDifferenceForDate } from '../utils'
-// import { FEED_QUERY } from './AppointmentList'
-
-// const FOLLOW_MUTATION = gql`
-//   mutation FollowMutation($appointmentId: ID!) {
-//     follow(followId: $followId) {
-//       id
-//       appointment {
-//         id
-//         follows {
-//           id
-//           user {
-//             id
-//           }
-//         }
-//       }
-//       user {
-//         id
-//       }
-//     }
-//   }
-// `;
-
-// const take = APPOINTMENTS_PER_PAGE;
-// const skip = 0;
-// const orderBy = { createdAt: 'desc' };
-
-// const Appointment = (props) => {
-//     const { appointment } = props;
-//     const authToken = localStorage.getItem(AUTH_TOKEN);
-//     const take = APPOINTMENTS_PER_PAGE;
-//     const skip = 0;
-//     const orderBy = { createdAt: 'desc' };
-
-//     const [follow] = useMutation(FOLLOW_MUTATION, {
-//         variables: {
-//             appointmentId: appointment.id
-//         },
-//         update(cache, { data: { follow } }) {
-//             const { feed } = cache.readQuery({
-//                 query: FEED_QUERY
-//             });
-
-//             const updatedAppointments = feed.follows.map((feedFollow) => {
-//                 if (feedFollow.id === appointment.id) {
-//                     return {
-//                         ...feedFollow,
-//                         follows: [...feedFollow.follows, follow]
-//                     };
-//                 }
-//                 return feedFollow;
-//             });
-
-//             cache.writeQuery({
-//                 query: FEED_QUERY,
-//                 data: {
-//                     feed: {
-//                         appointments: updatedAppointments
-//                     }
-//                 }
-//             });
-//         }
-//     });
-
-//     return (
-//         <div className="flex mt2 items-start">
-//             <div className="flex items-center">
-//                 <span className="gray">{props.index + 1}.</span>
-//                 {authToken && (
-//                     <div
-//                         className="ml1 gray f11"
-//                         style={{ cursor: 'pointer' }}
-//                         onClick={follow}
-//                     >
-//                         ▲
-//                     </div>
-//                 )}
-//             </div>
-//             <div className="ml1">
-//                 <div>
-//                     {appointment.title} ({appointment.description})
-//         </div>
-//                 {authToken && (
-//                     <div className="f6 lh-copy gray">
-//                         {appointment.follows.length} follows | by{' '}
-//                         {follow.createdBy ? follow.createdBy.name : 'Unknown'}{' '}
-//                         {timeDifferenceForDate(appointment.createdAt)}
-//                     </div>
-//                 )}
-//             </div>
-//         </div>
-//     );
-// };
-
-// export default Appointment;

client/src/components/appointment/AppointmentList.js

@@ -39,175 +39,3 @@ const AppointmentList = () => {
 };
 
 export default AppointmentList;
-
-// import { useHistory } from 'react-router';
-// import { APPOINTMENTS_PER_PAGE } from '../constants';
-// import { Link } from 'react-router-dom';
-
-// export const FEED_QUERY = gql`
-//   query AppointmentManyQuery(
-//     $take: Int
-//     $skip: Int
-//     $orderBy: AppointmentOrderByInput
-//   ) {
-//     appointmentMany(take: $take, skip: $skip, orderBy: $orderBy) {
-//       id
-//       appointments {
-//         id
-//         createdAt
-//         title
-//         # start
-//         # end
-//         description
-//         # createdBy {
-//         #   id
-//         #   name
-//         # }
-//         # follows {
-//         #   id
-//         #   user {
-//         #     id
-//         #   }
-//         # }
-//       }
-//       count
-//     }
-//   }
-// `;
-
-// // const NEW_APPOINTMENTS_SUBSCRIPTION = gql`
-// //   subscription {
-// //     newAppointment {
-// //       id
-// //       url
-// //       description
-// //       createdAt
-// //       createdBy {
-// //         id
-// //         name
-// //       }
-// //       follows {
-// //         id
-// //         user {
-// //           id
-// //         }
-// //       }
-// //     }
-// //   }
-// // `;
-
-// const getQueryVariables = (isNewPage, page) => {
-//   const skip = isNewPage ? (page - 1) * APPOINTMENTS_PER_PAGE : 0;
-//   const take = isNewPage ? APPOINTMENTS_PER_PAGE : 100;
-//   const orderBy = { createdAt: 'desc' };
-
-//   return { take, skip, orderBy };
-// };
-
-// const AppointmentList = () => {
-//   const history = useHistory();
-//   const isNewPage = history.location.pathname.includes(
-//     'new'
-//   );
-//   const pageIndexParams = history.location.pathname.split(
-//     '/'
-//   );
-
-//   const page = parseInt(
-//     pageIndexParams[pageIndexParams.length - 1]
-//   );
-
-//   const pageIndex = page ? (page - 1) * APPOINTMENTS_PER_PAGE : 0;
-
-//   const {
-//     data,
-//     loading,
-//     error,
-//     subscribeToMore
-//   } = useQuery(FEED_QUERY, {
-//     variables: getQueryVariables(isNewPage, page)
-//   });
-
-//   // const { data } = useQuery(FEED_QUERY);
-
-//   const getAppointmentsToRender = (isNewPage, data) => {
-//     if (isNewPage) {
-//       return data.feed.appointments;
-//     }
-//     const rankedAppointments = data.feed.appointments.slice();
-//     rankedAppointments.sort(
-//       (l1, l2) => l2.follows.length - l1.follows.length
-//     );
-//     return rankedAppointments;
-//   };
-
-//   // subscribeToMore({
-//   //   document: NEW_APPOINTMENTS_SUBSCRIPTION,
-//   //   updateQuery: (prev, { subscriptionData }) => {
-//   //     if (!subscriptionData.data) return prev;
-//   //     const newAppointment = subscriptionData.data.newAppointment;
-//   //     const exists = prev.feed.appointments.find(
-//   //       ({ id }) => id === newAppointment.id
-//   //     );
-//   //     if (exists) return prev;
-
-//   //     return Object.assign({}, prev, {
-//   //       feed: {
-//   //         appointments: [newAppointment, ...prev.feed.appointments],
-//   //         count: prev.feed.appointments.length + 1,
-//   //         __typename: prev.feed.__typename
-//   //       }
-//   //     });
-//   //   }
-//   // });
-
-//   return (
-//     <>
-//       {loading && <p>Loading...</p>}
-//       {error && <pre>{JSON.stringify(error, null, 2)}</pre>}
-//       {data && (
-//         <>
-//           {getAppointmentsToRender(isNewPage, data).map(
-//             (appointment, index) => (
-//               <Link
-//                 key={appointment.id}
-//                 link={appointment}
-//                 index={index + pageIndex}
-//               />
-//             )
-//           )}
-//           {isNewPage && (
-//             <div className="flex ml4 mv3 gray">
-//               <div
-//                 className="pointer mr2"
-//                 onClick={() => {
-//                   if (page > 1) {
-//                     history.push(`/new/${page - 1}`);
-//                   }
-//                 }}
-//               >
-//                 Previous
-//             </div>
-//               <div
-//                 className="pointer"
-//                 onClick={() => {
-//                   if (
-//                     page <=
-//                     data.feed.count / APPOINTMENTS_PER_PAGE
-//                   ) {
-//                     const nextPage = page + 1;
-//                     history.push(`/new/${nextPage}`);
-//                   }
-//                 }}
-//               >
-//                 Next
-//             </div>
-//             </div>
-//           )}
-//         </>
-//       )}
-//     </>
-//   );
-// };
-
-// export default AppointmentList;

client/src/components/appointment/CreateAppointment.js

@@ -1,8 +1,6 @@
 import React, { useState } from 'react';
 import { useHistory } from 'react-router';
 import { useMutation, gql } from '@apollo/client';
-import { APPOINTMENTS_PER_PAGE } from '../../constants';
-import { APPOINTMENTS_QUERY } from './AppointmentList';
 import Datetime from 'react-datetime';
 import "react-datetime/css/react-datetime.css";
 
@@ -43,34 +41,6 @@ const CreateAppointment = () => {
             start: formState.start,
             end: formState.end
         },
-        // update: (cache, { data: { createAppointment } }) => {
-        //     const take = APPOINTMENTS_PER_PAGE;
-        //     const skip = 0;
-        //     const orderBy = { createdAt: 'desc' };
-
-        //     const data = cache.readQuery({
-        //         query: APPOINTMENTS_QUERY,
-        //         variables: {
-        //             take,
-        //             skip,
-        //             orderBy
-        //         }
-        //     });
-
-        //     cache.writeQuery({
-        //         query: APPOINTMENTS_QUERY,
-        //         data: {
-        //             allAppointments: {
-        //                 appointments: [createAppointment, ...data.allAppointments]
-        //             }
-        //         },
-        //         variables: {
-        //             take,
-        //             skip,
-        //             orderBy
-        //         }
-        //     });
-        // },
         onCompleted: () => history.push('/')
     });
 

client/src/components/appointment/UpdateAppointment.js

@@ -1,8 +1,6 @@
 import React, { useState } from 'react';
 import { useHistory } from 'react-router';
 import { useMutation, gql, useQuery } from '@apollo/client';
-import { APPOINTMENTS_PER_PAGE } from '../../constants';
-import { APPOINTMENTS_QUERY } from './AppointmentList';
 import Datetime from 'react-datetime';
 import "react-datetime/css/react-datetime.css";
 
@@ -74,10 +72,6 @@ const UpdateAppointment = ({ match: { params: { _id } } }) => {
     if (data === undefined) {
         return <div>Loading...</div>
     } else {
-        // setFormState({
-        //     formState.title= data.oneAppointment.title
-        // })
-
         return (
             <div>
                 <form
@@ -95,16 +89,10 @@ const UpdateAppointment = ({ match: { params: { _id } } }) => {
                             type="text"
                         />
                         <input
+                            readOnly
                             className="mb2"
-                            value={formState.title}
+                            value={data.oneAppointment.title}
-                            onChange={(e) =>
-                                setFormState({
-                                    ...formState,
-                                    title: e.target.value
-                                })
-                            }
                             type="text"
-                            placeholder="Input title"
                         />
                         <input
                             className="mb2"

client/src/components/layout/Header.js

@@ -17,18 +17,6 @@ const Header = () => {
             <div className="flex flex-fixed">
                 <Link to="/create" className="ml1 no-underline black">New</Link>
             </div>
-            <div className="flex flex-fixed">
-                {authToken ? (
-                    <div className="ml1 pointer black"
-                        onClick={() => {
-                            localStorage.removeItem(AUTH_TOKEN);
-                            history.push(`/`);
-                        }}
-                    >Logout</div>
-                ) : (
-                        <Link to="/login" className="ml1 no-underline black">Login</Link>
-                    )}
-            </div>
         </div>
     );
 };

client/src/index.js

@@ -5,8 +5,6 @@ import { AUTH_TOKEN } from './constants';
 import App from './components/App';
 import { BrowserRouter } from 'react-router-dom';
 import { setContext } from '@apollo/client/link/context';
-// import * as serviceWorker from './serviceWorker';
-
 import {
   ApolloProvider,
   ApolloClient,
@@ -41,37 +39,3 @@ ReactDOM.render(
   </BrowserRouter>,
   document.getElementById('root')
 );
-// serviceWorker.unregister();
-
-
-
-// import { split } from '@apollo/client';
-// import { WebSocketLink } from '@apollo/client/link/ws';
-// import { getMainDefinition } from '@apollo/client/utilities';
-// // import AppointmentList from './components/AppointmentList';
-
-// // export default App;
-
-// const wsLink = new WebSocketLink({
-//   uri: `ws://localhost:4000/graphql`,
-//   options: {
-//     reconnect: true,
-//     connectionParams: {
-//       authToken: localStorage.getItem(AUTH_TOKEN)
-//     }
-//   }
-// });
-
-// const link = split(
-//   ({ query }) => {
-//     const { kind, operation } = getMainDefinition(query);
-//     return (
-//       kind === 'OperationDefinition' &&
-//       operation === 'subscription'
-//     );
-//   },
-//   wsLink,
-//   authLink.concat(httpLink)
-// );
-
-// // reportWebVitals();

server/package.json

@@ -13,16 +13,16 @@
     "@babel/node": "^7.12.10",
     "@babel/preset-env": "^7.12.11",
     "apollo-engine": "^1.1.2",
-    "apollo-server": "^2.19.0",
+    "apollo-server": "^3.13.0",
     "apollo-server-express": "^2.19.1",
     "bcrypt": "^5.0.0",
     "bcryptjs": "2.4.3",
-    "body-parser": "^1.19.0",
+    "body-parser": "^1.20.3",
     "chai": "^4.2.0",
     "cors": "^2.8.5",
     "dotenv": "^8.2.0",
     "esm": "^3.2.25",
-    "express": "^4.17.1",
+    "express": "^4.20.0",
     "express-graphql": "^0.12.0",
     "graphql": "^15.4.0",
     "graphql-compose": "^7.23.0",
@@ -31,11 +31,11 @@
     "graphql-depth-limit": "^1.1.0",
     "graphql-middleware": "^6.0.0",
     "graphql-tools": "^7.0.2",
-    "jsonwebtoken": "8.5.1",
+    "jsonwebtoken": "9.0.0",
     "migrate": "^1.7.0",
     "mocha": "^8.2.1",
-    "mongodb": "^3.6.3",
+    "mongodb": "^3.6.10",
-    "mongoose": "^5.11.9",
+    "mongoose": "^6.13.6",
     "mongoose-bcrypt": "^1.9.0",
     "mongoose-timestamp": "^0.6.0",
     "node-migrate": "^0.1.0"

server/src/index.js

@@ -9,36 +9,6 @@ import './utils/db.js';
 import fs from 'fs';
 import path from 'path';
 import cors from 'cors';
-// import getUserId from './utils';
-
-
-import jwt from 'jsonwebtoken';
-const APP_SECRET = 'GraphQL-is-aw3some';
-
-function getTokenPayload(token) {
-  return jwt.verify(token, APP_SECRET);
-}
-
-function getUserId(req, authToken) {
-  if (req) {
-    const authHeader = req.headers.authorization;
-    if (authHeader) {
-      const token = authHeader.replace('Bearer ', '');
-      if (!token) {
-        throw new Error('No token found');
-      }
-      const { userId } = getTokenPayload(token);
-      return userId;
-    }
-  } else if (authToken) {
-    const { userId } = getTokenPayload(authToken);
-    return userId;
-  }
-
-  throw new Error('Not authenticated');
-}
-
-
 
 const moduleURL = new URL(import.meta.url);
 const __dirname = path.dirname(moduleURL.pathname);
@@ -60,46 +30,15 @@ const server = new ApolloServer({
     path.join(__dirname, 'schema.graphql'),
     'utf8'
   ),
-  // schema,
   cors: true,
   playground: process.env.NODE_ENV === 'development' ? true : false,
   context: ({ req }) => {
-    //     if (!db) {
-    //       try {
-    //         if (!dbClient.isConnected()) await dbClient.connect()
-    //         mongo = dbClient.db('Calendar') // database name
-    //         console.log(db);
-    //       } catch (e) {
-    //         console.log('--->error while connecting with graphql context (db)', e)
-    //       }
-
     return {
       ...req,
       mongoose,
-      pubsub,
+      pubsub
-      userId:
-        req && req.headers.authorization
-          ? getUserId(req)
-          : null
     }
   },
-  // subscriptions: {
-  //   onConnect: (connectionParams) => {
-  //     if (connectionParams.authToken) {
-  //       return {
-  //         mongoose,
-  //         userId: getUserId(
-  //           null,
-  //           connectionParams.authToken
-  //         )
-  //       };
-  //     } else {
-  //       return {
-  //         mongoose
-  //       };
-  //     }
-  //   }
-  // },
   introspection: true,
   tracing: true,
   path: '/',
@@ -110,7 +49,6 @@ server.applyMiddleware({
   path: '/',
   cors: true,
   onHealthCheck: () =>
-    // eslint-disable-next-line no-undef
     new Promise((resolve, reject) => {
       if (mongoose.connection.readyState > 0) {
         resolve();
@@ -124,36 +62,3 @@ app.listen({ port: process.env.PORT }, () => {
   console.log(`🚀 Server listening on port ${process.env.PORT}`);
   console.log(`😷 Health checks available at ${process.env.HEALTH_ENDPOINT}`);
 });
-
-
-// const { graphqlHTTP } = require('express-graphql');
-// const mongoose = require("mongoose");
-// const graphqlSchema = require("./graphql/schema/schema")
-// const appointmentResolvers = require("./graphql/resolvers/appointment")
-// const userResolvers = require("./graphql/resolvers/user")
-
-// var MongoClient = require('mongodb', { useUnifiedTopology: true }).MongoClient;
-// // import { MongoClient } from 'mongodb'
-// const Query = require('./resolvers/Query');
-// const Mutation = require('./resolvers/Mutation');
-// const Subscription = require('./resolvers/Subscription');
-// const User = require('./resolvers/User');
-// const Appointment = require('./resolvers/Appointment');
-// const Follow = require('./resolvers/Follow');
-// const fs = require('fs');
-// const path = require('path');
-// const { getUserId } = require('./utils');
-
-// const graphqlResolvers = {
-//   appointmentResolvers,
-//   userResolvers
-// };
-
-// // const resolvers = {
-// //   Query,
-// //   Mutation,
-// //   Subscription,
-// //   User,
-// //   Appointment,
-// //   Follow
-// // };

server/src/models/product.js

@@ -1,12 +0,0 @@
-import mongoose from 'mongoose';
-const Schema = mongoose.Schema;
-const ProductSchema = new Schema({
-    title: {
-        type: String,
-        required: true
-    },
-    qty: {
-        type: Number
-    }
-});
-export default mongoose.model('product', ProductSchema);

server/src/models/user.js

@@ -1,33 +0,0 @@
-import mongoose from 'mongoose';
-import bcrypt from 'bcrypt';
-const Schema = mongoose.Schema;
-const UserSchema = new Schema({
-    username: {
-        type: String,
-        required: true
-    },
-    email: {
-        type: String,
-        required: true
-    },
-    password: {
-        type: String,
-        required: true
-    },
-    deleted: {
-        type: Boolean,
-        required: false
-    }
-});
-
-// hash the password
-UserSchema.methods.generateHash = function (password) {
-    return bcrypt.hashSync(password, bcrypt.genSaltSync(8), null);
-};
-
-// checking if password is valid
-UserSchema.methods.validPassword = function (password) {
-    return bcrypt.compareSync(password, this.password);
-};
-
-export default mongoose.model('user', UserSchema);

server/src/resolvers.js

@@ -1,74 +1,20 @@
-// import Appointment from '../../client/src/components/Appointment.js';
-import Product from './models/product.js';
 import Appointment from './models/appointment.js';
-import User from './models/user.js'
-// import { createAppointment } from './resolvers/Mutation.js';
-import bcrypt from 'bcrypt';
-import jwt from 'jsonwebtoken';
-import dotenv from 'dotenv';
 
 export const resolvers = {
     Query: {
         async allAppointments() {
             return await Appointment.find({ deleted: false })
-            // return await Appointment.find();
         },
         async oneAppointment(root, args, context, info) {
             return await Appointment.findOne({
                 _id: args._id
             });
         },
-        async allProducts() {
-            return await Product.find();
-        },
-        async allUsers() {
-            return await User.find();
-        },
     },
     Mutation: {
-        async signup(root, args, context, info) {
-            var user = await User.create(args);
-            user.password = user.generateHash(args.password);
-            user.save();
-
-            const token = jwt.sign({ userId: user.id }, process.env.APP_SECRET);
-
-            return {
-                token,
-                user
-            };
-        },
-
-        async login(parent, args, context, info) {
-            console.log(context);
-            const { userId } = context;
-            console.log(userId);
-
-            const user = await User.findOne({
-                email: args.email
-            });
-            if (!user) {
-                throw new Error('No such user found');
-            }
-
-            if (!user.validPassword(args.password)) {
-                throw new Error('Invalid password');
-            }
-
-            const token = jwt.sign({ userId: user.id }, process.env.APP_SECRET);
-
-            return {
-                token,
-                user
-            };
-        },
-
         async createAppointment(parent, args, context, info) {
             console.log(context);
-            const { userId } = context;
-            console.log("userID", userId);
             args.deleted = false;
-            args.createdBy = userId;
             return await Appointment.create(args);
         },
         async updateAppointment(parent, args, context, info) {
@@ -81,29 +27,6 @@ export const resolvers = {
         },
         async deleteAppointment(parent, args, context, info) {
             return await Appointment.findOneAndUpdate({ _id: args._id }, { deleted: true })
-            // return await Appointment.deleteOne({ _id: args._id });
-        },
-        async createProduct(root, {
-            input
-        }) {
-            return await Product.create(input);
-        },
-        async updateProduct(root, {
-            _id,
-            input
-        }) {
-            return await Product.findOneAndUpdate({
-                _id
-            }, input, {
-                new: true
-            })
-        },
-        async deleteProduct(root, {
-            _id
-        }) {
-            return await Product.findOneAndRemove({
-                _id
-            });
         },
     }
 };

server/src/resolvers/Appointment.js

@@ -4,13 +4,6 @@ function createdBy(parent, args, context) {
     .createdBy();
 }
 
-function follows(parent, args, context) {
-  return context.mongo.appointment
-    .findUnique({ where: { id: parent.id } })
-    .follows();
-}
-
 module.exports = {
-  createdBy,
+  createdBy
-  follows
 };

server/src/resolvers/Follow.js

@@ -1,16 +0,0 @@
-function appointment(parent, args, context) {
-  return context.mongo.follow
-    .findUnique({ where: { id: parent.id } })
-    .appointment();
-}
-
-function user(parent, args, context) {
-  return context.mongo.follow
-    .findUnique({ where: { id: parent.id } })
-    .user();
-}
-
-module.exports = {
-  appointment,
-  user
-};

server/src/resolvers/Mutation.js

@@ -1,90 +1,14 @@
-const bcrypt = require('bcryptjs');
-const jwt = require('jsonwebtoken');
-const { APP_SECRET } = require('../utils');
-
 function createAppointment(parent, args, context, info) {
-  const { userId } = context;
-
   const newAppointment = context.mongo.appointment.create({
     data: {
       title: args.title,
-      description: args.description,
+      description: args.description
-      createdBy: { connect: { id: userId } }
     }
   });
 
   return newAppointment;
 }
 
-async function signup(parent, args, context, info) {
-  const password = await bcrypt.hash(args.password, 10);
-  const user = await context.mongo.user.create({
-    data: { ...args, password }
-  });
-
-  const token = jwt.sign({ userId: user.id }, APP_SECRET);
-
-  return {
-    token,
-    user
-  };
-}
-
-async function login(parent, args, context, info) {
-  const user = await context.mongo.user.findUnique({
-    where: { email: args.email }
-  });
-  if (!user) {
-    throw new Error('No such user found');
-  }
-
-  const valid = await bcrypt.compare(
-    args.password,
-    user.password
-  );
-  if (!valid) {
-    throw new Error('Invalid password');
-  }
-
-  const token = jwt.sign({ userId: user.id }, APP_SECRET);
-
-  return {
-    token,
-    user
-  };
-}
-
-async function follow(parent, args, context, info) {
-  const { userId } = context;
-  const follow = await context.mongo.follow.findUnique({
-    where: {
-      linkId_userId: {
-        linkId: Number(args.linkId),
-        userId: userId
-      }
-    }
-  });
-
-  if (Boolean(follow)) {
-    throw new Error(
-      `Already followed the appointment: ${args.linkId}`
-    );
-  }
-
-  const newFollow = context.mongo.follow.create({
-    data: {
-      user: { connect: { id: userId } },
-      link: { connect: { id: Number(args.linkId) } }
-    }
-  });
-  context.pubsub.publish('NEW_FOLLOW', newFollow);
-
-  return newFollow;
-}
-
 module.exports = {
-  createAppointment,
+  createAppointment
-  signup,
-  login,
-  follow
 };

server/src/resolvers/Subscription.js

@@ -9,18 +9,6 @@ const newAppointment = {
   },
 }
 
-function newFollowSubscribe(parent, args, context, info) {
-  return context.pubsub.asyncIterator("NEW_FOLLOW")
-}
-
-const newFollow = {
-  subscribe: newFollowSubscribe,
-  resolve: payload => {
-    return payload
-  },
-}
-
 module.exports = {
   newAppointment,
-  newFollow
 }

server/src/schema.graphql

@@ -6,13 +6,8 @@ type Query {
     take: Int
     orderBy: AppointmentOrderByInput
   ): Feed!
-  allProducts: [Product]
   allAppointments: [Appointment]
-  oneAppointment(
+  oneAppointment(_id: ID!): Appointment
-    _id: ID!
-  ): Appointment
-  allUsers: [User]
-  users: [User!]!
 }
 
 type Feed {
@@ -31,7 +26,7 @@ type Mutation {
     deleted: Boolean
   ): Appointment!
   updateAppointment(
-    _id: ID!, 
+    _id: ID!
     title: String!
     description: String
     type: String!
@@ -39,55 +34,11 @@ type Mutation {
     end: DateTime!
     deleted: Boolean
   ): Appointment
-  deleteAppointment(
+  deleteAppointment(_id: ID!): Appointment
-    _id: ID!
-  ) : Appointment
-  createProduct(
-    input: ProductInput
-  ) : Product
-  updateProduct(
-    _id: ID!, 
-    input: ProductInput
-  ): Product
-  deleteProduct(
-    _id: ID!
-  ) : Product
-  signup(
-    email: String!
-    password: String!
-    username: String!
-  ): AuthPayload
-  login(
-    email: String!, 
-    password: String!
-    ): AuthPayload
-  follow(
-    appointmentId: ID!
-    ): Follow
 }
 
 type Subscription {
   newAppointment: Appointment
-  newFollow: Follow
-}
-
-#User Schemas
-type User {
-  _id: ID!
-  username: String!
-  email: String!
-  password: String!
-  # appointments: [Appointment!]!
-}
-input UserInput{
-  username: String!
-  email: String!
-  password: String!
-  # appointments: [Appointment!]!
-}
-type AuthPayload {
-  token: String
-  user: User
 }
 
 # Appointment schemas
@@ -99,9 +50,6 @@ type Appointment {
   start: DateTime!
   end: DateTime!
   deleted: Boolean
-  createdBy: User
-  # follows: [Follow!]!
-  # createdAt: DateTime!
 }
 input AppointmentInput {
   title: String!
@@ -110,29 +58,10 @@ input AppointmentInput {
   start: DateTime!
   end: DateTime!
   deleted: Boolean
- }
+}
 input AppointmentOrderByInput {
   title: Sort
   desc: Sort
-  # createdAt: Sort
-}
-
-# Product schemas
-type Product {
-  _id: ID!
-  title: String!
-  qty: Int
-}
-input ProductInput {
-  title: String!
-  qty: Int
- }
-
-# Follow schemas
-type Follow {
-  _id: ID!
-  appointment: Appointment!
-  user: User!
 }
 
 # General-purpose schemas

server/src/utils.js

@@ -1,30 +1,5 @@
-import jwt from 'jsonwebtoken';
 const APP_SECRET = 'GraphQL-is-aw3some';
 
-function getTokenPayload(token) {
-  return jwt.verify(token, APP_SECRET);
-}
-
-function getUserId(req, authToken) {
-  if (req) {
-    const authHeader = req.headers.authorization;
-    if (authHeader) {
-      const token = authHeader.replace('Bearer ', '');
-      if (!token) {
-        throw new Error('No token found');
-      }
-      const { userId } = getTokenPayload(token);
-      return userId;
-    }
-  } else if (authToken) {
-    const { userId } = getTokenPayload(authToken);
-    return userId;
-  }
-
-  throw new Error('Not authenticated');
-}
-
 module.exports = {
-  APP_SECRET,
+  APP_SECRET
-  getUserId
 };

server/src/utils/db.js

@@ -1,7 +1,4 @@
-// const mongoose = require("mongoose");
 import mongoose from 'mongoose';
-
-// const dotenv = require("../../.env");
 import dotenv from 'dotenv';
 
 dotenv.config();