From 04b681aa07fca254328f45d0c29904dc44a5b531 Mon Sep 17 00:00:00 2001 From: trymg <trymg@stud.ntnu.no> Date: Mon, 1 Nov 2021 17:14:07 +0100 Subject: [PATCH] reverted to localhost --- client/package.json | 6 +++--- client/src/components/Header.tsx | 4 ++-- client/src/components/services.ts | 2 +- server/package-lock.json | 5 ----- server/package.json | 4 ++-- server/src/server.ts | 9 ++++----- 6 files changed, 12 insertions(+), 18 deletions(-) diff --git a/client/package.json b/client/package.json index 9538abf..a0a6e85 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { - "homepage": "http://it2810-54.idi.ntnu.no", - "name": "project-3", + "homepage": "http://localhost:3000", + "name": "project-4", "version": "0.1.0", "private": true, "dependencies": { @@ -27,7 +27,7 @@ "test": "react-scripts test", "eject": "react-scripts eject" }, - "proxy": "http://it2810-54.idi.ntnu.no:4000", + "proxy": "http://localhost:8080", "eslintConfig": { "extends": [ "react-app", diff --git a/client/src/components/Header.tsx b/client/src/components/Header.tsx index 1c00a79..fa78b1d 100644 --- a/client/src/components/Header.tsx +++ b/client/src/components/Header.tsx @@ -34,8 +34,8 @@ class Header extends React.Component<MoviesProps, MyState> { <input type="text" placeholder="Search for movie titles..." onChange={this.handleChange} id="textfield1"></input> <span>Movie genre:</span> <input type="text" placeholder="Filter on genre..." onChange={this.handleChange} id="textfield2"></input> - {/* Order by year: */} - {/* <input type="checkbox" id="checkbox1" onChange={this.handleChange}></input> */} + Order by year: + <input type="checkbox" id="checkbox1" onChange={this.handleChange}></input> <button className="button button2" onClick={this.search} >Search</button> </div> ) diff --git a/client/src/components/services.ts b/client/src/components/services.ts index 64f3d5c..fb45dca 100644 --- a/client/src/components/services.ts +++ b/client/src/components/services.ts @@ -1,6 +1,6 @@ // used to send all requests to backend export function queryFetch(query: String) { - return fetch('http://it2810-54.idi.ntnu.no:4000/graphql', { + return fetch('/graphql', { method: 'POST', headers: { "Content-Type": "application/json" }, body: JSON.stringify({ diff --git a/server/package-lock.json b/server/package-lock.json index 20d32c7..b53a57b 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -5528,11 +5528,6 @@ "is-obj": "^2.0.0" } }, - "dotenv": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", - "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==" - }, "dotenv-expand": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz", diff --git a/server/package.json b/server/package.json index 5e2cb54..457dfbf 100644 --- a/server/package.json +++ b/server/package.json @@ -1,5 +1,5 @@ { - "name": "project-3", + "name": "project-4", "version": "0.1.0", "private": true, "dependencies": { @@ -27,7 +27,7 @@ "web-vitals": "^1.1.2" }, "scripts": { - "start": "nodemon src/server_local.ts --exec ts-node", + "start": "nodemon src/server.ts --exec ts-node", "build": "tsc src/server.ts", "test": "react-scripts test", "eject": "react-scripts eject" diff --git a/server/src/server.ts b/server/src/server.ts index 463e806..dfe8546 100644 --- a/server/src/server.ts +++ b/server/src/server.ts @@ -4,7 +4,7 @@ var { graphqlHTTP } = require('express-graphql'); var { GraphQLObjectType, GraphQLSchema, GraphQLInt, GraphQLString, GraphQLList, GraphQLBoolean } = require('graphql'); import {sendQuery} from "./database" -import * as cors from 'cors'; +// import * as cors from 'cors'; const MovieType = new GraphQLObjectType({ name: "Movie", @@ -76,7 +76,6 @@ const RootQuery = new GraphQLObjectType({ async resolve(parent: any, args: any) { let query = ''; if(typeof args.title!='undefined' && typeof args.genre!='undefined'){ - console.log("resolve") query = getSearchQuery(args.title, args.genre, args.order)} const response = await sendQuery(query); return response[0]; @@ -181,7 +180,7 @@ const schema = new GraphQLSchema({query: RootQuery, mutation: Mutation}) var app = express(); // Add headers -app.use(function (req, res, next) { +app.use(function (req: any, res: any, next: any) { // Website you wish to allow to connect res.setHeader('Access-Control-Allow-Origin', '*'); @@ -201,11 +200,11 @@ app.use(function (req, res, next) { }); -app.use(cors()); +// app.use(cors()); app.use('/graphql', graphqlHTTP({ schema: schema, graphiql: true, })); -app.listen(4000, () => console.log('Server running on port 4000')); +app.listen(8080, () => console.log('Server running on port 8080')); -- GitLab