misc

.gitignore

@@ -11,6 +11,7 @@
 /.mix/
 /.npm/
 /.config/
+/.elixir_ls/
 
 # Where 3rd-party dependencies like ExDoc output generated docs.
 /doc/

Dockerfile.dev

@@ -9,17 +9,19 @@ RUN apk update && \
     apk add bash curl inotify-tools 
 
 # various dependencies of dependencies
-RUN apk add git \
-    rust cargo \
+RUN apk add \
     npm \
-    git build-base \  
+    git \  
     mailcap \
     ca-certificates openssh-client openssl-dev \
     tzdata \
     gettext 
 
-# dependencies for comeonin
-RUN apk add cmake make gcc libc-dev
+# rust NIF + messctl deps
+RUN apk add rust cargo
+
+# dependencies for comeonin (not needed for dev)
+#RUN apk add cmake make gcc libc-dev
 
 # dependency manager
 RUN (git clone https://github.com/commonspub/messctl.git $FORKS/messctl/origin 2> /dev/null || (cd $FORKS/messctl/origin && git pull)) && cd $FORKS/messctl/origin && git checkout 8f53c86687ba2bd262471c6e8d9490ed00bf1306

Makefile

@@ -15,6 +15,9 @@ mix-%: init ## Run a specific mix command, eg: `make mix-deps.get` or make mix-d
 
 setup: build mix-setup ## First run - prepare environment and dependencies
 
+db:
+	docker-compose run db 
+
 db-pre-migrations:
 	touch deps/*/lib/migrations.ex
 	touch forks/*/lib/migrations.ex
@@ -34,7 +37,7 @@ shell: init ## Open a shell, in dev mode
 pull: 
 	git pull
 
-update: init pull build deps-local-git-pull bonfire-pre-updates mix-updates bonfire-post-updates ## Update/prepare dependencies
+update: init pull build bonfire-pre-updates mix-updates bonfire-post-updates deps-local-git-pull ## Update/prepare dependencies
 
 bonfire-pre-update:
 	mv deps.path deps.path.disabled 2> /dev/null || echo "continue"

config/dev.exs

@@ -7,7 +7,7 @@ config :bonfire, Mailer,
 
 config :bonfire, Bonfire.Repo,
   username: "postgres",
-  password: "postgres",
+  password: System.get_env("POSTGRES_PASSWORD", "postgres"),
   database: "bonfire_dev",
   hostname: System.get_env("DATABASE_HOST") || "localhost",
   show_sensitive_data_on_connection_error: true,

deps.git

@@ -23,4 +23,5 @@ bonfire_classify = "https://github.com/bonfire-ecosystem/bonfire_classify#main"
 # bonfire_taxonomy_seeder = "https://github.com/bonfire-ecosystem/bonfire_taxonomy_seeder#main"
 bonfire_search = "https://github.com/bonfire-ecosystem/bonfire_search#main"
 bonfire_data_shared_user = "https://github.com/bonfire-ecosystem/bonfire_data_shared_user#main"
-absinthe_client = "https://github.com/mayel/absinthe_client.git#master"
+bonfire_valueflows_observe = "https://github.com/bonfire-ecosystem/bonfire_valueflows_observe"
+absinthe_client = "https://github.com/mayel/absinthe_client.git#master"

docker-compose.yml

@@ -9,10 +9,10 @@ services:
       dockerfile: "Dockerfile.dev"
     ports:
       - "4003:4000"
-    # env_file:
-    #   - config/.env.secrets
     environment:
       - DATABASE_HOST=db
+    env_file:
+      - config/.env.secrets
     depends_on:
       - db
     #   - search
@@ -20,13 +20,15 @@ services:
       - type: bind
         source: .
         target: /opt/app
+      - /etc/passwd:/etc/passwd:ro 
     stdin_open: true # like docker run -i
     tty: true # like docker run -t
     user: $UID:$GID
   db:
     image: postgis/postgis:12-3.0-alpine
     volumes:
-      - "./data/postgres/dev:/var/lib/postgresql/data"
+      - ./data/postgres/dev:/var/lib/postgresql/data:z
+      - /etc/passwd:/etc/passwd:ro 
     # ports:
     #   - "5432:5432"
     env_file:
@@ -38,6 +40,7 @@ services:
       - "7703:7700"
     volumes:
       - "./data/search/dev:/data.ms"
+      - /etc/passwd:/etc/passwd:ro 
     env_file:
       - config/.env.secrets
     user: $UID:$GID

lib/web/router.ex

@@ -103,6 +103,8 @@ defmodule Bonfire.Web.Router do
 
     live "/feed", UI.Social.FeedPageLive
 
+    live "/user", Me.Web.ProfileLive
+
     live "/settings", Me.Web.UserSettingsLive
 
     resources "/delete", Me.Web.UserDeleteController, only: [:index, :create]

mix.lock

@@ -18,14 +18,15 @@
   "bonfire_fail": {:git, "https://github.com/bonfire-ecosystem/bonfire_fail", "353484ad3640539350d8f2fbef40ea29cbbebcff", [branch: "main"]},
   "bonfire_geolocate": {:git, "https://github.com/bonfire-ecosystem/bonfire_geolocate", "6eb6c02a2138ed64ad1ca4b84596b5ba2c517580", [branch: "main"]},
   "bonfire_mailer": {:git, "https://github.com/bonfire-ecosystem/bonfire_mailer", "079c8519395ee199dd689dd8ed8df0257210a9ff", [branch: "main"]},
-  "bonfire_me": {:git, "https://github.com/bonfire-ecosystem/bonfire_me", "fbbf23d7a02cbddc368a44f0cab6fc4a06818efb", [branch: "main"]},
-  "bonfire_quantify": {:git, "https://github.com/bonfire-ecosystem/bonfire_quantify", "f451c7b2a361ac2c4ad828bf3ed717c0618083bd", [branch: "main"]},
+  "bonfire_me": {:git, "https://github.com/bonfire-ecosystem/bonfire_me", "4ba57b0647e0741aec63e2bf2abd0d83494d4d92", [branch: "main"]},
+  "bonfire_quantify": {:git, "https://github.com/bonfire-ecosystem/bonfire_quantify", "c769d17a864f1466d6091e2a33c14f82e69e7e5d", [branch: "main"]},
   "bonfire_search": {:git, "https://github.com/bonfire-ecosystem/bonfire_search", "db372a48f59548abec8e0a07d0fd11d92c01acea", [branch: "main"]},
   "bonfire_tag": {:git, "https://github.com/bonfire-ecosystem/bonfire_tag", "cb708b8caeed112401cd5f4d55786923fa0cf546", [branch: "main"]},
   "bonfire_taxonomy_seeder": {:git, "https://github.com/bonfire-ecosystem/bonfire_taxonomy_seeder", "5d02af2c038bf2131e76c67221c4da04df376404", [branch: "main"]},
-  "bonfire_ui_social": {:git, "https://github.com/bonfire-ecosystem/bonfire_ui_social", "398d1fdf05ebb1d57b0bfc874e9424caddebfdaa", [branch: "main"]},
+  "bonfire_ui_social": {:git, "https://github.com/bonfire-ecosystem/bonfire_ui_social", "8b73e0ecb236d6da04fe4918f8ad0ad6a8fff663", [branch: "main"]},
   "bonfire_ui_valueflows": {:git, "https://github.com/bonfire-ecosystem/bonfire_ui_valueflows", "736519f4f6dc09f3c77a8500a581e464e5948124", [branch: "main"]},
-  "bonfire_valueflows": {:git, "https://github.com/bonfire-ecosystem/bonfire_valueflows", "e2e79477472d5046efa4230cf99bb9ba5ee95178", [branch: "main"]},
+  "bonfire_valueflows": {:git, "https://github.com/bonfire-ecosystem/bonfire_valueflows", "3ea972cb9825f7f7ebbd23b2b016457fa573b6d2", [branch: "main"]},
+  "bonfire_valueflows_observe": {:git, "https://github.com/bonfire-ecosystem/bonfire_valueflows_observe", "03e3ff44e06275afbcafeb0a186434ec0ce973a1", []},
   "bonfire_website": {:git, "https://github.com/bonfire-ecosystem/bonfire_website", "bc4899d56c968aebdd3916f0dd744a3a40cadc95", [branch: "main"]},
   "cachex": {:hex, :cachex, "3.3.0", "6f2ebb8f27491fe39121bd207c78badc499214d76c695658b19d6079beeca5c2", [:mix], [{:eternal, "~> 1.2", [hex: :eternal, repo: "hexpm", optional: false]}, {:jumper, "~> 1.0", [hex: :jumper, repo: "hexpm", optional: false]}, {:sleeplocks, "~> 1.1", [hex: :sleeplocks, repo: "hexpm", optional: false]}, {:unsafe, "~> 1.0", [hex: :unsafe, repo: "hexpm", optional: false]}], "hexpm", "d90e5ee1dde14cef33f6b187af4335b88748b72b30c038969176cd4e6ccc31a1"},
   "certifi": {:hex, :certifi, "2.5.3", "70bdd7e7188c804f3a30ee0e7c99655bc35d8ac41c23e12325f36ab449b70651", [:rebar3], [{:parse_trans, "~>3.3", [hex: :parse_trans, repo: "hexpm", optional: false]}], "hexpm", "ed516acb3929b101208a9d700062d520f3953da3b6b918d866106ffa980e1c10"},