Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@Clivern
Clivern committed Mar 19, 2024
1 parent b0f7bf1 commit cbbcb89
Show file tree
Hide file tree
Showing 5 changed files with 136 additions and 44 deletions.
6 changes: 3 additions & 3 deletions lib/lynx_web/controllers/user_controller.ex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ defmodule LynxWeb.UserController do
{:not_found, msg} ->
conn
|> put_status(:not_found)
|> render("error.json", %{error: msg})
|> render("error.json", %{message: msg})

{:ok, user} ->
conn
Expand Down Expand Up @@ -104,7 +104,7 @@ defmodule LynxWeb.UserController do
{:ok, user} ->
conn
|> put_status(:created)
|> render("create.json", %{user: user})
|> render("index.json", %{user: user})
end
rescue
e in InvalidRequest ->
Expand Down Expand Up @@ -139,7 +139,7 @@ defmodule LynxWeb.UserController do
{:not_found, msg} ->
conn
|> put_status(:not_found)
|> render("error.json", %{error: msg})
|> render("error.json", %{message: msg})

{:ok, _} ->
conn
Expand Down
6 changes: 3 additions & 3 deletions lib/lynx_web/templates/page/teams.html.heex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@
</thead>

<tbody>
<tr v-for="team in teams" :key="team.id">
<tr v-for="team in teams">
<td>
<a href="javascript:;">
<div class="avatar-item avatar-lg d-flex align-items-center justify-content-center bg-primary-4 hp-bg-dark-primary text-primary hp-text-color-dark-0 rounded-circle">
Expand All @@ -304,7 +304,7 @@
<nav>
<ul class="pagination justify-content-end px-32">
<li class="page-item">
<button class="page-link" @click="loadPreviousPage" v-if="currentPage > 1">
<button class="page-link" @click="loadPreviousPageAction" v-if="currentPage > 1">
<svg viewBox="64 64 896 896" focusable="false" data-icon="left" width="12px" height="12px" fill="currentColor" aria-hidden="true">
<path d="M724 218.3V141c0-6.7-7.7-10.4-12.9-6.3L260.3 486.8a31.86 31.86 0 000 50.3l450.8 352.1c5.3 4.1 12.9.4 12.9-6.3v-77.3c0-4.9-2.3-9.6-6.1-12.6l-360-281 360-281.1c3.8-3 6.1-7.7 6.1-12.6z"></path>
</svg>
Expand All @@ -316,7 +316,7 @@
</li>

<li class="page-item">
<button class="page-link" @click="loadNextPage" v-if="currentPage != totalPages">
<button class="page-link" @click="loadNextPageAction" v-if="currentPage != totalPages">
<svg viewBox="64 64 896 896" focusable="false" data-icon="right" width="12px" height="12px" fill="currentColor" aria-hidden="true">
<path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 00302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 000-50.4z"></path>
</svg>
Expand Down
36 changes: 26 additions & 10 deletions lib/lynx_web/templates/page/users.html.heex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
</div>
</div>

<div class="col-12">
<div class="col-12" id="users_list" data-action={Routes.user_path(@conn, :list)}>
<div class="card hp-contact-card mb-32">
<div class="card-body px-0">
<div class="table-responsive">
Expand All @@ -277,37 +277,53 @@
</thead>

<tbody>

<tr v-for="user in users">
<td>
<a href="javascript:;">
<div class="avatar-item avatar-lg d-flex align-items-center justify-content-center bg-primary-4 hp-bg-dark-primary text-primary hp-text-color-dark-0 rounded-circle">
<i class="iconly-Light-TwoUsers"></i>
</div>
</a>
</td>
<td>${user.name}</td>
<td>${user.email}</td>
<td>${user.role}</td>
<td>${user.createdAt}</td>
<td>
<button @click="editUserAction(user.id)" class="btn btn-dashed btn-sm text-black-100 border-black-100 hp-hover-text-color-black-80 hp-hover-border-color-black-80"><%= gettext "Edit" %></button>
<button @click="deleteUserAction(user.id)" class="btn btn-dashed btn-sm text-danger border-danger hp-hover-text-color-danger-2 hp-hover-border-color-danger-2"><%= gettext "Delete" %></button>
</td>
</tr>
<tr v-if="users.length == 0">
<td colspan="6" style="text-align: center;"><%= gettext "No Records Found!" %></td>
</tr>
</tbody>
</table>
</div>

<!--
TODO
<nav>
<ul class="pagination justify-content-end px-32">
<li class="page-item">
<a class="page-link" href="javascript:;">
<button class="page-link" @click="loadPreviousPageAction" v-if="currentPage > 1">
<svg viewBox="64 64 896 896" focusable="false" data-icon="left" width="12px" height="12px" fill="currentColor" aria-hidden="true">
<path d="M724 218.3V141c0-6.7-7.7-10.4-12.9-6.3L260.3 486.8a31.86 31.86 0 000 50.3l450.8 352.1c5.3 4.1 12.9.4 12.9-6.3v-77.3c0-4.9-2.3-9.6-6.1-12.6l-360-281 360-281.1c3.8-3 6.1-7.7 6.1-12.6z"></path>
</svg>
</a>
</button>
</li>

<li class="page-item">
<a class="page-link" href="javascript:;">1</a>
<button class="page-link">${currentPage}</button>
</li>

<li class="page-item">
<a class="page-link" href="javascript:;">
<button class="page-link" @click="loadNextPageAction" v-if="currentPage != totalPages">
<svg viewBox="64 64 896 896" focusable="false" data-icon="right" width="12px" height="12px" fill="currentColor" aria-hidden="true">
<path d="M765.7 486.8L314.9 134.7A7.97 7.97 0 00302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 000-50.4z"></path>
</svg>
</a>
</button>
</li>
</ul>
</nav>
--->
</div>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions lib/lynx_web/views/user_view.ex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ defmodule LynxWeb.UserView do
end

# Render errors
def render("error.json", %{error: error}) do
%{errorMessage: error}
def render("error.json", %{message: message}) do
%{errorMessage: message}
end

# Format user
Expand Down
Loading

0 comments on commit cbbcb89

Please sign in to comment.