chore: remove comments

Aksh-Bansal-dev · Aksh-Bansal-dev · commit 68d80223d0ac · 2021-05-28T15:53:56.000+05:30
diff --git a/frontend/public/images/projects/collabdraw.png b/frontend/public/images/projects/collabdraw.png
diff --git a/frontend/public/images/projects/pathfinding.png b/frontend/public/images/projects/pathfinding.png
diff --git a/frontend/src/components/RegistrationForm/index.tsx b/frontend/src/components/RegistrationForm/index.tsx
@@ -27,7 +27,6 @@ const useStyles = makeStyles((theme: Theme) =>
 
 const RegistrationForm: React.FC = () => {
   const classes = useStyles();
-  // const [login, setLogin] = useState(true);
   const [page, setPage] = useState(0);
   const heading = ["Login", "Sign Up", "Reset Password"];
   const component = [
@@ -39,14 +38,12 @@ const RegistrationForm: React.FC = () => {
   return (
     <Paper className={classes.main}>
       <Typography className={classes.title} align="center">
-        {/* {login ? "Login" : "Sign Up"} */}
         {heading[page]}
       </Typography>
       <GoogleButton />
       <Typography className={classes.or} align="center">
         OR
       </Typography>
-      {/* {login ? <Login setLogin={setLogin} /> : <Signup setLogin={setLogin} />} */}
       {component[page]}
     </Paper>
   );
diff --git a/frontend/src/components/aboutUs/ContactUs.tsx b/frontend/src/components/aboutUs/ContactUs.tsx
@@ -10,7 +10,7 @@ const useStyles = makeStyles((theme: Theme) =>
       [theme.breakpoints.down("md")]: {
         paddingTop: 0,
       },
-      minHeight: "10vh",
+      minHeight: "9vh",
       background: "var(--svg-bg)",
     },
     flexbox: {
@@ -69,7 +69,7 @@ const ContactUs: React.FC = () => {
             Contribute to the website{" "}
             <Link
               underline="always"
-              href="https://google.com"
+              href="https://github.com/BitByte-TPC/TPC-website"
               target="_blank"
               className={classes.icon}
             >
diff --git a/frontend/src/components/aboutUs/style.module.css b/frontend/src/components/aboutUs/style.module.css
@@ -1,5 +1,5 @@
 .container {
-  height: 100vh;
+  height: 91vh;
   grid-area: about;
   background-image: url("../../images/about\ us\ –\ 1.png");
   background-size: cover;
diff --git a/frontend/src/pages/Projects/index.tsx b/frontend/src/pages/Projects/index.tsx
@@ -1,7 +1,6 @@
 import React from "react";
 import NavBar from "../../components/Navs/Navbar";
 import { createStyles, makeStyles } from "@material-ui/core/styles";
-// import { Container } from "@material-ui/core";
 import ProjectCardv2 from "src/components/Cards/ProjectCardv2";
 import { projectlist } from "./projectlist";
 import useWindowDimensions from "../../utils/useWindowDimensions";
diff --git a/frontend/src/pages/Projects/projectlist.ts b/frontend/src/pages/Projects/projectlist.ts
@@ -33,12 +33,12 @@ export const projectlist = [
     image: "/images/projects/comrade.png",
   },
   {
-    projectName: "Path Finding Algorithm Visualizer",
-    lang: "Python",
+    projectName: "Collab Draw",
+    lang: "Typescript",
     description:
-      "Visualization of some of popular path finding algorithms using python",
+      "It's a drawing app that syncs with other browsers using web sockets.",
     dev: "Aksh Bansal",
-    url: "https://github.com/Aksh-Bansal-dev/PathfindingAlgo-Visualization",
-    image: "/images/projects/pathfinding.png",
+    url: "https://github.com/Aksh-Bansal-dev/collab-draw",
+    image: "/images/projects/collabdraw.png",
   },
 ];
diff --git a/frontend/src/pages/homePage/style.module.css b/frontend/src/pages/homePage/style.module.css
@@ -1,6 +1,5 @@
 .home {
   min-height: 100vh;
-  /* grid-area: home; */
   position: relative;
   display: grid;
   grid-template-columns: 66fr 33fr;
diff --git a/server/src/index.ts b/server/src/index.ts
@@ -19,7 +19,6 @@ app.use(express.json());
 app.use(
   cors({
     origin: process.env.CLIENT_URL,
-    // origin: "*",
     credentials: true,
   })
 );
diff --git a/server/src/model/Poll.ts b/server/src/model/Poll.ts
@@ -0,0 +1,40 @@
+import mongoose from "mongoose";
+
+type optionType = {
+  name: string;
+  votes: number;
+};
+
+interface PollInterface extends mongoose.Document {
+  question: string;
+  club: string;
+  options: optionType[];
+}
+
+const pollSchema: mongoose.Schema = new mongoose.Schema(
+  {
+    question: {
+      type: String,
+      required: true,
+    },
+    club: {
+      type: String,
+      required: true,
+    },
+    options: [
+      {
+        name: {
+          type: String,
+        },
+        votes: {
+          type: Number,
+        },
+      },
+    ],
+  },
+  { timestamps: true }
+);
+
+const Poll: mongoose.Model<PollInterface> = mongoose.model("Poll", pollSchema);
+
+export { Poll };
diff --git a/server/src/model/User.ts b/server/src/model/User.ts
@@ -11,7 +11,6 @@ interface userInterface extends mongoose.Document {
   password?: string;
   tokenVersion: number;
   clubs?: clubObj[];
-  // authority: "member" | "admin";
 }
 
 const userSchema: mongoose.Schema = new mongoose.Schema({
@@ -41,14 +40,10 @@ const userSchema: mongoose.Schema = new mongoose.Schema({
       },
       authority: {
         type: String,
+        default: "member",
       },
     },
   ],
-  // authority: {
-  //   type: String,
-  //   required: true,
-  //   default: "member",
-  // },
 });
 
 const User: mongoose.Model<userInterface> = mongoose.model("User", userSchema);
diff --git a/server/src/routes/googleAuthRoutes.ts b/server/src/routes/googleAuthRoutes.ts
@@ -7,7 +7,6 @@ Router.get(
   passport.authenticate("google", {
     scope: ["profile", "email"],
     session: false,
-    // scope: ["https://www.googleapis.com/auth/plus.login"],
   })
 );
 
diff --git a/server/src/routes/userRoutes.ts b/server/src/routes/userRoutes.ts
@@ -4,6 +4,8 @@ const Router = express.Router();
 import { compare, hash } from "bcryptjs";
 import { getAccessToken, sendRefreshToken } from "../utils/tokenstuff";
 
+const validEmailRegex = /^[a-zA-Z0-9]+(@iiitdmj\.ac\.in)$/;
+
 // Login
 Router.post("/login", async (req: Request, res: Response) => {
   try {
@@ -16,6 +18,10 @@ Router.post("/login", async (req: Request, res: Response) => {
     }
 
     const correctPass = gotUser.password;
+    if (!correctPass) {
+      res.json({ done: false, err: "Please login using google" });
+      return;
+    }
     const isValid = await compare(password, correctPass!);
 
     if (!isValid) {
@@ -69,8 +75,15 @@ Router.post("/register", async (req: Request, res: Response) => {
   try {
     const { username, email, password } = req.body;
     if (!username || !email || !password) {
-      throw new Error("Invalid input");
+      res.json({ done: false, err: "Invalid Input" });
+      return;
     }
+
+    if (!validEmailRegex.test(email)) {
+      res.json({ done: false, err: "Invalid Email" });
+      return;
+    }
+
     const existingUser = await User.findOne({ email: email }).exec();
     if (existingUser) {
       throw new Error("Email already exist");
diff --git a/server/src/utils/tokenstuff.ts b/server/src/utils/tokenstuff.ts
@@ -24,7 +24,6 @@ export const sendRefreshToken = (res: Response, user?: User): void => {
     ),
     {
       httpOnly: true,
-      // path: "/",
       path: "/api/refresh_token",
     }
   );
