Merge branch 'master' into nikita/fix-google-login

admin/src/all.dto.ts

@@ -1,26 +1,24 @@
-// CODE AUTOGENERATED BY npm run updateapi
-// IF YOU MODIFY THIS FILE, MAKE SURE TO ALSO MODIFY THE updateapi SCRIPT!
-// OTHERWISE YOUR CHANGES MAY BE OVERWRITTEN!
-export enum AchievementTypeDto {
+
+  // CODE AUTOGENERATED BY npm run updateapi
+  // IF YOU MODIFY THIS FILE, MAKE SURE TO ALSO MODIFY THE updateapi SCRIPT!
+  // OTHERWISE YOUR CHANGES MAY BE OVERWRITTEN!
+  export enum AchievementTypeDto {
   TOTAL_POINTS = "TOTAL_POINTS",
   TOTAL_CHALLENGES = "TOTAL_CHALLENGES",
   TOTAL_JOURNEYS = "TOTAL_JOURNEYS",
-  TOTAL_CHALLENGES_OR_JOURNEYS = "TOTAL_CHALLENGES_OR_JOURNEYS",
-}
+  TOTAL_CHALLENGES_OR_JOURNEYS = "TOTAL_CHALLENGES_OR_JOURNEYS",}
 
 export enum LoginAudDto {
   android = "android",
   ios = "ios",
-  web = "web",
-}
+  web = "web",}
 
 export enum LoginEnrollmentTypeDto {
   UNDERGRADUATE = "UNDERGRADUATE",
   GRADUATE = "GRADUATE",
   FACULTY = "FACULTY",
   ALUMNI = "ALUMNI",
-  GUEST = "GUEST",
-}
+  GUEST = "GUEST",}
 
 export enum ChallengeLocationDto {
   ENG_QUAD = "ENG_QUAD",
@@ -30,47 +28,40 @@ export enum ChallengeLocationDto {
   WEST_CAMPUS = "WEST_CAMPUS",
   COLLEGETOWN = "COLLEGETOWN",
   ITHACA_COMMONS = "ITHACA_COMMONS",
-  ANY = "ANY",
-}
+  ANY = "ANY",}
 
 export enum EventCategoryDto {
   FOOD = "FOOD",
   NATURE = "NATURE",
   HISTORICAL = "HISTORICAL",
   CAFE = "CAFE",
   DININGHALL = "DININGHALL",
-  DORM = "DORM",
-}
+  DORM = "DORM",}
 
 export enum EventTimeLimitationDto {
   LIMITED_TIME = "LIMITED_TIME",
-  PERPETUAL = "PERPETUAL",
-}
+  PERPETUAL = "PERPETUAL",}
 
 export enum EventDifficultyDto {
   Easy = "Easy",
   Normal = "Normal",
-  Hard = "Hard",
-}
+  Hard = "Hard",}
 
 export enum SetAuthToOAuthProviderDto {
   apple = "apple",
-  google = "google",
-}
+  google = "google",}
 
 export enum UserEnrollmentTypeDto {
   UNDERGRADUATE = "UNDERGRADUATE",
   GRADUATE = "GRADUATE",
   FACULTY = "FACULTY",
   ALUMNI = "ALUMNI",
-  GUEST = "GUEST",
-}
+  GUEST = "GUEST",}
 
 export enum UserAuthTypeDto {
   apple = "apple",
   google = "google",
-  device = "device",
-}
+  device = "device",}
 
 export interface AchievementDto {
   id: string;
@@ -103,8 +94,8 @@ export interface RequestAchievementDataDto {
 export interface LoginDto {
   idToken: string;
   noRegister: boolean;
-  lat?: number;
-  long?: number;
+  latF?: number;
+  longF?: number;
   username?: string;
   year?: string;
   college?: string;
@@ -240,15 +231,18 @@ export interface UpdateEventDataDto {
   deleted: boolean;
 }
 
-export interface UseEventTrackerHintDto {}
+export interface UseEventTrackerHintDto {
+}
 
 export interface JoinGroupDto {
   groupId: string;
 }
 
-export interface LeaveGroupDto {}
+export interface LeaveGroupDto {
+}
 
-export interface RequestGroupDataDto {}
+export interface RequestGroupDataDto {
+}
 
 export interface SetCurrentEventDto {
   eventId: string;
@@ -301,22 +295,7 @@ export interface UpdateOrganizationDataDto {
   deleted: boolean;
 }
 
-export interface CloseAccountDto {}
-
-export interface SetUsernameDto {
-  newUsername: string;
-}
-
-export interface SetCollegeDto {
-  newCollege: string;
-}
-
-export interface SetMajorDto {
-  newMajor: string;
-}
-
-export interface SetGraduationYearDto {
-  newYear: string;
+export interface CloseAccountDto {
 }
 
 export interface BanUserDto {
@@ -342,7 +321,8 @@ export interface RequestUserDataDto {
   userId?: string;
 }
 
-export interface RequestAllUserDataDto {}
+export interface RequestAllUserDataDto {
+}
 
 export interface RequestFavoriteEventDataDto {
   isFavorite: boolean;
@@ -379,3 +359,4 @@ export interface AddManagerDto {
 export interface JoinOrganizationDto {
   accessCode: string;
 }
+

game/ios/Podfile.lock

@@ -1,48 +1,48 @@
 PODS:
-  - AppAuth (1.7.3):
-    - AppAuth/Core (= 1.7.3)
-    - AppAuth/ExternalUserAgent (= 1.7.3)
-  - AppAuth/Core (1.7.3)
-  - AppAuth/ExternalUserAgent (1.7.3):
+  - AppAuth (1.7.4):
+    - AppAuth/Core (= 1.7.4)
+    - AppAuth/ExternalUserAgent (= 1.7.4)
+  - AppAuth/Core (1.7.4)
+  - AppAuth/ExternalUserAgent (1.7.4):
     - AppAuth/Core
   - device_info (0.0.1):
     - Flutter
   - device_info_plus (0.0.1):
     - Flutter
-  - Firebase (10.23.0):
-    - Firebase/Core (= 10.23.0)
-  - Firebase/Analytics (10.23.0):
+  - Firebase (10.24.0):
+    - Firebase/Core (= 10.24.0)
+  - Firebase/Analytics (10.24.0):
     - Firebase/Core
-  - Firebase/Core (10.23.0):
+  - Firebase/Core (10.24.0):
     - Firebase/CoreOnly
-    - FirebaseAnalytics (~> 10.23.0)
-  - Firebase/CoreOnly (10.23.0):
-    - FirebaseCore (= 10.23.0)
-  - FirebaseAnalytics (10.23.0):
-    - FirebaseAnalytics/AdIdSupport (= 10.23.0)
+    - FirebaseAnalytics (~> 10.24.0)
+  - Firebase/CoreOnly (10.24.0):
+    - FirebaseCore (= 10.24.0)
+  - FirebaseAnalytics (10.24.0):
+    - FirebaseAnalytics/AdIdSupport (= 10.24.0)
     - FirebaseCore (~> 10.0)
     - FirebaseInstallations (~> 10.0)
     - GoogleUtilities/AppDelegateSwizzler (~> 7.11)
     - GoogleUtilities/MethodSwizzler (~> 7.11)
     - GoogleUtilities/Network (~> 7.11)
     - "GoogleUtilities/NSData+zlib (~> 7.11)"
     - nanopb (< 2.30911.0, >= 2.30908.0)
-  - FirebaseAnalytics/AdIdSupport (10.23.0):
+  - FirebaseAnalytics/AdIdSupport (10.24.0):
     - FirebaseCore (~> 10.0)
     - FirebaseInstallations (~> 10.0)
-    - GoogleAppMeasurement (= 10.23.0)
+    - GoogleAppMeasurement (= 10.24.0)
     - GoogleUtilities/AppDelegateSwizzler (~> 7.11)
     - GoogleUtilities/MethodSwizzler (~> 7.11)
     - GoogleUtilities/Network (~> 7.11)
     - "GoogleUtilities/NSData+zlib (~> 7.11)"
     - nanopb (< 2.30911.0, >= 2.30908.0)
-  - FirebaseCore (10.23.0):
+  - FirebaseCore (10.24.0):
     - FirebaseCoreInternal (~> 10.0)
     - GoogleUtilities/Environment (~> 7.12)
     - GoogleUtilities/Logger (~> 7.12)
-  - FirebaseCoreInternal (10.23.0):
+  - FirebaseCoreInternal (10.24.0):
     - "GoogleUtilities/NSData+zlib (~> 7.8)"
-  - FirebaseInstallations (10.23.0):
+  - FirebaseInstallations (10.24.0):
     - FirebaseCore (~> 10.0)
     - GoogleUtilities/Environment (~> 7.8)
     - GoogleUtilities/UserDefaults (~> 7.8)
@@ -70,14 +70,14 @@ PODS:
     - GoogleUtilities/Network (~> 7.11)
     - "GoogleUtilities/NSData+zlib (~> 7.11)"
     - nanopb (< 2.30911.0, >= 2.30908.0)
-  - GoogleAppMeasurement/AdIdSupport (10.23.0):
-    - GoogleAppMeasurement/WithoutAdIdSupport (= 10.23.0)
+  - GoogleAppMeasurement/AdIdSupport (10.24.0):
+    - GoogleAppMeasurement/WithoutAdIdSupport (= 10.24.0)
     - GoogleUtilities/AppDelegateSwizzler (~> 7.11)
     - GoogleUtilities/MethodSwizzler (~> 7.11)
     - GoogleUtilities/Network (~> 7.11)
     - "GoogleUtilities/NSData+zlib (~> 7.11)"
     - nanopb (< 2.30911.0, >= 2.30908.0)
-  - GoogleAppMeasurement/WithoutAdIdSupport (10.23.0):
+  - GoogleAppMeasurement/WithoutAdIdSupport (10.24.0):
     - GoogleUtilities/AppDelegateSwizzler (~> 7.11)
     - GoogleUtilities/MethodSwizzler (~> 7.11)
     - GoogleUtilities/Network (~> 7.11)
@@ -216,15 +216,15 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
 
 SPEC CHECKSUMS:
-  AppAuth: a13994980c1ec792f7e2e665acd4d4aa6be43240
+  AppAuth: 182c5b88630569df5acb672720534756c29b3358
   device_info: d7d233b645a32c40dfdc212de5cf646ca482f175
   device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
-  Firebase: 333ec7c6b12fa09c77b5162cda6b862102211d50
-  FirebaseAnalytics: 45f6e2e5ef8ccbb90be73ae983c3b20fa78837f7
-  FirebaseCore: 63efb128decaebb04c4033ed4e05fb0bb1cccef1
-  FirebaseCoreInternal: 6a292e6f0bece1243a737e81556e56e5e19282e3
-  FirebaseInstallations: 42d6ead4605d6eafb3b6683674e80e18eb6f2c35
-  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
+  Firebase: 91fefd38712feb9186ea8996af6cbdef41473442
+  FirebaseAnalytics: b5efc493eb0f40ec560b04a472e3e1a15d39ca13
+  FirebaseCore: 11dc8a16dfb7c5e3c3f45ba0e191a33ac4f50894
+  FirebaseCoreInternal: bcb5acffd4ea05e12a783ecf835f2210ce3dc6af
+  FirebaseInstallations: 8f581fca6478a50705d2bd2abd66d306e0f5736e
+  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   flutter_config: f48f0d47a284f1791aacce2687eabb3309ba7a41
   flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
   fluttertoast: 31b00dabfa7fb7bacd9e7dbee580d7a2ff4bf265

game/ios/Runner.xcodeproj/project.pbxproj

@@ -159,7 +159,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {

game/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"