Skip to content

Commit

Permalink
refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
@garrettladley
garrettladley committed Apr 22, 2024
1 parent 3c7337f commit 6479bac
Show file tree
Hide file tree
Showing 184 changed files with 393 additions and 374 deletions.
1 change: 1 addition & 0 deletions backend/.dockerignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
tests/
15 changes: 15 additions & 0 deletions backend/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# syntax=docker/dockerfile:1

FROM golang:1.22.2

WORKDIR /app

COPY go.mod go.sum ./

COPY *.go ./

RUN CGO_ENABLED=0 GOOS=linux go build -v -o ./sac

EXPOSE 8080

CMD ["/sac"]
0 backend/src/auth/hash.go → backend/auth/hash.go
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions backend/src/auth/jwt.go → backend/auth/jwt.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"fmt"
"time"

"github.com/GenerateNU/sac/backend/src/config"
"github.com/GenerateNU/sac/backend/src/constants"
"github.com/GenerateNU/sac/backend/src/errors"
"github.com/GenerateNU/sac/backend/config"
"github.com/GenerateNU/sac/backend/constants"
"github.com/GenerateNU/sac/backend/errors"
m "github.com/garrettladley/mattress"
"github.com/gofiber/fiber/v2"
"github.com/golang-jwt/jwt"
Expand Down
2 changes: 1 addition & 1 deletion backend/src/auth/jwt_mock.go → backend/auth/jwt_mock.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package auth

import (
"github.com/GenerateNU/sac/backend/src/errors"
"github.com/GenerateNU/sac/backend/errors"
"github.com/golang-jwt/jwt"
)

Expand Down
4 changes: 2 additions & 2 deletions backend/src/auth/password.go → backend/auth/password.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"regexp"
"strings"

"github.com/GenerateNU/sac/backend/src/constants"
"github.com/GenerateNU/sac/backend/src/errors"
"github.com/GenerateNU/sac/backend/constants"
"github.com/GenerateNU/sac/backend/errors"
)

func ValidatePassword(password string) *errors.Error {
Expand Down
2 changes: 1 addition & 1 deletion backend/src/auth/permissions.go → backend/auth/permissions.go
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package auth

import "github.com/GenerateNU/sac/backend/src/models"
import "github.com/GenerateNU/sac/backend/models"

type Permission string

Expand Down
0 backend/src/config/application.go → backend/config/application.go
View file
File renamed without changes.
0 backend/src/config/auth.go → backend/config/auth.go
View file
File renamed without changes.
0 backend/src/config/aws.go → backend/config/aws.go
View file
File renamed without changes.
0 backend/src/config/config.go → backend/config/config.go
View file
File renamed without changes.
0 backend/src/config/database.go → backend/config/database.go
View file
File renamed without changes.
0 backend/src/config/local.go → backend/config/local.go
View file
File renamed without changes.
0 backend/src/config/openai.go → backend/config/openai.go
View file
File renamed without changes.
0 backend/src/config/pinecone.go → backend/config/pinecone.go
View file
File renamed without changes.
0 backend/src/config/production.go → backend/config/production.go
View file
File renamed without changes.
0 backend/src/config/resend.go → backend/config/resend.go
View file
File renamed without changes.
0 backend/src/config/super_user.go → backend/config/super_user.go
View file
File renamed without changes.
0 backend/src/constants/auth.go → backend/constants/auth.go
View file
File renamed without changes.
0 backend/src/constants/email.go → backend/constants/email.go
View file
File renamed without changes.
0 backend/src/constants/file.go → backend/constants/file.go
View file
File renamed without changes.
0 backend/src/constants/pagination.go → backend/constants/pagination.go
View file
File renamed without changes.
0 backend/src/constants/search.go → backend/constants/search.go
View file
File renamed without changes.
10 changes: 5 additions & 5 deletions backend/src/controllers/auth.go → backend/controllers/auth.go
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package controllers

import (
"github.com/GenerateNU/sac/backend/src/auth"
"github.com/GenerateNU/sac/backend/src/errors"
"github.com/GenerateNU/sac/backend/src/models"
"github.com/GenerateNU/sac/backend/src/services"
"github.com/GenerateNU/sac/backend/src/utilities"
"github.com/GenerateNU/sac/backend/auth"
"github.com/GenerateNU/sac/backend/errors"
"github.com/GenerateNU/sac/backend/models"
"github.com/GenerateNU/sac/backend/services"
"github.com/GenerateNU/sac/backend/utilities"
"github.com/gofiber/fiber/v2"
)

Expand Down
8 changes: 4 additions & 4 deletions backend/src/controllers/category.go → backend/controllers/category.go
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package controllers

import (
"github.com/GenerateNU/sac/backend/src/constants"
"github.com/GenerateNU/sac/backend/src/errors"
"github.com/GenerateNU/sac/backend/src/models"
"github.com/GenerateNU/sac/backend/src/services"
"github.com/GenerateNU/sac/backend/constants"
"github.com/GenerateNU/sac/backend/errors"
"github.com/GenerateNU/sac/backend/models"
"github.com/GenerateNU/sac/backend/services"
"github.com/gofiber/fiber/v2"
)

Expand Down
4 changes: 2 additions & 2 deletions backend/src/controllers/category_tag.go → backend/controllers/category_tag.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package controllers

import (
"github.com/GenerateNU/sac/backend/src/constants"
"github.com/GenerateNU/sac/backend/src/services"
"github.com/GenerateNU/sac/backend/constants"
"github.com/GenerateNU/sac/backend/services"

"github.com/gofiber/fiber/v2"
)
Expand Down
8 changes: 4 additions & 4 deletions backend/src/controllers/club.go → backend/controllers/club.go
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package controllers

import (
"github.com/GenerateNU/sac/backend/src/constants"
"github.com/GenerateNU/sac/backend/src/errors"
"github.com/GenerateNU/sac/backend/src/models"
"github.com/GenerateNU/sac/backend/src/services"
"github.com/GenerateNU/sac/backend/constants"
"github.com/GenerateNU/sac/backend/errors"
"github.com/GenerateNU/sac/backend/models"
"github.com/GenerateNU/sac/backend/services"
"github.com/gofiber/fiber/v2"
)

Expand Down
6 changes: 3 additions & 3 deletions backend/src/controllers/club_contact.go → backend/controllers/club_contact.go
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package controllers

import (
"github.com/GenerateNU/sac/backend/src/errors"
"github.com/GenerateNU/sac/backend/src/models"
"github.com/GenerateNU/sac/backend/src/services"
"github.com/GenerateNU/sac/backend/errors"
"github.com/GenerateNU/sac/backend/models"
"github.com/GenerateNU/sac/backend/services"
"github.com/gofiber/fiber/v2"
)

Expand Down
4 changes: 2 additions & 2 deletions backend/src/controllers/club_event.go → backend/controllers/club_event.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package controllers

import (
"github.com/GenerateNU/sac/backend/src/constants"
"github.com/GenerateNU/sac/backend/src/services"
"github.com/GenerateNU/sac/backend/constants"
"github.com/GenerateNU/sac/backend/services"
"github.com/gofiber/fiber/v2"
)

Expand Down
4 changes: 2 additions & 2 deletions backend/src/controllers/club_follower.go → backend/controllers/club_follower.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package controllers

import (
"github.com/GenerateNU/sac/backend/src/constants"
"github.com/GenerateNU/sac/backend/src/services"
"github.com/GenerateNU/sac/backend/constants"
"github.com/GenerateNU/sac/backend/services"
"github.com/gofiber/fiber/v2"
)

Expand Down
4 changes: 2 additions & 2 deletions backend/src/controllers/club_member.go → backend/controllers/club_member.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package controllers

import (
"github.com/GenerateNU/sac/backend/src/constants"
"github.com/GenerateNU/sac/backend/src/services"
"github.com/GenerateNU/sac/backend/constants"
"github.com/GenerateNU/sac/backend/services"
"github.com/gofiber/fiber/v2"
)

Expand Down
6 changes: 3 additions & 3 deletions backend/src/controllers/club_poc.go → backend/controllers/club_poc.go
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package controllers

import (
"github.com/GenerateNU/sac/backend/src/errors"
"github.com/GenerateNU/sac/backend/src/models"
"github.com/GenerateNU/sac/backend/src/services"
"github.com/GenerateNU/sac/backend/errors"
"github.com/GenerateNU/sac/backend/models"
"github.com/GenerateNU/sac/backend/services"
"github.com/gofiber/fiber/v2"
)

Expand Down
6 changes: 3 additions & 3 deletions backend/src/controllers/club_tag.go → backend/controllers/club_tag.go
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package controllers

import (
"github.com/GenerateNU/sac/backend/src/errors"
"github.com/GenerateNU/sac/backend/src/models"
"github.com/GenerateNU/sac/backend/src/services"
"github.com/GenerateNU/sac/backend/errors"
"github.com/GenerateNU/sac/backend/models"
"github.com/GenerateNU/sac/backend/services"
"github.com/gofiber/fiber/v2"
)

Expand Down
4 changes: 2 additions & 2 deletions backend/src/controllers/contact.go → backend/controllers/contact.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package controllers

import (
"github.com/GenerateNU/sac/backend/src/constants"
"github.com/GenerateNU/sac/backend/src/services"
"github.com/GenerateNU/sac/backend/constants"
"github.com/GenerateNU/sac/backend/services"
"github.com/gofiber/fiber/v2"
)

Expand Down
8 changes: 4 additions & 4 deletions backend/src/controllers/event.go → backend/controllers/event.go
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package controllers

import (
"github.com/GenerateNU/sac/backend/src/constants"
"github.com/GenerateNU/sac/backend/src/errors"
"github.com/GenerateNU/sac/backend/src/models"
"github.com/GenerateNU/sac/backend/src/services"
"github.com/GenerateNU/sac/backend/constants"
"github.com/GenerateNU/sac/backend/errors"
"github.com/GenerateNU/sac/backend/models"
"github.com/GenerateNU/sac/backend/services"
"github.com/gofiber/fiber/v2"
)

Expand Down
8 changes: 4 additions & 4 deletions backend/src/controllers/file.go → backend/controllers/file.go
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package controllers

import (
"github.com/GenerateNU/sac/backend/src/constants"
"github.com/GenerateNU/sac/backend/src/errors"
"github.com/GenerateNU/sac/backend/src/models"
"github.com/GenerateNU/sac/backend/src/services"
"github.com/GenerateNU/sac/backend/constants"
"github.com/GenerateNU/sac/backend/errors"
"github.com/GenerateNU/sac/backend/models"
"github.com/GenerateNU/sac/backend/services"
"github.com/gofiber/fiber/v2"
)

Expand Down
4 changes: 2 additions & 2 deletions backend/src/controllers/poc.go → backend/controllers/poc.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package controllers

import (
"github.com/GenerateNU/sac/backend/src/constants"
"github.com/GenerateNU/sac/backend/src/services"
"github.com/GenerateNU/sac/backend/constants"
"github.com/GenerateNU/sac/backend/services"
"github.com/gofiber/fiber/v2"
)

Expand Down
6 changes: 3 additions & 3 deletions backend/src/controllers/tag.go → backend/controllers/tag.go
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package controllers

import (
"github.com/GenerateNU/sac/backend/src/errors"
"github.com/GenerateNU/sac/backend/src/models"
"github.com/GenerateNU/sac/backend/src/services"
"github.com/GenerateNU/sac/backend/errors"
"github.com/GenerateNU/sac/backend/models"
"github.com/GenerateNU/sac/backend/services"

"github.com/gofiber/fiber/v2"
)
Expand Down
12 changes: 6 additions & 6 deletions backend/src/controllers/user.go → backend/controllers/user.go
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package controllers

import (
"github.com/GenerateNU/sac/backend/src/auth"
"github.com/GenerateNU/sac/backend/src/constants"
"github.com/GenerateNU/sac/backend/src/errors"
"github.com/GenerateNU/sac/backend/src/models"
"github.com/GenerateNU/sac/backend/src/services"
"github.com/GenerateNU/sac/backend/src/utilities"
"github.com/GenerateNU/sac/backend/auth"
"github.com/GenerateNU/sac/backend/constants"
"github.com/GenerateNU/sac/backend/errors"
"github.com/GenerateNU/sac/backend/models"
"github.com/GenerateNU/sac/backend/services"
"github.com/GenerateNU/sac/backend/utilities"

"github.com/gofiber/fiber/v2"
)
Expand Down
4 changes: 2 additions & 2 deletions backend/src/controllers/user_follower.go → backend/controllers/user_follower.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package controllers

import (
"github.com/GenerateNU/sac/backend/src/services"
"github.com/GenerateNU/sac/backend/src/utilities"
"github.com/GenerateNU/sac/backend/services"
"github.com/GenerateNU/sac/backend/utilities"
"github.com/gofiber/fiber/v2"
)

Expand Down
4 changes: 2 additions & 2 deletions backend/src/controllers/user_member.go → backend/controllers/user_member.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package controllers

import (
"github.com/GenerateNU/sac/backend/src/services"
"github.com/GenerateNU/sac/backend/src/utilities"
"github.com/GenerateNU/sac/backend/services"
"github.com/GenerateNU/sac/backend/utilities"
"github.com/gofiber/fiber/v2"
)

Expand Down
6 changes: 3 additions & 3 deletions backend/src/controllers/user_tag.go → backend/controllers/user_tag.go
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package controllers

import (
"github.com/GenerateNU/sac/backend/src/errors"
"github.com/GenerateNU/sac/backend/src/models"
"github.com/GenerateNU/sac/backend/src/services"
"github.com/GenerateNU/sac/backend/errors"
"github.com/GenerateNU/sac/backend/models"
"github.com/GenerateNU/sac/backend/services"
"github.com/gofiber/fiber/v2"
)

Expand Down
4 changes: 2 additions & 2 deletions backend/src/database/db.go → backend/database/db.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package database

import (
"github.com/GenerateNU/sac/backend/src/config"
"github.com/GenerateNU/sac/backend/src/models"
"github.com/GenerateNU/sac/backend/config"
"github.com/GenerateNU/sac/backend/models"
"gorm.io/driver/postgres"
"gorm.io/gorm"
"gorm.io/gorm/logger"
Expand Down
8 changes: 4 additions & 4 deletions backend/src/database/super.go → backend/database/super.go
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package database

import (
"github.com/GenerateNU/sac/backend/src/auth"
"github.com/GenerateNU/sac/backend/src/config"
"github.com/GenerateNU/sac/backend/src/errors"
"github.com/GenerateNU/sac/backend/src/models"
"github.com/GenerateNU/sac/backend/auth"
"github.com/GenerateNU/sac/backend/config"
"github.com/GenerateNU/sac/backend/errors"
"github.com/GenerateNU/sac/backend/models"
"github.com/google/uuid"
)

Expand Down
0 backend/src/docs/docs.go → backend/docs/docs.go
View file
File renamed without changes.
0 backend/src/docs/swagger.json → backend/docs/swagger.json
View file
File renamed without changes.
0 backend/src/docs/swagger.yaml → backend/docs/swagger.yaml
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions backend/src/email/email.go → backend/email/email.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"fmt"
"os"

"github.com/GenerateNU/sac/backend/src/config"
"github.com/GenerateNU/sac/backend/src/constants"
"github.com/GenerateNU/sac/backend/src/errors"
"github.com/GenerateNU/sac/backend/config"
"github.com/GenerateNU/sac/backend/constants"
"github.com/GenerateNU/sac/backend/errors"
"github.com/afex/hystrix-go/hystrix"
"github.com/resend/resend-go/v2"
)
Expand Down
2 changes: 1 addition & 1 deletion backend/src/email/resend_mock.go → backend/email/resend_mock.go
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package email

import "github.com/GenerateNU/sac/backend/src/errors"
import "github.com/GenerateNU/sac/backend/errors"

type ResendMockClient struct{}

Expand Down
0 backend/src/errors/auth.go → backend/errors/auth.go
View file
File renamed without changes.
0 backend/src/errors/category.go → backend/errors/category.go
View file
File renamed without changes.
0 backend/src/errors/club.go → backend/errors/club.go
View file
File renamed without changes.
0 backend/src/errors/common.go → backend/errors/common.go
View file
File renamed without changes.
0 backend/src/errors/contact.go → backend/errors/contact.go
View file
File renamed without changes.
0 backend/src/errors/error.go → backend/errors/error.go
View file
File renamed without changes.
0 backend/src/errors/event.go → backend/errors/event.go
View file
File renamed without changes.
0 backend/src/errors/file.go → backend/errors/file.go
View file
File renamed without changes.
0 backend/src/errors/point_of_contact.go → backend/errors/point_of_contact.go
View file
File renamed without changes.
0 backend/src/errors/search.go → backend/errors/search.go
View file
File renamed without changes.
0 backend/src/errors/tag.go → backend/errors/tag.go
View file
File renamed without changes.
0 backend/src/errors/user.go → backend/errors/user.go
View file
File renamed without changes.
0 backend/src/errors/verification.go → backend/errors/verification.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions backend/src/file/aws_mock.go → backend/file/aws_mock.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package file
import (
"mime/multipart"

"github.com/GenerateNU/sac/backend/src/errors"
"github.com/GenerateNU/sac/backend/src/models"
"github.com/GenerateNU/sac/backend/errors"
"github.com/GenerateNU/sac/backend/models"
)

type AWSMockClient struct{}
Expand Down
8 changes: 4 additions & 4 deletions backend/src/file/file.go → backend/file/file.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"mime/multipart"
"strings"

"github.com/GenerateNU/sac/backend/src/config"
"github.com/GenerateNU/sac/backend/src/constants"
"github.com/GenerateNU/sac/backend/src/errors"
"github.com/GenerateNU/sac/backend/src/models"
"github.com/GenerateNU/sac/backend/config"
"github.com/GenerateNU/sac/backend/constants"
"github.com/GenerateNU/sac/backend/errors"
"github.com/GenerateNU/sac/backend/models"
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/credentials"
"github.com/aws/aws-sdk-go/aws/session"
Expand Down
Loading

0 comments on commit 6479bac

Please sign in to comment.