diff --git a/FlexDXCluster.exe b/FlexDXCluster.exe new file mode 100644 index 0000000..033a688 Binary files /dev/null and b/FlexDXCluster.exe differ diff --git a/HTTPServer.go b/HTTPServer.go index fffbd9b..dd2c296 100644 --- a/HTTPServer.go +++ b/HTTPServer.go @@ -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() { diff --git a/TCPServer.go b/TCPServer.go index ddc5b4b..5c9b7f3 100644 --- a/TCPServer.go +++ b/TCPServer.go @@ -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()) } diff --git a/flex.sqlite b/flex.sqlite new file mode 100644 index 0000000..5620fd8 Binary files /dev/null and b/flex.sqlite differ diff --git a/flexradio.go b/flexradio.go index cae4b20..190a452 100644 --- a/flexradio.go +++ b/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) diff --git a/flexradio.log b/flexradio.log new file mode 100644 index 0000000..649211c --- /dev/null +++ b/flexradio.log @@ -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 diff --git a/images/background.jpg b/images/background.jpg new file mode 100644 index 0000000..2eee2ce Binary files /dev/null and b/images/background.jpg differ diff --git a/images/background2.jpg b/images/background2.jpg new file mode 100644 index 0000000..465dc6e Binary files /dev/null and b/images/background2.jpg differ diff --git a/images/background3.jpg b/images/background3.jpg new file mode 100644 index 0000000..b9c404c Binary files /dev/null and b/images/background3.jpg differ diff --git a/images/logo.png b/images/logo.png new file mode 100644 index 0000000..452ad9e Binary files /dev/null and b/images/logo.png differ diff --git a/main.go b/main.go index f051ad3..dd80dfa 100644 --- a/main.go +++ b/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) diff --git a/resources/background.jpg b/resources/background.jpg deleted file mode 100644 index 21f5359..0000000 Binary files a/resources/background.jpg and /dev/null differ diff --git a/templates/home.html b/templates/home.html index 9303f55..66fae2f 100644 --- a/templates/home.html +++ b/templates/home.html @@ -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'); }
-
+ + +
+ +
-
+
Spots
Current number of spots

-
+
-
+
Top Spotters
-
+
-
+
To Work
New DXCC, Band or Mode
-
diff --git a/templates/new.html b/templates/new.html index aa951b7..9488d72 100644 --- a/templates/new.html +++ b/templates/new.html @@ -2,7 +2,7 @@ {{ range.}} -{{ if .NewDXCC }} {{ else if .NewMode }} {{ else }} {{ end }} {{ .DX }}   → {{ .Status }}
+{{ if .NewDXCC }} {{ else if .NewMode }} {{ else }} {{ end }} {{ .DX }} → {{ .Status }}
{{ end }}