update
This commit is contained in:
parent
e9e93e2162
commit
d53369f529
BIN
FlexDXCluster.exe
Normal file
BIN
FlexDXCluster.exe
Normal file
Binary file not shown.
@ -26,9 +26,10 @@ type HTTPServer struct {
|
||||
Repo FlexDXClusterRepository
|
||||
Log *log.Logger
|
||||
FlexClient FlexClient
|
||||
TCPServer TCPServer
|
||||
}
|
||||
|
||||
func NewHTTPServer(cRepo Log4OMContactsRepository, fRepo FlexDXClusterRepository, fClient FlexClient, log *log.Logger) *HTTPServer {
|
||||
func NewHTTPServer(cRepo Log4OMContactsRepository, fRepo FlexDXClusterRepository, FlexClient *FlexClient, TCPServer *TCPServer, log *log.Logger) *HTTPServer {
|
||||
|
||||
gRouter := mux.NewRouter()
|
||||
|
||||
@ -37,7 +38,8 @@ func NewHTTPServer(cRepo Log4OMContactsRepository, fRepo FlexDXClusterRepository
|
||||
Log4OMRepo: cRepo,
|
||||
Repo: fRepo,
|
||||
Log: log,
|
||||
FlexClient: fClient,
|
||||
FlexClient: *FlexClient,
|
||||
TCPServer: *TCPServer,
|
||||
}
|
||||
}
|
||||
|
||||
@ -47,6 +49,8 @@ func (s *HTTPServer) SetRoutes() {
|
||||
s.router.HandleFunc("/spotscount", s.GetSpotsCount).Methods("GET")
|
||||
s.router.HandleFunc("/spotters", s.GetSpotters).Methods("GET")
|
||||
s.router.HandleFunc("/new", s.GetNew).Methods("GET")
|
||||
|
||||
s.router.PathPrefix("/images/").Handler(http.StripPrefix("/images/", http.FileServer(http.Dir("./images/"))))
|
||||
}
|
||||
|
||||
func (s *HTTPServer) StartHTTPServer() {
|
||||
|
||||
@ -39,6 +39,7 @@ func NewTCPServer(address string, port string, log *log.Logger) *TCPServer {
|
||||
MsgChan: make(chan string),
|
||||
CmdChan: make(chan string),
|
||||
Log: log,
|
||||
Mutex: new(sync.Mutex),
|
||||
}
|
||||
}
|
||||
|
||||
@ -87,7 +88,6 @@ func (s *TCPServer) handleConnection() {
|
||||
s.Mutex.Lock()
|
||||
delete(s.Clients, s.Conn)
|
||||
s.Mutex.Unlock()
|
||||
s.Log.Infof("client %s disconnected", s.Conn.RemoteAddr().String())
|
||||
return
|
||||
}
|
||||
|
||||
@ -98,6 +98,7 @@ func (s *TCPServer) handleConnection() {
|
||||
s.Mutex.Lock()
|
||||
delete(s.Clients, s.Conn)
|
||||
s.Mutex.Unlock()
|
||||
s.Conn.Close()
|
||||
s.Log.Infof("client %s disconnected", s.Conn.RemoteAddr().String())
|
||||
}
|
||||
|
||||
|
||||
BIN
flex.sqlite
Normal file
BIN
flex.sqlite
Normal file
Binary file not shown.
12
flexradio.go
12
flexradio.go
@ -52,10 +52,10 @@ type FlexClient struct {
|
||||
FlexSpotChan chan FlexSpot
|
||||
Repo FlexDXClusterRepository
|
||||
Log *log.Logger
|
||||
TCPServer TCPServer
|
||||
TCPServer *TCPServer
|
||||
}
|
||||
|
||||
func NewFlexClient(repo FlexDXClusterRepository, TCPServer TCPServer, log *log.Logger) *FlexClient {
|
||||
func NewFlexClient(repo FlexDXClusterRepository, TCPServer *TCPServer, log *log.Logger) *FlexClient {
|
||||
return &FlexClient{
|
||||
Address: Cfg.Flex.IP,
|
||||
Port: "4992",
|
||||
@ -73,7 +73,7 @@ func (fc *FlexClient) StartFlexClient() {
|
||||
|
||||
addr, err := net.ResolveTCPAddr("tcp", fc.Address+":"+fc.Port)
|
||||
if err != nil {
|
||||
fc.Log.Error("cannot resolve Telnet Client address:", err)
|
||||
fc.Log.Error("cannot resolve Telnet Client address")
|
||||
}
|
||||
|
||||
fc.LogWriter = bufio.NewWriter(os.Stdout)
|
||||
@ -81,7 +81,7 @@ func (fc *FlexClient) StartFlexClient() {
|
||||
fc.Timeout = 600 * time.Second
|
||||
fc.Conn, err = net.DialTCP("tcp", nil, addr)
|
||||
if err != nil {
|
||||
fc.Log.Error("could not connect to flex radio, exiting...", err)
|
||||
fc.Log.Errorf("could not connect to flex radio on %s, exiting...", Cfg.Flex.IP)
|
||||
os.Exit(1)
|
||||
}
|
||||
fc.Log.Infof("connected to flex radio at %s:%s", fc.Address, fc.Port)
|
||||
@ -97,7 +97,7 @@ func (fc *FlexClient) StartFlexClient() {
|
||||
|
||||
err = fc.Conn.SetKeepAlive(true)
|
||||
if err != nil {
|
||||
fc.Log.Error("error while setting keep alive:", err)
|
||||
fc.Log.Error("error while setting keep alive")
|
||||
}
|
||||
|
||||
go fc.ReadLine()
|
||||
@ -184,7 +184,7 @@ func (fc *FlexClient) SendSpottoFlex(spot TelnetSpot) {
|
||||
flexSpot.DX, flexSpot.Mode, flexSpot.Source, flexSpot.SpotterCallsign, flexSpot.TimeStamp, flexSpot.LifeTime, flexSpot.Comment, flexSpot.Color, flexSpot.BackgroundColor, flexSpot.Priority)
|
||||
CommandNumber++
|
||||
|
||||
} else if srcFlexSpot.DX != "" && srcFlexSpot.Band == flexSpot.Band && srcFlexSpot.FrequencyMhz != flexSpot.FrequencyMhz {
|
||||
} else if srcFlexSpot.DX != "" && srcFlexSpot.Band == flexSpot.Band {
|
||||
fc.Repo.UpdateSpotSameBand(flexSpot)
|
||||
stringSpot = fmt.Sprintf("C%v|spot set %v rx_freq=%v callsign=%s mode=%s source=%s spotter_callsign=%s timestamp=%v lifetime_seconds=%s comment=%s color=%s background_color=%s priority=%s", flexSpot.CommandNumber, srcFlexSpot.FlexSpotNumber, flexSpot.FrequencyMhz,
|
||||
flexSpot.DX, flexSpot.Mode, flexSpot.Source, flexSpot.SpotterCallsign, flexSpot.TimeStamp, flexSpot.LifeTime, flexSpot.Comment, flexSpot.Color, flexSpot.BackgroundColor, flexSpot.Priority)
|
||||
|
||||
76
flexradio.log
Normal file
76
flexradio.log
Normal file
@ -0,0 +1,76 @@
|
||||
[30-09-2024 23:19:22] INFO config loaded.
|
||||
[30-09-2024 23:19:22] INFO Callsign: XV9Q
|
||||
[30-09-2024 23:19:22] INFO deleting existing database
|
||||
[30-09-2024 23:19:22] INFO Opening SQLite database
|
||||
[30-09-2024 23:19:22] INFO telnet server listening on 0.0.0.0:7301
|
||||
[30-09-2024 23:19:22] INFO starting HTTP server on 0.0.0.0:3000
|
||||
[30-09-2024 23:19:22] INFO connected to flex radio at 10.10.10.120:4992
|
||||
[30-09-2024 23:19:22] DEBUG Subscribed to spot on FlexRadio and Deleted all spots from panadapter
|
||||
[30-09-2024 23:19:22] INFO connected to DX cluster dxc.k0xm.net:7300
|
||||
[30-09-2024 23:19:23] DEBUG Found login prompt...sending callsign
|
||||
[30-09-2024 23:19:25] DEBUG Skimmer is on as defined in the config file
|
||||
[30-09-2024 23:19:25] DEBUG FT8 is off as defined in the config file
|
||||
[30-09-2024 23:19:26] INFO start receiving spots
|
||||
[30-09-2024 23:19:27] DEBUG DX: OM2NW - Spotter: TF3Y - Freq: 14018.0 - Band: 20M - Mode: CW - Comment: 19 dB 29 WPM CQ - Time: 1619Z - DXCC: 504
|
||||
[30-09-2024 23:19:27] DEBUG DX: G3PJT - Spotter: TF3Y - Freq: 24905.1 - Band: 12M - Mode: CW - Comment: 10 dB 24 WPM CQ - Time: 1619Z - DXCC: 223
|
||||
[30-09-2024 23:19:28] DEBUG (** New Band **) DX: ON4EM - Spotter: YO2MAX - Freq: 7020.0 - Band: 40M - Mode: CW - Comment: 21 dB 36 WPM CQ - Time: 1619Z - DXCC: 209
|
||||
[30-09-2024 23:19:28] DEBUG (** New Band **) DX: DL250CDF - Spotter: RK3TD - Freq: 7021.0 - Band: 40M - Mode: CW - Comment: 22 dB 21 WPM CQ - Time: 1619Z - DXCC: 230
|
||||
[30-09-2024 23:19:28] DEBUG DX: M0KJN - Spotter: UY2RA - Freq: 14033.5 - Band: 20M - Mode: CW - Comment: 4 dB 18 WPM CQ - Time: 1619Z - DXCC: 223
|
||||
[30-09-2024 23:19:29] DEBUG (** New Band **) DX: PU2TIN - Spotter: MW0MUT - Freq: 7016.9 - Band: 40M - Mode: CW - Comment: 11 dB 28 WPM CQ - Time: 1619Z - DXCC: 108
|
||||
[30-09-2024 23:19:29] DEBUG (** New Band **) DX: OL4W - Spotter: G4ZFE - Freq: 7036.5 - Band: 40M - Mode: CW - Comment: 4 dB 29 WPM CQ - Time: 1619Z - DXCC: 503
|
||||
[30-09-2024 23:19:29] DEBUG (** New Band **) DX: G4ARI - Spotter: DE1LON - Freq: 7028.0 - Band: 40M - Mode: CW - Comment: 4 dB 19 WPM CQ - Time: 1619Z - DXCC: 223
|
||||
[30-09-2024 23:19:30] DEBUG DX: F8GFA - Spotter: S53WW - Freq: 14058.9 - Band: 20M - Mode: CW - Comment: 18 dB 21 WPM CQ - Time: 1619Z - DXCC: 227
|
||||
[30-09-2024 23:19:30] DEBUG (** New Band **) DX: LZ5DI - Spotter: LZ4UX - Freq: 7022.0 - Band: 40M - Mode: CW - Comment: 18 dB 33 WPM CQ - Time: 1619Z - DXCC: 212
|
||||
[30-09-2024 23:19:32] DEBUG DX: SN5N - Spotter: RN4WA - Freq: 7032.0 - Band: 40M - Mode: CW - Comment: 11 dB 26 WPM CQ - Time: 1619Z - DXCC: 269
|
||||
[30-09-2024 23:19:33] DEBUG DX: SN5N - Spotter: OG66X - Freq: 7032.0 - Band: 40M - Mode: CW - Comment: 32 dB 26 WPM CQ - Time: 1619Z - DXCC: 269
|
||||
[30-09-2024 23:19:34] DEBUG DX: PA1FP - Spotter: DD5XX - Freq: 21019.5 - Band: 15M - Mode: CW - Comment: 10 dB 24 WPM CQ - Time: 1619Z - DXCC: 263
|
||||
[30-09-2024 23:19:35] DEBUG DX: OV1CDX - Spotter: CT7ANO - Freq: 28036.2 - Band: 10M - Mode: CW - Comment: 27 dB 18 WPM CQ - Time: 1619Z - DXCC: 221
|
||||
[30-09-2024 23:19:35] DEBUG DX: DL5CX - Spotter: HG8A - Freq: 10109.7 - Band: 30M - Mode: CW - Comment: 8 dB 22 WPM CQ - Time: 1619Z - DXCC: 230
|
||||
[30-09-2024 23:19:36] DEBUG DX: EA4JI - Spotter: KM3T - Freq: 21045.0 - Band: 15M - Mode: CW - Comment: 6 dB 30 WPM CQ - Time: 1619Z - DXCC: 281
|
||||
[30-09-2024 23:19:37] DEBUG DX: I1IM - Spotter: G0KTN - Freq: 10112.5 - Band: 30M - Mode: CW - Comment: 16 dB 18 WPM CQ - Time: 1619Z - DXCC: 248
|
||||
[30-09-2024 23:19:38] DEBUG DX: IK6JOV - Spotter: F4GOU - Freq: 10119.0 - Band: 30M - Mode: CW - Comment: 18 dB 29 WPM CQ - Time: 1619Z - DXCC: 248
|
||||
[30-09-2024 23:19:40] DEBUG (** New Band **) DX: F4GMM - Spotter: MM3NDH - Freq: 7012.5 - Band: 40M - Mode: CW - Comment: 14 dB 18 WPM CQ - Time: 1619Z - DXCC: 227
|
||||
[30-09-2024 23:19:41] DEBUG (** Worked **) DX: E75M - Spotter: F8DGY - Freq: 14021.5 - Band: 20M - Mode: CW - Comment: 25 dB 33 WPM CQ - Time: 1619Z - DXCC: 501
|
||||
[30-09-2024 23:19:41] DEBUG DX: E75M - Spotter: F8DGY - Freq: 14021.5 - Band: 20M - Mode: CW - Comment: 25 dB 33 WPM CQ - Time: 1619Z - DXCC: 501
|
||||
[30-09-2024 23:19:43] DEBUG DX: KB6FPW - Spotter: K9LC - Freq: 18083.0 - Band: 17M - Mode: CW - Comment: 21 dB 19 WPM CQ - Time: 1619Z - DXCC: 291
|
||||
[30-09-2024 23:19:43] DEBUG DX: DL3ARH - Spotter: YO4RDW - Freq: 21021.9 - Band: 15M - Mode: CW - Comment: 4 dB 25 WPM CQ - Time: 1619Z - DXCC: 230
|
||||
[30-09-2024 23:19:44] DEBUG DX: Z32LM - Spotter: DK9IP - Freq: 18076.9 - Band: 17M - Mode: CW - Comment: 16 dB 15 WPM CQ - Time: 1619Z - DXCC: 502
|
||||
[30-09-2024 23:19:44] DEBUG DX: N9JF - Spotter: VE3EID - Freq: 14043.1 - Band: 20M - Mode: CW - Comment: 30 dB 23 WPM CQ - Time: 1619Z - DXCC: 291
|
||||
[30-09-2024 23:19:46] DEBUG DX: OL80CARBON - Spotter: OH6BG - Freq: 14042.0 - Band: 20M - Mode: CW - Comment: 15 dB 22 WPM CQ - Time: 1619Z - DXCC: 503
|
||||
[30-09-2024 23:19:46] DEBUG DX: I2NKR - Spotter: N9CO - Freq: 21015.0 - Band: 15M - Mode: CW - Comment: 18 dB 25 WPM CQ - Time: 1619Z - DXCC: 248
|
||||
[30-09-2024 23:19:46] DEBUG DX: W6AWG - Spotter: N9CO - Freq: 14040.0 - Band: 20M - Mode: CW - Comment: 18 dB 21 WPM CQ - Time: 1619Z - DXCC: 291
|
||||
[30-09-2024 23:19:47] DEBUG DX: I2JIN - Spotter: RK3TD - Freq: 14034.9 - Band: 20M - Mode: CW - Comment: 37 dB 22 WPM CQ - Time: 1619Z - DXCC: 248
|
||||
[30-09-2024 23:19:47] DEBUG DX: KB6FPW - Spotter: VE6JY - Freq: 18083.1 - Band: 17M - Mode: CW - Comment: 33 dB 19 WPM CQ - Time: 1619Z - DXCC: 291
|
||||
[30-09-2024 23:19:48] DEBUG DX: OZ4ADX - Spotter: ON6ZQ - Freq: 10108.0 - Band: 30M - Mode: CW - Comment: 19 dB 25 WPM CQ - Time: 1619Z - DXCC: 221
|
||||
[30-09-2024 23:19:48] DEBUG DX: N1ZF - Spotter: G0KTN - Freq: 28061.9 - Band: 10M - Mode: CW - Comment: 4 dB 20 WPM CQ - Time: 1619Z - DXCC: 291
|
||||
[30-09-2024 23:19:49] DEBUG DX: R9AAB - Spotter: DR4W - Freq: 7017.0 - Band: 40M - Mode: CW - Comment: 10 dB 23 WPM CQ - Time: 1619Z - DXCC: 15
|
||||
[30-09-2024 23:19:49] DEBUG DX: HA2EOU - Spotter: DF2CK - Freq: 28023.4 - Band: 10M - Mode: CW - Comment: 6 dB 27 WPM CQ - Time: 1619Z - DXCC: 239
|
||||
[30-09-2024 23:19:49] DEBUG DX: VR2B - Spotter: DF2CK - Freq: 21150.0 - Band: 15M - Mode: CW - Comment: 16 dB 19 WPM NCDXF BCN - Time: 1619Z - DXCC: 321
|
||||
[30-09-2024 23:19:51] DEBUG DX: ZS6DN - Spotter: VK2GEL - Freq: 14100.0 - Band: 20M - Mode: CW - Comment: 11 dB 19 WPM NCDXF BCN - Time: 1619Z - DXCC: 462
|
||||
[30-09-2024 23:19:51] DEBUG DX: SN4D - Spotter: F8DGY - Freq: 7031.5 - Band: 40M - Mode: CW - Comment: 14 dB 24 WPM CQ - Time: 1619Z - DXCC: 269
|
||||
[30-09-2024 23:19:52] DEBUG DX: RA3QTT - Spotter: AC0C - Freq: 24899.0 - Band: 12M - Mode: CW - Comment: 8 dB 22 WPM CQ - Time: 1619Z - DXCC: 54
|
||||
[30-09-2024 23:19:54] DEBUG (** New Band **) DX: DL9DBI - Spotter: OE6TZE - Freq: 7024.5 - Band: 40M - Mode: CW - Comment: 18 dB 25 WPM CQ - Time: 1619Z - DXCC: 230
|
||||
[30-09-2024 23:19:54] DEBUG DX: ON4ERM - Spotter: DL8LAS - Freq: 10104.6 - Band: 30M - Mode: CW - Comment: 22 dB 22 WPM CQ - Time: 1619Z - DXCC: 209
|
||||
[30-09-2024 23:19:58] DEBUG DX: VU2TMP - Spotter: LZ5DI - Freq: 28029.0 - Band: 10M - Mode: CW - Comment: 14 dB 28 WPM CQ - Time: 1619Z - DXCC: 324
|
||||
[30-09-2024 23:20:02] DEBUG DX: DH3JZ - Spotter: W1NT - Freq: 24898.0 - Band: 12M - Mode: CW - Comment: 14 dB 22 WPM CQ - Time: 1620Z - DXCC: 230
|
||||
[30-09-2024 23:20:02] DEBUG DX: N3JT - Spotter: MM3NDH - Freq: 21015.0 - Band: 15M - Mode: CW - Comment: 35 dB 25 WPM CQ - Time: 1620Z - DXCC: 291
|
||||
[30-09-2024 23:20:05] DEBUG (** New Band **) DX: SN4X - Spotter: SE5E - Freq: 3543.0 - Band: 80M - Mode: CW - Comment: 21 dB 26 WPM CQ - Time: 1620Z - DXCC: 269
|
||||
[30-09-2024 23:20:09] DEBUG DX: 4X6TU - Spotter: DF2CK - Freq: 14100.0 - Band: 20M - Mode: CW - Comment: 16 dB 21 WPM NCDXF BCN - Time: 1620Z - DXCC: 997
|
||||
[30-09-2024 23:20:10] DEBUG DX: R7KBB - Spotter: DF2CK - Freq: 14017.1 - Band: 20M - Mode: CW - Comment: 31 dB 21 WPM CQ - Time: 1620Z - DXCC: 54
|
||||
[30-09-2024 23:20:10] DEBUG DX: DK7LX - Spotter: W8WWV - Freq: 28022.9 - Band: 10M - Mode: CW - Comment: 7 dB 25 WPM CQ - Time: 1620Z - DXCC: 230
|
||||
[30-09-2024 23:20:11] DEBUG DX: G0VJH - Spotter: DM5GG - Freq: 14045.0 - Band: 20M - Mode: CW - Comment: 14 dB 13 WPM CQ - Time: 1620Z - DXCC: 223
|
||||
[30-09-2024 23:20:14] DEBUG (** New DXCC **) DX: C30P - Spotter: KM3T - Freq: 28256.0 - Band: 10M - Mode: CW - Comment: 3 dB 20 WPM BEACON - Time: 1620Z - Command: 0, FlexSpot: 0
|
||||
[30-09-2024 23:20:14] DEBUG DX: F6HKA - Spotter: K9LC - Freq: 28051.0 - Band: 10M - Mode: CW - Comment: 13 dB 14 WPM CQ - Time: 1620Z - DXCC: 227
|
||||
[30-09-2024 23:20:15] DEBUG DX: VA4ADM - Spotter: G4IRN - Freq: 18081.0 - Band: 17M - Mode: CW - Comment: 23 dB 25 WPM CQ - Time: 1620Z - DXCC: 1
|
||||
[30-09-2024 23:20:15] DEBUG DX: VA3CWT - Spotter: SQ5OUO - Freq: 28027.2 - Band: 10M - Mode: CW - Comment: 9 dB 24 WPM CQ - Time: 1620Z - DXCC: 1
|
||||
[30-09-2024 23:20:16] DEBUG (** New Band **) DX: RU3X - Spotter: SE5E - Freq: 3514.0 - Band: 80M - Mode: CW - Comment: 7 dB 20 WPM CQ - Time: 1620Z - DXCC: 54
|
||||
[30-09-2024 23:20:16] DEBUG DX: NO5Z - Spotter: CT7ANO - Freq: 28007.2 - Band: 10M - Mode: CW - Comment: 9 dB 25 WPM CQ - Time: 1620Z - DXCC: 291
|
||||
[30-09-2024 23:20:16] DEBUG (** New Band **) DX: G0JRM - Spotter: DK9IP - Freq: 7037.0 - Band: 40M - Mode: CW - Comment: 19 dB 13 WPM CQ - Time: 1620Z - DXCC: 223
|
||||
[30-09-2024 23:20:19] DEBUG DX: OH2B - Spotter: LZ5DI - Freq: 14100.0 - Band: 20M - Mode: CW - Comment: 8 dB 21 WPM NCDXF BCN - Time: 1620Z - DXCC: 997
|
||||
[30-09-2024 23:20:19] DEBUG DX: 4X6TU - Spotter: LZ5DI - Freq: 18110.0 - Band: 17M - Mode: CW - Comment: 11 dB 22 WPM NCDXF BCN - Time: 1620Z - DXCC: 997
|
||||
[30-09-2024 23:20:20] DEBUG DX: DL1ROT - Spotter: ZL4YL - Freq: 14015.1 - Band: 20M - Mode: CW - Comment: 16 dB 23 WPM CQ - Time: 1620Z - DXCC: 230
|
||||
[30-09-2024 23:20:21] DEBUG DX: K5AB - Spotter: DM5GG - Freq: 28280.0 - Band: 10M - Mode: CW - Comment: 10 dB 14 WPM BEACON - Time: 1620Z - DXCC: 291
|
||||
[30-09-2024 23:20:22] DEBUG (** New Band **) DX: IW0QLQ - Spotter: IU5KZF - Freq: 7145.0 - Band: 40M - Mode: LSB - Comment: - Time: 1620Z - DXCC: 248
|
||||
[30-09-2024 23:20:24] DEBUG DX: IK6RHT - Spotter: UA4CC - Freq: 14010.1 - Band: 20M - Mode: CW - Comment: 10 dB 19 WPM CQ - Time: 1620Z - DXCC: 248
|
||||
[30-09-2024 23:20:25] DEBUG DX: PA3AAV - Spotter: TF3Y - Freq: 7020.5 - Band: 40M - Mode: CW - Comment: 18 dB 32 WPM CQ - Time: 1620Z - DXCC: 263
|
||||
[30-09-2024 23:20:27] DEBUG (** New Band **) DX: IX1HPN - Spotter: IZ8STJ - Freq: 7128.0 - Band: 40M - Mode: LSB - Comment: - Time: 1620Z - DXCC: 248
|
||||
BIN
images/background.jpg
Normal file
BIN
images/background.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.2 MiB |
BIN
images/background2.jpg
Normal file
BIN
images/background2.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.3 MiB |
BIN
images/background3.jpg
Normal file
BIN
images/background3.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 95 KiB |
BIN
images/logo.png
Normal file
BIN
images/logo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 25 KiB |
5
main.go
5
main.go
@ -53,9 +53,10 @@ func main() {
|
||||
defer cRepo.db.Close()
|
||||
|
||||
TCPServer := NewTCPServer(cfg.TelnetServer.Host, cfg.TelnetServer.Port, log)
|
||||
FlexClient := NewFlexClient(*fRepo, *TCPServer, log)
|
||||
|
||||
FlexClient := NewFlexClient(*fRepo, TCPServer, log)
|
||||
TCPClient := NewTCPClient(TCPServer, FlexClient, log)
|
||||
HTTPServer := NewHTTPServer(*cRepo, *fRepo, *FlexClient, log)
|
||||
HTTPServer := NewHTTPServer(*cRepo, *fRepo, FlexClient, TCPServer, log)
|
||||
|
||||
sigCh := make(chan os.Signal, 1)
|
||||
signal.Notify(sigCh, syscall.SIGHUP, syscall.SIGINT, syscall.SIGQUIT, syscall.SIGTERM)
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 44 KiB |
@ -19,53 +19,108 @@
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.menu {
|
||||
display: flex;
|
||||
width: 10%;
|
||||
}
|
||||
|
||||
.left {
|
||||
display: flex;
|
||||
height: 600px;
|
||||
width: 25%;
|
||||
flex-direction: column;
|
||||
margin-top: 50px;
|
||||
}
|
||||
.right {
|
||||
display: flex;
|
||||
height: 400px;
|
||||
width: 20%;
|
||||
justify-content: right;
|
||||
margin-top: 50px;
|
||||
}
|
||||
|
||||
.container {
|
||||
margin-top: 50px;
|
||||
}
|
||||
|
||||
body {
|
||||
background-image: url('./images/background.jpg');
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<br>
|
||||
<div class="absolute top-0 z-[-2] h-screen w-screen bg-[#000000] bg-[radial-gradient(#ffffff33_1px,#00091d_1px)] bg-[size:20px_20px]"></div>
|
||||
<!-- <div class="absolute top-0 z-[-2] h-screen w-screen bg-[#000000] bg-[radial-gradient(#ffffff33_1px,#00091d_1px)] bg-[size:20px_20px]"></div>
|
||||
<h1 class="text-center text-white text-2xl font-bold">Flex DX Cluster Dashboard</h1>
|
||||
<img class="rounded-full w-36 h-36 mx-auto" src="./images/logo.png">
|
||||
|
||||
<br>
|
||||
<br>
|
||||
<br>
|
||||
-->
|
||||
|
||||
|
||||
<div class="main">
|
||||
<!-- sidebar -->
|
||||
<div class="hidden md:flex flex-col w-64 h-800">
|
||||
<div class="flex items-center justify-center h-16">
|
||||
<span class="text-white font-bold uppercase">Flex DX Cluster</span>
|
||||
</div>
|
||||
<div class="flex flex-col flex-1 overflow-y-auto">
|
||||
<nav class="flex-1 px-2 py-4">
|
||||
<a href="#" class="flex items-center px-4 py-2 text-gray-100 hover:bg-gray-700">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6 mr-2" fill="none" viewBox="0 0 24 24"
|
||||
stroke="currentColor">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
|
||||
d="M4 6h16M4 12h16M4 18h16" />
|
||||
</svg>
|
||||
Dashboard
|
||||
</a>
|
||||
<a href="#" class="flex items-center px-4 py-2 mt-2 text-gray-100 hover:bg-gray-700">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6 mr-2" fill="none" viewBox="0 0 24 24"
|
||||
stroke="currentColor">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
|
||||
d="M6 18L18 6M6 6l12 12" />
|
||||
</svg>
|
||||
Messages
|
||||
</a>
|
||||
<a href="#" class="flex items-center px-4 py-2 mt-2 text-gray-100 hover:bg-gray-700">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6 mr-2" fill="none" viewBox="0 0 24 24"
|
||||
stroke="currentColor">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
|
||||
d="M13 10V3L4 14h7v7l9-11h-7z" />
|
||||
</svg>
|
||||
Settings
|
||||
</a>
|
||||
</nav>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="left">
|
||||
<div class="block max-w-sm p-6 bg-white border border-gray-200 rounded-lg shadow hover:bg-gray-100 dark:bg-gray-800 dark:border-gray-700 dark:hover:bg-gray-700 mr-2" style="margin-bottom: 2em; height: 12rem; width: 19rem;">
|
||||
<div class="block max-w-sm p-6 bg-white border border-gray-200 rounded-lg shadow hover:bg-gray-100 dark:bg-gray-800 dark:border-gray-700 dark:hover:bg-gray-700 ml-4 mr-2" style="margin-bottom: 2em; height: 12rem;">
|
||||
<h5 class="mb-2 text-2xl font-bold tracking-tight text-gray-900 dark:text-white">Spots</h5>
|
||||
<h6 class="card-subtitle mb-2 text-muted">Current number of spots</h6>
|
||||
<br>
|
||||
<div class="font-bold text-gray-700 text-center text-4xl dark:text-gray-400" id="spotCount" hx-get="/spotscount" hx-trigger="every 1s" hx-swap="innerHTML"></div>
|
||||
<div class="font-bold text-gray-700 text-center text-4xl text-red-800" id="spotCount" hx-get="/spotscount" hx-trigger="every 1s" hx-swap="innerHTML"></div>
|
||||
</div>
|
||||
|
||||
<div class="block max-w-sm p-6 bg-white border border-gray-200 rounded-lg shadow hover:bg-gray-100 dark:bg-gray-800 dark:border-gray-700 dark:hover:bg-gray-700 mr-2" style="height: 17rem; width: 19rem;">
|
||||
<div class="block max-w-sm p-6 bg-white border border-gray-200 rounded-lg shadow hover:bg-gray-100 dark:bg-gray-800 dark:border-gray-700 dark:hover:bg-gray-700 ml-4 mr-2" style="height: 17rem;">
|
||||
<h5 class="mb-2 text-2xl font-bold tracking-tight text-gray-900 dark:text-white">Top Spotters</h5>
|
||||
<div class="font-normal text-gray-700 dark:text-gray-400" id="spotters" hx-get="/spotters" hx-trigger="every 1s" hx-swap="innerHTML"></div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="container w-full mx-auto gap-4">
|
||||
<div class="container w-full mx-auto">
|
||||
<div class="flex-container" id="spot" hx-get="/spots" hx-trigger="every 1s" hx-swap="innerHTML"></div>
|
||||
</div>
|
||||
|
||||
<div class="right">
|
||||
<div class="block max-w-sm p-6 bg-white border border-gray-200 rounded-lg shadow hover:bg-gray-100 dark:bg-gray-800 dark:border-gray-700 dark:hover:bg-gray-700" style= "height: 18; width: 23rem;">
|
||||
<div class="block max-w-sm p-6 bg-white border border-gray-200 rounded-lg shadow hover:bg-gray-100 dark:bg-gray-800 dark:border-gray-700 dark:hover:bg-gray-700 mr-4" style= "height: 18; width: 23rem;">
|
||||
<h5 class="mb-2 text-2xl font-bold tracking-tight text-gray-900 dark:text-white">To Work</h5>
|
||||
<h6 class="card-subtitle mb-2 text-muted">New DXCC, Band or Mode</h6>
|
||||
<div class="card-text" id="new" hx-get="/new" hx-trigger="every 1s" hx-swap="innerHTML"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</body>
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
{{ range.}}
|
||||
|
||||
{{ if .NewDXCC }}<span class="fw-bold text-green-600/100"> {{ else if .NewMode }}<span class="fw-bold text-orange-600/100"> {{ else }}<span class="fw-bold"> {{ end }} {{ .DX }}</span> → <span>{{ .Status }}</span><br>
|
||||
{{ if .NewDXCC }}<span class="fw-bold text-green-600/100"> {{ else if .NewMode }}<span class="fw-bold text-orange-600/100"> {{ else }}<span class="fw-bold"> {{ end }} {{ .DX }}</span> → <span>{{ .Status }}</span><br>
|
||||
|
||||
{{ end }}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user