kishan.bhuta/GSFV2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

client changes

Browse Source
This commit is contained in:
kishan06
2024-04-22 16:40:42 +05:30
parent b18717188f
commit 3af401464b
4 changed files with 81 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
gsf/lib/modals/blog_model.dart
View File

@@ -9,15 +9,15 @@ class BlogModel {
success = json['success'];
message = json['message'];
result =
json['result'] != null ? new Result.fromJson(json['result']) : null;
json['result'] != null ? Result.fromJson(json['result']) : null;
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['success'] = this.success;
data['message'] = this.message;
if (this.result != null) {
data['result'] = this.result!.toJson();
final Map<String, dynamic> data = <String, dynamic>{};
data['success'] = success;
data['message'] = message;
if (result != null) {
data['result'] = result!.toJson();
}
return data;
}
@@ -32,15 +32,15 @@ class Result {
if (json['category'] != null) {
category = <Category>[];
json['category'].forEach((v) {
category!.add(new Category.fromJson(v));
category!.add(Category.fromJson(v));
});
}
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
if (this.category != null) {
data['category'] = this.category!.map((v) => v.toJson()).toList();
final Map<String, dynamic> data = <String, dynamic>{};
if (category != null) {
data['category'] = category!.map((v) => v.toJson()).toList();
}
return data;
}
@@ -50,7 +50,7 @@ class Category {
int? id;
String? categoryName;
String? isActive;
Null? deletedAt;
String? deletedAt;
String? createdAt;
String? updatedAt;
List<Articles>? articles;
@@ -74,21 +74,21 @@ class Category {
if (json['articles'] != null) {
articles = <Articles>[];
json['articles'].forEach((v) {
articles!.add(new Articles.fromJson(v));
articles!.add(Articles.fromJson(v));
});
}
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['id'] = this.id;
data['category_name'] = this.categoryName;
data['is_active'] = this.isActive;
data['deleted_at'] = this.deletedAt;
data['created_at'] = this.createdAt;
data['updated_at'] = this.updatedAt;
if (this.articles != null) {
data['articles'] = this.articles!.map((v) => v.toJson()).toList();
final Map<String, dynamic> data = <String, dynamic>{};
data['id'] = id;
data['category_name'] = categoryName;
data['is_active'] = isActive;
data['deleted_at'] = deletedAt;
data['created_at'] = createdAt;
data['updated_at'] = updatedAt;
if (articles != null) {
data['articles'] = articles!.map((v) => v.toJson()).toList();
}
return data;
}
@@ -105,7 +105,7 @@ class Articles {
String? tags;
String? thumbnailPath;
String? isActive;
Null? deletedAt;
String? deletedAt;
String? createdAt;
String? updatedAt;
@@ -141,20 +141,20 @@ class Articles {
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['id'] = this.id;
data['category_id'] = this.categoryId;
data['article_name'] = this.articleName;
data['short_text'] = this.shortText;
data['description'] = this.description;
data['image_upload'] = this.imageUpload;
data['video_url'] = this.videoUrl;
data['tags'] = this.tags;
data['thumbnail_path'] = this.thumbnailPath;
data['is_active'] = this.isActive;
data['deleted_at'] = this.deletedAt;
data['created_at'] = this.createdAt;
data['updated_at'] = this.updatedAt;
final Map<String, dynamic> data = <String, dynamic>{};
data['id'] = id;
data['category_id'] = categoryId;
data['article_name'] = articleName;
data['short_text'] = shortText;
data['description'] = description;
data['image_upload'] = imageUpload;
data['video_url'] = videoUrl;
data['tags'] = tags;
data['thumbnail_path'] = thumbnailPath;
data['is_active'] = isActive;
data['deleted_at'] = deletedAt;
data['created_at'] = createdAt;
data['updated_at'] = updatedAt;
return data;
}
}

4
gsf/lib/views/pages/blog/blog_inner.dart
View File

@@ -53,7 +53,7 @@ class BlogDetails extends StatelessWidget {
child: Row(
children: [
Text(
tages!,
tages ?? "",
style: TextStyle(
fontSize: 18,
color: ColorConstants.kWhite,
@@ -62,7 +62,7 @@ class BlogDetails extends StatelessWidget {
),
Spacer(),
Text(
formattedtime!,
formattedtime ?? "",
style: TextStyle(
fontSize: 18,
color: ColorConstants.kWhite,

4
gsf/lib/views/pages/blog/blog_main.dart
View File

@@ -295,7 +295,7 @@ class _NewsBodyState extends State<NewsBody> {
.result![index].articleName ??
'',
image_upload: searchArticle!
.result![index].thumbnailPath ??
.result![index].imageUpload ??
'',
updatedAtTime: formatDateTime2(
searchArticle!.result![index]
@@ -356,7 +356,7 @@ class _NewsBodyState extends State<NewsBody> {
.result![index].articleName ??
'',
thumbnailimg: searchArticle!
.result![index].thumbnailPath ??
.result![index].imageUpload ??
'',
updatedTime: formatDateTime(searchArticle!
.result![index].updatedAt ??

81
gsf/lib/views/pages/sidebar.dart
View File

@@ -136,17 +136,14 @@ class _AppDrawerState extends State<AppDrawer> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
headTitel('The Podium'),
menuWidget('quiz', 'Quiz Section', () {
FirebaseAnalytics.instance
.logScreenView(screenName: "Quiz");
// headTitel('The Podium'),
menuWidget('video', 'Profile', () {
Get.back();
Get.to(
() => const QuizHome(),
() => const ProfilePage(),
);
}, false),
}, true),
const SizedBox(height: 15),
menuWidget('quiz', 'Menstrual cycle tracker', () {
FirebaseAnalytics.instance.logScreenView(
screenName: "Menstrual cycle tracker");
@@ -160,6 +157,24 @@ class _AppDrawerState extends State<AppDrawer> {
}
}, false),
const SizedBox(height: 15),
menuWidget('news_articles', 'News & Articles', () {
FirebaseAnalytics.instance
.logScreenView(screenName: "News & Articles");
Get.to(
() => const BlogMain(),
);
}, false),
const SizedBox(height: 15),
// menuWidget('quiz', 'Quiz Section', () {
// FirebaseAnalytics.instance
// .logScreenView(screenName: "Quiz");
// Get.back();
// Get.to(
// () => const QuizHome(),
// );
// }, false),
// const SizedBox(height: 15),
// menuWidget('rank', 'LeaderBoard', () {
// homePageController.updateBottomNavIndex(3);
@@ -189,7 +204,7 @@ class _AppDrawerState extends State<AppDrawer> {
// : const SizedBox(),
// ),
// const SizedBox(height: 40),
headTitel('External Motivation'),
// headTitel('External Motivation'),
menuWidget('podcast', 'Podcasts', () {
FirebaseAnalytics.instance
.logScreenView(screenName: "Podcasts");
@@ -199,15 +214,6 @@ class _AppDrawerState extends State<AppDrawer> {
}, false),
const SizedBox(height: 15),
menuWidget('news_articles', 'News & Articles', () {
FirebaseAnalytics.instance
.logScreenView(screenName: "News & Articles");
Get.to(
() => const BlogMain(),
);
}, false),
const SizedBox(height: 15),
// menuWidget(
// 'instagram',
// 'GSF Instagram Handle',
@@ -217,7 +223,7 @@ class _AppDrawerState extends State<AppDrawer> {
// },
// ),
// const SizedBox(height: 40),
headTitel('All You need to know'),
// headTitel('All You need to know'),
// SizedBox(
// child: (controller.isLoggedIn)
// ? Column(
@@ -229,13 +235,13 @@ class _AppDrawerState extends State<AppDrawer> {
// )
// : const SizedBox(),
// ),
menuWidget(
'about',
'About GETSETFIT',
() => Get.to(
() => const AboutGSF(),
),
false),
// menuWidget(
// 'about',
// 'About GETSETFIT',
// () => Get.to(
// () => const AboutGSF(),
// ),
// false),
// const SizedBox(height: 15),
@@ -246,14 +252,9 @@ class _AppDrawerState extends State<AppDrawer> {
// () => const ProfileSkeleton(),
// ),
// ),
const SizedBox(height: 15),
menuWidget('video', 'Profile', () {
Get.back();
Get.to(
() => const ProfilePage(),
);
}, true),
const SizedBox(height: 15),
// const SizedBox(height: 15),
// const SizedBox(height: 15),
menuWidget('help_info', 'FAQs', () {
Get.back();
Get.to(
@@ -275,13 +276,13 @@ class _AppDrawerState extends State<AppDrawer> {
// )
// : const SizedBox(),
// ),
menuWidget('phone', 'Contact Us', () {
Get.back();
Get.to(
() => const ContactUs(),
);
}, false),
const SizedBox(height: 15),
// menuWidget('phone', 'Contact Us', () {
// Get.back();
// Get.to(
// () => const ContactUs(),
// );
// }, false),
//const SizedBox(height: 15),
menuWidget('phone', 'My Subscription', () {
Get.back();
Get.to(