Hasan/eatvio_app
1
0
Fork 0
forked from eatvio/eatvio_app
Code Pull Requests Activity

Merge pull request 'secrets >> env' (#341) from mso7nueh/eatvio_app:main into main

Browse Source 
Reviewed-on: eatvio/eatvio_app#341
This commit is contained in:
mso7nueh
2025-04-21 12:26:13 +00:00
parent 3d87940755 554b747d8e
commit 83ad3ffdd1
4 changed files with 41 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
.gitea/workflows/test-flight-cd.yaml
View File

@@ -23,17 +23,17 @@ jobs:
KEYCHAIN_PATH: ${{ runner.temp }}/signing_temp.keychain
with:
keychain-path: ${{ env.KEYCHAIN_PATH }}
p12-file-base64: ${{ secrets.CERTIFICATES_FILE_BASE64 }}
p12-password: ${{ secrets.CERTIFICATES_PASSWORD }}
p12-file-base64: ${{ env.CERTIFICATES_FILE_BASE64 }}
p12-password: ${{ env.CERTIFICATES_PASSWORD }}
- name: Download provisioning
uses: mso7nueh/apple-provisioning-profiles-downloader@v1.0.8
with:
profile-type: IOS_APP_STORE
bundle-id: com.eatvioapp.app
issuer-id: ${{ secrets.APPSTORE_ISSUER_ID }}
api-key-id: ${{ secrets.APPSTORE_KEY_ID }}
api-private-key: ${{ secrets.APPSTORE_PRIVATE_KEY }}
issuer-id: ${{ env.APPSTORE_ISSUER_ID }}
api-key-id: ${{ env.APPSTORE_KEY_ID }}
api-private-key: ${{ env.APPSTORE_PRIVATE_KEY }}
- run: ./Build-tf
@@ -41,6 +41,6 @@ jobs:
uses: mso7nueh/upload-testflight-build@master
with:
app-path: .build/Artifacts/EatvioApp.ipa/EatvioApp.ipa
issuer-id: ${{ secrets.APPSTORE_ISSUER_ID }}
api-key-id: ${{ secrets.APPSTORE_KEY_ID }}
api-private-key: ${{ secrets.APPSTORE_PRIVATE_KEY }}
issuer-id: ${{ env.APPSTORE_ISSUER_ID }}
api-key-id: ${{ env.APPSTORE_KEY_ID }}
api-private-key: ${{ env.APPSTORE_PRIVATE_KEY }}

2
Build-tf
View File

@@ -31,7 +31,7 @@ EXPORT_OPTIONS_FILE="Support/ExportOptions.plist"
# Clean and prepare the build
flutter clean
flutter pub get
flutter upgrade
dart run build_runner build --delete-conflicting-outputs
cd ios
rm -rf Pods Podfile.lock

6
lib/features/my_finance/entities/consultant_finance_entity.dart
View File

@@ -1,21 +1,18 @@
enum ConsultationStatus {
completed,
canceled,
canceledByInitiator,
}
class ConsultantFinanceEntity {
final int totalConsultationsCount;
final int completedCount;
final int canceledCount;
final int canceledByInitiatorCount;
final List<ConsultationFinanceCardEntity> consultationsList;
ConsultantFinanceEntity({
required this.totalConsultationsCount,
required this.completedCount,
required this.canceledCount,
required this.canceledByInitiatorCount,
required this.consultationsList,
});
}
@@ -67,7 +64,7 @@ final testConsultations = [
clientName: 'Charlie',
planDuration: 60,
price: 200,
status: ConsultationStatus.canceledByInitiator,
status: ConsultationStatus.completed,
),
];
@@ -75,6 +72,5 @@ final testFinanceEntity = ConsultantFinanceEntity(
totalConsultationsCount: testConsultations.length,
completedCount: testConsultations.where((c) => c.status == ConsultationStatus.completed).length,
canceledCount: testConsultations.where((c) => c.status == ConsultationStatus.canceled).length,
canceledByInitiatorCount: testConsultations.where((c) => c.status == ConsultationStatus.canceledByInitiator).length,
consultationsList: testConsultations,
);

82
lib/features/my_finance/presentation/pages/consultant_finance_screen.dart
View File

@@ -54,63 +54,43 @@ class _ConsultantFinanceScreenState extends State<ConsultantFinanceScreen> {
),
),
const SizedBox(height: 12),
SingleChildScrollView(
scrollDirection: Axis.horizontal,
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Row(
children: [
Material(
color: const Color(0xFF0BB450).withAlpha(11),
borderRadius: BorderRadius.circular(8),
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
child: Text(
'Завершено: ${testFinanceEntity.completedCount}',
style: const TextStyle(
fontSize: 14,
fontWeight: FontWeight.w400,
color: Color(0xFF0BB450),
height: 1,
),
Row(
children: [
const SizedBox(width: 16),
Material(
color: const Color(0xFF0BB450).withAlpha(11),
borderRadius: BorderRadius.circular(8),
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
child: Text(
'Завершено: ${testFinanceEntity.completedCount}',
style: const TextStyle(
fontSize: 14,
fontWeight: FontWeight.w400,
color: Color(0xFF0BB450),
height: 1,
),
),
),
const SizedBox(width: 8),
Material(
color: const Color(0xFFD01717).withAlpha(11),
borderRadius: BorderRadius.circular(8),
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
child: Text(
'Отменено: ${testFinanceEntity.canceledCount}',
style: const TextStyle(
fontSize: 14,
fontWeight: FontWeight.w400,
color: Color(0xFFD01717),
height: 1,
),
),
const SizedBox(width: 8),
Material(
color: const Color(0xFFD01717).withAlpha(11),
borderRadius: BorderRadius.circular(8),
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
child: Text(
'Отменено: ${testFinanceEntity.canceledCount}',
style: const TextStyle(
fontSize: 14,
fontWeight: FontWeight.w400,
color: Color(0xFFD01717),
height: 1,
),
),
),
const SizedBox(width: 8),
Material(
color: const Color(0xFFD07317).withAlpha(11),
borderRadius: BorderRadius.circular(8),
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
child: Text(
'Отменено инициатором: ${testFinanceEntity.canceledByInitiatorCount}',
style: const TextStyle(
fontSize: 14,
fontWeight: FontWeight.w400,
color: Color(0xFFD07317),
height: 1,
),
),
),
),
],
),
),
],
),
const SizedBox(height: 16),
],