-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
20 changed files
with
40 additions
and
93 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,39 +1,23 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "github.com/VATUSA/primary-api/external" | ||
| "github.com/VATUSA/primary-api/pkg/config" | ||
| "github.com/VATUSA/primary-api/pkg/cookie" | ||
| "github.com/VATUSA/primary-api/pkg/database" | ||
| "github.com/VATUSA/primary-api/pkg/database/models" | ||
| gochi "github.com/VATUSA/primary-api/pkg/go-chi" | ||
| "github.com/VATUSA/primary-api/pkg/logger" | ||
| "github.com/VATUSA/primary-api/pkg/oauth" | ||
| "github.com/VATUSA/primary-api/pkg/storage" | ||
| "github.com/joho/godotenv" | ||
| "log" | ||
| "net/http" | ||
| ) | ||
|
|
||
| func main() { | ||
| _ = godotenv.Load(".env") | ||
| config.Cfg = config.New() | ||
|
|
||
| oauth.OAuthConfig = oauth.Initialize(config.Cfg) | ||
|
|
||
| bucket, err := storage.NewS3Client(config.Cfg.S3) | ||
| if err != nil { | ||
| panic(err) | ||
| } | ||
|
|
||
| storage.PublicBucket = bucket | ||
| database.DB = database.Connect(config.Cfg.Database) | ||
| cookie.CookieStore = cookie.New(config.Cfg) | ||
| models.AutoMigrate() | ||
| logger.Setup() | ||
|
|
||
| r := gochi.New(config.Cfg) | ||
| external.Router(r, config.Cfg) | ||
| log.Fatalf("Err starting http server: %s", http.ListenAndServeTLS(fmt.Sprintf(":%s", config.Cfg.API.Port), "./api.vatusa.local.crt", "./api.vatusa.local.key", r)) | ||
| } | ||
| //func main() { | ||
| // _ = godotenv.Load(".env") | ||
| // config.Cfg = config.New() | ||
| // | ||
| // oauth.OAuthConfig = oauth.Initialize(config.Cfg) | ||
| // | ||
| // bucket, err := storage.NewS3Client(config.Cfg.S3) | ||
| // if err != nil { | ||
| // panic(err) | ||
| // } | ||
| // | ||
| // storage.PublicBucket = bucket | ||
| // database.DB = database.Connect(config.Cfg.Database) | ||
| // cookie.CookieStore = cookie.New(config.Cfg) | ||
| // models.AutoMigrate() | ||
| // logger.Setup() | ||
| // | ||
| // r := gochi.New(config.Cfg) | ||
| // external.Router(r, config.Cfg) | ||
| // log.Fatalf("Err starting http server: %s", http.ListenAndServeTLS(fmt.Sprintf(":%s", config.Cfg.API.Port), "./api.vatusa.local.crt", "./api.vatusa.local.key", r)) | ||
| //} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,6 +34,5 @@ func CanEditFacility(next http.Handler) http.Handler { | |
| } | ||
|
|
||
| utils.Render(w, r, utils.ErrForbidden) | ||
| return | ||
| }) | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -26,6 +26,5 @@ func CanEditFAQ(next http.Handler) http.Handler { | |
| } | ||
|
|
||
| utils.Render(w, r, utils.ErrForbidden) | ||
| return | ||
| }) | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -35,6 +35,5 @@ func CanEditNews(next http.Handler) http.Handler { | |
| } | ||
|
|
||
| utils.Render(w, r, utils.ErrForbidden) | ||
| return | ||
| }) | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -35,6 +35,5 @@ func CanEditRoster(next http.Handler) http.Handler { | |
| } | ||
|
|
||
| utils.Render(w, r, utils.ErrForbidden) | ||
| return | ||
| }) | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.