diff --git a/apollo-gateway/Dockerfile b/apollo-gateway/Dockerfile index d0ec9c9cb4f420dd0147cca4d0e736347388af50..5930be5fb59ecf05322580a540bdfb73e9a3343f 100644 --- a/apollo-gateway/Dockerfile +++ b/apollo-gateway/Dockerfile @@ -1,9 +1,9 @@ FROM node:14 -COPY . /opt/app - WORKDIR /opt/app +COPY . /opt/app + RUN npm install EXPOSE 5000 diff --git a/comments-service/Dockerfile b/comments-service/Dockerfile index c4303bdd4fbcefaabf54381a2b8dbfe5551e4d94..b18c45920c87c6c91d4ec4581b6113b40d539b71 100644 --- a/comments-service/Dockerfile +++ b/comments-service/Dockerfile @@ -1,9 +1,9 @@ FROM node:14 -COPY . /opt/app - WORKDIR /opt/app +COPY . /opt/app + RUN npm install EXPOSE 5003 diff --git a/docker-compose.yaml b/docker-compose.yaml index e8a62b4876c384921f014f91167bfee3065ea2d3..37fbc7910b90c4ffff6cf90150415d1ce6a3e28c 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,5 +1,15 @@ version: "3" services: + frontend: + build: "./frontend" + depends_on: + - apollo-gateway + volumes: + - ./frontend:/opt/app + - /opt/app/node_modules + ports: + - 3000:3000 + apollo-gateway: build: "./apollo-gateway" depends_on: @@ -8,6 +18,7 @@ services: - comments-service volumes: - ./apollo-gateway:/opt/app + - /opt/app/node_modules ports: - 5000:5000 @@ -23,6 +34,7 @@ services: build: "./posts-service" volumes: - ./posts-service:/opt/app + - /opt/app/node_modules ports: - 5002:5002 @@ -30,5 +42,6 @@ services: build: "./comments-service" volumes: - ./comments-service:/opt/app + - /opt/app/node_modules ports: - 5003:5003 \ No newline at end of file diff --git a/frontend/Dockerfile b/frontend/Dockerfile new file mode 100644 index 0000000000000000000000000000000000000000..d43f1699b5c4062ebc2968e6b65a9dd795da7854 --- /dev/null +++ b/frontend/Dockerfile @@ -0,0 +1,11 @@ +FROM node:14 + +WORKDIR /opt/app + +COPY . /opt/app + +RUN npm install + +EXPOSE 3000 + +CMD npm start \ No newline at end of file diff --git a/frontend/src/App.js b/frontend/src/App.js index c22b8348bc8a7d85a9adbab38e85dbcb28c4d93d..b59d43ba1dc5202b0f8f0f398b077a4e6e0093bd 100644 --- a/frontend/src/App.js +++ b/frontend/src/App.js @@ -1,6 +1,6 @@ import React from 'react'; import { BrowserRouter, Switch, Route } from 'react-router-dom'; -import { ApolloClient, ApolloProvider, InMemoryCache, createHttpLink, ApolloLink } from '@apollo/client'; +import { ApolloClient, ApolloProvider, InMemoryCache, createHttpLink } from '@apollo/client'; import { setContext } from '@apollo/client/link/context'; import { darkTheme } from './styles.js' import Home from './components/Pages/Home/Home.js'; diff --git a/frontend/src/components/Auth/Auth.js b/frontend/src/components/Auth/Auth.js index 5c9239aa1a5d02d04041400a00ea1b1a44c864de..6a9889f31683e0851966518d7a25d905aa184a18 100644 --- a/frontend/src/components/Auth/Auth.js +++ b/frontend/src/components/Auth/Auth.js @@ -24,7 +24,7 @@ const Auth = () => { confirmPassword: "" }; const [formData, setFormData] = useState(initialState); - const [signupUser, { data }] = useMutation(SIGNUP, { + const [signupUser] = useMutation(SIGNUP, { update(proxy, result) { context.signin(result.data.signup); history.push("/"); @@ -33,7 +33,7 @@ const Auth = () => { setErrorData({...errorData, email: { error: true, errorMessage: "Email already in use" }}); } }); - const [signinUser, { data: data2 }] = useMutation(SIGNIN, { + const [signinUser] = useMutation(SIGNIN, { update(proxy, result) { context.signin(result.data.signin); history.push("/"); diff --git a/frontend/src/components/Header/Header.js b/frontend/src/components/Header/Header.js index f75f377d300e5608a2cdf3621c54da5bd65c030c..e8d2dfda9ec5795a8a67547d971c67f087ccafca 100644 --- a/frontend/src/components/Header/Header.js +++ b/frontend/src/components/Header/Header.js @@ -1,6 +1,5 @@ -import React, { useState, useContext } from 'react'; -import { useHistory, useLocation } from 'react-router'; -import decode from 'jwt-decode'; +import React, { useContext } from 'react'; +import { useHistory } from 'react-router'; import { AuthContext } from '../../context/auth.js'; import useStyles from './styles.js'; import Toolbar from '@material-ui/core/Toolbar'; diff --git a/frontend/src/components/Pages/AddPost/AddPost.js b/frontend/src/components/Pages/AddPost/AddPost.js index 041d39c27a5eecccd023b24e7fa62bc9d293e5db..73ec869c07b9ae154af8310f65f40e4fe3deec95 100644 --- a/frontend/src/components/Pages/AddPost/AddPost.js +++ b/frontend/src/components/Pages/AddPost/AddPost.js @@ -26,7 +26,7 @@ const AddPost = () => { }; const [errorData, setErrorData] = useState(validationState); - const [createNewPost, { error }] = useMutation(CREATE_POST, { + const [createNewPost] = useMutation(CREATE_POST, { update(proxy, result) { const data = proxy.readQuery({ query: GET_POSTS diff --git a/posts-service/Dockerfile b/posts-service/Dockerfile index 4306abe89aa5d93583b2db3c67de635a89adc3e7..af8a18513eb53c8efc35d8d2e0a261ca91a1fe75 100644 --- a/posts-service/Dockerfile +++ b/posts-service/Dockerfile @@ -1,9 +1,9 @@ FROM node:14 -COPY . /opt/app - WORKDIR /opt/app +COPY . /opt/app + RUN npm install EXPOSE 5002 diff --git a/users-service/Dockerfile b/users-service/Dockerfile index b27ddbaeb2da3818c19dc27f45bb4cf424bd598b..11fd2d5d7784de794dd130b902633c1343ef7566 100644 --- a/users-service/Dockerfile +++ b/users-service/Dockerfile @@ -1,9 +1,9 @@ FROM node:14 -COPY . /opt/app - WORKDIR /opt/app +COPY . /opt/app + RUN npm install EXPOSE 5001 diff --git a/users-service/controllers/users.js b/users-service/controllers/users.js index c9813b73c12fa3746085747a459bfdc8e0acd8db..7d982baf33a4b90fc2f60dd24235da4b4ee62b17 100644 --- a/users-service/controllers/users.js +++ b/users-service/controllers/users.js @@ -48,8 +48,6 @@ export const checkUserEmail = async (req, res) => { try { const user = await User.findOne({ email }); - if (!user) - return res.status(404).json({ message: "User doesn't exist" }); return res.status(200).json(user); } catch (error) { diff --git a/users-service/test/users.spec.js b/users-service/test/users.spec.js index 88c57ae3169c24030658966f0ec498e2db9259f9..2f4f9e23f7d702d8496c7822d0da9bed358e1c15 100644 --- a/users-service/test/users.spec.js +++ b/users-service/test/users.spec.js @@ -139,11 +139,4 @@ describe('get user by email', () => { done(); }); - - it('should not find non existent user', async (done) => { - const res = await agent.get(`/user/user/check/doesntexist@test.com`); - expect(res.statusCode).toBe(404); - - done(); - }); }); \ No newline at end of file