Compare commits
26 Commits
213f3d418d
...
linux
| Author | SHA1 | Date | |
|---|---|---|---|
| fd4c34c59d | |||
| 5e003a4d71 | |||
| dca595bf60 | |||
| fcf1bbbb15 | |||
| 8a0c0d7dba | |||
| ff7f363983 | |||
| a54f1c61ae | |||
| 843997e58c | |||
| cbe70e2e44 | |||
| 3778ebb261 | |||
| c911e88453 | |||
| b1487839a7 | |||
| 518dd1300e | |||
| 221030eff3 | |||
| 707b49c088 | |||
| 5135629b33 | |||
| bb64be077f | |||
| 281ea863e8 | |||
| 64af64f28b | |||
| 1c0dd6d328 | |||
| 07d4ba4afa | |||
| 6ad6b6ccbd | |||
| ce2575035f | |||
| baea2c9fdb | |||
| 27639cb964 | |||
| 1143d11054 |
@@ -48,13 +48,15 @@ origins = [
|
|||||||
"http://MIH-API-Hub",
|
"http://MIH-API-Hub",
|
||||||
"http://api.mzansi-innovation-hub.co.za",
|
"http://api.mzansi-innovation-hub.co.za",
|
||||||
"http://app.mzansi-innovation-hub.co.za",
|
"http://app.mzansi-innovation-hub.co.za",
|
||||||
|
"https://api.mzansi-innovation-hub.co.za",
|
||||||
|
"https://app.mzansi-innovation-hub.co.za",
|
||||||
]
|
]
|
||||||
|
|
||||||
init(
|
init(
|
||||||
app_info=InputAppInfo(
|
app_info=InputAppInfo(
|
||||||
app_name="Mzansi Innovation Hub",
|
app_name="Mzansi Innovation Hub",
|
||||||
api_domain="http://localhost:8080/",
|
api_domain="http://localhost:8080/",
|
||||||
website_domain="http://app.mzansi-innovation-hub.co.za",
|
website_domain="https://app.mzansi-innovation-hub.co.za",
|
||||||
api_base_path="/auth",
|
api_base_path="/auth",
|
||||||
website_base_path="/auth"
|
website_base_path="/auth"
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -9,5 +9,5 @@ watchfiles
|
|||||||
python-multipart
|
python-multipart
|
||||||
python-dotenv
|
python-dotenv
|
||||||
xlrd
|
xlrd
|
||||||
supertokens-python
|
supertokens-python==0.24.0
|
||||||
sniffio
|
sniffio
|
||||||
@@ -26,7 +26,15 @@ abstract class AppEnviroment {
|
|||||||
baseApiUrl = "http://localhost:8080";
|
baseApiUrl = "http://localhost:8080";
|
||||||
baseFileUrl = "http://localhost:9000";
|
baseFileUrl = "http://localhost:9000";
|
||||||
baseAiUrl = "http://localhost:11434";
|
baseAiUrl = "http://localhost:11434";
|
||||||
bannerAdUnitId = 'ca-app-pub-3940256099942544/2435281174';
|
bannerAdUnitId = 'ca-app-pub-3940256099942544/2435281174'; // IOS ID
|
||||||
|
break;
|
||||||
|
} else if (Platform.isIOS || Platform.isLinux) {
|
||||||
|
//================= Web Dev Urls =================
|
||||||
|
baseAppUrl = "http://localhost:80";
|
||||||
|
baseApiUrl = "http://localhost:8080";
|
||||||
|
baseFileUrl = "http://localhost:9000";
|
||||||
|
baseAiUrl = "http://localhost:11434";
|
||||||
|
bannerAdUnitId = 'ca-app-pub-3940256099942544/2435281174'; // IOS ID
|
||||||
break;
|
break;
|
||||||
} else if (Platform.isAndroid) {
|
} else if (Platform.isAndroid) {
|
||||||
//================= Android Dev Urls =================
|
//================= Android Dev Urls =================
|
||||||
@@ -35,14 +43,6 @@ abstract class AppEnviroment {
|
|||||||
baseFileUrl = "http://10.0.2.2:9000";
|
baseFileUrl = "http://10.0.2.2:9000";
|
||||||
baseAiUrl = "http://10.0.2.2:11434";
|
baseAiUrl = "http://10.0.2.2:11434";
|
||||||
bannerAdUnitId = 'ca-app-pub-3940256099942544/9214589741';
|
bannerAdUnitId = 'ca-app-pub-3940256099942544/9214589741';
|
||||||
} else {
|
|
||||||
//================= Web & iOS Dev Urls =================
|
|
||||||
baseAppUrl = "http://localhost:80";
|
|
||||||
baseApiUrl = "http://localhost:8080";
|
|
||||||
baseFileUrl = "http://localhost:9000";
|
|
||||||
baseAiUrl = "http://localhost:11434";
|
|
||||||
bannerAdUnitId = 'ca-app-pub-3940256099942544/2435281174';
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
case Enviroment.prod:
|
case Enviroment.prod:
|
||||||
|
|||||||
@@ -98,6 +98,12 @@ class MihTheme {
|
|||||||
return "Android";
|
return "Android";
|
||||||
} else if (platform == TargetPlatform.iOS) {
|
} else if (platform == TargetPlatform.iOS) {
|
||||||
return "iOS";
|
return "iOS";
|
||||||
|
} else if (platform == TargetPlatform.linux) {
|
||||||
|
return "Linux";
|
||||||
|
} else if (platform == TargetPlatform.macOS) {
|
||||||
|
return "macOS";
|
||||||
|
} else if (platform == TargetPlatform.windows) {
|
||||||
|
return "Windows";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return "Other";
|
return "Other";
|
||||||
|
|||||||
@@ -1,5 +1,8 @@
|
|||||||
|
import 'dart:io';
|
||||||
|
|
||||||
import 'package:country_code_picker/country_code_picker.dart';
|
import 'package:country_code_picker/country_code_picker.dart';
|
||||||
import 'package:file_picker/file_picker.dart';
|
import 'package:file_picker/file_picker.dart';
|
||||||
|
import 'package:flutter/foundation.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_speed_dial/flutter_speed_dial.dart';
|
import 'package:flutter_speed_dial/flutter_speed_dial.dart';
|
||||||
import 'package:geolocator/geolocator.dart';
|
import 'package:geolocator/geolocator.dart';
|
||||||
@@ -451,7 +454,8 @@ class _PackageToolOneState extends State<PackageToolOne> {
|
|||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
MihBannerAd(),
|
if (!kIsWeb && (Platform.isAndroid || Platform.isIOS))
|
||||||
|
MihBannerAd(),
|
||||||
const SizedBox(height: 10),
|
const SizedBox(height: 10),
|
||||||
Divider(
|
Divider(
|
||||||
color: MihColors.getSecondaryColor(
|
color: MihColors.getSecondaryColor(
|
||||||
|
|||||||
@@ -52,13 +52,16 @@ class _MihCircleAvatarState extends State<MihCircleAvatar> {
|
|||||||
context: context,
|
context: context,
|
||||||
builder: (context) {
|
builder: (context) {
|
||||||
return MihPackageWindow(
|
return MihPackageWindow(
|
||||||
fullscreen: false,
|
fullscreen: true,
|
||||||
windowTitle: "",
|
windowTitle: "",
|
||||||
|
scrollbarOn: false,
|
||||||
onWindowTapClose: () {
|
onWindowTapClose: () {
|
||||||
context.pop();
|
context.pop();
|
||||||
},
|
},
|
||||||
windowBody: InteractiveViewer(
|
windowBody: SizedBox.expand(
|
||||||
child: Image(image: imagePreview!),
|
child: InteractiveViewer(
|
||||||
|
child: Image(image: imagePreview!),
|
||||||
|
),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -103,6 +103,18 @@ class _MihDropdownFieldState extends State<MihDropdownField> {
|
|||||||
Expanded(
|
Expanded(
|
||||||
child: Theme(
|
child: Theme(
|
||||||
data: Theme.of(context).copyWith(
|
data: Theme.of(context).copyWith(
|
||||||
|
scrollbarTheme: ScrollbarThemeData(
|
||||||
|
thumbColor: WidgetStatePropertyAll(
|
||||||
|
MihColors.getPrimaryColor(
|
||||||
|
MzansiInnovationHub.of(context)!
|
||||||
|
.theme
|
||||||
|
.mode ==
|
||||||
|
"Dark")),
|
||||||
|
thickness: const WidgetStatePropertyAll(6),
|
||||||
|
radius: const Radius.circular(10),
|
||||||
|
thumbVisibility: const WidgetStatePropertyAll(
|
||||||
|
true), // Always show when scrolling
|
||||||
|
),
|
||||||
textSelectionTheme: TextSelectionThemeData(
|
textSelectionTheme: TextSelectionThemeData(
|
||||||
cursorColor: MihColors.getPrimaryColor(
|
cursorColor: MihColors.getPrimaryColor(
|
||||||
MzansiInnovationHub.of(context)!.theme.mode ==
|
MzansiInnovationHub.of(context)!.theme.mode ==
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
|
import 'dart:io';
|
||||||
|
|
||||||
|
import 'package:flutter/foundation.dart';
|
||||||
import 'package:flutter/services.dart';
|
import 'package:flutter/services.dart';
|
||||||
import 'package:go_router/go_router.dart';
|
import 'package:go_router/go_router.dart';
|
||||||
import 'package:ken_logger/ken_logger.dart';
|
import 'package:ken_logger/ken_logger.dart';
|
||||||
import 'package:mzansi_innovation_hub/main.dart';
|
|
||||||
import 'package:mzansi_innovation_hub/mih_package_components/mih_scack_bar.dart';
|
import 'package:mzansi_innovation_hub/mih_package_components/mih_scack_bar.dart';
|
||||||
import 'package:mzansi_innovation_hub/mih_packages/mih_home/components/mih_app_drawer.dart';
|
import 'package:mzansi_innovation_hub/mih_packages/mih_home/components/mih_app_drawer.dart';
|
||||||
import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tools.dart';
|
import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tools.dart';
|
||||||
@@ -100,7 +102,7 @@ class _MihPackageState extends State<MihPackage>
|
|||||||
// _peakAnimation();
|
// _peakAnimation();
|
||||||
// });
|
// });
|
||||||
// }
|
// }
|
||||||
if (!MzansiInnovationHub.of(context)!.theme.kIsWeb) {
|
if (!kIsWeb && (Platform.isAndroid || Platform.isIOS)) {
|
||||||
// Trigger the peak animation only AFTER the route transition is complete
|
// Trigger the peak animation only AFTER the route transition is complete
|
||||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||||
final ModalRoute? currentRoute = ModalRoute.of(context);
|
final ModalRoute? currentRoute = ModalRoute.of(context);
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
import 'dart:io';
|
||||||
|
|
||||||
import 'package:app_settings/app_settings.dart';
|
import 'package:app_settings/app_settings.dart';
|
||||||
import 'package:flutter/foundation.dart';
|
import 'package:flutter/foundation.dart';
|
||||||
import 'package:local_auth/local_auth.dart';
|
import 'package:local_auth/local_auth.dart';
|
||||||
@@ -155,7 +157,8 @@ class _MihPackageTileState extends State<MihPackageTile> {
|
|||||||
Future<void> authenticateUser() async {
|
Future<void> authenticateUser() async {
|
||||||
if (widget.authenticateUser != null &&
|
if (widget.authenticateUser != null &&
|
||||||
widget.authenticateUser! &&
|
widget.authenticateUser! &&
|
||||||
!kIsWeb) {
|
!kIsWeb &&
|
||||||
|
!Platform.isLinux) {
|
||||||
if (await isUserAuthenticated()) {
|
if (await isUserAuthenticated()) {
|
||||||
widget.onTap();
|
widget.onTap();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ class MihPackageWindow extends StatefulWidget {
|
|||||||
final Color? foregroundColor;
|
final Color? foregroundColor;
|
||||||
final bool? borderOn;
|
final bool? borderOn;
|
||||||
final bool fullscreen;
|
final bool fullscreen;
|
||||||
|
final bool? scrollbarOn;
|
||||||
const MihPackageWindow({
|
const MihPackageWindow({
|
||||||
super.key,
|
super.key,
|
||||||
required this.fullscreen,
|
required this.fullscreen,
|
||||||
@@ -23,6 +24,7 @@ class MihPackageWindow extends StatefulWidget {
|
|||||||
required this.onWindowTapClose,
|
required this.onWindowTapClose,
|
||||||
required this.windowBody,
|
required this.windowBody,
|
||||||
this.borderOn,
|
this.borderOn,
|
||||||
|
this.scrollbarOn,
|
||||||
this.backgroundColor,
|
this.backgroundColor,
|
||||||
this.foregroundColor,
|
this.foregroundColor,
|
||||||
});
|
});
|
||||||
@@ -177,7 +179,13 @@ class _MihPackageWindowState extends State<MihPackageWindow> {
|
|||||||
getHeader(),
|
getHeader(),
|
||||||
const SizedBox(height: 5),
|
const SizedBox(height: 5),
|
||||||
Expanded(
|
Expanded(
|
||||||
child: SingleChildScrollView(child: widget.windowBody)),
|
child: widget.scrollbarOn != null || !widget.scrollbarOn!
|
||||||
|
? widget.windowBody
|
||||||
|
: MihSingleChildScroll(
|
||||||
|
scrollbarOn: true,
|
||||||
|
child: widget.windowBody,
|
||||||
|
),
|
||||||
|
),
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
: Column(
|
: Column(
|
||||||
|
|||||||
@@ -1,3 +1,6 @@
|
|||||||
|
import 'dart:io';
|
||||||
|
|
||||||
|
import 'package:flutter/foundation.dart';
|
||||||
import 'package:flutter/gestures.dart';
|
import 'package:flutter/gestures.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:mzansi_innovation_hub/main.dart';
|
import 'package:mzansi_innovation_hub/main.dart';
|
||||||
@@ -157,7 +160,11 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
|
|||||||
),
|
),
|
||||||
SizedBox(height: 10),
|
SizedBox(height: 10),
|
||||||
Consumer(builder: (context, bannerAdDisplay, child) {
|
Consumer(builder: (context, bannerAdDisplay, child) {
|
||||||
return MihBannerAd();
|
if (!kIsWeb && (Platform.isAndroid || Platform.isIOS)) {
|
||||||
|
return MihBannerAd();
|
||||||
|
} else {
|
||||||
|
return const SizedBox(height: 0);
|
||||||
|
}
|
||||||
}),
|
}),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -1,3 +1,6 @@
|
|||||||
|
import 'dart:io';
|
||||||
|
|
||||||
|
import 'package:flutter/foundation.dart';
|
||||||
import 'package:mzansi_innovation_hub/main.dart';
|
import 'package:mzansi_innovation_hub/main.dart';
|
||||||
import 'package:mzansi_innovation_hub/mih_package_components/mih_banner_ad.dart';
|
import 'package:mzansi_innovation_hub/mih_package_components/mih_banner_ad.dart';
|
||||||
import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
|
import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
|
||||||
@@ -229,7 +232,11 @@ class _TipCalcState extends State<TipCalc> {
|
|||||||
),
|
),
|
||||||
SizedBox(height: 10),
|
SizedBox(height: 10),
|
||||||
Consumer(builder: (context, bannerAdDisplay, child) {
|
Consumer(builder: (context, bannerAdDisplay, child) {
|
||||||
return MihBannerAd();
|
if (!kIsWeb && (Platform.isAndroid || Platform.isIOS)) {
|
||||||
|
return MihBannerAd();
|
||||||
|
} else {
|
||||||
|
return const SizedBox(height: 0);
|
||||||
|
}
|
||||||
}),
|
}),
|
||||||
// if (splitBillController.text == "Yes") const Divider(),
|
// if (splitBillController.text == "Yes") const Divider(),
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
import 'dart:async';
|
import 'dart:async';
|
||||||
|
import 'dart:io';
|
||||||
import 'dart:math';
|
import 'dart:math';
|
||||||
|
import 'package:flutter/foundation.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_speed_dial/flutter_speed_dial.dart';
|
import 'package:flutter_speed_dial/flutter_speed_dial.dart';
|
||||||
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
|
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
|
||||||
@@ -851,7 +853,9 @@ class _MineSweeperGameState extends State<MineSweeperGame> {
|
|||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
_timer != null ? MihBannerAd() : SizedBox(),
|
_timer != null && !kIsWeb && (Platform.isAndroid || Platform.isIOS)
|
||||||
|
? MihBannerAd()
|
||||||
|
: SizedBox(),
|
||||||
SizedBox(height: 15),
|
SizedBox(height: 15),
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import 'dart:convert';
|
import 'dart:convert';
|
||||||
|
import 'dart:io';
|
||||||
|
|
||||||
import 'package:flutter/foundation.dart';
|
import 'package:flutter/foundation.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
@@ -112,15 +113,35 @@ class _MihAiChatState extends State<MihAiChat> with WidgetsBindingObserver {
|
|||||||
|
|
||||||
void speakLastMessage(MzansiAiProvider aiProvider) {
|
void speakLastMessage(MzansiAiProvider aiProvider) {
|
||||||
final history = aiProvider.ollamaProvider.history;
|
final history = aiProvider.ollamaProvider.history;
|
||||||
if (history.isNotEmpty) {
|
if (history.isEmpty) return;
|
||||||
final historyList = history.toList();
|
|
||||||
for (int i = historyList.length - 1; i >= 0; i--) {
|
final historyList = history.toList();
|
||||||
if (historyList[i].origin == MessageOrigin.llm &&
|
String? textToSpeak;
|
||||||
historyList[i].text != null &&
|
|
||||||
historyList[i].text!.isNotEmpty) {
|
// Find the last LLM message
|
||||||
_flutterTts.speak(historyList[i].text!);
|
for (int i = historyList.length - 1; i >= 0; i--) {
|
||||||
return;
|
if (historyList[i].origin == MessageOrigin.llm &&
|
||||||
}
|
historyList[i].text != null &&
|
||||||
|
historyList[i].text!.isNotEmpty) {
|
||||||
|
textToSpeak = historyList[i].text!;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (textToSpeak != null) {
|
||||||
|
if (!kIsWeb && Platform.isLinux) {
|
||||||
|
// Linux Workaround: Use Speech Dispatcher (standard on most distros)
|
||||||
|
// '-t female1' is optional for voice variety
|
||||||
|
Process.run('spd-say', [textToSpeak]);
|
||||||
|
|
||||||
|
// Since spd-say doesn't have an easy "completion handler" via CLI,
|
||||||
|
// we manually toggle the UI state or just leave it off.
|
||||||
|
aiProvider.setTTSstate(true);
|
||||||
|
Future.delayed(
|
||||||
|
Duration(seconds: 5), () => aiProvider.setTTSstate(false));
|
||||||
|
} else {
|
||||||
|
// Your existing mobile/web logic
|
||||||
|
_flutterTts.speak(textToSpeak);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -183,11 +204,16 @@ class _MihAiChatState extends State<MihAiChat> with WidgetsBindingObserver {
|
|||||||
// }
|
// }
|
||||||
|
|
||||||
void stopTTS(MzansiAiProvider aiProvider) {
|
void stopTTS(MzansiAiProvider aiProvider) {
|
||||||
_flutterTts.stop();
|
if (!kIsWeb && Platform.isLinux) {
|
||||||
|
Process.run('spd-say', ['-S']); // The -S flag stops current speech
|
||||||
|
} else {
|
||||||
|
_flutterTts.stop();
|
||||||
|
}
|
||||||
aiProvider.setTTSstate(false);
|
aiProvider.setTTSstate(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> initTts(MzansiAiProvider aiProvider) async {
|
Future<void> initTts(MzansiAiProvider aiProvider) async {
|
||||||
|
if (!kIsWeb && Platform.isLinux) return;
|
||||||
try {
|
try {
|
||||||
await _flutterTts.setSpeechRate(!kIsWeb ? 0.55 : 1);
|
await _flutterTts.setSpeechRate(!kIsWeb ? 0.55 : 1);
|
||||||
// await _flutterTts.setLanguage("en-US");
|
// await _flutterTts.setLanguage("en-US");
|
||||||
@@ -258,7 +284,9 @@ class _MihAiChatState extends State<MihAiChat> with WidgetsBindingObserver {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
void dispose() {
|
void dispose() {
|
||||||
_flutterTts.stop();
|
if (!kIsWeb && !Platform.isLinux) {
|
||||||
|
_flutterTts.stop();
|
||||||
|
}
|
||||||
WidgetsBinding.instance.removeObserver(this);
|
WidgetsBinding.instance.removeObserver(this);
|
||||||
super.dispose();
|
super.dispose();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
import 'dart:io';
|
||||||
|
|
||||||
import 'package:cached_network_image/cached_network_image.dart';
|
import 'package:cached_network_image/cached_network_image.dart';
|
||||||
import 'package:file_picker/file_picker.dart';
|
import 'package:file_picker/file_picker.dart';
|
||||||
import 'package:file_saver/file_saver.dart';
|
import 'package:file_saver/file_saver.dart';
|
||||||
@@ -82,6 +84,19 @@ class _MihBusinessQrCodeState extends State<MihBusinessQrCode> {
|
|||||||
fileExtension: "png",
|
fileExtension: "png",
|
||||||
mimeType: MimeType.png,
|
mimeType: MimeType.png,
|
||||||
);
|
);
|
||||||
|
} else if (defaultTargetPlatform == TargetPlatform.linux ||
|
||||||
|
defaultTargetPlatform == TargetPlatform.windows) {
|
||||||
|
// Use File Picker to get a save path on Desktop
|
||||||
|
String? outputFile = await FilePicker.platform.saveFile(
|
||||||
|
dialogTitle: 'Please select where to save your QR Code:',
|
||||||
|
fileName: filename,
|
||||||
|
);
|
||||||
|
|
||||||
|
if (outputFile != null) {
|
||||||
|
final file = File(outputFile);
|
||||||
|
await file.writeAsBytes(imageBytes);
|
||||||
|
KenLogger.success("Saved to $outputFile");
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
await FileSaver.instance.saveAs(
|
await FileSaver.instance.saveAs(
|
||||||
name: filename,
|
name: filename,
|
||||||
@@ -95,14 +110,14 @@ class _MihBusinessQrCodeState extends State<MihBusinessQrCode> {
|
|||||||
Future<void> downloadQrCode() async {
|
Future<void> downloadQrCode() async {
|
||||||
if (_isUserSignedIn) {
|
if (_isUserSignedIn) {
|
||||||
await screenshotController.capture().then((image) {
|
await screenshotController.capture().then((image) {
|
||||||
KenLogger.success("Image Captured: $image");
|
// KenLogger.success("Image Captured: $image");
|
||||||
setState(() {
|
setState(() {
|
||||||
businessQRImageFile = image;
|
businessQRImageFile = image;
|
||||||
});
|
});
|
||||||
}).catchError((onError) {
|
}).catchError((onError) {
|
||||||
KenLogger.error(onError);
|
KenLogger.error(onError);
|
||||||
});
|
});
|
||||||
KenLogger.success("QR Code Image Captured : $businessQRImageFile");
|
// KenLogger.success("QR Code Image Captured : $businessQRImageFile");
|
||||||
saveImage(businessQRImageFile!);
|
saveImage(businessQRImageFile!);
|
||||||
} else {
|
} else {
|
||||||
showSignInRequiredAlert();
|
showSignInRequiredAlert();
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
import 'dart:io';
|
||||||
|
|
||||||
import 'package:flutter/foundation.dart';
|
import 'package:flutter/foundation.dart';
|
||||||
import 'package:flutter_speed_dial/flutter_speed_dial.dart';
|
import 'package:flutter_speed_dial/flutter_speed_dial.dart';
|
||||||
import 'package:go_router/go_router.dart';
|
import 'package:go_router/go_router.dart';
|
||||||
@@ -545,7 +547,7 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: 10),
|
SizedBox(height: 10),
|
||||||
MihBannerAd()
|
if (!kIsWeb && (Platform.isAndroid || Platform.isIOS)) MihBannerAd()
|
||||||
// MihBannerAd(),
|
// MihBannerAd(),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
@@ -572,7 +574,7 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Future<void> setScreenBrightness(double newBrightness) async {
|
Future<void> setScreenBrightness(double newBrightness) async {
|
||||||
if (!kIsWeb) {
|
if (!kIsWeb && !Platform.isLinux) {
|
||||||
bool canChange =
|
bool canChange =
|
||||||
await ScreenBrightness.instance.canChangeSystemBrightness;
|
await ScreenBrightness.instance.canChangeSystemBrightness;
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
import 'dart:io';
|
||||||
|
|
||||||
import 'package:flutter/foundation.dart';
|
import 'package:flutter/foundation.dart';
|
||||||
import 'package:google_mobile_ads/google_mobile_ads.dart';
|
import 'package:google_mobile_ads/google_mobile_ads.dart';
|
||||||
import 'package:mzansi_innovation_hub/mih_config/mih_env.dart';
|
import 'package:mzansi_innovation_hub/mih_config/mih_env.dart';
|
||||||
@@ -28,35 +30,37 @@ class MihBannerAdProvider extends ChangeNotifier {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void loadBannerAd() {
|
void loadBannerAd() {
|
||||||
if (bannerAd != null) {
|
if (!kIsWeb && (Platform.isAndroid || Platform.isIOS)) {
|
||||||
bannerAd!.dispose();
|
if (bannerAd != null) {
|
||||||
bannerAd = null;
|
bannerAd!.dispose();
|
||||||
isBannerAdLoaded = false;
|
bannerAd = null;
|
||||||
|
isBannerAdLoaded = false;
|
||||||
|
}
|
||||||
|
bannerAd = BannerAd(
|
||||||
|
adUnitId: adUnitId,
|
||||||
|
request: const AdRequest(),
|
||||||
|
size: AdSize.banner,
|
||||||
|
listener: BannerAdListener(
|
||||||
|
onAdLoaded: (ad) {
|
||||||
|
debugPrint('$ad loaded.');
|
||||||
|
isBannerAdLoaded = true;
|
||||||
|
notifyListeners();
|
||||||
|
},
|
||||||
|
onAdFailedToLoad: (ad, err) {
|
||||||
|
debugPrint('BannerAd failed to load: $err');
|
||||||
|
errorMessage =
|
||||||
|
'Failed to load ad- Message: ${err.message} Code :${err.code}';
|
||||||
|
ad.dispose(); // Dispose the ad to free resources
|
||||||
|
isBannerAdLoaded = false; // ⬅️ Explicitly set to false
|
||||||
|
bannerAd = null; // ⬅️ Explicitly set to null
|
||||||
|
notifyListeners();
|
||||||
|
},
|
||||||
|
onAdOpened: (Ad ad) => debugPrint('$ad opened.'),
|
||||||
|
onAdClosed: (Ad ad) => debugPrint('$ad closed.'),
|
||||||
|
onAdImpression: (Ad ad) => debugPrint('$ad impression.'),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
bannerAd!.load();
|
||||||
}
|
}
|
||||||
bannerAd = BannerAd(
|
|
||||||
adUnitId: adUnitId,
|
|
||||||
request: const AdRequest(),
|
|
||||||
size: AdSize.banner,
|
|
||||||
listener: BannerAdListener(
|
|
||||||
onAdLoaded: (ad) {
|
|
||||||
debugPrint('$ad loaded.');
|
|
||||||
isBannerAdLoaded = true;
|
|
||||||
notifyListeners();
|
|
||||||
},
|
|
||||||
onAdFailedToLoad: (ad, err) {
|
|
||||||
debugPrint('BannerAd failed to load: $err');
|
|
||||||
errorMessage =
|
|
||||||
'Failed to load ad- Message: ${err.message} Code :${err.code}';
|
|
||||||
ad.dispose(); // Dispose the ad to free resources
|
|
||||||
isBannerAdLoaded = false; // ⬅️ Explicitly set to false
|
|
||||||
bannerAd = null; // ⬅️ Explicitly set to null
|
|
||||||
notifyListeners();
|
|
||||||
},
|
|
||||||
onAdOpened: (Ad ad) => debugPrint('$ad opened.'),
|
|
||||||
onAdClosed: (Ad ad) => debugPrint('$ad closed.'),
|
|
||||||
onAdImpression: (Ad ad) => debugPrint('$ad impression.'),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
bannerAd!.load();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,3 +1,6 @@
|
|||||||
|
import 'dart:io';
|
||||||
|
|
||||||
|
import 'package:flutter/foundation.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:go_router/go_router.dart';
|
import 'package:go_router/go_router.dart';
|
||||||
import 'package:mzansi_innovation_hub/main.dart';
|
import 'package:mzansi_innovation_hub/main.dart';
|
||||||
@@ -134,7 +137,9 @@ class MihAlertServices {
|
|||||||
),
|
),
|
||||||
const SizedBox(height: 15),
|
const SizedBox(height: 15),
|
||||||
Text(
|
Text(
|
||||||
"To get the most out of MIH, we need your location. Please go to the site settings of the app and enable location services. Once you do that, we can start showing you relevant information based on your location.",
|
!kIsWeb && Platform.isLinux
|
||||||
|
? "To get the most out of MIH, we need your location. Please go to your System Settings and enable location services. Once you do that, we can start showing you relevant information based on your location."
|
||||||
|
: "To get the most out of MIH, we need your location. Please go to the site settings of the app and enable location services. Once you do that, we can start showing you relevant information based on your location.",
|
||||||
style: TextStyle(
|
style: TextStyle(
|
||||||
color: MihColors.getSecondaryColor(
|
color: MihColors.getSecondaryColor(
|
||||||
MzansiInnovationHub.of(context)!.theme.mode ==
|
MzansiInnovationHub.of(context)!.theme.mode ==
|
||||||
|
|||||||
@@ -1,7 +1,10 @@
|
|||||||
import 'dart:convert';
|
import 'dart:convert';
|
||||||
|
import 'dart:io';
|
||||||
|
|
||||||
import 'package:file_picker/file_picker.dart';
|
import 'package:file_picker/file_picker.dart';
|
||||||
|
import 'package:flutter/foundation.dart';
|
||||||
import 'package:go_router/go_router.dart';
|
import 'package:go_router/go_router.dart';
|
||||||
|
import 'package:ken_logger/ken_logger.dart';
|
||||||
import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart';
|
import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart';
|
||||||
import 'package:mzansi_innovation_hub/mih_config/mih_env.dart';
|
import 'package:mzansi_innovation_hub/mih_config/mih_env.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
@@ -51,6 +54,15 @@ class MihFileApi {
|
|||||||
} finally {
|
} finally {
|
||||||
// Navigator.of(context).pop(); // Always pop loading dialog
|
// Navigator.of(context).pop(); // Always pop loading dialog
|
||||||
}
|
}
|
||||||
|
KenLogger.success("File URL: $fileUrl");
|
||||||
|
if (AppEnviroment.getEnv() == "Dev" && kIsWeb) {
|
||||||
|
fileUrl = fileUrl.replaceAll("10.0.2.2", "127.0.0.1");
|
||||||
|
} else if (AppEnviroment.getEnv() == "Dev" && Platform.isIOS) {
|
||||||
|
fileUrl = fileUrl.replaceAll("10.0.2.2", "127.0.0.1");
|
||||||
|
} else if (AppEnviroment.getEnv() == "Dev" && Platform.isLinux) {
|
||||||
|
fileUrl = fileUrl.replaceAll("10.0.2.2", "127.0.0.1");
|
||||||
|
}
|
||||||
|
KenLogger.success("File URL: $fileUrl");
|
||||||
return fileUrl;
|
return fileUrl;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,6 @@
|
|||||||
|
import 'dart:io';
|
||||||
|
|
||||||
|
import 'package:flutter/foundation.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:geolocator/geolocator.dart';
|
import 'package:geolocator/geolocator.dart';
|
||||||
import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
|
import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
|
||||||
@@ -13,6 +16,12 @@ class MIHLocationAPI {
|
|||||||
///if user has blocked permission (denied or denied forver), user will get error pop up.
|
///if user has blocked permission (denied or denied forver), user will get error pop up.
|
||||||
///if user has granted permission (while in use), function will return Position object.
|
///if user has granted permission (while in use), function will return Position object.
|
||||||
Future<Position?> getGPSPosition(BuildContext context) async {
|
Future<Position?> getGPSPosition(BuildContext context) async {
|
||||||
|
bool serviceEnabled = await Geolocator.isLocationServiceEnabled();
|
||||||
|
if (!serviceEnabled && !kIsWeb && Platform.isLinux) {
|
||||||
|
// Direct the user to their System Settings
|
||||||
|
MihAlertServices().locationPermissionAlert(context);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
print("Before checkPermission"); // Debug
|
print("Before checkPermission"); // Debug
|
||||||
LocationPermission permission = await Geolocator.checkPermission();
|
LocationPermission permission = await Geolocator.checkPermission();
|
||||||
print("After checkPermission: $permission"); // Debug
|
print("After checkPermission: $permission"); // Debug
|
||||||
|
|||||||
@@ -4,10 +4,10 @@ project(runner LANGUAGES CXX)
|
|||||||
|
|
||||||
# The name of the executable created for the application. Change this to change
|
# The name of the executable created for the application. Change this to change
|
||||||
# the on-disk name of your application.
|
# the on-disk name of your application.
|
||||||
set(BINARY_NAME "patient_manager")
|
set(BINARY_NAME "mzansi_innovation_hub")
|
||||||
# The unique GTK application identifier for this application. See:
|
# The unique GTK application identifier for this application. See:
|
||||||
# https://wiki.gnome.org/HowDoI/ChooseApplicationID
|
# https://wiki.gnome.org/HowDoI/ChooseApplicationID
|
||||||
set(APPLICATION_ID "com.example.patient_manager")
|
set(APPLICATION_ID "za.co.mzansiinnovationhub.mih")
|
||||||
|
|
||||||
# Explicitly opt in to modern CMake behaviors to avoid warnings with recent
|
# Explicitly opt in to modern CMake behaviors to avoid warnings with recent
|
||||||
# versions of CMake.
|
# versions of CMake.
|
||||||
|
|||||||
BIN
mih_ui/mih_app_flatpak/main.png
Normal file
BIN
mih_ui/mih_app_flatpak/main.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 169 KiB |
11
mih_ui/mih_app_flatpak/za.co.mzansiinnovationhub.mih.desktop
Normal file
11
mih_ui/mih_app_flatpak/za.co.mzansiinnovationhub.mih.desktop
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
[Desktop Entry]
|
||||||
|
Version=1.2.6
|
||||||
|
Type=Application
|
||||||
|
Name=MIH App
|
||||||
|
Comment=First Super App of Mzansi
|
||||||
|
Exec=mzansi_innovation_hub
|
||||||
|
Icon=za.co.mzansiinnovationhub.mih
|
||||||
|
Terminal=false
|
||||||
|
Categories=Utility;
|
||||||
|
Keywords=Mzansi;Innovation;Hub;App;
|
||||||
|
StartupWMClass=mzansi_innovation_hub
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<component type="desktop-application">
|
||||||
|
<id>za.co.mzansiinnovationhub.mih</id>
|
||||||
|
|
||||||
|
<metadata_license>CC0-1.0</metadata_license>
|
||||||
|
<project_license>GPL-3.0</project_license>
|
||||||
|
|
||||||
|
<name>MIH App</name>
|
||||||
|
<summary>First Super App of Mzansi</summary>
|
||||||
|
<developer_name>Mzansi Innovation Hub</developer_name>
|
||||||
|
|
||||||
|
<description>
|
||||||
|
<p>
|
||||||
|
The Mzansi Innovation Hub (MIH) App is a multipurpose platform designed to
|
||||||
|
empower users with integrated digital services.
|
||||||
|
</p>
|
||||||
|
</description>
|
||||||
|
|
||||||
|
<launchable type="desktop-id">za.co.mzansiinnovationhub.mih.desktop</launchable>
|
||||||
|
|
||||||
|
<screenshots>
|
||||||
|
<screenshot type="default">
|
||||||
|
<caption>The main dashboard of the MIH App</caption>
|
||||||
|
<image>https://git.mzansi-innovation-hub.co.za/yaso_meth/mih-project/raw/branch/main/mih_ui/mih_app_flatpak/main.png</image>
|
||||||
|
</screenshot>
|
||||||
|
</screenshots>
|
||||||
|
|
||||||
|
<url type="homepage">https://mzansi-innovation-hub.co.za</url>
|
||||||
|
<url type="bugtracker">https://git.mzansi-innovation-hub.co.za/yaso_meth/mih-project/issues</url>
|
||||||
|
|
||||||
|
<content_rating type="oars-1.1" />
|
||||||
|
|
||||||
|
<releases>
|
||||||
|
<release version="1.2.6" date="2026-02-25" />
|
||||||
|
</releases>
|
||||||
|
</component>
|
||||||
BIN
mih_ui/mih_app_flatpak/za.co.mzansiinnovationhub.mih.png
Normal file
BIN
mih_ui/mih_app_flatpak/za.co.mzansiinnovationhub.mih.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 16 KiB |
46
mih_ui/mih_app_flatpak/za.co.mzansiinnovationhub.mih.yml
Normal file
46
mih_ui/mih_app_flatpak/za.co.mzansiinnovationhub.mih.yml
Normal file
@@ -0,0 +1,46 @@
|
|||||||
|
app-id: za.co.mzansiinnovationhub.mih
|
||||||
|
runtime: org.gnome.Platform
|
||||||
|
runtime-version: '49' # Matches a more modern GNOME stack
|
||||||
|
sdk: org.gnome.Sdk
|
||||||
|
command: mzansi_innovation_hub
|
||||||
|
|
||||||
|
finish-args:
|
||||||
|
- --share=ipc
|
||||||
|
- --socket=fallback-x11
|
||||||
|
- --socket=wayland
|
||||||
|
- --device=dri
|
||||||
|
- --socket=pulseaudio
|
||||||
|
- --share=network
|
||||||
|
- --talk-name=org.freedesktop.Notifications
|
||||||
|
# Filesystem access for documents
|
||||||
|
- --filesystem=xdg-documents:ro
|
||||||
|
|
||||||
|
modules:
|
||||||
|
- name: mih-app
|
||||||
|
buildsystem: simple
|
||||||
|
build-commands:
|
||||||
|
# Create directory structure
|
||||||
|
- mkdir -p /app/bin /app/share/mih-app /app/share/applications /app/share/metainfo /app/share/icons/hicolor/256x256/apps
|
||||||
|
|
||||||
|
# Install everything to the share folder
|
||||||
|
- cp -r * /app/share/mih-app/
|
||||||
|
- find /app/share/mih-app -name "mzansi_innovation_hub" -exec chmod +x {} +
|
||||||
|
|
||||||
|
# Link the binary to /app/bin so Flatpak can find it
|
||||||
|
- ln -s /app/share/mih-app/mzansi_innovation_hub /app/bin/mzansi_innovation_hub
|
||||||
|
|
||||||
|
# Install Integration Files
|
||||||
|
- install -Dm644 za.co.mzansiinnovationhub.mih.desktop /app/share/applications/za.co.mzansiinnovationhub.mih.desktop
|
||||||
|
- install -Dm644 za.co.mzansiinnovationhub.mih.metainfo.xml /app/share/metainfo/za.co.mzansiinnovationhub.mih.metainfo.xml
|
||||||
|
- install -Dm644 za.co.mzansiinnovationhub.mih.png /app/share/icons/hicolor/256x256/apps/za.co.mzansiinnovationhub.mih.png
|
||||||
|
|
||||||
|
sources:
|
||||||
|
- type: archive
|
||||||
|
url: https://git.mzansi-innovation-hub.co.za/yaso_meth/mih-project/releases/download/V.1.2.6/mzansi_innovation_hub.tar.gz
|
||||||
|
sha256: cd610351f334fccce2d279f3112a5ac21bfa18b39d3c59e2cb0334fe2e8019b3
|
||||||
|
- type: file
|
||||||
|
path: za.co.mzansiinnovationhub.mih.desktop
|
||||||
|
- type: file
|
||||||
|
path: za.co.mzansiinnovationhub.mih.metainfo.xml
|
||||||
|
- type: file
|
||||||
|
path: za.co.mzansiinnovationhub.mih.png
|
||||||
@@ -369,6 +369,14 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "3.1.0"
|
version: "3.1.0"
|
||||||
|
dbus:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: dbus
|
||||||
|
sha256: d0c98dcd4f5169878b6cf8f6e0a52403a9dff371a3e2f019697accbf6f44a270
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "0.7.12"
|
||||||
device_info_plus:
|
device_info_plus:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
@@ -808,6 +816,14 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "4.0.0"
|
version: "4.0.0"
|
||||||
|
geoclue:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: geoclue
|
||||||
|
sha256: c2a998c77474fc57aa00c6baa2928e58f4b267649057a1c76738656e9dbd2a7f
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "0.1.1"
|
||||||
geolocator:
|
geolocator:
|
||||||
dependency: "direct main"
|
dependency: "direct main"
|
||||||
description:
|
description:
|
||||||
@@ -832,6 +848,14 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "2.3.13"
|
version: "2.3.13"
|
||||||
|
geolocator_linux:
|
||||||
|
dependency: "direct main"
|
||||||
|
description:
|
||||||
|
name: geolocator_linux
|
||||||
|
sha256: d64112a205931926f4363bb6bd48f14cb38e7326833041d170615586cd143797
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "0.2.4"
|
||||||
geolocator_platform_interface:
|
geolocator_platform_interface:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
@@ -904,6 +928,14 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "2.3.2"
|
version: "2.3.2"
|
||||||
|
gsettings:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: gsettings
|
||||||
|
sha256: "1b0ce661f5436d2db1e51f3c4295a49849f03d304003a7ba177d01e3a858249c"
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "0.2.8"
|
||||||
html:
|
html:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
name: mzansi_innovation_hub
|
name: mzansi_innovation_hub
|
||||||
description: ""
|
description: ""
|
||||||
publish_to: 'none' # Remove this line if you wish to publish to pub.dev
|
publish_to: 'none' # Remove this line if you wish to publish to pub.dev
|
||||||
version: 1.2.6+129
|
version: 1.2.6+130
|
||||||
# version: 1.1.1+97 #--- Updated version for upgrader package testing
|
# version: 1.1.1+97 #--- Updated version for upgrader package testing
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
@@ -29,6 +29,7 @@ dependencies:
|
|||||||
flutter_native_splash: ^2.4.6
|
flutter_native_splash: ^2.4.6
|
||||||
printing: ^5.13.3
|
printing: ^5.13.3
|
||||||
geolocator: ^14.0.1
|
geolocator: ^14.0.1
|
||||||
|
geolocator_linux: ^0.2.4
|
||||||
table_calendar: ^3.1.2
|
table_calendar: ^3.1.2
|
||||||
youtube_player_iframe: ^5.2.0
|
youtube_player_iframe: ^5.2.0
|
||||||
mobile_scanner: ^7.0.1
|
mobile_scanner: ^7.0.1
|
||||||
|
|||||||
Reference in New Issue
Block a user