struct-change

pemba1s1 · Feb 13, 2024 · 947badb · 947badb
1 parent 1286b43
commit 947badb
Show file tree

Hide file tree

Showing 33 changed files with 70 additions and 23 deletions.
diff --git a/Procfile b/Procfile
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -8,6 +8,7 @@
   },
   "dependencies": {
     "@testing-library/jest-dom": "^5.17.0",
+    "dompurify": "^2.4.7",
     "@testing-library/react": "^11.2.7",
     "@testing-library/user-event": "^12.8.3",
     "antd": "^4.24.15",

diff --git a/client/src/components/Blog/CreateBlog.js b/client/src/components/Blog/CreateBlog.js
@@ -7,11 +7,11 @@ import {
     Upload
   } from 'antd';
 import { LoadingOutlined,UploadOutlined } from '@ant-design/icons';
-import axios from "axios";
 import { useNavigate } from "react-router";
 import { useState,useEffect } from "react";
 import ReactQuill from 'react-quill';
 import 'react-quill/dist/quill.snow.css';
+import instance from "../../router/axiosInstance";
 
 const dummyRequest = ({ file, onSuccess }) => {
     setTimeout(() => {
@@ -53,14 +53,14 @@ export default function CreateBlog() {
         const fd = new FormData();
         fd.append('file', file, file.name);
         console.log(values)
-        await axios.post('/file/upload',fd,{
+        await instance.post('/file/upload',fd,{
             headers:{
                 Authorization: `Bearer ${localStorage.getItem('token')}`,
             }
         }).then(res=>{
             console.log(res.data)
             values = {...values,photo:res.data}
-             axios.post('/api/v1/blogs',values,{
+             instance.post('/api/v1/blogs',values,{
                 headers:{
                     Authorization: `Bearer ${localStorage.getItem('token')}`,
                 }

diff --git a/client/src/components/Blog/EditBlog.js b/client/src/components/Blog/EditBlog.js
@@ -7,7 +7,7 @@ import {
     Upload
   } from 'antd';
 import { LoadingOutlined,UploadOutlined } from '@ant-design/icons';
-import axios from "axios";
+import instance from "../../router/axiosInstance";
 import { useNavigate,useParams } from "react-router";
 import { useEffect,useState } from "react";
 import {Edit} from './../../services/Blog'
@@ -47,7 +47,7 @@ export default function EditBlog() {
     let navigate=useNavigate()
     useEffect(() => {
         async function fetchData(){
-            axios.get(`/api/v1/blogs/${params.id}`).then(res=>{
+            instance.get(`/api/v1/blogs/${params.id}`).then(res=>{
                 if(res.data.blog.writer._id!==localStorage.getItem('userId')){
                     navigate('/')
                 }
@@ -66,7 +66,7 @@ export default function EditBlog() {
         setLoad(true)
         const fd = new FormData();
         fd.append('file', file, file.name);
-        await axios.post('/file/upload',fd,{
+        await instance.post('/file/upload',fd,{
             headers:{
                 Authorization: `Bearer ${localStorage.getItem('token')}`,
             }

diff --git a/client/src/components/Home/Home.js b/client/src/components/Home/Home.js
@@ -1,6 +1,6 @@
 import { Content } from "antd/lib/layout/layout";
 import { List, Avatar, Skeleton,Image } from 'antd';
-import axios from "axios";
+import instance from "../../router/axiosInstance";
 import { useState,useEffect } from "react";
 import { Link } from "react-router-dom";
 import dayjs from "dayjs"
@@ -11,7 +11,7 @@ export default function Home() {
 
     useEffect(() => {
         async function fetchData(){
-            await axios.get('/api/v1/blogs').then(res=>{
+            await instance.get('/api/v1/blogs').then(res=>{
                 setBlogs(res.data.blogs)
                 setLoading(false)
             },err=>{

diff --git a/client/src/components/login/login.js b/client/src/components/login/login.js
@@ -1,7 +1,7 @@
 import { Content } from "antd/lib/layout/layout";
 import {Form, Input, Button, Checkbox,Spin} from 'antd'
 import { UserOutlined, LockOutlined,LoadingOutlined } from '@ant-design/icons';
-import axios from "axios";
+import instance from "../../router/axiosInstance";
 import { Link,useNavigate } from "react-router-dom";
 import { useState } from "react";
 
@@ -13,7 +13,7 @@ export default function Login() {
     const onFinish = async (values) => {
         setErr("")
         setLoad(true)
-        await axios.post('/api/user/login',values).then(res=>{
+        await instance.post('/api/user/login',values).then(res=>{
             localStorage.setItem('token',res.data.token)
             localStorage.setItem('userId',res.data.user.userId)
             localStorage.setItem('avatar',res.data.user.avatar)

diff --git a/client/src/components/profile/EditProfile.js b/client/src/components/profile/EditProfile.js
@@ -1,6 +1,6 @@
 import { Button, Form, Input,Spin,Upload } from "antd";
 import { Content } from "antd/lib/layout/layout";
-import axios from "axios";
+import instance from "../../router/axiosInstance";
 import { useState,useEffect } from "react";
 import { LoadingOutlined } from '@ant-design/icons';
 import { useParams } from "react-router-dom";
@@ -19,7 +19,7 @@ export default function EditProfile() {
     const [form] = Form.useForm()
 
     async function fetchData(){
-        await axios.get(`/api/user/${params.username}`).then(res=>{
+        await instance.get(`/api/user/${params.username}`).then(res=>{
             setUser(res.data.user)
             document.title = "Edit | "+res.data.user.username
             setLoading(false)
@@ -44,7 +44,7 @@ export default function EditProfile() {
         console.log(file)
         const fd = new FormData();
         fd.append('file', file, file.name);
-        await axios.post('/file/upload',fd,{
+        await instance.post('/file/upload',fd,{
             headers:{
                 Authorization: `Bearer ${localStorage.getItem('token')}`,
             }

diff --git a/client/src/components/profile/Profile.js b/client/src/components/profile/Profile.js
@@ -1,6 +1,6 @@
 import { Content } from "antd/lib/layout/layout";
 import { List, Avatar, Button, Skeleton, Image,Affix } from 'antd';
-import axios from "axios";
+import instance from "../../router/axiosInstance";
 import { useState,useEffect } from "react";
 import { Link,useParams } from "react-router-dom";
 import { Del} from './../../services/Blog'
@@ -13,7 +13,7 @@ export default function Profile() {
     let [loading,setLoading] = useState(true)
 
     async function fetchData(){
-        await axios.get(`/api/v1/blogs/user/${params.username}`).then(res=>{
+        await instance.get(`/api/v1/blogs/user/${params.username}`).then(res=>{
             setBlogs(res.data.userBlogs)
             setUser(res.data.user)
             document.title = params.username

diff --git a/client/src/components/signup/Signup.js b/client/src/components/signup/Signup.js
@@ -5,7 +5,7 @@ import {
     Button,
     Spin
   } from 'antd';
-import axios from "axios";
+  import instance from "../../router/axiosInstance";
 import { useNavigate } from "react-router";
 import {useState} from 'react'
 import { LoadingOutlined } from '@ant-design/icons';
@@ -19,7 +19,7 @@ export default function Signup() {
     const onFinish = async(values) => {
         setErr('')
         setLoad(true)
-        await axios.post('/api/user/signup',values).then(res=>{
+        await instance.post('/api/user/signup',values).then(res=>{
             console.log(res)
             setLoad(false)
             navigate("/login")

diff --git a/client/src/router/axiosInstance.js b/client/src/router/axiosInstance.js
@@ -0,0 +1,7 @@
+import axios from "axios";
+
+const instance = axios.create({
+    baseURL: 'http://localhost:5000'
+  });
+
+export default instance;
diff --git a/.gitignore → server/.gitignore b/.gitignore → server/.gitignore
diff --git a/LICENSE → server/LICENSE b/LICENSE → server/LICENSE
diff --git a/controllers/auth.js → server/controllers/auth.js b/controllers/auth.js → server/controllers/auth.js
diff --git a/controllers/blog.js → server/controllers/blog.js b/controllers/blog.js → server/controllers/blog.js
diff --git a/controllers/comment.js → server/controllers/comment.js b/controllers/comment.js → server/controllers/comment.js
diff --git a/controllers/file.js → server/controllers/file.js b/controllers/file.js → server/controllers/file.js
diff --git a/database/connect.js → server/database/connect.js b/database/connect.js → server/database/connect.js
diff --git a/middleware/asyncWrapper.js → server/middleware/asyncWrapper.js b/middleware/asyncWrapper.js → server/middleware/asyncWrapper.js
diff --git a/middleware/authentication.js → server/middleware/authentication.js b/middleware/authentication.js → server/middleware/authentication.js
diff --git a/middleware/error-handler.js → server/middleware/error-handler.js b/middleware/error-handler.js → server/middleware/error-handler.js
diff --git a/middleware/upload.js → server/middleware/upload.js b/middleware/upload.js → server/middleware/upload.js
diff --git a/models/blog.js → server/models/blog.js b/models/blog.js → server/models/blog.js
diff --git a/models/comment.js → server/models/comment.js b/models/comment.js → server/models/comment.js
diff --git a/models/user.js → server/models/user.js b/models/user.js → server/models/user.js
diff --git a/package-lock.json → server/package-lock.json b/package-lock.json → server/package-lock.json
diff --git a/package.json → server/package.json b/package.json → server/package.json
diff --git a/routes/auth.js → server/routes/auth.js b/routes/auth.js → server/routes/auth.js
diff --git a/routes/blog.js → server/routes/blog.js b/routes/blog.js → server/routes/blog.js
diff --git a/routes/comment.js → server/routes/comment.js b/routes/comment.js → server/routes/comment.js
diff --git a/routes/file.js → server/routes/file.js b/routes/file.js → server/routes/file.js
diff --git a/server.js → server/server.js b/server.js → server/server.js
@@ -13,7 +13,6 @@ require('dotenv').config()
 app.use(cors())
 app.use(express.json())
 
-app.use('/', express.static(path.join(__dirname, '/client/build')));
 app.use('/api/v1/blogs',blogRoute)
 app.use('/api/user',authRoute)
 app.use("/file", file);

diff --git a/server/vercel.json b/server/vercel.json
@@ -0,0 +1,16 @@
+{
+    "version": 2,
+    "buildCommand": "npm run build",
+    "builds": [
+      {
+        "src": "server.js", 
+        "use": "@vercel/node"
+      }
+    ],
+    "routes": [
+      {
+        "src": "/(.*)",
+        "dest": "server.js"
+      }
+    ]
+}