Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
7fbc0d2
worked on env
Vivekpaste Nov 29, 2024
f793b9e
created home page
Vivekpaste Dec 2, 2024
e741f52
made changes to home page
Vivekpaste Dec 3, 2024
8570951
added search and sort panel
VivekPaste12 Dec 3, 2024
86621c7
add podinfo and clientinfo
2014026-lukepro Dec 7, 2024
1db388a
adjusted the css for homepage
2014026-lukepro Dec 7, 2024
54e89a0
changes in css
2014026-lukepro Dec 7, 2024
37a9ca6
backend for projects
luke2014026 Dec 8, 2024
261ab33
worked with responsiveness
Vivekpaste Dec 9, 2024
081c15b
Merge branch 'Dev' of https://github.com/Vivekpaste/CollabAI into Dev
Vivekpaste Dec 9, 2024
476e647
added backend code to controller,model and router
Vivekpaste Dec 9, 2024
f2ce419
added feature collection
Vivekpaste Dec 10, 2024
fd2179e
Added review page,added css
luke2014026 Dec 10, 2024
ec06293
Merge branch 'Dev' of https://github.com/Vivekpaste/CollabAI into Dev
luke2014026 Dec 10, 2024
3e7198d
conflicts resolved
luke2014026 Dec 10, 2024
485f226
working backend for clientinfo page
luke2014026 Dec 11, 2024
e1c331a
backend done for pod info
luke2014026 Dec 16, 2024
64b94ae
made changes to the home page
Vivekpaste Dec 16, 2024
e9c0824
projects showing in clientinfo
luke2014026 Dec 16, 2024
d9fb541
worked on Project details page
Vivekpaste Dec 17, 2024
8041b82
few changes on project details
Vivekpaste Dec 19, 2024
66e607b
changes made for no image present for cards
luke2014026 Dec 20, 2024
efcd0e3
pages connected and css fixed for project cards
luke2014026 Dec 20, 2024
79599ad
minor changes in the components also added avatar
Vivekpaste Dec 23, 2024
8c9fd25
minor css changes like color,search bar....
luke2014026 Dec 23, 2024
9d4aa8a
Using existing project card of vivek
luke2014026 Dec 23, 2024
ac4cb8d
minor ui
Vivekpaste Dec 23, 2024
6d7fdaa
Merge branch 'Dev' of https://github.com/Vivekpaste/CollabAI into Dev
Vivekpaste Dec 23, 2024
63dc697
made the clientinfo page responsive
luke2014026 Dec 23, 2024
55828c7
Merge branch 'Dev' of https://github.com/Vivekpaste/CollabAI into Dev
luke2014026 Dec 23, 2024
4e65a06
Changes made such as added new path to portfolio feature,solved modal…
luke2014026 Dec 24, 2024
478dde3
changes to import page
Vivekpaste Dec 26, 2024
7a30e2f
Merge branch 'Dev' of https://github.com/Vivekpaste/CollabAI into Dev
Vivekpaste Dec 26, 2024
8654924
made the project details page responsive
luke2014026 Dec 26, 2024
a0721ec
removed | from homepage banner
luke2014026 Dec 26, 2024
73625c9
added projecteam feature on importcontroller
Vivekpaste Dec 26, 2024
e84286f
minor changes fixed
luke2014026 Dec 26, 2024
7ace61e
import page frontend
Vivekpaste Dec 26, 2024
c3b8cc6
frontend css added for import page ,fixed duplicates and pagination f…
luke2014026 Dec 26, 2024
1bb253b
removed duplicate cards from podinfo page
luke2014026 Dec 27, 2024
14763c9
removed console statements ffrom pod and clientinfo,added authenticat…
luke2014026 Dec 27, 2024
a567e75
removed console
Vivekpaste Dec 30, 2024
04ddf0e
removed searchroutes,unecessary files,comment out parts in clientinfo5
luke2014026 Dec 30, 2024
48b40f0
changes in contentpage removed console statements
luke2014026 Dec 30, 2024
96d0223
changes in the content pages responsiveness and new details content d…
Vivekpaste Dec 30, 2024
8199c51
changes minor
luke2014026 Dec 30, 2024
253204f
Merge branch 'Dev' of https://github.com/Vivekpaste/CollabAI into Dev
luke2014026 Dec 30, 2024
57e4d38
minor changes
Vivekpaste Dec 30, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/.env.sample
Original file line number Diff line number Diff line change
@@ -1 +1 @@
REACT_APP_BASE_URL=http://localhost:8001.com/
REACT_APP_BASE_URL=http://localhost:4000/
19 changes: 15 additions & 4 deletions client/package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
{
"name": "OpenAIframework",
"version": "0.1.0",
"name": "react",
"version": "18.3.1",
"private": true,
"dependencies": {
"@ant-design/icons": "^5.3.7",
"@emotion/react": "^11.14.0",
"@emotion/styled": "^11.14.0",
"@googleapis/docs": "^3.0.2",
"@mui/icons-material": "^6.3.0",
"@mui/material": "^6.3.0",
"@react-oauth/google": "^0.12.1",
"@rpldy/uploader": "^1.8.1",
"@testing-library/jest-dom": "^5.16.4",
Expand All @@ -17,12 +21,15 @@
"bootstrap-icons": "^1.9.1",
"browserify-zlib": "^0.2.0",
"dompurify": "^3.0.9",
"embla-carousel-autoplay": "^8.5.1",
"embla-carousel-react": "^8.5.1",
"framer-motion": "^11.0.8",
"gapi-script": "^1.2.0",
"google-auth-library": "^9.11.0",
"googleapis": "^140.0.1",
"highlight.js": "^11.9.0",
"js-cookie": "^3.0.5",
"lucide-react": "^0.468.0",
"marked": "^9.1.6",
"moment": "^2.29.4",
"openai": "^4.36.0",
Expand All @@ -37,7 +44,7 @@
"react-google-login": "^5.2.2",
"react-google-picker": "^0.1.0",
"react-hot-toast": "^2.4.0",
"react-icons": "^4.4.0",
"react-icons": "^4.12.0",
"react-infinite-scroll-component": "^6.1.0",
"react-router-dom": "^6.3.0",
"react-scripts": "^5.0.1",
Expand Down Expand Up @@ -88,5 +95,9 @@
"url": "^0.11.3",
"webpack": "^5.92.1",
"webpack-cli": "^5.1.4"
}
},
"main": "index.js",
"author": "",
"license": "ISC",
"description": ""
}
38 changes: 32 additions & 6 deletions client/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,13 @@ import {
AssistantsChatPage,
ChatPage,
AssistantFileDownloadPage,
Form,
ProjectDetails,
Upload
} from "./Pages";


import PortfolioHome from "./Pages/PortfolioHome";
import PlatformManagementfeature from "./Pages/PlatformMangemenrfeature/PlatformMangamentfeature";
import Layout from "./Pages/Layout";
import AssistantLayout from "./Pages/Layout/AssistantLayout";
import ConfigurationTabs from "./Pages/configration/index";
Expand All @@ -32,12 +36,16 @@ import TrackUsage from "./Pages/SuperAdmin/TrackUsage/TrackUsage";
import TrackUsageComponent from "./Pages/SuperAdmin/TrackUsage/TrackUsageComponent";
import PublicAssistant from "./Pages/ExploreGPTs";
import ProtectedRoutes from "./component/ProtectedRoute/ProtectedRoute";
import ProtectedRouteFeature from "./component/ProtectedRoute/ProtectedRouteFeature";
import AssistantTypeList from "./Pages/AssistantType/index";
import TaskCommands from "./Pages/SuperAdmin/TaskCommands/TaskCommands";import KnowledgeBase from "./Pages/KnowledgeBase";
import { IntegrateApplications } from "./component/IntegrateApplications/IntegrateApplications";
// import { IntegrateApplications } from "./component/Assistant/IntegrateApplications/IntegrateApplications";

import ConnectionWithWorkboard from "./Pages/configration/ConnectionWithWorkboard";
import ClientInfo from "./Pages/PortfolioManagement/ClientInfo";
import PodInfo from "./Pages/PortfolioManagement/PodInfo";
import ReviewsPage from "./Pages/PortfolioManagement/Reviews";

function App() {
// Hook to get the current location
Expand All @@ -53,8 +61,25 @@ function App() {
<Route path="login" element={<LoginForm />} />
<Route path="passwordReset/:token/:id" element={<ResetPassword />} />
<Route path="*" element={<PageNotFound />} />


<Route path="/Form" element={<Form/>}></Route>
<Route element={<ProtectedRouteFeature />}>
<Route
path="/platform-management-feature/*"
element={
<PlatformManagementfeature>
<Routes>
<Route path="portfolio" element={<PortfolioHome />} />
<Route path="projectdetails/:id" element={<ProjectDetails />} />
<Route path="Client/:id" element={<ClientInfo />} />
<Route path="PodInfo" element={<PodInfo />} />
<Route path="Pod/:id" element={<PodInfo />} />
<Route path="PodInfo" element={<PodInfo />} />
<Route path="portfoliomanagement/Reviews" element={<ReviewsPage />} />
<Route path="import" element={<Upload/>}/>
</Routes>
</PlatformManagementfeature>
}
/></Route>
{/* For connecting workboard */}
<Route path="ConnectionWithWorkboard" element={<ConnectionWithWorkboard />} />

Expand All @@ -72,7 +97,7 @@ function App() {
<Route path="promptuserview" element={<PrompotUsersList />} />
<Route path="/knowledge-base" element={<KnowledgeBase />} />
<Route path="/integrate-apps" element={<IntegrateApplications/>} />



<Route element={<ProtectedRoutes />}>
Expand Down Expand Up @@ -127,8 +152,9 @@ function App() {
path="assistants/download/:file_id"
element={<AssistantFileDownloadPage />}
/>
</Routes>


</Routes>
);
}

export default App;
13 changes: 13 additions & 0 deletions client/src/Pages/Form/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import React from 'react';
import ProjectForm from '../../component/ProjectForm';


const Form = () => {
return (
<div>
<ProjectForm></ProjectForm>
</div>
);
};

export default Form;
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import React from 'react';
import NewNavbar from '../../component/NewNavbar';

const PlatformManagementfeature = ({ children }) => {
return (
<>
<NewNavbar />
<div className="my-feature-content" style={{backgroundColor:' black'}}>
{children}
</div>
</>
);
};

export default PlatformManagementfeature;
18 changes: 18 additions & 0 deletions client/src/Pages/PortfolioHome/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import React from "react";
import { HeroBanner, ContentPage } from "../../component";
import "./style.css";

const PortfolioHome = () => {
return (
<div className="scroll-container">
<section className="scroll-section">
<HeroBanner />
</section>
<section className="scroll-section">
<ContentPage />
</section>
</div>
);
};

export default PortfolioHome;
20 changes: 20 additions & 0 deletions client/src/Pages/PortfolioHome/style.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
*
{
margin:0 0;
}
.scroll-container {
height: 100vh;
scroll-snap-type: y mandatory;
transition: scroll 0.5s ease-in-out;
scroll-behavior: smooth;
width:100%
}

.scroll-section {
display: flex;
justify-content: center;
background-color: #070707;
scroll-snap-align: start;
}


Loading