Merge pull request #985 from ruxailab/organization-feature

[Refactor PR] Main code refactor to improve management and code quality

Author: marcgc21

.env.example

@@ -1,12 +1,8 @@
-VUE_APP_FIREBASE_API_KEY=""
-VUE_APP_FIREBASE_AUTH_DOMAIN=""
-VUE_APP_FIREBASE_STORAGE_BUCKET=""
-VUE_APP_FIREBASE_DB_URL=""
-VUE_APP_FIREBASE_PROJECT_ID=""
-VUE_APP_FIREBASE_MESSAGING_SENDER_ID=""
-VUE_APP_FIREBASE_APP_ID=""
-VUE_APP_I18N_LOCALE=""
-VUE_APP_I18N_FALLBACK_LOCALE=""
-VUE_APP_FIREBASE_PYTHON_FUNCTION=""
-LARAVEL_PDF=""
-ACCESSIBILITY_API=""
+
+
+SMTP_HOST=
+SMTP_PORT=
+SMTP_USER=
+SMTP_PASS=
+SMTP_SECURE=
+SITE_URL=

.firebaserc

@@ -3,7 +3,8 @@
     "default": "retlab-dev",
     "dev": "retlab-dev",
     "production": "retlab",
-    "prod": "ruxailab-prod"
+    "prod": "ruxailab-prod",
+    "develop": "ruxailab-develop"
   },
   "targets": {
     "retlab-dev": {
@@ -14,5 +15,6 @@
       }
     }
   },
-  "etags": {}
+  "etags": {},
+  "dataconnectEmulatorConfig": {}
 }

.gitignore

@@ -8,7 +8,7 @@ firebase.json
 firestore.indexes.json
 firestore.rules
 firestore-debug.log
-/docs 
+/docs
 
 # local env files
 .env.local
@@ -22,7 +22,7 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 firebase-debug.log
-database-debug.log 
+database-debug.log
 ui-debug.log
 
 # Editor directories and files
@@ -39,4 +39,4 @@ ui-debug.log
 
 # Ignore the playwright test screenshots and video
 /playwright/output
-debug-screenshot.png
+debug-screenshot.png

.vscode/settings.json

@@ -2,7 +2,7 @@
     "editor.defaultFormatter": "esbenp.prettier-vscode",
     "editor.formatOnSave": true,
     "[vue]": {
-      "editor.defaultFormatter": "Vue.volar"
+      "editor.defaultFormatter": "vscode.typescript-language-features"
     },
     "[javascript]": {
       "editor.defaultFormatter": "vscode.typescript-language-features"
@@ -11,4 +11,3 @@
       "editor.defaultFormatter": "vscode.json-language-features"
     }
   }
-  

cypress/e2e/heuristic.spec.cy.js

@@ -15,7 +15,7 @@ describe('Heuristic test Suite', () => {
   })
   describe('Create Heuristic Test', () => {
     it('should allow a new test to create', () => {
-      cy.visit(url + '/testslist')
+      cy.visit(url + '/admin')
       cy.findByTestId('create-test-btn').click()
       cy.findByText('Create a blank test').click()
       cy.findByText('Usability Heuristic').click()

e2e/ruxailabtest.spec.js

@@ -164,7 +164,7 @@ test.describe('Link Page Tests', () => {
 //     '.console-button.mx-1.hidden-sm-and-down.v-btn.v-btn--text.theme--dark.v-size--default',
 //   )
 
-//   await page.goto('/testslist')
+//   await page.goto('/admin')
 
 //   await page.click('text=Test heuristic playwright for delate')
 //   await page.click(
@@ -202,7 +202,7 @@ test.describe('Link Page Tests', () => {
 //       '.console-button.mx-1.hidden-sm-and-down.v-btn.v-btn--text.theme--dark.v-size--default',
 //       { timeout: 5000 },
 //     )
-//     await expect(page).toHaveURL('https://ruxailab-prod.web.app/testslist')
+//     await expect(page).toHaveURL('https://ruxailab-prod.web.app/admin')
 //   } catch {
 //     console.error('Failed to click button or URL did not match:')
 //     page.close()

e2e/signIntest.spec.js

@@ -71,7 +71,7 @@ test.describe('Sign In Workflow', () => {
     await logIn(page, validEmail, validPassword);
 
     // 2. Wait for URL change
-    await expect(page).toHaveURL(/\/testslist/, { timeout: 10_000 });
+    await expect(page).toHaveURL(/\/admin/, { timeout: 10_000 });
 
     // 3. Verify that "My tests" tab is visible and selected
     const myTestsTab = page.getByRole('tab', { name: /My tests/i });
@@ -104,9 +104,9 @@ test.describe('Sign In Workflow', () => {
 
       // Option 2: Wait for successful network response
       page.waitForResponse(resp =>
-    resp.url().includes('identitytoolkit.googleapis.com/v1/accounts:sendOobCode') && resp.status() === 200,
-    { timeout: 10_000 }
-    ).then(() => 'network_response')
+        resp.url().includes('identitytoolkit.googleapis.com/v1/accounts:sendOobCode') && resp.status() === 200,
+        { timeout: 10_000 }
+      ).then(() => 'network_response')
     ]);
 
     // 6) Assertion: reset request was processed
@@ -135,8 +135,8 @@ test.describe('Sign In Workflow', () => {
         // Check if there's any password strength feedback or error
         // This could be a validation message or error alert
         const hasError = await page.locator('text=Password must be stronger').isVisible().catch(() => false) ||
-                        await page.locator('text=Password too weak').isVisible().catch(() => false) ||
-                        await page.locator('[role="alert"]').isVisible().catch(() => false);
+          await page.locator('text=Password too weak').isVisible().catch(() => false) ||
+          await page.locator('[role="alert"]').isVisible().catch(() => false);
 
         if (hasError) {
           console.log(`Weak password "${weakPassword}" correctly rejected`);

firebase.json

@@ -4,42 +4,86 @@
     "indexes": "firestore.indexes.json"
   },
   "functions": {
-    "predeploy": ["npm --prefix \"$RESOURCE_DIR\" run lint"],
+    "predeploy": [
+      "npm --prefix \"$RESOURCE_DIR\" run lint"
+    ],
     "source": "functions",
     "runtimes": "python312"
   },
   "hosting": [
     {
       "site": "ruxailab-stage",
       "public": "dist",
-      "ignore": ["firebase.json", "**/.*", "**/node_modules/**"],
-      "rewrites": [{ "source": "**", "destination": "/index.html" }]
+      "ignore": [
+        "firebase.json",
+        "**/.*",
+        "**/node_modules/**"
+      ],
+      "rewrites": [
+        {
+          "source": "**",
+          "destination": "/index.html"
+        }
+      ]
     },
     {
       "site": "ruxailab-dev",
       "public": "dist",
-      "ignore": ["firebase.json", "**/.*", "**/node_modules/**"],
-      "rewrites": [{ "source": "**", "destination": "/index.html" }]
+      "ignore": [
+        "firebase.json",
+        "**/.*",
+        "**/node_modules/**"
+      ],
+      "rewrites": [
+        {
+          "source": "**",
+          "destination": "/index.html"
+        }
+      ]
+    },
+    {
+      "site": "ruxailab-develop",
+      "public": "dist",
+      "ignore": [
+        "firebase.json",
+        "**/.*",
+        "**/node_modules/**"
+      ],
+      "rewrites": [
+        {
+          "source": "**",
+          "destination": "/index.html"
+        }
+      ]
     },
     {
       "site": "ruxailab-prod",
       "public": "dist",
-      "ignore": ["firebase.json", "**/.*", "**/node_modules/**"],
-      "rewrites": [{ "source": "**", "destination": "/index.html" }]
+      "ignore": [
+        "firebase.json",
+        "**/.*",
+        "**/node_modules/**"
+      ],
+      "rewrites": [
+        {
+          "source": "**",
+          "destination": "/index.html"
+        }
+      ]
     }
   ],
   "emulators": {
     "auth": {
       "port": 9099
     },
     "functions": {
-      "port": 5001
+      "port": 5002
     },
     "firestore": {
       "port": 8081
     },
     "hosting": {
-      "port": 5000
+      "port": 5001
     },
     "ui": {
       "enabled": true
@@ -52,4 +96,4 @@
   "storage": {
     "rules": "storage.rules"
   }
-}
+}

functions/index.js

@@ -4,80 +4,4 @@ admin.initializeApp()
 
 export * from './src/https/index.js'
 export * from './src/triggers/index.js'
-
-
-// const functions = require('firebase-functions')
-// const admin = require('firebase-admin')
-// const nodemailer = require('nodemailer')
-// require('dotenv').config()
-
-// admin.initializeApp()
-
-// exports.deleteAuth = functions.https.onCall(async (data, context) => {
-//   try {
-//     await admin.auth().deleteUser(data.id)
-//     return 'User deleted successfully.'
-//   } catch (err) {
-//     console.error('Error deleting user:', err)
-//     return err
-//   }
-// })
-
-// exports.sendEmail = functions.https.onCall(async (data, context) => {
-//   const transporter = nodemailer.createTransport({
-//     service: 'gmail',
-//     auth: {
-//       user: process.env.VUE_APP_FIREBASE_EMAIL,
-//       pass: process.env.VUE_APP_FIREBASE_PASSWORD,
-//     },
-//   })
-
-//   const mail = {
-//     from: 'Uramaki Lab',
-//     to: data.guest.email,
-//     subject: 'You have been invited to evaluate a test!',
-//     html: data.template,
-//     attachments: data.attachments ?? [],
-//   }
-
-//   try {
-//     const info = await transporter.sendMail(mail)
-//     return `Message sent: ${info.messageId}`
-//   } catch (error) {
-//     console.error('Error sending email:', error)
-//     return `Error sending email: ${error.message}`
-//   }
-// })
-
-// //code is in safe------------------------------------------------
-// // exports.processSignUp = functions.auth.user().onCreate(async (user) => {
-// //   try {
-// //     await admin
-// //       .firestore()
-// //       .collection("users")
-// //       .doc(user.uid)
-// //       .set({
-// //         email: user.email,
-// //         accessLevel: 1,
-// //         myTests: {},
-// //         myAnswers: {},
-// //         notifications: [],
-// //       });
-// //   } catch (err) {
-// //     console.error("Error to create user in database ", err);
-// //   }
-// // });
-
-// // exports.setUserRole = functions.https.onCall(async (data) => {
-// //   try {
-// //     return await admin
-// //       .firestore()
-// //       .collection("users")
-// //       .doc(data.uid)
-// //       .update({
-// //         accessLevel: data.customClaims.accessLevel,
-// //       });
-// //   } catch (err) {
-// //     return err;
-// //   }
-// // });
+export * from './src/helpers/index.js'