restructure LiveView directories: admin/, shop/, auth/
Consolidates admin_live/, theme_live/, provider_live/ into admin/ (with theme/ and providers/ subdirs). Renames shop_live/ to shop/ and user_live/ to auth/. Updates all module names, router refs, test files, CSS source paths, and dialyzer ignore. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
parent
e64bf40a71
commit
deea04885f
@ -19,7 +19,7 @@
|
|||||||
{"lib/simpleshop_theme_web/controllers/checkout_controller.ex", :no_return},
|
{"lib/simpleshop_theme_web/controllers/checkout_controller.ex", :no_return},
|
||||||
|
|
||||||
# Environment-dependent: localhost?() is always true in dev
|
# Environment-dependent: localhost?() is always true in dev
|
||||||
{"lib/simpleshop_theme_web/live/admin_live/settings.ex", :pattern_match},
|
{"lib/simpleshop_theme_web/live/admin/settings.ex", :pattern_match},
|
||||||
|
|
||||||
# Provider behaviour type not derived by dialyzer
|
# Provider behaviour type not derived by dialyzer
|
||||||
{"lib/simpleshop_theme/providers/provider.ex", :unknown_type},
|
{"lib/simpleshop_theme/providers/provider.ex", :unknown_type},
|
||||||
|
|||||||
@ -7,7 +7,7 @@
|
|||||||
@source "../css";
|
@source "../css";
|
||||||
@source "../js";
|
@source "../js";
|
||||||
/* Only scan shop-specific files, not admin pages */
|
/* Only scan shop-specific files, not admin pages */
|
||||||
@source "../../lib/simpleshop_theme_web/live/shop_live";
|
@source "../../lib/simpleshop_theme_web/live/shop";
|
||||||
@source "../../lib/simpleshop_theme_web/components/shop_components.ex";
|
@source "../../lib/simpleshop_theme_web/components/shop_components.ex";
|
||||||
@source "../../lib/simpleshop_theme_web/components/shop_components";
|
@source "../../lib/simpleshop_theme_web/components/shop_components";
|
||||||
@source "../../lib/simpleshop_theme_web/components/page_templates";
|
@source "../../lib/simpleshop_theme_web/components/page_templates";
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
defmodule SimpleshopThemeWeb.AdminLive.OrderShow do
|
defmodule SimpleshopThemeWeb.Admin.OrderShow do
|
||||||
use SimpleshopThemeWeb, :live_view
|
use SimpleshopThemeWeb, :live_view
|
||||||
|
|
||||||
alias SimpleshopTheme.Orders
|
alias SimpleshopTheme.Orders
|
||||||
@ -1,4 +1,4 @@
|
|||||||
defmodule SimpleshopThemeWeb.AdminLive.Orders do
|
defmodule SimpleshopThemeWeb.Admin.Orders do
|
||||||
use SimpleshopThemeWeb, :live_view
|
use SimpleshopThemeWeb, :live_view
|
||||||
|
|
||||||
alias SimpleshopTheme.Orders
|
alias SimpleshopTheme.Orders
|
||||||
@ -1,4 +1,4 @@
|
|||||||
defmodule SimpleshopThemeWeb.ProviderLive.Form do
|
defmodule SimpleshopThemeWeb.Admin.Providers.Form do
|
||||||
use SimpleshopThemeWeb, :live_view
|
use SimpleshopThemeWeb, :live_view
|
||||||
|
|
||||||
alias SimpleshopTheme.Products
|
alias SimpleshopTheme.Products
|
||||||
@ -1,4 +1,4 @@
|
|||||||
defmodule SimpleshopThemeWeb.ProviderLive.Index do
|
defmodule SimpleshopThemeWeb.Admin.Providers.Index do
|
||||||
use SimpleshopThemeWeb, :live_view
|
use SimpleshopThemeWeb, :live_view
|
||||||
|
|
||||||
alias SimpleshopTheme.Products
|
alias SimpleshopTheme.Products
|
||||||
@ -1,4 +1,4 @@
|
|||||||
defmodule SimpleshopThemeWeb.AdminLive.Settings do
|
defmodule SimpleshopThemeWeb.Admin.Settings do
|
||||||
use SimpleshopThemeWeb, :live_view
|
use SimpleshopThemeWeb, :live_view
|
||||||
|
|
||||||
alias SimpleshopTheme.Settings
|
alias SimpleshopTheme.Settings
|
||||||
@ -1,4 +1,4 @@
|
|||||||
defmodule SimpleshopThemeWeb.ThemeLive.Index do
|
defmodule SimpleshopThemeWeb.Admin.Theme.Index do
|
||||||
use SimpleshopThemeWeb, :live_view
|
use SimpleshopThemeWeb, :live_view
|
||||||
|
|
||||||
alias SimpleshopTheme.Settings
|
alias SimpleshopTheme.Settings
|
||||||
@ -1,4 +1,4 @@
|
|||||||
defmodule SimpleshopThemeWeb.UserLive.Confirmation do
|
defmodule SimpleshopThemeWeb.Auth.Confirmation do
|
||||||
use SimpleshopThemeWeb, :live_view
|
use SimpleshopThemeWeb, :live_view
|
||||||
|
|
||||||
alias SimpleshopTheme.Accounts
|
alias SimpleshopTheme.Accounts
|
||||||
@ -1,4 +1,4 @@
|
|||||||
defmodule SimpleshopThemeWeb.UserLive.Login do
|
defmodule SimpleshopThemeWeb.Auth.Login do
|
||||||
use SimpleshopThemeWeb, :live_view
|
use SimpleshopThemeWeb, :live_view
|
||||||
|
|
||||||
alias SimpleshopTheme.Accounts
|
alias SimpleshopTheme.Accounts
|
||||||
@ -1,4 +1,4 @@
|
|||||||
defmodule SimpleshopThemeWeb.UserLive.Registration do
|
defmodule SimpleshopThemeWeb.Auth.Registration do
|
||||||
use SimpleshopThemeWeb, :live_view
|
use SimpleshopThemeWeb, :live_view
|
||||||
|
|
||||||
alias SimpleshopTheme.Accounts
|
alias SimpleshopTheme.Accounts
|
||||||
@ -1,4 +1,4 @@
|
|||||||
defmodule SimpleshopThemeWeb.UserLive.Settings do
|
defmodule SimpleshopThemeWeb.Auth.Settings do
|
||||||
use SimpleshopThemeWeb, :live_view
|
use SimpleshopThemeWeb, :live_view
|
||||||
|
|
||||||
on_mount {SimpleshopThemeWeb.UserAuth, :require_sudo_mode}
|
on_mount {SimpleshopThemeWeb.UserAuth, :require_sudo_mode}
|
||||||
@ -1,4 +1,4 @@
|
|||||||
defmodule SimpleshopThemeWeb.ShopLive.Cart do
|
defmodule SimpleshopThemeWeb.Shop.Cart do
|
||||||
use SimpleshopThemeWeb, :live_view
|
use SimpleshopThemeWeb, :live_view
|
||||||
|
|
||||||
alias SimpleshopTheme.Cart
|
alias SimpleshopTheme.Cart
|
||||||
@ -1,4 +1,4 @@
|
|||||||
defmodule SimpleshopThemeWeb.ShopLive.CheckoutSuccess do
|
defmodule SimpleshopThemeWeb.Shop.CheckoutSuccess do
|
||||||
use SimpleshopThemeWeb, :live_view
|
use SimpleshopThemeWeb, :live_view
|
||||||
|
|
||||||
alias SimpleshopTheme.Orders
|
alias SimpleshopTheme.Orders
|
||||||
@ -1,4 +1,4 @@
|
|||||||
defmodule SimpleshopThemeWeb.ShopLive.Collection do
|
defmodule SimpleshopThemeWeb.Shop.Collection do
|
||||||
use SimpleshopThemeWeb, :live_view
|
use SimpleshopThemeWeb, :live_view
|
||||||
|
|
||||||
alias SimpleshopTheme.Theme.PreviewData
|
alias SimpleshopTheme.Theme.PreviewData
|
||||||
@ -1,4 +1,4 @@
|
|||||||
defmodule SimpleshopThemeWeb.ShopLive.ComingSoon do
|
defmodule SimpleshopThemeWeb.Shop.ComingSoon do
|
||||||
use SimpleshopThemeWeb, :live_view
|
use SimpleshopThemeWeb, :live_view
|
||||||
|
|
||||||
@impl true
|
@impl true
|
||||||
@ -1,4 +1,4 @@
|
|||||||
defmodule SimpleshopThemeWeb.ShopLive.Contact do
|
defmodule SimpleshopThemeWeb.Shop.Contact do
|
||||||
use SimpleshopThemeWeb, :live_view
|
use SimpleshopThemeWeb, :live_view
|
||||||
|
|
||||||
@impl true
|
@impl true
|
||||||
@ -1,4 +1,4 @@
|
|||||||
defmodule SimpleshopThemeWeb.ShopLive.Content do
|
defmodule SimpleshopThemeWeb.Shop.Content do
|
||||||
use SimpleshopThemeWeb, :live_view
|
use SimpleshopThemeWeb, :live_view
|
||||||
|
|
||||||
alias SimpleshopTheme.Theme.PreviewData
|
alias SimpleshopTheme.Theme.PreviewData
|
||||||
@ -1,4 +1,4 @@
|
|||||||
defmodule SimpleshopThemeWeb.ShopLive.Home do
|
defmodule SimpleshopThemeWeb.Shop.Home do
|
||||||
use SimpleshopThemeWeb, :live_view
|
use SimpleshopThemeWeb, :live_view
|
||||||
|
|
||||||
alias SimpleshopTheme.Theme.PreviewData
|
alias SimpleshopTheme.Theme.PreviewData
|
||||||
@ -1,4 +1,4 @@
|
|||||||
defmodule SimpleshopThemeWeb.ShopLive.ProductShow do
|
defmodule SimpleshopThemeWeb.Shop.ProductShow do
|
||||||
use SimpleshopThemeWeb, :live_view
|
use SimpleshopThemeWeb, :live_view
|
||||||
|
|
||||||
alias SimpleshopTheme.Cart
|
alias SimpleshopTheme.Cart
|
||||||
@ -37,7 +37,7 @@ defmodule SimpleshopThemeWeb.Router do
|
|||||||
on_mount: [
|
on_mount: [
|
||||||
{SimpleshopThemeWeb.ThemeHook, :mount_theme}
|
{SimpleshopThemeWeb.ThemeHook, :mount_theme}
|
||||||
] do
|
] do
|
||||||
live "/coming-soon", ShopLive.ComingSoon, :index
|
live "/coming-soon", Shop.ComingSoon, :index
|
||||||
end
|
end
|
||||||
|
|
||||||
live_session :public_shop,
|
live_session :public_shop,
|
||||||
@ -47,16 +47,16 @@ defmodule SimpleshopThemeWeb.Router do
|
|||||||
{SimpleshopThemeWeb.ThemeHook, :require_site_live},
|
{SimpleshopThemeWeb.ThemeHook, :require_site_live},
|
||||||
{SimpleshopThemeWeb.CartHook, :mount_cart}
|
{SimpleshopThemeWeb.CartHook, :mount_cart}
|
||||||
] do
|
] do
|
||||||
live "/", ShopLive.Home, :index
|
live "/", Shop.Home, :index
|
||||||
live "/about", ShopLive.Content, :about
|
live "/about", Shop.Content, :about
|
||||||
live "/delivery", ShopLive.Content, :delivery
|
live "/delivery", Shop.Content, :delivery
|
||||||
live "/privacy", ShopLive.Content, :privacy
|
live "/privacy", Shop.Content, :privacy
|
||||||
live "/terms", ShopLive.Content, :terms
|
live "/terms", Shop.Content, :terms
|
||||||
live "/contact", ShopLive.Contact, :index
|
live "/contact", Shop.Contact, :index
|
||||||
live "/collections/:slug", ShopLive.Collection, :show
|
live "/collections/:slug", Shop.Collection, :show
|
||||||
live "/products/:id", ShopLive.ProductShow, :show
|
live "/products/:id", Shop.ProductShow, :show
|
||||||
live "/cart", ShopLive.Cart, :index
|
live "/cart", Shop.Cart, :index
|
||||||
live "/checkout/success", ShopLive.CheckoutSuccess, :show
|
live "/checkout/success", Shop.CheckoutSuccess, :show
|
||||||
end
|
end
|
||||||
|
|
||||||
# Checkout (POST — creates Stripe session and redirects)
|
# Checkout (POST — creates Stripe session and redirects)
|
||||||
@ -135,15 +135,15 @@ defmodule SimpleshopThemeWeb.Router do
|
|||||||
|
|
||||||
live_session :require_authenticated_user,
|
live_session :require_authenticated_user,
|
||||||
on_mount: [{SimpleshopThemeWeb.UserAuth, :require_authenticated}] do
|
on_mount: [{SimpleshopThemeWeb.UserAuth, :require_authenticated}] do
|
||||||
live "/users/settings", UserLive.Settings, :edit
|
live "/users/settings", Auth.Settings, :edit
|
||||||
live "/users/settings/confirm-email/:token", UserLive.Settings, :confirm_email
|
live "/users/settings/confirm-email/:token", Auth.Settings, :confirm_email
|
||||||
live "/admin/theme", ThemeLive.Index, :index
|
live "/admin/theme", Admin.Theme.Index, :index
|
||||||
live "/admin/providers", ProviderLive.Index, :index
|
live "/admin/providers", Admin.Providers.Index, :index
|
||||||
live "/admin/providers/new", ProviderLive.Form, :new
|
live "/admin/providers/new", Admin.Providers.Form, :new
|
||||||
live "/admin/providers/:id/edit", ProviderLive.Form, :edit
|
live "/admin/providers/:id/edit", Admin.Providers.Form, :edit
|
||||||
live "/admin/orders", AdminLive.Orders, :index
|
live "/admin/orders", Admin.Orders, :index
|
||||||
live "/admin/orders/:id", AdminLive.OrderShow, :show
|
live "/admin/orders/:id", Admin.OrderShow, :show
|
||||||
live "/admin/settings", AdminLive.Settings, :index
|
live "/admin/settings", Admin.Settings, :index
|
||||||
end
|
end
|
||||||
|
|
||||||
post "/users/update-password", UserSessionController, :update_password
|
post "/users/update-password", UserSessionController, :update_password
|
||||||
@ -154,9 +154,9 @@ defmodule SimpleshopThemeWeb.Router do
|
|||||||
|
|
||||||
live_session :current_user,
|
live_session :current_user,
|
||||||
on_mount: [{SimpleshopThemeWeb.UserAuth, :mount_current_scope}] do
|
on_mount: [{SimpleshopThemeWeb.UserAuth, :mount_current_scope}] do
|
||||||
live "/users/register", UserLive.Registration, :new
|
live "/users/register", Auth.Registration, :new
|
||||||
live "/users/log-in", UserLive.Login, :new
|
live "/users/log-in", Auth.Login, :new
|
||||||
live "/users/log-in/:token", UserLive.Confirmation, :new
|
live "/users/log-in/:token", Auth.Confirmation, :new
|
||||||
end
|
end
|
||||||
|
|
||||||
post "/users/log-in", UserSessionController, :create
|
post "/users/log-in", UserSessionController, :create
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
defmodule SimpleshopThemeWeb.AdminLive.OrdersTest do
|
defmodule SimpleshopThemeWeb.Admin.OrdersTest do
|
||||||
use SimpleshopThemeWeb.ConnCase, async: false
|
use SimpleshopThemeWeb.ConnCase, async: false
|
||||||
|
|
||||||
import Phoenix.LiveViewTest
|
import Phoenix.LiveViewTest
|
||||||
@ -1,4 +1,4 @@
|
|||||||
defmodule SimpleshopThemeWeb.AdminLive.SettingsTest do
|
defmodule SimpleshopThemeWeb.Admin.SettingsTest do
|
||||||
use SimpleshopThemeWeb.ConnCase, async: false
|
use SimpleshopThemeWeb.ConnCase, async: false
|
||||||
|
|
||||||
import Phoenix.LiveViewTest
|
import Phoenix.LiveViewTest
|
||||||
@ -1,4 +1,4 @@
|
|||||||
defmodule SimpleshopThemeWeb.ThemeLiveTest do
|
defmodule SimpleshopThemeWeb.Admin.ThemeTest do
|
||||||
use SimpleshopThemeWeb.ConnCase, async: false
|
use SimpleshopThemeWeb.ConnCase, async: false
|
||||||
|
|
||||||
import Phoenix.LiveViewTest
|
import Phoenix.LiveViewTest
|
||||||
@ -1,4 +1,4 @@
|
|||||||
defmodule SimpleshopThemeWeb.UserLive.ConfirmationTest do
|
defmodule SimpleshopThemeWeb.Auth.ConfirmationTest do
|
||||||
use SimpleshopThemeWeb.ConnCase
|
use SimpleshopThemeWeb.ConnCase
|
||||||
|
|
||||||
import Phoenix.LiveViewTest
|
import Phoenix.LiveViewTest
|
||||||
@ -1,4 +1,4 @@
|
|||||||
defmodule SimpleshopThemeWeb.UserLive.LoginTest do
|
defmodule SimpleshopThemeWeb.Auth.LoginTest do
|
||||||
use SimpleshopThemeWeb.ConnCase
|
use SimpleshopThemeWeb.ConnCase
|
||||||
|
|
||||||
import Phoenix.LiveViewTest
|
import Phoenix.LiveViewTest
|
||||||
@ -1,4 +1,4 @@
|
|||||||
defmodule SimpleshopThemeWeb.UserLive.RegistrationTest do
|
defmodule SimpleshopThemeWeb.Auth.RegistrationTest do
|
||||||
use SimpleshopThemeWeb.ConnCase
|
use SimpleshopThemeWeb.ConnCase
|
||||||
|
|
||||||
import Phoenix.LiveViewTest
|
import Phoenix.LiveViewTest
|
||||||
@ -1,4 +1,4 @@
|
|||||||
defmodule SimpleshopThemeWeb.UserLive.SettingsTest do
|
defmodule SimpleshopThemeWeb.Auth.SettingsTest do
|
||||||
use SimpleshopThemeWeb.ConnCase
|
use SimpleshopThemeWeb.ConnCase
|
||||||
|
|
||||||
alias SimpleshopTheme.Accounts
|
alias SimpleshopTheme.Accounts
|
||||||
@ -1,4 +1,4 @@
|
|||||||
defmodule SimpleshopThemeWeb.ShopLive.CartTest do
|
defmodule SimpleshopThemeWeb.Shop.CartTest do
|
||||||
use SimpleshopThemeWeb.ConnCase, async: false
|
use SimpleshopThemeWeb.ConnCase, async: false
|
||||||
|
|
||||||
import Phoenix.LiveViewTest
|
import Phoenix.LiveViewTest
|
||||||
@ -1,4 +1,4 @@
|
|||||||
defmodule SimpleshopThemeWeb.ShopLive.CollectionTest do
|
defmodule SimpleshopThemeWeb.Shop.CollectionTest do
|
||||||
use SimpleshopThemeWeb.ConnCase, async: false
|
use SimpleshopThemeWeb.ConnCase, async: false
|
||||||
|
|
||||||
import Phoenix.LiveViewTest
|
import Phoenix.LiveViewTest
|
||||||
@ -1,4 +1,4 @@
|
|||||||
defmodule SimpleshopThemeWeb.ShopLive.ComingSoonTest do
|
defmodule SimpleshopThemeWeb.Shop.ComingSoonTest do
|
||||||
use SimpleshopThemeWeb.ConnCase, async: false
|
use SimpleshopThemeWeb.ConnCase, async: false
|
||||||
|
|
||||||
import Phoenix.LiveViewTest
|
import Phoenix.LiveViewTest
|
||||||
@ -1,4 +1,4 @@
|
|||||||
defmodule SimpleshopThemeWeb.ShopLive.ContentTest do
|
defmodule SimpleshopThemeWeb.Shop.ContentTest do
|
||||||
use SimpleshopThemeWeb.ConnCase, async: false
|
use SimpleshopThemeWeb.ConnCase, async: false
|
||||||
|
|
||||||
import Phoenix.LiveViewTest
|
import Phoenix.LiveViewTest
|
||||||
@ -1,4 +1,4 @@
|
|||||||
defmodule SimpleshopThemeWeb.ShopLive.HomeTest do
|
defmodule SimpleshopThemeWeb.Shop.HomeTest do
|
||||||
use SimpleshopThemeWeb.ConnCase, async: false
|
use SimpleshopThemeWeb.ConnCase, async: false
|
||||||
|
|
||||||
import Phoenix.LiveViewTest
|
import Phoenix.LiveViewTest
|
||||||
@ -1,4 +1,4 @@
|
|||||||
defmodule SimpleshopThemeWeb.ShopLive.ProductShowTest do
|
defmodule SimpleshopThemeWeb.Shop.ProductShowTest do
|
||||||
use SimpleshopThemeWeb.ConnCase, async: false
|
use SimpleshopThemeWeb.ConnCase, async: false
|
||||||
|
|
||||||
import Phoenix.LiveViewTest
|
import Phoenix.LiveViewTest
|
||||||
Loading…
Reference in New Issue
Block a user