Merge pull request #31 from dewetblomerus/admin-bug

Admin bug

assets/js/app.js

@@ -40,13 +40,18 @@ window.addEventListener(`phx:set_storage`, (e) => {
   }
 })
 
+const userFromStorage = {
+  admin_token: localStorage.getItem('admin_token'),
+  name: localStorage.getItem('name'),
+  only_viewing: localStorage.getItem('only_viewing'),
+}
+
 Hooks.RestoreUser = {
   mounted() {
-    console.log('Restoring user from localStorage 🥶')
-    this.pushEvent('restore_user', {
-      admin_token: localStorage.getItem('admin_token'),
-      name: localStorage.getItem('name'),
-      only_viewing: localStorage.getItem('only_viewing'),
+    this.handleEvent('restore_user', () => {
+      console.log('Server requested user from localStorage 🥶')
+      console.log('Sending this user:', userFromStorage)
+      this.pushEvent('restore_user', userFromStorage)
     })
   },
 }

lib/quick_average_web/live/average_live.ex

@@ -19,6 +19,7 @@ defmodule QuickAverageWeb.AverageLive do
   def mount(%{"room_id" => room_id}, _session, socket) do
     ManagerSupervisor.create(room_id)
     PubSubInterface.subscribe_display(room_id)
+    send(self(), :ask_frontend_to_restore_user)
 
     new_socket =
       assign(socket, %{
@@ -36,10 +37,7 @@ defmodule QuickAverageWeb.AverageLive do
 
     PresenceInterface.track(new_socket)
 
-    {
-      :ok,
-      new_socket
-    }
+    {:ok, new_socket}
   end
 
   @impl true
@@ -165,6 +163,11 @@ defmodule QuickAverageWeb.AverageLive do
     {:noreply, socket}
   end
 
+  @impl true
+  def handle_info(:ask_frontend_to_restore_user, socket) do
+    {:noreply, push_event(socket, "restore_user", %{})}
+  end
+
   @impl true
   def handle_info(%DisplayState{users: users, average: average}, socket) do
     is_admin = socket.assigns.is_admin || is_alone?(users)

lib/quick_average_web/live/average_live.html.heex

@@ -1,4 +1,4 @@
-<div id="hooker" phx-hook="RestoreUser"></div>
+<div id="hook-1" phx-hook="RestoreUser"></div>
 <div class="border-2 border-gray-400 rounded-xl mt-2">
   <div class="pl-4 pt-4 pr-4">
     <.simple_form

mix.exs

@@ -36,16 +36,16 @@ defmodule QuickAverage.MixProject do
       {:esbuild, "~> 0.6", runtime: Mix.env() == :dev},
       {:floki, ">= 0.34.0", only: :test},
       {:gettext, "~> 0.22"},
-      {:heroicons, "~> 0.5"},
+      {:heroicons, "> 0.5.2"},
       {:jason, "~> 1.2"},
       {:mimic, "~> 1.7", only: :test},
       {:mix_test_watch, "~> 1.1", only: :dev, runtime: false},
       {:phoenix_ecto, "~> 4.4.2"},
       {:phoenix_html, "~> 3.3"},
-      {:phoenix_live_dashboard, "~> 0.7.2"},
+      {:phoenix_live_dashboard, "> 0.8.0"},
       {:phoenix_live_reload, "~> 1.4", only: :dev},
-      {:phoenix_live_view, "~> 0.18.17"},
-      {:phoenix, "~> 1.7.1", override: true},
+      {:phoenix_live_view, "~> 0.20.0"},
+      {:phoenix, "~> 1.7.7", override: true},
       {:plug_cowboy, "~> 2.6"},
       {:sobelow, "~> 0.12", only: [:dev, :test], runtime: false},
       {:tailwind, "~> 0.1.10", runtime: Mix.env() == :dev},