Merge pull request #29 from Prakhargarg-2010196/development

Initalize develop branch
Prakhargarg-2010196 · Jul 10, 2023 · d507cab · d507cab
2 parents 66a8a11 + 47fe4f2
commit d507cab
Show file tree

Hide file tree

Showing 13 changed files with 9,117 additions and 31,348 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/README.md b/README.md
@@ -1,5 +1,16 @@
-# EventManagementSystem
+# Event Management System version 1.0
 
-https://eventooze.netlify.app/  
+## Basic Crud functionalities from user dashboard
 
+- Create an Event
+- Modify/Update an Event
+- Delete an Event
+- View/Read all the events associated to one user
 
+## Other Features include
+
+### Admin Dashboard that provides functionalities like
+
+- Manage events all over the website
+- Approve an event/Validate the event for public viewer ship 
+- 
diff --git a/jsconfig.json b/jsconfig.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,15 +3,21 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@emotion/react": "^11.5.0",
-    "@emotion/styled": "^11.3.0",
+    "@emotion/react": "^11.11.1",
+    "@emotion/styled": "^11.11.0",
+    "@material-ui/core": "^4.12.4",
     "@material-ui/lab": "^4.0.0-alpha.60",
-    "@mui/icons-material": "^5.1.0",
+    "@mui/icons-material": "^5.11.16",
     "@mui/lab": "^5.0.0-alpha.55",
-    "@mui/material": "^5.1.1",
+    "@mui/material": "^5.13.6",
+    "@mui/styles": "^5.13.2",
     "@testing-library/jest-dom": "^5.14.1",
     "@testing-library/react": "^11.2.7",
     "@testing-library/user-event": "^12.8.3",
+    "@types/jest": "^29.5.2",
+    "@types/node": "^20.3.2",
+    "@types/react": "^17.0.62",
+    "@types/react-dom": "^18.2.6",
     "axios": "^0.24.0",
     "bootstrap": "^5.1.3",
     "primeicons": "^5.0.0",
@@ -22,24 +28,37 @@
     "react-dom": "^17.0.2",
     "react-dropzone": "^11.4.2",
     "react-router-dom": "^5.3.0",
-    "react-scripts": "4.0.3",
+    "react-scripts": "^5.0.1",
     "react-simple-timefield": "^3.2.5",
     "react-toastify": "^8.1.0",
     "styled-components": "^5.3.3",
     "swiper": "^6.8.4",
+    "typescript": "^5.1.6",
     "web-vitals": "^1.1.2"
   },
   "scripts": {
-    "start": "react-scripts start",
+    "start": "react-scripts  start",
     "build": "react-scripts build",
     "test": "react-scripts test",
     "eject": "react-scripts eject"
   },
   "eslintConfig": {
     "extends": [
       "react-app",
-      "react-app/jest"
-    ]
+      "react-app/jest",
+      "prettier"
+    ],
+    "plugins": [
+      "react-hooks"
+    ],
+    "rules": {
+      "react-hooks/rules-of-hooks": "error",
+      "react-hooks/exhaustive-deps": "warn"
+    }
+  },
+  "overrides": {
+    "autoprefixer": "10.4.5",
+    "typescript": "^5.1.6"
   },
   "browserslist": {
     "production": [
@@ -52,5 +71,9 @@
       "last 1 firefox version",
       "last 1 safari version"
     ]
+  },
+  "devDependencies": {
+    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
+    "eslint-config-prettier": "^8.8.0"
   }
 }
diff --git a/public/index.html b/public/index.html
@@ -17,7 +17,7 @@
 		<title>Eventooze</title>
 	</head>
 	<body>
-		<noscript>You need to enable JavaScript to run this app.</noscript>
 		<div id="root"></div>
+		<script src="http://localhost:8097"></script>
 	</body>
 </html>
diff --git a/src/App.js b/src/App.js
@@ -1,15 +1,9 @@
+// This is the file from which the App starts 
 import "App.css";
 
-import { Component } from "react";
 import { Routes } from "Routes/Routes";
 
-class App extends Component {
-	render() {
-		return (
-			<>
-				<Routes />
-			</>
-		);
-	}
+export default function App (){
+	return <Routes/>;
 }
-export default App;
+
diff --git a/src/api/services/admin-crud-service.js b/src/api/services/admin-crud-service.js
@@ -70,5 +70,5 @@ class AdminCrudService {
 
 
 }
-
-export default new AdminCrudService();
+let admin=new AdminCrudService()
+export default admin ;
diff --git a/src/api/services/auth.service.js b/src/api/services/auth.service.js
@@ -39,6 +39,6 @@ class AuthService{
 
 
 }
-
-export  default new AuthService();
+let auth = new AuthService();
+export default auth;
 
diff --git a/src/api/services/crud-service.js → src/api/services/crud-service.ts b/src/api/services/crud-service.js → src/api/services/crud-service.ts
@@ -12,6 +12,7 @@ class CrudService {
 			},
 		});
 	}
+
 	Update(id,FormData) {
 		return axios.put(BaseUrl() + `post/update/${id}`, FormData,{
 			headers:{
@@ -73,5 +74,5 @@ class CrudService {
 		});
 	}
 }
-
-export default new CrudService();
+let crud = new CrudService();
+export default crud;
diff --git a/src/api/services/posts.service.js b/src/api/services/posts.service.js
@@ -62,4 +62,5 @@ class PostService {
 
 }
 
-export default new PostService();
+let post=new PostService();
+export default post;
diff --git a/src/api/services/user.service.js b/src/api/services/user.service.js
@@ -6,4 +6,6 @@ class UserService {
 		return axios.get(BaseUrl() + "post/dashboard", { headers: authHeader() });
 	}
 }
-export default new UserService();
+
+let user=new UserService();
+export default user;
diff --git a/tsconfig.json b/tsconfig.json
@@ -0,0 +1,11 @@
+{
+    "include": [
+        ".",
+        "../typescript/types",
+        "src"
+    ],
+    "compilerOptions": {
+        "baseUrl": "src"
+    },
+
+}