Merge branch 'master' of https://github.com/ABHINAVGARG05/devsoc-be-25

Author: ABHINAVGARG05

pkg/models/submission.go

@@ -4,16 +4,16 @@ type CreateSubmissionRequest struct {
 	Title       string `json:"title" validate:"required"`
 	Description string `json:"description" validate:"required"`
 	Track       string `json:"track" validate:"required"`
-	GithubLink  string `json:"github_link" validate:"required,url"`
-	FigmaLink   string `json:"figma_link" validate:"required,url"`
-	OtherLink   string `json:"other_link" validate:"omitempty,url"`
+	GithubLink  string `json:"github_link"`
+	FigmaLink   string `json:"figma_link`
+	OtherLink   string `json:"other_link"`
 }
 
 type UpdateSubmissionRequest struct {
 	Title       string `json:"title" validate:"required"`
 	Description string `json:"description" validate:"required"`
 	Track       string `json:"track" validate:"required"`
-	GithubLink  string `json:"github_link" validate:"required,url"`
-	FigmaLink   string `json:"figma_link" validate:"required,url"`
-	OtherLink   string `json:"other_link" validate:"omitempty,url"`
+	GithubLink  string `json:"github_link"`
+	FigmaLink   string `json:"figma_link"`
+	OtherLink   string `json:"other_link"`
 }

pkg/router/admin_routes.go

@@ -2,14 +2,14 @@ package router
 
 import (
 	"github.com/CodeChefVIT/devsoc-be-24/pkg/controller"
-	//"github.com/CodeChefVIT/devsoc-be-24/pkg/middleware"
+	"github.com/CodeChefVIT/devsoc-be-24/pkg/middleware"
 	"github.com/labstack/echo/v4"
 )
 
 func AdminRoutes(incomingRoutes *echo.Group) {
 	admin := incomingRoutes.Group("/admin")
-	// admin.Use(middleware.JWTMiddleware())
-	// admin.Use(middleware.CheckAdmin)
+	admin.Use(middleware.JWTMiddleware())
+	admin.Use(middleware.CheckAdmin)
 
 	admin.GET("/users", controller.GetAllUsers)
 	admin.GET("/user/:email", controller.GetUsersByEmail)