diff --git a/client/src/components/layout/Header.js b/client/src/components/layout/Header.js index e21be71..af7b150 100644 --- a/client/src/components/layout/Header.js +++ b/client/src/components/layout/Header.js @@ -1,11 +1,11 @@ import React from 'react'; -import { useHistory } from 'react-router'; +// import { useHistory } from 'react-router'; import { Link, withRouter } from 'react-router-dom'; -import { AUTH_TOKEN } from '../../constants'; +// import { AUTH_TOKEN } from '../../constants'; const Header = () => { - const history = useHistory(); - const authToken = localStorage.getItem(AUTH_TOKEN); + // const history = useHistory(); + // const authToken = localStorage.getItem(AUTH_TOKEN); return (
@@ -17,7 +17,7 @@ const Header = () => {
New
-
+ {/*
{authToken ? (
{ @@ -28,7 +28,7 @@ const Header = () => { ) : ( Login )} -
+
*/}
); }; diff --git a/client/src/index.js b/client/src/index.js index bd45a97..8ddb835 100644 --- a/client/src/index.js +++ b/client/src/index.js @@ -15,7 +15,7 @@ import { } from '@apollo/client'; const httpLink = createHttpLink({ - uri: 'http://localhost:4000/djhb58fytkh476dk45yh49' + uri: 'http://localhost:4000/graphql' }); const authLink = setContext((_, { headers }) => { diff --git a/server/src/index.js b/server/src/index.js index bcb8a8e..0157741 100644 --- a/server/src/index.js +++ b/server/src/index.js @@ -9,11 +9,15 @@ 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'; +const moduleURL = new URL(import.meta.url); +const __dirname = path.dirname(moduleURL.pathname); +const app = express(); +const pubsub = new PubSub(); + +dotenv.config(); function getTokenPayload(token) { return jwt.verify(token, APP_SECRET); @@ -38,19 +42,10 @@ function getUserId(req, authToken) { throw new Error('Not authenticated'); } - - -const moduleURL = new URL(import.meta.url); -const __dirname = path.dirname(moduleURL.pathname); -const app = express(); -const pubsub = new PubSub(); - -dotenv.config(); - app.use(cors()); -app.use('/djhb58fytkh476dk45yh49', graphqlHTTP({ - schema: schema, +app.use('/graphql', graphqlHTTP({ + schema, validationRules: [depthLimit(3)], graphiql: true })); @@ -121,8 +116,7 @@ server.applyMiddleware({ }); 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}`); + console.log(`Server listening on port ${process.env.PORT}`); }); diff --git a/server/src/resolvers.js b/server/src/resolvers.js index 28463d2..5d99811 100644 --- a/server/src/resolvers.js +++ b/server/src/resolvers.js @@ -1,18 +1,13 @@ -// import Appointment from '../../client/src/components/Appointment.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(); + return await Appointment.find({ deleted: false }); }, - async oneAppointment(root, args, context, info) { + async oneAppointment(root, args) { return await Appointment.findOne({ _id: args._id }); @@ -22,8 +17,8 @@ export const resolvers = { }, }, Mutation: { - async signup(root, args, context, info) { - var user = await User.create(args); + async signup(root, args) { + const user = await User.create(args); user.password = user.generateHash(args.password); user.save(); @@ -35,7 +30,7 @@ export const resolvers = { }; }, - async login(parent, args, context, info) { + async login(parent, args, context) { console.log(context); const { userId } = context; console.log(userId); @@ -59,7 +54,7 @@ export const resolvers = { }; }, - async createAppointment(parent, args, context, info) { + async createAppointment(parent, args, context) { console.log(context); const { userId } = context; console.log("userID", userId); @@ -67,7 +62,7 @@ export const resolvers = { args.createdBy = userId; return await Appointment.create(args); }, - async updateAppointment(parent, args, context, info) { + async updateAppointment(parent, args) { console.log(args); return await Appointment.findOneAndUpdate({ args