Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions lib/foedus_web/components/layouts.ex
Original file line number Diff line number Diff line change
Expand Up @@ -201,12 +201,6 @@ defmodule FoedusWeb.Layouts do
>
Entrar
</.link>
<.link
href={~p"/users/register"}
class="bg-indigo-600 text-white px-4 py-2 rounded-md text-sm font-medium hover:bg-indigo-700 transition-colors"
>
Cadastrar
</.link>
</div>
"""
end
Expand Down
2 changes: 1 addition & 1 deletion lib/foedus_web/components/ui/addresses_list.ex
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ defmodule FoedusWeb.Components.UI.AddressesList do

attr :addresses, :list, required: true
attr :title, :string, default: "Addresses"
attr :class, :string, default: ""
attr :class, :any, default: ""

def addresses_list(assigns) do
~H"""
Expand Down
2 changes: 0 additions & 2 deletions lib/foedus_web/components/ui/button.ex
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
defmodule FoedusWeb.Components.UI.Button do
use Phoenix.Component

alias FoedusWeb.Components.UI.Icon

@base_class "inline-flex items-center justify-center gap-2 border font-medium rounded-lg transition-colors duration-200 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500"

@variants %{
Expand Down
10 changes: 1 addition & 9 deletions lib/foedus_web/components/ui/card.ex
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ defmodule FoedusWeb.Components.UI.Card do

import FoedusWeb.Components.UI.Icon

attr :class, :string, default: ""
attr :class, :any, default: ""
attr :title, :string, default: nil
attr :icon, :string, default: nil
attr :icon_color, :string, default: "gray"
Expand Down Expand Up @@ -82,12 +82,4 @@ defmodule FoedusWeb.Components.UI.Card do
defp icon_text_class("yellow"), do: "text-yellow-600"
defp icon_text_class("indigo"), do: "text-indigo-600"
defp icon_text_class(_), do: "text-gray-600"

defp stat_bg_class("blue"), do: "bg-blue-500"
defp stat_bg_class("green"), do: "bg-green-500"
defp stat_bg_class("purple"), do: "bg-purple-500"
defp stat_bg_class("red"), do: "bg-red-500"
defp stat_bg_class("yellow"), do: "bg-yellow-500"
defp stat_bg_class("indigo"), do: "bg-indigo-500"
defp stat_bg_class(_), do: "bg-gray-500"
end
2 changes: 1 addition & 1 deletion lib/foedus_web/components/ui/icon.ex
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ defmodule FoedusWeb.Components.UI.Icon do
<.icon name="check-circle" class="w-4 h-4 text-green-500" />
"""
attr :name, :string, required: true
attr :class, :string, default: nil
attr :class, :any, default: nil

def icon(%{name: "hero-" <> _} = assigns) do
~H"""
Expand Down
2 changes: 1 addition & 1 deletion lib/foedus_web/live/contract_template_live/show.html.heex
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
Back
</.link>
<.link
patch={~p"/contract_templates/#{@contract_template}/show/edit"}
patch={~p"/contract_templates/#{@contract_template.id}/edit"}
phx-click={JS.push_focus()}
>
<.button class="inline-flex items-center justify-center gap-2 hover:text-indigo-600 hover:bg-gray-50 text-indigo-600 font-medium px-4 py-2.5 rounded-xl shadow-sm transition-all duration-200 border border-white">
Expand Down
3 changes: 0 additions & 3 deletions lib/foedus_web/live/contractor_live/show.ex
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,4 @@ defmodule FoedusWeb.ContractorLive.Show do

defp page_title(:show), do: "Show Contractor"
defp page_title(:edit), do: "Edit Contractor"

defp information_section_title(%{entity_type: :company}), do: "Company Information"
defp information_section_title(_contractor), do: "Personal Information"
end
3 changes: 1 addition & 2 deletions lib/foedus_web/live/contractor_live/show.html.heex
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,7 @@
<FoedusWeb.Components.UI.Badge.status_badge
size={:lg}
status={@contractor.status}
>
</FoedusWeb.Components.UI.Badge.status_badge>
/>
</div>
</div>

Expand Down
21 changes: 0 additions & 21 deletions lib/foedus_web/live/signer_live/show.ex
Original file line number Diff line number Diff line change
Expand Up @@ -34,25 +34,4 @@ defmodule FoedusWeb.SignerLive.Show do
name = String.trim("#{first} #{last}")
if name == "", do: "Signer ##{signer.id}", else: name
end

defp format_document(document) when is_binary(document) do
document
|> String.replace(~r/[^\d]/, "")
|> case do
<<a::binary-size(3), b::binary-size(3), c::binary-size(3), d::binary-size(2)>> ->
"#{a}.#{b}.#{c}-#{d}"

<<a::binary-size(2), b::binary-size(3), c::binary-size(3), d::binary-size(4), e::binary-size(2)>> ->
"#{a}.#{b}.#{c}/#{d}-#{e}"

doc ->
doc
end
end

defp format_document(nil), do: "N/A"

defp format_date(%Date{} = date), do: Calendar.strftime(date, "%d/%m/%Y")
defp format_date(nil), do: "N/A"
defp format_date(_), do: "N/A"
end
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
defmodule FoedusWeb.UserConfirmationInstructionsLive do
defmodule FoedusWeb.UserAuth.UserConfirmationInstructionsLive do
use FoedusWeb, :live_view

alias Foedus.Accounts
Expand All @@ -21,8 +21,7 @@ defmodule FoedusWeb.UserConfirmationInstructionsLive do
</.simple_form>

<p class="text-center mt-4">
<.link href={~p"/users/register"}>Register</.link>
| <.link href={~p"/users/log_in"}>Log in</.link>
<.link href={~p"/users/log_in"}>Log in</.link>
</p>
</div>
"""
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
defmodule FoedusWeb.UserConfirmationLive do
defmodule FoedusWeb.UserAuth.UserConfirmationLive do
use FoedusWeb, :live_view

alias Foedus.Accounts
Expand All @@ -16,8 +16,7 @@ defmodule FoedusWeb.UserConfirmationLive do
</.simple_form>

<p class="text-center mt-4">
<.link href={~p"/users/register"}>Register</.link>
| <.link href={~p"/users/log_in"}>Log in</.link>
<.link href={~p"/users/log_in"}>Log in</.link>
</p>
</div>
"""
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
defmodule FoedusWeb.UserForgotPasswordLive do
defmodule FoedusWeb.UserAuth.UserForgotPasswordLive do
use FoedusWeb, :live_view

alias Foedus.Accounts
Expand Down Expand Up @@ -29,9 +29,6 @@ defmodule FoedusWeb.UserForgotPasswordLive do
</.simple_form>

<p class="text-center text-sm mt-6 text-gray-600">
<.link href={~p"/users/register"} class="font-semibold text-indigo-600 hover:underline">
Register
</.link>
<span class="mx-2">|</span>
<.link href={~p"/users/log_in"} class="font-semibold text-indigo-600 hover:underline">
Log in
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
defmodule FoedusWeb.UserLoginLive do
defmodule FoedusWeb.UserAuth.UserLoginLive do
use FoedusWeb, :live_view

def render(assigns) do
Expand All @@ -7,18 +7,6 @@ defmodule FoedusWeb.UserLoginLive do
<div class="w-full max-w-md bg-white shadow-lg rounded-2xl p-8">
<.header class="text-center mb-8">
<span class="block text-3xl font-bold text-gray-900">Log in to account</span>
<:subtitle>
<span class="text-sm text-gray-500">
Don't have an account?
<.link
navigate={~p"/users/register"}
class="font-semibold text-indigo-600 hover:underline"
>
Sign up
</.link>
for an account now.
</span>
</:subtitle>
</.header>

<.simple_form
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
defmodule FoedusWeb.UserResetPasswordLive do
defmodule FoedusWeb.UserAuth.UserResetPasswordLive do
use FoedusWeb, :live_view

alias Foedus.Accounts
Expand Down Expand Up @@ -31,8 +31,7 @@ defmodule FoedusWeb.UserResetPasswordLive do
</.simple_form>

<p class="text-center text-sm mt-4">
<.link href={~p"/users/register"}>Register</.link>
| <.link href={~p"/users/log_in"}>Log in</.link>
<.link href={~p"/users/log_in"}>Log in</.link>
</p>
</div>
"""
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
defmodule FoedusWeb.UserSettingsLive do
defmodule FoedusWeb.UserAuth.UserSettingsLive do
use FoedusWeb, :live_view

alias Foedus.Accounts
Expand Down
100 changes: 0 additions & 100 deletions lib/foedus_web/live/user_registration_live.ex

This file was deleted.

29 changes: 9 additions & 20 deletions lib/foedus_web/router.ex
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
defmodule FoedusWeb.Router do
use FoedusWeb, :router

import FoedusWeb.UserAuth

pipeline :browser do
Expand All @@ -13,37 +12,27 @@ defmodule FoedusWeb.Router do
plug :fetch_current_user
end

# Enable LiveDashboard and Swoosh mailbox preview in development
if Application.compile_env(:foedus, :dev_routes) do
# If you want to use the LiveDashboard in production, you should put
# it behind authentication and allow only admins to access it.
# If your application does not have an admins-only section yet,
# you can use Plug.BasicAuth to set up some basic authentication
# as long as you are also using SSL (which you should anyway).
import Phoenix.LiveDashboard.Router

scope "/dev" do
pipe_through :browser

live_dashboard "/dashboard", metrics: FoedusWeb.Telemetry
forward "/mailbox", Plug.Swoosh.MailboxPreview
end
end

## Authentication routes

scope "/", FoedusWeb do
pipe_through [:browser, :redirect_if_user_is_authenticated]

live_session :redirect_if_user_is_authenticated,
on_mount: [{FoedusWeb.UserAuth, :redirect_if_user_is_authenticated}] do
live "/", HomeLive.Index, :index
# live "/users/register", UserRegistrationLive, :new
# live "/users/reset_password", UserForgotPasswordLive, :new
# live "/users/reset_password/:token", UserResetPasswordLive, :edit

live "/users/log_in", UserLoginLive, :new
live "/onboarding", OnboardingLive.Index, :index

live "/users/reset_password", UserAuth.UserForgotPasswordLive, :new
live "/users/reset_password/:token", UserAuth.UserResetPasswordLive, :edit
end

post "/users/log_in", UserSessionController, :create
Expand All @@ -54,24 +43,24 @@ defmodule FoedusWeb.Router do

live_session :require_authenticated_user,
on_mount: [{FoedusWeb.UserAuth, :ensure_authenticated}] do
live "/users/settings", UserSettingsLive, :edit
live "/users/settings/confirm_email/:token", UserSettingsLive, :confirm_email
live "/users/settings", UserAuth.UserSettingsLive, :edit
live "/users/settings/confirm_email/:token", UserAuth.UserSettingsLive, :confirm_email

live "/dashboard", DashboardLive.Index

live "/contractors", ContractorLive.Index, :index
live "/contractors/:id/edit", ContractorLive.Index, :edit
live "/contractors/:id", ContractorLive.Show, :show

live "/contract_templates", ContractTemplateLive.Index, :index
live "/contract_templates/new", ContractTemplateLive.Index, :new
live "/contract_templates/:id/edit", ContractTemplateLive.Index, :edit
live "/contract_templates/:id", ContractTemplateLive.Show, :show

live "/signers", SignerLive.Index, :index
live "/signers/new", SignerLive.Index, :new
live "/signers/:id/edit", SignerLive.Index, :edit
live "/signers/:id", SignerLive.Show, :show

live "/contract_templates/:id", ContractTemplateLive.Show, :show
end
end

Expand All @@ -84,8 +73,8 @@ defmodule FoedusWeb.Router do

live_session :current_user,
on_mount: [{FoedusWeb.UserAuth, :mount_current_user}] do
live "/users/confirm/:token", UserConfirmationLive, :edit
live "/users/confirm", UserConfirmationInstructionsLive, :new
live "/users/confirm/:token", UserAuth.UserConfirmationLive, :edit
live "/users/confirm", UserAuth.UserConfirmationInstructionsLive, :new
end
end
end