Merge pull request #528 from bluewave-labs/develop

erenfn · web-flow · commit 90d37443ea8e · 2025-01-28T15:15:44.000+03:00
Develop -&gt; Master
diff --git a/README.md b/README.md
@@ -140,10 +140,10 @@ NODE_ENV - node environment (production, test or development)
 
 It is set from the .env file in the root directory
 
-2. Api Url
+2. Backend Url
 
 ```
-API_BASE_URL - Backend API url
+BASE_URL - Backend url
 ```
 
 It is set from ./frontend/src/utils/constant.js
diff --git a/backend/src/controllers/team.controller.js b/backend/src/controllers/team.controller.js
@@ -14,7 +14,7 @@ const setOrganisation = async (req, res) => {
       return res.status(400).json({ error: 'Cannot create more than one team.' });
     }
 
-    const newOrg = await teamService.createTeam(name);
+    const newOrg = await teamService.createTeamWithAgentUrl(name);
     return res.status(201).json({
       status: 201,
       message: 'Organization created successfully',
diff --git a/backend/src/service/team.service.js b/backend/src/service/team.service.js
@@ -1,4 +1,3 @@
-const { where } = require("sequelize");
 const settings = require("../../config/settings");
 const db = require("../models");
 const Team = db.Team;
@@ -21,6 +20,20 @@ class TeamService {
         }
     }
 
+    async createTeamWithAgentUrl(name) {
+        const transaction = await sequelize.transaction();
+        const agentUrl = 'https://cdn.jsdelivr.net/gh/bluewave-labs/bluewave-onboarding@agent-1.0.2/jsAgent/'
+        try {
+            const team = await Team.create({ name, agentUrl }, { transaction });
+            await transaction.commit();
+            return team;
+        } catch (err) {
+            await transaction.rollback();
+            throw new Error("Failed to create team");
+        }
+    }
+
+
     async getTeam() {
         try {
             const team = await Team.findOne({
diff --git a/frontend/dist/index.html b/frontend/dist/index.html
@@ -6,8 +6,8 @@
         <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <title>Guidefox</title>
         <link rel="icon" type="image/svg+xml" href="/svg/favicon.svg" />
-      <script type="module" crossorigin src="/assets/index-4Qqfvg46.js"></script>
-      <link rel="stylesheet" crossorigin href="/assets/index-B2RrmTqS.css">
+      <script type="module" crossorigin src="/assets/index-BJhRV-7j.js"></script>
+      <link rel="stylesheet" crossorigin href="/assets/index-ZKMHXvUn.css">
     </head>
 
     <body>
diff --git a/frontend/src/assets/icons/IconWrapper.jsx b/frontend/src/assets/icons/IconWrapper.jsx
diff --git a/frontend/src/assets/icons/google-icon.svg b/frontend/src/assets/icons/google-icon.svg
diff --git a/frontend/src/assets/icons/utilityIcons.jsx b/frontend/src/assets/icons/utilityIcons.jsx
diff --git a/frontend/src/components/Button/GoogleSignInButton/GoogleSignInButton.jsx b/frontend/src/components/Button/GoogleSignInButton/GoogleSignInButton.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import GoogleIconSvg from '../../../assets/google-icon.svg';
+import GoogleIconSvg from '../../../assets/icons/google-icon.svg';
 import './GoogleSignInButton.css'; 
 
 const GoogleSignInButton = ({ text='Sign in with Google', onClick = () => {}}) => {
diff --git a/frontend/src/templates/GuideMainPageTemplate/GuideMainPageComponents/List/ListItem/ListItem.jsx b/frontend/src/templates/GuideMainPageTemplate/GuideMainPageComponents/List/ListItem/ListItem.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { IconButton, useTheme } from '@mui/material';
-import { DuplicateIcon, EditIcon, TrashIcon } from '../../../../../../public/svg/utilityIcons';
+import { DuplicateIcon, EditIcon, TrashIcon } from '../../../../../assets/icons/utilityIcons';
 import CircleIcon from '@mui/icons-material/Circle';
 import './ListItem.css';
 import { useAuth } from '../../../../../services/authProvider';
diff --git a/frontend/src/utils/constants.js b/frontend/src/utils/constants.js
@@ -1,9 +1,11 @@
 // API constants
 //local environment
-export const API_BASE_URL = 'http://localhost:3000/api/';
+export const BASE_URL = 'localhost:3000';
+export const API_BASE_URL = `http://${BASE_URL}/api/`;
 
 //staging environment
-// export const API_BASE_URL = 'https://onboarding-demo.bluewavelabs.ca/api/';
+// export const BASE_URL = 'onboarding-demo.bluewavelabs.ca';
+// export const API_BASE_URL = `https://${BASE_URL}/api/`;
 // Other constants
 export const APP_TITLE = 'Bluewave Onboarding';
 export const SUPPORT_EMAIL = 'support@bluewave.com';
diff --git a/frontend/vite.config.js b/frontend/vite.config.js
@@ -1,12 +1,14 @@
 import { defineConfig } from 'vite';
 import react from '@vitejs/plugin-react-swc';
+import { BASE_URL } from './src/utils/constants';
 
 export default defineConfig({
   base: '/',
   plugins: [react()],
   server: {
     host: '0.0.0.0',
-    port: 4173
+    port: 4173,
+    allowedHosts: [BASE_URL]
   },
   css: {
     preprocessorOptions: {

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ const setOrganisation = async (req, res) => {`
`14`	`14`	`return res.status(400).json({ error: 'Cannot create more than one team.' });`
`15`	`15`	`}`
`16`	`16`
`17`		`- const newOrg = await teamService.createTeam(name);`
	`17`	`+ const newOrg = await teamService.createTeamWithAgentUrl(name);`
`18`	`18`	`return res.status(201).json({`
`19`	`19`	`status: 201,`
`20`	`20`	`message: 'Organization created successfully',`