Merge branch 'main' into 1042-chore-alter-redirect-uri-based-on-appli…

…cation-communicating-with-be
GenerateNU · Jun 18, 2024 · 50a9f51 · 50a9f51
2 parents bec18c7 + 3da58bd
commit 50a9f51
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 40 deletions.
diff --git a/backend/entities/auth/base/transactions.go b/backend/entities/auth/base/transactions.go
@@ -13,9 +13,11 @@ func FindOrCreateUser(ctx context.Context, db *gorm.DB, user soth.User) (*models
 	var sacUser models.User
 	if err := db.WithContext(ctx).Where("email = ?", user.Email).First(&sacUser).Error; err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
-			if err := createUser(ctx, db, user.Into()); err != nil {
+			user, err := createUser(ctx, db, *user.Into())
+			if err != nil {
 				return nil, err
 			}
+			return user, nil
 		} else {
 			return nil, err
 		}
@@ -24,24 +26,24 @@ func FindOrCreateUser(ctx context.Context, db *gorm.DB, user soth.User) (*models
 	return &sacUser, nil
 }
 
-func createUser(ctx context.Context, db *gorm.DB, user *models.User) error {
+func createUser(ctx context.Context, db *gorm.DB, user models.User) (*models.User, error) {
 	tx := db.WithContext(ctx).Begin()
 	defer func() {
 		if r := recover(); r != nil {
 			tx.Rollback()
 		}
 	}()
 
-	if err := tx.Create(user).Error; err != nil {
+	if err := tx.Create(&user).Error; err != nil {
 		tx.Rollback()
-		return err
+		return nil, err
 	}
 
 	welcomeTask := models.WelcomeTask{Name: user.Name, Email: user.Email}
 	if err := tx.Create(&welcomeTask).Error; err != nil {
 		tx.Rollback()
-		return err
+		return nil, err
 	}
 
-	return tx.Commit().Error
+	return &user, tx.Commit().Error
 }
diff --git a/backend/integrations/oauth/soth/sothic/sothic.go b/backend/integrations/oauth/soth/sothic/sothic.go
@@ -353,9 +353,11 @@ func updateSessionValue(session *session.Session, key, value string) error {
 	if _, err := gz.Write([]byte(value)); err != nil {
 		return err
 	}
+
 	if err := gz.Flush(); err != nil {
 		return err
 	}
+
 	if err := gz.Close(); err != nil {
 		return err
 	}

diff --git a/frontend/lib/package.json b/frontend/lib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@generatesac/lib",
-  "version": "0.0.179",
+  "version": "0.0.180",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/frontend/lib/src/api/base.ts b/frontend/lib/src/api/base.ts
@@ -1,11 +1,12 @@
 import { createApi, fetchBaseQuery } from "@reduxjs/toolkit/query/react";
 
-export const API_BASE_URL = "http://127.0.0.1:8080/api/v1";
+export const LOCAL_API_BASE_URL = "http://localhost:3000/api/v1";
+export const PROD_API_BASE_URL = "https://studentactivitycalendar.xyz/api/v1";
 
 // BaseAPI for the entire application:
 export const baseApi = createApi({
   baseQuery: fetchBaseQuery({
-    baseUrl: API_BASE_URL,
+    baseUrl: PROD_API_BASE_URL,
     credentials: "include",
     prepareHeaders: async (headers, { getState }) => {
       // User slice existing must exist in all dependent apps:

diff --git a/frontend/mobile/app.json b/frontend/mobile/app.json
@@ -2,7 +2,7 @@
     "expo": {
         "name": "sac-mobile",
         "slug": "student-activity-calendar",
-        "version": "1.0.3",
+        "version": "1.0.4",
         "orientation": "portrait",
         "icon": "./src/assets/images/icon.png",
         "scheme": "myapp",

diff --git a/frontend/mobile/package.json b/frontend/mobile/package.json
@@ -25,7 +25,7 @@
         "@fortawesome/free-solid-svg-icons": "^6.5.2",
         "@fortawesome/react-fontawesome": "^0.2.2",
         "@fortawesome/react-native-fontawesome": "^0.3.2",
-        "@generatesac/lib": "0.0.179",
+        "@generatesac/lib": "0.0.180",
         "@gorhom/bottom-sheet": "^4.6.3",
         "@hookform/resolvers": "^3.4.2",
         "@react-native-async-storage/async-storage": "^1.23.1",

diff --git a/frontend/mobile/src/app/auth/index.tsx b/frontend/mobile/src/app/auth/index.tsx
@@ -1,8 +1,6 @@
 import React from 'react';
 import { Image, Linking, SafeAreaView } from 'react-native';
 
-import { router } from 'expo-router';
-
 import { authApi } from '@generatesac/lib';
 
 import Loading from '@/src/assets/gif/loading.gif';
@@ -57,23 +55,6 @@ const WelcomePage = () => {
                             'Continue with Outlook'
                         )}
                     </Button>
-                    <Button
-                        variant="standardButton"
-                        color="darkRed"
-                        onPress={() => router.navigate('/auth/callback')}
-                    >
-                        {isLoading ? (
-                            <Image
-                                source={Loading}
-                                style={{
-                                    width: 15,
-                                    height: 15
-                                }}
-                            />
-                        ) : (
-                            'View Callback'
-                        )}
-                    </Button>
                 </Box>
             </GlobalLayout>
         </SafeAreaView>

diff --git a/frontend/mobile/src/app/design-system/components/Calendar/DayTimeSection.tsx b/frontend/mobile/src/app/design-system/components/Calendar/DayTimeSection.tsx
@@ -40,17 +40,15 @@ function convertNumToTime(num: number) {
     let meridiem = num === 23 ? 'AM' : 'PM';
     let minutes = num % 100;
 
-    if (num !== 0 && (num < 1000 || num > 2359)) {
+    if (num !== 0 && (num < 0 || num > 2359)) {
         throw new Error('Invalid time');
     }
 
     time = time / 100;
-
-    if (num < 12) {
-        time += 12;
+    if (time < 12) {
         meridiem = 'AM';
     }
-    if (num > 12) {
+    if (time > 12) {
         time -= 12;
     }
 

diff --git a/frontend/mobile/src/app/design-system/components/EventCard/Variants/EventCardBig.tsx b/frontend/mobile/src/app/design-system/components/EventCard/Variants/EventCardBig.tsx
@@ -29,7 +29,7 @@ export const EventCardBig: React.FC<EventCardBigProps> = ({
     return (
         <Box>
             <TouchableOpacity
-                onPress={() => router.navigate(`/event/${eventId}`)}
+                onPress={() => router.navigate(`/app/event/${eventId}`)}
             >
                 <Box gap="xs">
                     <Image

diff --git a/frontend/mobile/yarn.lock b/frontend/mobile/yarn.lock
@@ -1402,10 +1402,10 @@
     humps "^2.0.1"
     prop-types "^15.7.2"
 
-"@generatesac/[email protected].179":
-  version "0.0.179"
-  resolved "https://registry.yarnpkg.com/@generatesac/lib/-/lib-0.0.179.tgz#48941b9f059bcfc5508291bfa86d2c1f7c03d3da"
-  integrity sha512-N44CToFq1EDAJKnulpvPRkAp8GmC5x/T4NVSx5jO1de3YAMJX7r9vg+99eLHDkhAc+jZPyEckAiQQCfpG+uEsA==
+"@generatesac/[email protected].180":
+  version "0.0.180"
+  resolved "https://registry.yarnpkg.com/@generatesac/lib/-/lib-0.0.180.tgz#01a5866af05ccbd369e14faddb8acb2745b9fece"
+  integrity sha512-UxIBGebRwwHdNyX8CHMmMTbC6WwQMKbvzAtRGCZyMvkldasw+XdQ9+F+WzZyR6OF1Lp84VLJsF6UAIYLO1slVQ==
   dependencies:
     "@reduxjs/toolkit" "^2.2.3"
     react "^18.2.0"