Skip to content

Commit cab0d8d

Browse files
authored
fix: 오류수정 (#97)
* feat: 온도그래프 화면으로 전환 * feat: 온도그래프 화면으로 전환 * feat: 온도그래프 화면으로 전환 * feat: 온도그래프 화면으로 전환 * feat: 온도그래프 화면으로 전환 * feat: 온도그래프 화면 구현 * feat: 온도그래프 화면 구현 * feat: 온도그래프 화면 구현 * feat: 온도그래프 화면 구현 * feat: 온도그래프 화면 구현 * feat: 마이페이지 및 온도지수 api연결 * feat: 마이페이지 api 연결 * feat: 마이페이지 api 연결 * feat: 가족기여도 api 연결 * feat: dkdkkkkkk * feat: 서비스 업로드 * feat: 서비스 업로드 * feat: 서비스 업로드 * feat: 서비스 업로드
1 parent 866f16c commit cab0d8d

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

frontend/ongi/lib/screens/home/home_degree_graph.dart

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,15 @@ class _HomeDegreeGraph extends State<HomeDegreeGraph> {
6868
try {
6969
final userInfo = await PrefsManager.getUserInfo();
7070
final familyCode = userInfo['familycode'];
71+
final token = await PrefsManager.getAccessToken();
7172
if (familyCode == null) throw Exception('가족 코드가 없습니다.');
7273
final service = TemperatureService(baseUrl: 'https://ongi-1049536928483.asia-northeast3.run.app');
73-
final dailyResp = await service.fetchFamilyTemperatureDaily(familyCode);
74-
final contribResp = await service.fetchFamilyTemperatureContributions(familyCode);
74+
final dailyResp = await service.fetchFamilyTemperatureDaily(familyCode, token: token);
75+
final contribResp = await service.fetchFamilyTemperatureContributions(familyCode, token: token);
7576
if (!mounted) return;
7677
setState(() {
7778
dailyTemperatures = dailyResp;
78-
contributions = contribResp;
79+
contributions = contribResp.map((e) => Contribution.fromJson(e)).toList();
7980
isLoading = false;
8081
});
8182
} catch (e) {
@@ -312,7 +313,8 @@ class _HomeDegreeGraph extends State<HomeDegreeGraph> {
312313
),
313314
),
314315
Text(
315-
item['date'] ?? '',
316+
item.formattedDate ?? '',
317+
316318
style: const TextStyle(
317319
color: Colors.grey,
318320
fontSize: 12,

frontend/ongi/lib/screens/home/home_donutCapsule.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import 'package:flutter/material.dart';
22
import 'package:ongi/core/app_colors.dart';
33
import 'package:flutter_svg/flutter_svg.dart';
4-
import 'package:ongi/screens/home/home_degree_graph.dart';
54
import 'package:ongi/widgets/custom_chart_painter.dart';
65
import 'package:ongi/services/temperature_service.dart';
76
import 'package:ongi/utils/prefs_manager.dart';
@@ -32,8 +31,9 @@ class _HomeCapsuleSectionState extends State<HomeCapsuleSection> {
3231
final userInfo = await PrefsManager.getUserInfo();
3332
final familyCode = userInfo['familycode'];
3433
if (familyCode == null) throw Exception('가족 코드가 없습니다.');
34+
final token = await PrefsManager.getAccessToken();
3535
final service = TemperatureService(baseUrl: 'https://ongi-1049536928483.asia-northeast3.run.app');
36-
final dailyTemps = await service.fetchFamilyTemperatureDaily(familyCode);
36+
final dailyTemps = await service.fetchFamilyTemperatureDaily(familyCode, token: token);
3737
final today = DateTime.now();
3838
final todayStr = '${today.year.toString().padLeft(4, '0')}-${today.month.toString().padLeft(2, '0')}-${today.day.toString().padLeft(2, '0')}';
3939
final match = dailyTemps.firstWhere(

frontend/ongi/lib/services/temperature_service.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class TemperatureService {
1616
final response = await http.get(url, headers: headers);
1717
if (response.statusCode == 200) {
1818
final data = json.decode(response.body);
19-
return List<Map<String, dynamic>>.from(data['dailyTemperatures'] ?? data ?? []);
19+
return List<Map<String, dynamic>>.from(data['dailyTemperatures'] ?? []);
2020
} else {
2121
throw Exception('가족 온도 일별 데이터 불러오기 실패');
2222
}
@@ -33,7 +33,8 @@ class TemperatureService {
3333
final response = await http.get(url, headers: headers);
3434
if (response.statusCode == 200) {
3535
final data = json.decode(response.body);
36-
return data['contributions'] ?? data ?? [];
36+
return data['contributions'] ?? [];
37+
3738
} else {
3839
throw Exception('가족 온도 기여도 데이터 불러오기 실패');
3940
}

0 commit comments

Comments
 (0)