From 173f69b58cf2e88c1229f483473c4fcdb8a7656d Mon Sep 17 00:00:00 2001 From: ANNA <109578911+joanna930224@users.noreply.github.com> Date: Tue, 31 Jan 2023 22:56:30 +0900 Subject: [PATCH 1/2] =?UTF-8?q?feat:[=EC=A1=B0=EC=95=88=EB=82=98]=20F)=20S?= =?UTF-8?q?pring=20http=20uri=20=ED=86=B5=ED=95=A9=20=EA=B4=80=EB=A6=AC=20?= =?UTF-8?q?[LOL-E=E2=80=99SPORTS-KOREA60]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lib/api/authentication/spring_member_api.dart | 9 +++++---- .../lib/api/authentication/spring_validation_api.dart | 7 ++++--- .../lib/api/comment/spring_comment_api.dart | 8 ++++---- p4th/AnnaJo/lolEsportsKorea_frontend/lib/api/ipInfo.dart | 3 +++ .../lib/api/league/league_info_api.dart | 5 ++--- .../lib/api/ranking/ranking_info_api.dart | 6 +++--- 6 files changed, 21 insertions(+), 17 deletions(-) create mode 100644 p4th/AnnaJo/lolEsportsKorea_frontend/lib/api/ipInfo.dart diff --git a/p4th/AnnaJo/lolEsportsKorea_frontend/lib/api/authentication/spring_member_api.dart b/p4th/AnnaJo/lolEsportsKorea_frontend/lib/api/authentication/spring_member_api.dart index c217b2f1..f12d3762 100644 --- a/p4th/AnnaJo/lolEsportsKorea_frontend/lib/api/authentication/spring_member_api.dart +++ b/p4th/AnnaJo/lolEsportsKorea_frontend/lib/api/authentication/spring_member_api.dart @@ -4,8 +4,9 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:http/http.dart' as http; +import '../ipInfo.dart'; + class SpringHttpApi { - static const String httpUri = '192.168.0.8:8888'; static var signInResponse; static var signUpResponse; static var removeResponse; @@ -15,7 +16,7 @@ class SpringHttpApi { try { signInResponse = await http.post( - Uri.http(httpUri, '/member/sign-in'), + Uri.http(IpInfo.httpUri, '/member/sign-in'), headers: {"Content-Type": "application/json"}, body: body, ); @@ -29,7 +30,7 @@ class SpringHttpApi { try { signUpResponse = await http.post( - Uri.http(httpUri, '/member/sign-up'), + Uri.http(IpInfo.httpUri, '/member/sign-up'), headers: {"Content-Type": "application/json"}, body: body, ); @@ -41,7 +42,7 @@ class SpringHttpApi { memberRemoveApi(String email) async { try { removeResponse = await http.post( - Uri.http(httpUri, '/member/remove/$email'), + Uri.http(IpInfo.httpUri, '/member/remove/$email'), headers: {"Content-Type": "application/json"}, ); } catch (e) { diff --git a/p4th/AnnaJo/lolEsportsKorea_frontend/lib/api/authentication/spring_validation_api.dart b/p4th/AnnaJo/lolEsportsKorea_frontend/lib/api/authentication/spring_validation_api.dart index 2dd94d45..77537740 100644 --- a/p4th/AnnaJo/lolEsportsKorea_frontend/lib/api/authentication/spring_validation_api.dart +++ b/p4th/AnnaJo/lolEsportsKorea_frontend/lib/api/authentication/spring_validation_api.dart @@ -4,8 +4,9 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:http/http.dart' as http; +import '../ipInfo.dart'; + class SpringValidationApi { - static const String httpUri = '192.168.0.8:8888'; static var emailValidationResponse; static var nicknameValidationResponse; @@ -17,7 +18,7 @@ class SpringValidationApi { debugPrint(body); try { emailValidationResponse = await http.post( - Uri.http(httpUri, '/member/check-email/$email'), + Uri.http(IpInfo.httpUri, '/member/check-email/$email'), headers: {"Content-Type": "application/json"}, body: body, ); @@ -34,7 +35,7 @@ class SpringValidationApi { debugPrint(body); try { nicknameValidationResponse = await http.post( - Uri.http(httpUri, '/member/check-nickname/$nickname'), + Uri.http(IpInfo.httpUri, '/member/check-nickname/$nickname'), headers: {"Content-Type": "application/json"}, body: body, ); diff --git a/p4th/AnnaJo/lolEsportsKorea_frontend/lib/api/comment/spring_comment_api.dart b/p4th/AnnaJo/lolEsportsKorea_frontend/lib/api/comment/spring_comment_api.dart index c7580bba..9ce8d06a 100644 --- a/p4th/AnnaJo/lolEsportsKorea_frontend/lib/api/comment/spring_comment_api.dart +++ b/p4th/AnnaJo/lolEsportsKorea_frontend/lib/api/comment/spring_comment_api.dart @@ -5,9 +5,9 @@ import 'package:flutter/material.dart'; import 'package:http/http.dart' as http; import '../../components/my_team/team_comment_data.dart'; +import '../ipInfo.dart'; class SpringCommentApi { - static const String httpUri = '192.168.0.8:8888'; static var commentRegisterResponse; static var commentDeleteResponse; @@ -15,7 +15,7 @@ class SpringCommentApi { String request) async { try { final commentListResponse = await http.get( - Uri.http(httpUri, '/comment/$request'), + Uri.http(IpInfo.httpUri, '/comment/$request'), headers: {"Content-Type": "application/json"}, ); String responseBody = utf8.decode(commentListResponse.bodyBytes); @@ -35,7 +35,7 @@ class SpringCommentApi { try { commentRegisterResponse = await http.post( - Uri.http(httpUri, '/comment/register'), + Uri.http(IpInfo.httpUri, '/comment/register'), headers: {"Content-Type": "application/json"}, body: body, ); @@ -49,7 +49,7 @@ class SpringCommentApi { try { commentDeleteResponse = await http.post( - Uri.http(httpUri, '/comment/delete'), + Uri.http(IpInfo.httpUri, '/comment/delete'), headers: {"Content-Type": "application/json"}, body: body, ); diff --git a/p4th/AnnaJo/lolEsportsKorea_frontend/lib/api/ipInfo.dart b/p4th/AnnaJo/lolEsportsKorea_frontend/lib/api/ipInfo.dart new file mode 100644 index 00000000..0e6e9e53 --- /dev/null +++ b/p4th/AnnaJo/lolEsportsKorea_frontend/lib/api/ipInfo.dart @@ -0,0 +1,3 @@ +class IpInfo { + static const String httpUri = '192.168.0.8:8888'; +} \ No newline at end of file diff --git a/p4th/AnnaJo/lolEsportsKorea_frontend/lib/api/league/league_info_api.dart b/p4th/AnnaJo/lolEsportsKorea_frontend/lib/api/league/league_info_api.dart index 6cba12ef..f5a5af02 100644 --- a/p4th/AnnaJo/lolEsportsKorea_frontend/lib/api/league/league_info_api.dart +++ b/p4th/AnnaJo/lolEsportsKorea_frontend/lib/api/league/league_info_api.dart @@ -2,14 +2,13 @@ import 'dart:convert'; import 'package:http/http.dart' as http; import '../../components/match_schedule/league_data.dart'; +import '../ipInfo.dart'; class LeagueApi { - static const String httpUri = '192.168.0.8:8888'; - static Future> getLeagueInfo() async { try { final leagueInfoResponse = await http.get( - Uri.http(httpUri, '/league/list'), + Uri.http(IpInfo.httpUri, '/league/list'), headers: {"Content-Type": "application/json"}, ); String responseBody = utf8.decode(leagueInfoResponse.bodyBytes); diff --git a/p4th/AnnaJo/lolEsportsKorea_frontend/lib/api/ranking/ranking_info_api.dart b/p4th/AnnaJo/lolEsportsKorea_frontend/lib/api/ranking/ranking_info_api.dart index d3fd426e..2e2f8823 100644 --- a/p4th/AnnaJo/lolEsportsKorea_frontend/lib/api/ranking/ranking_info_api.dart +++ b/p4th/AnnaJo/lolEsportsKorea_frontend/lib/api/ranking/ranking_info_api.dart @@ -3,14 +3,14 @@ import 'dart:convert'; import '../../components/ranking/team_ranking_data.dart'; import 'package:http/http.dart' as http; -class RankingApi { - static const String httpUri = '192.168.0.8:8888'; +import '../ipInfo.dart'; +class RankingApi { static Future> getTeamRankingInfo( String request) async { try { final teamRankingInfoResponse = await http.get( - Uri.http(httpUri, '/ranking/$request'), + Uri.http(IpInfo.httpUri, '/ranking/$request'), headers: {"Content-Type": "application/json"}, ); String responseBody = utf8.decode(teamRankingInfoResponse.bodyBytes); From ae20eaf56a52ddcb63792e8e5fd5e2ab2fb4cb81 Mon Sep 17 00:00:00 2001 From: ANNA <109578911+joanna930224@users.noreply.github.com> Date: Thu, 2 Mar 2023 23:52:55 +0900 Subject: [PATCH 2/2] =?UTF-8?q?style:[=EC=A1=B0=EC=95=88=EB=82=98]=20F)=20?= =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=EA=B0=80=20=ED=9A=8C=EC=9B=90?= =?UTF-8?q?=EA=B0=80=EC=9E=85=EC=8B=9C=20=EA=B0=9C=EC=9D=B8=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=88=98=EC=A7=91=EB=8F=99=EC=9D=98=EC=84=9C?= =?UTF-8?q?=EC=97=90=20=ED=95=B4=EB=8B=B9=ED=95=98=EB=8A=94=20=EB=82=B4?= =?UTF-8?q?=EC=9A=A9=20=EC=88=98=EC=A0=95=20[LOL-E=E2=80=99SPORTS-KOREA53]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../authentication/accept/accept_box.dart | 27 +++++++------ .../lolEsportsKorea_frontend/pubspec.lock | 39 ++++++++----------- 2 files changed, 31 insertions(+), 35 deletions(-) diff --git a/p4th/AnnaJo/lolEsportsKorea_frontend/lib/components/authentication/accept/accept_box.dart b/p4th/AnnaJo/lolEsportsKorea_frontend/lib/components/authentication/accept/accept_box.dart index e29b3b29..0964146f 100644 --- a/p4th/AnnaJo/lolEsportsKorea_frontend/lib/components/authentication/accept/accept_box.dart +++ b/p4th/AnnaJo/lolEsportsKorea_frontend/lib/components/authentication/accept/accept_box.dart @@ -21,18 +21,21 @@ class AcceptCheck extends StatelessWidget { ), child: const SingleChildScrollView( scrollDirection: Axis.vertical, - child: Text( - "<개인정보 수집·동의서> \n" - "1.수집하는 개인정보 항목 이메일 \n" - "2.개인정보의 수집 및 이용 목적 제공하신 정보는 앱 서비스 가입을 위해 사용합니다.\n" - "① 본인 확인 식별(성명, 이메일, 휴대폰번호) \n" - "② 의사소통 및 정보 전달 등에 이용(성명, 이메일, 휴대폰번호)\n" - "3.개인정보의 보유 및 잉요기간 수집된 개인정보의 보유 기간은" - "앱 서비스 이용 종료 후 1년간이며 삭제 요청시," - "당사자는 개인 정보를 재생이 불가능한 방법으로 즉시 파기합니다. \n" - "※ 귀하는 이에 대한 동의를 거부할 수 있습니다.\n" - "다만 동의가 없을 경우 당 기관의 앱 서비스 이용이 불가능할 수도 있음을 알려드립니다.", - style: TextStyle(color: Colors.grey), + child: Padding( + padding: EdgeInsets.all(8.0), + child: Text( + "<개인정보 수집·동의서> \n" + "1.수집하는 개인정보 항목 이메일 \n" + "2.개인정보의 수집 및 이용 목적 제공하신 정보는 앱 서비스 가입을 위해 사용합니다.\n" + "① 본인 확인 식별(성명, 이메일, 휴대폰번호) \n" + "② 의사소통 및 정보 전달 등에 이용(성명, 이메일, 휴대폰번호)\n" + "3.개인정보의 보유 및 잉요기간 수집된 개인정보의 보유 기간은" + "앱 서비스 이용 종료 후 1년간이며 삭제 요청시," + "당사자는 개인 정보를 재생이 불가능한 방법으로 즉시 파기합니다. \n" + "※ 귀하는 이에 대한 동의를 거부할 수 있습니다.\n" + "다만 동의가 없을 경우 당 기관의 앱 서비스 이용이 불가능할 수도 있음을 알려드립니다.", + style: TextStyle(color: Colors.grey), + ), ), ), ), diff --git a/p4th/AnnaJo/lolEsportsKorea_frontend/pubspec.lock b/p4th/AnnaJo/lolEsportsKorea_frontend/pubspec.lock index 4feff656..19738d7c 100644 --- a/p4th/AnnaJo/lolEsportsKorea_frontend/pubspec.lock +++ b/p4th/AnnaJo/lolEsportsKorea_frontend/pubspec.lock @@ -7,7 +7,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.8.2" + version: "2.9.0" boolean_selector: dependency: transitive description: @@ -21,28 +21,21 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.1" + version: "1.2.1" clock: dependency: transitive description: name: clock url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.1" collection: dependency: transitive description: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.15.0" + version: "1.16.0" comment_box: dependency: "direct main" description: @@ -63,7 +56,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" flutter: dependency: "direct main" description: flutter @@ -162,7 +155,7 @@ packages: name: js url: "https://pub.dartlang.org" source: hosted - version: "0.6.3" + version: "0.6.4" lints: dependency: transitive description: @@ -176,28 +169,28 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.11" + version: "0.12.12" material_color_utilities: dependency: transitive description: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.3" + version: "0.1.5" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.7.0" + version: "1.8.0" path: dependency: transitive description: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.0" + version: "1.8.2" plugin_platform_interface: dependency: transitive description: @@ -230,7 +223,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.9.0" stack_trace: dependency: transitive description: @@ -251,7 +244,7 @@ packages: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.1" table_calendar: dependency: "direct main" description: @@ -265,14 +258,14 @@ packages: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.2.1" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.8" + version: "0.4.12" typed_data: dependency: transitive description: @@ -286,7 +279,7 @@ packages: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" + version: "2.1.2" sdks: - dart: ">=2.16.1 <3.0.0" + dart: ">=2.17.0-0 <3.0.0" flutter: ">=2.0.0"