diff --git a/.prettierrc.js b/.prettierrc.js
new file mode 100644
index 0000000..f50b949
--- /dev/null
+++ b/.prettierrc.js
@@ -0,0 +1,12 @@
+/**
+ * @see https://prettier.io/docs/configuration
+ * @type {import("prettier").Config}
+ */
+const config = {
+ trailingComma: "es5",
+ tabWidth: 4,
+ semi: false,
+ singleQuote: true,
+};
+
+export default config;
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..35f29e2
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,10 @@
+FROM node:20-alpine
+
+RUN apk update && apk add bash
+
+RUN npm install -g npm@^9.0.0
+
+WORKDIR /srv/app
+COPY package.json package-lock.json /srv/app/
+RUN cd /srv/app && npm install
+COPY . /srv/app/
diff --git a/Makefile b/Makefile
index d51d834..fc43cd3 100644
--- a/Makefile
+++ b/Makefile
@@ -5,34 +5,45 @@ help: ## List all make commands
@echo ' '
build: ## Build the project with -d and --no-recreate flags
- $(DOCKER_COMPOSE) up --build --no-recreate -d
+ docker compose up --build --no-recreate -d
install: ## Exec container and make npm install commands
- $(DOCKER_EXEC_TOOLS_APP) -c $(NODE_INSTALL)
+ docker compose exec mct_web npm install
-bundle: ## Run build npm command script
- $(DOCKER_EXEC_TOOLS_APP) -c $(BUNDLE_RUN)
+bundle:
+ docker compose exec mct_web npm run bundle
clean: ## Remove all dist/ files
- $(DOCKER_EXEC_TOOLS_APP) -c $(CLEAN_RUN)
+ docker compose exec mct_web rm -r dist/*
-interact: ## Interact to install new packages or run specific commands in container
- $(DOCKER_EXEC_TOOLS_APP)
+bash: ## Interact to install new packages or run specific commands in container
+ docker compose exec -it mct_web bash
dev: # Internal command to run dev npm command script
- $(DOCKER_EXEC_TOOLS_APP) -c $(SERVER_RUN)
+ docker compose exec -it mct_web npm run development
up: ## Run up -d Docker command container will wait for interactions
- $(DOCKER_COMPOSE) up -d
+ docker compose up -d
start: up dev ## Up the docker env and run the npm run dev it to
first: build install dev ## Build the env, up it and run the npm install and then run npm run dev it to
-stop: $(ROOT_DIR)/compose.yml ## Stop and remove containers
- $(DOCKER_COMPOSE) kill
- $(DOCKER_COMPOSE) rm --force
+stop: ./compose.yml ## Stop and remove containers
+ docker compose kill
+ docker compose rm --force
restart: stop start dev ## Stop and restart container
-clear: stop $(ROOT_DIR)/compose.yml ## Stop and remove container and orphans
- $(DOCKER_COMPOSE) down -v --remove-orphans
+types: ## Run type check and generator
+ docker compose exec mct_web npm run types
+
+prettier: ## Run prettier the opinionated code formatter in code
+ docker compose exec mct_web npm run prettier
+
+types-watch: ## Run type check and generator
+ docker compose exec mct_web npm run types-watch
+
+clear: stop ./compose.yml ## Stop and remove container and orphans
+ docker compose down -v --remove-orphans
+
+.PHONY: bash build clean help logs start stop types types-watch prettier
diff --git a/compose.yml b/compose.yml
index 9b79ef1..9661484 100644
--- a/compose.yml
+++ b/compose.yml
@@ -1,9 +1,7 @@
-version: "3.4"
-
services:
- vite_docker:
- image: node:alpine
- container_name: "${DOCKER_NAME}"
+ mct_web:
+ build: .
+ image: mct:latest
entrypoint: /bin/sh
env_file:
- .env
diff --git a/env.example b/env.example
index e1a49d1..45633f3 100644
--- a/env.example
+++ b/env.example
@@ -4,13 +4,3 @@ HOST_PORT=5173
CONTAINER_PORT=5173
SERVER_HOST_PORT=5000
SERVER_CONTAINER_PORT=5000
-DOCKER_NAME=mct_docker
-
-CURRENT_DIR=$(patsubst %/,%,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))
-ROOT_DIR=$(CURRENT_DIR)
-DOCKER_COMPOSE=docker compose
-DOCKER_EXEC_TOOLS_APP=docker exec -it $(DOCKER_NAME) sh
-NODE_INSTALL="npm i"
-BUNDLE_RUN="npm run build"
-CLEAN_RUN="rm -r dist/*"
-SERVER_RUN="npm run development"
diff --git a/images.d.ts b/images.d.ts
new file mode 100644
index 0000000..9398a2b
--- /dev/null
+++ b/images.d.ts
@@ -0,0 +1,13 @@
+declare module "*.svg" {
+ const content: string;
+ export default content;
+}
+
+declare module '*.png' {
+ const value: string;
+ export default value;
+}
+
+declare module '*.jpg';
+declare module '*.jpeg';
+declare module '*.svg';
diff --git a/index.html b/index.html
index 27c3ef0..04bde35 100644
--- a/index.html
+++ b/index.html
@@ -4,14 +4,53 @@
+
Map Chart Table
+
+
+
+
+
-
+
+
+
+
+
+