Merge pull request 'UwU' (#2) from danog/ecodash:master into master

Reviewed-on: ecodash/ecodash#2

.golangci.yml

@@ -1,7 +1,7 @@
 # options for analysis running
 run:
   # timeout for analysis, e.g. 30s, 5m, default is 1m
-  timeout: 10m
+  timeout: 30m
 
 # output configuration options
 output:

Dockerfile

@@ -21,6 +21,6 @@ WORKDIR /app
 
 COPY --from=1 /app/app .
 COPY ./templates /app/templates
-RUN touch config.json
+RUN touch config.json database.db
 
 CMD ["./app"]

src/ecodash/api.go

@@ -27,7 +27,8 @@ func dayStart(t time.Time) time.Time {
 var errNon200 = errors.New("got a non-200 status code. Check the correctness of sensors IDs")
 
 func (config *Config) queryHistory(entityID string, startTime, endTime time.Time) (HistoryResult, error) {
-	ctx, cancel := context.WithTimeout(context.Background(), 1*time.Minute)
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
 	req, err := http.NewRequestWithContext(
 		ctx,
 		http.MethodGet,
@@ -40,7 +41,6 @@ func (config *Config) queryHistory(entityID string, startTime, endTime time.Time
 		),
 		http.NoBody,
 	)
-	cancel()
 	if err != nil {
 		return HistoryResult{}, err
 	}

templates/default/admin.html

@@ -19,7 +19,7 @@
 
     <h3>HomeAssistant</h3>
     <label>HomeAssistant's base URL <input type="text" name="base_url" value="{{.Config.HomeAssistant.BaseURL}}" required></label>
-    <label>HomeAssistant's API Key <input type="text" name="api_key" value="{{.Config.HomeAssistant.ApiKey}}" required></label>
+    <label>HomeAssistant's API Key <input type="text" name="api_key" value="{{.Config.HomeAssistant.APIKey}}" required></label>
     <lablel>Installation date<input type="date" name="installation_date" value="{{HTMLDateFormat .Config.HomeAssistant.InstallationDate}}" required></lablel>
 
     <h3>Sensors</h3>