From c821d226546b7fdd2a0b7d508fb5e84a25a6b89d Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Mon, 15 Aug 2022 22:03:10 -0400 Subject: [PATCH 1/8] initial push with loading pages So far this is all i have. With a manually configured org and event I can load signup pages --- event.go | 9 ++ pkg/config/config.go | 47 ++++++++ pkg/event/data.go | 150 +++++++++++++++++++++++++ pkg/event/manage.go | 13 +++ pkg/event/schedule.go | 11 ++ pkg/event/signups.go | 71 ++++++++++++ pkg/event/structs.go | 60 ++++++++++ pkg/event/webserver.go | 25 +++++ pkg/parse/parse.go | 1 + templates/html/event.html | 10 ++ templates/html/events.html | 10 ++ templates/html/newEvent.html | 14 +++ templates/html/schedule.html | 10 ++ templates/html/signup.html | 82 ++++++++++++++ templates/styles/signup.css | 208 +++++++++++++++++++++++++++++++++++ 15 files changed, 721 insertions(+) create mode 100644 event.go create mode 100644 pkg/config/config.go create mode 100644 pkg/event/data.go create mode 100644 pkg/event/manage.go create mode 100644 pkg/event/schedule.go create mode 100644 pkg/event/signups.go create mode 100644 pkg/event/structs.go create mode 100644 pkg/event/webserver.go create mode 100644 pkg/parse/parse.go create mode 100644 templates/html/event.html create mode 100644 templates/html/events.html create mode 100644 templates/html/newEvent.html create mode 100644 templates/html/schedule.html create mode 100644 templates/html/signup.html create mode 100644 templates/styles/signup.css diff --git a/event.go b/event.go new file mode 100644 index 0000000..acd68e4 --- /dev/null +++ b/event.go @@ -0,0 +1,9 @@ +package main + +import ( + "github.com/parkervcp/testing/pkg/event" +) + +func main() { + event.Start() +} diff --git a/pkg/config/config.go b/pkg/config/config.go new file mode 100644 index 0000000..7e1a992 --- /dev/null +++ b/pkg/config/config.go @@ -0,0 +1,47 @@ +package config + +import ( + "bufio" + "fmt" + "os" + "strings" +) + +func CreateConfig() (err error) { + if boolPrompt("Would you like to configure some services?") { + + } else { + fmt.Println("No services will be configured") + return + } + + return +} + +// stringPrompt asks for a string value using the label +func stringPrompt(label string) string { + var s string + r := bufio.NewReader(os.Stdin) + for { + fmt.Fprint(os.Stderr, label) + s, _ = r.ReadString('\n') + if s != "" { + break + } + } + return strings.TrimSpace(s) +} + +// boolPrompt asks for a string value using the label +func boolPrompt(label string) bool { + r := bufio.NewReader(os.Stdin) + // print question and options + fmt.Fprint(os.Stderr, label+" (y/N):") + input, _ := r.ReadString('\n') + switch strings.TrimSpace(input) { + case "y", "Y", "Yes", "yes": + return true + default: + return false + } +} diff --git a/pkg/event/data.go b/pkg/event/data.go new file mode 100644 index 0000000..b4914aa --- /dev/null +++ b/pkg/event/data.go @@ -0,0 +1,150 @@ +package event + +import ( + "fmt" + "time" + + log "github.com/sirupsen/logrus" + "github.com/spf13/viper" +) + +var ( + organizations []Organization +) + +func loadEvents() { + log.SetLevel(log.DebugLevel) + orgs := viper.New() + orgs.SetConfigName("organizations") + orgs.SetConfigType("yaml") + orgs.AddConfigPath("./events/") + err := orgs.ReadInConfig() // Find and read the config file + if err != nil { // Handle errors reading the config file + log.Error(err) + } + + log.Debugf("found orgs %v", orgs.GetStringSlice("organizations")) + + // load config for orgs + for _, orgName := range orgs.GetStringSlice("organizations") { + var orgEvents []Event + var orgSignups []Signup + log.Debugf("loading org %s", orgName) + org := viper.New() + org.SetConfigName("org") + org.SetConfigType("yaml") + org.AddConfigPath(fmt.Sprintf("./events/%s/", orgName)) + err := org.ReadInConfig() // Find and read the config file + if err != nil { // Handle errors reading the config file + log.Error(err) + } + + log.Debugf("found events %v", org.GetStringSlice("events")) + + // load events for orgs + for _, eventID := range org.GetStringSlice("events") { + var eventShifts []Shift + var eventUsers []User + + log.Debugf("loading org event %s", eventID) + event := viper.New() + event.SetConfigName("event") + event.SetConfigType("yaml") + event.AddConfigPath(fmt.Sprintf("./events/%s/%s/", orgName, eventID)) + err := event.ReadInConfig() // Find and read the config file + if err != nil { // Handle errors reading the config file + log.Panic("fatal error config file:", err) + } + + eventStartTime, err := time.Parse("Mon Jan _2 15:04 PM 2006", event.GetString("start")) + if err != nil { // Handle errors reading the config file + log.Error(err) + } + + log.Debugf("event users loading") + users := viper.New() + users.SetConfigName("users") + users.SetConfigType("yaml") + users.AddConfigPath(fmt.Sprintf("./events/%s/%s/", orgName, eventID)) + err = users.ReadInConfig() // Find and read the config file + if err != nil { // Handle errors reading the config file + log.Panic("fatal error config file:", err) + } + + err = users.UnmarshalKey("users", &eventUsers) + if err != nil { // Handle errors reading the config file + log.Panic("fatal error marshalling ", err) + } + log.Debugf("event users loaded") + + log.Debugf("event shifts loading") + shifts := viper.New() + shifts.SetConfigName("shifts") + shifts.SetConfigType("yaml") + shifts.AddConfigPath(fmt.Sprintf("./events/%s/%s/", orgName, eventID)) + err = shifts.ReadInConfig() // Find and read the config file + if err != nil { // Handle errors reading the config file + log.Panic("fatal error config file:", err) + } + + var newShifts []struct { + Type string `mapstructure:"type,omitempty"` + ShiftID string `mapstructure:"shift_id,omitempty"` + UserID string `mapstructure:"user_id,omitempty"` + Title string `mapstructure:"title,omitempty"` + HasGame bool `mapstructure:"hasGame,omitempty"` + Game string `mapstructure:"game,omitempty"` + Start string `mapstructure:"start,omitempty"` + Length int `mapstructure:"length,omitempty"` + MaxPlayers int `mapstructure:"max_players,omitempty"` + Players []Player `mapstructure:"players,omitempty"` + } + + err = shifts.UnmarshalKey("shifts", &newShifts) + if err != nil { // Handle errors reading the config file + log.Panic("fatal error marshalling ", err) + } + log.Debugf("event shifts loaded") + + for _, shift := range newShifts { + log.Debugf("%+v", shift) + + shiftStartTime, err := time.Parse("Mon Jan _2 15:04 PM 2006", shift.Start) + if err != nil { // Handle errors reading the config file + log.Error(err) + } + eventShifts = append(eventShifts, Shift{ + Type: shift.Type, + ShiftID: shift.ShiftID, + UserID: shift.UserID, + Title: shift.Title, + Game: shift.Game, + Start: shiftStartTime, + Length: shift.Length, + MaxPlayers: shift.MaxPlayers, + Players: shift.Players, + }) + } + + orgEvents = append(orgEvents, Event{ + Name: event.GetString("name"), + ID: eventID, + Start: eventStartTime, + Length: event.GetInt("length"), + Users: eventUsers, + Shifts: eventShifts, + }) + } + + err = org.UnmarshalKey("signups", &orgSignups) + if err != nil { // Handle errors reading the config file + log.Panic("fatal error marshalling ", err) + } + + organizations = append(organizations, Organization{ + Name: orgName, + Events: orgEvents, + Signups: orgSignups, + }) + } +} diff --git a/pkg/event/manage.go b/pkg/event/manage.go new file mode 100644 index 0000000..33fa514 --- /dev/null +++ b/pkg/event/manage.go @@ -0,0 +1,13 @@ +package event + +import ( + "github.com/gin-gonic/gin" +) + +func manageEvents(c *gin.Context) { + c.Param("org") +} + +func manageEvent(c *gin.Context) { + +} diff --git a/pkg/event/schedule.go b/pkg/event/schedule.go new file mode 100644 index 0000000..dd36f89 --- /dev/null +++ b/pkg/event/schedule.go @@ -0,0 +1,11 @@ +package event + +import "github.com/gin-gonic/gin" + +func getSchedules(c *gin.Context) { + +} + +func getSchedule(c *gin.Context) { + +} diff --git a/pkg/event/signups.go b/pkg/event/signups.go new file mode 100644 index 0000000..ec82942 --- /dev/null +++ b/pkg/event/signups.go @@ -0,0 +1,71 @@ +package event + +import ( + "net/http" + + "github.com/gin-gonic/gin" +) + +func getSignup(c *gin.Context) { + var thisOrg Organization + var thisEvent Event + var thisUser User + var shifts []Shift + var questions []Question + + // get org info + for _, org := range organizations { + if org.Name == c.Param("org") { + thisOrg = org + break + } + } + + // load specific event + for _, event := range thisOrg.Events { + if event.ID == c.Param("eventid") { + thisEvent = event + break + } + } + + for _, user := range thisEvent.Users { + if user.UserID == c.Param("userid") { + thisUser = user + break + } + } + + if thisOrg.Name == "" || thisEvent.Name == "" || thisUser.UserID == "" { + return + } + + // load shifts for this event + for _, shift := range thisEvent.Shifts { + if shift.Type == c.Param("position") { + shifts = append(shifts, shift) + // if signup shares type then set has game + for _, signup := range thisOrg.Signups { + if signup.Type == shift.Type { + shift.HasGame = signup.HasGame + questions = signup.Questions + } + } + } + } + + c.HTML(http.StatusOK, "signup.html", gin.H{ + "eventid": thisEvent.ID, + "event": thisEvent.Name, + "position": c.Param("position"), + "userid": c.Param("userid"), + "user": c.Param("user"), + "questions": questions, + "shifts": shifts, + }) + +} + +func postSignup(c *gin.Context) { + c.Query("") +} diff --git a/pkg/event/structs.go b/pkg/event/structs.go new file mode 100644 index 0000000..983449c --- /dev/null +++ b/pkg/event/structs.go @@ -0,0 +1,60 @@ +package event + +import ( + "time" +) + +type Organization struct { + Name string `mapstructure:"name,omitempty"` + Events []Event `mapstructure:"events,omitempty"` + Signups []Signup `mapstructure:"signups,omitempty"` +} + +type Event struct { + Name string `mapstructure:"name,omitempty"` + ID string `mapstructure:"id,omitempty"` + Start time.Time `mapstructure:"start,omitempty"` + Length int `mapstructure:"length,omitempty"` + Users []User `mapstructure:"users,omitempty"` + Shifts []Shift `mapstructure:"shifts,omitempty"` +} + +type User struct { + UserID string `mapstructure:"user_id,omitempty"` + DiscordID string `mapstructure:"discord_id,omitempty"` + SalesforceOrgID string `mapstructure:"salesforce_id,omitempty"` +} + +type Shift struct { + Type string `mapstructure:"type,omitempty"` + ShiftID string `mapstructure:"shift_id,omitempty"` + UserID string `mapstructure:"user_id,omitempty"` + Title string `mapstructure:"title,omitempty"` + HasGame bool `mapstructure:"hasGame,omitempty"` + Game string `mapstructure:"game,omitempty"` + Start time.Time `mapstructure:"start,omitempty"` + Length int `mapstructure:"length,omitempty"` + MaxPlayers int `mapstructure:"max_players,omitempty"` + Players []Player `mapstructure:"players,omitempty"` +} + +type Player struct { + UserID string `mapstructure:"user_id,omitempty"` +} + +type Signup struct { + Type string `mapstructure:"type,omitempty"` + UserID string `mapstructure:"user_id,omitempty"` + Questions []Question `mapstructure:"questions,omitempty"` + HasGame bool `mapstructure:"has_game,omitempty"` + Game string `mapstructure:"game,omitempty"` + PlayersNeeded bool `mapstructure:"players_needed,omitempty"` + PlayerCount int `mapstructure:"player_count,omitempty"` +} + +type Question struct { + Label string `mapstructure:"label,omitempty"` + Placeholder string `mapstructure:"placeholder,omitempty"` + Type string `mapstructure:"type,omitempty"` + Required bool `mapstructure:"required,omitempty"` +} diff --git a/pkg/event/webserver.go b/pkg/event/webserver.go new file mode 100644 index 0000000..41f39a6 --- /dev/null +++ b/pkg/event/webserver.go @@ -0,0 +1,25 @@ +package event + +import "github.com/gin-gonic/gin" + +func Start() { + loadEvents() + + s := gin.New() + s.LoadHTMLGlob("templates/html/*.html") + s.Static("/css", "templates/styles") + + //event management + s.GET("/:org/event/", getSchedules) + s.GET("/:org/event/:eventid", getSchedule) + + // signup management + s.GET("/:org/event/:eventid/signup/:position/:userid", getSignup) + s.POST("/:org/event/:eventid/signup/:position/:userid", postSignup) + + //event management + s.GET("/:org/event/manage/", manageEvents) + s.GET("/:org/event/manage/:event", manageEvent) + + s.Run() +} diff --git a/pkg/parse/parse.go b/pkg/parse/parse.go new file mode 100644 index 0000000..fe2554d --- /dev/null +++ b/pkg/parse/parse.go @@ -0,0 +1 @@ +package parse diff --git a/templates/html/event.html b/templates/html/event.html new file mode 100644 index 0000000..ab6e8ff --- /dev/null +++ b/templates/html/event.html @@ -0,0 +1,10 @@ + + + + + Event + + + + + \ No newline at end of file diff --git a/templates/html/events.html b/templates/html/events.html new file mode 100644 index 0000000..630ad4a --- /dev/null +++ b/templates/html/events.html @@ -0,0 +1,10 @@ + + + + + Scheduled Events + + + + + \ No newline at end of file diff --git a/templates/html/newEvent.html b/templates/html/newEvent.html new file mode 100644 index 0000000..3441828 --- /dev/null +++ b/templates/html/newEvent.html @@ -0,0 +1,14 @@ + + + + + + + + Create A New Event + + + + + + \ No newline at end of file diff --git a/templates/html/schedule.html b/templates/html/schedule.html new file mode 100644 index 0000000..566549b --- /dev/null +++ b/templates/html/schedule.html @@ -0,0 +1,10 @@ + + + + + Title + + + + + \ No newline at end of file diff --git a/templates/html/signup.html b/templates/html/signup.html new file mode 100644 index 0000000..7ef6002 --- /dev/null +++ b/templates/html/signup.html @@ -0,0 +1,82 @@ + + + + + +
+

+ {{.event}}
+ {{.position}} signup +

+ +
+

+ User Information +

+ +
+ {{range .questions}} +
+
+ + +
+
+ {{end}} + +

+ Select Shifts +

+ +

+ All shifts are in Eastern +

+ + {{range .shifts}} +
+ +
+ + + +
+ {{end}} +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/templates/styles/signup.css b/templates/styles/signup.css new file mode 100644 index 0000000..f96d33a --- /dev/null +++ b/templates/styles/signup.css @@ -0,0 +1,208 @@ +/* + most of this stylesheet was made from copying from here - https://freefrontend.com/css-forms/ +*/ + +* { + padding: 0; + margin: 0; + color: #ffffff; + box-sizing: border-box; + word-wrap: break-word; + font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Ubuntu,sans-serif; +} + +html { + height: 100%; +} + +body { + margin:0; + padding:0; + font-family: sans-serif; + background: linear-gradient(#141e30, #243b55); +} + +h1 { + letter-spacing: -1px; +} + +a { + color: #5469d4; + text-decoration: unset; +} + +.signup-box { + position: absolute; + top: 50%; + left: 50%; + padding: 40px; + transform: translate(-50%, -50%); + background: rgba(0,0,0,.5); + box-sizing: border-box; + box-shadow: 0 15px 25px rgba(0,0,0,.6); + border-radius: 10px; +} + +.signup-box h1 { + margin: 0 0 30px; + padding: 0; + color: #fff; + text-align: center; +} + +.signup-box h2 { + margin: 0 0 30px; + padding: 0; + color: #fff; + text-align: center; +} + +.signup-box h3 { + margin: 0 0 30px; + padding: 0; + color: #fff; + text-align: center; +} + +.signup-box .input-box { + position: relative; +} + +.signup-box .input-box input { + width: 100%; + padding: 10px 0; + font-size: 16px; + color: #fff; + margin-bottom: 30px; + border: none; + outline: none; + background: transparent; +} + +.signup-box .input-box label { + position: absolute; + top:0; + left: 0; + padding: 10px 0; + font-size: 16px; + color: #fff; + pointer-events: none; + transition: .5s; +} + +.signup-box .input-box input:focus ~ label, +.signup-box .input-box input:valid ~ label { + top: -20px; + left: 0; + color: #4e738b; + font-size: 12px; +} + +input::placeholder { + color: transparent; +} + +input:focus::placeholder { + color: grey; +} + +/* Customize the label (the container) */ +.container { + display: block; + position: relative; + padding-left: 35px; + margin-bottom: 12px; + cursor: pointer; + font-size: 22px; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; +} + +/* Hide the browser's default checkbox */ +.container input { + position: absolute; + opacity: 0; + cursor: pointer; + height: 0; + width: 0; +} + +/* Create a custom checkbox */ +.checkmark { + position: absolute; + top: 0; + left: 0; + height: 25px; + width: 25px; + background-color: #eee; +} + +/* On mouse-over, add a grey background color */ +.container:hover input ~ .checkmark { + background-color: #ccc; +} + +/* When the checkbox is checked, add a blue background */ +.container input:checked ~ .checkmark { + background-color: #4e738b; +} + +/* Create the checkmark/indicator (hidden when not checked) */ +.checkmark:after { + content: ""; + position: absolute; + display: none; +} + +/* Show the checkmark when checked */ +.container input:checked ~ .checkmark:after { + display: block; +} + +/* Style the checkmark/indicator */ +.container .checkmark:after { + left: 9px; + top: 5px; + width: 5px; + height: 10px; + border: solid white; + border-width: 0 3px 3px 0; + -webkit-transform: rotate(45deg); + -ms-transform: rotate(45deg); + transform: rotate(45deg); +} + +.signup-box input { + font-size: 16px; + line-height: 28px; + padding: 8px 16px; + width: 100%; + min-height: 44px; + border: unset; + border-radius: 4px; + outline-color: rgb(84 105 212 / 0.5); + background-color: rgb(255, 255, 255); + box-shadow: rgba(0, 0, 0, 0) 0px 0px 0px 0px, + rgba(0, 0, 0, 0) 0px 0px 0px 0px, + rgba(0, 0, 0, 0) 0px 0px 0px 0px, + rgba(60, 66, 87, 0.16) 0px 0px 0px 1px, + rgba(0, 0, 0, 0) 0px 0px 0px 0px, + rgba(0, 0, 0, 0) 0px 0px 0px 0px, + rgba(0, 0, 0, 0) 0px 0px 0px 0px; +} + +input[type="submit"] { + background-color: #4e738b; + box-shadow: rgba(0, 0, 0, 0) 0px 0px 0px 0px, + rgba(0, 0, 0, 0) 0px 0px 0px 0px, + rgba(0, 0, 0, 0.12) 0px 1px 1px 0px, + rgb(84, 105, 212) 0px 0px 0px 1px, + rgba(0, 0, 0, 0) 0px 0px 0px 0px, + rgba(0, 0, 0, 0) 0px 0px 0px 0px, + rgba(60, 66, 87, 0.08) 0px 2px 5px 0px; + color: #fff; + font-weight: 600; + cursor: pointer; +} \ No newline at end of file From e6757b8e255846ddace78eafbe082fd716278d00 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Fri, 14 Oct 2022 12:31:12 -0400 Subject: [PATCH 2/8] update gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 66fd13c..d1e607f 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ # Dependency directories (remove the comment below to include it) # vendor/ +.idea/* \ No newline at end of file From b509c7c63b8d423303732835dd43aaef94be9e7a Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Sat, 4 Feb 2023 12:05:13 -0500 Subject: [PATCH 3/8] first big update --- event.go | 9 - events/config.yml | 4 + .../shifts.yml | 0 .../shifts.yml | 55 ++ .../signups.yml | 0 .../shifts.yml | 0 .../shifts.yml | 0 .../events.yml | 40 ++ .../events.yml | 0 events/teams.yml | 12 + events/users.yml | 4 + go.mod | 53 ++ go.sum | 595 ++++++++++++++++++ main.go | 15 + pkg/event/data.go | 150 ----- pkg/event/events.go | 43 ++ pkg/event/manage.go | 10 +- pkg/event/schedule.go | 6 +- pkg/event/setup.go | 48 ++ pkg/event/signups.go | 67 +- pkg/event/structs.go | 94 +-- pkg/event/teams.go | 56 ++ pkg/event/users.go | 1 + pkg/event/webserver.go | 25 - pkg/filestore/crud.go | 44 ++ pkg/filestore/filesystem.go | 89 +++ pkg/filestore/structs.go | 1 + pkg/webserver/discord.go | 111 ++++ pkg/webserver/discord_structs.go | 46 ++ pkg/webserver/webserver.go | 72 +++ templates/html/event.html | 10 - templates/html/event/event.html | 21 + templates/html/event/events.html | 19 + templates/html/{ => event}/newEvent.html | 0 templates/html/event/schedule.html | 7 + .../{signup.html => event/signup-orig.html} | 40 +- templates/html/event/signup.html | 62 ++ templates/html/event/team.html | 40 ++ templates/html/event/teams.html | 19 + templates/html/events.html | 10 - templates/html/general/head.html | 10 + templates/html/general/index.html | 13 + templates/html/general/navbar.html | 13 + templates/html/general/scripts.html | 5 + templates/html/general/test.html | 163 +++++ templates/html/schedule.html | 10 - templates/scripts/fragforce.js | 9 + templates/scripts/navbar.js | 46 ++ .../styles/{signup.css => fragforce.css} | 40 +- templates/styles/test.css | 0 50 files changed, 1850 insertions(+), 337 deletions(-) delete mode 100644 event.go create mode 100644 events/config.yml create mode 100644 events/team/60ea1699-467b-452c-a4d4-3eb255d3f313/5793a68b-1602-4c0b-9836-9f565eda1935/shifts.yml create mode 100644 events/team/60ea1699-467b-452c-a4d4-3eb255d3f313/5b392c09-435d-4ea7-aae8-54f94a2ccaeb/shifts.yml create mode 100644 events/team/60ea1699-467b-452c-a4d4-3eb255d3f313/5b392c09-435d-4ea7-aae8-54f94a2ccaeb/signups.yml create mode 100644 events/team/60ea1699-467b-452c-a4d4-3eb255d3f313/8363169e-349f-45fd-98d0-afe12e2c0ab4/shifts.yml create mode 100644 events/team/60ea1699-467b-452c-a4d4-3eb255d3f313/b226472c-597b-435d-8e21-63b843f0e828/shifts.yml create mode 100644 events/team/60ea1699-467b-452c-a4d4-3eb255d3f313/events.yml create mode 100644 events/team/fd584d9d-8836-4b97-981d-15616ef25f7a/events.yml create mode 100644 events/teams.yml create mode 100644 events/users.yml create mode 100644 go.mod create mode 100644 go.sum create mode 100644 main.go delete mode 100644 pkg/event/data.go create mode 100644 pkg/event/events.go create mode 100644 pkg/event/setup.go create mode 100644 pkg/event/teams.go create mode 100644 pkg/event/users.go delete mode 100644 pkg/event/webserver.go create mode 100644 pkg/filestore/crud.go create mode 100644 pkg/filestore/filesystem.go create mode 100644 pkg/filestore/structs.go create mode 100644 pkg/webserver/discord.go create mode 100644 pkg/webserver/discord_structs.go create mode 100644 pkg/webserver/webserver.go delete mode 100644 templates/html/event.html create mode 100644 templates/html/event/event.html create mode 100644 templates/html/event/events.html rename templates/html/{ => event}/newEvent.html (100%) create mode 100644 templates/html/event/schedule.html rename templates/html/{signup.html => event/signup-orig.html} (60%) create mode 100644 templates/html/event/signup.html create mode 100644 templates/html/event/team.html create mode 100644 templates/html/event/teams.html delete mode 100644 templates/html/events.html create mode 100644 templates/html/general/head.html create mode 100644 templates/html/general/index.html create mode 100644 templates/html/general/navbar.html create mode 100644 templates/html/general/scripts.html create mode 100644 templates/html/general/test.html delete mode 100644 templates/html/schedule.html create mode 100644 templates/scripts/fragforce.js create mode 100644 templates/scripts/navbar.js rename templates/styles/{signup.css => fragforce.css} (88%) create mode 100644 templates/styles/test.css diff --git a/event.go b/event.go deleted file mode 100644 index acd68e4..0000000 --- a/event.go +++ /dev/null @@ -1,9 +0,0 @@ -package main - -import ( - "github.com/parkervcp/testing/pkg/event" -) - -func main() { - event.Start() -} diff --git a/events/config.yml b/events/config.yml new file mode 100644 index 0000000..df1145c --- /dev/null +++ b/events/config.yml @@ -0,0 +1,4 @@ +discord: + redirect_url: "http://localhost:8080/auth/discord/callback" + client_id: "353011020467404810" + client_secret: "CDIqEJ6oFMghx2xY0-JPTG4Q6fo6B1KO" \ No newline at end of file diff --git a/events/team/60ea1699-467b-452c-a4d4-3eb255d3f313/5793a68b-1602-4c0b-9836-9f565eda1935/shifts.yml b/events/team/60ea1699-467b-452c-a4d4-3eb255d3f313/5793a68b-1602-4c0b-9836-9f565eda1935/shifts.yml new file mode 100644 index 0000000..e69de29 diff --git a/events/team/60ea1699-467b-452c-a4d4-3eb255d3f313/5b392c09-435d-4ea7-aae8-54f94a2ccaeb/shifts.yml b/events/team/60ea1699-467b-452c-a4d4-3eb255d3f313/5b392c09-435d-4ea7-aae8-54f94a2ccaeb/shifts.yml new file mode 100644 index 0000000..210bb1f --- /dev/null +++ b/events/team/60ea1699-467b-452c-a4d4-3eb255d3f313/5b392c09-435d-4ea7-aae8-54f94a2ccaeb/shifts.yml @@ -0,0 +1,55 @@ +- shift_id: "f403fa5d-fe2c-4424-b0e2-8edab1b51858" + type: "manager" + title: "Manager Shift 1" + start: 2022-11-18T13:00:00Z + length: 6 + +- shift_id: "1660dad7-87e1-4297-a34c-48a807c49d96" + type: "manager" + title: "Manager Shift 2" + start: 2022-11-18T19:00:00Z + length: 6 + +- shift_id: "30782162-ac84-4fd8-86b7-80a7f20b53fc" + hash: 86737912e2 + type: "streamer" + title: "Streamer Shift 1" + start: 2022-11-18T13:00:00Z + length: 2 + game: Streamers Choice + +- shift_id: "99b2be2e-9c5a-4342-955c-40990ac67de3" + hash: 25c6bdeddd + type: "streamer" + title: "Streamer Shift 2" + start: 2022-11-18T15:00:00Z + length: 2 + game: Streamers Choice + +- shift_id: "3055097e-5349-4737-9f55-fe494500387c" + hash: 6a16bbf2e3 + type: "streamer" + title: "Streamer Shift 3" + start: 2022-11-18T17:00:00Z + length: 2 + game: Streamers Choice + +- shift_id: "0d6d5329-427c-4245-ab9c-1b072a9759b5" + hash: 525e1f65d0 + type: "streamer" + title: "Streamer Shift 4" + start: 2022-11-18T19:00:00Z + length: 3 + game: Villainous (Tabletop Simulator) + +- shift_id: "09a073d1-a9d4-4603-9f76-21bc68f259f1" + type: "moderator" + title: "Moderator Shift 1" + start: 2022-11-18T13:00:00Z + length: 3 + +- shift_id: "e3181f6b-1bcb-477f-b886-660a95bd1629" + type: "moderator" + title: "Moderator Shift 2" + start: 2022-11-18T19:00:00Z + length: 6 \ No newline at end of file diff --git a/events/team/60ea1699-467b-452c-a4d4-3eb255d3f313/5b392c09-435d-4ea7-aae8-54f94a2ccaeb/signups.yml b/events/team/60ea1699-467b-452c-a4d4-3eb255d3f313/5b392c09-435d-4ea7-aae8-54f94a2ccaeb/signups.yml new file mode 100644 index 0000000..e69de29 diff --git a/events/team/60ea1699-467b-452c-a4d4-3eb255d3f313/8363169e-349f-45fd-98d0-afe12e2c0ab4/shifts.yml b/events/team/60ea1699-467b-452c-a4d4-3eb255d3f313/8363169e-349f-45fd-98d0-afe12e2c0ab4/shifts.yml new file mode 100644 index 0000000..e69de29 diff --git a/events/team/60ea1699-467b-452c-a4d4-3eb255d3f313/b226472c-597b-435d-8e21-63b843f0e828/shifts.yml b/events/team/60ea1699-467b-452c-a4d4-3eb255d3f313/b226472c-597b-435d-8e21-63b843f0e828/shifts.yml new file mode 100644 index 0000000..e69de29 diff --git a/events/team/60ea1699-467b-452c-a4d4-3eb255d3f313/events.yml b/events/team/60ea1699-467b-452c-a4d4-3eb255d3f313/events.yml new file mode 100644 index 0000000..17e2128 --- /dev/null +++ b/events/team/60ea1699-467b-452c-a4d4-3eb255d3f313/events.yml @@ -0,0 +1,40 @@ +- event_id: 5b392c09-435d-4ea7-aae8-54f94a2ccaeb + event_hash: add37bea39 + event_name: 2022 Fall Superstream + event_start: 2022-11-18T13:00:00Z + event_length: 40 + signups: + - type: "streamer" + has_game: true + questions: + - label: "Twitch Username" + placeholder: "MisterFragbot" + type: "text" + required: true + + - type: "moderator" + questions: + - label: "Twitch Username" + placeholder: "MisterFragbot" + type: "text" + required: true + + - type: "manager" + +- event_id: 8363169e-349f-45fd-98d0-afe12e2c0ab4 + event_hash: 22ddedb3a9 + event_name: 2022 Summer Superstream + event_start: 2022-08-12T13:00:00Z + event_length: 40 + +- event_id: 5793a68b-1602-4c0b-9836-9f565eda1935 + event_hash: c668c3fe4f + event_name: 2023 Spring Superstream + event_start: 2023-04-14T13:00:00Z + event_length: 40 + +- event_id: b226472c-597b-435d-8e21-63b843f0e828 + event_hash: 7e559abdea + event_name: test superstream + event_start: 2022-08-12T13:00:00Z + event_length: 4000 \ No newline at end of file diff --git a/events/team/fd584d9d-8836-4b97-981d-15616ef25f7a/events.yml b/events/team/fd584d9d-8836-4b97-981d-15616ef25f7a/events.yml new file mode 100644 index 0000000..e69de29 diff --git a/events/teams.yml b/events/teams.yml new file mode 100644 index 0000000..bd2f06f --- /dev/null +++ b/events/teams.yml @@ -0,0 +1,12 @@ +- team_id: 60ea1699-467b-452c-a4d4-3eb255d3f313 + team_hash: 2e26389ac3 + team_name: Fragforce + team_owner: be5917086c + team_url: https://fragforce.org + guild_id: "164136635762606081" +- team_id: fd584d9d-8836-4b97-981d-15616ef25f7a + team_hash: 652a664362 + team_name: Testing Team + team_owner: be5917086c + team_url: https://fragforce.org + guild_id: "164136635762606081" \ No newline at end of file diff --git a/events/users.yml b/events/users.yml new file mode 100644 index 0000000..1c51a15 --- /dev/null +++ b/events/users.yml @@ -0,0 +1,4 @@ +--- +- user_id: c2e752b3-1b51-48f1-9168-16866d707c37 + user_hash: be5917086c + discord_id: 122906021160026112 \ No newline at end of file diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..d20c2e7 --- /dev/null +++ b/go.mod @@ -0,0 +1,53 @@ +module github.com/fragforce/event-manager + +go 1.19 + +require ( + github.com/gin-gonic/gin v1.8.1 + github.com/goccy/go-yaml v1.9.6 + github.com/sirupsen/logrus v1.9.0 + github.com/spf13/viper v1.14.0 +) + +require ( + github.com/fatih/color v1.13.0 // indirect + github.com/fsnotify/fsnotify v1.6.0 // indirect + github.com/gin-contrib/sse v0.1.0 // indirect + github.com/go-playground/locales v0.14.0 // indirect + github.com/go-playground/universal-translator v0.18.0 // indirect + github.com/go-playground/validator/v10 v10.11.1 // indirect + github.com/goccy/go-json v0.9.11 // indirect + github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect + github.com/golang/protobuf v1.5.2 // indirect + github.com/hashicorp/hcl v1.0.0 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/leodido/go-urn v1.2.1 // indirect + github.com/magiconair/properties v1.8.6 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-isatty v0.0.16 // indirect + github.com/mitchellh/mapstructure v1.5.0 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/parkervcp/discord-oauth2 v0.0.0-20221107213606-dc8497a5205c // indirect + github.com/pelletier/go-toml v1.9.5 // indirect + github.com/pelletier/go-toml/v2 v2.0.5 // indirect + github.com/ravener/discord-oauth2 v0.0.0-20220615092331-f6a9839c223e // indirect + github.com/spf13/afero v1.9.3 // indirect + github.com/spf13/cast v1.5.0 // indirect + github.com/spf13/jwalterweatherman v1.1.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/subosito/gotenv v1.4.1 // indirect + github.com/ugorji/go/codec v1.2.7 // indirect + github.com/zalando/gin-oauth2 v1.5.3 // indirect + golang.org/x/crypto v0.3.0 // indirect + golang.org/x/net v0.2.0 // indirect + golang.org/x/oauth2 v0.1.0 // indirect + golang.org/x/sys v0.2.0 // indirect + golang.org/x/text v0.4.0 // indirect + golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect + google.golang.org/appengine v1.6.7 // indirect + google.golang.org/protobuf v1.28.1 // indirect + gopkg.in/ini.v1 v1.67.0 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..81da438 --- /dev/null +++ b/go.sum @@ -0,0 +1,595 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= +cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= +cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= +cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= +cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= +cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= +cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= +cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= +cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= +cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= +cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= +cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= +cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= +cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= +cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= +cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= +cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY= +cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= +cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= +cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= +cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= +cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= +cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= +cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= +cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= +cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= +cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= +cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= +cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= +cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= +cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= +cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= +cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= +cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= +cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= +dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= +github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= +github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= +github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= +github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= +github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= +github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI= +github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= +github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= +github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= +github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= +github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= +github.com/gin-gonic/gin v1.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8= +github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk= +github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= +github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= +github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU= +github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs= +github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= +github.com/go-playground/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/jYrnRPArHwAcmLoJZxyho= +github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA= +github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4= +github.com/go-playground/validator/v10 v10.10.0 h1:I7mrTYv78z8k8VXa/qJlOlEXn/nBh+BF8dHX5nt/dr0= +github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos= +github.com/go-playground/validator/v10 v10.11.1 h1:prmOlTVv+YjZjmRmNSF3VmspqJIxJWXmqUsHwfTRRkQ= +github.com/go-playground/validator/v10 v10.11.1/go.mod h1:i+3WkQ1FvaUjjxh1kSvIA4dMGDBiPU55YFDl0WbKdWU= +github.com/goccy/go-json v0.9.7 h1:IcB+Aqpx/iMHu5Yooh7jEzJk1JZ7Pjtmys2ukPr7EeM= +github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/goccy/go-json v0.9.11 h1:/pAaQDLHEoCq/5FFmSKBswWmK6H0e8g4159Kc/X/nqk= +github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/goccy/go-yaml v1.9.6 h1:KhAu1zf9JXnm3vbG49aDE0E5uEBUsM4uwD31/58ZWyI= +github.com/goccy/go-yaml v1.9.6/go.mod h1:JubOolP3gh0HpiBc4BLRD4YmjEjHAmIIB2aaXKkTfoE= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= +github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= +github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= +github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= +github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w= +github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= +github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= +github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= +github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= +github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= +github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= +github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= +github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/parkervcp/discord-oauth2 v0.0.0-20221107213606-dc8497a5205c h1:5JDXkw7yv3jpoc663uDrFa7pT/fGIUR+c7OSzwD7bzw= +github.com/parkervcp/discord-oauth2 v0.0.0-20221107213606-dc8497a5205c/go.mod h1:JrV+aiiXzRsRSH6tToQiGYx3MkmZxBNd0GzfTR/e+ok= +github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= +github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= +github.com/pelletier/go-toml/v2 v2.0.5 h1:ipoSadvV8oGUjnUbMub59IDPPwfxF694nG/jwbMiyQg= +github.com/pelletier/go-toml/v2 v2.0.5/go.mod h1:OMHamSCAODeSsVrwwvcJOaoN0LIUIaFVNZzmWyNfXas= +github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/ravener/discord-oauth2 v0.0.0-20220615092331-f6a9839c223e h1:7t1Ur+etUw2hE1GgSNWJGNi/D8zBMqwwkGwTiE/mWTE= +github.com/ravener/discord-oauth2 v0.0.0-20220615092331-f6a9839c223e/go.mod h1:P/mZMYLZ87lqRSECEWsOqywGrO1hlZkk9RTwEw35IP4= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= +github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= +github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= +github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo= +github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= +github.com/spf13/afero v1.9.3 h1:41FoI0fD7OR7mGcKE/aOiLkGreyf8ifIOQmJANWogMk= +github.com/spf13/afero v1.9.3/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= +github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= +github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= +github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= +github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= +github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/viper v1.13.0 h1:BWSJ/M+f+3nmdz9bxB+bWX28kkALN2ok11D0rSo8EJU= +github.com/spf13/viper v1.13.0/go.mod h1:Icm2xNL3/8uyh/wFuB1jI7TiTNKp8632Nwegu+zgdYw= +github.com/spf13/viper v1.14.0 h1:Rg7d3Lo706X9tHsJMUjdiwMpHB7W8WnSVOssIY+JElU= +github.com/spf13/viper v1.14.0/go.mod h1:WT//axPky3FdvXHzGw33dNdXXXfFQqmEalje+egj8As= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/subosito/gotenv v1.4.1 h1:jyEFiXpy21Wm81FBN71l9VoMMV8H8jG+qIK3GCpY6Qs= +github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= +github.com/ugorji/go v1.2.7 h1:qYhyWUUd6WbiM+C6JZAUkIJt/1WrjzNHY9+KCIjVqTo= +github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M= +github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0= +github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY= +github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/zalando/gin-oauth2 v1.5.3 h1:tkfdquN2RIb7I7PlIOHaMB4o0ZpY/T1zNG2SpSBx9qs= +github.com/zalando/gin-oauth2 v1.5.3/go.mod h1:ji8FkTmYYc32KK9+ZxIi78YefLtcSCRp193jO57yOHc= +go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= +go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= +go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 h1:kUhD7nTDoI3fVd9G4ORWrbV5NY0liEs/Jg2pv5f+bBA= +golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.3.0 h1:a06MkbcxBrEFc0w0QIZWXrH/9cCX6KJyWbBOIwAn+7A= +golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= +golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= +golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= +golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= +golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= +golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= +golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= +golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= +golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 h1:NWy5+hlRbC7HK+PmcXVUmW1IMyFce7to56IUvhUFm7Y= +golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU= +golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 h1:OSnWWcOd/CtWQC2cYSBgbTSJv3ciqd8r54ySIW2y3RE= +golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= +golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk= +golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= +golang.org/x/oauth2 v0.1.0 h1:isLCZuhj4v+tYv7eskaN4v/TM+A1begWWgyVJDdl1+Y= +golang.org/x/oauth2 v0.1.0/go.mod h1:G9FE4dLTsbXUu90h/Pf85g4w1D+SSAgR+q46nJZ8M4A= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220406163625-3f8b81556e12/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A= +golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg= +golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= +golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df h1:5Pf6pFKu98ODmgnpvkJ3kFUOQGGLIzLIkbzUHp47618= +golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= +golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= +golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= +google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= +google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= +google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= +google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= +google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= +google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= +google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= +google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= +google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= +google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= +google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= +google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= +google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= +google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= +google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= +google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= +google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= +google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= +gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= +rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= +rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/main.go b/main.go new file mode 100644 index 0000000..75820d5 --- /dev/null +++ b/main.go @@ -0,0 +1,15 @@ +package main + +import ( + "github.com/fragforce/event-manager/pkg/event" + "github.com/fragforce/event-manager/pkg/webserver" + "log" +) + +func main() { + err := event.LoadEvents() + if err != nil { + log.Panicln(err) + } + webserver.Start() +} diff --git a/pkg/event/data.go b/pkg/event/data.go deleted file mode 100644 index b4914aa..0000000 --- a/pkg/event/data.go +++ /dev/null @@ -1,150 +0,0 @@ -package event - -import ( - "fmt" - "time" - - log "github.com/sirupsen/logrus" - "github.com/spf13/viper" -) - -var ( - organizations []Organization -) - -func loadEvents() { - log.SetLevel(log.DebugLevel) - orgs := viper.New() - orgs.SetConfigName("organizations") - orgs.SetConfigType("yaml") - orgs.AddConfigPath("./events/") - err := orgs.ReadInConfig() // Find and read the config file - if err != nil { // Handle errors reading the config file - log.Error(err) - } - - log.Debugf("found orgs %v", orgs.GetStringSlice("organizations")) - - // load config for orgs - for _, orgName := range orgs.GetStringSlice("organizations") { - var orgEvents []Event - var orgSignups []Signup - log.Debugf("loading org %s", orgName) - org := viper.New() - org.SetConfigName("org") - org.SetConfigType("yaml") - org.AddConfigPath(fmt.Sprintf("./events/%s/", orgName)) - err := org.ReadInConfig() // Find and read the config file - if err != nil { // Handle errors reading the config file - log.Error(err) - } - - log.Debugf("found events %v", org.GetStringSlice("events")) - - // load events for orgs - for _, eventID := range org.GetStringSlice("events") { - var eventShifts []Shift - var eventUsers []User - - log.Debugf("loading org event %s", eventID) - event := viper.New() - event.SetConfigName("event") - event.SetConfigType("yaml") - event.AddConfigPath(fmt.Sprintf("./events/%s/%s/", orgName, eventID)) - err := event.ReadInConfig() // Find and read the config file - if err != nil { // Handle errors reading the config file - log.Panic("fatal error config file:", err) - } - - eventStartTime, err := time.Parse("Mon Jan _2 15:04 PM 2006", event.GetString("start")) - if err != nil { // Handle errors reading the config file - log.Error(err) - } - - log.Debugf("event users loading") - users := viper.New() - users.SetConfigName("users") - users.SetConfigType("yaml") - users.AddConfigPath(fmt.Sprintf("./events/%s/%s/", orgName, eventID)) - err = users.ReadInConfig() // Find and read the config file - if err != nil { // Handle errors reading the config file - log.Panic("fatal error config file:", err) - } - - err = users.UnmarshalKey("users", &eventUsers) - if err != nil { // Handle errors reading the config file - log.Panic("fatal error marshalling ", err) - } - log.Debugf("event users loaded") - - log.Debugf("event shifts loading") - shifts := viper.New() - shifts.SetConfigName("shifts") - shifts.SetConfigType("yaml") - shifts.AddConfigPath(fmt.Sprintf("./events/%s/%s/", orgName, eventID)) - err = shifts.ReadInConfig() // Find and read the config file - if err != nil { // Handle errors reading the config file - log.Panic("fatal error config file:", err) - } - - var newShifts []struct { - Type string `mapstructure:"type,omitempty"` - ShiftID string `mapstructure:"shift_id,omitempty"` - UserID string `mapstructure:"user_id,omitempty"` - Title string `mapstructure:"title,omitempty"` - HasGame bool `mapstructure:"hasGame,omitempty"` - Game string `mapstructure:"game,omitempty"` - Start string `mapstructure:"start,omitempty"` - Length int `mapstructure:"length,omitempty"` - MaxPlayers int `mapstructure:"max_players,omitempty"` - Players []Player `mapstructure:"players,omitempty"` - } - - err = shifts.UnmarshalKey("shifts", &newShifts) - if err != nil { // Handle errors reading the config file - log.Panic("fatal error marshalling ", err) - } - log.Debugf("event shifts loaded") - - for _, shift := range newShifts { - log.Debugf("%+v", shift) - - shiftStartTime, err := time.Parse("Mon Jan _2 15:04 PM 2006", shift.Start) - if err != nil { // Handle errors reading the config file - log.Error(err) - } - eventShifts = append(eventShifts, Shift{ - Type: shift.Type, - ShiftID: shift.ShiftID, - UserID: shift.UserID, - Title: shift.Title, - Game: shift.Game, - Start: shiftStartTime, - Length: shift.Length, - MaxPlayers: shift.MaxPlayers, - Players: shift.Players, - }) - } - - orgEvents = append(orgEvents, Event{ - Name: event.GetString("name"), - ID: eventID, - Start: eventStartTime, - Length: event.GetInt("length"), - Users: eventUsers, - Shifts: eventShifts, - }) - } - - err = org.UnmarshalKey("signups", &orgSignups) - if err != nil { // Handle errors reading the config file - log.Panic("fatal error marshalling ", err) - } - - organizations = append(organizations, Organization{ - Name: orgName, - Events: orgEvents, - Signups: orgSignups, - }) - } -} diff --git a/pkg/event/events.go b/pkg/event/events.go new file mode 100644 index 0000000..8895429 --- /dev/null +++ b/pkg/event/events.go @@ -0,0 +1,43 @@ +package event + +import ( + "fmt" + "github.com/gin-gonic/gin" + "net/http" +) + +var ( + teams []Team + users []User +) + +func GetEvent(c *gin.Context) { + var thisTeam Team + var thisEvent Event + shifts := make(map[string][]Shift) + + for _, team := range teams { + if team.Hash == c.Param("teamid") { + thisTeam = team + break + } + } + + for _, event := range thisTeam.Events { + if event.Hash == c.Param("eventid") { + thisEvent = event + break + } + } + + for _, shift := range thisEvent.Shifts { + shifts[shift.Type] = append(shifts[shift.Type], shift) + } + + c.HTML(http.StatusOK, "event.html", gin.H{ + "Title": fmt.Sprintf("Event Schedule"), + "Team": thisTeam, + "Event": thisEvent, + "Shifts": shifts, + }) +} diff --git a/pkg/event/manage.go b/pkg/event/manage.go index 33fa514..c6172d2 100644 --- a/pkg/event/manage.go +++ b/pkg/event/manage.go @@ -4,10 +4,14 @@ import ( "github.com/gin-gonic/gin" ) -func manageEvents(c *gin.Context) { - c.Param("org") +func GetTeamManage(c *gin.Context) { + +} + +func PostTeamManage(c *gin.Context) { + } -func manageEvent(c *gin.Context) { +func PostTeamEvent(c *gin.Context) { } diff --git a/pkg/event/schedule.go b/pkg/event/schedule.go index dd36f89..36f3e10 100644 --- a/pkg/event/schedule.go +++ b/pkg/event/schedule.go @@ -2,10 +2,6 @@ package event import "github.com/gin-gonic/gin" -func getSchedules(c *gin.Context) { - -} - -func getSchedule(c *gin.Context) { +func GetSchedule(c *gin.Context) { } diff --git a/pkg/event/setup.go b/pkg/event/setup.go new file mode 100644 index 0000000..8ab2c4c --- /dev/null +++ b/pkg/event/setup.go @@ -0,0 +1,48 @@ +package event + +import ( + "fmt" + "github.com/fragforce/event-manager/pkg/filestore" + "strings" +) + +func LoadEvents() (err error) { + err = filestore.ReadConfig("events/users.yml", &users) + if err != nil { + return err + } + + err = filestore.ReadConfig("events/teams.yml", &teams) + if err != nil { + return err + } + + for tid, team := range teams { + var events []Event + err = filestore.ReadConfig(fmt.Sprintf("events/team/%s/events.yml", team.ID), &events) + if err != nil { + return err + } + + for eid, event := range events { + for sid, _ := range event.Signups { + for qid, _ := range event.Signups[sid].Questions { + event.Signups[sid].Questions[qid].LabelLower = + strings.ReplaceAll(strings.ToLower(event.Signups[sid].Questions[qid].Label), " ", "_") + } + } + + var shifts []Shift + err = filestore.ReadConfig(fmt.Sprintf("events/team/%s/%s/shifts.yml", team.ID, event.ID), &shifts) + if err != nil { + return err + } + events[eid].Shifts = shifts + } + + teams[tid].Events = events + + } + + return +} diff --git a/pkg/event/signups.go b/pkg/event/signups.go index ec82942..c0ee918 100644 --- a/pkg/event/signups.go +++ b/pkg/event/signups.go @@ -1,71 +1,80 @@ package event import ( - "net/http" - + "fmt" "github.com/gin-gonic/gin" + "io" + "log" + "net/http" ) -func getSignup(c *gin.Context) { - var thisOrg Organization +func GetSignup(c *gin.Context) { + var thisTeam Team var thisEvent Event - var thisUser User var shifts []Shift var questions []Question - // get org info - for _, org := range organizations { - if org.Name == c.Param("org") { - thisOrg = org + // get team info + for _, team := range teams { + if team.Hash == c.Param("teamid") { + thisTeam = team break } } // load specific event - for _, event := range thisOrg.Events { - if event.ID == c.Param("eventid") { + for _, event := range thisTeam.Events { + if event.Hash == c.Param("eventid") { thisEvent = event break } } - for _, user := range thisEvent.Users { - if user.UserID == c.Param("userid") { - thisUser = user - break - } - } - - if thisOrg.Name == "" || thisEvent.Name == "" || thisUser.UserID == "" { - return - } - // load shifts for this event for _, shift := range thisEvent.Shifts { if shift.Type == c.Param("position") { - shifts = append(shifts, shift) // if signup shares type then set has game - for _, signup := range thisOrg.Signups { + for _, signup := range thisEvent.Signups { if signup.Type == shift.Type { + shift.HasGame = signup.HasGame questions = signup.Questions } } + shifts = append(shifts, shift) } } c.HTML(http.StatusOK, "signup.html", gin.H{ - "eventid": thisEvent.ID, + "Title": "Event Signup", + "eventid": thisEvent.Hash, + "team": thisTeam.Name, + "teamid": thisTeam.Hash, "event": thisEvent.Name, "position": c.Param("position"), - "userid": c.Param("userid"), - "user": c.Param("user"), "questions": questions, "shifts": shifts, }) +} +func PostSignup(c *gin.Context) { + body, err := io.ReadAll(c.Request.Body) + if err != nil { + log.Print(err) + } + fmt.Printf(string(body)) + + fmt.Println(c.Query("email")) + fmt.Println(c.Query("Twitch+Username")) } -func postSignup(c *gin.Context) { - c.Query("") +func PatchSignup(c *gin.Context) { + body, err := io.ReadAll(c.Request.Body) + if err != nil { + log.Print(err) + } + fmt.Printf(string(body)) + + fmt.Println(c.Query("email")) + fmt.Println(c.Query("Twitch+Username")) } diff --git a/pkg/event/structs.go b/pkg/event/structs.go index 983449c..80a600a 100644 --- a/pkg/event/structs.go +++ b/pkg/event/structs.go @@ -4,57 +4,65 @@ import ( "time" ) -type Organization struct { - Name string `mapstructure:"name,omitempty"` - Events []Event `mapstructure:"events,omitempty"` - Signups []Signup `mapstructure:"signups,omitempty"` -} - -type Event struct { - Name string `mapstructure:"name,omitempty"` - ID string `mapstructure:"id,omitempty"` - Start time.Time `mapstructure:"start,omitempty"` - Length int `mapstructure:"length,omitempty"` - Users []User `mapstructure:"users,omitempty"` - Shifts []Shift `mapstructure:"shifts,omitempty"` -} - type User struct { - UserID string `mapstructure:"user_id,omitempty"` - DiscordID string `mapstructure:"discord_id,omitempty"` - SalesforceOrgID string `mapstructure:"salesforce_id,omitempty"` + ID string `json:"user_id,omitempty"` + Hash string `json:"hash,omitempty"` + DiscordID string `json:"discord_id,omitempty"` + SalesforceOrgID string `json:"salesforce_id,omitempty"` + DonationURL string `json:"donation_url,omitempty"` } -type Shift struct { - Type string `mapstructure:"type,omitempty"` - ShiftID string `mapstructure:"shift_id,omitempty"` - UserID string `mapstructure:"user_id,omitempty"` - Title string `mapstructure:"title,omitempty"` - HasGame bool `mapstructure:"hasGame,omitempty"` - Game string `mapstructure:"game,omitempty"` - Start time.Time `mapstructure:"start,omitempty"` - Length int `mapstructure:"length,omitempty"` - MaxPlayers int `mapstructure:"max_players,omitempty"` - Players []Player `mapstructure:"players,omitempty"` +type Team struct { + ID string `json:"team_id,omitempty"` + Hash string `json:"team_hash,omitempty"` + Name string `json:"team_name,omitempty"` + Owner string `json:"team_owner,omitempty"` + URL string `json:"team_url,omitempty"` + Events []Event `json:"events,omitempty"` } -type Player struct { - UserID string `mapstructure:"user_id,omitempty"` +type Question struct { + Label string `json:"label,omitempty"` + LabelLower string + Placeholder string `json:"placeholder,omitempty"` + Type string `json:"type,omitempty"` + Required bool `json:"required,omitempty"` } type Signup struct { - Type string `mapstructure:"type,omitempty"` - UserID string `mapstructure:"user_id,omitempty"` - Questions []Question `mapstructure:"questions,omitempty"` - HasGame bool `mapstructure:"has_game,omitempty"` - Game string `mapstructure:"game,omitempty"` - PlayersNeeded bool `mapstructure:"players_needed,omitempty"` - PlayerCount int `mapstructure:"player_count,omitempty"` + Type string `json:"type,omitempty"` + UserID string `json:"user_id,omitempty"` + Questions []Question `json:"questions,omitempty"` + HasGame bool `json:"has_game,omitempty"` + Game string `json:"game,omitempty"` + PlayersNeeded bool `json:"players_needed,omitempty"` + PlayerCount int `json:"player_count,omitempty"` } -type Question struct { - Label string `mapstructure:"label,omitempty"` - Placeholder string `mapstructure:"placeholder,omitempty"` - Type string `mapstructure:"type,omitempty"` - Required bool `mapstructure:"required,omitempty"` +type Shift struct { + Type string `json:"type,omitempty"` + ID string `json:"shift_id,omitempty"` + Hash string `json:"hash,omitempty"` + UserID string `json:"user_id,omitempty"` + Title string `json:"title,omitempty"` + HasGame bool `json:"hasGame,omitempty"` + Game string `json:"game,omitempty"` + Start time.Time `json:"start,omitempty"` + Length int `json:"length,omitempty"` + MaxPlayers int `json:"max_players,omitempty"` + Players []User `json:"players,omitempty"` + Signups []Signup `json:"signups,omitempty"` + Questions []Question `json:"questions,omitempty"` +} + +type Event struct { + ID string `json:"event_id,omitempty"` + Hash string `json:"event_hash,omitempty"` + Finalized bool `json:"finalized,omitempty"` + Name string `json:"event_name,omitempty"` + Start time.Time `json:"event_start,omitempty"` + Length int `json:"event_length,omitempty"` + Participants []User `json:"participants,omitempty"` + Shifts []Shift `json:"shifts,omitempty"` + Signups []Signup } diff --git a/pkg/event/teams.go b/pkg/event/teams.go new file mode 100644 index 0000000..07c094b --- /dev/null +++ b/pkg/event/teams.go @@ -0,0 +1,56 @@ +package event + +import ( + "fmt" + "github.com/gin-gonic/gin" + "net/http" + "time" +) + +func GetTeams(c *gin.Context) { + c.HTML(http.StatusOK, "teams.html", gin.H{ + "Title": "Teams", + "Teams": teams, + }) +} + +func GetTeam(c *gin.Context) { + var thisTeam Team + var currentEvents, futureEvents, pastEvents []Event + // get team info + for _, team := range teams { + if team.Hash == c.Param("teamid") { + thisTeam = team + break + } + } + + //fmt.Println(thisTeam.Events) + + // load specific event + for _, event := range thisTeam.Events { + switch { + case event.Start.After(time.Now()): + futureEvents = append(futureEvents, event) + case event.Start.Before(time.Now()) && event.Start.Add(time.Duration(event.Length)*time.Hour).After(time.Now()): + currentEvents = append(currentEvents, event) + case event.Start.Add(time.Duration(event.Length) * time.Hour).Before(time.Now()): + pastEvents = append(pastEvents, event) + default: + continue + } + } + + c.HTML(http.StatusOK, "team.html", gin.H{ + "Title": fmt.Sprintf("%s Events", thisTeam.Name), + "teamid": c.Param("teamid"), + "teamName": thisTeam.Name, + "currentEvents": currentEvents, + "futureEvents": futureEvents, + "pastEvents": pastEvents, + }) +} + +func GetTeamEvents(c *gin.Context) { + +} diff --git a/pkg/event/users.go b/pkg/event/users.go new file mode 100644 index 0000000..0e4b82e --- /dev/null +++ b/pkg/event/users.go @@ -0,0 +1 @@ +package event diff --git a/pkg/event/webserver.go b/pkg/event/webserver.go deleted file mode 100644 index 41f39a6..0000000 --- a/pkg/event/webserver.go +++ /dev/null @@ -1,25 +0,0 @@ -package event - -import "github.com/gin-gonic/gin" - -func Start() { - loadEvents() - - s := gin.New() - s.LoadHTMLGlob("templates/html/*.html") - s.Static("/css", "templates/styles") - - //event management - s.GET("/:org/event/", getSchedules) - s.GET("/:org/event/:eventid", getSchedule) - - // signup management - s.GET("/:org/event/:eventid/signup/:position/:userid", getSignup) - s.POST("/:org/event/:eventid/signup/:position/:userid", postSignup) - - //event management - s.GET("/:org/event/manage/", manageEvents) - s.GET("/:org/event/manage/:event", manageEvent) - - s.Run() -} diff --git a/pkg/filestore/crud.go b/pkg/filestore/crud.go new file mode 100644 index 0000000..9ca26f2 --- /dev/null +++ b/pkg/filestore/crud.go @@ -0,0 +1,44 @@ +package filestore + +func CreateConfig(path string, data interface{}) (err error) { + switch path[4:] { + case "json": + err = writeJSONToFile(path, data) + case ".yml", "yaml": + err = writeYamlToFile(path, data) + default: + err = writeYamlToFile(path, data) + } + + return +} + +func ReadConfig(path string, data interface{}) (err error) { + switch path[4:] { + case "json": + err = readJSONFromFile(path, data) + case ".yml", "yaml": + err = readYamlFromFile(path, data) + default: + err = readYamlFromFile(path, data) + } + + return +} + +func UpdateConfig(path string, data interface{}) (err error) { + switch path[4:] { + case "json": + err = writeJSONToFile(path, data) + case ".yml", "yaml": + err = writeYamlToFile(path, data) + default: + err = writeYamlToFile(path, data) + } + + return +} + +func DeleteFile(path string) (err error) { + return +} diff --git a/pkg/filestore/filesystem.go b/pkg/filestore/filesystem.go new file mode 100644 index 0000000..6bf113e --- /dev/null +++ b/pkg/filestore/filesystem.go @@ -0,0 +1,89 @@ +package filestore + +import ( + "encoding/json" + "io" + "os" + + "github.com/goccy/go-yaml" +) + +func writeJSONToFile(file string, dataInterface interface{}) (err error) { + jsonData, err := json.MarshalIndent(dataInterface, "", " ") + if err != nil { + return + } + + // create a file with a supplied name + if jsonFile, err := os.Create(file); err != nil { + return err + } else if _, err = jsonFile.Write(jsonData); err != nil { + return err + } + + return nil +} + +func readJSONFromFile(file string, dataInterface interface{}) (err error) { + jsonFile, err := os.Open(file) + // if we os.Open returns an error then handle it + if err != nil { + return err + } + + // defer the closing of our jsonFile so that we can parse it later on + defer func() { + if err = jsonFile.Close(); err != nil { + return + } + }() + + // read our opened xmlFile as a byte array. + byteValue, _ := io.ReadAll(jsonFile) + if err = json.Unmarshal(byteValue, dataInterface); err != nil { + return err + } + + // return the json byte value. + return nil +} + +func writeYamlToFile(file string, dataInterface interface{}) (err error) { + yamlData, err := yaml.Marshal(&dataInterface) + if err != nil { + return + } + + // create a file with a supplied name + yamlFile, err := os.Create(file) + if err != nil { + return + } + + if _, err = yamlFile.Write(yamlData); err != nil { + return + } + + return +} + +func readYamlFromFile(file string, dataInterface interface{}) (err error) { + yamlFile, err := os.Open(file) + if err != nil { + return + } + + // defer the closing of our jsonFile so that we can parse it later on + defer func() { + if err := yamlFile.Close(); err != nil { + return + } + }() + + byteValue, _ := io.ReadAll(yamlFile) + if err = yaml.Unmarshal(byteValue, dataInterface); err != nil { + return + } + + return +} diff --git a/pkg/filestore/structs.go b/pkg/filestore/structs.go new file mode 100644 index 0000000..9b06f59 --- /dev/null +++ b/pkg/filestore/structs.go @@ -0,0 +1 @@ +package filestore diff --git a/pkg/webserver/discord.go b/pkg/webserver/discord.go new file mode 100644 index 0000000..fabb348 --- /dev/null +++ b/pkg/webserver/discord.go @@ -0,0 +1,111 @@ +package webserver + +import ( + "github.com/gin-gonic/gin" + "github.com/parkervcp/discord-oauth2" + "golang.org/x/oauth2" + "io" + + "context" + "encoding/json" + "log" + "net/http" +) + +var ( + state = "random" + oauthConf discordOauth + + discordConfig = &oauth2.Config{ + RedirectURL: "http://localhost:8080/auth/discord/callback", + ClientID: "353011020467404810", + ClientSecret: "CDIqEJ6oFMghx2xY0-JPTG4Q6fo6B1KO", + Scopes: []string{discord.ScopeIdentify, discord.ScopeGuilds, discord.ScopeGuildsJoin}, + Endpoint: discord.Endpoint, + } +) + +func discordRedirect(c *gin.Context) { + c.Redirect(http.StatusTemporaryRedirect, discordConfig.AuthCodeURL(state)) +} + +func discordCallback(c *gin.Context) { + if c.Query("state") != state { + c.String(400, "invalid state") + } + + token, err := discordConfig.Exchange(context.Background(), c.Query("code")) + if err != nil { + log.Println(err) + } + + dUser, err := getDiscordUser(token) + + if err != nil { + log.Println(err) + } + + getDiscordUserGuilds(token) + + c.String(200, "hello %s", dUser) +} + +func getDiscordUser(token *oauth2.Token) (dUser discordUser, err error) { + res, err := discordConfig.Client(context.Background(), token).Get("https://discord.com/api/users/@me") + + if err != nil || res.StatusCode != 200 { + return + } + + defer res.Body.Close() + + body, err := io.ReadAll(res.Body) + + if err != nil { + return + } + + json.Unmarshal(body, &dUser) + + return +} + +func getDiscordUserGuilds(token *oauth2.Token) (guilds []string) { + res, err := discordConfig.Client(context.Background(), token).Get("https://discord.com/api/users/@me/guilds") + + if err != nil || res.StatusCode != 200 { + return + } + + defer res.Body.Close() + + body, err := io.ReadAll(res.Body) + + if err != nil { + return + } + + log.Println(string(body)) + + return +} + +func joinDiscordGuild(token *oauth2.Token, guild string) (err error) { + res, err := discordConfig.Client(context.Background(), token).Get("https://discord.com/api/users/@me/guilds") + + if err != nil || res.StatusCode != 200 { + return + } + + defer res.Body.Close() + + body, err := io.ReadAll(res.Body) + + if err != nil { + return + } + + log.Println(string(body)) + + return +} diff --git a/pkg/webserver/discord_structs.go b/pkg/webserver/discord_structs.go new file mode 100644 index 0000000..375ff8e --- /dev/null +++ b/pkg/webserver/discord_structs.go @@ -0,0 +1,46 @@ +package webserver + +type discordOauth struct { + RedirectURL string `json:"redirect_url,omitempty"` + ClientID string `json:"client_id,omitempty"` + ClientSecret string `json:"client_secret,omitempty"` +} + +type discordUser struct { + ID string `json:"id,omitempty"` + Username string `json:"username,omitempty"` + Avatar string `json:"avatar,omitempty"` + AvatarDecoration interface{} `json:"avatar_decoration,omitempty"` + Discriminator string `json:"discriminator,omitempty"` + PublicFlags int `json:"public_flags,omitempty"` + Flags int `json:"flags,omitempty"` + Banner interface{} `json:"banner,omitempty"` + BannerColor interface{} `json:"banner_color,omitempty"` + AccentColor interface{} `json:"accent_color,omitempty"` + Locale string `json:"locale,omitempty"` + MfaEnabled bool `json:"mfa_enabled,omitempty"` + PremiumType int `json:"premium_type,omitempty"` +} + +type discordUserGuilds struct { + ID string `json:"id,omitempty"` + Name string `json:"name,omitempty"` + Icon string `json:"icon,omitempty"` + Owner bool `json:"owner,omitempty"` + Permissions int `json:"permissions,omitempty"` + Features []string `json:"features,omitempty"` + PermissionsNew string `json:"permissions_new,omitempty"` +} + +type discordUserRole struct { + ID string `json:"id,omitempty"` + Name string `json:"name,omitempty"` + Color int `json:"color,omitempty"` + Hoist bool `json:"hoist,omitempty"` + Icon string `json:"icon,omitempty"` + UnicodeEmoji interface{} `json:"unicode_emoji,omitempty"` + Position int `json:"position,omitempty"` + Permissions string `json:"permissions,omitempty"` + Managed bool `json:"managed,omitempty"` + Mentionable bool `json:"mentionable,omitempty"` +} diff --git a/pkg/webserver/webserver.go b/pkg/webserver/webserver.go new file mode 100644 index 0000000..b145735 --- /dev/null +++ b/pkg/webserver/webserver.go @@ -0,0 +1,72 @@ +package webserver + +import ( + "fmt" + "github.com/fragforce/event-manager/pkg/event" + "github.com/fragforce/event-manager/pkg/filestore" + "github.com/gin-gonic/gin" + "net/http" + "time" +) + +func Start() { + s := gin.New() + s.LoadHTMLGlob("templates/html/*/*.html") + s.Static("/images", "templates/images") + s.Static("/css", "templates/styles") + s.Static("/js", "templates/scripts") + + // general pages + s.GET("/", func(c *gin.Context) { + c.HTML(http.StatusOK, "index.html", nil) + }) + + // teams + s.GET("/teams", event.GetTeams) + + s.GET("/:teamid", event.GetTeam) + + // login + s.GET("/login", discordRedirect) + s.GET("/login/discord/callback", discordCallback) + + // event + s.GET("/:teamid/event/:eventid", event.GetEvent) + + // signup management + s.GET("/:teamid/event/:eventid/signup/:position", event.GetSignup) + s.POST("/:teamid/event/:eventid/signup/:position", event.PostSignup) + s.PATCH("/:teamid/event/:eventid/signup/:position", event.PatchSignup) + + //event management + s.GET("/:teamid/manage/", event.GetTeamManage) + s.POST("/:teamid/manage/", event.PostTeamManage) + s.GET("/:teamid/manage/:eventid", event.GetTeamEvents) + s.POST("/:teamid/manage/:eventid", event.PostTeamEvent) + + s.Run() +} + +func Test() { + shiftStart, err := time.Parse("Mon Jan 02 3:04 AM 2006 MST", "Fri Nov 18 8:00 AM 2022 EST") + if err != nil { + fmt.Println(err) + } + + fmt.Println(shiftStart.Format("Mon, Jan 02 2006 3:04:05 PM +MST")) + + shifts := []event.Shift{ + event.Shift{ + ID: "f403fa5d-fe2c-4424-b0e2-8edab1b51858", + Type: "manager", + Title: "Manager Shift 1", + Length: 6, + Start: shiftStart.UTC(), + }, + } + err = filestore.UpdateConfig("events/shifts.yml", &shifts) + if err != nil { + fmt.Println(err) + } + +} diff --git a/templates/html/event.html b/templates/html/event.html deleted file mode 100644 index ab6e8ff..0000000 --- a/templates/html/event.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - - Event - - - - - \ No newline at end of file diff --git a/templates/html/event/event.html b/templates/html/event/event.html new file mode 100644 index 0000000..e292df4 --- /dev/null +++ b/templates/html/event/event.html @@ -0,0 +1,21 @@ + + +{{template "head" .Title}} + +{{template "navbar"}} +
+

{{.team.Name}} {{.Event.Name}} Schedule

+
+ {{ range $type, $shifts := .Shifts }} +
+
{{ $type }} shifts
+ {{ range $shift := $shifts }} +
{{ $shift.Title }}
+ {{ end }} +
+ {{ end }} +
+
+{{template "scripts"}} + + \ No newline at end of file diff --git a/templates/html/event/events.html b/templates/html/event/events.html new file mode 100644 index 0000000..935a196 --- /dev/null +++ b/templates/html/event/events.html @@ -0,0 +1,19 @@ + + +{{template "head" .Title}} + +{{template "navbar"}} +
+
+

+ {{.team.Name}} {{.event.Name}} Schedule +

+
+ {{range .event.Shifts}} + {{.Name}} + {{end}} +
+
+
+ + \ No newline at end of file diff --git a/templates/html/newEvent.html b/templates/html/event/newEvent.html similarity index 100% rename from templates/html/newEvent.html rename to templates/html/event/newEvent.html diff --git a/templates/html/event/schedule.html b/templates/html/event/schedule.html new file mode 100644 index 0000000..453d1e0 --- /dev/null +++ b/templates/html/event/schedule.html @@ -0,0 +1,7 @@ + + +{{template "head" .Title}} + + + + \ No newline at end of file diff --git a/templates/html/signup.html b/templates/html/event/signup-orig.html similarity index 60% rename from templates/html/signup.html rename to templates/html/event/signup-orig.html index 7ef6002..04363e8 100644 --- a/templates/html/signup.html +++ b/templates/html/event/signup-orig.html @@ -1,15 +1,17 @@ - - + + {{template "stylesheets"}} + {{.event}} {{.position}} Signup +{{template "navbar"}} - - +{{template "scripts"}} \ No newline at end of file diff --git a/templates/html/event/signup.html b/templates/html/event/signup.html new file mode 100644 index 0000000..c8af422 --- /dev/null +++ b/templates/html/event/signup.html @@ -0,0 +1,62 @@ + + +{{template "head" .Title}} + +{{template "navbar"}} +
+
+

+ {{.team}} {{.event}}
{{.position}} signup +

+
+
+
+
+ + +
We'll never share your email with anyone else.
+
+ {{range .questions}} +
+ + +
+ {{end}} {{range .shifts}} + +
+
+ +
+
+
+ + +
+ {{end}} +
+
+
+
+
+{{template "scripts"}} + + \ No newline at end of file diff --git a/templates/html/event/team.html b/templates/html/event/team.html new file mode 100644 index 0000000..5706d64 --- /dev/null +++ b/templates/html/event/team.html @@ -0,0 +1,40 @@ + + +{{template "head" .Title}} + +{{template "navbar"}} +
+
+

{{.teamName}} Events

+
+
+

Current Events

+ {{range .currentEvents}} + {{.Name}} + {{end}}
+
+ +
+
+
+

Future Events

+ {{range .futureEvents}} + {{.Name}} + {{end}} +
+
+
+ +
+
+
+

Past Events

+ {{range .pastEvents}} + {{.Name}} + {{end}} +
+
+
+{{template "scripts"}} + + \ No newline at end of file diff --git a/templates/html/event/teams.html b/templates/html/event/teams.html new file mode 100644 index 0000000..8885911 --- /dev/null +++ b/templates/html/event/teams.html @@ -0,0 +1,19 @@ + + +{{template "head" .Title}} + +{{template "navbar"}} +
+

Teams

+
+
+
+ {{range .Teams}} + {{.Name}} + {{end}} +
+
+
+{{template "scripts"}} + + \ No newline at end of file diff --git a/templates/html/events.html b/templates/html/events.html deleted file mode 100644 index 630ad4a..0000000 --- a/templates/html/events.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - - Scheduled Events - - - - - \ No newline at end of file diff --git a/templates/html/general/head.html b/templates/html/general/head.html new file mode 100644 index 0000000..c5385c9 --- /dev/null +++ b/templates/html/general/head.html @@ -0,0 +1,10 @@ +{{define "head"}} + + + {{.}} + + + + +{{end}} + diff --git a/templates/html/general/index.html b/templates/html/general/index.html new file mode 100644 index 0000000..74d0482 --- /dev/null +++ b/templates/html/general/index.html @@ -0,0 +1,13 @@ + + + + + Home + + {{template "head"}} + + +{{template "navbar"}} +{{template "scripts"}} + + \ No newline at end of file diff --git a/templates/html/general/navbar.html b/templates/html/general/navbar.html new file mode 100644 index 0000000..57b9994 --- /dev/null +++ b/templates/html/general/navbar.html @@ -0,0 +1,13 @@ +{{define "navbar"}} + +{{end}} \ No newline at end of file diff --git a/templates/html/general/scripts.html b/templates/html/general/scripts.html new file mode 100644 index 0000000..a9673ba --- /dev/null +++ b/templates/html/general/scripts.html @@ -0,0 +1,5 @@ +{{define "scripts"}} + + + +{{end}} \ No newline at end of file diff --git a/templates/html/general/test.html b/templates/html/general/test.html new file mode 100644 index 0000000..b8be435 --- /dev/null +++ b/templates/html/general/test.html @@ -0,0 +1,163 @@ + + + + + Test + + + + + + + + + \ No newline at end of file diff --git a/templates/html/schedule.html b/templates/html/schedule.html deleted file mode 100644 index 566549b..0000000 --- a/templates/html/schedule.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - - Title - - - - - \ No newline at end of file diff --git a/templates/scripts/fragforce.js b/templates/scripts/fragforce.js new file mode 100644 index 0000000..0fe24bf --- /dev/null +++ b/templates/scripts/fragforce.js @@ -0,0 +1,9 @@ +function minimizeSelection(inputString) { + var checkBox = document.getElementById(inputString); + var text = document.getElementById(inputString+"-response-div"); + if (checkBox.checked == true){ + text.style.display = "block"; + } else { + text.style.display = "none"; + } +} \ No newline at end of file diff --git a/templates/scripts/navbar.js b/templates/scripts/navbar.js new file mode 100644 index 0000000..a4336aa --- /dev/null +++ b/templates/scripts/navbar.js @@ -0,0 +1,46 @@ +(function (window, document) { + var menu = document.getElementById('menu'), + rollback, + WINDOW_CHANGE_EVENT = ('onorientationchange' in window) ? 'orientationchange':'resize'; + + function toggleHorizontal() { + menu.classList.remove('closing'); + [].forEach.call( + document.getElementById('menu').querySelectorAll('.navbar-can-transform'), + function(el){ + el.classList.toggle('pure-menu-horizontal'); + } + ); + }; + + function toggleMenu() { +// set timeout so that the panel has a chance to roll up +// before the menu switches states + if (menu.classList.contains('open')) { + menu.classList.add('closing'); + rollBack = setTimeout(toggleHorizontal, 500); + } + else { + if (menu.classList.contains('closing')) { + clearTimeout(rollBack); + } else { + toggleHorizontal(); + } + } + menu.classList.toggle('open'); + document.getElementById('toggle').classList.toggle('x'); + }; + + function closeMenu() { + if (menu.classList.contains('open')) { + toggleMenu(); + } + } + + document.getElementById('toggle').addEventListener('click', function (e) { + toggleMenu(); + e.preventDefault(); + }); + + window.addEventListener(WINDOW_CHANGE_EVENT, closeMenu); +})(this, this.document); \ No newline at end of file diff --git a/templates/styles/signup.css b/templates/styles/fragforce.css similarity index 88% rename from templates/styles/signup.css rename to templates/styles/fragforce.css index f96d33a..204d015 100644 --- a/templates/styles/signup.css +++ b/templates/styles/fragforce.css @@ -31,6 +31,8 @@ a { text-decoration: unset; } +/* ##signup */ + .signup-box { position: absolute; top: 50%; @@ -98,16 +100,8 @@ a { font-size: 12px; } -input::placeholder { - color: transparent; -} - -input:focus::placeholder { - color: grey; -} - /* Customize the label (the container) */ -.container { +.signup-box .container { display: block; position: relative; padding-left: 35px; @@ -121,7 +115,7 @@ input:focus::placeholder { } /* Hide the browser's default checkbox */ -.container input { +.signup-box .container input { position: absolute; opacity: 0; cursor: pointer; @@ -129,8 +123,10 @@ input:focus::placeholder { width: 0; } +/* ##checkmark */ + /* Create a custom checkbox */ -.checkmark { +.signup-box .checkmark { position: absolute; top: 0; left: 0; @@ -140,29 +136,29 @@ input:focus::placeholder { } /* On mouse-over, add a grey background color */ -.container:hover input ~ .checkmark { +.signup-box .container:hover input ~ .checkmark { background-color: #ccc; } /* When the checkbox is checked, add a blue background */ -.container input:checked ~ .checkmark { +.signup-box .container input:checked ~ .checkmark { background-color: #4e738b; } /* Create the checkmark/indicator (hidden when not checked) */ -.checkmark:after { +.signup-box .checkmark:after { content: ""; position: absolute; display: none; } /* Show the checkmark when checked */ -.container input:checked ~ .checkmark:after { +.signup-box .container input:checked ~ .checkmark:after { display: block; } /* Style the checkmark/indicator */ -.container .checkmark:after { +.signup-box .container .checkmark:after { left: 9px; top: 5px; width: 5px; @@ -174,6 +170,8 @@ input:focus::placeholder { transform: rotate(45deg); } +/* ##input */ + .signup-box input { font-size: 16px; line-height: 28px; @@ -193,7 +191,15 @@ input:focus::placeholder { rgba(0, 0, 0, 0) 0px 0px 0px 0px; } -input[type="submit"] { +.signup-box input::placeholder { + color: transparent; +} + +.signup-box input:focus::placeholder { + color: grey; +} + +.signup-box input[type="submit"] { background-color: #4e738b; box-shadow: rgba(0, 0, 0, 0) 0px 0px 0px 0px, rgba(0, 0, 0, 0) 0px 0px 0px 0px, diff --git a/templates/styles/test.css b/templates/styles/test.css new file mode 100644 index 0000000..e69de29 From d4623338437e56dc31b67c4b07e38a10991b4b6f Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Fri, 24 Mar 2023 20:39:43 -0400 Subject: [PATCH 4/8] updated to run --- .../events.yml | 30 +++++++--- pkg/event/events.go | 18 ++++-- pkg/event/signups.go | 11 +++- pkg/event/structs.go | 19 ++++--- pkg/webserver/discord.go | 7 ++- pkg/webserver/webserver.go | 10 ++-- templates/html/event/event.html | 25 ++++---- templates/html/event/signup.html | 57 ++++++++++--------- templates/html/event/team.html | 6 +- templates/html/general/head.html | 1 - templates/html/general/index.html | 7 +-- 11 files changed, 111 insertions(+), 80 deletions(-) diff --git a/events/team/60ea1699-467b-452c-a4d4-3eb255d3f313/events.yml b/events/team/60ea1699-467b-452c-a4d4-3eb255d3f313/events.yml index 17e2128..f2f4042 100644 --- a/events/team/60ea1699-467b-452c-a4d4-3eb255d3f313/events.yml +++ b/events/team/60ea1699-467b-452c-a4d4-3eb255d3f313/events.yml @@ -3,6 +3,7 @@ event_name: 2022 Fall Superstream event_start: 2022-11-18T13:00:00Z event_length: 40 + signup_enabled: false signups: - type: "streamer" has_game: true @@ -24,17 +25,32 @@ - event_id: 8363169e-349f-45fd-98d0-afe12e2c0ab4 event_hash: 22ddedb3a9 event_name: 2022 Summer Superstream - event_start: 2022-08-12T13:00:00Z + event_start: 2022-08-12T12:00:00Z event_length: 40 - event_id: 5793a68b-1602-4c0b-9836-9f565eda1935 event_hash: c668c3fe4f event_name: 2023 Spring Superstream - event_start: 2023-04-14T13:00:00Z + event_start: 2023-04-14T12:00:00Z event_length: 40 + signup_enabled: true + signups: + - type: "streamer" + has_game: true + questions: + - label: "Twitch Username" + placeholder: "MisterFragbot" + type: "text" + required: true + - label: "Be informed when you can sign up for a stream position?" + type: "checkbox" + required: false + + - type: "moderator" + questions: + - label: "Twitch Username" + placeholder: "MisterFragbot" + type: "text" + required: true -- event_id: b226472c-597b-435d-8e21-63b843f0e828 - event_hash: 7e559abdea - event_name: test superstream - event_start: 2022-08-12T13:00:00Z - event_length: 4000 \ No newline at end of file + - type: "manager" \ No newline at end of file diff --git a/pkg/event/events.go b/pkg/event/events.go index 8895429..c1d3273 100644 --- a/pkg/event/events.go +++ b/pkg/event/events.go @@ -2,8 +2,9 @@ package event import ( "fmt" - "github.com/gin-gonic/gin" "net/http" + + "github.com/gin-gonic/gin" ) var ( @@ -14,7 +15,9 @@ var ( func GetEvent(c *gin.Context) { var thisTeam Team var thisEvent Event + shifts := make(map[string][]Shift) + signups := make(map[string][]Signup) for _, team := range teams { if team.Hash == c.Param("teamid") { @@ -34,10 +37,15 @@ func GetEvent(c *gin.Context) { shifts[shift.Type] = append(shifts[shift.Type], shift) } + for _, signup := range thisEvent.Signups { + signups[signup.Type] = append(signups[signup.Type], signup) + } + c.HTML(http.StatusOK, "event.html", gin.H{ - "Title": fmt.Sprintf("Event Schedule"), - "Team": thisTeam, - "Event": thisEvent, - "Shifts": shifts, + "Title": fmt.Sprintf("Event Schedule"), + "Team": thisTeam, + "Event": thisEvent, + "Shifts": shifts, + "Signups": signups, }) } diff --git a/pkg/event/signups.go b/pkg/event/signups.go index c0ee918..5a5832a 100644 --- a/pkg/event/signups.go +++ b/pkg/event/signups.go @@ -2,10 +2,11 @@ package event import ( "fmt" - "github.com/gin-gonic/gin" "io" "log" "net/http" + + "github.com/gin-gonic/gin" ) func GetSignup(c *gin.Context) { @@ -30,15 +31,19 @@ func GetSignup(c *gin.Context) { } } + for _, signup := range thisEvent.Signups { + if signup.Type == c.Param("position") { + questions = signup.Questions + } + } + // load shifts for this event for _, shift := range thisEvent.Shifts { if shift.Type == c.Param("position") { // if signup shares type then set has game for _, signup := range thisEvent.Signups { if signup.Type == shift.Type { - shift.HasGame = signup.HasGame - questions = signup.Questions } } shifts = append(shifts, shift) diff --git a/pkg/event/structs.go b/pkg/event/structs.go index 80a600a..ef0b85a 100644 --- a/pkg/event/structs.go +++ b/pkg/event/structs.go @@ -56,13 +56,14 @@ type Shift struct { } type Event struct { - ID string `json:"event_id,omitempty"` - Hash string `json:"event_hash,omitempty"` - Finalized bool `json:"finalized,omitempty"` - Name string `json:"event_name,omitempty"` - Start time.Time `json:"event_start,omitempty"` - Length int `json:"event_length,omitempty"` - Participants []User `json:"participants,omitempty"` - Shifts []Shift `json:"shifts,omitempty"` - Signups []Signup + ID string `json:"event_id,omitempty"` + Hash string `json:"event_hash,omitempty"` + Finalized bool `json:"finalized,omitempty"` + Name string `json:"event_name,omitempty"` + Start time.Time `json:"event_start,omitempty"` + Length int `json:"event_length,omitempty"` + Participants []User `json:"participants,omitempty"` + Shifts []Shift `json:"shifts,omitempty"` + SignupEnabled bool `json:"signup_enabled,omitempty"` + Signups []Signup } diff --git a/pkg/webserver/discord.go b/pkg/webserver/discord.go index fabb348..0b887fd 100644 --- a/pkg/webserver/discord.go +++ b/pkg/webserver/discord.go @@ -1,10 +1,11 @@ package webserver import ( + "io" + "github.com/gin-gonic/gin" "github.com/parkervcp/discord-oauth2" "golang.org/x/oauth2" - "io" "context" "encoding/json" @@ -17,7 +18,7 @@ var ( oauthConf discordOauth discordConfig = &oauth2.Config{ - RedirectURL: "http://localhost:8080/auth/discord/callback", + RedirectURL: "http://localhost:8080/login/discord/callback", ClientID: "353011020467404810", ClientSecret: "CDIqEJ6oFMghx2xY0-JPTG4Q6fo6B1KO", Scopes: []string{discord.ScopeIdentify, discord.ScopeGuilds, discord.ScopeGuildsJoin}, @@ -47,7 +48,7 @@ func discordCallback(c *gin.Context) { getDiscordUserGuilds(token) - c.String(200, "hello %s", dUser) + c.String(200, "hello %s", dUser.Username) } func getDiscordUser(token *oauth2.Token) (dUser discordUser, err error) { diff --git a/pkg/webserver/webserver.go b/pkg/webserver/webserver.go index b145735..3d5d218 100644 --- a/pkg/webserver/webserver.go +++ b/pkg/webserver/webserver.go @@ -2,11 +2,12 @@ package webserver import ( "fmt" + "net/http" + "time" + "github.com/fragforce/event-manager/pkg/event" "github.com/fragforce/event-manager/pkg/filestore" "github.com/gin-gonic/gin" - "net/http" - "time" ) func Start() { @@ -18,12 +19,13 @@ func Start() { // general pages s.GET("/", func(c *gin.Context) { - c.HTML(http.StatusOK, "index.html", nil) + c.HTML(http.StatusOK, "index.html", gin.H{ + "Title": "Home", + }) }) // teams s.GET("/teams", event.GetTeams) - s.GET("/:teamid", event.GetTeam) // login diff --git a/templates/html/event/event.html b/templates/html/event/event.html index e292df4..46bbff5 100644 --- a/templates/html/event/event.html +++ b/templates/html/event/event.html @@ -1,20 +1,23 @@ - + {{template "head" .Title}} {{template "navbar"}}
-

{{.team.Name}} {{.Event.Name}} Schedule

-
- {{ range $type, $shifts := .Shifts }} +

{{.Team.Name}} {{.Event.Name}} Schedule

+ {{if .Event.SignupEnabled}}

Signup Now

+
+
{{ range $type, $signup := .Signups }} +
+ +
{{ end }} +

{{end}} {{if .Shifts}} +
{{ range $type, $shifts := .Shifts }}
-
{{ $type }} shifts
- {{ range $shift := $shifts }} -
{{ $shift.Title }}
- {{ end }} -
- {{ end }} -
+
{{ $type }} shifts
{{ range $shift := $shifts }} +
{{ $shift.Title }}
{{ end }} +
{{ end }} +
{{ end }} {{template "scripts"}} diff --git a/templates/html/event/signup.html b/templates/html/event/signup.html index c8af422..e9a46e5 100644 --- a/templates/html/event/signup.html +++ b/templates/html/event/signup.html @@ -16,42 +16,43 @@

We'll never share your email with anyone else.
- {{range .questions}} -
+ {{range .questions}}
+ {{if eq .Type "text"}} - -
- {{end}} {{range .shifts}} + + {{else if eq .Type "checkbox"}} + + + {{end}} +
{{end}} -
+ {{range .shifts}}

-
-
- - {{end}}
diff --git a/templates/html/event/team.html b/templates/html/event/team.html index 5706d64..b665cf6 100644 --- a/templates/html/event/team.html +++ b/templates/html/event/team.html @@ -10,7 +10,7 @@

{{.teamName}} Events

Current Events

{{range .currentEvents}} - {{.Name}} + {{.Name}}
 {{end}}
@@ -19,7 +19,7 @@

Current Events

Future Events

{{range .futureEvents}} - {{.Name}} + {{.Name}}
 {{end}}
@@ -30,7 +30,7 @@

Future Events

Past Events

{{range .pastEvents}} - {{.Name}} + {{.Name}}
 {{end}}
diff --git a/templates/html/general/head.html b/templates/html/general/head.html index c5385c9..5b73bad 100644 --- a/templates/html/general/head.html +++ b/templates/html/general/head.html @@ -4,7 +4,6 @@ {{.}} - {{end}} diff --git a/templates/html/general/index.html b/templates/html/general/index.html index 74d0482..5cc5fa3 100644 --- a/templates/html/general/index.html +++ b/templates/html/general/index.html @@ -1,11 +1,6 @@ - - - Home - - {{template "head"}} - +{{template "head" .Title}} {{template "navbar"}} {{template "scripts"}} From dc20bd83c7126eb1131a2c4150ef62fe580ded1b Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Mon, 17 Apr 2023 14:40:04 -0400 Subject: [PATCH 5/8] update gitignore --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index d1e607f..cd0dfbb 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,6 @@ # Dependency directories (remove the comment below to include it) # vendor/ -.idea/* \ No newline at end of file +.idea/* + +config.yml \ No newline at end of file From 376565a49e0865aca5ab03df914e03d8597b67ff Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Mon, 17 Apr 2023 14:40:47 -0400 Subject: [PATCH 6/8] remove invalid config.yml config yml has been moved and added to the gitignore --- events/config.yml | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 events/config.yml diff --git a/events/config.yml b/events/config.yml deleted file mode 100644 index df1145c..0000000 --- a/events/config.yml +++ /dev/null @@ -1,4 +0,0 @@ -discord: - redirect_url: "http://localhost:8080/auth/discord/callback" - client_id: "353011020467404810" - client_secret: "CDIqEJ6oFMghx2xY0-JPTG4Q6fo6B1KO" \ No newline at end of file From 6a5db6edb7de6a74ab607596997311adf53bba3e Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Wed, 31 May 2023 08:40:38 -0400 Subject: [PATCH 7/8] start to support postgres Initial work on supporting postgres Clean up some webserver code Clean up secrets in code --- cmd/root.go | 77 ++++++++++++++++++++++++++++++++++++++ cmd/start.go | 29 ++++++++++++++ events/teams.yml | 13 ++++--- events/users.yml | 1 + go.mod | 25 ++++++++----- go.sum | 32 ++++++++++++++++ main.go | 12 +----- pkg/config/config.go | 47 ----------------------- pkg/database/database.go | 1 + pkg/event/events.go | 17 +++------ pkg/event/setup.go | 51 ++++++------------------- pkg/event/structs.go | 50 +++++++++++++------------ pkg/webserver/discord.go | 21 +++++++---- pkg/webserver/webserver.go | 45 ++++++++-------------- 14 files changed, 238 insertions(+), 183 deletions(-) create mode 100644 cmd/root.go create mode 100644 cmd/start.go delete mode 100644 pkg/config/config.go create mode 100644 pkg/database/database.go diff --git a/cmd/root.go b/cmd/root.go new file mode 100644 index 0000000..71a274e --- /dev/null +++ b/cmd/root.go @@ -0,0 +1,77 @@ +package cmd + +import ( + "github.com/sirupsen/logrus" + "github.com/spf13/cobra" + "github.com/spf13/viper" + "os" +) + +var ( + log = logrus.New() + verbose string + + cfgDir = "." + cfgFile = "config.yml" + config = viper.New() + + version = `v0.4.0` + asciiArt = ` __ __ + ____ ____ ______/ /_____ _____/ /__________ ____ + / __ \/ __ '/ ___/ //_/ _ \/ ___/ __/ ___/ __ \/ __ \ + / /_/ / /_/ / / / ,< / __/ / / /_/ / / /_/ / / / / + / .___/\__,_/_/ /_/|_|\___/_/ \__/_/ \____/_/ /_/ +/_/` +) + +var ( + rootCmd = &cobra.Command{ + Use: "event-manager", + Short: "event management software", + Long: `A software written to manage entire streaming events from fragforce`, + PreRun: setVerbose, + } +) + +// Execute adds all child commands to the root command and sets flags appropriately. +// This is called by main.main(). It only needs to happen once to the rootCmd. +func Execute() { + err := rootCmd.Execute() + if err != nil { + os.Exit(1) + } +} + +func init() { + rootCmd.PersistentFlags().StringVarP(&cfgFile, "file", "f", cfgFile, "config file name (default is 'config.yml'") + rootCmd.PersistentFlags().StringVarP(&cfgDir, "dir", "d", cfgDir, "config directory path (default is '.)") + rootCmd.PersistentFlags().StringVarP(&verbose, "verbosity", "v", logrus.InfoLevel.String(), "Log level (debug, info, warn, error") + + log.Info("starting event manager") + // If a config file is found, read it in. + config.AddConfigPath(cfgDir) + config.SetConfigType("yaml") + config.SetConfigName(cfgFile) + + err := config.ReadInConfig() + if err != nil { + log.Panic(err) + } + + log.Info("Using config file:", config.ConfigFileUsed()) +} + +func setVerbose(cmd *cobra.Command, args []string) { + switch verbose { + case "debug": + log.SetLevel(logrus.DebugLevel) + case "info": + log.SetLevel(logrus.DebugLevel) + case "warn": + log.SetLevel(logrus.WarnLevel) + case "error": + log.SetLevel(logrus.ErrorLevel) + default: + log.SetLevel(logrus.DebugLevel) + } +} diff --git a/cmd/start.go b/cmd/start.go new file mode 100644 index 0000000..d76b168 --- /dev/null +++ b/cmd/start.go @@ -0,0 +1,29 @@ +package cmd + +import ( + "github.com/fragforce/event-manager/pkg/webserver" + "github.com/spf13/cobra" +) + +// startCmd represents the start command +var startCmd = &cobra.Command{ + Use: "start", + Short: "Start manager and services", + Long: `Starts the event manager service manager`, + PreRun: setVerbose, + Run: func(cmd *cobra.Command, args []string) { + log.Debug("starting webserver") + webserver.Start(*config) + //log.Debug("starting sub-services") + }, +} + +func init() { + rootCmd.AddCommand(startCmd) + + // Here you will define your flags and configuration settings. + + // Cobra supports Persistent Flags which will work for this command + // and all subcommands, e.g.: + // startCmd.PersistentFlags().String("foo", "", "A help for foo") +} diff --git a/events/teams.yml b/events/teams.yml index bd2f06f..8acc876 100644 --- a/events/teams.yml +++ b/events/teams.yml @@ -1,12 +1,13 @@ -- team_id: 60ea1699-467b-452c-a4d4-3eb255d3f313 +--- +- guild_id: "164136635762606081" + team_id: 60ea1699-467b-452c-a4d4-3eb255d3f313 team_hash: 2e26389ac3 team_name: Fragforce - team_owner: be5917086c team_url: https://fragforce.org - guild_id: "164136635762606081" -- team_id: fd584d9d-8836-4b97-981d-15616ef25f7a + owner_hash: be5917086c +- guild_id: "164136635762606081" + team_id: fd584d9d-8836-4b97-981d-15616ef25f7a team_hash: 652a664362 team_name: Testing Team - team_owner: be5917086c team_url: https://fragforce.org - guild_id: "164136635762606081" \ No newline at end of file + owner_hash: be5917086c \ No newline at end of file diff --git a/events/users.yml b/events/users.yml index 1c51a15..233daee 100644 --- a/events/users.yml +++ b/events/users.yml @@ -1,4 +1,5 @@ --- - user_id: c2e752b3-1b51-48f1-9168-16866d707c37 user_hash: be5917086c + display_name: parkervcp discord_id: 122906021160026112 \ No newline at end of file diff --git a/go.mod b/go.mod index d20c2e7..bdecf83 100644 --- a/go.mod +++ b/go.mod @@ -5,13 +5,16 @@ go 1.19 require ( github.com/gin-gonic/gin v1.8.1 github.com/goccy/go-yaml v1.9.6 + github.com/parkervcp/discord-oauth2 v0.0.0-20221107213606-dc8497a5205c github.com/sirupsen/logrus v1.9.0 - github.com/spf13/viper v1.14.0 + github.com/spf13/viper v1.15.0 + golang.org/x/oauth2 v0.1.0 ) require ( github.com/fatih/color v1.13.0 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect + github.com/gin-contrib/sessions v0.0.5 // indirect github.com/gin-contrib/sse v0.1.0 // indirect github.com/go-playground/locales v0.14.0 // indirect github.com/go-playground/universal-translator v0.18.0 // indirect @@ -19,31 +22,35 @@ require ( github.com/goccy/go-json v0.9.11 // indirect github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect github.com/golang/protobuf v1.5.2 // indirect + github.com/google/uuid v1.3.0 // indirect + github.com/gorilla/context v1.1.1 // indirect + github.com/gorilla/securecookie v1.1.1 // indirect + github.com/gorilla/sessions v1.2.1 // indirect github.com/hashicorp/hcl v1.0.0 // indirect + github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/leodido/go-urn v1.2.1 // indirect - github.com/magiconair/properties v1.8.6 // indirect + github.com/magiconair/properties v1.8.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.16 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/parkervcp/discord-oauth2 v0.0.0-20221107213606-dc8497a5205c // indirect github.com/pelletier/go-toml v1.9.5 // indirect - github.com/pelletier/go-toml/v2 v2.0.5 // indirect + github.com/pelletier/go-toml/v2 v2.0.6 // indirect github.com/ravener/discord-oauth2 v0.0.0-20220615092331-f6a9839c223e // indirect github.com/spf13/afero v1.9.3 // indirect github.com/spf13/cast v1.5.0 // indirect + github.com/spf13/cobra v1.7.0 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/subosito/gotenv v1.4.1 // indirect + github.com/subosito/gotenv v1.4.2 // indirect github.com/ugorji/go/codec v1.2.7 // indirect github.com/zalando/gin-oauth2 v1.5.3 // indirect golang.org/x/crypto v0.3.0 // indirect - golang.org/x/net v0.2.0 // indirect - golang.org/x/oauth2 v0.1.0 // indirect - golang.org/x/sys v0.2.0 // indirect - golang.org/x/text v0.4.0 // indirect + golang.org/x/net v0.4.0 // indirect + golang.org/x/sys v0.3.0 // indirect + golang.org/x/text v0.5.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/protobuf v1.28.1 // indirect diff --git a/go.sum b/go.sum index 81da438..5ab5b47 100644 --- a/go.sum +++ b/go.sum @@ -46,6 +46,7 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -62,6 +63,8 @@ github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwV github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= +github.com/gin-contrib/sessions v0.0.5 h1:CATtfHmLMQrMNpJRgzjWXD7worTh7g7ritsQfmF+0jE= +github.com/gin-contrib/sessions v0.0.5/go.mod h1:vYAuaUPqie3WUSsft6HUlCjlwwoJQs97miaG2+7neKY= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= github.com/gin-gonic/gin v1.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8= @@ -144,15 +147,25 @@ github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= +github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= +github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8= +github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= +github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ= +github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= +github.com/gorilla/sessions v1.2.1 h1:DHd3rPN5lE3Ts3D8rKkQ8x/0kqfeNmBAaiSi+o7FsgI= +github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= +github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= @@ -170,6 +183,8 @@ github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w= github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= +github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= @@ -194,6 +209,8 @@ github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3v github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml/v2 v2.0.5 h1:ipoSadvV8oGUjnUbMub59IDPPwfxF694nG/jwbMiyQg= github.com/pelletier/go-toml/v2 v2.0.5/go.mod h1:OMHamSCAODeSsVrwwvcJOaoN0LIUIaFVNZzmWyNfXas= +github.com/pelletier/go-toml/v2 v2.0.6 h1:nrzqCb7j9cDFj2coyLNLaZuJTLjWjlaz6nvTvIwycIU= +github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= @@ -204,6 +221,7 @@ github.com/ravener/discord-oauth2 v0.0.0-20220615092331-f6a9839c223e/go.mod h1:P github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= +github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo= @@ -212,6 +230,8 @@ github.com/spf13/afero v1.9.3 h1:41FoI0fD7OR7mGcKE/aOiLkGreyf8ifIOQmJANWogMk= github.com/spf13/afero v1.9.3/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= +github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= +github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= @@ -220,8 +240,11 @@ github.com/spf13/viper v1.13.0 h1:BWSJ/M+f+3nmdz9bxB+bWX28kkALN2ok11D0rSo8EJU= github.com/spf13/viper v1.13.0/go.mod h1:Icm2xNL3/8uyh/wFuB1jI7TiTNKp8632Nwegu+zgdYw= github.com/spf13/viper v1.14.0 h1:Rg7d3Lo706X9tHsJMUjdiwMpHB7W8WnSVOssIY+JElU= github.com/spf13/viper v1.14.0/go.mod h1:WT//axPky3FdvXHzGw33dNdXXXfFQqmEalje+egj8As= +github.com/spf13/viper v1.15.0 h1:js3yy885G8xwJa6iOISGFwd+qlUo5AvyXb7CiihdtiU= +github.com/spf13/viper v1.15.0/go.mod h1:fFcTBJxvhhzSJiZy8n+PeW6t8l+KeT/uTARa0jHOQLA= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= @@ -230,8 +253,11 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/subosito/gotenv v1.4.1 h1:jyEFiXpy21Wm81FBN71l9VoMMV8H8jG+qIK3GCpY6Qs= github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= +github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= +github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= github.com/ugorji/go v1.2.7 h1:qYhyWUUd6WbiM+C6JZAUkIJt/1WrjzNHY9+KCIjVqTo= github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M= github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0= @@ -331,6 +357,8 @@ golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 h1:NWy5+hlRbC7HK+PmcXVUmW1IM golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU= golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= +golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU= +golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -404,6 +432,8 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ= +golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -417,6 +447,8 @@ golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM= +golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= diff --git a/main.go b/main.go index 75820d5..853ece7 100644 --- a/main.go +++ b/main.go @@ -1,15 +1,7 @@ package main -import ( - "github.com/fragforce/event-manager/pkg/event" - "github.com/fragforce/event-manager/pkg/webserver" - "log" -) +import "github.com/fragforce/event-manager/cmd" func main() { - err := event.LoadEvents() - if err != nil { - log.Panicln(err) - } - webserver.Start() + cmd.Execute() } diff --git a/pkg/config/config.go b/pkg/config/config.go deleted file mode 100644 index 7e1a992..0000000 --- a/pkg/config/config.go +++ /dev/null @@ -1,47 +0,0 @@ -package config - -import ( - "bufio" - "fmt" - "os" - "strings" -) - -func CreateConfig() (err error) { - if boolPrompt("Would you like to configure some services?") { - - } else { - fmt.Println("No services will be configured") - return - } - - return -} - -// stringPrompt asks for a string value using the label -func stringPrompt(label string) string { - var s string - r := bufio.NewReader(os.Stdin) - for { - fmt.Fprint(os.Stderr, label) - s, _ = r.ReadString('\n') - if s != "" { - break - } - } - return strings.TrimSpace(s) -} - -// boolPrompt asks for a string value using the label -func boolPrompt(label string) bool { - r := bufio.NewReader(os.Stdin) - // print question and options - fmt.Fprint(os.Stderr, label+" (y/N):") - input, _ := r.ReadString('\n') - switch strings.TrimSpace(input) { - case "y", "Y", "Yes", "yes": - return true - default: - return false - } -} diff --git a/pkg/database/database.go b/pkg/database/database.go new file mode 100644 index 0000000..636bab8 --- /dev/null +++ b/pkg/database/database.go @@ -0,0 +1 @@ +package database diff --git a/pkg/event/events.go b/pkg/event/events.go index c1d3273..3883050 100644 --- a/pkg/event/events.go +++ b/pkg/event/events.go @@ -7,11 +7,6 @@ import ( "github.com/gin-gonic/gin" ) -var ( - teams []Team - users []User -) - func GetEvent(c *gin.Context) { var thisTeam Team var thisEvent Event @@ -19,12 +14,12 @@ func GetEvent(c *gin.Context) { shifts := make(map[string][]Shift) signups := make(map[string][]Signup) - for _, team := range teams { - if team.Hash == c.Param("teamid") { - thisTeam = team - break - } - } + //for _, team := range teams.Get("") { + // if team.Hash == c.Param("teamid") { + // thisTeam = team + // break + // } + //} for _, event := range thisTeam.Events { if event.Hash == c.Param("eventid") { diff --git a/pkg/event/setup.go b/pkg/event/setup.go index 8ab2c4c..402a6fa 100644 --- a/pkg/event/setup.go +++ b/pkg/event/setup.go @@ -1,48 +1,19 @@ package event -import ( - "fmt" - "github.com/fragforce/event-manager/pkg/filestore" - "strings" -) - -func LoadEvents() (err error) { - err = filestore.ReadConfig("events/users.yml", &users) - if err != nil { - return err - } - - err = filestore.ReadConfig("events/teams.yml", &teams) - if err != nil { - return err - } +import "github.com/spf13/viper" - for tid, team := range teams { - var events []Event - err = filestore.ReadConfig(fmt.Sprintf("events/team/%s/events.yml", team.ID), &events) - if err != nil { - return err - } - - for eid, event := range events { - for sid, _ := range event.Signups { - for qid, _ := range event.Signups[sid].Questions { - event.Signups[sid].Questions[qid].LabelLower = - strings.ReplaceAll(strings.ToLower(event.Signups[sid].Questions[qid].Label), " ", "_") - } - } - - var shifts []Shift - err = filestore.ReadConfig(fmt.Sprintf("events/team/%s/%s/shifts.yml", team.ID, event.ID), &shifts) - if err != nil { - return err - } - events[eid].Shifts = shifts - } +var ( + users viper.Viper + teams viper.Viper + events viper.Viper +) - teams[tid].Events = events +func LoadEvents(config viper.Viper) (err error) { + teams.AddConfigPath(config.GetString("events.config.folder")) + teams.SetConfigFile("teams.yml") - } + users.AddConfigPath(config.GetString("events.config.folder")) + users.SetConfigFile("users.yml") return } diff --git a/pkg/event/structs.go b/pkg/event/structs.go index ef0b85a..e2d2bb2 100644 --- a/pkg/event/structs.go +++ b/pkg/event/structs.go @@ -2,23 +2,38 @@ package event import ( "time" + + "github.com/google/uuid" ) type User struct { - ID string `json:"user_id,omitempty"` - Hash string `json:"hash,omitempty"` - DiscordID string `json:"discord_id,omitempty"` - SalesforceOrgID string `json:"salesforce_id,omitempty"` - DonationURL string `json:"donation_url,omitempty"` + ID uuid.UUID `json:"user_id,omitempty" gorm:"type:uuid;default:uuid_generate_v4()"` + DiscordID string `json:"discord_id,omitempty" gorm:"uniqueIndex"` + Hash string `json:"hash,omitempty"` + SalesforceOrgID string `json:"salesforce_id,omitempty"` + DonationURL string `json:"donation_url,omitempty"` } type Team struct { - ID string `json:"team_id,omitempty"` - Hash string `json:"team_hash,omitempty"` - Name string `json:"team_name,omitempty"` - Owner string `json:"team_owner,omitempty"` - URL string `json:"team_url,omitempty"` - Events []Event `json:"events,omitempty"` + ID uuid.UUID `json:"team_id,omitempty" gorm:"type:uuid;default:uuid_generate_v4()"` + Name string `json:"team_name,omitempty" gorm:"uniqueIndex"` + Hash string `json:"team_hash,omitempty"` + Owner string `json:"team_owner,omitempty"` + URL string `json:"team_url,omitempty"` + Events []Event `json:"events,omitempty" gorm:"many2many:team_events;"` + Members []User `gorm:"many2many:team_members;"` +} + +type Event struct { + ID string `json:"event_id,omitempty"` + Hash string `json:"event_hash,omitempty"` + Finalized bool `json:"finalized,omitempty"` + Name string `json:"event_name,omitempty"` + Start time.Time `json:"event_start,omitempty"` + Length int `json:"event_length,omitempty"` + Participants []User `json:"participants,omitempty"` + Shifts []Shift `json:"shifts,omitempty"` + SignupEnabled bool `json:"signup_enabled,omitempty"` } type Question struct { @@ -54,16 +69,3 @@ type Shift struct { Signups []Signup `json:"signups,omitempty"` Questions []Question `json:"questions,omitempty"` } - -type Event struct { - ID string `json:"event_id,omitempty"` - Hash string `json:"event_hash,omitempty"` - Finalized bool `json:"finalized,omitempty"` - Name string `json:"event_name,omitempty"` - Start time.Time `json:"event_start,omitempty"` - Length int `json:"event_length,omitempty"` - Participants []User `json:"participants,omitempty"` - Shifts []Shift `json:"shifts,omitempty"` - SignupEnabled bool `json:"signup_enabled,omitempty"` - Signups []Signup -} diff --git a/pkg/webserver/discord.go b/pkg/webserver/discord.go index 0b887fd..56dd2c8 100644 --- a/pkg/webserver/discord.go +++ b/pkg/webserver/discord.go @@ -1,16 +1,17 @@ package webserver import ( + "context" + "encoding/json" "io" + "log" + "net/http" "github.com/gin-gonic/gin" "github.com/parkervcp/discord-oauth2" "golang.org/x/oauth2" - "context" - "encoding/json" - "log" - "net/http" + "github.com/spf13/viper" ) var ( @@ -18,14 +19,20 @@ var ( oauthConf discordOauth discordConfig = &oauth2.Config{ - RedirectURL: "http://localhost:8080/login/discord/callback", - ClientID: "353011020467404810", - ClientSecret: "CDIqEJ6oFMghx2xY0-JPTG4Q6fo6B1KO", + RedirectURL: "", + ClientID: "", + ClientSecret: "", Scopes: []string{discord.ScopeIdentify, discord.ScopeGuilds, discord.ScopeGuildsJoin}, Endpoint: discord.Endpoint, } ) +func loadDiscordOauth(config viper.Viper) { + discordConfig.RedirectURL = config.GetString("discord.oauth.redirect_utl") + discordConfig.ClientID = config.GetString("discord.oauth.client_id") + discordConfig.ClientSecret = config.GetString("discord.oauth.client_secret") +} + func discordRedirect(c *gin.Context) { c.Redirect(http.StatusTemporaryRedirect, discordConfig.AuthCodeURL(state)) } diff --git a/pkg/webserver/webserver.go b/pkg/webserver/webserver.go index 3d5d218..a5de195 100644 --- a/pkg/webserver/webserver.go +++ b/pkg/webserver/webserver.go @@ -1,22 +1,30 @@ package webserver import ( - "fmt" "net/http" - "time" "github.com/fragforce/event-manager/pkg/event" - "github.com/fragforce/event-manager/pkg/filestore" + + "github.com/gin-contrib/sessions" + "github.com/gin-contrib/sessions/cookie" "github.com/gin-gonic/gin" + + "github.com/spf13/viper" ) -func Start() { +func Start(config viper.Viper) { + loadDiscordOauth(config) + event.LoadEvents(config) + s := gin.New() s.LoadHTMLGlob("templates/html/*/*.html") s.Static("/images", "templates/images") s.Static("/css", "templates/styles") s.Static("/js", "templates/scripts") + store := cookie.NewStore([]byte(viper.GetString("secrets.webserver.session"))) + s.Use(sessions.Sessions("eventSessions", store)) + // general pages s.GET("/", func(c *gin.Context) { c.HTML(http.StatusOK, "index.html", gin.H{ @@ -29,7 +37,10 @@ func Start() { s.GET("/:teamid", event.GetTeam) // login - s.GET("/login", discordRedirect) + s.GET("/login", func(c *gin.Context) { + discordRedirect(c) + }) + //s.GET("/login", discordRedirect) s.GET("/login/discord/callback", discordCallback) // event @@ -48,27 +59,3 @@ func Start() { s.Run() } - -func Test() { - shiftStart, err := time.Parse("Mon Jan 02 3:04 AM 2006 MST", "Fri Nov 18 8:00 AM 2022 EST") - if err != nil { - fmt.Println(err) - } - - fmt.Println(shiftStart.Format("Mon, Jan 02 2006 3:04:05 PM +MST")) - - shifts := []event.Shift{ - event.Shift{ - ID: "f403fa5d-fe2c-4424-b0e2-8edab1b51858", - Type: "manager", - Title: "Manager Shift 1", - Length: 6, - Start: shiftStart.UTC(), - }, - } - err = filestore.UpdateConfig("events/shifts.yml", &shifts) - if err != nil { - fmt.Println(err) - } - -} From ea1c279b325444d3738a6e4761ba9f6e7605b154 Mon Sep 17 00:00:00 2001 From: Paulson McIntyre Date: Sat, 8 Jul 2023 10:15:27 -0400 Subject: [PATCH 8/8] Progress with json->gorm --- pkg/event/structs.go | 74 ++++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/pkg/event/structs.go b/pkg/event/structs.go index e2d2bb2..a58f84c 100644 --- a/pkg/event/structs.go +++ b/pkg/event/structs.go @@ -6,34 +6,35 @@ import ( "github.com/google/uuid" ) +// FIXME: Add FK Constraints: `constraint:OnUpdate:CASCADE,OnDelete:CASCADE;` + type User struct { - ID uuid.UUID `json:"user_id,omitempty" gorm:"type:uuid;default:uuid_generate_v4()"` - DiscordID string `json:"discord_id,omitempty" gorm:"uniqueIndex"` - Hash string `json:"hash,omitempty"` - SalesforceOrgID string `json:"salesforce_id,omitempty"` - DonationURL string `json:"donation_url,omitempty"` + ID uuid.UUID `json:"user_id,omitempty" gorm:"type:uuid;default:uuid_generate_v4();not null;primaryKey"` + DiscordID string `json:"discord_id,omitempty" gorm:"uniqueIndex;size:18;not null"` + DonationURL string `json:"donation_url,omitempty" gorm:"size:8192"` + Teams []*Team `gorm:"many2many:user_team_membership"` } type Team struct { - ID uuid.UUID `json:"team_id,omitempty" gorm:"type:uuid;default:uuid_generate_v4()"` - Name string `json:"team_name,omitempty" gorm:"uniqueIndex"` - Hash string `json:"team_hash,omitempty"` - Owner string `json:"team_owner,omitempty"` - URL string `json:"team_url,omitempty"` - Events []Event `json:"events,omitempty" gorm:"many2many:team_events;"` - Members []User `gorm:"many2many:team_members;"` + ID uuid.UUID `json:"team_id,omitempty" gorm:"type:uuid;default:uuid_generate_v4();not null;primaryKey"` + Name string `json:"team_name,omitempty" gorm:"uniqueIndex;not null"` + OwnerID uuid.UUID `json:"team_owner,omitempty" gorm:"not null"` + Owner *User `gorm:"foreignKey:ID;not null"` + SalesforceOrgID string `json:"salesforce_id,omitempty" gorm:"size:18"` + URL string `json:"team_url,omitempty"` + Events []*Event `json:"events,omitempty" gorm:"many2many:team_events;"` + Members []*User `gorm:"many2many:user_team_membership;"` } type Event struct { - ID string `json:"event_id,omitempty"` - Hash string `json:"event_hash,omitempty"` + ID string `json:"event_id,omitempty" gorm:"not null;primaryKey"` Finalized bool `json:"finalized,omitempty"` - Name string `json:"event_name,omitempty"` + Name string `json:"event_name,omitempty" gorm:"uniqueIndex;not null"` Start time.Time `json:"event_start,omitempty"` Length int `json:"event_length,omitempty"` - Participants []User `json:"participants,omitempty"` - Shifts []Shift `json:"shifts,omitempty"` + Shifts []*Shift `json:"shifts,omitempty" gorm:"foreignKey:ID"` SignupEnabled bool `json:"signup_enabled,omitempty"` + Teams []*Team `gorm:"many2many:team_events"` } type Question struct { @@ -45,27 +46,26 @@ type Question struct { } type Signup struct { - Type string `json:"type,omitempty"` - UserID string `json:"user_id,omitempty"` - Questions []Question `json:"questions,omitempty"` - HasGame bool `json:"has_game,omitempty"` - Game string `json:"game,omitempty"` - PlayersNeeded bool `json:"players_needed,omitempty"` - PlayerCount int `json:"player_count,omitempty"` + Type string `json:"type,omitempty"` + OwnerID string `json:"user_id,omitempty"` + Questions []*Question `json:"questions,omitempty"` + HasGame bool `json:"has_game,omitempty"` + Game string `json:"game,omitempty"` + PlayersNeeded bool `json:"players_needed,omitempty"` + PlayerCount int `json:"player_count,omitempty"` } type Shift struct { - Type string `json:"type,omitempty"` - ID string `json:"shift_id,omitempty"` - Hash string `json:"hash,omitempty"` - UserID string `json:"user_id,omitempty"` - Title string `json:"title,omitempty"` - HasGame bool `json:"hasGame,omitempty"` - Game string `json:"game,omitempty"` - Start time.Time `json:"start,omitempty"` - Length int `json:"length,omitempty"` - MaxPlayers int `json:"max_players,omitempty"` - Players []User `json:"players,omitempty"` - Signups []Signup `json:"signups,omitempty"` - Questions []Question `json:"questions,omitempty"` + Type string `json:"type,omitempty"` + ID string `json:"shift_id,omitempty"` + OwnerID string `json:"user_id,omitempty"` + Title string `json:"title,omitempty"` + HasGame bool `json:"hasGame,omitempty"` + Game string `json:"game,omitempty"` + Start time.Time `json:"start,omitempty"` + Length int `json:"length,omitempty"` + MaxPlayers int `json:"max_players,omitempty"` + Players []*User `json:"players,omitempty"` + Signups []*Signup `json:"signups,omitempty"` + Questions []*Question `json:"questions,omitempty"` }