From 9fec4b07342af5305f4b8536a12b13361817d151 Mon Sep 17 00:00:00 2001 From: erenfn <erenfindik7@gmail.com> Date: Tue, 28 Jan 2025 02:49:56 +0300 Subject: [PATCH] last changes efore 1.0.0 --- README.md | 4 ++-- backend/src/controllers/team.controller.js | 2 +- backend/src/service/team.service.js | 15 ++++++++++++++- frontend/dist/index.html | 4 ++-- .../svg => src/assets/icons}/IconWrapper.jsx | 0 frontend/src/assets/{ => icons}/google-icon.svg | 0 .../svg => src/assets/icons}/utilityIcons.jsx | 0 .../GoogleSignInButton/GoogleSignInButton.jsx | 2 +- .../List/ListItem/ListItem.jsx | 2 +- frontend/src/utils/constants.js | 6 ++++-- frontend/vite.config.js | 4 +++- 11 files changed, 28 insertions(+), 11 deletions(-) rename frontend/{public/svg => src/assets/icons}/IconWrapper.jsx (100%) rename frontend/src/assets/{ => icons}/google-icon.svg (100%) rename frontend/{public/svg => src/assets/icons}/utilityIcons.jsx (100%) diff --git a/README.md b/README.md index 9fae7d59..28c1c559 100644 --- a/README.md +++ b/README.md @@ -138,10 +138,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 index 12e31af2..511b04ff 100644 --- 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 index a2ea77f9..43018015 100644 --- 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 index 8c4634b4..37d564ed 100644 --- 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-DBm1Hrdr.js"></script> - <link rel="stylesheet" crossorigin href="/assets/index-x2uT4T0p.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/public/svg/IconWrapper.jsx b/frontend/src/assets/icons/IconWrapper.jsx similarity index 100% rename from frontend/public/svg/IconWrapper.jsx rename to frontend/src/assets/icons/IconWrapper.jsx diff --git a/frontend/src/assets/google-icon.svg b/frontend/src/assets/icons/google-icon.svg similarity index 100% rename from frontend/src/assets/google-icon.svg rename to frontend/src/assets/icons/google-icon.svg diff --git a/frontend/public/svg/utilityIcons.jsx b/frontend/src/assets/icons/utilityIcons.jsx similarity index 100% rename from frontend/public/svg/utilityIcons.jsx rename to frontend/src/assets/icons/utilityIcons.jsx diff --git a/frontend/src/components/Button/GoogleSignInButton/GoogleSignInButton.jsx b/frontend/src/components/Button/GoogleSignInButton/GoogleSignInButton.jsx index c3156f67..d28ac841 100644 --- 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 index 8b233ee8..469a8d73 100644 --- 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 index d3fafe5d..e31ac777 100644 --- 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 index a3746ff5..7efc97ab 100644 --- 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: {