v2.0.0

.editorconfig

@@ -1,9 +1,7 @@
-root = true
-
-[*]
+[*.{js,jsx,mjs,cjs,ts,tsx,mts,cts,vue}]
 charset = utf-8
-indent_style = space
 indent_size = 2
+indent_style = space
 end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true

.env.development

@@ -0,0 +1,2 @@
+# /api will be proxied to the backend server
+VITE_API_BASE_URL = '/api'

.gitignore

@@ -5,7 +5,8 @@ node_modules
 # Quasar core related directories
 .quasar
 /dist
-/data
+/quasar.config.*.temporary.compiled*
+
 # Cordova related directories and files
 /src-cordova/node_modules
 /src-cordova/platforms
@@ -16,10 +17,6 @@ node_modules
 /src-capacitor/www
 /src-capacitor/node_modules
 
-# BEX related directories and files
-/src-bex/www
-/src-bex/js/core
-
 # Log files
 npm-debug.log*
 yarn-debug.log*
@@ -31,3 +28,6 @@ yarn-error.log*
 *.ntvs*
 *.njsproj
 *.sln
+
+# local .env files
+.env.local*

.prettierrc.json

@@ -0,0 +1,5 @@
+{
+  "$schema": "https://json.schemastore.org/prettierrc",
+  "singleQuote": true,
+  "printWidth": 100
+}

.vscode/settings.json

@@ -1,8 +1,13 @@
 {
+  "editor.bracketPairColorization.enabled": true,
+  "editor.guides.bracketPairs": true,
+  "editor.formatOnSave": true,
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "editor.codeActionsOnSave": ["source.fixAll.eslint"],
   "vetur.validation.template": false,
   "vetur.format.enable": false,
   "eslint.validate": ["javascript", "javascriptreact", "typescript", "vue"],
-
+  "typescript.tsdk": "node_modules/typescript/lib",
   "vetur.experimental.templateInterpolationService": true,
   "git.ignoreLimitWarning": true
 }

Dockerfile

@@ -1,16 +1,16 @@
 # build stage
-FROM node:lts-alpine as build-stage
+FROM node:lts-alpine AS build-stage
 
 WORKDIR /app
 
 COPY package*.json ./
-RUN npm install
 COPY ./ .
+RUN npm install
 RUN npm run build
 
 
 # production stage
-FROM nginx:stable-alpine as production-stage
+FROM nginx:stable-alpine AS production-stage
 
 LABEL org.opencontainers.image.source=https://github.com/Mosquito-Alert/map
 

Makefile

@@ -0,0 +1,40 @@
+.PHONY: help
+
+.DEFAULT_GOAL	:= help
+SHELL			:= /bin/bash
+
+APP_NAME 		:= 'map'
+REGISTRY_SERVER	:= ghcr.io
+REPOSITORY 		:= '$(REGISTRY_SERVER)/mosquito-alert/map'
+TAG				:= $(shell git describe --tags)
+RELEASE_TAG		?= latest
+
+DOCKER_USER		?= ''
+
+ENVIRONMENT		:= 'production'
+
+DOCKER_COMPOSE_DEV=docker-compose-local.yml
+
+help: # http://marmelab.com/blog/2016/02/29/auto-documented-makefile.html
+	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+
+# ===================================================
+# Docker images commands
+# ===================================================
+
+login: ## Login to container registry server.
+	docker login -u $(DOCKER_USER) $(REGISTRY_SERVER)
+
+build: ## Build the current image version for this app.
+	docker build --tag $(APP_NAME)_$(ENVIRONMENT):$(TAG) --build-arg BUILD_ENVIRONMENT=$(ENVIRONMENT) .
+	docker tag $(APP_NAME)_$(ENVIRONMENT):$(TAG) $(REPOSITORY):$(TAG)
+
+push: login ## Push the latest image to the repository.
+	docker push $(REPOSITORY):$(TAG)
+
+deploy: build login push  ## Build and push a new image version to the reposistory.
+
+release: login  ## Make current docker tag to be retagged as 'latest'.
+	docker pull $(REPOSITORY):$(TAG)
+	docker tag  $(REPOSITORY):$(TAG) $(REPOSITORY):$(RELEASE_TAG)
+	docker push $(REPOSITORY):$(RELEASE_TAG)

README.md

@@ -1,26 +1,43 @@
-# Quasar App (mosquito2_public_frontend)
+# Mosquito Alert Map (map)
 
-Public map for Mosquito Alert
+Mosquito Alert Map
 
 ## Install the dependencies
+
 ```bash
+yarn
+# or
 npm install
 ```
 
 ### Start the app in development mode (hot-code reloading, error reporting, etc.)
+
 ```bash
 quasar dev
 ```
 
 ### Lint the files
+
 ```bash
+yarn lint
+# or
 npm run lint
 ```
 
+### Format the files
+
+```bash
+yarn format
+# or
+npm run format
+```
+
 ### Build the app for production
+
 ```bash
 quasar build
 ```
 
 ### Customize the configuration
-See [Configuring quasar.conf.js](https://quasar.dev/quasar-cli/quasar-conf-js).
+
+See [Configuring quasar.config.js](https://v2.quasar.dev/quasar-cli-vite/quasar-config-js).