Compare commits
4 Commits
a37b45f5b6
...
develop
| Author | SHA1 | Date | |
|---|---|---|---|
| 14637d415a | |||
| c8f46f6c8f | |||
| ed3d9bf52e | |||
| b3cae6e3a9 |
BIN
Binary file not shown.
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
validateDistributionUrl=true
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
|||||||
Vendored
+1
-4
@@ -1,7 +1,7 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
#
|
#
|
||||||
# Copyright © 2015-2021 the original authors.
|
# Copyright © 2015 the original authors.
|
||||||
#
|
#
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
# you may not use this file except in compliance with the License.
|
# you may not use this file except in compliance with the License.
|
||||||
@@ -114,7 +114,6 @@ case "$( uname )" in #(
|
|||||||
NONSTOP* ) nonstop=true ;;
|
NONSTOP* ) nonstop=true ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
CLASSPATH="\\\"\\\""
|
|
||||||
|
|
||||||
|
|
||||||
# Determine the Java command to use to start the JVM.
|
# Determine the Java command to use to start the JVM.
|
||||||
@@ -172,7 +171,6 @@ fi
|
|||||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||||
if "$cygwin" || "$msys" ; then
|
if "$cygwin" || "$msys" ; then
|
||||||
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
||||||
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
|
|
||||||
|
|
||||||
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
||||||
|
|
||||||
@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
|||||||
|
|
||||||
set -- \
|
set -- \
|
||||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||||
-classpath "$CLASSPATH" \
|
|
||||||
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
|
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
|
||||||
"$@"
|
"$@"
|
||||||
|
|
||||||
|
|||||||
Vendored
+1
-2
@@ -70,11 +70,10 @@ goto fail
|
|||||||
:execute
|
:execute
|
||||||
@rem Setup the command line
|
@rem Setup the command line
|
||||||
|
|
||||||
set CLASSPATH=
|
|
||||||
|
|
||||||
|
|
||||||
@rem Execute Gradle
|
@rem Execute Gradle
|
||||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
|
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
|
||||||
|
|
||||||
:end
|
:end
|
||||||
@rem End local scope for the variables with windows NT shell
|
@rem End local scope for the variables with windows NT shell
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
@if (friendsRequest().length > 0) {
|
@if (friendsRequest().length) {
|
||||||
<div class="rounded-xl px-5 m-3 bg-white overflow-auto font-mono border-1 border-gray-300">
|
<div class="rounded-xl px-5 m-3 bg-white overflow-auto font-mono border border-gray-300">
|
||||||
<ion-list>
|
<ion-list>
|
||||||
@for (request of friendsRequest(); track request.userId; let i = $index) {
|
@for (request of friendsRequest(); track request.userId; let i = $index) {
|
||||||
@if (i == friendsRequest().length - 1) {
|
@if (i == friendsRequest().length - 1) {
|
||||||
@@ -37,9 +37,15 @@
|
|||||||
</ion-list>
|
</ion-list>
|
||||||
</div>
|
</div>
|
||||||
} @else {
|
} @else {
|
||||||
<div class="flex justify-center items-center p-4">
|
<ion-item lines="none" class="border border-stone-200 rounded-xl m-3" style="--background: #fafaf8;">
|
||||||
<p class="text-center text-sm italic text-gray-500 font-serif">
|
<div class="flex flex-col items-center w-full px-10 py-20 gap-3">
|
||||||
Vous n'avez aucune demande d'ami
|
<div class="w-10 h-10 rounded-full bg-stone-100 border border-stone-200 flex items-center justify-center">
|
||||||
</p>
|
<ion-icon name="people-outline" style="color:#a8a090; font-size:20px;"></ion-icon>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="text-center">
|
||||||
|
<p class="m-0 text-sm font-medium text-stone-400">Ajoutez vos amis</p>
|
||||||
|
<p class="m-0 mt-1 text-xs text-stone-300 leading-relaxed">Vos demandes d'amis apparaîtront ici</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</ion-item>
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
import {Component, inject} from '@angular/core';
|
import {Component, inject} from '@angular/core';
|
||||||
import {IonicModule, LoadingController, ToastController} from "@ionic/angular";
|
import {IonicModule, LoadingController, ToastController} from "@ionic/angular";
|
||||||
import {checkmarkCircleOutline, closeCircleOutline} from 'ionicons/icons';
|
import {checkmarkCircleOutline, closeCircleOutline, peopleOutline} from 'ionicons/icons';
|
||||||
import {addIcons} from "ionicons";
|
import {addIcons} from "ionicons";
|
||||||
import {PipeComponent} from "../pipe/pipe.component";
|
import {PipeComponent} from "../pipe/pipe.component";
|
||||||
import {FriendsService, GetFriendRequestDto} from "../../services/api";
|
import {FriendsService, GetFriendRequestDto} from "../../services/api";
|
||||||
@@ -9,7 +9,8 @@ import {FriendsStateService} from "../../services/friends-state";
|
|||||||
|
|
||||||
addIcons({
|
addIcons({
|
||||||
'check': checkmarkCircleOutline,
|
'check': checkmarkCircleOutline,
|
||||||
'close': closeCircleOutline
|
'close': closeCircleOutline,
|
||||||
|
'people-outline': peopleOutline
|
||||||
});
|
});
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
@if (friends().length) {
|
@if (friends().length) {
|
||||||
<div class="rounded-xl px-5 m-3 bg-white font-mono border-1 border-gray-300">
|
<div class="rounded-xl px-5 m-3 bg-white font-mono border border-gray-300">
|
||||||
<ion-list>
|
<ion-list>
|
||||||
@for (friend of friends(); track friend.friendId; let i = $index) {
|
@for (friend of friends(); track friend.friendId; let i = $index) {
|
||||||
@if (i == friends().length - 1) {
|
@if (i == friends().length - 1) {
|
||||||
@@ -35,11 +35,17 @@
|
|||||||
</ion-list>
|
</ion-list>
|
||||||
</div>
|
</div>
|
||||||
} @else {
|
} @else {
|
||||||
<div class="flex justify-center items-center p-4">
|
<ion-item lines="none" class="border border-stone-200 rounded-xl m-3" style="--background: #fafaf8;">
|
||||||
<p class="text-center text-sm italic text-gray-500 font-serif">
|
<div class="flex flex-col items-center w-full px-10 py-20 gap-3">
|
||||||
C'est plus marrant à plusieurs, ajoute des amis !
|
<div class="w-10 h-10 rounded-full bg-stone-100 border border-stone-200 flex items-center justify-center">
|
||||||
</p>
|
<ion-icon name="people" style="color:#a8a090; font-size:20px;"></ion-icon>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="text-center">
|
||||||
|
<p class="m-0 text-sm font-medium text-stone-400">Ajoutez vos amis</p>
|
||||||
|
<p class="m-0 mt-1 text-xs text-stone-300 leading-relaxed">Vos amis apparaîtront ici</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</ion-item>
|
||||||
}
|
}
|
||||||
|
|
||||||
<ion-modal [isOpen]="isModalOpen">
|
<ion-modal [isOpen]="isModalOpen">
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import {Component, inject, OnInit, signal} from '@angular/core';
|
import {Component, inject, signal} from '@angular/core';
|
||||||
import {IonicModule, LoadingController, ToastController} from "@ionic/angular";
|
import {IonicModule, LoadingController, ToastController} from "@ionic/angular";
|
||||||
import {closeCircleOutline} from 'ionicons/icons';
|
import {closeCircleOutline, peopleOutline} from 'ionicons/icons';
|
||||||
import {addIcons} from "ionicons";
|
import {addIcons} from "ionicons";
|
||||||
import {FriendsService, GetUserDto, UsersService} from "../../services/api";
|
import {FriendsService, GetUserDto, UsersService} from "../../services/api";
|
||||||
import {firstValueFrom} from "rxjs";
|
import {firstValueFrom} from "rxjs";
|
||||||
@@ -9,6 +9,7 @@ import {GenericUserInfoComponent} from "../generic-user-info/generic-user-info.c
|
|||||||
|
|
||||||
addIcons({
|
addIcons({
|
||||||
'close': closeCircleOutline,
|
'close': closeCircleOutline,
|
||||||
|
'people': peopleOutline
|
||||||
});
|
});
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
<div class="bg-white rounded-lg p-2 shadow-sm border border-gray-200 overflow-scroll max-h-full">
|
<div class="bg-white rounded-lg p-2 shadow-sm border border-gray-200 overflow-scroll max-h-full">
|
||||||
<div class="grid grid-cols-4 gap-3">
|
<div class="grid grid-cols-4 gap-3">
|
||||||
@for (p of proofs(); track p) {
|
@for (p of proofs(); track p) {
|
||||||
<img [src]="'data:image/jpeg;base64,' + p.proof"
|
<img [src]="p.proof"
|
||||||
class="w-20 h-20 object-cover"
|
class="w-20 h-20 object-cover"
|
||||||
alt=""
|
alt=""
|
||||||
(click)="openProof(p.proof)"
|
(click)="openProof(p.proof)"
|
||||||
@@ -18,7 +18,7 @@
|
|||||||
<ion-icon name="close-circle-outline"></ion-icon>
|
<ion-icon name="close-circle-outline"></ion-icon>
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<img [src]="'data:image/jpeg;base64,' + selectedProof()"
|
<img [src]="selectedProof()"
|
||||||
class="w-[90%] h-[90%] object-cover rounded-md mt-10"
|
class="w-[90%] h-[90%] object-cover rounded-md mt-10"
|
||||||
alt=""
|
alt=""
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -19,7 +19,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="aspect-square overflow-hidden p-1">
|
<div class="aspect-square overflow-hidden p-1">
|
||||||
<img [src]="'data:image/jpeg;base64,' + post.proof"
|
<img [src]="post.proof"
|
||||||
alt=""
|
alt=""
|
||||||
class="w-full h-full object-cover"/>
|
class="w-full h-full object-cover"/>
|
||||||
</div>
|
</div>
|
||||||
@@ -54,7 +54,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="aspect-square overflow-hidden p-1">
|
<div class="aspect-square overflow-hidden p-1">
|
||||||
<img [src]="'data:image/jpeg;base64,' + post.proof"
|
<img [src]="post.proof"
|
||||||
alt=""
|
alt=""
|
||||||
class="w-full h-full object-cover"/>
|
class="w-full h-full object-cover"/>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user