Merge branch 'prod' into master

CommunityOfCoders · Apr 7, 2023 · d152d8f · d152d8f
2 parents c375b3e + f624922
commit d152d8f
Show file tree

Hide file tree

Showing 16 changed files with 12,778 additions and 40 deletions.
diff --git a/new_client/.env b/new_client/.env
@@ -1 +1 @@
-REACT_APP_API=http://localhost:8000/api
+REACT_APP_API=https://www.communityofcoders.in/server/api
diff --git a/new_client/.prettierignore b/new_client/.prettierignore
@@ -9,4 +9,5 @@ node_modules
 *.webp
 *.ttf
 *.jpeg
-*.pdf
+*.pdf
+yarn.lock
diff --git a/new_client/package.json b/new_client/package.json
@@ -87,4 +87,4 @@
     "prettier": "2.2.1",
     "sass": "^1.49.7"
   }
-}
+}
diff --git a/new_client/public/coc.jpeg b/new_client/public/coc.jpeg
diff --git a/new_client/src/components/blogs/AddBlog.jsx b/new_client/src/components/blogs/AddBlog.jsx
@@ -110,7 +110,7 @@ function AddBlog(props) {
         })
         .catch((err) => console.log(err));
     }
-  });
+  }, [isEditPage, props.username]);
 
   useEffect(() => {
     if (isEditPage) {

diff --git a/new_client/src/components/blogs/Blog.jsx b/new_client/src/components/blogs/Blog.jsx
@@ -118,17 +118,7 @@ const Blogs = (props) => {
     });
   };
 
-  let addBlogFab = (
-    <Grid item style={{ position: "fixed", right: "50px", bottom: "25px" }}>
-      <Tooltip title="Login Required" aria-label="add">
-        <span>
-          <Fab color="secondary" disabled>
-            <AddIcon />
-          </Fab>
-        </span>
-      </Tooltip>
-    </Grid>
-  );
+  let addBlogFab;
 
   if (props.isAuthenticated) {
     addBlogFab = (
@@ -148,7 +138,7 @@ const Blogs = (props) => {
 
   if (!isLoading) {
     blogComponent = posts.map((article) => (
-      <Grid item xs={6} key={article._id}>
+      <Grid item xs={12} md={6} lg={6} key={article._id}>
         <Card>
           <CardHeader
             title={article.blogTitle}
@@ -214,7 +204,7 @@ const Blogs = (props) => {
 
   return (
     <div className={classes.root}>
-      <Container maxWidth="md">
+      <Container maxWidth="lg">
         <Grid container spacing={3}>
           {blogComponent}
           {addBlogFab}

diff --git a/new_client/src/components/events/EventList.jsx b/new_client/src/components/events/EventList.jsx
@@ -15,6 +15,7 @@ import Banner from "./Banner";
 import { isFuture } from "date-fns";
 import { TitleWithDivider } from "./EventPage";
 import useAuthenticatedAxios from "../Utilities/useAuthenticatedAxios.js";
+import "./EventList.css";
 import { format } from "date-fns";
 
 function TabPanel(props) {
@@ -159,7 +160,7 @@ function EventList(props) {
         },
         {
           label: "Cancel",
-          onClick: () => {},
+          onClick: () => { },
         },
       ],
     });
@@ -177,9 +178,9 @@ function EventList(props) {
     try {
       const url = !isUserRegistered
         ? process.env.REACT_APP_API +
-          `/events/register?eid=${eventId}&uid=${props.userID}`
+        `/events/register?eid=${eventId}&uid=${props.userID}`
         : process.env.REACT_APP_API +
-          `/events/unregister?eid=${eventId}&uid=${props.userID}`;
+        `/events/unregister?eid=${eventId}&uid=${props.userID}`;
       const response = await authenticatedAxios.post(url);
       if (response.status === 200) {
         const isRegisteredTemp = {
@@ -278,7 +279,7 @@ function EventList(props) {
                       </Tabs>
                     </Grid>
                   </Grid>
-                  
+
                   <Grid item>
                     {years.map((year, index) => (
                       <TabPanel key={year} value={tabValue} index={index}>

diff --git a/new_client/src/components/glimpses/Glimpse.jsx b/new_client/src/components/glimpses/Glimpse.jsx
@@ -32,7 +32,7 @@ const Glimpse = () => {
       <Grid container spacing={4}>
         {isLoading ? <Spinner /> : null}
         {glimpses.map((glimpse) => (
-          <Grid item xs={6} md={6} lg={4} key={glimpse._id}>
+          <Grid item xs={12} md={6} lg={4} key={glimpse._id}>
             <IndividualGlimpse
               imgSrc={glimpse.preview}
               title={glimpse.eventName}