chore(dev): replace tmuxp by terminator + fix end yarn-dev-portal removal
All checks were successful
/ build (map[dockerfile:./services/web/Dockerfile name:web]) (push) Successful in 2m7s
/ build (map[dockerfile:./services/app/Dockerfile name:app]) (push) Successful in 38s
/ build (map[dockerfile:./services/hasura/Dockerfile name:hasura]) (push) Successful in 46s
/ build (map[dockerfile:./services/files/Dockerfile name:files]) (push) Successful in 1m50s
/ build (map[dockerfile:./services/tasks/Dockerfile name:tasks]) (push) Successful in 2m3s
/ build (map[dockerfile:./services/api/Dockerfile name:api]) (push) Successful in 1m50s
/ build (map[dockerfile:./services/watchers/Dockerfile name:watchers]) (push) Successful in 2m0s
/ deploy (push) Successful in 9s
All checks were successful
/ build (map[dockerfile:./services/web/Dockerfile name:web]) (push) Successful in 2m7s
/ build (map[dockerfile:./services/app/Dockerfile name:app]) (push) Successful in 38s
/ build (map[dockerfile:./services/hasura/Dockerfile name:hasura]) (push) Successful in 46s
/ build (map[dockerfile:./services/files/Dockerfile name:files]) (push) Successful in 1m50s
/ build (map[dockerfile:./services/tasks/Dockerfile name:tasks]) (push) Successful in 2m3s
/ build (map[dockerfile:./services/api/Dockerfile name:api]) (push) Successful in 1m50s
/ build (map[dockerfile:./services/watchers/Dockerfile name:watchers]) (push) Successful in 2m0s
/ deploy (push) Successful in 9s
This commit is contained in:
parent
cdf45a1301
commit
64f2f995f3
9 changed files with 23930 additions and 127 deletions
7
.gitignore
vendored
7
.gitignore
vendored
|
@ -26,13 +26,6 @@ services/*/dist
|
||||||
!.yarn/versions
|
!.yarn/versions
|
||||||
# !.yarn/cache
|
# !.yarn/cache
|
||||||
|
|
||||||
yarn.lock.dev
|
|
||||||
yarn.lock
|
|
||||||
/package.json.dev
|
|
||||||
/package.json
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
codebase.md
|
codebase.md
|
||||||
|
|
||||||
/bin
|
/bin
|
45
.tmux.conf
45
.tmux.conf
|
@ -1,45 +0,0 @@
|
||||||
# sensitivity for vim
|
|
||||||
set -s escape-time 0
|
|
||||||
|
|
||||||
set -g mouse on
|
|
||||||
setw -g mode-keys vi
|
|
||||||
|
|
||||||
# increase history size
|
|
||||||
set-option -g history-limit 10000
|
|
||||||
|
|
||||||
bind-key -T copy-mode-vi v send -X begin-selection
|
|
||||||
bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel 'xclip -in -selection clipboard'
|
|
||||||
|
|
||||||
# better titles for Rofi switch mode
|
|
||||||
set-option -g set-titles on
|
|
||||||
set-option -g set-titles-string "#S - #W"
|
|
||||||
|
|
||||||
# map prefix to default Ctrl+b
|
|
||||||
set-option -g prefix C-b
|
|
||||||
bind-key C-b send-prefix
|
|
||||||
|
|
||||||
|
|
||||||
# remaps to avoid confirm prompt
|
|
||||||
# bind-key & kill-window
|
|
||||||
# bind-key x kill-pane
|
|
||||||
# bind-key X kill-session
|
|
||||||
|
|
||||||
# map C-a to toggle panes sync
|
|
||||||
bind C-a set-window-option synchronize-panes
|
|
||||||
|
|
||||||
# remap pane navigation to Alt + HJKL
|
|
||||||
bind-key -n C-Left select-pane -L
|
|
||||||
bind-key -n C-Down select-pane -D
|
|
||||||
bind-key -n C-Up select-pane -U
|
|
||||||
bind-key -n C-Right select-pane -R
|
|
||||||
|
|
||||||
# remap window navigation to Alt + NP
|
|
||||||
bind-key -n M-p previous-window
|
|
||||||
bind-key -n M-n next-window
|
|
||||||
|
|
||||||
# remap pane zoom to Alt + Z
|
|
||||||
bind-key -n M-z resize-pane -Z
|
|
||||||
|
|
||||||
|
|
||||||
# notes:
|
|
||||||
# use Shift + Mouse to allow text selection
|
|
|
@ -1,40 +0,0 @@
|
||||||
session_name: helpme-project
|
|
||||||
|
|
||||||
# https://github.com/tmux-python/tmuxp/tree/master/examples
|
|
||||||
|
|
||||||
# tmux cheatsheet https://gist.github.com/MohamedAlaa/2961058
|
|
||||||
|
|
||||||
before_script: |
|
|
||||||
docker compose up --build -d
|
|
||||||
|
|
||||||
windows:
|
|
||||||
- window_name: dev
|
|
||||||
layout: tiled
|
|
||||||
panes:
|
|
||||||
- shell_command:
|
|
||||||
- docker compose logs --follow db
|
|
||||||
- shell_command:
|
|
||||||
- docker compose logs --follow minio
|
|
||||||
- shell_command:
|
|
||||||
- docker compose logs --follow rabbitmq
|
|
||||||
- shell_command:
|
|
||||||
- docker compose logs --follow osrm-car osrm-foot osrm-bicycle
|
|
||||||
- shell_command:
|
|
||||||
- docker compose logs --follow nominatim
|
|
||||||
- shell_command:
|
|
||||||
- docker compose logs --follow tileserver-gl
|
|
||||||
- shell_command:
|
|
||||||
- docker compose logs --follow hasura
|
|
||||||
- shell_command:
|
|
||||||
- docker compose logs --follow hasura_console
|
|
||||||
- shell_command:
|
|
||||||
- docker compose logs --follow api
|
|
||||||
- shell_command:
|
|
||||||
- docker compose logs --follow files
|
|
||||||
- shell_command:
|
|
||||||
- docker compose logs --follow watchers
|
|
||||||
- shell_command:
|
|
||||||
- docker compose logs --follow tasks
|
|
||||||
- shell_command:
|
|
||||||
- yarn dev:web
|
|
||||||
|
|
27
.tmuxp.yaml
27
.tmuxp.yaml
|
@ -1,27 +0,0 @@
|
||||||
session_name: helpme-project
|
|
||||||
|
|
||||||
# https://github.com/tmux-python/tmuxp/tree/master/examples
|
|
||||||
|
|
||||||
# tmux cheatsheet https://gist.github.com/MohamedAlaa/2961058
|
|
||||||
|
|
||||||
before_script: |
|
|
||||||
up
|
|
||||||
|
|
||||||
windows:
|
|
||||||
- window_name: dev
|
|
||||||
layout: tiled
|
|
||||||
panes:
|
|
||||||
- shell_command:
|
|
||||||
- docker compose logs --follow --tail=10 db minio rabbitmq redis-hot-geodata redis-q-dedup keydb-cold-geodata
|
|
||||||
- shell_command:
|
|
||||||
# - docker compose logs --follow tileserver-gl osrm-car osrm-foot osrm-bicycle nominatim
|
|
||||||
- docker compose logs --follow --tail=10 tileserver-gl osrm-car osrm-foot nominatim
|
|
||||||
- shell_command:
|
|
||||||
- docker compose logs --follow --tail=10 hasura hasura_console
|
|
||||||
- shell_command:
|
|
||||||
- docker compose logs --follow --tail=10 api files
|
|
||||||
- shell_command:
|
|
||||||
- docker compose logs --follow --tail=10 watchers tasks
|
|
||||||
- shell_command:
|
|
||||||
- yarn dev:web
|
|
||||||
|
|
|
@ -366,14 +366,14 @@ services:
|
||||||
- "${MAILDEV_WEB_PORT:-4226}:1080"
|
- "${MAILDEV_WEB_PORT:-4226}:1080"
|
||||||
restart: always
|
restart: always
|
||||||
|
|
||||||
# web:
|
web:
|
||||||
# image: helpme_web
|
image: helpme_web
|
||||||
# restart: always
|
restart: always
|
||||||
# build:
|
build:
|
||||||
# context: .
|
context: .
|
||||||
# dockerfile: ./services/web/Dockerfile
|
dockerfile: ./services/web/Dockerfile
|
||||||
# ports:
|
ports:
|
||||||
# - ${WEB_PORT:-4203}:8080
|
- ${WEB_PORT:-4203}:8080
|
||||||
|
|
||||||
app:
|
app:
|
||||||
image: helpme_app
|
image: helpme_app
|
||||||
|
|
72
package.json
Normal file
72
package.json
Normal file
|
@ -0,0 +1,72 @@
|
||||||
|
{
|
||||||
|
"name": "alerte-secours",
|
||||||
|
"version": "0.0.1",
|
||||||
|
"description": "Alerte-Secours - Le Réflexe qui Sauve",
|
||||||
|
"keywords": [
|
||||||
|
"alerte",
|
||||||
|
"secours",
|
||||||
|
"urgence",
|
||||||
|
"entraide",
|
||||||
|
"geolocalisation"
|
||||||
|
],
|
||||||
|
"author": "devthejo <jo@devthefuture.org>",
|
||||||
|
"homepage": "https://codeberg.org/alerte-secours/alerte-secours",
|
||||||
|
"repository": "https://codeberg.org/alerte-secours/alerte-secours",
|
||||||
|
"bugs": "https://codeberg.org/alerte-secours/alerte-secours/-/issues",
|
||||||
|
"private": true,
|
||||||
|
"workspaces": [
|
||||||
|
"services/*",
|
||||||
|
"libs/*",
|
||||||
|
"tests/*"
|
||||||
|
],
|
||||||
|
"scripts": {
|
||||||
|
"dev": "yarn dev:up && yarn dev:logs",
|
||||||
|
"dev:up": "up",
|
||||||
|
"dev:logs": "dev-logs",
|
||||||
|
"release": "commit-and-tag-version",
|
||||||
|
"lint": "eslint .",
|
||||||
|
"test": "jest tests",
|
||||||
|
"clear:local": "git clean -xdf",
|
||||||
|
"postinstall": "[ -d '.husky' ] && husky install || true && bin/direnv allow"
|
||||||
|
},
|
||||||
|
"lint-staged": {
|
||||||
|
"*.{js,jsx}": "eslint"
|
||||||
|
},
|
||||||
|
"husky": {
|
||||||
|
"hooks": {
|
||||||
|
"pre-commit": "yarn lint --fix",
|
||||||
|
"commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"dotenv": "^16.0.0",
|
||||||
|
"js-yaml": "^4.1.0",
|
||||||
|
"lodash.camelcase": "^4.3.0"
|
||||||
|
},
|
||||||
|
"devDependencies": {
|
||||||
|
"@commitlint/cli": "^12.1.4",
|
||||||
|
"@commitlint/config-conventional": "^12.1.4",
|
||||||
|
"commit-and-tag-version": "^11.2.2",
|
||||||
|
"eslint": "^7.32.0",
|
||||||
|
"eslint-config-airbnb": "^18.2.1",
|
||||||
|
"eslint-config-prettier": "^7",
|
||||||
|
"eslint-import-resolver-alias": "^1.1.2",
|
||||||
|
"eslint-plugin-import": "^2.26.0",
|
||||||
|
"eslint-plugin-jsx-a11y": "^6.4.1",
|
||||||
|
"eslint-plugin-node": "^11.1.0",
|
||||||
|
"eslint-plugin-prettier": "^3.4.1",
|
||||||
|
"eslint-plugin-sql-pretty": "^1.1.2",
|
||||||
|
"husky": "^7.0.0",
|
||||||
|
"lint-staged": "^11.1.2",
|
||||||
|
"node-gyp": "^9.4.0",
|
||||||
|
"prettier": "^2.3.2",
|
||||||
|
"standard-changelog": "^2.0.27"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=20"
|
||||||
|
},
|
||||||
|
"resolutions": {
|
||||||
|
"express": "5.0.0-beta.3"
|
||||||
|
},
|
||||||
|
"packageManager": "yarn@4.6.0"
|
||||||
|
}
|
15
scripts/dev-logs
Executable file
15
scripts/dev-logs
Executable file
|
@ -0,0 +1,15 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
set -e
|
||||||
|
|
||||||
|
# 1) your “before_script”
|
||||||
|
|
||||||
|
|
||||||
|
# 2) launch Terminator in its own D-Bus session (so it fully registers & unregisters windows),
|
||||||
|
# background it, and redirect all of its output away from your shell:
|
||||||
|
dbus-run-session -- terminator \
|
||||||
|
--config ./terminator-config \
|
||||||
|
--layout dev \
|
||||||
|
> /dev/null 2>&1 &
|
||||||
|
|
||||||
|
# 3) remove it from your shell’s job table so it won’t ever echo anything later
|
||||||
|
disown
|
76
terminator-config
Normal file
76
terminator-config
Normal file
|
@ -0,0 +1,76 @@
|
||||||
|
[global_config]
|
||||||
|
suppress_multiple_term_dialog = True
|
||||||
|
|
||||||
|
[keybindings]
|
||||||
|
hide_window = None
|
||||||
|
|
||||||
|
[profiles]
|
||||||
|
[[default]]
|
||||||
|
use_system_font = True
|
||||||
|
|
||||||
|
[layouts]
|
||||||
|
[[dev]]
|
||||||
|
# root window
|
||||||
|
[[[window0]]]
|
||||||
|
type = Window
|
||||||
|
parent = ""
|
||||||
|
|
||||||
|
# top-level horizontal split: left vs right
|
||||||
|
[[[pane0]]]
|
||||||
|
type = HPaned
|
||||||
|
parent = window0
|
||||||
|
|
||||||
|
# left column: vertical paned into 3 rows
|
||||||
|
[[[pane_left]]]
|
||||||
|
type = VPaned
|
||||||
|
parent = pane0
|
||||||
|
# nest another VPaned under the bottom half of pane_left
|
||||||
|
[[[pane_left2]]]
|
||||||
|
type = VPaned
|
||||||
|
parent = pane_left
|
||||||
|
|
||||||
|
# right column: vertical paned into 3 rows
|
||||||
|
[[[pane_right]]]
|
||||||
|
type = VPaned
|
||||||
|
parent = pane0
|
||||||
|
# nest another VPaned under the bottom half of pane_right
|
||||||
|
[[[pane_right2]]]
|
||||||
|
type = VPaned
|
||||||
|
parent = pane_right
|
||||||
|
|
||||||
|
# Row 1, Col 1 (db/minio logs)
|
||||||
|
[[[child0]]]
|
||||||
|
type = Terminal
|
||||||
|
parent = pane_left
|
||||||
|
profile = default
|
||||||
|
command = bash -lc "docker compose logs --follow --tail=10 db minio rabbitmq redis-hot-geodata redis-q-dedup keydb-cold-geodata; exec bash"
|
||||||
|
|
||||||
|
# Row 2, Col 1 (tileserver logs)
|
||||||
|
[[[child1]]]
|
||||||
|
type = Terminal
|
||||||
|
parent = pane_left2
|
||||||
|
profile = default
|
||||||
|
command = bash -lc "docker compose logs --follow --tail=10 tileserver-gl osrm-car osrm-foot nominatim; exec bash"
|
||||||
|
|
||||||
|
# Row 3, Col 1 (hasura logs)
|
||||||
|
[[[child2]]]
|
||||||
|
type = Terminal
|
||||||
|
parent = pane_left2
|
||||||
|
profile = default
|
||||||
|
command = bash -lc "docker compose logs --follow --tail=10 hasura hasura_console; exec bash"
|
||||||
|
|
||||||
|
# Row 1, Col 2 (api/files logs)
|
||||||
|
[[[child3]]]
|
||||||
|
type = Terminal
|
||||||
|
parent = pane_right
|
||||||
|
profile = default
|
||||||
|
command = bash -lc "docker compose logs --follow --tail=10 api files web; exec bash"
|
||||||
|
|
||||||
|
# Row 2, Col 2 (watchers/tasks logs)
|
||||||
|
[[[child4]]]
|
||||||
|
type = Terminal
|
||||||
|
parent = pane_right2
|
||||||
|
profile = default
|
||||||
|
command = bash -lc "docker compose logs --follow --tail=10 watchers tasks; exec bash"
|
||||||
|
|
||||||
|
[plugins]
|
Loading…
Add table
Reference in a new issue