Skip to content
This repository has been archived by the owner on Oct 15, 2023. It is now read-only.

Première mise à jour via le canal beta de Papillon #3

Merged
merged 102 commits into from
Jan 4, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
102 commits
Select commit Hold shift + click to select a range
814c5ce
Update README.md
ecnivtwelve Dec 30, 2022
cbf9d92
Merge pull request #1 from PapillonApp/master
ecnivtwelve Dec 30, 2022
276236e
Fix de légers bugs d'affichage
ecnivtwelve Dec 30, 2022
63f889c
Passage à une liste pour l'affichage des données
ecnivtwelve Dec 30, 2022
57c908d
Ajout d'un meilleur handler des erreurs dans le login
ecnivtwelve Dec 30, 2022
77749b0
Amélioration des détails des erreurs
ecnivtwelve Dec 30, 2022
3be1602
Changement de label
ecnivtwelve Dec 30, 2022
698cfba
Ajout de loadings
ecnivtwelve Dec 30, 2022
92301f1
Fix sur le login sur PC
ecnivtwelve Dec 30, 2022
3058eb8
Fix de l'onglet notes coté client avec les changements d'API
ecnivtwelve Dec 30, 2022
6c4ae80
Chargement dynamique des ENTs
ecnivtwelve Dec 30, 2022
388894e
Ajout du statut du serveur
ecnivtwelve Dec 30, 2022
da96d9a
Passage à la nouvelle API de CORS
ecnivtwelve Dec 30, 2022
aa50571
Changement des couleurs
ecnivtwelve Dec 30, 2022
24baae2
Ajout d'un skeleton sur les notes
ecnivtwelve Dec 30, 2022
40c8759
Fix des devoirs
ecnivtwelve Dec 30, 2022
0329e63
Ajout d'un ToFixed sur les moyennes
ecnivtwelve Dec 30, 2022
19de426
Ajout d'un toFixed sur les moyennes
ecnivtwelve Dec 30, 2022
c6150aa
➕ Add Educonnect message
lucas-luchack Dec 30, 2022
03e0178
Ajout des icones Android
ecnivtwelve Dec 31, 2022
509f4ef
Merge branch 'development' of https://github.com/PapillonApp/papillon…
ecnivtwelve Dec 31, 2022
c112ea7
Cleanup des modules inutiles
ecnivtwelve Dec 31, 2022
6fe79a3
Ajout des intitulés de notes
ecnivtwelve Dec 31, 2022
d2e4511
➕ Add Workflow for publishing on stores
lucas-luchack Jan 1, 2023
8d296cd
🪱 Adding for Android test
lucas-luchack Jan 1, 2023
7fa95ed
⌚ Add cache to workflow
lucas-luchack Jan 1, 2023
c57da5b
🪱 Fix ubuntu to macos
lucas-luchack Jan 1, 2023
71919ce
Automatic update
github-actions[bot] Jan 1, 2023
00e129c
Fix something
lucas-luchack Jan 1, 2023
c05b6b6
🪄 Last manual editing of Package.json
lucas-luchack Jan 1, 2023
fb9805b
🪱 Fix Fastlane call error
lucas-luchack Jan 1, 2023
df693ec
🚩 Update play_store.json (wasn't hide)
lucas-luchack Jan 1, 2023
101e3a6
🚩 Set right path
lucas-luchack Jan 1, 2023
f434241
🎃 Oupsi, this is good now
lucas-luchack Jan 1, 2023
80ed908
💭 Update of workflow
lucas-luchack Jan 2, 2023
776c4b8
🚩 Fix Android Fastlane
lucas-luchack Jan 2, 2023
e13329c
🤖 Android Fastlane finished
lucas-luchack Jan 2, 2023
a21413d
🚩 Fix last bugs
lucas-luchack Jan 2, 2023
48bca2a
🈵 Temporary disabled
lucas-luchack Jan 2, 2023
4a43b09
🖊️ Change iOS minimum version
lucas-luchack Jan 2, 2023
ff64a93
🪱 Oups...
lucas-luchack Jan 2, 2023
dc66551
💭 Temporary edit
lucas-luchack Jan 2, 2023
a261c0f
New attempt
lucas-luchack Jan 2, 2023
3833c8b
Re-Oupsi
lucas-luchack Jan 2, 2023
b23233f
💭 Set TEST lane
lucas-luchack Jan 2, 2023
45429c0
🚩 Finish workflow for Android
lucas-luchack Jan 2, 2023
eb04476
🗒️ Little changes
lucas-luchack Jan 2, 2023
fc6ae67
Fix des icônes
ecnivtwelve Jan 2, 2023
0981754
Merge branch 'development' of https://github.com/PapillonApp/papillon…
ecnivtwelve Jan 2, 2023
add9c89
🪄 Remove useless step in workflow
lucas-luchack Jan 2, 2023
b85d388
💭 Add build on README
lucas-luchack Jan 2, 2023
26d1bb5
🖊️ Add caps
lucas-luchack Jan 2, 2023
4b15f7d
Design des cours en cartes
ecnivtwelve Jan 2, 2023
2d908c9
Merge branch 'development' of https://github.com/PapillonApp/papillon…
ecnivtwelve Jan 2, 2023
5432fda
Ajout du nom de la matière dans la modal + changements de design
ecnivtwelve Jan 2, 2023
1e2a606
Meilleur error handling pour les refresh token
ecnivtwelve Jan 2, 2023
d3b1d0e
Ajout d'un spinner sur le loading dans la page emploi du temps
ecnivtwelve Jan 2, 2023
0ef4e1e
🧱 Change bundle identifier
lucas-luchack Jan 2, 2023
99e523e
🪱 Fix Android version set
lucas-luchack Jan 2, 2023
f493cc8
Fix du calendrier sur la page de devoirs
ecnivtwelve Jan 2, 2023
276f1a2
Fix des couleurs de l'interface Android
ecnivtwelve Jan 2, 2023
38e8deb
Merge branch 'development' of https://github.com/PapillonApp/papillon…
ecnivtwelve Jan 2, 2023
d713103
🖌️ Change style when lesson cancelled
lucas-luchack Jan 2, 2023
e68e19d
🪄 Change to the right icon
lucas-luchack Jan 2, 2023
6949247
✒️ Update Mark system when non significant
lucas-luchack Jan 2, 2023
64a60c5
👍🏻 Add when mark is bonus or other
lucas-luchack Jan 2, 2023
bcc5fae
✒️ Add significant for average
lucas-luchack Jan 2, 2023
81e0033
🚩 API return Number so it's useless
lucas-luchack Jan 2, 2023
1b0c89d
📚 Fix homework cache
lucas-luchack Jan 2, 2023
e576e8a
📆 Add data to Timetable
lucas-luchack Jan 2, 2023
1264dff
🗞️ Add periods
lucas-luchack Jan 2, 2023
4d2dffd
🧨 Capitalize establishment name and class
lucas-luchack Jan 2, 2023
9ac14b4
Merge pull request #2 from PapillonApp/features/new-api
ecnivtwelve Jan 2, 2023
5c33764
🔧 Fixed grade display
ecnivtwelve Jan 2, 2023
a67c4ad
💻 Adaptation à la nouvelle API
ecnivtwelve Jan 2, 2023
a6d61ba
🧠 Added toFixed on averages
ecnivtwelve Jan 2, 2023
2d384de
🪄 Replace timetable mention in grades file
lucas-luchack Jan 2, 2023
b18b791
🗑 Removed ent_list
lucas-luchack Jan 3, 2023
f42c8fe
🚩 Fix spelling error
lucas-luchack Jan 3, 2023
9093c3f
🐍 Add API version
lucas-luchack Jan 3, 2023
33adf39
🖊️ Fix spelling error
lucas-luchack Jan 3, 2023
7eee8b4
🚩 Add error message
lucas-luchack Jan 3, 2023
d0b72a4
🧨 Put displayToast in function
lucas-luchack Jan 3, 2023
cbd1ab4
🧨 Finish change toast display
lucas-luchack Jan 3, 2023
c0ab68f
🪄 Enhance skeleton loading
lucas-luchack Jan 3, 2023
3b07a60
✒️ Add isDismissible value
lucas-luchack Jan 3, 2023
50ad789
🗞️ Start adding multiple cas selection
lucas-luchack Jan 3, 2023
1049125
🧨 Oups, I forgot to import
lucas-luchack Jan 3, 2023
914a14a
🪄 Transform Array to String
lucas-luchack Jan 3, 2023
1c65253
📆 Fix calendar date selection
lucas-luchack Jan 3, 2023
add238f
Passage au router natif de Vue.js
ecnivtwelve Jan 4, 2023
3b09cd9
Merge branch 'development' of https://github.com/PapillonApp/papillon…
ecnivtwelve Jan 4, 2023
9eb79ba
Fix des changements du dernier commit sur les cours
ecnivtwelve Jan 4, 2023
230a1aa
Utilisation de l'id de la matière pour les couleurs (bonne idée je sa…
ecnivtwelve Jan 4, 2023
3989f85
Changements de design sous iOS
ecnivtwelve Jan 4, 2023
59500d4
Amélioration du design des notes sous iOS
ecnivtwelve Jan 4, 2023
ec5d94a
♦️ Change color for status
lucas-luchack Jan 4, 2023
7bda435
Changement de version pour build
ecnivtwelve Jan 4, 2023
66c6de1
Merge branch 'development' of https://github.com/PapillonApp/papillon…
ecnivtwelve Jan 4, 2023
e1a78c3
🧨 Fix when room or teacher is empty
lucas-luchack Jan 4, 2023
99fd632
Ajout interne du picker d'ENT
ecnivtwelve Jan 4, 2023
4f984ac
Merge branch 'development' of https://github.com/PapillonApp/papillon…
ecnivtwelve Jan 4, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Ajout de loadings
  • Loading branch information
ecnivtwelve committed Dec 30, 2022
commit 698cfba9a7b845294bb80cc426e004faf3696bbd
14 changes: 12 additions & 2 deletions src/views/GradesView.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script>
import { defineComponent } from 'vue';
import { IonHeader, IonContent, IonToolbar, IonTitle, IonMenuButton, IonPage, IonButtons, IonButton, IonList, IonListHeader, IonLabel, IonItem, toastController, IonCard } from '@ionic/vue';
import { IonHeader, IonContent, IonToolbar, IonTitle, IonMenuButton, IonPage, IonButtons, IonButton, IonList, IonListHeader, IonLabel, IonItem, toastController, IonCard, IonSpinner } from '@ionic/vue';

import { calendarOutline } from 'ionicons/icons';

Expand All @@ -24,13 +24,15 @@
IonItem,
IonLabel,
IonList,
IonListHeader
IonListHeader,
IonSpinner
},
data() {
return {
grades: [],
averages: [],
classAverages: [],
isLoading: false,
}
},
methods: {
Expand All @@ -43,9 +45,12 @@
}
},
mounted() {
this.isLoading = true;

GetGrades().then((data) => {
this.grades = data.marks;
this.averages = data.averages;
this.isLoading = false;

this.classAverages = data.averages.class;
});
Expand Down Expand Up @@ -75,6 +80,11 @@

<div id="noTouchZone"></div>

<ion-item v-if="this.isLoading">
<ion-label>Chargement des notes</ion-label>
<ion-spinner></ion-spinner>
</ion-item>

<ion-card class="subject" v-for="(subject, index) in grades" v-bind:key="index">
<div class="subject-name" :style="`background: ${getRandomColor()};`">
<h3>{{subject.name}}</h3>
Expand Down
2 changes: 1 addition & 1 deletion src/views/login/LoginView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@

.slideButton {
position: absolute;
bottom: 5vh;
bottom: 8vh;
width: 80%;
}

Expand Down