Merge branch 'main' into feature/format-homework-content

eslint.config.js

@@ -3,6 +3,14 @@ const unusedImports = require("eslint-plugin-unused-imports");
 const typescript = require("@typescript-eslint/parser");
 
 module.exports = [
+  { // Ignored directory
+    ignores: [
+      "**/node_modules/",
+      "**/android/",
+      "**/ios/",
+      "**/.*"
+    ]
+  },
   { // Apply to `cjs`, `.mjs` and `.js` files.
     files: ["**/*.?([cm])js?(x)"]
   },

package.json

@@ -23,7 +23,7 @@
     "@react-navigation/native": "^6.1.17",
     "@react-navigation/native-stack": "^6.9.26",
     "@react-navigation/stack": "^6.4.0",
-    "alise-api": "^0.1.2",
+    "alise-api": "^0.1.3",
     "axios": "^1.7.7",
     "buffer": "^6.0.3",
     "cal-parser": "^1.0.2",

src/components/Global/AnimatedNumber.tsx

@@ -50,7 +50,7 @@ const AnimatedNumber: React.FC<AnimatedNumberProps> = ({
       }, contentContainerStyle]}
       layout={animPapillon(LinearTransition)}
     >
-      {value.toString().split("").map((n, i) => (
+      {value.toString().split("").map((n:number, i:number) => (
         <Reanimated.View
           key={i + "_" + n}
           entering={animPapillon(FadeInDown).delay(i * 20 + 20).mass(1).damping(30).stiffness(700)}

src/components/Global/PapillonPicker.tsx

@@ -10,12 +10,13 @@ import { NativeText } from "./NativeComponents";
 import { BlurView } from "expo-blur";
 import { Check } from "lucide-react-native";
 
-type PickerData = string[] | { label: string, icon?: JSX.Element, onPress: () => unknown }[];
+export type PickerDataItem = { index?: number, label: string, icon?: JSX.Element, onPress?: () => unknown };
+export type PickerData = string[] | PickerDataItem[];
 
 interface PapillonPickerProps {
   children: React.ReactNode
   data: PickerData
-  selected?: string
+  selected?: string | PickerDataItem
   contentContainerStyle?: StyleProp<AnimatedStyle<StyleProp<ViewStyle>>>
   delay?: number,
   direction?: "left" | "right",
@@ -204,4 +205,4 @@ const styles = StyleSheet.create({
   },
 });
 
-export default PapillonPicker;
+export default PapillonPicker;

src/components/Grades/AnimatedEmoji.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from "react";
-import { View, Text } from "react-native";
+import { View } from "react-native";
 import Animated, {
   useAnimatedStyle,
   useSharedValue,

src/components/Grades/GradeModal.tsx

@@ -5,13 +5,11 @@ import {
   Image,
   TouchableOpacity,
   Text,
-  Platform,
   Alert
 } from "react-native";
-import { Download, Trash, Maximize2, Share, Delete } from "lucide-react-native";
+import { Download, Trash, Share } from "lucide-react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { BlurView } from "expo-blur";
-import { ScrollView } from "react-native-gesture-handler";
 import * as Sharing from "expo-sharing";
 import * as FileSystem from "expo-file-system";
 import * as MediaLibrary from "expo-media-library";
@@ -46,7 +44,7 @@ const GradeModal: React.FC<GradeModalProps> = ({
       await FileSystem.writeAsStringAsync(fileUri, imageBase64, { encoding: FileSystem.EncodingType.Base64 });
       const asset = await MediaLibrary.createAssetAsync(fileUri);
       await MediaLibrary.createAlbumAsync("Download", asset, false);
-      Alert.alert("Image sauvegardée", "L'image a été sauvegardée dans votre galerie.");
+      Alert.alert("Image sauvegardée", "L'image a été sauvegardée dans ta galerie.");
     } catch (error) {
       console.error("Failed to save image:", error);
     }

src/components/Settings/ApparenceContainerCard.tsx

@@ -23,7 +23,7 @@ const ApparenceContainerCard = () => {
           Mode d'affichage
         </NativeText>
         <NativeText variant="subtitle">
-          Par défaut, Papillon s'adapte à votre thème système. Mais vous pouvez choisir un thème clair ou sombre.
+          Par défaut, Papillon s'adapte à ton thème système. Mais tu peux choisir un thème clair ou sombre.
         </NativeText>
       </NativeItem>
     </NativeList>

src/consts/DefaultTabs.ts

@@ -60,7 +60,7 @@ export const defaultTabs = [
   {
     tab: "Evaluation",
     label: "Compétences",
-    description: "Vos compétences et évaluations",
+    description: "Tes compétences et évaluations",
     icon: require("@/../assets/lottie/tab_evaluations.json"),
     enabled: true,
   }

src/router/helpers/types.ts

@@ -137,7 +137,7 @@ export type RouteParameters = {
 
   Menu?: undefined;
   RestaurantQrCode: {
-    QrCodes: string[];
+    QrCodes: Array<string | Blob>;
   };
   RestaurantHistory: {
     histories: ReservationHistory[];

src/router/navigator/atoms/MenuItem.tsx

@@ -1,13 +1,11 @@
 import * as React from "react";
-import { useCurrentAccount } from "@/stores/account";
-import { useNavigationBuilder, useTheme } from "@react-navigation/native";
-import { StyleSheet, View, Text, Platform } from "react-native";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { useTheme } from "@react-navigation/native";
+import { StyleSheet, Platform } from "react-native";
 import LottieView from "lottie-react-native";
 import colorsList from "@/utils/data/colors.json";
 import { Pressable } from "react-native-gesture-handler";
 import * as Haptics from "expo-haptics";
-import Reanimated, { FadeIn, FadeOut, LinearTransition, ZoomIn } from "react-native-reanimated";
+import Reanimated, { FadeIn, FadeOut, LinearTransition } from "react-native-reanimated";
 import { anim2Papillon } from "@/utils/ui/animations";
 
 const MenuItem: React.FC<{

src/router/navigator/atoms/TabItem.tsx

@@ -1,8 +1,6 @@
 import * as React from "react";
-import { useCurrentAccount } from "@/stores/account";
-import { useNavigationBuilder, useTheme } from "@react-navigation/native";
-import { StyleSheet, View, Text, Platform } from "react-native";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { useTheme } from "@react-navigation/native";
+import { StyleSheet, Platform } from "react-native";
 import LottieView from "lottie-react-native";
 import colorsList from "@/utils/data/colors.json";
 import { Pressable } from "react-native-gesture-handler";

src/router/navigator/menu.tsx

@@ -1,17 +1,13 @@
-import React, { useEffect, useMemo, useState } from "react";
+import React, { useMemo, useState } from "react";
 import { useCurrentAccount } from "@/stores/account";
 import { useNavigationBuilder, useTheme } from "@react-navigation/native";
-import { StyleSheet, View, ScrollView, Platform, Image, Text, StatusBar } from "react-native";
+import { StyleSheet, Platform, Image, Text, StatusBar } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
-import TabItem from "./atoms/TabItem";
 
-import Reanimated, { LinearTransition, useSharedValue } from "react-native-reanimated";
+import Reanimated from "react-native-reanimated";
 import MenuItem from "./atoms/MenuItem";
-import AccountSwitcher from "@/components/Home/AccountSwitcher";
 import ContextMenu from "@/components/Home/AccountSwitcherContextMenu";
-import { NativeText } from "@/components/Global/NativeComponents";
 import { defaultProfilePicture } from "@/utils/ui/default-profile-picture";
-import { he } from "date-fns/locale";
 
 const PapillonNavigatorMenu: React.FC<Omit<ReturnType<typeof useNavigationBuilder>, "NavigationContent">> = ({ state, descriptors, navigation }) => {
   const theme = useTheme();

src/router/navigator/navigator.tsx

@@ -1,8 +1,7 @@
 import { BottomTabView } from "@react-navigation/bottom-tabs";
 import { createNavigatorFactory, TabRouter, useNavigationBuilder } from "@react-navigation/native";
 import PapillonNavigatorTabs from "./tabs";
-import { memo, useEffect, useMemo, useState } from "react";
-import { Dimensions, View } from "react-native";
+import { View } from "react-native";
 import PapillonNavigatorMenu from "./menu";
 import useScreenDimensions from "@/hooks/useScreenDimensions";
 

src/router/navigator/tabs.tsx

@@ -1,11 +1,11 @@
 import React, { useEffect, useMemo, useState } from "react";
 import { useCurrentAccount } from "@/stores/account";
 import { useNavigationBuilder, useTheme } from "@react-navigation/native";
-import { StyleSheet, View, Platform } from "react-native";
+import { StyleSheet, Platform } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import TabItem from "./atoms/TabItem";
 
-import Reanimated, { LinearTransition } from "react-native-reanimated";
+import Reanimated from "react-native-reanimated";
 
 const PapillonNavigatorTabs: React.FC<Omit<ReturnType<typeof useNavigationBuilder>, "NavigationContent">> = ({ state, descriptors, navigation }) => {
   const theme = useTheme();

src/services/alise/qrcode.ts

@@ -0,0 +1,6 @@
+import type { AliseAccount } from "@/stores/account/types";
+
+export const getQRCode = async (account: AliseAccount): Promise<Blob | null> => {
+  const barcode = await account.authentication.session.getBarcode();
+  return barcode ?? null;
+};

src/services/ecoledirecte/grades.ts

@@ -26,27 +26,27 @@ const decodeGradeValue = (
   value: ecoledirecte.GradeValue | undefined,
 ): GradeValue => {
   if (typeof value === "undefined")
-    return { value: null, disabled: true };
+    return { value: null, disabled: true, status: null };
 
   switch (value.kind) {
     case GradeKind.Grade:
-      return { value: value.points ?? 0, disabled: false };
+      return { value: value.points ?? 0, disabled: false, status: null };
     case GradeKind.Absent:
-      return { value: value.points ?? 0, disabled: true, information: GradeInformation.Absent };
+      return { value: value.points ?? 0, disabled: true, status: "Abs" };
     case GradeKind.Exempted:
-      return { value: value.points ?? 0, disabled: true, information: GradeInformation.Exempted };
+      return { value: value.points ?? 0, disabled: true, status: "Disp" };
     case GradeKind.NotGraded:
-      return { value: value.points ?? 0, disabled: true, information: GradeInformation.NotGraded };
+      return { value: value.points ?? 0, disabled: true, status: "N. Not" };
     default:
-      return { value: value.points ?? 0, disabled: true };
+      return { value: value.points ?? 0, disabled: true, status: null };
   }
 };
 
 const getGradeValue = (value: number | string | undefined): GradeValue => {
   return {
     disabled: false,
     value: value ? Number(value) : 0,
-    information: undefined,
+    status: null,
   };
 };
 

src/services/grades.ts

@@ -66,8 +66,8 @@ export async function updateGradesAndAveragesInCache <T extends Account> (accoun
   let grades: Grade[] = [];
   let averages: AverageOverview = {
     subjects: [],
-    overall: { value: null, disabled: true },
-    classOverall: { value: null, disabled: true }
+    overall: { value: null, disabled: true, status: null },
+    classOverall: { value: null, disabled: true, status: null}
   };
 
   try {
@@ -100,8 +100,8 @@ export async function updateGradesAndAveragesInCache <T extends Account> (accoun
           grades = [];
           averages = {
             subjects: [],
-            overall: { value: 0, disabled: true },
-            classOverall: { value: 0, disabled: true }
+            overall: { value: 0, disabled: true, status: null },
+            classOverall: { value: 0, disabled: true, status: null }
           };
         }
 

src/services/iutlan/grades.ts

@@ -34,10 +34,12 @@ export const saveIUTLanGrades = async (account: LocalAccount): Promise<{
       classOverall: {
         value: null,
         disabled: true,
+        status: null,
       },
       overall: {
         value: null,
         disabled: true,
+        status: null,
       },
       subjects: []
     };
@@ -63,24 +65,29 @@ export const saveIUTLanGrades = async (account: LocalAccount): Promise<{
           student: {
             value: parseFloat(note.note.value),
             disabled: parsedStudent === null || isNaN(parsedStudent),
+            status: null,
           },
           min: {
             value: parseFloat(note.note.min),
             disabled: parsedMin === null || isNaN(parsedMin),
+            status: null,
           },
           max: {
             value: parseFloat(note.note.max),
             disabled: parsedMax === null || isNaN(parsedMax),
+            status: null,
           },
           average: {
             value: parseFloat(note.note.moy),
             disabled: parsedAverage === null || isNaN(parsedAverage),
+            status: null,
           },
 
           id: uuid(),
           outOf: {
             value: 20,
             disabled: false,
+            status: null,
           },
           description: note.description,
           timestamp: new Date(note.date).getTime(),
@@ -112,24 +119,29 @@ export const saveIUTLanGrades = async (account: LocalAccount): Promise<{
         classAverage: {
           value: classAverage,
           disabled: false,
+          status: null,
         },
         color: "#888888",
         max: {
           value: max,
           disabled: false,
+          status: null,
         },
         subjectName: subject.name,
         min: {
           value: min,
           disabled: false,
+          status: null,
         },
         average: {
           value: average,
           disabled: false,
+          status: null,
         },
         outOf: {
           value: 20,
           disabled: false,
+          status: null,
         },
       });
     });
@@ -144,10 +156,12 @@ export const saveIUTLanGrades = async (account: LocalAccount): Promise<{
         classOverall: {
           value: null,
           disabled: true,
+          status: null,
         },
         overall: {
           value: null,
           disabled: true,
+          status: null,
         },
         subjects: []
       }

src/services/pronote/evaluations.ts

@@ -12,7 +12,7 @@ const getTab = (account: PronoteAccount): pronote.Tab => {
 
   const tab = account.instance.user.resources[0].tabs.get(pronote.TabLocation.Evaluations);
   if (!tab)
-    throw new Error("Vous n'avez pas accès à l'onglet 'Compétences' dans PRONOTE");
+    throw new Error("Tu n'as pas accès à l'onglet 'Compétences' dans PRONOTE");
 
   return tab;
 };