Dominic's work today

.gitignore

@@ -0,0 +1,5 @@
+backend/node_modules/
+frontend/node_modules/
+.DS_Store
+package-lock.json
+backend/.env

README.md

@@ -1,2 +1,54 @@
-# Syntax Schoolers
-hello
+# Syntax Schoolers: Project Alpha
+
+<img src="frontend/assets/VivaLingo_homepagescreenshot.png">
+
+### For our full-stack project which consolidates all the technical skills that we have learnt in the last four weeks at La Fosse, we have created an MVP (Minimum Viable Product) called VivaLingo - an educational app that allows schoolchildren to learn French.
+
+The aim of the app is to provide fun and engaging way of learning a non-STEM subject. The app allows for the translating of basic concepts between English and French. 
+
+## Stakeholder & Solutions Analysis
+
+Here are some examples of stakeholder stories from those who would have an interest in the app.
+- [ ] As a student, I want a fun, simple language learning app, so that learning a language can be an engaging, repeatable, and memory-friendly experience, without being bombarded with overwhelming amounts of content and textbooks. 
+- [ ] As a teacher, I want a simple language learning app for my students to use, so that they can retain key phrases through repetition with increasing challenges, while not getting bored or feeling like learning a foreign language is a chore. This app should provide a respite from facing lots of focus on STEM subjects, to the detriment of a greater knowledge of subjects such as languages and geography.
+- [ ] As a product owner, I want to manage the production lifecycle of a simple, fun language learning app for teenagers, so that an alternative is available when compared to other apps that contain an overwhelming amount of content and visuals. I want to ensure that the production lifecycle is delivered on time, and that it receives positive feedback in the Beta phase.
+- [ ] As a CEO of the Hive Schools, I want to see my pupils embrace a holistic education that includes retaining key knowledge and critical thinking so that they have a well-rounded education that isn't just focused on STEM subjects. I would hope that this app can achieve that.
+- [ ] As a Government Department for Education policy advisor, I want to see students in schools engage in a language learning app that they can enjoy using, so that they can build on their foreign languages skills to reach targets such as key stages 2 and 3 under the national curriculum.
+- [ ] As a marketing manager, I want to to see young people enjoy using our app, and find it effective in building on their language skills, so that I can spread the word on the effectiveness of the app in our marketing campaigns.
+- [ ] As a parent, I want to see my son/daughter enjoy their education and have fun learning foreign languages while not being overwhelmed with content, so that they can have a well-rounded education that isn't just about technical knowledge in STEM subjects. 
+- [ ] As a software developer, I want to build a language learning app that offers an enjoyable, intuitive UX experience for students, with a well-structured codebase built around MVC architecture, so that students can enjoy using my app to learn a foreign language, rather than it feeling like a chore. The ease of navigating the app should be important, bearing in mind the target audience.
+
+A visualisation of the importance of each stakeholder can be viewed in this stakeholder analysis diagram. The teacher and student remain the most fundamentally importance in utilising the app accordingly.
+
+<img src="frontend/assets/VivaLingo_stakeholderanalysischart_screenshot.png">
+
+
+## Risk Analysis
+
+Here are some examples of risks and market analysis to the project.
+
+<img src="frontend/assets/VivaLingo_RiskAssessmentGrid_screenshot.png">
+
+## Entity Relationship Diagram (ERD)
+
+The database structure for this app can be visualised as follows. This ERD was created with Mermaid.js.
+
+<img src="frontend/assets/VivaLingo_ERD_screenshot.png">
+
+## Project Management
+
+We used Trello to structure our work in terms of tasks completed. 
+
+<img src="frontend/assets/VivaLingo_Trello_screenshot.png">
+
+## Technical Architecture
+
+User Interface: HTML, CSS, JavaScript, Jest
+Backend Services: Node, Express
+Data Storage: SQL, Supabase
+Data Schema visualisation: Mermaid
+Infrastructure: Git
+
+## Development Challenges
+
+

backend/app.js

@@ -0,0 +1,13 @@
+const express = require('express');
+const cors = require('cors');
+const staffRoutes = require('./routers/staffRoutes.js');
+
+const app = express();
+
+app.use(cors());
+app.use(express.json());
+
+// Mount all staff routes at /api/staff
+app.use('/api/staff', staffRoutes);
+
+module.exports = app;

backend/controllers/level1Controller.js

@@ -0,0 +1,110 @@
+const Level = require('../models/Level1');
+
+class SimpleLevelController {
+    // POST /api/levels/1/start - Start Level 1 (stateless)
+    static async startLevel1(req, res) {
+        try {
+            const userId = 1;
+            // Ensure progress row exists and get questions
+            const result = await Level.startLevel1(userId);
+            res.status(200).json({
+                success: true,
+                message: 'Level 1 started',
+                data: {
+                    questions: result.questions,
+                    totalQuestions: result.questions.length
+                }
+            });
+        } catch (error) {
+            console.error('Error starting Level 1:', error);
+            res.status(500).json({
+                success: false,
+                message: 'Failed to start Level 1'
+            });
+        }
+    }
+
+    // POST /api/levels/1/submit - Submit all answers at once
+    static async submitLevel1(req, res) {
+        try {
+            const { answers, userId } = req.body; // Array of {englishId, frenchId} pairs
+            console.log('recieved userId' , userId)
+            console.log('Received answers:', answers);
+            //console.log('Question sample:', questions[0]);
+
+            // Get questions to validate against
+            const questions = await Level.getLevel1Questions();
+
+            // Count correct answers
+            let correctCount = 0;
+            answers.forEach(answer => {
+                if (answer.englishId === answer.frenchId) {
+                    correctCount++;
+                }
+            });
+
+            // Save to database
+            const result = await Level.submitLevel1Answers(userId, correctCount, questions.length);
+
+
+            // Update overallprogress: set level_1_complete = true
+            const db = require('../database/connect');
+            await db.query(`
+                INSERT INTO overallprogress (user_id, level_1_complete)
+                VALUES ($1, true)
+                ON CONFLICT (user_id) DO UPDATE SET level_1_complete = true
+            `, [userId]);
+
+
+
+
+            const percentage = Math.round((correctCount / questions.length) * 100);
+
+            res.status(200).json({
+                success: true,
+                message: 'Level 1 completed!',
+                data: {
+                    correctAnswers: correctCount,
+                    totalQuestions: questions.length,
+                    percentage: percentage,
+                    ...result
+                }
+            });
+        } catch (error) {
+            console.error('Error submitting Level 1:', error);
+            res.status(500).json({
+                success: false,
+                message: 'Failed to submit Level 1'
+            });
+        }
+    }
+
+    // GET /api/levels/1/progress - Get saved progress
+    static async getLevel1Progress(req, res) {
+        try {
+            const userId = req.user.id;
+            const progress = await Level.getLevel1Progress(userId);
+
+            if (!progress) {
+                return res.status(404).json({
+                    success: false,
+                    message: 'No progress found'
+                });
+            }
+
+            res.status(200).json({
+                success: true,
+                message: 'Progress retrieved',
+                data: progress
+            });
+        } catch (error) {
+            console.error('Error getting progress:', error);
+            res.status(500).json({
+                success: false,
+                message: 'Failed to get progress'
+            });
+        }
+    }
+}
+
+module.exports = SimpleLevelController;

backend/controllers/level2Controller.js

@@ -0,0 +1,42 @@
+const Level2 = require('../models/Level2');
+const ProgressL2 = require('../models/ProgressL2')
+
+
+async function getRandomSentence(req, res) {
+  try {
+    const sentence = await Level2.getRandomSentence(); // model function
+    if (!sentence) {
+      return res.status(404).json({ error: 'No sentence found' });
+    }
+    res.json(sentence);
+  } catch (err) {
+    console.error('Error fetching sentence:', err);
+    res.status(500).json({ error: 'Internal Server Error' });
+  }
+}
+
+async function submitSentence(req, res) {
+    try {
+      const { sentenceId, answer, userId, levelId} = req.body;
+
+      if (!sentenceId || !answer) {
+        return res.status(400).json({ error: 'Missing sentenceId or answer' });
+      }
+
+      const isCorrect = await Level2.checkAnswer(sentenceId, answer);
+
+      const levelStatus = await Level2.updateLevelProgress(userId, levelId, isCorrect);
+
+        // If level is now completed, mark it in overall progress
+      if (levelStatus === true) {
+        await ProgressL2.markLevelComplete(userId, levelId);
+      }
+
+      res.json({ correct: isCorrect, levelStatus });
+    } catch (err) {
+      console.error('Error checking answer:', err);
+      res.status(500).json({ error: 'Internal Server Error' });
+    }
+  }
+
+module.exports = { getRandomSentence, submitSentence };

backend/controllers/level3Controller.js

@@ -0,0 +1,63 @@
+
+const Level3 = require('../models/Level3'); // adjust filename if different
+const Progress = require('../models/Progress')
+
+async function getRandomSentence(req, res) {
+  try {
+    const sentence = await Level3.getRandomSentence();
+    if (!sentence) {
+      return res.status(404).json({ error: 'No sentence found' });
+    }
+    res.json({
+      sentence_id: sentence.sentence_id,
+      english: sentence.english,
+      shuffled: sentence.shuffled,
+      category_id: sentence.category_id
+    });
+  } catch (err) {
+    console.error('Error in getRandomSentence:', err);
+    res.status(500).json({ error: 'Internal server error' });
+  }
+}
+
+async function submitSentence(req, res) {
+    try {
+      const { sentenceId, sentence, userId, levelId } = req.body; // sentence is an array of words
+
+      if (!sentenceId || !Array.isArray(sentence)) {
+        return res.status(400).json({ error: 'Invalid request body' });
+      }
+
+      // Fetch the correct sentence from DB (model function)
+      const correctSentence = await Level3.getSentenceById(sentenceId);
+      if (!correctSentence) {
+        return res.status(404).json({ error: 'Sentence not found' });
+      }
+
+      // Compare user submitted sentence to correct answer (French)
+      const correctWords = correctSentence.french.trim().split(/\s+/);
+      const isCorrect = sentence.length === correctWords.length &&
+                        sentence.every((word, i) => word === correctWords[i]);
+
+      // Update or create level progress, return updated status (model function)
+      const levelStatus = await Level3.updateLevelProgress(userId, levelId, isCorrect);
+
+        // If level is now completed, mark it in overall progress
+      if (levelStatus === true) {
+        await Progress.markLevelComplete(userId, levelId);
+      }
+
+      // Respond with correctness and updated level status
+      res.json({ correct: isCorrect, levelStatus });
+
+    } catch (error) {
+      console.error('Error in submitSentence:', error);
+      res.status(500).json({ error: 'Internal Server Error' });
+    }
+  }
+
+
+module.exports = {
+  getRandomSentence,
+  submitSentence,
+};