Merge dev-led to main (#35)

* Better navigation, Timer functioning, on progress latex * Fixed latex, better ui * Fixed quiz upload input bug, few changes in its UI, and changed cubit deets * Better upload details. Quizzes now have UserRef and SolutionsRef * Working solutions page, with working scores * Working solutions page, with working scores p2
Nesvier-Tech · Mar 12, 2024 · 0e09d49 · 0e09d49
1 parent 86b3463
commit 0e09d49
Show file tree

Hide file tree

Showing 57 changed files with 1,573 additions and 1,040 deletions.
diff --git a/d b/d
@@ -0,0 +1,79 @@
+[33m86b3463[m[33m ([m[1;36mHEAD -> [m[1;32mdev-led[m[33m, [m[1;31morigin/main[m[33m, [m[1;31morigin/dev-led[m[33m, [m[1;31morigin/HEAD[m[33m, [m[1;32mmain[m[33m)[m style: improve user profile UI/UX
+[33m3b59a19[m feat: reset password via email
+[33m0eb834e[m dev: very rough release candidate v0.0.1
+[33ma8ca87d[m chore: sync git
+[33mea5178b[m Quiz mode and upload feature (#28)
+[33mde56798[m dev: basic profile screen
+[33m59b56f3[m dev: auth sign-out option
+[33md3a2d13[m dev: backend code for email & password authentication
+[33mcc03ebc[m dev: other experimental rich text editor using Markdown (w/ latex support)
+[33m930ece0[m style: improve layout and visual elements in email verification screen
+[33md5c7456[m dev: backend code for email verification
+[33med8ace7[m dev: add working BE code for creating a user
+[33m3cb413d[m dev: add UserEntity
+[33m3b2e6d8[m[33m ([m[1;31morigin/dev[m[33m)[m chore: daily git sync
+[33m40533dd[m dev: explore the viability of  flutter_quill text editor (experimental)
+[33m9558e2f[m deps: add flutter_quill and set proper configurations
+[33mcd06c58[m style: add signup screen and validators
+[33medb7f15[m dev: git daily sync
+[33me97d12f[m style: add reset password screen, password reset email confirmation, and validators
+[33m7dfe0ec[m style: add login screen
+[33mcbb8640[m  refactor: convert Entity and Params interfaces to base classes
+[33mcd01dd1[m dev: add custom Failure classes
+[33mdbe2873[m refactor: improve custom Exception classes
+[33mf68d955[m dev: add utility exception classes (auth and db)
+[33mc05e662[m dev: setup the folder structure for the core features: auth, app_settings, and system
+[33m76928c8[m style: setup general screens
+[33m664bd8f[m dev: add no_params class and use case interface
+[33m545489d[m dev: add failure and params interfaces
+[33m6c219de[m dev: add entity and exception interfaces
+[33m686e5c8[m style: add icon launcher for android and web
+[33m272adc3[m style: implement a native splash screen (supports light and dark mode)
+[33mbcedf26[m dev: clean assets folder and add sg-scholar's guide logos
+[33m3b35948[m dev: refactor app_router and upgrade go_router dependency
+[33m5dd9766[m dev: implement a nested and stateful router (using go_router and NavigationBar)
+[33md59ab29[m style: add different app themes
+[33m779c18b[m dev: add a ServiceLocator (using get_it package)
+[33m3212041[m dev: add UpCampuses enum
+[33m7d3bad7[m dev: add StorageTypes enum
+[33m67c4a8b[m dev: add Genders and Sex enums
+[33m3070e29[m dev: add OnlineTimeSource enum
+[33meb79b9c[m dev: add AccountTypes enum
+[33mc7e8640[m dev: add AppColors utility class
+[33m7a0aed5[m fix: add flutter cli in github ci
+[33mb46554b[m fix: enable firebase experimental web framework support (2)
+[33m45a3b2a[m fix: enable firebase experimental web framework support
+[33mfdbe1b0[m fix: remove npm run build error
+[33m1815a27[m fix: remove npm ci error (2) via generation of package-lock.json
+[33m4dc3927[m fix: remove npm ci error
+[33maf535cf[m feat: enable firebase web app hosting
+[33mfc57e15[m fix: add multidex support
+[33mf0c1528[m deps: add go_router, bloc, and tes oriented dev dependencies
+[33m774b890[m deps: add relevant firebase features
+[33ma726300[m deps: initialize firebase core
+[33m6fec13f[m chore: remove remnant node_modules dir
+[33ma4011e5[m chore: add foundational assets
+[33ma2c1c49[m chore: initialize flutter project
+[33mcaf3db3[m chore: Add LICENSE
+[33m2d9e7c0[m Update README.md
+[33mc910fd2[m Update README.md
+[33m96d01e6[m chore: wipe repo (change from nuxt to flutter)
+[33mcd12869[m Update README.md
+[33m5f9cc43[m Initialize firebase hosting
+[33m6221d0e[m Add firebase
+[33mb83e093[m Add basic email verification logic
+[33m285bc5d[m Add basic forgot password logic
+[33mdc03fcb[m Add basic login auth logic (using Appwrite)
+[33mf761b88[m Add email verification page view
+[33m83ca2c1[m Add sign-up page view
+[33m293f5cf[m Add forgot password page view
+[33mbd76adb[m Add login page view
+[33m0ea4124[m Update README.md
+[33m3bf6648[m feat: Initialize project - Led (#20)
+[33m42d4622[m Initialize WebStorm IDE dev environment
+[33mcdd7465[m Create README.md
+[33m1bd46ad[m Create SECURITY.md (#2)
+[33m44a9f4b[m Update FUNDING.yml
+[33m03ca1d5[m Create FUNDING.yml
+[33m60caecf[m Update issue templates
+[33m072f3a6[m Initial commit
diff --git a/lib/core/models/firestore_model.dart b/lib/core/models/firestore_model.dart
@@ -4,6 +4,9 @@ import 'package:scholars_guide/core/models/question_model.dart';
 
 class FireStore {
   //* Collection names in the Firestore
+  static const solutionsCollection = 'solutions';
+  static const commentsCollection = 'comments';
+  static const additionalQuestionDataRef = 'additionalQuestionsData';
   static const subjects = {
     SUBJ.MATH: 'mathematicsQuestions',
     SUBJ.SCIENCE: 'scienceQuestions',
@@ -15,6 +18,8 @@ class FireStore {
   //* Field names of each document in the Firestore
   // Question related fields
   static const String question = 'question';
+  static const String solutionRef = 'solutionsRef';
+  static const String solutionData = 'solutionData';
   static const String options = 'choices';
   static const String correctIndex = 'correctChoiceKey';
   // static const String questionReference = 'additionalQuestionDataRef';

diff --git a/lib/core/models/question_model.dart b/lib/core/models/question_model.dart
@@ -2,44 +2,64 @@
 
 import 'dart:math';
 
+import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:scholars_guide/core/models/firestore_model.dart';
 
 enum SUBJ { MATH, SCIENCE, READING, LANGUAGE, ALL }
 
 class Question {
-  final String question;
-  final List<String> options;
-  final int correctIndex;
-  final SUBJ subject;
-
-  const Question({
+  Question({
     required this.question,
     required this.options,
     required this.correctIndex,
     required this.subject,
+    this.id = '',
+    this.solution = '',
+    this.solutionRef,
+    this.createdBy,
   });
 
+  final String question;
+  final List<String> options;
+  final int correctIndex;
+  final SUBJ subject;
+  String id;
+  String solution;
+  DocumentReference? solutionRef;
+
+  DocumentReference? createdBy;
+  final FieldValue createdAt = FieldValue.serverTimestamp();
+
+  static var updatedAt = FieldValue.serverTimestamp();
+  static const String updatedBy = ''; // ! This is a placeholder
+
+  static bool isVerified = false;
+  static const String verifiedAt = '';
+  static const String verifiedBy = '';
+
   void printQuestion() {
     print('Question: $question');
     print('Options: $options');
     print('Correct: $correctIndex');
   }
 
   // Returns a Question Class using data fetched from the Firestore
-  factory Question.fromMap(Map<String, dynamic> data, SUBJ subject) {
+  factory Question.fromMap(String id, Map<String, dynamic> data, SUBJ subject) {
     List<String> temp = [];
     for (var val in data[FireStore.options].values) {
       temp.add(val);
     }
-
-    String temp2 = temp[int.parse(data[FireStore.correctIndex])]; 
+    String temp2 = temp[int.parse(data[FireStore.correctIndex])];
     temp.shuffle(Random());
 
     return Question(
+        id: id,
         subject: subject,
         question: data[FireStore.question],
+        solutionRef: data[FireStore.solutionRef],
         options: temp,
-        correctIndex: temp.indexWhere((element) => element == temp2));
+        correctIndex: temp.indexWhere((element) => element == temp2),
+        createdBy: data[FireStore.createdBy]);
   }
 
   // Converts the Question Class to a json like file to be stored in the Firestore
@@ -53,6 +73,9 @@ class Question {
         '3': options[3],
       },
       FireStore.correctIndex: correctIndex.toString(),
+      FireStore.solutionRef: solutionRef,
+      FireStore.createdBy: createdBy,
+      FireStore.createdAt: createdAt,
     };
   }
 

diff --git a/lib/features/quiz_mode/data/data_sources/remote_data_source/fetch_questions.dart b/lib/features/quiz_mode/data/data_sources/remote_data_source/fetch_questions.dart
diff --git a/lib/features/quiz_mode/data/repositories/quiz_mode_repository_impl.dart b/lib/features/quiz_mode/data/repositories/quiz_mode_repository_impl.dart
@@ -3,29 +3,37 @@
 // import 'package:scholars_guide/service_locator/service_locator.dart';
 
 import 'package:cloud_firestore/cloud_firestore.dart';
-import 'package:firebase_core/firebase_core.dart';
 import 'package:scholars_guide/core/models/firestore_model.dart';
 import 'package:scholars_guide/core/models/question_model.dart';
 import 'package:scholars_guide/features/quiz_mode/domain/repositories_contract/quiz_mode_repository_contract.dart';
-import 'package:scholars_guide/firebase_options.dart';
 
-class QuizModeRepositoryImpl implements QuizModeRepositoryContract{
+import '../../../../service_locator/service_locator.dart';
+
+class QuizModeRepositoryImpl implements QuizModeRepositoryContract {
   const QuizModeRepositoryImpl();
-  
+
   @override
   Future<List<Question>> collectQuestions({required SUBJ subj}) async {
+    final dbService = services<FirebaseFirestore>();
     List<Question> questions = [];
 
-    await Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform)
-      .whenComplete(() => FirebaseFirestore.instance
-          .collection(FireStore.SUBJ2subject(subj))
-          .get()
-          .then((snapshot) => snapshot.docs
-              .map((e) => questions.add(Question.fromMap(e.data(), subj))).toList()));
+    // * Fetching the questions from the Firestore
+    await dbService
+        .collection(FireStore.SUBJ2subject(subj))
+        .get()
+        .then((snapshot) {
+      print("GETTING QUESTIONS");
+      snapshot.docs
+          .map((e) => questions.add(Question.fromMap(e.id, e.data(), subj)))
+          .toList();
+    });
 
-    // TODO: Update imports and change actual code below once get_it is done
-    // await fetchQuestions(subject).then((snapshot) => snapshot.docs.map((e) => questions.add(Question.fromMap(e.data(), subj))));
-    print("DONE COLLECTING QUESTIONS ========================================"); // ! Debugging
-    return questions;
+    // * Fetching the solutions from the Firestore
+    for (Question q in questions) {
+      await q.solutionRef?.get().then((value) {
+        q.solution = value[FireStore.solutionData];
+      });
     }
+    return questions;
   }
+}
diff --git a/lib/features/quiz_mode/domain/usecases/select_questions.dart b/lib/features/quiz_mode/domain/usecases/select_questions.dart
@@ -13,7 +13,6 @@ class ChooseQuestions {
     List<Question> totalQuestions =
         await const QuizModeRepositoryImpl().collectQuestions(subj: subj);
     totalQuestions.shuffle(Random());
-    // TODO: randomize the choices as well for each question
 
     return totalQuestions.sublist(
         0,