eightequal/AstralRinth
1
0
Fork 0
forked from didirus/AstralRinth
Code Pull Requests Activity

fix intellij proj

Browse Source
This commit is contained in:
Jai A
2024-12-11 20:45:38 -08:00
parent 381cbe837b
commit 10ef25eabb
4 changed files with 14 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
.idea/daedalus.iml generated
View File

@@ -1,20 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/daedalus_client_new/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/apps/daedalus_client/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/packages/daedalus/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/apps/app-playground/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/apps/app/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/apps/labrinth/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/apps/labrinth/tests" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/packages/app-lib/src" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

2
.idea/modules.xml generated
View File

@@ -2,7 +2,7 @@
<project version="4"> <project version="4">
<component name="ProjectModuleManager"> <component name="ProjectModuleManager">
<modules> <modules>
<module fileurl="file://$PROJECT_DIR$/.idea/daedalus.iml" filepath="$PROJECT_DIR$/.idea/daedalus.iml" /> <module fileurl="file://$PROJECT_DIR$/.idea/code.iml" filepath="$PROJECT_DIR$/.idea/code.iml" />
</modules> </modules>
</component> </component>
</project> </project>

11
apps/app-frontend/src/components/ui/friends/FriendsList.vue
View File

@@ -157,20 +157,19 @@ const unlisten = await friend_listener(() => loadFriends())
onUnmounted(() => { onUnmounted(() => {
unlisten() unlisten()
}) })
// TODO: Remove friends menu
</script> </script>
<template> <template>
<NewModal ref="manageFriendsModal" header="Manage friends"> <NewModal ref="manageFriendsModal" header="Manage friends">
<p v-if="acceptedFriends.length === 0">You have no friends :C</p> <p v-if="acceptedFriends.length === 0">You have no friends :C</p>
<div v-else class="flex flex-col gap-4"> <div v-else class="flex flex-col gap-4 min-w-[20rem]">
<input type="text" placeholder="Search friends..." class="w-full" /> <input v-model="search" type="text" placeholder="Search friends..." class="w-full" />
<div <div
v-for="friend in acceptedFriends.filter((x) => v-for="friend in acceptedFriends.filter(
x.username.toLowerCase().includes(search.value), (x) => !search || x.username.toLowerCase().includes(search),
)" )"
:key="friend.username" :key="friend.username"
class="flex gap-2 items-center min-w-[20rem]" class="flex gap-2 items-center"
> >
<div class="relative"> <div class="relative">
<Avatar :src="friend.avatar" class="w-12 h-12 rounded-full" size="2.25rem" circle /> <Avatar :src="friend.avatar" class="w-12 h-12 rounded-full" size="2.25rem" circle />

7
packages/app-lib/src/state/friends.rs
View File

@@ -206,6 +206,13 @@ impl FriendsSocket {
tokio::task::spawn(async move { tokio::task::spawn(async move {
let res = async { let res = async {
let state = crate::State::get().await?; let state = crate::State::get().await?;
{
if state.friends_socket.write.lock().await.is_some() {
return Ok(());
}
}
state state
.friends_socket .friends_socket
.connect( .connect(