Merge branch 'main' into calendar-page

GenerateNU · Jun 8, 2024 · 70f3c96 · 70f3c96
2 parents b33a418 + 96a86ac
commit 70f3c96
Show file tree

Hide file tree

Showing 104 changed files with 4,215 additions and 2,875 deletions.
diff --git a/backend/auth/locals.go b/backend/auth/locals.go
diff --git a/backend/constants/db.go b/backend/constants/db.go
@@ -1,6 +1,9 @@
 package constants
 
+import "time"
+
 const (
-	MAX_IDLE_CONNECTIONS int = 10
-	MAX_OPEN_CONNECTIONS int = 100
+	MAX_IDLE_CONNECTIONS int           = 10
+	MAX_OPEN_CONNECTIONS int           = 100
+	DB_TIMEOUT           time.Duration = 200 * time.Millisecond
 )
diff --git a/backend/database/super.go b/backend/database/super.go
@@ -32,14 +32,10 @@ func SuperUser(superUserSettings config.SuperUserSettings) (*models.User, error)
 
 func SuperClub() models.Club {
 	return models.Club{
-		Name:             "SAC",
-		Preview:          "SAC",
-		Description:      "SAC",
-		NumMembers:       0,
-		IsRecruiting:     true,
-		RecruitmentCycle: models.Always,
-		RecruitmentType:  models.Application,
-		ApplicationLink:  "https://generatenu.com/apply",
-		Logo:             "https://aws.amazon.com/s3",
+		Name:        "SAC",
+		Preview:     "SAC",
+		Description: "SAC",
+		NumMembers:  0,
+		Logo:        "https://aws.amazon.com/s3",
 	}
 }