doc: Add issues: grouped measures and measure visibility.

- Re-organized and documented make targets.
- Parameterized the make targets to more cleanly support multiple
  development scenarios.
- Documented the different development scenarios in a README.
- Standardized the host port used when running locally.
- Updated DEV and PROD database config files to match current practice.
- Renamed `personal_measure_api.config.prod.json` to
  `personal_measure_api.config.docker.json` to more accurately reflect
  that this is the config used when building the docker image
  (regardless of which env it ends up in).

.gitignore

@@ -3,6 +3,8 @@ api/personal_measure_api
 api/postgres.container.id
 api/src/main/nim/personal_measure_api
 api/src/main/nim/personal_measure_apipkg/db
+api/personal_measure_api.config.dev.json
+api/personal_measure_api.config.prod.json
 
 .DS_Store
 node_modules

Makefile

@@ -5,14 +5,12 @@ build: dist/personal-measure-api.tar.gz dist/personal-measure-web.tar.gz
 
 clean:
 	-rm -r dist
-	-rm api/personal_measure_api
 	-rm -r web/dist
+	-docker container prune
+	-docker image prune
 
-dist/personal-measure-api.tar.gz:
-	-mkdir dist
-	make -C api personal_measure_api
-	tar czf dist/personal-measure-api-${VERSION}.tar.gz -C api personal_measure_api
-	cp dist/personal-measure-api-${VERSION}.tar.gz dist/personal-measure-api.tar.gz
+update-version:
+	operations/update-version.sh
 
 dist/personal-measure-web.tar.gz:
 	-mkdir dist
@@ -20,18 +18,14 @@ dist/personal-measure-web.tar.gz:
 	tar czf dist/personal-measure-web-${VERSION}.tar.gz -C web/dist .
 	cp dist/personal-measure-web-${VERSION}.tar.gz dist/personal-measure-web.tar.gz
 
-deploy-api: dist/personal-measure-api.tar.gz
-	mkdir -p temp-deploy/personal-measure-api-${VERSION}
-	tar xzf dist/personal-measure-api-${VERSION}.tar.gz -C temp-deploy/personal-measure-api-${VERSION}
-	-ssh pmapi@pmapi.jdb-labs.com "sudo systemctl stop personal_measure_api.$(TARGET_ENV).service"
-	scp temp-deploy/personal-measure-api-${VERSION}/personal_measure_api pmapi@pmapi.jdb-labs.com:/home/pmapi/$(TARGET_ENV)/personal_measure_api
-	ssh pmapi@pmapi.jdb-labs.com "sudo systemctl start personal_measure_api.$(TARGET_ENV).service"
-	rm -r temp-deploy
+deploy-api:
+	make -C api personal_measure_api-image push-image
+	cd operations/terraform && terraform apply -target module.${TARGET_ENV}_env.aws_ecs_task_definition.pmapi -target module.${TARGET_ENV}_env.aws_ecs_service.pmapi
 
 deploy-web: dist/personal-measure-web.tar.gz
 	mkdir -p temp-deploy/personal-measure-web-${VERSION}
 	tar xzf dist/personal-measure-web-${VERSION}.tar.gz -C temp-deploy/personal-measure-web-${VERSION}
-	aws s3 sync temp-deploy/personal-measure-web-${VERSION} s3://pm.jdb-labs.com/$(TARGET_ENV)/webroot
+	aws s3 sync temp-deploy/personal-measure-web-${VERSION} s3://pm.jdb-software.com/$(TARGET_ENV)/webroot
 	TARGET_ENV=${TARGET_ENV} operations/invalidate-cdn-cache.sh
 	rm -r temp-deploy
 

api/Dockerfile

@@ -1,26 +1,22 @@
-FROM 063932952339.dkr.ecr.us-west-2.amazonaws.com/nim-alpine AS build
+FROM 063932952339.dkr.ecr.us-west-2.amazonaws.com/alpine-nim:nim-1.4.8 AS build
 MAINTAINER jonathan@jdbernard.com
 
-# TODO: install db_migrate so we can use it below
-# RUN nimble install https://git.jdb-labs.com/jdb/db-migrate.git
-
-#RUN apt-get install -y libssl-dev
 COPY personal_measure_api.nimble /pm-api/
 COPY src /pm-api/src
 WORKDIR /pm-api
 RUN nimble build -y
 
 FROM alpine
-#RUN apt-get install -y postgresql-client
+EXPOSE 80
 RUN apk -v --update add --no-cache \
   ca-certificates \
-  libressl2.7-libssl \
-  libressl2.7-libcrypto \
+  libcrypto1.1 \
+  libssl1.1 \
   pcre \
   postgresql-client
 
 COPY --from=build /pm-api/personal_measure_api /
-COPY personal_measure_api.config.prod.json /personal_measure_api.config.json
+COPY personal_measure_api.config.docker.json /personal_measure_api.config.json
 CMD ["/personal_measure_api", "serve"]
 
 # TODO: replace the above with something like:

api/Makefile

@@ -1,31 +1,123 @@
 PGSQL_CONTAINER_ID=`cat postgres.container.id`
-DB_NAME="personal_measure"
 SOURCES=$(wildcard src/main/nim/*.nim) $(wildcard src/main/nim/personal_measure_apipkg/*.nim)
 
-serve: personal_measure_api start-postgres
+# Variables that can be overriden
+# -------------------------------
+
+# AWS Account URL for the ECR repository
+ECR_ACCOUNT_URL ?= 063932952339.dkr.ecr.us-west-2.amazonaws.com
+
+# The version number that will be tagged the container image. You might want to
+# override this when doing local development to create local versions that are
+# reflect changes not yet committed.
+VERSION ?= `git describe`
+
+# The port on the host machine (not the container)
+PORT ?= 8100
+
+# The name of the database (used then creating a local Postgres container)
+DB_NAME ?= personal_measure
+
+# The database connection string. You would change this to point the API at a
+# different database server (default is the local Postgres container).
+DB_CONN_STRING ?= host=localhost dbname=$(DB_NAME) user=postgres password=password port=5500
+
+# The API authentication secret (used for hashing passwords, etc.)
+AUTH_SECRET ?= 123abc
+
+
+default: start-postgres serve-docker
+
+# Building and deploying the API container image
+# ----------------------------------------------
+
+personal_measure_api-image: $(SOURCES)
+	# Build the container image.
+	docker image build -t $(ECR_ACCOUNT_URL)/personal_measure_api:$(VERSION) .
+
+push-image: personal_measure_api-image
+	# Push the container image to the private AWS ECR
+	docker push $(ECR_ACCOUNT_URL)/personal_measure_api:$(VERSION)
+
+# Running the API locally on bare metal
+# -------------------------------------
+
+personal_measure_api: $(SOURCES)
+	# Build the API
+	nimble build
+
+serve: personal_measure_api
+	# Run the API on this machine. Note that configuration is taken by default
+	# from the `personal_measure_api.config.json` file, but environment variables
+	# specified when running make can be used to override these (to change the
+	# DB_CONN_STRING, for example).
 	./personal_measure_api serve
 
+# Running the API locally in a container
+# --------------------------------------
+
+serve-docker: personal_measure_api-image
+	# Run the API in a docker container. Note that the configuration loaded into
+	# the Docker container defines very little of the actual configuration as
+	# environment variables are used in the deployed environments. Accordingly,
+	# we must specify them explicitly here.
+	docker run \
+		-e AUTH_SECRET=$(AUTH_SECRET) \
+		-e PORT=80 \
+		-e "DB_CONN_STRING=$(DB_CONN_STRING)" \
+		-e 'KNOWN_ORIGINS=["https://curl.localhost"]' \
+		-p 127.0.0.1:$(PORT):80/tcp \
+		$(ECR_ACCOUNT_URL)/personal_measure_api:$(VERSION)
+
+# Managing Postgres in a local container
+# --------------------------------------
+#
+#   This supports local development on this machine. These commands rely on a
+#   file named `postgres.container.id` to track the existing and ID of the
+#   local Postgres instance.
+
 postgres.container.id:
+	# This creates a new local Postegres container and initializes the PM API
+	# database scheme.
 	docker run --name postgres-$(DB_NAME) -e POSTGRES_PASSWORD=password -p 5500:5432 -d postgres > postgres.container.id
 	sleep 5
 	PGPASSWORD=password psql -p 5500 -U postgres -h localhost -c "CREATE DATABASE $(DB_NAME);"
 	db_migrate up -c database-local.json
 
 start-postgres: postgres.container.id
+	# Start the existing local Postgres container
 	docker start $(PGSQL_CONTAINER_ID)
 	sleep 1
 	db_migrate up -c database-local.json
 
 stop-postgres: postgres.container.id
+	# Stop the existing local Postgres container
 	docker stop $(PGSQL_CONTAINER_ID)
 
 delete-postgres-container:
+	# Delete the local Postgres container. Note that this will destroy any data
+	# in this database instance.
 	-docker stop $(PGSQL_CONTAINER_ID)
 	docker container rm $(PGSQL_CONTAINER_ID)
 	rm postgres.container.id
 
-connect:
+connect-postgres:
+	# Connect to the Postgres instance running in the local container
 	PGPASSWORD=password psql -p 5500 -U postgres -h localhost ${DB_NAME}
 
-personal_measure_api: $(SOURCES)
-	nimble build
+
+# Utility
+# -------
+
+ecr-auth:
+	# Authenticate docker to the AWS private elastic container repository.
+	aws ecr get-login-password --region us-west-2 | docker login --username AWS --password-stdin 063932952339.dkr.ecr.us-west-2.amazonaws.com
+
+echo-vars:
+	@echo \
+		" ECR_ACCOUNT_URL=$(ECR_ACCOUNT_URL)\n" \
+		"VERSION=$(VERSION)\n" \
+		"PORT=$(PORT)\n" \
+		"DB_NAME=$(DB_NAME)\n" \
+		"DB_CONN_STRING=$(DB_CONN_STRING)\n" \
+		"AUTH_SECRET=$(AUTH_SECRET)\n"

api/README.md

@@ -0,0 +1,30 @@
+## Local Development
+
+Examples of different local development & testing scenarios:
+
+- Bare-metal API server, local Postgres container
+
+      make start-postgres
+      make serve
+
+- Bare-metal API server, different Postgres server
+
+      DB_CONN_STRING="host=<db-hostname> user=pmapi password=<pwd>" make serve
+
+- Docker API Server, local Postgres container
+
+      make start-postgres
+      VERSION=0.X.0-alpha make serve-docker
+
+- Docker API server, different Postgres server
+
+      DB_CONN_STRING="host=<db-hostname> user=pmapi password=<pwd>" \
+      VERSION=0.X.0-alpha \
+        make serve-docker
+
+All of the available `make` targets are documented inline; see the
+[Makefile](./Makefile) for more details.
+
+### Using the API CLI wrapper
+
+The API CLI wrapper

api/database-dev.json

@@ -0,0 +1,5 @@
+{
+  "driver": "postgres",
+  "connectionString": "host=localhost port=5432 dbname=personal_measure_dev user=pmapi",
+  "sqlDir": "src/main/sql/migrations"
+}

api/database-prod.json

@@ -1,5 +1,5 @@
 {
   "driver": "postgres",
-  "connectionString": "host=localhost port=5999 dbname=personal_measure user=postgres",
+  "connectionString": "host=localhost port=5432 dbname=personal_measure user=pmapi",
   "sqlDir": "src/main/sql/migrations"
 }

api/personal_measure_api.config.docker.json

@@ -0,0 +1,4 @@
+{
+  "debug":false,
+  "pwdCost":11
+}

api/personal_measure_api.config.json

@@ -2,7 +2,7 @@
   "authSecret":"bifekHuffIs3",
   "dbConnString":"host=localhost port=5500 dbname=personal_measure user=postgres password=password",
   "debug":true,
-  "port":8081,
+  "port":8100,
   "pwdCost":11,
   "knownOrigins": [ "https://curl.localhost" ]
 }

api/personal_measure_api.config.prod.json

@@ -1,6 +0,0 @@
-{
-  "debug":false,
-  "port":80,
-  "pwdCost":11,
-  "knownOrigins": [ "https://pm.jdb-labs.com" ]
-}

api/personal_measure_api.nimble

@@ -2,7 +2,7 @@
 
 include "src/main/nim/personal_measure_apipkg/version.nim"
 
-version       = "0.8.0"
+version       = "0.11.0"
 author        = "Jonathan Bernard"
 description   = "JDB\'s Personal Measures API"
 license       = "MIT"
@@ -16,6 +16,6 @@ skipExt       = @["nim"]
 requires @["nim >= 0.19.4", "bcrypt", "docopt >= 0.6.8", "isaac >= 0.1.3",
   "jester >= 0.4.3", "jwt", "tempfile", "uuids >= 0.1.10" ]
 
-requires "https://git.jdb-labs.com/jdb/nim-cli-utils.git >= 0.6.3"
-requires "https://git.jdb-labs.com/jdb/nim-time-utils.git >= 0.5.2"
-requires "https://git.jdb-labs.com/jdb-labs/fiber-orm-nim.git >= 0.3.0"
+requires "https://git.jdb-software.com/jdb/nim-cli-utils.git >= 0.6.3"
+requires "https://git.jdb-software.com/jdb/nim-time-utils.git >= 0.5.2"
+requires "https://git.jdb-software.com/jdb-software/fiber-orm-nim.git >= 0.3.2"

api/src/main/nim/personal_measure_api.nim

@@ -27,26 +27,22 @@ proc loadConfig*(args: Table[string, docopt.Value] = initTable[string, docopt.Va
   try: json = parseFile(filePath)
   except:
     json = %DEFAULT_CONFIG
-    if not existsFile(filePath):
+    if not fileExists(filePath):
       info "created new configuration file \"" & filePath & "\""
       filePath.writeFile($json)
     else:
       warn "Cannot read configuration file \"" & filePath & "\":\n\t" &
         getCurrentExceptionMsg()
 
-  let knownOriginsArray =
-    if json.hasKey("knownOrigins"): json["knownOrigins"]
-    else: newJArray()
-
   let cfg = CombinedConfig(docopt: args, json: json)
 
   result = PMApiConfig(
     authSecret: cfg.getVal("auth-secret"),
     dbConnString: cfg.getVal("db-conn-string"),
     debug: "true".startsWith(cfg.getVal("debug", "false").toLower()),
-    port: parseInt(cfg.getVal("port", "8080")),
+    port: parseInt(cfg.getVal("port", "8100")),
     pwdCost: cast[int8](parseInt(cfg.getVal("pwd-cost", "11"))),
-    knownOrigins: toSeq(knownOriginsArray).mapIt(it.getStr))
+    knownOrigins: cfg.getVal("known-origins")[1..^2].split(',').mapIt(it[1..^2]))
 
 proc initContext(args: Table[string, docopt.Value]): PMApiContext =
 
@@ -114,6 +110,6 @@ Options:
     if args["serve"]: start(ctx)
 
   except:
-    fatal "pit: " & getCurrentExceptionMsg()
+    fatal "personal_measure_api: " & getCurrentExceptionMsg()
     #raise getCurrentException()
     quit(QuitFailure)

api/src/main/nim/personal_measure_apipkg/api.nim

@@ -1,5 +1,6 @@
 import asyncdispatch, base64, jester, json, jwt, logging, options, sequtils,
   times, uuids
+from httpcore import HttpMethod
 from unicode import capitalize
 import strutils except capitalize
 import timeutils
@@ -58,6 +59,29 @@ template jsonResp(code: HttpCode, body: string = "", headersToSend: RawHeaders =
     body
   )
 
+template optionsResp(allowedMethods: seq[HttpMethod]) =
+
+  let reqOrigin =
+    if request.headers.hasKey("Origin"): $(request.headers["Origin"])
+    else: ""
+
+  let corsHeaders =
+    if ctx.cfg.knownOrigins.contains(reqOrigin):
+      @{
+        "Access-Control-Allow-Origin": reqOrigin,
+        "Access-Control-Allow-Credentials": "true",
+        "Access-Control-Allow-Methods": allowedMethods.mapIt($it).join(", "),
+        "Access-Control-Allow-Headers": "DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization"
+      }
+    else: @{:}
+
+  halt(
+    Http200,
+    corsHeaders,
+    ""
+  )
+
+
 template jsonResp(body: string) = jsonResp(Http200, body)
 
 template statusResp(code: HttpCode, details: string = "", headersToSend: RawHeaders = @{:} ) =
@@ -97,7 +121,7 @@ proc fromJWT*(ctx: PMApiContext, strTok: string): Session =
   ## Validate a given JWT and extract the session data.
   let jwt = toJWT(strTok)
   var secret = ctx.cfg.authSecret
-  if not jwt.verify(secret): raiseEx "Unable to verify auth token."
+  if not jwt.verify(secret, HS256): raiseEx "Unable to verify auth token."
   jwt.verifyTimeClaims()
 
   # Find the user record (if authenticated)
@@ -212,9 +236,13 @@ proc start*(ctx: PMApiContext): void =
 
   routes:
 
+    options "/version": optionsResp(@[HttpGet])
+
     get "/version":
       jsonResp($(%("personal_measure_api v" & PM_API_VERSION)))
 
+    options "/auth-token": optionsResp(@[HttpPost])
+
     post "/auth-token":
 
       try:
@@ -226,6 +254,8 @@ proc start*(ctx: PMApiContext): void =
       except JsonParsingError: statusResp(Http400, getCurrentExceptionMsg())
       except: statusResp(Http401, getCurrentExceptionMsg())
 
+    options "/change-pwd": optionsResp(@[HttpPost])
+
     post "/change-pwd":
       checkAuth()
 
@@ -247,6 +277,8 @@ proc start*(ctx: PMApiContext): void =
         error "internal error changing password: " & getCurrentExceptionMsg()
         statusResp(Http500)
 
+    options "/change-pwd/@userId": optionsResp(@[HttpPost])
+
     post "/change-pwd/@userId":
       checkAuth(true)
 
@@ -268,6 +300,8 @@ proc start*(ctx: PMApiContext): void =
         error "internal error changing password: " & getCurrentExceptionMsg()
         statusResp(Http500)
 
+    options "/user": optionsResp(@[HttpGet, HttpPut])
+
     get "/user":
       checkAuth()
 
@@ -292,6 +326,8 @@ proc start*(ctx: PMApiContext): void =
         error "Could not update user information:\n\t" & getCurrentExceptionMsg()
         statusResp(Http500)
 
+    options "/users": optionsResp(@[HttpGet, HttpPost])
+
     get "/users":
       checkAuth(true)
 
@@ -320,6 +356,8 @@ proc start*(ctx: PMApiContext): void =
         error "Could not create new user:\n\t" & getCurrentExceptionMsg()
         statusResp(Http500)
 
+    options "/users/@userId": optionsResp(@[HttpGet, HttpDelete])
+
     get "/users/@userId":
       checkAuth(true)
 
@@ -340,6 +378,8 @@ proc start*(ctx: PMApiContext): void =
 
       except: statusResp(Http500, getCurrentExceptionMsg())
 
+    options "/api-tokens": optionsResp(@[HttpGet, HttpPost])
+
     get "/api-tokens":
       checkAuth()
 
@@ -374,6 +414,8 @@ proc start*(ctx: PMApiContext): void =
         debug getCurrentExceptionMsg()
         statusResp(Http500)
 
+    options "/api-tokens/@tokenId": optionsResp(@[HttpGet, HttpDelete])
+
     get "/api-tokens/@tokenId":
       checkAuth()
 
@@ -392,6 +434,10 @@ proc start*(ctx: PMApiContext): void =
       except NotFoundError: statusResp(Http404, getCurrentExceptionMsg())
       except: statusResp(Http500)
 
+    # Measure
+
+    options "/measures": optionsResp(@[HttpGet, HttpPost])
+
     get "/measures":
       checkAuth()
 
@@ -436,6 +482,8 @@ proc start*(ctx: PMApiContext): void =
         error "unable to create new measure:\n\t" & getCurrentExceptionMsg()
         statusResp(Http500)
 
+    options "/measures/@slug": optionsResp(@[HttpGet, HttpPost, HttpDelete])
+
     get "/measures/@slug":
       checkAuth()
 
@@ -445,6 +493,37 @@ proc start*(ctx: PMApiContext): void =
         error "unable to look up a measure by id:\n\t" & getCurrentExceptionMsg()
         statusResp(Http500)
 
+    post "/measures/@slug":
+      checkAuth()
+
+      try:
+        let jsonBody = parseJson(request.body)
+        var existingMeasure = ctx.getMeasureForSlug(session.user.id, @"slug")
+
+        if not (jsonBody.hasKey("slug") or jsonBody.hasKey("name")):
+          raiseEx BadRequestError, "body must contain either the 'slug' field (short name), or the 'name' field, or both"
+
+        existingMeasure.slug =
+          if jsonBody.hasKey("slug"): jsonBody["slug"].getStr.nameToSlug
+          else: jsonBody["name"].getStr.nameToSlug
+
+        existingMeasure.name =
+          if jsonBody.hasKey("name"): jsonBody["name"].getStr
+          else: jsonBody["slug"].getStr.capitalize
+
+
+        if jsonBody.hasKey("config"): existingMeasure.config = jsonBody["config"]
+
+        if jsonBody.hasKey("description"): existingMeasure.description = jsonBody["description"].getStr
+
+        jsonResp($(%ctx.db.updateMeasure(existingMeasure)))
+
+      except JsonParsingError: statusResp(Http400, getCurrentExceptionMsg())
+      except BadRequestError: statusResp(Http400, getCurrentExceptionMsg())
+      except:
+        error "unable to update measure:\n\t" & getCurrentExceptionMsg()
+        statusResp(Http500)
+
     delete "/measures/@slug":
       checkAuth()
 
@@ -457,7 +536,11 @@ proc start*(ctx: PMApiContext): void =
           error "unable to delete a measure:\n\t" & getCurrentExceptionMsg()
           statusResp(Http500)
 
-    get "/measure/@slug":
+    # Measurements
+
+    options "/measurements/@slug": optionsResp(@[HttpGet, HttpPost])
+
+    get "/measurements/@slug":
       checkAuth()
 
       try:
@@ -468,7 +551,7 @@ proc start*(ctx: PMApiContext): void =
           error "unable to list measurements:\n\t" & getCurrentExceptionMsg()
           statusResp(Http500)
 
-    post "/measure/@slug":
+    post "/measurements/@slug":
       checkAuth()
 
       try:
@@ -494,7 +577,9 @@ proc start*(ctx: PMApiContext): void =
         error "unable to add measurement:\n\t" & getCurrentExceptionMsg()
         statusResp(Http500)
 
-    get "/measure/@slug/@id":
+    options "/measurements/@slug/@id": optionsResp(@[HttpGet, HttpPut, HttpDelete])
+
+    get "/measurements/@slug/@id":
       checkAuth()
 
       try:
@@ -509,7 +594,7 @@ proc start*(ctx: PMApiContext): void =
         error "unable to retrieve measurement:\n\t" & getCurrentExceptionMsg()
         statusResp(Http500)
 
-    put "/measure/@slug/@id":
+    put "/measurements/@slug/@id":
       checkAuth()
 
       try:
@@ -529,7 +614,7 @@ proc start*(ctx: PMApiContext): void =
         error "unable to retrieve measurement:\n\t" & getCurrentExceptionMsg()
         statusResp(Http500)
 
-    delete "/measure/@slug/@id":
+    delete "/measurements/@slug/@id":
       checkAuth()
 
       try:
@@ -546,6 +631,8 @@ proc start*(ctx: PMApiContext): void =
         error "unable to delete measurement:\n\t" & getCurrentExceptionMsg()
         statusResp(Http500)
 
+    options "/log": optionsResp(@[HttpPost])
+
     post "/log":
       checkAuth()
 
@@ -563,6 +650,8 @@ proc start*(ctx: PMApiContext): void =
       except BadRequestError: statusResp(Http400, getCurrentExceptionMsg())
       except: statusResp(Http500, getCurrentExceptionMsg())
 
+    options "/log/batch": optionsResp(@[HttpPost])
+
     post "/log/batch":
       checkAuth()
 

api/src/main/nim/personal_measure_apipkg/db.nim

@@ -1,4 +1,4 @@
-import db_postgres, fiber_orm, uuids
+import db_postgres, fiber_orm, sequtils, uuids
 
 import ./models
 
@@ -8,7 +8,7 @@ type
   PMApiDb* = ref object
     conn: DbConn
 
-  
+
 proc connect*(connString: string): PMApiDb =
   result = PMApiDb(conn: open("", "", "", connString))
 

api/src/main/nim/personal_measure_apipkg/version.nim

@@ -1 +1 @@
-const PM_API_VERSION* = "0.8.0"
+const PM_API_VERSION* = "0.11.0"

api/src/util/bash/client.sh

@@ -1,24 +1,37 @@
 #!/bin/bash
 
-api_base_url="${PM_API_BASE_URL:-http://localhost:8081}"
+api_base_url="${PM_API_BASE_URL:-http://localhost:8100/v0}"
 if [ $# -eq 1 ]; then
   url="$1"
   method="GET"
   data=""
 elif [ $# -eq 2 ]; then
-  method="$1"
-  url="$2"
-  data=""
-else 
+  if [ $1 == "auth-token" ]; then
+    curl -s -X POST \
+      -H "Origin: https://curl.localhost" \
+      "${api_base_url}/auth-token" \
+      -d "$2" \
+    | xargs printf "Bearer %s" \
+    > credential
+
+    exit 0
+  else
+    method="$1"
+    url="$2"
+    data=""
+  fi
+else
   method="$1"
   url="$2"
   data="$3"
 fi
 
+if [[ ! $url = /* ]]; then url="/$url"; fi
+
 curl -s -X "$method" \
   -H "Content-Type: application/json" \
   -H "Authorization: $(cat credential)" \
   -H "Origin: https://curl.localhost" \
-  "${api_base_url}/api/$url" \
+  "${api_base_url}$url" \
   -d "$data" \
-  -v
+  | jq .

doc/issues/done/004-add-the-ability-to-delete-measures.md

@@ -0,0 +1 @@
+### Add the ability to delete measures.

doc/issues/in-progress/002-add-support-for-text-entries.md

@@ -0,0 +1,5 @@
+### Add support for text entries.
+
+Thinking is to allow recording an arbitrary text value alonside a timestamp.
+Presentation would be something like a list of the values. Probably no graph
+(maybe something like a histogram for some use cases?).

doc/issues/new-issue.sh

@@ -0,0 +1,9 @@
+id=$(cat next-issue-number.txt)
+printf "%03d" "$(expr $id + 1)" > next-issue-number.txt
+
+printf "Title/Summary?\n> "
+read -r summary
+
+slugSummary=$(echo "$summary" | tr "[:upper:]" "[:lower:]" | tr ' ' - )
+slugSummary="${slugSummary//.}"
+echo "### $summary" > "$id-$slugSummary.md"

doc/issues/next-issue-number.txt

@@ -0,0 +1 @@
+010

doc/issues/open/000-provide-options-for-graphing-measurements.md

@@ -0,0 +1,8 @@
+### Provide options for graphing measures.
+
+As a user I would like to be able to configure the graph used for a measure.
+
+Needed:
+- General pattern for graph configuration.
+- Support for different graph types (line, bar, pie, area, others?).
+- Support for pre-processing of data (graph rolling average, etc).

doc/issues/open/001-add-a-timestamp-meaure-type-(no-value).md

@@ -0,0 +1,10 @@
+### Add a timestamp meaure type (no value).
+
+As a user I would like to be able to measure when things happen (fall asleep)
+with a simple timestamp.
+
+#### Implementation notes:
+
+This may not require a new storage type (just use the existing SimpleMeasure)
+but UI (input, graphs, etc.) would just ignore the value and only consider the
+timestamp.

doc/issues/open/003-add-the-ability-to-delete-measurements.md

@@ -0,0 +1 @@
+### Add the ability to delete measurements.

doc/issues/open/005-add-the-ability-to-edit-measurements.md

@@ -0,0 +1 @@
+### Add the ability to edit measurements.

doc/issues/open/006-add-the-ability-to-edit-measures.md

@@ -0,0 +1 @@
+### Add the ability to edit measures.

doc/issues/open/007-support-rolling-averages-in-graph-displays.md

@@ -0,0 +1 @@
+### Support rolling averages in graph displays.

doc/issues/open/008-toggle-measure-visibility.md

@@ -0,0 +1,3 @@
+### Toggle Measure Visibility
+
+Allow the user to choose whether a measure should be visible or hidden by default.

doc/issues/open/009-grouped-measures.md

@@ -0,0 +1,3 @@
+### Grouped Measures
+
+Create a measure type that is just a grouping of several other measures. For example, it would be nice to be able to group all workout-related measures into one group. The graph could show an overlay of all the different measures on one graph.

operations/PersonalMeasure_RoutingRules.xml

@@ -1,10 +0,0 @@
-<RoutingRules>
-  <RoutingRule>
-    <Condition>
-      <KeyPrefixEquals>api</KeyPrefixEquals>
-    </Condition>
-    <Redirect>
-      <HostName>https://pmapi.jdbernard.com</HostName>
-    </Redirect>
-  </RoutingRule>
-</RoutingRules>

operations/nginx/sites-available/pmapi-dev.jdb-labs.com

@@ -1,33 +0,0 @@
-server {
-    listen 80;
-
-    server_name pmapi-dev.jdb-labs.com;
-
-    return 301 https://pmapi-dev.jdb-labs.com$request_uri;
-}
-
-server {
-    listen 443;
-
-    server_name pmapi-dev.jdb-labs.com;
-
-    ssl on;
-
-    location / {
-        if ($request_method = 'OPTIONS') {
-            add_header 'Access-Control-Allow-Origin' 'https://pm-dev.jdb-labs.com';
-            add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
-            add_header 'Access-Control-Max-Age' 1728000;
-            add_header 'Content-Type' 'text/plain; charset=utf-8';
-            add_header 'Content-Length' 0;
-            add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization';
-            return 204;
-        }
-
-        proxy_pass http://localhost:8281;
-        proxy_set_header Host               $http_host;
-        proxy_set_header X-Real-IP          $remote_addr;
-        proxy_set_header X-Forwarded-For    $proxy_add_x_forwarded_for;
-    }
-}
-

operations/nginx/sites-available/pmapi.jdb-labs.com

@@ -1,33 +0,0 @@
-server {
-    listen 80;
-
-    server_name pmapi.jdb-labs.com;
-
-    return 301 https://pmapi.jdb-labs.com$request_uri;
-}
-
-server {
-    listen 443;
-
-    server_name pmapi.jdb-labs.com;
-
-    ssl on;
-
-    location / {
-        if ($request_method = 'OPTIONS') {
-            add_header 'Access-Control-Allow-Origin' 'https://pm.jdb-labs.com';
-            add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
-            add_header 'Access-Control-Max-Age' 1728000;
-            add_header 'Content-Type' 'text/plain; charset=utf-8';
-            add_header 'Content-Length' 0;
-            add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization';
-            return 204;
-        }
-
-        proxy_pass http://localhost:8280;
-        proxy_set_header Host               $http_host;
-        proxy_set_header X-Real-IP          $remote_addr;
-        proxy_set_header X-Forwarded-For    $proxy_add_x_forwarded_for;
-    }
-}
-

operations/terraform/common.tf

@@ -7,5 +7,5 @@ variable "aws_region" {
 
 variable "app_root_url" {
   description = "Name of the S3 bucket to store deployed artifacts, logs, etc."
-  default = "pm.jdb-labs.com"
+  default = "pm.jdb-software.com"
 }

operations/terraform/deployed_env/cloudfront.tf

@@ -6,18 +6,18 @@ data "aws_iam_policy_document" "bucket_access_policy" {
 
     principals {
       type        = "AWS"
-      identifiers = [ "${aws_cloudfront_origin_access_identity.origin_access_identity.iam_arn}" ]
+      identifiers = [ aws_cloudfront_origin_access_identity.origin_access_identity.iam_arn ]
     }
   }
 
   statement {
     actions   = [ "s3:ListBucket" ]
     effect    = "Allow"
-    resources = [ "${var.artifact_bucket.arn}" ]
+    resources = [ var.artifact_bucket.arn ]
 
     principals {
       type        = "AWS"
-      identifiers = [ "${aws_cloudfront_origin_access_identity.origin_access_identity.iam_arn}" ]
+      identifiers = [ aws_cloudfront_origin_access_identity.origin_access_identity.iam_arn ]
     }
   }
 }
@@ -26,22 +26,18 @@ output "oai_access_policy" {
  value = data.aws_iam_policy_document.bucket_access_policy
 }
 
-locals {
-  env_domain_name = "pm${var.environment == "prod" ? "" : "-${var.environment}"}.jdb-labs.com"
-}
-
 resource "aws_cloudfront_origin_access_identity" "origin_access_identity" {
   comment = "OAI for Personal Measure {$var.environment} environment."
 }
 
 resource "aws_cloudfront_distribution" "s3_distribution" {
   origin {
-    domain_name = "${var.artifact_bucket.bucket_regional_domain_name}"
+    domain_name = var.artifact_bucket.bucket_regional_domain_name
     origin_id   = "S3-PersonalMeasure-${var.environment}"
     origin_path = "/${var.environment}/webroot"
 
     s3_origin_config {
-      origin_access_identity = "${aws_cloudfront_origin_access_identity.origin_access_identity.cloudfront_access_identity_path}"
+      origin_access_identity = aws_cloudfront_origin_access_identity.origin_access_identity.cloudfront_access_identity_path
     }
   }
 
@@ -52,11 +48,11 @@ resource "aws_cloudfront_distribution" "s3_distribution" {
 
   logging_config {
     include_cookies = false
-    bucket          = "${var.artifact_bucket.bucket_domain_name}"
+    bucket          = var.artifact_bucket.bucket_domain_name
     prefix          = "${var.environment}/logs/cloudfront"
   }
 
-  aliases = ["${local.env_domain_name}"]
+  aliases = [local.app_domain_name]
 
   default_cache_behavior {
     allowed_methods   = ["GET", "HEAD", "OPTIONS"]
@@ -92,11 +88,11 @@ resource "aws_cloudfront_distribution" "s3_distribution" {
     }
   }
   tags = {
-    Environment = "${var.environment}"
+    Environment = local.environment_name
   }
 
   viewer_certificate {
-    acm_certificate_arn = "${var.cloudfront_ssl_certificate_arn}"
+    acm_certificate_arn = data.terraform_remote_state.jdbsoft.outputs.aws_acm_certificate_jdbsoft_us_east_1.arn
     ssl_support_method  = "sni-only"
   }
 }

operations/terraform/deployed_env/domain.tf

@@ -0,0 +1,25 @@
+resource "aws_route53_record" "app_domain" {
+  zone_id   = data.terraform_remote_state.jdbsoft.outputs.aws_route53_zone_jdbsoft.zone_id
+  name      = local.app_domain_name
+  type      = "A"
+
+  alias {
+    name    = aws_cloudfront_distribution.s3_distribution.domain_name
+    zone_id = aws_cloudfront_distribution.s3_distribution.hosted_zone_id
+    evaluate_target_health = false
+  }
+
+  depends_on  = [aws_cloudfront_distribution.s3_distribution ]
+}
+
+resource "aws_route53_record" "api_domain" {
+  zone_id   = data.terraform_remote_state.jdbsoft.outputs.aws_route53_zone_jdbsoft.zone_id
+  name      = local.api_domain_name
+  type      = "A"
+
+  alias {
+    name    = data.terraform_remote_state.jdbsoft.outputs.aws_lb_jdbsoft.dns_name
+    zone_id = data.terraform_remote_state.jdbsoft.outputs.aws_lb_jdbsoft.zone_id
+    evaluate_target_health  = false
+  }
+}

operations/terraform/deployed_env/ecs.tf

@@ -0,0 +1,75 @@
+resource "aws_secretsmanager_secret" "pmapi" {
+  name  = "${local.environment_name}-Config"
+  tags  = { Environment = local.environment_name }
+}
+
+resource "aws_ecs_task_definition" "pmapi" {
+  family                    = local.environment_name
+  network_mode              = "bridge"
+  requires_compatibilities  = ["EC2"]
+  execution_role_arn        = aws_iam_role.ecs_task.arn
+
+  # See https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_ContainerDefinition.html
+  container_definitions = jsonencode([
+    {
+      name              = local.environment_name
+      image             = "${var.ecr_repo.repository_url}:${data.external.git_describe.result.version}"
+      cpu               = 128
+      memory            = 128
+      memoryReservation = 32
+      environment       = [
+        {
+          name  = "PORT"
+          value = "80"
+        }
+      ]
+      portMappings      = [
+        {
+          protocol      = "tcp"
+          containerPort = 80
+        }
+      ]
+      secrets           = [
+        {
+          name        = "AUTH_SECRET"
+          description = "Auth secret used to hash and salt passwords."
+          valueFrom   = "${aws_secretsmanager_secret.pmapi.arn}:authSecret::"
+        },
+        {
+          name      = "DB_CONN_STRING"
+          description = "Connection string with user credentials."
+          valueFrom   = "${aws_secretsmanager_secret.pmapi.arn}:dbConnString::"
+        },
+        {
+          name      = "KNOWN_ORIGINS"
+          description = "Connection string with user credentials."
+          valueFrom   = "${aws_secretsmanager_secret.pmapi.arn}:knownOrigins::"
+        }
+      ]
+    }
+  ])
+
+  tags = {
+    Name        = local.api_domain_name
+    Environment = local.environment_name
+  }
+}
+
+resource "aws_ecs_service" "pmapi" {
+  name            = local.environment_name
+  cluster         = data.terraform_remote_state.jdbsoft.outputs.aws_ecs_cluster_ortis.id
+  task_definition = aws_ecs_task_definition.pmapi.arn
+  desired_count   = 1
+  launch_type     = "EC2"
+
+  load_balancer {
+    target_group_arn  = aws_lb_target_group.pmapi.arn
+    container_name    = local.environment_name
+    container_port    = 80
+  }
+
+  tags = {
+    Name        = local.api_domain_name
+    Environment = local.environment_name
+  }
+}

operations/terraform/deployed_env/iam.tf

@@ -0,0 +1,69 @@
+resource "aws_iam_role" "ecs_task" {
+  name  = "${local.environment_name}-EcsTaskRole"
+
+  assume_role_policy = jsonencode({
+    Version   = "2012-10-17"
+    Statement = [
+      {
+        Action    = "sts:AssumeRole"
+        Effect    = "Allow"
+        Sid       = ""
+        Principal = {
+          Service = "ecs-tasks.amazonaws.com"
+        }
+      }
+    ]
+  })
+
+  inline_policy {
+    name    = "AllowSecretsAccessForPmApiTasks"
+    policy  = jsonencode({
+      Version   = "2012-10-17"
+      Statement = [
+        {
+          Effect    = "Allow"
+          Action    = [
+            "secretsmanager:GetSecretValue",
+            "kms:Decrypt"
+          ]
+          Resource  = [
+            aws_secretsmanager_secret.pmapi.arn
+          ]
+        }
+      ]
+    })
+  }
+
+  inline_policy {
+    name    = "AllowAccessToEcrForPmApiTasks"
+    policy  = jsonencode({
+      Version   = "2012-10-17"
+      Statement = [
+        {
+          Effect    = "Allow"
+          Action    = [
+            "ecr:GetAuthorizationToken"
+          ]
+          Resource  = [ "*" ]
+        },
+        {
+          Effect    = "Allow"
+          Action    = [
+            "ecr:BatchGetImage",
+            "ecr:BatchCheckLayerAvailability",
+            "ecr:DescribeImages",
+            "ecr:GetDownloadUrlForLayer"
+          ]
+          Resource  = [
+            var.ecr_repo.arn
+          ]
+        }
+      ]
+    })
+  }
+
+  tags = {
+    Name        = "PersonalMeasure-EcsTaskRole"
+    Environment = local.environment_name
+  }
+}

operations/terraform/deployed_env/load-balancer.tf

@@ -0,0 +1,43 @@
+resource "aws_lb_target_group" "pmapi" {
+  name        = "${local.environment_name}-${substr(uuid(), 0, 2)}"
+  port        = 80
+  protocol    = "HTTP"
+  target_type = "instance"
+  vpc_id      = data.terraform_remote_state.jdbsoft.outputs.aws_vpc_jdbsoft.id
+
+  health_check {
+    enabled   = true
+    matcher   = "200"
+    path      = "/v0/version"
+  }
+
+  lifecycle {
+    create_before_destroy = true
+    ignore_changes        = [name]
+  }
+
+  tags = {
+    Name        = local.api_domain_name
+    Environment = local.environment_name
+  }
+}
+
+resource "aws_lb_listener_rule" "pmapi" {
+  listener_arn  = data.terraform_remote_state.jdbsoft.outputs.aws_lb_listener_https.arn
+
+  action {
+    type              = "forward"
+    target_group_arn  = aws_lb_target_group.pmapi.arn
+  }
+
+  condition {
+    host_header {
+      values = [ local.api_domain_name ]
+    }
+  }
+
+  tags = {
+    Name        = "${local.api_domain_name} HTTPS"
+    Environment = local.environment_name
+  }
+}

operations/terraform/deployed_env/variables.tf

@@ -8,6 +8,27 @@ variable "artifact_bucket" {
   description = "The aws_s3_bucket object representing the artifact bucket where deployed artifacts, logs, etc. live."
 }
 
-variable "cloudfront_ssl_certificate_arn" {
-  description = "ARN of the managed SSL certificate to use for this environment."
+variable "ecr_repo" {
+  description = "ECR repository information."
+}
+
+locals {
+  environment_name  = "PersonalMeasure-${var.environment}"
+  app_domain_name   = "pm${var.environment == "prod" ? "" : "-${var.environment}"}.jdb-software.com"
+  api_domain_name   = "pmapi${var.environment == "prod" ? "" : "-${var.environment}"}.jdb-software.com"
+}
+
+data "external" "git_describe" {
+  program = ["sh", "-c", "git describe | xargs printf '{\"version\": \"%s\"}'"]
+}
+
+data "terraform_remote_state" "jdbsoft" {
+  backend = "s3"
+
+  config = {
+    bucket = "operations.jdb-software.com"
+    region = "us-west-2"
+    key    = "terraform/operations.tfstate"
+    dynamodb_table = "terraform-state-lock.jdb-software.com"
+  }
 }

operations/terraform/ecr.tf

@@ -0,0 +1,8 @@
+resource "aws_ecr_repository" "personal_measure_api" {
+  name                  = "personal_measure_api"
+  image_tag_mutability  = "IMMUTABLE"
+
+  image_scanning_configuration {
+    scan_on_push  = true
+  }
+}

operations/terraform/main.tf

@@ -3,40 +3,24 @@ provider "aws" {
 }
 
 resource "aws_s3_bucket" "personal_measure" {
-  bucket = "${var.app_root_url}"
+  bucket = var.app_root_url
   acl    = "log-delivery-write"
 }
 
-resource "aws_dynamodb_table" "dynamodb_terraform-state-lock" {
-  name = "terraform-state-lock.${var.app_root_url}"
-  hash_key = "LockID"
-  read_capacity = 20
-  write_capacity = 20
-
-  attribute {
-    name = "LockID"
-    type = "S"
-  }
-
-  tags = {
-    Name = "Terraform DynamoDB State Lock Table"
-  }
-}
-
 module "dev_env" {
   source = "./deployed_env"
-  
-  environment = "dev"
+
+  environment     = "dev"
   artifact_bucket = aws_s3_bucket.personal_measure
-  cloudfront_ssl_certificate_arn = "arn:aws:acm:us-east-1:063932952339:certificate/48fe3ce0-4700-4eaa-b433-bb634f47934c"
+  ecr_repo        = aws_ecr_repository.personal_measure_api
 }
 
 module "prod_env" {
   source = "./deployed_env"
-  
-  environment = "prod"
+
+  environment     = "prod"
   artifact_bucket = aws_s3_bucket.personal_measure
-  cloudfront_ssl_certificate_arn = "arn:aws:acm:us-east-1:063932952339:certificate/48fe3ce0-4700-4eaa-b433-bb634f47934c"
+  ecr_repo        = aws_ecr_repository.personal_measure_api
 }
 
 data "aws_iam_policy_document" "cloudfront_access_policy" {
@@ -45,6 +29,6 @@ data "aws_iam_policy_document" "cloudfront_access_policy" {
 }
 
 resource "aws_s3_bucket_policy" "personal_measure" {
-  bucket = "${aws_s3_bucket.personal_measure.id}"
-  policy = "${data.aws_iam_policy_document.cloudfront_access_policy.json}"
+  bucket = aws_s3_bucket.personal_measure.id
+  policy = data.aws_iam_policy_document.cloudfront_access_policy.json
 }

operations/terraform/terraform.tf

@@ -1,8 +1,8 @@
 terraform {
   backend "s3" {
-    bucket = "pm.jdb-labs.com"
+    bucket = "pm.jdb-software.com"
     region = "us-west-2"
     key    = "terraform.tfstate"
-    dynamodb_table = "terraform-state-lock.pm.jdb-labs.com"
+    dynamodb_table = "terraform-state-lock.jdb-software.com"
   }
 }

web/.env.development

@@ -1,4 +1,4 @@
 NODE_ENV=production
-VUE_APP_PM_API_BASE=https://pmapi-dev.jdb-labs.com/v0
+VUE_APP_PM_API_BASE=https://pmapi-dev.jdb-software.com/v0
 VUE_APP_LOG_LEVEL=INFO
 VUE_APP_API_LOG_LEVEL=ERROR

web/.env.production

@@ -1,3 +1,3 @@
-VUE_APP_PM_API_BASE=https://pmapi.jdb-labs.com/v0
+VUE_APP_PM_API_BASE=https://pmapi.jdb-software.com/v0
 VUE_APP_LOG_LEVEL=INFO
 VUE_APP_API_LOG_LEVEL=ERROR

web/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "personal-measure-web",
-  "version": "0.8.0",
+  "version": "0.11.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -829,30 +829,30 @@
       }
     },
     "@fortawesome/fontawesome-common-types": {
-      "version": "0.2.27",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.27.tgz",
-      "integrity": "sha512-97GaByGaXDGMkzcJX7VmR/jRJd8h1mfhtA7RsxDBN61GnWE/PPCZhOdwG/8OZYktiRUF0CvFOr+VgRkJrt6TWg=="
+      "version": "0.2.31",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.31.tgz",
+      "integrity": "sha512-xfnPyH6NN5r/h1/qDYoGB0BlHSID902UkQzxR8QsoKDh55KAPr8ruAoie12WQEEQT8lRE2wtV7LoUllJ1HqCag=="
     },
     "@fortawesome/fontawesome-svg-core": {
-      "version": "1.2.27",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.27.tgz",
-      "integrity": "sha512-sOD3DKynocnHYpuw2sLPnTunDj7rLk91LYhi2axUYwuGe9cPCw7Bsu9EWtVdNJP+IYgTCZIbyARKXuy5K/nv+Q==",
+      "version": "1.2.31",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.31.tgz",
+      "integrity": "sha512-lqUWRK+ylHQJG5Kiez4XrAZAfc7snxCc+X59quL3xPfMnxzfyf1lt+/hD7X1ZL4KlzAH2KFzMuEVrolo/rAkog==",
       "requires": {
-        "@fortawesome/fontawesome-common-types": "^0.2.27"
+        "@fortawesome/fontawesome-common-types": "^0.2.31"
       }
     },
     "@fortawesome/free-solid-svg-icons": {
-      "version": "5.12.1",
-      "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.12.1.tgz",
-      "integrity": "sha512-k3MwRFFUhyL4cuCJSaHDA0YNYMELDXX0h8JKtWYxO5XD3Dn+maXOMrVAAiNGooUyM2v/wz/TOaM0jxYVKeXX7g==",
+      "version": "5.15.0",
+      "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.0.tgz",
+      "integrity": "sha512-4dGRsOnGBPM7c0fd3LuiU6LgRSLn01rw1LJ370yC2iFMLUcLCLLynZhQbMhsiJmMwQM/YmPQblAdyHKVCgsIAA==",
       "requires": {
-        "@fortawesome/fontawesome-common-types": "^0.2.27"
+        "@fortawesome/fontawesome-common-types": "^0.2.31"
       }
     },
     "@fortawesome/vue-fontawesome": {
-      "version": "0.1.9",
-      "resolved": "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-0.1.9.tgz",
-      "integrity": "sha512-h/emhmZz+DfB2zOGLWawNwXq82UYhn9waTfUjLLmeaIqtnIyNt6kYlpQT/vzJjLZRDRvY2IEJAh1di5qKpKVpA=="
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-0.1.10.tgz",
+      "integrity": "sha512-b2+SLF31h32LSepVcXe+BQ63yvbq5qmTCy4KfFogCYm2bn68H5sDWUnX+U7MBqnM2aeEk9M7xSoqGnu+wSdY6w=="
     },
     "@hapi/address": {
       "version": "2.1.4",
@@ -1012,9 +1012,9 @@
       "dev": true
     },
     "@types/js-cookie": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/@types/js-cookie/-/js-cookie-2.2.4.tgz",
-      "integrity": "sha512-WTfSE1Eauak/Nrg6cA9FgPTFvVawejsai6zXoq0QYTQ3mxONeRtGhKxa7wMlUzWWmzrmTeV+rwLjHgsCntdrsA=="
+      "version": "2.2.6",
+      "resolved": "https://registry.npmjs.org/@types/js-cookie/-/js-cookie-2.2.6.tgz",
+      "integrity": "sha512-+oY0FDTO2GYKEV0YPvSshGq9t7YozVkgvXLty7zogQNuCxBhT9/3INX9Q7H1aRZ4SUDRXAKlJuA4EA5nTt7SNw=="
     },
     "@types/jwt-decode": {
       "version": "2.2.1",
@@ -1059,6 +1059,14 @@
         "@types/lodash": "*"
       }
     },
+    "@types/lodash.omit": {
+      "version": "4.5.6",
+      "resolved": "https://registry.npmjs.org/@types/lodash.omit/-/lodash.omit-4.5.6.tgz",
+      "integrity": "sha512-KXPpOSNX2h0DAG2w7ajpk7TXvWF28ZHs5nJhOJyP0BQHkehgr948RVsToItMme6oi0XJkp19CbuNXkIX8FiBlQ==",
+      "requires": {
+        "@types/lodash": "*"
+      }
+    },
     "@types/minimatch": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
@@ -1500,9 +1508,9 @@
       "dev": true
     },
     "@vue/test-utils": {
-      "version": "1.0.0-beta.31",
-      "resolved": "https://registry.npmjs.org/@vue/test-utils/-/test-utils-1.0.0-beta.31.tgz",
-      "integrity": "sha512-IlhSx5hyEVnbvDZ3P98R1jNmy88QAd/y66Upn4EcvxSD5D4hwOutl3dIdfmSTSXs4b9DIMDnEVjX7t00cvOnvg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@vue/test-utils/-/test-utils-1.1.0.tgz",
+      "integrity": "sha512-M+3jtVqNYIrvzO5gaxogre5a5+96h0hN/dXw+5Lj0t+dp6fAhYcUjpLrC9j9cEEkl2Rcuh/gKYRUmR5N4vcqPw==",
       "dev": true,
       "requires": {
         "dom-event-types": "^1.0.0",
@@ -1872,16 +1880,16 @@
       "dev": true
     },
     "apexcharts": {
-      "version": "3.15.6",
-      "resolved": "https://registry.npmjs.org/apexcharts/-/apexcharts-3.15.6.tgz",
-      "integrity": "sha512-8mZqg7eTZGU2zvjYUUOf+sTqgfmutipHU9lNgkqzZPtwIVGwR5PwXTBNKRJSI3AeSoQ8VZGYfzTJWoUDfGAeBw==",
+      "version": "3.21.0",
+      "resolved": "https://registry.npmjs.org/apexcharts/-/apexcharts-3.21.0.tgz",
+      "integrity": "sha512-yeulUZCTG57swbJ5oIJIjgfRdIsvmC/2WJanrZxNGhjtZf2B9NaT95pEtbrml1BILJKtMn4VbpXVZp+8Tzmydg==",
       "requires": {
         "svg.draggable.js": "^2.2.2",
         "svg.easing.js": "^2.0.0",
         "svg.filter.js": "^2.0.2",
         "svg.pathmorphing.js": "^0.1.3",
         "svg.resize.js": "^1.4.3",
-        "svg.select.js": "^2.1.2"
+        "svg.select.js": "^3.0.1"
       }
     },
     "append-transform": {
@@ -6976,9 +6984,9 @@
       }
     },
     "globule": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.0.tgz",
-      "integrity": "sha512-YlD4kdMqRCQHrhVdonet4TdRtv1/sZKepvoxNT4Nrhrp5HI8XFfc8kFlGlBn2myBo80aGp8Eft259mbcUJhgSg==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.2.tgz",
+      "integrity": "sha512-7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA==",
       "dev": true,
       "requires": {
         "glob": "~7.1.1",
@@ -7590,9 +7598,9 @@
       "dev": true
     },
     "in-publish": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz",
-      "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.1.tgz",
+      "integrity": "sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ==",
       "dev": true
     },
     "indent-string": {
@@ -7666,12 +7674,6 @@
         "loose-envify": "^1.0.0"
       }
     },
-    "invert-kv": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
-      "dev": true
-    },
     "ip": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
@@ -9268,9 +9270,9 @@
       }
     },
     "js-base64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz",
-      "integrity": "sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw==",
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz",
+      "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==",
       "dev": true
     },
     "js-beautify": {
@@ -9463,9 +9465,9 @@
       "integrity": "sha1-fYa9VmefWM5qhHBKZX3TkruoGnk="
     },
     "keen-ui": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/keen-ui/-/keen-ui-1.2.1.tgz",
-      "integrity": "sha512-SyF3orIjl098Du4b1UoXNDmdASxn/hsn7NO0JSoDI4LKmFUs8dP9uywfK+QEnDCev73jSZ3tdJELJKOjV/dl3Q==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/keen-ui/-/keen-ui-1.3.1.tgz",
+      "integrity": "sha512-2EAZy2YFdthCRtZvDHXvMZUTwvHda70WcjbEUaJKM1oH5q9rgecL80VBsTmmcIvfuratIEisBBiteojw3XEa5g==",
       "requires": {
         "autosize": "^3.0.20",
         "deepmerge": "^2.0.1",
@@ -9518,15 +9520,6 @@
         "launch-editor": "^2.2.1"
       }
     },
-    "lcid": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-      "dev": true,
-      "requires": {
-        "invert-kv": "^1.0.0"
-      }
-    },
     "left-pad": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz",
@@ -9991,6 +9984,11 @@
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
     },
+    "lodash.omit": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.5.0.tgz",
+      "integrity": "sha1-brGa5aHuHdnfC5aeZs4Lf6MLXmA="
+    },
     "lodash.sortby": {
       "version": "4.7.0",
       "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
@@ -10485,9 +10483,9 @@
       }
     },
     "moment": {
-      "version": "2.24.0",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
-      "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
+      "version": "2.29.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.0.tgz",
+      "integrity": "sha512-z6IJ5HXYiuxvFTI6eiQ9dm77uE0gyy1yXNApVHqTcnIKfY9tIwEjlzsZ6u1LQXvVgKeTnv9Xm7NDvJ7lso3MtA=="
     },
     "morgan": {
       "version": "1.9.1",
@@ -10773,9 +10771,9 @@
       }
     },
     "node-sass": {
-      "version": "4.13.1",
-      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.13.1.tgz",
-      "integrity": "sha512-TTWFx+ZhyDx1Biiez2nB0L3YrCZ/8oHagaDalbuBSlqXgUPsdkUSzJsVxeDO9LtPB49+Fh3WQl3slABo6AotNw==",
+      "version": "4.14.1",
+      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.1.tgz",
+      "integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==",
       "dev": true,
       "requires": {
         "async-foreach": "^0.1.3",
@@ -10792,7 +10790,7 @@
         "node-gyp": "^3.8.0",
         "npmlog": "^4.0.0",
         "request": "^2.88.0",
-        "sass-graph": "^2.2.4",
+        "sass-graph": "2.2.5",
         "stdout-stream": "^1.4.0",
         "true-case-path": "^1.0.2"
       },
@@ -10843,9 +10841,9 @@
           }
         },
         "nan": {
-          "version": "2.14.0",
-          "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
-          "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
+          "version": "2.14.1",
+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz",
+          "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==",
           "dev": true
         },
         "strip-ansi": {
@@ -12717,9 +12715,9 @@
       }
     },
     "register-service-worker": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/register-service-worker/-/register-service-worker-1.6.2.tgz",
-      "integrity": "sha512-I8L87fX2TK29LDx+wgyOUh2BJ3rDIRC1FtRZEHeP3rivzDv6p1DDZLGGtPucqjEkm45+2crtFIFssEWv56+9Wg=="
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/register-service-worker/-/register-service-worker-1.7.1.tgz",
+      "integrity": "sha512-IdTfUZ4u8iJL8o1w8es8l6UMGPmkwHolUdT+UmM1UypC80IB4KbpuIlvwWVj8UDS7eJwkEYRcKRgfRX+oTmJsw=="
     },
     "regjsgen": {
       "version": "0.5.1",
@@ -13053,118 +13051,137 @@
       }
     },
     "sass-graph": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz",
-      "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=",
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.5.tgz",
+      "integrity": "sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==",
       "dev": true,
       "requires": {
         "glob": "^7.0.0",
         "lodash": "^4.0.0",
         "scss-tokenizer": "^0.2.3",
-        "yargs": "^7.0.0"
+        "yargs": "^13.3.2"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "camelcase": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-          "dev": true
-        },
         "cliui": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-          "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+          "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
           "dev": true,
           "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1",
-            "wrap-ansi": "^2.0.0"
+            "string-width": "^3.1.0",
+            "strip-ansi": "^5.2.0",
+            "wrap-ansi": "^5.1.0"
           }
         },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+        "emoji-regex": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+          "dev": true
+        },
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
           "dev": true,
           "requires": {
-            "number-is-nan": "^1.0.0"
+            "locate-path": "^3.0.0"
           }
         },
-        "os-locale": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-          "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
+        "get-caller-file": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+          "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+          "dev": true
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
           "dev": true,
           "requires": {
-            "lcid": "^1.0.0"
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
           }
         },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "dev": true
+        },
+        "require-main-filename": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+          "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+          "dev": true
+        },
         "string-width": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
           "dev": true,
           "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
           }
         },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+        "wrap-ansi": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+          "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^2.0.0"
+            "ansi-styles": "^3.2.0",
+            "string-width": "^3.0.0",
+            "strip-ansi": "^5.0.0"
           }
         },
-        "which-module": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-          "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
-          "dev": true
-        },
-        "y18n": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
-          "dev": true
-        },
         "yargs": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
-          "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
+          "version": "13.3.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
+          "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
           "dev": true,
           "requires": {
-            "camelcase": "^3.0.0",
-            "cliui": "^3.2.0",
-            "decamelize": "^1.1.1",
-            "get-caller-file": "^1.0.1",
-            "os-locale": "^1.4.0",
-            "read-pkg-up": "^1.0.1",
+            "cliui": "^5.0.0",
+            "find-up": "^3.0.0",
+            "get-caller-file": "^2.0.1",
             "require-directory": "^2.1.1",
-            "require-main-filename": "^1.0.1",
+            "require-main-filename": "^2.0.0",
             "set-blocking": "^2.0.0",
-            "string-width": "^1.0.2",
-            "which-module": "^1.0.0",
-            "y18n": "^3.2.1",
-            "yargs-parser": "^5.0.0"
+            "string-width": "^3.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^4.0.0",
+            "yargs-parser": "^13.1.2"
           }
         },
         "yargs-parser": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
-          "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
+          "version": "13.1.2",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+          "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
           "dev": true,
           "requires": {
-            "camelcase": "^3.0.0"
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
           }
         }
       }
@@ -13402,6 +13419,12 @@
         }
       }
     },
+    "servor": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/servor/-/servor-4.0.2.tgz",
+      "integrity": "sha512-MlmQ5Ntv4jDYUN060x/KEmN7emvIqKMZ9OkM+nY8Bf2+KkyLmGsTqWLyAN2cZr5oESAcH00UanUyyrlS1LRjFw==",
+      "dev": true
+    },
     "set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
@@ -14266,14 +14289,24 @@
       "requires": {
         "svg.js": "^2.6.5",
         "svg.select.js": "^2.1.2"
+      },
+      "dependencies": {
+        "svg.select.js": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/svg.select.js/-/svg.select.js-2.1.2.tgz",
+          "integrity": "sha512-tH6ABEyJsAOVAhwcCjF8mw4crjXSI1aa7j2VQR8ZuJ37H2MBUbyeqYr5nEO7sSN3cy9AR9DUwNg0t/962HlDbQ==",
+          "requires": {
+            "svg.js": "^2.2.5"
+          }
+        }
       }
     },
     "svg.select.js": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/svg.select.js/-/svg.select.js-2.1.2.tgz",
-      "integrity": "sha512-tH6ABEyJsAOVAhwcCjF8mw4crjXSI1aa7j2VQR8ZuJ37H2MBUbyeqYr5nEO7sSN3cy9AR9DUwNg0t/962HlDbQ==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/svg.select.js/-/svg.select.js-3.0.1.tgz",
+      "integrity": "sha512-h5IS/hKkuVCbKSieR9uQCj9w+zLHoPh+ce19bBYyqF53g6mnPB8sAtIbe1s9dh2S2fCmYX2xel1Ln3PJBbK4kw==",
       "requires": {
-        "svg.js": "^2.2.5"
+        "svg.js": "^2.6.5"
       }
     },
     "svgo": {
@@ -14877,9 +14910,9 @@
       "dev": true
     },
     "typescript": {
-      "version": "3.7.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.7.5.tgz",
-      "integrity": "sha512-/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw==",
+      "version": "3.9.7",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz",
+      "integrity": "sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==",
       "dev": true
     },
     "uglify-js": {
@@ -15193,14 +15226,14 @@
       "dev": true
     },
     "vue": {
-      "version": "2.6.11",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.11.tgz",
-      "integrity": "sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ=="
+      "version": "2.6.12",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.12.tgz",
+      "integrity": "sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg=="
     },
     "vue-apexcharts": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/vue-apexcharts/-/vue-apexcharts-1.5.2.tgz",
-      "integrity": "sha512-m7IIyql4yU6cLTu5RODx3DcdxCekmNRzUh7lEoybq2MXcgabmBPhUn8qgXNx1HucWiMNOdXfwq/L6TfCbKnfMw=="
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/vue-apexcharts/-/vue-apexcharts-1.6.0.tgz",
+      "integrity": "sha512-sT6tuVTLBwfH3TA7azecDNS/W70bmz14ZJI7aE7QIqcG9I6OywyH7x3hcOeY1v1DxttI8Svc5RuYj4Dd+A5F4g=="
     },
     "vue-class-component": {
       "version": "6.3.2",
@@ -15262,9 +15295,9 @@
       }
     },
     "vue-router": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.1.5.tgz",
-      "integrity": "sha512-BszkPvhl7I9h334GjckCh7sVFyjTPMMJFJ4Bsrem/Ik+B/9gt5tgrk8k4gGLO4ZpdvciVdg7O41gW4DisQWurg=="
+      "version": "3.4.5",
+      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.4.5.tgz",
+      "integrity": "sha512-ioRY5QyDpXM9TDjOX6hX79gtaMXSVDDzSlbIlyAmbHNteIL81WIVB2e+jbzV23vzxtoV0krdS2XHm+GxFg+Nxg=="
     },
     "vue-style-loader": {
       "version": "4.1.2",
@@ -15277,9 +15310,9 @@
       }
     },
     "vue-template-compiler": {
-      "version": "2.6.11",
-      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.11.tgz",
-      "integrity": "sha512-KIq15bvQDrcCjpGjrAhx4mUlyyHfdmTaoNfeoATHLAiWB+MU3cx4lOzMwrnUh9cCxy0Lt1T11hAFY6TQgroUAA==",
+      "version": "2.6.12",
+      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.12.tgz",
+      "integrity": "sha512-OzzZ52zS41YUbkCBfdXShQTe69j1gQDZ9HIX8miuC9C3rBCk9wIRjLiZZLrmX9V+Ftq/YEyv1JaVr5Y/hNtByg==",
       "dev": true,
       "requires": {
         "de-indent": "^1.0.2",
@@ -15301,9 +15334,9 @@
       }
     },
     "vuex": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.1.2.tgz",
-      "integrity": "sha512-ha3jNLJqNhhrAemDXcmMJMKf1Zu4sybMPr9KxJIuOpVcsDQlTBYLLladav2U+g1AvdYDG5Gs0xBTb0M5pXXYFQ=="
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.5.1.tgz",
+      "integrity": "sha512-w7oJzmHQs0FM9LXodfskhw9wgKBiaB+totOdb8sNzbTB2KDCEEwEs29NzBZFh/lmEK1t5tDmM1vtsO7ubG1DFw=="
     },
     "vuex-module-decorators": {
       "version": "0.9.11",

web/package.json

@@ -1,41 +1,43 @@
 {
   "name": "personal-measure-web",
-  "version": "0.8.0",
+  "version": "0.11.0",
   "private": true,
   "scripts": {
-    "serve": "vue-cli-service serve",
+    "serve": "npx servor dist",
     "build-prod": "vue-cli-service build --mode production",
     "build-dev": "vue-cli-service build --mode development",
     "lint": "vue-cli-service lint",
     "test:unit": "vue-cli-service test:unit"
   },
   "dependencies": {
-    "@fortawesome/fontawesome-svg-core": "^1.2.27",
-    "@fortawesome/free-solid-svg-icons": "^5.12.1",
-    "@fortawesome/vue-fontawesome": "^0.1.9",
-    "@types/js-cookie": "^2.2.4",
+    "@fortawesome/fontawesome-svg-core": "^1.2.31",
+    "@fortawesome/free-solid-svg-icons": "^5.15.0",
+    "@fortawesome/vue-fontawesome": "^0.1.10",
+    "@types/js-cookie": "^2.2.6",
     "@types/jwt-decode": "^2.2.1",
     "@types/lodash.assign": "^4.2.6",
     "@types/lodash.findindex": "^4.6.6",
     "@types/lodash.merge": "^4.6.6",
-    "apexcharts": "^3.15.6",
+    "@types/lodash.omit": "^4.5.6",
+    "apexcharts": "^3.21.0",
     "axios": "^0.18.1",
     "js-cookie": "^2.2.1",
     "jwt-decode": "^2.2.0",
-    "keen-ui": "^1.2.1",
+    "keen-ui": "^1.3.1",
     "lodash.assign": "^4.2.0",
     "lodash.findindex": "^4.6.0",
     "lodash.keyby": "^4.6.0",
     "lodash.merge": "^4.6.2",
-    "moment": "^2.24.0",
-    "register-service-worker": "^1.5.2",
-    "vue": "^2.6.11",
-    "vue-apexcharts": "^1.5.2",
+    "lodash.omit": "^4.5.0",
+    "moment": "^2.29.0",
+    "register-service-worker": "^1.7.1",
+    "vue": "^2.6.12",
+    "vue-apexcharts": "^1.6.0",
     "vue-class-component": "^6.0.0",
     "vue-property-decorator": "^7.0.0",
-    "vue-router": "^3.1.5",
+    "vue-router": "^3.4.5",
     "vuejs-smart-table": "0.0.3",
-    "vuex": "^3.1.2",
+    "vuex": "^3.5.1",
     "vuex-module-decorators": "^0.9.11"
   },
   "devDependencies": {
@@ -46,16 +48,17 @@
     "@vue/cli-plugin-typescript": "^3.12.1",
     "@vue/cli-plugin-unit-jest": "^3.12.1",
     "@vue/cli-service": "^3.12.1",
-    "@vue/test-utils": "^1.0.0-beta.31",
+    "@vue/test-utils": "^1.1.0",
     "babel-core": "7.0.0-bridge.0",
     "lint-staged": "^8.2.1",
     "live-server": "^1.2.1",
-    "node-sass": "^4.13.1",
+    "node-sass": "^4.14.1",
     "sass-loader": "^7.3.1",
+    "servor": "^4.0.2",
     "ts-jest": "^23.0.0",
-    "typescript": "^3.7.5",
+    "typescript": "^3.9.7",
     "vue-cli-plugin-webpack-bundle-analyzer": "^1.4.0",
-    "vue-template-compiler": "^2.6.11"
+    "vue-template-compiler": "^2.6.12"
   },
   "gitHooks": {
     "pre-commit": "lint-staged"

web/src/components/measure-config/MeasureConfigForm.vue

@@ -2,19 +2,40 @@
   <fieldset>
     <div>
       <label for=measureType>Type</label>
+      <span v-if=measureExists>{{value.type}}</span>
       <select
         :disabled=disabled
         name=measureType
+        v-if="!measureExists"
         v-model=value.type>
         <option value=simple>Simple</option>
-        <option value=list>List</option>
+        <option value=text>Text</option>
       </select>
     </div>
     <div>
       <label for=measureIsVisible>Show by default.</label>
       <input type=checkbox v-model=value.isVisible :disabled=disabled />
     </div>
-    <!--<ListMeasureConfigForm :config=config v-show="config.type === 'list'"/>-->
+    <div>
+      <label for=timestampDisplayFormat>Timestamp Format</label>
+      <select
+        v-on:change=formatSelectionChanged
+        :disabled=disabled
+        v-model=selectedFormat
+        name=timestampDisplayFormat>
+        <option v-for="fmtStr in formatStrings"
+                :value=fmtStr>{{now.format(fmtStr)}}</option>
+        <option value="custom">Custom</option>
+      </select>
+    </div>
+    <div v-if="selectedFormat === 'custom'">
+      <label for=timestampCustomDisplayFormat>
+        Custom Timestamp Format
+        (<a target="_blank" href="https://momentjs.com/docs/#/displaying/format/">see formatting options</a>)
+      </label>
+      <input type=text v-model=value.timestampDisplayFormat />
+    </div>
+    <TextMeasureConfigForm v-model=value v-show="value.type === 'text'" :disabled=disabled />
   </fieldset>
 </template>
 <script lang=ts src=./measure-config-form.ts></script>

web/src/components/measure-config/TextMeasureConfigForm.vue

@@ -0,0 +1,10 @@
+<template>
+  <div>
+    <label for=textEntryShowTimestamp>Show Timestamps.</label>
+    <input name=textEntryShowTimestamp
+           :disabled=disabled
+           type=checkbox
+           v-model=value.showTimestamp />
+  </div>
+</template>
+<script lang=ts src=./text-measure-config-form.ts></script>

web/src/components/measure-config/measure-config-form.ts

@@ -1,17 +1,60 @@
 import { Component, Emit, Prop, Vue, Watch } from 'vue-property-decorator';
 import { logService } from '@/services/logging';
 import { Measure, MeasureConfig } from '@/models';
+import TextMeasureConfigForm from './TextMeasureConfigForm.vue';
+import moment from 'moment';
 
-@Component({})
+@Component({
+  components: {
+    TextMeasureConfigForm
+  }
+})
 export class MeasureConfigForm extends Vue {
   @Prop({}) public value!: MeasureConfig;
   @Prop({}) public disabled: boolean = false;
+  @Prop({}) public measureExists!: boolean;
+
+  public now = moment();
+  public formatStrings = [
+    'l',
+    'L',
+    'll',
+    'LL',
+    'lll',
+    'LLL',
+    'llll',
+    'LLLL',
+    'Y-MM-DD',
+    'Y-MM-DDTHH:mm',
+    'Y-MM-DDTHH:mm:ss',
+    'Y-MM-DDTHH:mm:ss.SSSZZ',
+    'MM/DD',
+    'MMM Do',
+    'HH:mm',
+    'hh:mmA'
+  ];
+
+  private selectedFormat: string = 'l';
 
   @Watch('value', { immediate: true, deep: true })
   @Emit('input')
   private onConfigChanged(newVal: MeasureConfig, oldVal: MeasureConfig) {
     return newVal;
   }
+
+  private formatSelectionChanged() {
+    if (this.selectedFormat !== 'custom') {
+      this.value.timestampDisplayFormat = this.selectedFormat;
+    }
+  }
+
+  private mounted() {
+    if (this.formatStrings.includes(this.value.timestampDisplayFormat)) {
+      this.selectedFormat = this.value.timestampDisplayFormat;
+    } else {
+      this.selectedFormat = 'custom';
+    }
+  }
 }
 
 export default MeasureConfigForm;

web/src/components/measure-config/text-measure-config-form.ts

@@ -0,0 +1,17 @@
+import { Component, Emit, Prop, Vue, Watch } from 'vue-property-decorator';
+import { logService } from '@/services/logging';
+import { Measure, MeasureConfig, TextMeasureConfig } from '@/models';
+
+@Component({})
+export class TextMeasureConfigForm extends Vue {
+  @Prop({}) public value!: MeasureConfig;
+  @Prop({}) public disabled: boolean = false;
+
+  @Watch('value', { immediate: true, deep: true })
+  @Emit('input')
+  private onConfigChanged(newVal: TextMeasureConfig, oldVal: TextMeasureConfig) {
+    return newVal;
+  }
+}
+
+export default TextMeasureConfigForm;

web/src/components/measure-details/MeasureDetails.vue

@@ -2,6 +2,8 @@
   <div>
     <SimpleDetails v-if="measure.config.type === 'simple'"
       :measure=measure :measurements=measurements />
+    <TextDetails v-if="measure.config.type === 'text'"
+      :measure=measure :measurements=measurements />
   </div>
 </template>
 <script lang="ts" src="./measure-details.ts"></script>

web/src/components/measure-details/SimpleDetails.vue

@@ -15,7 +15,6 @@
         </tr>
       </tbody>
     </v-table>
-    <SimpleEntry :measure=measure v-model=
   </div>
 </template>
 <script lang="ts" src="./simple-details.ts"></script>

web/src/components/measure-details/TextDetails.vue

@@ -0,0 +1,22 @@
+<template>
+  <div class=text-details>
+    <v-table :data=measurementTableData>
+      <thead slot=head>
+        <tr>
+          <v-th
+            v-if="measure.config.showTimestamp"
+            sortKey=tsSort
+            defaultSort=asc>Timestamp</v-th>
+          <v-th sortKey=value>{{measure.name}}</v-th>
+        </tr>
+      </thead>
+      <tbody slot=body slot-scope={displayData} >
+        <tr v-for="row in displayData" :key="row.id">
+          <td v-if="measure.config.showTimestamp">{{row.tsDisplay}}</td>
+          <td>{{row.extData.entry}}</td>
+        </tr>
+      </tbody>
+    </v-table>
+  </div>
+</template>
+<script lang=ts src=./text-details.ts></script>

web/src/components/measure-details/measure-details.ts

@@ -1,9 +1,13 @@
 import { Component, Prop, Vue } from 'vue-property-decorator';
 import { Measure, MeasureConfig, MeasureType, Measurement, MeasurementMeta } from '@/models';
 import SimpleDetails from './SimpleDetails.vue';
+import TextDetails from './TextDetails.vue';
 
 @Component({
-  components: { SimpleDetails }
+  components: {
+    SimpleDetails,
+    TextDetails
+  }
 })
 export class MeasureDetails extends Vue {
   @Prop() private measure!: Measure<MeasureConfig>;

web/src/components/measure-details/simple-details.ts

@@ -1,9 +1,9 @@
 import { Component, Prop, Vue } from 'vue-property-decorator';
 import { Measure, MeasureConfig, MeasureType, Measurement, MeasurementMeta } from '@/models';
-import moment from 'moment';
 import assign from 'lodash.assign';
 import { library } from '@fortawesome/fontawesome-svg-core';
 import { faPencilAlt } from '@fortawesome/free-solid-svg-icons';
+import { byTimestampComparator, formatTS } from '@/util';
 
 library.add(faPencilAlt);
 
@@ -12,8 +12,6 @@ export class SimpleDetails extends Vue {
   @Prop() private measure!: Measure<MeasureConfig>;
   @Prop() private measurements!: Array<Measurement<MeasurementMeta>>;
 
-  // private newMeasurement;
-  private moment = moment;
   private chartOptions = {
     markers: { size: 6 },
     noData: { text: 'no data',
@@ -28,7 +26,7 @@ export class SimpleDetails extends Vue {
     return [{
       name: this.measure.name,
       data: measurementData
-        .sort((a, b) => a.timestamp.getTime() - b.timestamp.getTime())
+        .sort(byTimestampComparator)
         .map((m) => ({ x: m.timestamp.toISOString(), y: m.value }))
     }];
   }
@@ -36,7 +34,7 @@ export class SimpleDetails extends Vue {
   private get measurementTableData() {
     return (this.measurements || []).map((m) => {
       return assign({}, m, {
-        tsDisplay: moment(m.timestamp).format('MMM Do, HH:mm'),
+        tsDisplay: formatTS(this.measure, m),
         tsSort: m.timestamp.toISOString()
       });
     });

web/src/components/measure-details/text-details.ts

@@ -0,0 +1,22 @@
+import { Component, Prop, Vue } from 'vue-property-decorator';
+import assign from 'lodash.assign';
+import { Measure, Measurement, TextMeasureConfig, TextMeasurementMeta } from '@/models';
+import { formatTS } from '@/util';
+
+@Component({})
+export class TextDetails extends Vue {
+  @Prop() private measure!: Measure<TextMeasureConfig>;
+  @Prop() private measurements!: Array<Measurement<TextMeasurementMeta>>;
+
+  private get measurementTableData() {
+    return (this.measurements || []).map((m) => {
+      return assign({}, m, {
+        tsDisplay: formatTS(this.measure, m),
+        tsSort: m.timestamp.toISOString()
+      });
+    });
+  }
+
+}
+
+export default TextDetails;

web/src/components/measure-summaries/ListSummary.vue

@@ -1,6 +0,0 @@
-<template>
-  <ul>
-    <li v-for="m in top5">{{m.extData.entry}}</li>
-  </ul>
-</template>
-<script lang="ts" src="./list-summary.ts"></script>

web/src/components/measure-summaries/MeasureSummary.vue

@@ -5,7 +5,7 @@
         {{measure.name}}</router-link></h2>
     <SimpleSummaryGraph v-if="measure.config.type === 'simple'"
       :measure=measure :measurements=measurements />
-    <ListSummary v-if="measure.config.type === 'list'"
+    <TextSummary v-if="measure.config.type === 'text'"
       :measure=measure :measurements=measurements />
   </div>
 </template>

web/src/components/measure-summaries/TextSummary.vue

@@ -0,0 +1,13 @@
+<template>
+  <ul>
+    <li
+      v-for="m in top5"
+      v-bind:class="{ 'show-timestamp': measure.config.showTimestamp,
+                      'full-timestamp': !withinLastYear }">
+      <span class=timestamp>{{formatDate(m.timestamp)}}</span>
+      <span class=entry>{{m.extData.entry}}</span>
+    </li>
+  </ul>
+</template>
+<script lang="ts" src="./text-summary.ts"></script>
+<style scoped lang="scss" src="./text-summary.scss"></script>

web/src/components/measure-summaries/list-summary.ts

@@ -1,16 +0,0 @@
-import { Component, Prop, Vue } from 'vue-property-decorator';
-import { Measure, ListMeasureConfig, Measurement, ListMeasurementMeta } from '@/models';
-
-@Component
-export class ListSummary extends Vue {
-  @Prop() private measure!: Measure<ListMeasureConfig>;
-  @Prop() private measurements!: Array<Measurement<ListMeasurementMeta>>;
-
-  private top5(): Array<Measurement<ListMeasurementMeta>>  {
-    return this.measurements
-      .sort((a, b) => b.timestamp.getTime() - a.timestamp.getTime())
-      .slice(0, 5);
-  }
-}
-
-export default ListSummary;

web/src/components/measure-summaries/measure-summary.ts

@@ -1,12 +1,12 @@
 import { Component, Prop, Vue } from 'vue-property-decorator';
 import { Measure, MeasureConfig, MeasureType, Measurement, MeasurementMeta } from '@/models';
 import { measurementStore } from '@/store';
-import ListSummary from './ListSummary.vue';
+import TextSummary from './TextSummary.vue';
 import SimpleSummaryGraph from './SimpleSummaryGraph.vue';
 
 @Component({
   components: {
-    ListSummary,
+    TextSummary,
     SimpleSummaryGraph
   }
 })

web/src/components/measure-summaries/text-summary.scss

@@ -0,0 +1,39 @@
+@import '~@/styles/vars';
+
+ul {
+  list-style: none;
+  padding: 0.5rem 0;
+
+  li {
+    span {
+      display: inline-block;
+      vertical-align: bottom;
+
+      &.timestamp {
+        color: $color2;
+        font-weight: bold;
+      }
+
+      &.entry {
+        overflow-x: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
+    }
+
+    &:not(.show-timestamp) {
+      span.timestamp { display: none; }
+      span.entry { width: 100%; }
+    }
+
+    &.show-timestamp {
+      span.timestamp { width: 5rem; }
+      span.entry { width: calc(100% - 5rem); }
+    }
+
+    &.show-timestamp.full-timestamp {
+      span.timestamp { width: 6rem; }
+      span.entry { width: calc(100% - 6rem); }
+    }
+  }
+}

web/src/components/measure-summaries/text-summary.ts

@@ -0,0 +1,33 @@
+import { Component, Prop, Vue, Watch } from 'vue-property-decorator';
+import moment from 'moment';
+import { Measure, TextMeasureConfig, Measurement, TextMeasurementMeta } from '@/models';
+import { byTimestampComparator } from '@/util';
+
+const YEAR_START = moment().startOf('year');
+
+@Component
+export class TextSummary extends Vue {
+  @Prop() private measure!: Measure<TextMeasureConfig>;
+  @Prop() private measurements!: Array<Measurement<TextMeasurementMeta>>;
+
+  private top5: Array<Measurement<TextMeasurementMeta>> = [];
+  private withinLastYear: boolean = true;
+
+  @Watch('measurements')
+  private onMeasurementsChanged() {
+    this.top5 = this.measurements
+      .slice(0)
+      .sort(byTimestampComparator)
+      .slice(0, 5);
+
+    this.withinLastYear = this.top5.every((entry) => YEAR_START.isBefore(entry.timestamp));
+  }
+
+  private formatDate(ts: Date) {
+    if (this.withinLastYear) { return moment(ts).format('MMM. Do'); }
+    else { return moment(ts).format('YYYY-MM-DD'); }
+  }
+
+}
+
+export default TextSummary;

web/src/components/measurement-entry/MeasurementEntry.vue

@@ -2,6 +2,8 @@
   <div>
     <SimpleEntry v-if="measure.config.type === 'simple'"
       :measure=measure v-model=value />
+    <TextEntry v-if="measure.config.type === 'text'"
+      :measure=measure v-model=value />
   </div>
 </template>
 <script lang="ts" src="./measurement-entry.ts"></script>

web/src/components/measurement-entry/SimpleEntry.vue

@@ -2,7 +2,9 @@
   <fieldset>
     <div>
       <label for=timestamp>Timestamp</label>
-      <input type=datetime-local
+      <input
+        name=timestamp
+        type=datetime-local
         v-model=value.timestamp
         v-show=editTimestamp
         :disabled=disabled />

web/src/components/measurement-entry/TextEntry.vue

@@ -0,0 +1,26 @@
+<template>
+  <fieldset>
+    <div>
+      <label for=timestamp>Timestamp</label>
+      <input
+        name=timestamp
+        type=datetime-local
+        v-model=value.timestamp
+        v-show=editTimestamp
+        :disabled=disabled />
+      <span v-show="!editTimestamp">
+        now <a href="#" v-on:click.stop.prevent="editTimestamp = true"> (set a time)</a>
+      </span>
+    </div>
+    <div>
+      <label for=measurementEntry>{{measure.name}}</label>
+      <input
+        name=measurementEntry
+        required
+        type=text
+        v-model=value.extData.entry
+        :disabled=disabled />
+    </div>
+  </fieldset>
+</template>
+<script lang="ts" src="./text-entry.ts"></script>

web/src/components/measurement-entry/measurement-entry.ts

@@ -1,9 +1,13 @@
 import { Component, Emit, Prop, Vue, Watch } from 'vue-property-decorator';
 import { Measure, MeasureConfig, MeasureType, Measurement, MeasurementMeta } from '@/models';
 import SimpleEntry from './SimpleEntry.vue';
+import TextEntry from './TextEntry.vue';
 
 @Component({
-  components: { SimpleEntry }
+  components: {
+    SimpleEntry,
+    TextEntry
+  }
 })
 export class MeasurementEntry extends Vue {
   @Prop() private measure!: Measure<MeasureConfig>;

web/src/components/measurement-entry/simple-entry.ts

@@ -11,8 +11,6 @@ export class SimpleEntry extends Vue {
   @Watch('value', { immediate: true, deep: true })
   @Emit('input')
   private onMeasurementChanged(newVal: Measurement<MeasurementMeta>, oldVal: Measurement<MeasurementMeta>) {
-    newVal.extData.measureType = 'simple' as MeasureType;
-
     if (typeof(newVal.value) === 'string' ) {
       newVal.value = parseInt(newVal.value, 10);
     }

web/src/components/measurement-entry/text-entry.ts

@@ -0,0 +1,13 @@
+import { Component, Emit, Prop, Vue, Watch } from 'vue-property-decorator';
+import { Measure, MeasureConfig, MeasureType, Measurement, MeasurementMeta } from '@/models';
+
+@Component({})
+export class TextEntry extends Vue {
+  @Prop() public measure!: Measure<MeasureConfig>;
+  @Prop() public value!: Measurement<MeasurementMeta>;
+  @Prop() public disabled!: boolean;
+  private editTimestamp: boolean = false;
+
+}
+
+export default TextEntry;

web/src/models.d.ts

@@ -1,4 +1,4 @@
-export enum MeasureType { List = 'list', Simple = 'simple' }
+export enum MeasureType { Text = 'text', Simple = 'simple' }
 
 export interface ApiToken {
   id: string;
@@ -17,9 +17,10 @@ export interface LoginSubmit {
 export interface MeasureConfig {
   type: MeasureType;
   isVisible: boolean;
+  timestampDisplayFormat: string;
 }
 
-export interface ListMeasureConfig extends MeasureConfig {
+export interface TextMeasureConfig extends MeasureConfig {
   showTimestamp: boolean;
 }
 
@@ -33,10 +34,9 @@ export interface Measure<C extends MeasureConfig> {
 }
 
 export interface MeasurementMeta {
-  measureType: MeasureType;
 }
 
-export interface ListMeasurementMeta extends MeasurementMeta {
+export interface TextMeasurementMeta extends MeasurementMeta {
   entry: string;
 }
 

web/src/router.ts

@@ -7,6 +7,8 @@ import Measure from '@/views/Measure.vue';
 import Measures from '@/views/Measures.vue';
 import NewMeasure from '@/views/NewMeasure.vue';
 import NewMeasurement from '@/views/NewMeasurement.vue';
+import DeleteMeasure from '@/views/DeleteMeasure.vue';
+import EditMeasure from '@/views/EditMeasure.vue';
 import NotFound from '@/views/NotFound.vue';
 import QuickPanels from '@/views/QuickPanels.vue';
 import UserAccount from '@/views/UserAccount.vue';
@@ -68,6 +70,16 @@ const router = new Router({
       name: 'new-measurement',
       component: NewMeasurement
     },
+    {
+      path: '/delete/measure/:slug',
+      name: 'delete-measure',
+      component: DeleteMeasure
+    },
+    {
+      path: '/edit/measure/:slug',
+      name: 'edit-measure',
+      component: EditMeasure
+    },
     {
       path: '*',
       name: 'not-found',

web/src/services/pm-api-client.ts

@@ -123,6 +123,11 @@ export class PmApiClient {
     return resp.data;
   }
 
+  public async updateMeasure<T extends MeasureConfig>(measure: Measure<T>): Promise<Measure<T>> {
+    const resp = await this.http.post(`/measures/${measure.slug}`, measure);
+    return resp.data;
+  }
+
   public async deleteMeasure(slug: string): Promise<boolean> {
     const resp = await this.http.delete(`/measures/${slug}`);
     return true;
@@ -131,7 +136,7 @@ export class PmApiClient {
   public async getMeasurements(measureSlug: string)
     : Promise<Array<Measurement<MeasurementMeta>>> {
 
-    const resp = await this.http.get(`/measure/${measureSlug}`);
+    const resp = await this.http.get(`/measurements/${measureSlug}`);
     return resp.data.map(this.fromMeasurementDTO);
   }
 
@@ -141,7 +146,7 @@ export class PmApiClient {
     : Promise<Measurement<MeasurementMeta>> {
 
      const resp = await this.http.post(
-       `/measure/${measureSlug}`,
+       `/measurements/${measureSlug}`,
        this.toMeasurementDTO(measurement));
      return this.fromMeasurementDTO(resp.data);
   }
@@ -152,7 +157,7 @@ export class PmApiClient {
     : Promise<Measurement<MeasurementMeta>> {
 
     const resp = await this.http
-      .get(`/measure/${measureSlug}/${measurementId}`);
+      .get(`/measurements/${measureSlug}/${measurementId}`);
     return this.fromMeasurementDTO(resp.data);
   }
 
@@ -162,7 +167,7 @@ export class PmApiClient {
     : Promise<Measurement<MeasurementMeta>> {
 
     const resp = await this.http.put(
-      `/measure/${measureSlug}/${measurement.id}`,
+      `/measurements/${measureSlug}/${measurement.id}`,
       this.toMeasurementDTO(measurement));
     return this.fromMeasurementDTO(resp.data);
   }
@@ -173,7 +178,7 @@ export class PmApiClient {
     : Promise<boolean> {
 
     const resp = await this.http
-      .delete(`/measure/${measureSlug}/${measurementId}`);
+      .delete(`/measurements/${measureSlug}/${measurementId}`);
     return true;
   }
 

web/src/store-modules/measure.ts

@@ -6,7 +6,9 @@ import {
   MutationAction,
   VuexModule
 } from 'vuex-module-decorators';
+import assign from 'lodash.assign';
 import keyBy from 'lodash.keyby';
+import omit from 'lodash.omit';
 import { User, Measure, MeasureConfig } from '@/models';
 import api from '@/services/pm-api-client';
 
@@ -28,13 +30,29 @@ export class MeasureStoreModule extends VuexModule {
   }
 
   @Action({ rawError: true })
-  public async createMeasure(m: Measure<MeasureConfig>) {
+  public async createMeasure<T extends MeasureConfig>(m: Measure<T>) {
     const newMeasure = await api.createMeasure(m);
     this.context.commit('SET_MEASURE', newMeasure);
     return newMeasure;
   }
 
+  @Action({ rawError: true })
+  public async deleteMeasure<T extends MeasureConfig>(m: Measure<T>) {
+    const delResponse = await api.deleteMeasure(m.slug);
+    this.context.commit('DELETE_MEASURE', m);
+  }
+
+  @Action({ rawError: true })
+  public async updateMeasure<T extends MeasureConfig>(m: Measure<T>) {
+    const updatedMeasure = await api.updateMeasure(m);
+    return updatedMeasure;
+  }
+
   @Mutation private SET_MEASURE<T extends MeasureConfig>(measure: Measure<T>) {
-    this.measures[measure.slug] = measure;
+    this.measures = assign({}, this.measures, {[measure.slug]: measure});
+  }
+
+  @Mutation private DELETE_MEASURE<T extends MeasureConfig>(measure: Measure<T>) {
+    this.measures = assign({}, omit(this.measures, measure.slug));
   }
 }

web/src/styles/ui-common.scss

@@ -1,7 +1,9 @@
 @import '~@/styles/vars';
 
+button,
 .btn,
-.btn-action {
+.btn-action,
+.btn-icon {
   border: 0;
   border-radius: .25em;
   cursor: pointer;
@@ -13,14 +15,27 @@
   a { text-decoration: none; }
 }
 
+.btn, .btn-icon { color: $fg-primary; }
+
+.btn-icon {
+
+  border-radius: 1em;
+  padding: .5em;
+  margin: 0 .5em;
+
+  &:hover, &:focus {
+    background-color: darken($bg-primary, 20%);
+  }
+}
+
 .btn-action {
   background-color: $color2;
   color: $color3;
   cursor: pointer;
   position: relative;
 
-  &:hover {
-    background-color: darken($color2, 5%);
+  &:hover, &:focus {
+    background-color: lighten($color2, 20%);
   }
 }
 

web/src/util.ts

@@ -0,0 +1,25 @@
+import { Measure, MeasureConfig, Measurement, MeasurementMeta } from '@/models';
+import moment from 'moment';
+
+export function byTimestampComparator<T extends MeasurementMeta>(
+  a: Measurement<T>,
+  b: Measurement<T>): number {
+  return a.timestamp.getTime() - b.timestamp.getTime();
+}
+
+export function formatTS(
+  m: Measure<MeasureConfig>,
+  mm: Measurement<MeasurementMeta>
+): string {
+  return moment(mm.timestamp).format(
+    m.config.timestampDisplayFormat || 'MMM Do');
+}
+
+export function slugify(s: string): string {
+  return s
+    .toLowerCase()
+    .replace(/[^\w\s\-]/g, '')
+    .replace(/\s+/g, '-');
+}
+
+

web/src/views/DeleteMeasure.vue

@@ -0,0 +1,25 @@
+<template>
+  <div v-if="measure">
+    <div class=header>
+      <h1>Delete Measure</h1>
+      <h2>Are you sure you want to delete {{measure.name}}?</h2>
+    </div>
+    <form @submit.prevent=deleteMeasure() >
+      This will delete all measurements associated with this measure. This
+      cannot be undone.
+      <div v-if='!waiting' class=form-actions>
+        <button class=btn-action>Delete</button>
+        <a class=btn @click="$router.go(-1)">Cancel</a>
+      </div>
+      <div v-if='waiting' class=form-waiting>
+        <div class=wait-spinner>working <fa-icon icon=sync spin /></div>
+      </div>
+    </form>
+  </div>
+  <div v-else>
+    <div class=header-action>
+      <h1>There is no measure named {{$route.params.slug}}.</h1>
+    </div>
+  </div>
+</template>
+<script lang=ts src=./delete-measure.ts></script>

web/src/views/EditMeasure.vue

@@ -0,0 +1,52 @@
+<template>
+  <div id=edit-measure v-if=measure>
+    <div class=header>
+      <h1>Edit Measure</h1>
+      <h2>{{measure.name}}</h2>
+    </div>
+    <form @submit.prevent=updateMeasure() class=edit-measure-form>
+      <fieldset>
+        <div>
+          <label for=measureName>Display Name</label>
+          <input
+            :disabled=waiting
+            type=text
+            name=measureName
+            placeholder="what you are measuring"
+            required
+            v-model="measure.name" />
+        </div>
+        <div>
+          <label for=measureDescription>Description</label>
+          <textarea
+            :disabled=waiting
+            name=measureDescription
+            placeholder="optional description"
+            v-model="measure.description" ></textarea>
+        </div>
+        <div>
+          <label for=measureSlug>Short name (slug)</label>
+          <input
+            :disabled=waiting
+            type=text
+            name=measureDescription
+            :placeholder='slugFromName + " (default)"'
+            :value="measure.slug"
+            @input="measure.slug = slugify($event.target.value)"/>
+        </div>
+      </fieldset>
+      <MeasureConfigForm
+        v-model=measure.config
+        :disabled=waiting
+        measureExists=false />
+      <div v-if='!waiting' class=form-actions>
+        <button class=btn-action>Update</button>
+        <a class=btn @click="$router.go(-1)">Cancel</a>
+      </div>
+      <div v-if='waiting' class=form-waiting>
+        <div class=wait-spinner>working <fa-icon icon=sync spin /></div>
+      </div>
+    </form>
+  </div>
+</template>
+<script lang=ts src=./edit-measure.ts></script>

web/src/views/Measure.vue

@@ -5,7 +5,26 @@
         <h1>{{measure.name}}</h1>
         <h2>{{measure.description}}</h2>
       </div>
-      <router-link :to="'/new/measurement/' + measure.slug" class=btn-action>Add Measurement</router-link>
+      <div class=actions>
+        <router-link
+          title="Delete Measure"
+          :to="'/delete/measure/' + measure.slug"
+          class=btn-icon >
+          <fa-icon icon=trash></fa-icon>
+        </router-link>
+        <router-link
+          title="Edit Measure"
+          :to="'/edit/measure/' + measure.slug"
+          class=btn-icon>
+          <fa-icon icon=pencil-alt></fa-icon>
+        </router-link>
+        <router-link
+          title="Add Measurement"
+          :to="'/new/measurement/' + measure.slug"
+          class=btn-action>
+          Add Measurement
+        </router-link>
+      </div>
     </div>
     <MeasureDetails :measure=measure :measurements=measurements />
   </div>
@@ -16,4 +35,4 @@
   </div>
 </template>
 <script lang="ts" src="./measure.ts"></script>
-<style lang="scss" src="./measure.scss"></style>
+<style scoped lang="scss" src="./measure.scss"></style>

web/src/views/Measures.vue

@@ -12,12 +12,9 @@
     <div class=measure-list>
       <MeasureSummary
         v-for="(measure, slug) in measures"
-        v-show="measure.slug.startsWith(filter)"
+        v-bind:key="measure.id"
+        v-show="measure.slug.startsWith(filter.toLowerCase())"
         :measure=measure />
-      <!--<MeasureSummary
-        v-for="(measure, slug) in measures"
-        :key="slug"
-        :measure=measure />-->
     </div>
   </div>
 </template>

web/src/views/delete-measure.ts

@@ -0,0 +1,38 @@
+import { Component, Prop, Vue } from 'vue-property-decorator';
+import { Measure as MeasureModel, MeasureConfig } from '@/models';
+import { measureStore, measurementStore } from '@/store';
+import { logService } from '@/services/logging';
+
+const logger = logService.getLogger('/views/delete-measure');
+
+@Component({})
+export class DeleteMeasure extends Vue {
+  private waiting: boolean = false;
+
+  private get measure(): MeasureModel<MeasureConfig> | null {
+    return measureStore.measures[this.$route.params.slug] || null;
+  }
+
+  private async mounted() {
+    if (!this.measure) {
+      await measureStore.fetchMeasure(this.$route.params.slug);
+    }
+  }
+
+  private async deleteMeasure() {
+    if (this.measure) {
+      this.waiting = true;
+      try {
+        await measureStore.deleteMeasure(this.measure);
+        this.$router.push({ name: 'measures' });
+      } catch (e) {
+        // TODO: show errors
+        logger.error('Unable to delete measure. \n\t ' + JSON.stringify(this.measure), e.stack);
+      } finally {
+        this.waiting = false;
+      }
+    }
+  }
+}
+
+export default DeleteMeasure;

web/src/views/edit-measure.ts

@@ -0,0 +1,56 @@
+import { Component, Prop, Vue, Watch } from 'vue-property-decorator';
+import { logService } from '@/services/logging';
+import { measureStore, userStore } from '@/store';
+import { Measure, MeasureConfig, MeasureType } from '@/models';
+import MeasureConfigForm from '@/components/measure-config/MeasureConfigForm.vue';
+import { slugify } from '@/util';
+
+const logger = logService.getLogger('/views/edit-measure');
+
+@Component({
+  components: { MeasureConfigForm }
+})
+export class EditMeasure extends Vue {
+  private waiting = false;
+
+  private get measure(): Measure<MeasureConfig> | null {
+    return measureStore.measures[this.$route.params.slug] || null;
+  }
+
+  private get slugFromName() {
+    if (this.measure) {
+      return slugify(this.measure.name);
+    } else {
+      return null;
+    }
+  }
+
+  private async updateMeasure() {
+    if (this.measure) {
+      if (!this.measure.slug) {
+        this.measure.slug = slugify(this.measure.name);
+      }
+
+      this.waiting = true;
+      try {
+        await measureStore.updateMeasure(this.measure);
+        this.$router.push({name: 'measure', params: { slug: this.measure.slug }});
+      } catch (e) {
+        logger.error('Unable to update measure. \n\t' + JSON.stringify(this.measure), e.stack);
+      } finally {
+        this.waiting = false;
+      }
+    }
+  }
+
+  private async mounted() {
+    // good chance we've already fetched this
+    // TODO: centralize this caching behavior?
+    if (!this.measure) {
+      await measureStore.fetchMeasure(this.$route.params.slug);
+    }
+  }
+
+}
+
+export default EditMeasure;

web/src/views/measure.scss

@@ -1,3 +1 @@
 @import '~@/styles/vars';
-
-

web/src/views/measure.ts

@@ -1,8 +1,14 @@
 import { Component, Prop, Vue } from 'vue-property-decorator';
+import { library } from '@fortawesome/fontawesome-svg-core';
+import { faPencilAlt } from '@fortawesome/free-solid-svg-icons';
+import { faTrash } from '@fortawesome/free-solid-svg-icons';
 import { Measure as MeasureModel, MeasureConfig } from '@/models';
 import { measureStore, measurementStore } from '@/store';
 import MeasureDetails from '@/components/measure-details/MeasureDetails.vue';
 
+library.add(faPencilAlt);
+library.add(faTrash);
+
 @Component({
   components: {
     MeasureDetails

web/src/views/new-measure.ts

@@ -5,6 +5,7 @@ import { logService } from '@/services/logging';
 import { measureStore, userStore } from '@/store';
 import { Measure, MeasureConfig, MeasureType } from '@/models';
 import MeasureConfigForm from '@/components/measure-config/MeasureConfigForm.vue';
+import { slugify } from '@/util';
 
 library.add(faSync);
 
@@ -19,7 +20,8 @@ export class NewMeasure extends Vue {
     id: '',
     config: {
       type: 'simple' as MeasureType,
-      isVisible: true
+      isVisible: true,
+      timestampDisplayFormat: 'l'
     },
     description: '',
     name: '',
@@ -28,19 +30,12 @@ export class NewMeasure extends Vue {
   };
 
   private get slugFromName() {
-    return this.slugify(this.measure.name);
-  }
-
-  private slugify(s: string): string {
-    return s
-      .toLowerCase()
-      .replace(/[^\w\s\-]/g, '')
-      .replace(/\s+/g, '-');
+    return slugify(this.measure.name);
   }
 
   private async createMeasure() {
     if (!this.measure.slug) {
-      this.measure.slug = this.slugify(this.measure.name);
+      this.measure.slug = slugify(this.measure.name);
     }
 
     this.waiting = true;

web/src/views/new-measurement.ts

@@ -22,9 +22,7 @@ export class NewMeasurement extends Vue {
     measureId: '',
     value: 0,
     timestamp: new Date(),
-    extData: {
-      measureType: 'simple' as MeasureType
-    }
+    extData: { }
   };
 
   private async mounted() {