Skip to content

Commit

Permalink
[App] flutter format all files; [BlogPage] add tooltips; [Drawer] hig…
Browse files Browse the repository at this point in the history
…hlight profile title even when not selected;
  • Loading branch information
tastelessjolt committed Feb 23, 2019
1 parent 1e18e78 commit 150f5e8
Show file tree
Hide file tree
Showing 39 changed files with 282 additions and 221 deletions.
99 changes: 70 additions & 29 deletions lib/src/api/apiclient.dart
Original file line number Diff line number Diff line change
Expand Up @@ -42,33 +42,49 @@ class InstiAppApi extends _$InstiAppApiClient implements ApiClient {
Future<List<Hostel>> getHostelMess();

@GetReq(path: "/pass-login")
Future<Session> passwordLogin(@QueryParam("username") String username, @QueryParam("password") String password);
Future<Session> passwordLogin(@QueryParam("username") String username,
@QueryParam("password") String password);

@GetReq(path: "/pass-login")
Future<Session> passwordLoginFcm(@QueryParam("username") String username, @QueryParam("password") String password, @QueryParam("fcm_id") String fcmId);
Future<Session> passwordLoginFcm(
@QueryParam("username") String username,
@QueryParam("password") String password,
@QueryParam("fcm_id") String fcmId);

@GetReq(path: "/login")
Future<Session> login(@QueryParam() String code, @QueryParam() String redir);

@GetReq(path: "/placement-blog")
Future<List<PlacementBlogPost>> getPlacementBlogFeed(@Header("Cookie") String sessionId, @QueryParam("from") int from, @QueryParam("num") int number, @QueryParam("query") String query);
Future<List<PlacementBlogPost>> getPlacementBlogFeed(
@Header("Cookie") String sessionId,
@QueryParam("from") int from,
@QueryParam("num") int number,
@QueryParam("query") String query);

@GetReq(path: "/training-blog")
Future<List<TrainingBlogPost>> getTrainingBlogFeed(@Header("Cookie") String sessionID, @QueryParam("from") int from, @QueryParam("num") int num, @QueryParam("query") String query);

Future<List<TrainingBlogPost>> getTrainingBlogFeed(
@Header("Cookie") String sessionID,
@QueryParam("from") int from,
@QueryParam("num") int num,
@QueryParam("query") String query);

// Events
@GetReq(path: "/events/:uuid")
Future<Event> getEvent(@Header("Cookie") String sessionId, @PathParam() String uuid);
Future<Event> getEvent(
@Header("Cookie") String sessionId, @PathParam() String uuid);

@GetReq(path: "/events")
Future<NewsFeedResponse> getNewsFeed(@Header("Cookie") String sessionId);

@GetReq(path: "/events")
Future<NewsFeedResponse> getEventsBetweenDates(@Header("Cookie") String sessionId, @QueryParam("start") String start, @QueryParam("end") String end);
Future<NewsFeedResponse> getEventsBetweenDates(
@Header("Cookie") String sessionId,
@QueryParam("start") String start,
@QueryParam("end") String end);

@PostReq(path: "/events")
Future<EventCreateResponse> createEvent(@Header("Cookie") String sessionId, @AsJson() EventCreateRequest eventCreateRequest);
Future<EventCreateResponse> createEvent(@Header("Cookie") String sessionId,
@AsJson() EventCreateRequest eventCreateRequest);

// Venues
@GetReq(path: "/locations")
Expand All @@ -79,79 +95,104 @@ class InstiAppApi extends _$InstiAppApiClient implements ApiClient {

// Users
@GetReq(path: "/users/:uuid")
Future<User> getUser(@Header("Cookie") String sessionId, @PathParam() String uuid);
Future<User> getUser(
@Header("Cookie") String sessionId, @PathParam() String uuid);

// Bodies
@GetReq(path: "/bodies/:uuid")
Future<Body> getBody(@Header("Cookie") String sessionId, @PathParam() String uuid);
Future<Body> getBody(
@Header("Cookie") String sessionId, @PathParam() String uuid);

@GetReq(path: "/bodies")
Future<List<Body>> getAllBodies(@Header("Cookie") String sessionId);

@GetReq(path: "/bodies/:bodyID/follow")
Future<void> updateBodyFollowing(@Header("Cookie") String sessionID, @PathParam("bodyID") String eventID, @QueryParam("action") int action);
Future<void> updateBodyFollowing(@Header("Cookie") String sessionID,
@PathParam("bodyID") String eventID, @QueryParam("action") int action);

// Image upload
@PostReq(path: "/upload")
Future<ImageUploadResponse> uploadImage(@Header("Cookie") String sessionID, @AsJson() ImageUploadRequest imageUploadRequest);
Future<ImageUploadResponse> uploadImage(@Header("Cookie") String sessionID,
@AsJson() ImageUploadRequest imageUploadRequest);

// My data
@GetReq(path: "/user-me")
Future<User> getUserMe(@Header("Cookie") String sessionID);

@GetReq(path: "/user-me/ues/:eventID")
Future<void> updateUserEventStatus(@Header("Cookie") String sessionID, @PathParam() String eventID, @QueryParam("status") int status);
Future<void> updateUserEventStatus(@Header("Cookie") String sessionID,
@PathParam() String eventID, @QueryParam("status") int status);

@PatchReq(path: "/user-me")
Future<User> patchFCMUserMe(@Header("Cookie") String sessionID, @AsJson() UserFCMPatchRequest userFCMPatchRequest);
Future<User> patchFCMUserMe(@Header("Cookie") String sessionID,
@AsJson() UserFCMPatchRequest userFCMPatchRequest);

@PatchReq(path: "/user-me")
Future<User> patchSCNUserMe(@Header("Cookie") String sessionID, @AsJson() UserSCNPatchRequest userSCNPatchRequest);
Future<User> patchSCNUserMe(@Header("Cookie") String sessionID,
@AsJson() UserSCNPatchRequest userSCNPatchRequest);

@GetReq(path: "/news")
Future<List<NewsArticle>> getNews(@Header("Cookie") String sessionID, @QueryParam("from") int from, @QueryParam("num") int num, @QueryParam("query") String query);
Future<List<NewsArticle>> getNews(
@Header("Cookie") String sessionID,
@QueryParam("from") int from,
@QueryParam("num") int num,
@QueryParam("query") String query);

@GetReq(path: "/notifications")
Future<List<Notification>> getNotifications(@Header("Cookie") String sessionID);
Future<List<Notification>> getNotifications(
@Header("Cookie") String sessionID);

@GetReq(path: "/notifications/read/:notificationID")
Future<void> markNotificationRead(@Header("Cookie") String sessionID, @PathParam() String notificationID);
Future<void> markNotificationRead(
@Header("Cookie") String sessionID, @PathParam() String notificationID);

@GetReq(path: "/notifications/read")
@GetReq(path: "/notifications/read")
Future<void> markAllNotificationsRead(@Header("Cookie") String sessionID);

@GetReq(path: "/logout")
Future<void> logout(@Header("Cookie") String sessionID);

// Explore search
@GetReq(path: "/search")
Future<ExploreResponse> search(@Header("Cookie") String sessionID, @QueryParam("query") String query);
Future<ExploreResponse> search(
@Header("Cookie") String sessionID, @QueryParam("query") String query);

// Venter
// Venter
@GetReq(path: "/venter/complaints")
Future<List<Complaint>> getAllComplaints(@Header("Cookie") String sessionId);

@GetReq(path: "/venter/complaints?filter=me")
Future<List<Complaint>> getUserComplaints(@Header("Cookie") String sessionId);

@GetReq(path: "/venter/complaints/:complaintId")
Future<Complaint> getComplaint(@Header("Cookie") String sessionId, @PathParam() String complaintId);
Future<Complaint> getComplaint(
@Header("Cookie") String sessionId, @PathParam() String complaintId);

@GetReq(path: "/venter/complaints/:complaintId/upvote")
Future<Complaint> upVote(@Header("Cookie") String sessionId, @PathParam() String complaintId, @QueryParam("action") int count);
Future<Complaint> upVote(@Header("Cookie") String sessionId,
@PathParam() String complaintId, @QueryParam("action") int count);

@GetReq(path: "/venter/complaints/:complaintId/subscribe")
Future<Complaint> subscribleToComplaint(@Header("Cookie") String sessionId, @PathParam() String complaintId, @QueryParam("action") int count);
Future<Complaint> subscribleToComplaint(@Header("Cookie") String sessionId,
@PathParam() String complaintId, @QueryParam("action") int count);

@PostReq(path: "/venter/complaints")
Future<Complaint> postComplaint(@Header("Cookie") String sessionId, @AsJson() ComplaintCreateRequest complaintCreateRequest);
Future<Complaint> postComplaint(@Header("Cookie") String sessionId,
@AsJson() ComplaintCreateRequest complaintCreateRequest);

@PostReq(path: "/venter/complaints/:complaintId/comments")
Future<Comment> postComment(@Header("Cookie") String sessionId, @PathParam() String complaintId, @AsJson() CommentCreateRequest commentCreateRequest);
Future<Comment> postComment(
@Header("Cookie") String sessionId,
@PathParam() String complaintId,
@AsJson() CommentCreateRequest commentCreateRequest);

@PutReq(path: "/venter/comments/:commentId")
Future<Comment> updateComment(@Header("Cookie") String sessionId, @PathParam() String commentId, @AsJson() CommentCreateRequest commentCreateRequest);
Future<Comment> updateComment(
@Header("Cookie") String sessionId,
@PathParam() String commentId,
@AsJson() CommentCreateRequest commentCreateRequest);

@DeleteReq(path: "/venter/comments/:commentId")
Future<void> deleteComment(@Header("Cookie") String sessionId, @PathParam() String commentId);
}
Future<void> deleteComment(
@Header("Cookie") String sessionId, @PathParam() String commentId);
}
2 changes: 1 addition & 1 deletion lib/src/api/model/body.dart
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@ class Body {
}

@GenSerializer()
class BodySerializer extends Serializer<Body> with _$BodySerializer {}
class BodySerializer extends Serializer<Body> with _$BodySerializer {}
2 changes: 0 additions & 2 deletions lib/src/api/model/datetime.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import 'package:jaguar_serializer/jaguar_serializer.dart';



class DateTimeSerializer extends Serializer<DateTime>
with _$DateTimeSerializer {}

Expand Down
5 changes: 3 additions & 2 deletions lib/src/api/model/event.dart
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ class Event {
}

if (startTime != null) {
subtitle += formatDate(startTime.toLocal(), [dd, " ", M, " | ", HH, ":", nn]);
subtitle +=
formatDate(startTime.toLocal(), [dd, " ", M, " | ", HH, ":", nn]);
}
String eventVenueName = "";
for (var venue in eventVenues) {
Expand All @@ -101,4 +102,4 @@ class Event {
}

@GenSerializer()
class EventSerializer extends Serializer<Event> with _$EventSerializer {}
class EventSerializer extends Serializer<Event> with _$EventSerializer {}
13 changes: 7 additions & 6 deletions lib/src/api/model/mess.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ import 'package:jaguar_serializer/jaguar_serializer.dart';
import 'dart:core';
part 'mess.jser.dart';

class Hostel{
class Hostel {
String id;
String name;

@Alias('short_name')
String shortName;

@Alias('long_name')
String longName;

List<HostelMess> mess;

int compareTo(Hostel h) {
Expand Down Expand Up @@ -40,8 +40,8 @@ class HostelMess {
final now = DateTime.now();
int today = now.weekday;

int x = (this.day - today) + (this.day - today < 0 ? 7 : 0);
int y = (h.day - today) + (h.day - today < 0 ? 7 : 0);
int x = (this.day - today) + (this.day - today < 0 ? 7 : 0);
int y = (h.day - today) + (h.day - today < 0 ? 7 : 0);

return x.compareTo(y);
}
Expand All @@ -63,4 +63,5 @@ class HostelMess {
class HostelSerializer extends Serializer<Hostel> with _$HostelSerializer {}

@GenSerializer()
class HostelMessSerializer extends Serializer<HostelMess> with _$HostelMessSerializer {}
class HostelMessSerializer extends Serializer<HostelMess>
with _$HostelMessSerializer {}
33 changes: 18 additions & 15 deletions lib/src/api/model/post.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,39 +4,42 @@ import 'package:jaguar_serializer/jaguar_serializer.dart';
part 'post.jser.dart';

class Post {
@Alias("id")
String postID;
@Alias("id")
String postID;

@Alias("link")
String link;
@Alias("link")
String link;

@Alias("title")
String title;
@Alias("title")
String title;

@Alias("content")
String content;
@Alias("content")
String content;

@Alias("published")
String published;
@Alias("published")
String published;
}

class PlacementBlogPost extends Post{}
class TrainingBlogPost extends Post{}
class PlacementBlogPost extends Post {}

class TrainingBlogPost extends Post {}

class NewsArticle extends Post {
@Alias("body")
Body body;
}

@GenSerializer()
class NewsArticleSerializer extends Serializer<NewsArticle> with _$NewsArticleSerializer {}
class NewsArticleSerializer extends Serializer<NewsArticle>
with _$NewsArticleSerializer {}

@GenSerializer()
class PostSerializer extends Serializer<Post> with _$PostSerializer {}

@GenSerializer()
class PlacementBlogPostSerializer extends Serializer<PlacementBlogPost> with _$PlacementBlogPostSerializer {}
class PlacementBlogPostSerializer extends Serializer<PlacementBlogPost>
with _$PlacementBlogPostSerializer {}

@GenSerializer()
class TrainingBlogPostSerializer extends Serializer<TrainingBlogPost> with _$TrainingBlogPostSerializer {}
class TrainingBlogPostSerializer extends Serializer<TrainingBlogPost>
with _$TrainingBlogPostSerializer {}
4 changes: 2 additions & 2 deletions lib/src/api/model/rich_notification.dart
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ class RichNotification {
String notificationImage;
}


@GenSerializer()
class RichNotificationSerializer extends Serializer<RichNotification> with _$RichNotificationSerializer {}
class RichNotificationSerializer extends Serializer<RichNotification>
with _$RichNotificationSerializer {}
38 changes: 19 additions & 19 deletions lib/src/api/model/role.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,33 @@ import 'package:jaguar_serializer/jaguar_serializer.dart';
part 'role.jser.dart';

class Role {
@Alias("id")
String roleID;
@Alias("id")
String roleID;

@Alias("name")
String roleName;
@Alias("name")
String roleName;

@Alias("inheritable")
bool roleInheritable;
@Alias("inheritable")
bool roleInheritable;

@Alias("body")
String roleBody;
@Alias("body")
String roleBody;

@Alias("body_detail")
Body roleBodyDetails;
@Alias("body_detail")
Body roleBodyDetails;

@Alias("bodies")
List<Body> roleBodies;
@Alias("bodies")
List<Body> roleBodies;

@Alias("permissions")
List<String> rolePermissions;
@Alias("permissions")
List<String> rolePermissions;

@Alias("users")
List<String> roleUsers;
@Alias("users")
List<String> roleUsers;

@Alias("users_detail")
List<User> roleUsersDetail;
@Alias("users_detail")
List<User> roleUsersDetail;
}

@GenSerializer()
class RoleSerializer extends Serializer<Role> with _$RoleSerializer {}
class RoleSerializer extends Serializer<Role> with _$RoleSerializer {}
5 changes: 3 additions & 2 deletions lib/src/api/model/venter.dart
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,11 @@ class Comment {
}

@GenSerializer()
class ComplaintSerializer extends Serializer<Complaint> with _$ComplaintSerializer {}
class ComplaintSerializer extends Serializer<Complaint>
with _$ComplaintSerializer {}

@GenSerializer()
class TagUriSerializer extends Serializer<TagUri> with _$TagUriSerializer {}

@GenSerializer()
class CommentSerializer extends Serializer<Comment> with _$CommentSerializer {}
class CommentSerializer extends Serializer<Comment> with _$CommentSerializer {}
Loading

0 comments on commit 150f5e8

Please sign in to comment.