Skip to content

Commit

Permalink
Merge pull request #233 from unb-mds/consertar-erros
Browse files Browse the repository at this point in the history
fix(geral): corrige erros gerais de arquivos e componentes
  • Loading branch information
TiagoBalieiro authored Feb 14, 2025
2 parents 3540cb1 + 4d1c3aa commit cb0af7c
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 6 deletions.
7 changes: 3 additions & 4 deletions API/users/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@
path("auth/user/", UserDetailView.as_view(), name="useer-detail"),
path("test-user/", TestUserView.as_view(), name="test_user"),
path("users/", UserListView.as_view(), name="user-list"),
path(
"users/<int:user_id>/", UserListView.as_view(), name="user-detail"
),
# Implementação futura sobre matchs path("items/<int:item_id>/matches/", MatchItemViewSet.as_view(), name="item-matches"),
path("users/<int:user_id>/", UserListView.as_view(), name="user-detail"),
# Implementação futura sobre matchs path("items/<int:item_id>/matches/",
# MatchItemViewSet.as_view(), name="item-matches"),
]
9 changes: 9 additions & 0 deletions web/src/assets/main.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/* Configuração global de fontes /
body {
font-family: "Inter", sans-serif;
}
/ @import "./base.css"; */
@tailwind base;
@tailwind components;
@tailwind utilities;
2 changes: 1 addition & 1 deletion web/src/components/Empty-State-User.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</template>

<script setup>
import box from "@/assets/icons/found-and-lost-box.jpg";
import box from "@/assets/icons/box.svg";
defineProps({
message: String,
Expand Down
3 changes: 2 additions & 1 deletion web/src/views/ListItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@
</div>

<button
v-if="currentUser.id != item.user_id"
class="bg-laranja text-white w-full md:w-[70%] lg:w-[40%] font-medium py-4 rounded-full hover:scale-110 transition-transform duration-300 text-center text-lg lg:text-xl"
@click="handleChat"
>
Expand Down Expand Up @@ -286,7 +287,7 @@ const handleChat = async () => {
}
} catch (error) {
console.error("Erro ao criar/aceder chat:", error.response?.data || error.message);
alertMessage.value = "Erro ao excluir item.";
alertMessage.value = "Erro ao criar chat.";
submitError.value = true;
}
};
Expand Down

0 comments on commit cb0af7c

Please sign in to comment.