Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
  jmartinandCursor
|
8829e8c4f9 | ||
|
jmartinandCursor
|
c784de8198 |
@@ -1,6 +1,4 @@
|
||||
import { Module } from '@nestjs/common';
|
||||
import { ConfigModule, ConfigService } from '@nestjs/config';
|
||||
import { JwtModule } from '@nestjs/jwt';
|
||||
import { TypeOrmModule } from '@nestjs/typeorm';
|
||||
import { AbsencesGarde } from 'src/entities/absences_garde.entity';
|
||||
import { AmChildren } from 'src/entities/am_children.entity';
|
||||
@@ -11,14 +9,6 @@ import { AbsencesGardeService } from './absences-garde.service';
|
||||
@Module({
|
||||
imports: [
|
||||
TypeOrmModule.forFeature([AbsencesGarde, AmChildren, ParentsChildren]),
|
||||
JwtModule.registerAsync({
|
||||
imports: [ConfigModule],
|
||||
useFactory: (config: ConfigService) => ({
|
||||
secret: config.get('jwt.accessSecret'),
|
||||
signOptions: { expiresIn: config.get('jwt.accessExpiresIn') },
|
||||
}),
|
||||
inject: [ConfigService],
|
||||
}),
|
||||
],
|
||||
controllers: [AbsencesGardeController],
|
||||
providers: [AbsencesGardeService],
|
||||
|
||||
@@ -1,94 +0,0 @@
|
||||
import {
|
||||
Controller,
|
||||
Get,
|
||||
Headers,
|
||||
MessageEvent,
|
||||
Query,
|
||||
Sse,
|
||||
UnauthorizedException,
|
||||
UseGuards,
|
||||
} from '@nestjs/common';
|
||||
import {
|
||||
ApiBearerAuth,
|
||||
ApiOperation,
|
||||
ApiQuery,
|
||||
ApiTags,
|
||||
} from '@nestjs/swagger';
|
||||
import { ConfigService } from '@nestjs/config';
|
||||
import { JwtService } from '@nestjs/jwt';
|
||||
import { Observable } from 'rxjs';
|
||||
import { AuthGuard } from 'src/common/guards/auth.guard';
|
||||
import { RolesGuard } from 'src/common/guards/roles.guard';
|
||||
import { Roles } from 'src/common/decorators/roles.decorator';
|
||||
import { Public } from 'src/common/decorators/public.decorator';
|
||||
import { User } from 'src/common/decorators/user.decorator';
|
||||
import { RoleType } from 'src/entities/users.entity';
|
||||
import { CardsRealtimeService } from './cards-realtime.service';
|
||||
|
||||
/**
|
||||
* SSE Cartes — #195
|
||||
* Auth : Bearer (recommandé) ou `?access_token=` (EventSource navigateur).
|
||||
*/
|
||||
@ApiTags('Cartes')
|
||||
@Controller('cards')
|
||||
export class CardsRealtimeController {
|
||||
constructor(
|
||||
private readonly realtime: CardsRealtimeService,
|
||||
private readonly jwtService: JwtService,
|
||||
private readonly configService: ConfigService,
|
||||
) {}
|
||||
|
||||
@Sse('stream')
|
||||
@Public()
|
||||
@ApiOperation({
|
||||
summary: 'Flux SSE bulles (card.created|updated|deleted, response.added) — #195',
|
||||
})
|
||||
@ApiQuery({
|
||||
name: 'access_token',
|
||||
required: false,
|
||||
description: 'JWT si pas de header Authorization (EventSource)',
|
||||
})
|
||||
@ApiBearerAuth('access-token')
|
||||
async stream(
|
||||
@Headers('authorization') authorization?: string,
|
||||
@Query('access_token') accessToken?: string,
|
||||
): Promise<Observable<MessageEvent>> {
|
||||
const userId = await this.resolveUserId(authorization, accessToken);
|
||||
return this.realtime.streamFor(userId);
|
||||
}
|
||||
|
||||
/** Variante gardée (clients qui envoient Bearer correctement). */
|
||||
@Get('stream/info')
|
||||
@UseGuards(AuthGuard, RolesGuard)
|
||||
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
|
||||
@ApiBearerAuth('access-token')
|
||||
@ApiOperation({ summary: 'Debug : abonnés SSE pour mon user — #195' })
|
||||
info(@User('id') userId: string) {
|
||||
return {
|
||||
user_id: userId,
|
||||
subscribers: this.realtime.subscriberCount(userId),
|
||||
};
|
||||
}
|
||||
|
||||
private async resolveUserId(
|
||||
authorization?: string,
|
||||
accessToken?: string,
|
||||
): Promise<string> {
|
||||
let token = accessToken?.trim();
|
||||
if (!token && authorization?.startsWith('Bearer ')) {
|
||||
token = authorization.slice(7).trim();
|
||||
}
|
||||
if (!token) {
|
||||
throw new UnauthorizedException('Token manquant (Bearer ou access_token)');
|
||||
}
|
||||
try {
|
||||
const payload = await this.jwtService.verifyAsync<{ sub: string }>(token, {
|
||||
secret: this.configService.get<string>('jwt.accessSecret'),
|
||||
});
|
||||
if (!payload?.sub) throw new UnauthorizedException('Token invalide');
|
||||
return payload.sub;
|
||||
} catch {
|
||||
throw new UnauthorizedException('Token invalide ou expiré');
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,47 +0,0 @@
|
||||
import { MessageEvent } from '@nestjs/common';
|
||||
import { CardsRealtimeService } from './cards-realtime.service';
|
||||
|
||||
describe('CardsRealtimeService (#195)', () => {
|
||||
let service: CardsRealtimeService;
|
||||
|
||||
beforeEach(() => {
|
||||
service = new CardsRealtimeService();
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
service.onModuleDestroy();
|
||||
});
|
||||
|
||||
it('émet card.created aux abonnés du user', async () => {
|
||||
const events: MessageEvent[] = [];
|
||||
const sub = service.streamFor('user-a').subscribe((e) => events.push(e));
|
||||
|
||||
await new Promise((r) => setTimeout(r, 20));
|
||||
expect(events[0]?.type).toBe('heartbeat');
|
||||
expect(service.subscriberCount('user-a')).toBe(1);
|
||||
|
||||
service.emitToUsers(['user-a', 'user-b'], 'card.created', 'card-1', {
|
||||
id: 'card-1',
|
||||
});
|
||||
await new Promise((r) => setTimeout(r, 20));
|
||||
|
||||
const created = events.find((e) => e.type === 'card.created');
|
||||
expect(created).toBeDefined();
|
||||
expect((created!.data as { card_id: string }).card_id).toBe('card-1');
|
||||
expect(service.subscriberCount('user-b')).toBe(0);
|
||||
|
||||
sub.unsubscribe();
|
||||
expect(service.subscriberCount('user-a')).toBe(0);
|
||||
});
|
||||
|
||||
it('ne diffuse pas aux users non abonnés', async () => {
|
||||
const events: MessageEvent[] = [];
|
||||
const sub = service.streamFor('user-a').subscribe((e) => events.push(e));
|
||||
await new Promise((r) => setTimeout(r, 20));
|
||||
const before = events.length;
|
||||
service.emitToUsers(['user-b'], 'card.updated', 'x');
|
||||
await new Promise((r) => setTimeout(r, 20));
|
||||
expect(events.length).toBe(before);
|
||||
sub.unsubscribe();
|
||||
});
|
||||
});
|
||||
@@ -1,111 +0,0 @@
|
||||
import { Injectable, MessageEvent, OnModuleDestroy } from '@nestjs/common';
|
||||
import { Observable, Subject, interval, merge, takeUntil } from 'rxjs';
|
||||
import { map } from 'rxjs/operators';
|
||||
|
||||
export type CardRealtimeEventType =
|
||||
| 'card.created'
|
||||
| 'card.updated'
|
||||
| 'card.deleted'
|
||||
| 'response.added'
|
||||
| 'heartbeat';
|
||||
|
||||
export interface CardRealtimePayload {
|
||||
event: CardRealtimeEventType;
|
||||
card_id?: string;
|
||||
data?: unknown;
|
||||
at: string;
|
||||
}
|
||||
|
||||
/**
|
||||
* Bus SSE in-memory par utilisateur (V1 mono-instance).
|
||||
* Rooms = userId (audience carte).
|
||||
*/
|
||||
@Injectable()
|
||||
export class CardsRealtimeService implements OnModuleDestroy {
|
||||
private readonly byUser = new Map<string, Set<Subject<CardRealtimePayload>>>();
|
||||
private readonly destroy$ = new Subject<void>();
|
||||
|
||||
onModuleDestroy(): void {
|
||||
this.destroy$.next();
|
||||
this.destroy$.complete();
|
||||
for (const set of this.byUser.values()) {
|
||||
for (const s of set) s.complete();
|
||||
}
|
||||
this.byUser.clear();
|
||||
}
|
||||
|
||||
/** Flux SSE pour un utilisateur authentifié. */
|
||||
streamFor(userId: string): Observable<MessageEvent> {
|
||||
const subject = new Subject<CardRealtimePayload>();
|
||||
let set = this.byUser.get(userId);
|
||||
if (!set) {
|
||||
set = new Set();
|
||||
this.byUser.set(userId, set);
|
||||
}
|
||||
set.add(subject);
|
||||
|
||||
const heartbeat$ = interval(25_000).pipe(
|
||||
map(
|
||||
(): CardRealtimePayload => ({
|
||||
event: 'heartbeat',
|
||||
at: new Date().toISOString(),
|
||||
}),
|
||||
),
|
||||
);
|
||||
|
||||
return new Observable<MessageEvent>((observer) => {
|
||||
const sub = merge(subject, heartbeat$)
|
||||
.pipe(takeUntil(this.destroy$))
|
||||
.subscribe({
|
||||
next: (payload) =>
|
||||
observer.next({
|
||||
type: payload.event,
|
||||
data: payload,
|
||||
} as MessageEvent),
|
||||
error: (err) => observer.error(err),
|
||||
complete: () => observer.complete(),
|
||||
});
|
||||
|
||||
// ping initial
|
||||
subject.next({
|
||||
event: 'heartbeat',
|
||||
at: new Date().toISOString(),
|
||||
});
|
||||
|
||||
return () => {
|
||||
sub.unsubscribe();
|
||||
set!.delete(subject);
|
||||
subject.complete();
|
||||
if (set!.size === 0) this.byUser.delete(userId);
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
emitToUsers(
|
||||
userIds: string[],
|
||||
event: Exclude<CardRealtimeEventType, 'heartbeat'>,
|
||||
cardId: string | undefined,
|
||||
data?: unknown,
|
||||
): void {
|
||||
const unique = [...new Set(userIds.filter(Boolean))];
|
||||
const payload: CardRealtimePayload = {
|
||||
event,
|
||||
card_id: cardId,
|
||||
data,
|
||||
at: new Date().toISOString(),
|
||||
};
|
||||
for (const uid of unique) {
|
||||
const set = this.byUser.get(uid);
|
||||
if (!set) continue;
|
||||
for (const s of set) s.next(payload);
|
||||
}
|
||||
}
|
||||
|
||||
/** Test / debug : nombre d’abonnés actifs. */
|
||||
subscriberCount(userId?: string): number {
|
||||
if (userId) return this.byUser.get(userId)?.size ?? 0;
|
||||
let n = 0;
|
||||
for (const s of this.byUser.values()) n += s.size;
|
||||
return n;
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,4 @@
|
||||
import { Module } from '@nestjs/common';
|
||||
import { ConfigModule, ConfigService } from '@nestjs/config';
|
||||
import { JwtModule } from '@nestjs/jwt';
|
||||
import { TypeOrmModule } from '@nestjs/typeorm';
|
||||
import { AbsencesGardeModule } from '../absences-garde';
|
||||
import { CardType } from 'src/entities/card_types.entity';
|
||||
@@ -10,9 +8,7 @@ import { CardResponse } from 'src/entities/card_responses.entity';
|
||||
import { AmChildren } from 'src/entities/am_children.entity';
|
||||
import { ParentsChildren } from 'src/entities/parents_children.entity';
|
||||
import { CardsController } from './cards.controller';
|
||||
import { CardsRealtimeController } from './cards-realtime.controller';
|
||||
import { CardsService } from './cards.service';
|
||||
import { CardsRealtimeService } from './cards-realtime.service';
|
||||
|
||||
@Module({
|
||||
imports: [
|
||||
@@ -25,17 +21,9 @@ import { CardsRealtimeService } from './cards-realtime.service';
|
||||
AmChildren,
|
||||
ParentsChildren,
|
||||
]),
|
||||
JwtModule.registerAsync({
|
||||
imports: [ConfigModule],
|
||||
useFactory: (config: ConfigService) => ({
|
||||
secret: config.get('jwt.accessSecret'),
|
||||
signOptions: { expiresIn: config.get('jwt.accessExpiresIn') },
|
||||
}),
|
||||
inject: [ConfigService],
|
||||
}),
|
||||
],
|
||||
controllers: [CardsController, CardsRealtimeController],
|
||||
providers: [CardsService, CardsRealtimeService],
|
||||
exports: [CardsService, CardsRealtimeService],
|
||||
controllers: [CardsController],
|
||||
providers: [CardsService],
|
||||
exports: [CardsService],
|
||||
})
|
||||
export class CardsModule {}
|
||||
|
||||
@@ -2,7 +2,6 @@ import { Test, TestingModule } from '@nestjs/testing';
|
||||
import { getRepositoryToken } from '@nestjs/typeorm';
|
||||
import { ForbiddenException } from '@nestjs/common';
|
||||
import { CardsService } from './cards.service';
|
||||
import { CardsRealtimeService } from './cards-realtime.service';
|
||||
import { AbsencesGardeService } from '../absences-garde/absences-garde.service';
|
||||
import { CardType, CardResponseModeType } from 'src/entities/card_types.entity';
|
||||
import {
|
||||
@@ -33,7 +32,6 @@ describe('CardsService (#194)', () => {
|
||||
create: jest.fn((x) => x),
|
||||
save: jest.fn(),
|
||||
findOne: jest.fn(),
|
||||
find: jest.fn(),
|
||||
};
|
||||
const responsesRepo = {
|
||||
create: jest.fn((x) => x),
|
||||
@@ -46,7 +44,6 @@ describe('CardsService (#194)', () => {
|
||||
maj: jest.fn(),
|
||||
supprimer: jest.fn(),
|
||||
};
|
||||
const realtime = { emitToUsers: jest.fn() };
|
||||
|
||||
beforeEach(async () => {
|
||||
const module: TestingModule = await Test.createTestingModule({
|
||||
@@ -59,7 +56,6 @@ describe('CardsService (#194)', () => {
|
||||
{ provide: getRepositoryToken(AmChildren), useValue: amChildrenRepo },
|
||||
{ provide: getRepositoryToken(ParentsChildren), useValue: parentsChildrenRepo },
|
||||
{ provide: AbsencesGardeService, useValue: absencesService },
|
||||
{ provide: CardsRealtimeService, useValue: realtime },
|
||||
],
|
||||
}).compile();
|
||||
service = module.get(CardsService);
|
||||
@@ -116,11 +112,7 @@ describe('CardsService (#194)', () => {
|
||||
retention_days: 14,
|
||||
},
|
||||
responses: [],
|
||||
audience: [
|
||||
{ id_utilisateur: 'am-1' },
|
||||
{ id_utilisateur: 'p-1' },
|
||||
{ id_utilisateur: 'p-2' },
|
||||
],
|
||||
audience: [],
|
||||
});
|
||||
|
||||
const res = await service.creer('am-1', RoleType.ASSISTANTE_MATERNELLE, {
|
||||
@@ -132,12 +124,6 @@ describe('CardsService (#194)', () => {
|
||||
|
||||
expect(absencesService.creer).toHaveBeenCalled();
|
||||
expect(audienceRepo.save).toHaveBeenCalled();
|
||||
expect(realtime.emitToUsers).toHaveBeenCalledWith(
|
||||
['am-1', 'p-1', 'p-2'],
|
||||
'card.created',
|
||||
'card-1',
|
||||
expect.any(Object),
|
||||
);
|
||||
expect(res.type_code).toBe('conge_am');
|
||||
expect(res.statut).toBe(CardInstanceStatutType.OUVERTE);
|
||||
});
|
||||
|
||||
@@ -32,7 +32,6 @@ import {
|
||||
MajCarteDto,
|
||||
RepondreCarteDto,
|
||||
} from './dto/cards.dto';
|
||||
import { CardsRealtimeService } from './cards-realtime.service';
|
||||
|
||||
@Injectable()
|
||||
export class CardsService {
|
||||
@@ -50,7 +49,6 @@ export class CardsService {
|
||||
@InjectRepository(ParentsChildren)
|
||||
private readonly parentsChildrenRepo: Repository<ParentsChildren>,
|
||||
private readonly absencesService: AbsencesGardeService,
|
||||
private readonly realtime: CardsRealtimeService,
|
||||
) {}
|
||||
|
||||
async listerTypes(role: RoleType): Promise<CardType[]> {
|
||||
@@ -166,9 +164,7 @@ export class CardsService {
|
||||
await this.buildAudience(saved, type, placement, userId, role);
|
||||
|
||||
const full = await this.loadCard(saved.id);
|
||||
const dtoOut = this.toDto(full, userId);
|
||||
this.emitAudience(full, 'card.created', dtoOut);
|
||||
return dtoOut;
|
||||
return this.toDto(full, userId);
|
||||
}
|
||||
|
||||
async repondre(
|
||||
@@ -232,14 +228,7 @@ export class CardsService {
|
||||
|
||||
card.purge_at = this.purgeAt(card.type.retention_days, card.statut);
|
||||
await this.cardsRepo.save(card);
|
||||
const full = await this.loadCard(cardId);
|
||||
const dtoOut = this.toDto(full, userId);
|
||||
this.emitAudience(full, 'response.added', {
|
||||
action: dto.action,
|
||||
card: dtoOut,
|
||||
});
|
||||
this.emitAudience(full, 'card.updated', dtoOut);
|
||||
return dtoOut;
|
||||
return this.toDto(await this.loadCard(cardId), userId);
|
||||
}
|
||||
|
||||
async majEnAttente(
|
||||
@@ -284,10 +273,7 @@ export class CardsService {
|
||||
card.statut = CardInstanceStatutType.OUVERTE;
|
||||
card.purge_at = this.purgeAt(card.type.retention_days, card.statut);
|
||||
await this.cardsRepo.save(card);
|
||||
const full = await this.loadCard(cardId);
|
||||
const dtoOut = this.toDto(full, userId);
|
||||
this.emitAudience(full, 'card.updated', dtoOut);
|
||||
return dtoOut;
|
||||
return this.toDto(await this.loadCard(cardId), userId);
|
||||
}
|
||||
|
||||
async supprimer(
|
||||
@@ -299,7 +285,6 @@ export class CardsService {
|
||||
if (card.cree_par !== userId) {
|
||||
throw new ForbiddenException('Seul le créateur peut supprimer cette carte');
|
||||
}
|
||||
const audienceIds = await this.audienceUserIds(card);
|
||||
if (card.id_absence) {
|
||||
const absStatut =
|
||||
card.statut === CardInstanceStatutType.TRAITEE
|
||||
@@ -315,27 +300,6 @@ export class CardsService {
|
||||
void absStatut;
|
||||
}
|
||||
await this.cardsRepo.delete({ id: cardId });
|
||||
this.realtime.emitToUsers(audienceIds, 'card.deleted', cardId, {
|
||||
id: cardId,
|
||||
});
|
||||
}
|
||||
|
||||
private emitAudience(
|
||||
card: CardInstance,
|
||||
event: 'card.created' | 'card.updated' | 'response.added',
|
||||
data: unknown,
|
||||
): void {
|
||||
const ids = (card.audience ?? []).map((a) => a.id_utilisateur);
|
||||
if (ids.length === 0) return;
|
||||
this.realtime.emitToUsers(ids, event, card.id, data);
|
||||
}
|
||||
|
||||
private async audienceUserIds(card: CardInstance): Promise<string[]> {
|
||||
if (card.audience?.length) {
|
||||
return card.audience.map((a) => a.id_utilisateur);
|
||||
}
|
||||
const rows = await this.audienceRepo.find({ where: { id_card: card.id } });
|
||||
return rows.map((r) => r.id_utilisateur);
|
||||
}
|
||||
|
||||
private mapAbsenceType(typeCode: string): TypeAbsenceGardeType {
|
||||
|
||||
@@ -1,3 +1,2 @@
|
||||
export { CardsModule } from './cards.module';
|
||||
export { CardsService } from './cards.service';
|
||||
export { CardsRealtimeService } from './cards-realtime.service';
|
||||
|
||||
@@ -107,7 +107,7 @@ Liste des enfants / foyers pour l’AM + contexte courant (symétrique A3).
|
||||
| BDD | Table `absences_garde` + drop `evenements` |
|
||||
| API | CRUD + **GET liste** (`placementId` \| tous les placements du user) |
|
||||
| Cartes SYSTEM | Module `cards/` types S1–S3 (sans sondages V1) |
|
||||
| Realtime | WS/SSE bulles → **SSE** `GET /cards/stream` (#195) |
|
||||
| Realtime | WS/SSE bulles |
|
||||
| Purge TTL | Job `expire_at` / `purge_at` |
|
||||
|
||||
### Front (après API — hors chantier back immédiat)
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<application
|
||||
android:label="p_tits_pas"
|
||||
android:name="${applicationName}"
|
||||
android:icon="@mipmap/launcher_icon">
|
||||
android:icon="@mipmap/ic_launcher">
|
||||
<activity
|
||||
android:name=".MainActivity"
|
||||
android:exported="true"
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 5.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 8.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 17 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 28 KiB |
@@ -1,58 +0,0 @@
|
||||
class AbsenceGarde {
|
||||
final String id;
|
||||
final String idPlacement;
|
||||
final String type;
|
||||
final String dateDebut;
|
||||
final String dateFin;
|
||||
final String statut;
|
||||
final String expireAt;
|
||||
final String? creePar;
|
||||
final String? motif;
|
||||
final String? idEnfant;
|
||||
final String? prenomEnfant;
|
||||
final String? idAm;
|
||||
final String? prenomAm;
|
||||
final String? nomAm;
|
||||
final String creeLe;
|
||||
final String modifieLe;
|
||||
|
||||
AbsenceGarde({
|
||||
required this.id,
|
||||
required this.idPlacement,
|
||||
required this.type,
|
||||
required this.dateDebut,
|
||||
required this.dateFin,
|
||||
required this.statut,
|
||||
required this.expireAt,
|
||||
this.creePar,
|
||||
this.motif,
|
||||
this.idEnfant,
|
||||
this.prenomEnfant,
|
||||
this.idAm,
|
||||
this.prenomAm,
|
||||
this.nomAm,
|
||||
required this.creeLe,
|
||||
required this.modifieLe,
|
||||
});
|
||||
|
||||
factory AbsenceGarde.fromJson(Map<String, dynamic> json) {
|
||||
return AbsenceGarde(
|
||||
id: json['id'] ?? '',
|
||||
idPlacement: json['id_placement'] ?? '',
|
||||
type: json['type'] ?? '',
|
||||
dateDebut: json['date_debut'] ?? '',
|
||||
dateFin: json['date_fin'] ?? '',
|
||||
statut: json['statut'] ?? '',
|
||||
expireAt: json['expire_at'] ?? '',
|
||||
creePar: json['cree_par'],
|
||||
motif: json['motif'],
|
||||
idEnfant: json['id_enfant'],
|
||||
prenomEnfant: json['prenom_enfant'],
|
||||
idAm: json['id_am'],
|
||||
prenomAm: json['prenom_am'],
|
||||
nomAm: json['nom_am'],
|
||||
creeLe: json['cree_le'] ?? '',
|
||||
modifieLe: json['modifie_le'] ?? '',
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -1,12 +1,11 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:p_tits_pas/models/user.dart';
|
||||
import 'package:p_tits_pas/services/auth_service.dart';
|
||||
import 'package:p_tits_pas/widgets/quotidien/quotidien_shell.dart';
|
||||
import 'package:p_tits_pas/widgets/quotidien/quotidien_theme.dart';
|
||||
import 'package:p_tits_pas/widgets/app_footer.dart';
|
||||
import 'package:p_tits_pas/widgets/dashboard/dashboard_bandeau.dart';
|
||||
|
||||
/// Dashboard assistante maternelle – coquille 3 colonnes quotidien (#169).
|
||||
/// Colonne gauche : sélecteur de couple enfant–parent(s) (à venir #170).
|
||||
/// Métier cartes / blog / messagerie : tickets C/D/E.
|
||||
/// Dashboard assistante maternelle – page blanche avec bandeau générique.
|
||||
/// Contenu détaillé à venir.
|
||||
class AmDashboardScreen extends StatefulWidget {
|
||||
const AmDashboardScreen({super.key});
|
||||
|
||||
@@ -15,7 +14,7 @@ class AmDashboardScreen extends StatefulWidget {
|
||||
}
|
||||
|
||||
class _AmDashboardScreenState extends State<AmDashboardScreen> {
|
||||
QuotidienNavSection _section = QuotidienNavSection.liaison;
|
||||
int selectedTabIndex = 0;
|
||||
AppUser? _user;
|
||||
|
||||
@override
|
||||
@@ -29,58 +28,51 @@ class _AmDashboardScreenState extends State<AmDashboardScreen> {
|
||||
if (mounted) setState(() => _user = user);
|
||||
}
|
||||
|
||||
String get _displayName {
|
||||
final n = _user?.fullName.trim() ?? '';
|
||||
if (n.isNotEmpty) return n;
|
||||
final email = _user?.email.trim() ?? '';
|
||||
if (email.isNotEmpty) return email.split('@').first;
|
||||
return 'Assistante maternelle';
|
||||
}
|
||||
|
||||
void _soon(String label) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(content: Text('$label — à venir')),
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return QuotidienShell(
|
||||
selectedSection: _section,
|
||||
onSectionSelected: (s) => setState(() => _section = s),
|
||||
userDisplayName: _displayName,
|
||||
userEmail: _user?.email,
|
||||
onProfileTap: () => _soon('Profil'),
|
||||
onSettingsTap: () => _soon('Paramètres'),
|
||||
// L'AM n'a pas de bouton "Recherche AM" dans le bandeau
|
||||
onSearchAmTap: null,
|
||||
leftColumn: const QuotidienColumnPlaceholder(
|
||||
title: 'Cartes',
|
||||
subtitle:
|
||||
'Couple enfant–parent(s) et flux de cartes\n(à brancher — tickets #170 / #174).',
|
||||
icon: Icons.style_outlined,
|
||||
return Scaffold(
|
||||
appBar: PreferredSize(
|
||||
preferredSize: const Size.fromHeight(60.0),
|
||||
child: DashboardBandeau(
|
||||
tabItems: const [
|
||||
DashboardTabItem(label: 'Mon tableau de bord'),
|
||||
DashboardTabItem(label: 'Paramètres'),
|
||||
],
|
||||
selectedTabIndex: selectedTabIndex,
|
||||
onTabSelected: (index) => setState(() => selectedTabIndex = index),
|
||||
userDisplayName: _user?.fullName.isNotEmpty == true
|
||||
? _user!.fullName
|
||||
: 'Assistante maternelle',
|
||||
userEmail: _user?.email,
|
||||
userRole: _user?.role,
|
||||
onProfileTap: () {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
const SnackBar(
|
||||
content: Text('Modification du profil – à venir')),
|
||||
);
|
||||
},
|
||||
onSettingsTap: () {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
const SnackBar(content: Text('Paramètres – à venir')),
|
||||
);
|
||||
},
|
||||
onLogout: () {},
|
||||
showLogoutConfirmation: true,
|
||||
),
|
||||
),
|
||||
centerColumn: const QuotidienColumnPlaceholder(
|
||||
title: 'Blog',
|
||||
subtitle:
|
||||
'Fil du quotidien (affichage par défaut)\n(à brancher — ticket #179).',
|
||||
icon: Icons.auto_stories_outlined,
|
||||
),
|
||||
rightColumn: const QuotidienColumnPlaceholder(
|
||||
title: 'Messagerie',
|
||||
subtitle:
|
||||
'Mess. Parents · Mess. RPE\n(à brancher — ticket #185).',
|
||||
icon: Icons.chat_bubble_outline,
|
||||
),
|
||||
agendaBody: const QuotidienStubPage(
|
||||
title: 'Agenda',
|
||||
message: 'Agenda — contenu à venir (stub #187).',
|
||||
),
|
||||
contratBody: const QuotidienStubPage(
|
||||
title: 'Contrat',
|
||||
message: 'Contrat — contenu à venir (stub #187).',
|
||||
body: Column(
|
||||
children: [
|
||||
Expanded(
|
||||
child: Center(
|
||||
child: Text(
|
||||
'Dashboard AM – à venir',
|
||||
style: Theme.of(context).textTheme.titleLarge,
|
||||
),
|
||||
),
|
||||
),
|
||||
const AppFooter(),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -6,7 +6,6 @@ import 'package:p_tits_pas/services/couple_garde_service.dart';
|
||||
import 'package:p_tits_pas/widgets/quotidien/couple_selector_bandeau.dart';
|
||||
import 'package:p_tits_pas/widgets/quotidien/quotidien_shell.dart';
|
||||
import 'package:p_tits_pas/widgets/quotidien/quotidien_theme.dart';
|
||||
import 'package:p_tits_pas/screens/home/parent_screen/agenda_absences_stub.dart';
|
||||
|
||||
/// Tableau de bord parent — coquille 3 colonnes quotidien (#166).
|
||||
/// Colonne gauche : sélecteur de couple enfant–nounou (#167).
|
||||
@@ -129,7 +128,10 @@ class _ParentDashboardScreenState extends State<ParentDashboardScreen> {
|
||||
'Mess. AM · Mess. RPE\n(à brancher — ticket #184).',
|
||||
icon: Icons.chat_bubble_outline,
|
||||
),
|
||||
agendaBody: AgendaAbsencesStub(placementId: _selectedCoupleId),
|
||||
agendaBody: const QuotidienStubPage(
|
||||
title: 'Agenda',
|
||||
message: 'Agenda — contenu à venir (stub #187).',
|
||||
),
|
||||
contratBody: const QuotidienStubPage(
|
||||
title: 'Contrat',
|
||||
message: 'Contrat — contenu à venir (stub #187).',
|
||||
|
||||
@@ -1,192 +0,0 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:p_tits_pas/models/absence_garde.dart';
|
||||
import 'package:p_tits_pas/services/api/absences_garde_service.dart';
|
||||
import 'package:p_tits_pas/widgets/quotidien/quotidien_theme.dart';
|
||||
|
||||
class AgendaAbsencesStub extends StatefulWidget {
|
||||
final String? placementId;
|
||||
|
||||
const AgendaAbsencesStub({super.key, this.placementId});
|
||||
|
||||
@override
|
||||
State<AgendaAbsencesStub> createState() => _AgendaAbsencesStubState();
|
||||
}
|
||||
|
||||
class _AgendaAbsencesStubState extends State<AgendaAbsencesStub> {
|
||||
List<AbsenceGarde> _absences = [];
|
||||
bool _loading = true;
|
||||
String? _error;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
_loadAbsences();
|
||||
}
|
||||
|
||||
@override
|
||||
void didUpdateWidget(covariant AgendaAbsencesStub oldWidget) {
|
||||
super.didUpdateWidget(oldWidget);
|
||||
if (oldWidget.placementId != widget.placementId) {
|
||||
_loadAbsences();
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _loadAbsences() async {
|
||||
setState(() {
|
||||
_loading = true;
|
||||
_error = null;
|
||||
});
|
||||
try {
|
||||
final absences = await AbsencesGardeService.getAbsences(
|
||||
placementId: widget.placementId,
|
||||
);
|
||||
if (!mounted) return;
|
||||
setState(() {
|
||||
_absences = absences;
|
||||
_loading = false;
|
||||
});
|
||||
} catch (e) {
|
||||
if (!mounted) return;
|
||||
setState(() {
|
||||
_error = e.toString();
|
||||
_loading = false;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Container(
|
||||
color: QuotidienTheme.ivory,
|
||||
child: Center(
|
||||
child: ConstrainedBox(
|
||||
constraints: const BoxConstraints(maxWidth: 600),
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
const Icon(
|
||||
Icons.calendar_month_outlined,
|
||||
size: 64,
|
||||
color: QuotidienTheme.peach,
|
||||
),
|
||||
const SizedBox(height: 24),
|
||||
Text(
|
||||
"Agenda (Stub) - Lignes d'absence",
|
||||
textAlign: TextAlign.center,
|
||||
style: Theme.of(context).textTheme.headlineSmall?.copyWith(
|
||||
color: QuotidienTheme.ink,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
Text(
|
||||
'ID Placement courant: ${widget.placementId ?? 'Tous'}',
|
||||
textAlign: TextAlign.center,
|
||||
style: const TextStyle(color: QuotidienTheme.muted),
|
||||
),
|
||||
const SizedBox(height: 24),
|
||||
Expanded(
|
||||
child: _buildList(),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildList() {
|
||||
if (_loading) {
|
||||
return const Center(child: CircularProgressIndicator());
|
||||
}
|
||||
if (_error != null) {
|
||||
return Center(
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
const Icon(Icons.error_outline, color: Colors.red, size: 48),
|
||||
const SizedBox(height: 16),
|
||||
Text(_error!, style: const TextStyle(color: Colors.red)),
|
||||
const SizedBox(height: 16),
|
||||
ElevatedButton(
|
||||
onPressed: _loadAbsences,
|
||||
child: const Text('Réessayer'),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
if (_absences.isEmpty) {
|
||||
return const Center(
|
||||
child: Text('Aucune absence ou congé trouvé.',
|
||||
style: TextStyle(color: QuotidienTheme.muted)),
|
||||
);
|
||||
}
|
||||
return ListView.separated(
|
||||
itemCount: _absences.length,
|
||||
separatorBuilder: (_, __) => const Divider(),
|
||||
itemBuilder: (context, index) {
|
||||
final abs = _absences[index];
|
||||
return ListTile(
|
||||
leading: _getIcon(abs.type),
|
||||
title: Text('${abs.type} (${abs.statut})'),
|
||||
subtitle: Text(
|
||||
'Du ${abs.dateDebut} au ${abs.dateFin}\n'
|
||||
'Enfant: ${abs.prenomEnfant ?? 'N/A'}, AM: ${abs.prenomAm ?? 'N/A'}',
|
||||
),
|
||||
trailing: IconButton(
|
||||
icon: const Icon(Icons.delete_outline, color: Colors.red),
|
||||
onPressed: () => _confirmDelete(abs),
|
||||
),
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
Icon _getIcon(String type) {
|
||||
switch (type) {
|
||||
case 'absence_enfant':
|
||||
return const Icon(Icons.child_care, color: QuotidienTheme.coral);
|
||||
case 'conge_am':
|
||||
return const Icon(Icons.beach_access, color: QuotidienTheme.turquoise);
|
||||
case 'arret_maladie_am':
|
||||
return const Icon(Icons.medical_services, color: QuotidienTheme.coral);
|
||||
default:
|
||||
return const Icon(Icons.event);
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _confirmDelete(AbsenceGarde abs) async {
|
||||
final confirm = await showDialog<bool>(
|
||||
context: context,
|
||||
builder: (context) => AlertDialog(
|
||||
title: const Text('Supprimer ?'),
|
||||
content: Text("Supprimer l'absence ${abs.type} du ${abs.dateDebut} ?"),
|
||||
actions: [
|
||||
TextButton(
|
||||
onPressed: () => Navigator.pop(context, false),
|
||||
child: const Text('Annuler'),
|
||||
),
|
||||
TextButton(
|
||||
onPressed: () => Navigator.pop(context, true),
|
||||
style: TextButton.styleFrom(foregroundColor: Colors.red),
|
||||
child: const Text('Supprimer'),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
|
||||
if (confirm == true) {
|
||||
try {
|
||||
await AbsencesGardeService.supprimerAbsence(abs.id);
|
||||
_loadAbsences();
|
||||
} catch (e) {
|
||||
if (!mounted) return;
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(content: Text('Erreur: $e')),
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,94 +0,0 @@
|
||||
import 'dart:convert';
|
||||
import 'package:http/http.dart' as http;
|
||||
import 'package:p_tits_pas/models/absence_garde.dart';
|
||||
import 'package:p_tits_pas/services/api/api_config.dart';
|
||||
import 'package:p_tits_pas/services/api/tokenService.dart';
|
||||
|
||||
class AbsencesGardeService {
|
||||
static Future<List<AbsenceGarde>> getAbsences({String? placementId}) async {
|
||||
final token = await TokenService.getToken();
|
||||
final headers = token != null ? ApiConfig.authHeaders(token) : ApiConfig.headers;
|
||||
|
||||
final uri = Uri.parse(ApiConfig.baseUrl +
|
||||
'/absences-garde' +
|
||||
(placementId != null ? '?placementId=$placementId' : ''));
|
||||
|
||||
final res = await http.get(uri, headers: headers);
|
||||
if (res.statusCode == 200) {
|
||||
final json = jsonDecode(res.body);
|
||||
final List items = json['items'] ?? [];
|
||||
return items.map((e) => AbsenceGarde.fromJson(e)).toList();
|
||||
} else {
|
||||
throw Exception('Erreur de chargement des absences : ${res.statusCode}');
|
||||
}
|
||||
}
|
||||
|
||||
static Future<AbsenceGarde> creerAbsence({
|
||||
required String idPlacement,
|
||||
required String type,
|
||||
required String dateDebut,
|
||||
required String dateFin,
|
||||
String? motif,
|
||||
}) async {
|
||||
final token = await TokenService.getToken();
|
||||
final headers = token != null ? ApiConfig.authHeaders(token) : ApiConfig.headers;
|
||||
|
||||
final uri = Uri.parse('${ApiConfig.baseUrl}/absences-garde');
|
||||
final res = await http.post(
|
||||
uri,
|
||||
headers: headers,
|
||||
body: jsonEncode({
|
||||
'id_placement': idPlacement,
|
||||
'type': type,
|
||||
'date_debut': dateDebut,
|
||||
'date_fin': dateFin,
|
||||
if (motif != null) 'motif': motif,
|
||||
}),
|
||||
);
|
||||
if (res.statusCode == 201) {
|
||||
return AbsenceGarde.fromJson(jsonDecode(res.body));
|
||||
} else {
|
||||
throw Exception("Erreur de création d'absence : ${res.statusCode}");
|
||||
}
|
||||
}
|
||||
|
||||
static Future<AbsenceGarde> modifierAbsence(
|
||||
String id, {
|
||||
String? dateDebut,
|
||||
String? dateFin,
|
||||
String? statut,
|
||||
String? motif,
|
||||
}) async {
|
||||
final token = await TokenService.getToken();
|
||||
final headers = token != null ? ApiConfig.authHeaders(token) : ApiConfig.headers;
|
||||
|
||||
final uri = Uri.parse('${ApiConfig.baseUrl}/absences-garde/$id');
|
||||
final Map<String, dynamic> body = {};
|
||||
if (dateDebut != null) body['date_debut'] = dateDebut;
|
||||
if (dateFin != null) body['date_fin'] = dateFin;
|
||||
if (statut != null) body['statut'] = statut;
|
||||
if (motif != null) body['motif'] = motif;
|
||||
|
||||
final res = await http.patch(
|
||||
uri,
|
||||
headers: headers,
|
||||
body: jsonEncode(body),
|
||||
);
|
||||
if (res.statusCode == 200) {
|
||||
return AbsenceGarde.fromJson(jsonDecode(res.body));
|
||||
} else {
|
||||
throw Exception("Erreur de modification d'absence : ${res.statusCode}");
|
||||
}
|
||||
}
|
||||
|
||||
static Future<void> supprimerAbsence(String id) async {
|
||||
final token = await TokenService.getToken();
|
||||
final headers = token != null ? ApiConfig.authHeaders(token) : ApiConfig.headers;
|
||||
|
||||
final uri = Uri.parse('${ApiConfig.baseUrl}/absences-garde/$id');
|
||||
final res = await http.delete(uri, headers: headers);
|
||||
if (res.statusCode != 204) {
|
||||
throw Exception("Erreur de suppression d'absence : ${res.statusCode}");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -96,8 +96,7 @@ class ApiConfig {
|
||||
};
|
||||
|
||||
static Map<String, String> authHeaders(String token) => {
|
||||
'Content-Type': 'application/json',
|
||||
'Accept': 'application/json',
|
||||
...headers,
|
||||
'Authorization': 'Bearer $token',
|
||||
};
|
||||
}
|
||||
|
||||
@@ -383,13 +383,6 @@ class AuthService {
|
||||
}
|
||||
|
||||
/// Récupère l'utilisateur connecté depuis le cache
|
||||
static const String tokenKey = 'auth_token';
|
||||
|
||||
static Future<String?> getToken() async {
|
||||
final prefs = await SharedPreferences.getInstance();
|
||||
return prefs.getString(tokenKey);
|
||||
}
|
||||
|
||||
static Future<AppUser?> getCurrentUser() async {
|
||||
final prefs = await SharedPreferences.getInstance();
|
||||
final userJson = prefs.getString(_currentUserKey);
|
||||
|
||||
@@ -183,16 +183,15 @@ class _UserMenu extends StatelessWidget {
|
||||
title: Text('Profil'),
|
||||
),
|
||||
),
|
||||
if (onSearchAmTap != null)
|
||||
const PopupMenuItem(
|
||||
value: 'search_am',
|
||||
child: ListTile(
|
||||
dense: true,
|
||||
contentPadding: EdgeInsets.zero,
|
||||
leading: Icon(Icons.search, size: 20),
|
||||
title: Text('Recherche AM'),
|
||||
),
|
||||
const PopupMenuItem(
|
||||
value: 'search_am',
|
||||
child: ListTile(
|
||||
dense: true,
|
||||
contentPadding: EdgeInsets.zero,
|
||||
leading: Icon(Icons.search, size: 20),
|
||||
title: Text('Recherche AM'),
|
||||
),
|
||||
),
|
||||
const PopupMenuItem(
|
||||
value: 'settings',
|
||||
child: ListTile(
|
||||
|
||||
@@ -6,7 +6,6 @@ abstract final class QuotidienTheme {
|
||||
static const Color ink = Color(0xFF2F2F2F);
|
||||
static const Color ivory = Color(0xFFFFFEF9);
|
||||
static const Color turquoise = Color(0xFF8AD0C8);
|
||||
static const Color peach = Color(0xFFFFCCB6);
|
||||
static const Color lavender = Color(0xFFC6A3D8);
|
||||
static const Color coral = Color(0xFFF4A28C);
|
||||
static const Color softGreenPill = Color(0xFFB8D9A8);
|
||||
|
||||
@@ -1,22 +1,6 @@
|
||||
# Generated by pub
|
||||
# See https://dart.dev/tools/pub/glossary#lockfile
|
||||
packages:
|
||||
archive:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: archive
|
||||
sha256: "6c5bcd986e06b94e3c40244af471750840a3d2341d1f9763a1100a14add517b4"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "4.3.0"
|
||||
args:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: args
|
||||
sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.7.0"
|
||||
async:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -41,22 +25,6 @@ packages:
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.4.0"
|
||||
checked_yaml:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: checked_yaml
|
||||
sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.0.3"
|
||||
cli_util:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: cli_util
|
||||
sha256: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.4.2"
|
||||
clock:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -182,14 +150,6 @@ packages:
|
||||
description: flutter
|
||||
source: sdk
|
||||
version: "0.0.0"
|
||||
flutter_launcher_icons:
|
||||
dependency: "direct dev"
|
||||
description:
|
||||
name: flutter_launcher_icons
|
||||
sha256: "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.13.1"
|
||||
flutter_lints:
|
||||
dependency: "direct dev"
|
||||
description:
|
||||
@@ -253,14 +213,6 @@ packages:
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "4.0.2"
|
||||
image:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: image
|
||||
sha256: a1e7f4951e538a568e14b856702afc9ae1d2f4b202daced8d22c1b9cd211ce89
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "4.10.1"
|
||||
image_picker:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
@@ -341,14 +293,6 @@ packages:
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.6.7"
|
||||
json_annotation:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: json_annotation
|
||||
sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "4.9.0"
|
||||
leak_tracker:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -517,14 +461,6 @@ packages:
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.1.8"
|
||||
posix:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: posix
|
||||
sha256: bc1bad54ad2b735816e31f8d4600cfde6c7839975085ddfbca48b6c9f7c4044e
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "6.5.2"
|
||||
provider:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
@@ -786,14 +722,6 @@ packages:
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.1.0"
|
||||
yaml:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: yaml
|
||||
sha256: f67cdd8e07d3c6329146aaef1ba043542b3134c12489f553ca9a7435d1068aea
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "3.1.4"
|
||||
sdks:
|
||||
dart: ">=3.7.0-0 <4.0.0"
|
||||
flutter: ">=3.19.0"
|
||||
|
||||
@@ -30,21 +30,6 @@ dev_dependencies:
|
||||
flutter_test:
|
||||
sdk: flutter
|
||||
flutter_lints: ^2.0.0
|
||||
flutter_launcher_icons: ^0.13.1
|
||||
|
||||
flutter_launcher_icons:
|
||||
android: "launcher_icon"
|
||||
ios: false
|
||||
image_path: "assets/images/icon.png"
|
||||
web:
|
||||
generate: true
|
||||
image_path: "assets/images/icon.png"
|
||||
background_color: "#ffffff"
|
||||
theme_color: "#ffffff"
|
||||
windows:
|
||||
generate: true
|
||||
image_path: "assets/images/icon.png"
|
||||
icon_size: 256
|
||||
|
||||
flutter:
|
||||
uses-material-design: true
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 633 B After Width: | Height: | Size: 917 B |
Binary file not shown.
|
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 5.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 165 KiB After Width: | Height: | Size: 8.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 5.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 165 KiB After Width: | Height: | Size: 20 KiB |
@@ -3,19 +3,19 @@
|
||||
"short_name": "P'titsPas",
|
||||
"start_url": ".",
|
||||
"display": "standalone",
|
||||
"background_color": "#ffffff",
|
||||
"theme_color": "#ffffff",
|
||||
"background_color": "#FFFEF9",
|
||||
"theme_color": "#8AD0C8",
|
||||
"description": "P'titsPas - Grandir pas à pas, sereinement",
|
||||
"orientation": "portrait-primary",
|
||||
"prefer_related_applications": false,
|
||||
"icons": [
|
||||
{
|
||||
"src": "icons/Icon-192.png",
|
||||
"src": "assets/images/icon.png",
|
||||
"sizes": "192x192",
|
||||
"type": "image/png"
|
||||
},
|
||||
{
|
||||
"src": "icons/Icon-512.png",
|
||||
"src": "assets/images/icon.png",
|
||||
"sizes": "512x512",
|
||||
"type": "image/png"
|
||||
},
|
||||
@@ -32,4 +32,4 @@
|
||||
"purpose": "maskable"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 47 KiB After Width: | Height: | Size: 33 KiB |
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user