Merge pull request #54 from vidar-team/dev

v0.6.1
05sec · Jul 15, 2020 · ca58fce · ca58fce
2 parents 97618c0 + 4959aa8
commit ca58fce
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 2 deletions.
diff --git a/go.mod b/go.mod
@@ -44,7 +44,7 @@ require (
 	github.com/theplant/htmltestingutils v0.0.0-20190423050759-0e06de7b6967 // indirect
 	github.com/theplant/testingutils v0.0.0-20190603093022-26d8b4d95c61 // indirect
 	github.com/vidar-team/Cardinal_frontend v0.5.2-alpha
-	github.com/vidar-team/Cardinal_manager_frontend v0.6.0
+	github.com/vidar-team/Cardinal_manager_frontend v0.6.1
 	github.com/yosssi/gohtml v0.0.0-20200424144038-a48de20dd9dd // indirect
 	golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd
 	golang.org/x/text v0.3.0

diff --git a/go.sum b/go.sum
@@ -173,6 +173,8 @@ github.com/vidar-team/Cardinal_manager_frontend v0.5.2-alpha h1:xgXwPqXCjHiHVQC7
 github.com/vidar-team/Cardinal_manager_frontend v0.5.2-alpha/go.mod h1:uJBQtuXHTLNyuIMONoM1OqYmW7Q/N40+587Qt90kqAk=
 github.com/vidar-team/Cardinal_manager_frontend v0.6.0 h1:OMsb3O7raah7r37ppyjm83iMnV4B+1OTWG38VTuT0T8=
 github.com/vidar-team/Cardinal_manager_frontend v0.6.0/go.mod h1:uJBQtuXHTLNyuIMONoM1OqYmW7Q/N40+587Qt90kqAk=
+github.com/vidar-team/Cardinal_manager_frontend v0.6.1 h1:R3h/YovMTtAsteNb2pVAQM/fr3whculO4JeRXzs9Hu0=
+github.com/vidar-team/Cardinal_manager_frontend v0.6.1/go.mod h1:uJBQtuXHTLNyuIMONoM1OqYmW7Q/N40+587Qt90kqAk=
 github.com/yosssi/gohtml v0.0.0-20200424144038-a48de20dd9dd h1:LxsPdxzQnF9yE7Xv/1Ln8C8JJbEh1SlRyIDvgR/bsKg=
 github.com/yosssi/gohtml v0.0.0-20200424144038-a48de20dd9dd/go.mod h1:+ccdNT0xMY1dtc5XBxumbYfOUhmduiGudqaDgD2rVRE=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=

diff --git a/src/asteroid.go b/src/asteroid.go
@@ -3,6 +3,7 @@ package main
 import (
 	"github.com/gin-gonic/gin"
 	"github.com/vidar-team/Cardinal/src/asteroid"
+	"github.com/vidar-team/Cardinal/src/conf"
 	"github.com/vidar-team/Cardinal/src/locales"
 	"github.com/vidar-team/Cardinal/src/utils"
 )
@@ -20,6 +21,7 @@ func (s *Service) asteroidGreetData() (result asteroid.Greet) {
 		})
 	}
 
+	result.Title = conf.Get().Title
 	result.Team = asteroidTeam
 	result.Time = s.Timer.RoundRemainTime
 	result.Round = s.Timer.NowRound

diff --git a/src/asteroid/handler.go b/src/asteroid/handler.go
@@ -13,7 +13,7 @@ const (
 )
 
 var hub *Hub
-var refresh func() Greet // Used to get team, score, time data.
+var refresh func() Greet // Used to get title, team, score, time data.
 
 // InitAsteroid is used to init the asteroid. A function will be given to get the team rank data.
 func InitAsteroid(function func() Greet) {

diff --git a/src/asteroid/model.go b/src/asteroid/model.go
@@ -10,6 +10,7 @@ type Team struct {
 
 // Greet will been sent when the client connect to the server firstly.
 type Greet struct {
+	Title string
 	Time  int
 	Round int
 	Team  []Team