Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolved merge issues #51

Open
wants to merge 21 commits into
base: main
Choose a base branch
from
Open

Resolved merge issues #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
ec6b9c7
Correct the responses.json format so it matches the structure require…
mimikwkk May 28, 2024
61ee975
Adjusted UI for mobile and desktop
DanielOkonov May 28, 2024
690b38d
Remove unused content
mimikwkk May 28, 2024
b8ac8d7
Integrate db manipulation into api endpoint
mimikwkk May 28, 2024
50fd24f
Integrate db manipulation into api call in front end
mimikwkk May 28, 2024
d2d27d0
Refactor code to streamline and fix bugs
mimikwkk May 28, 2024
aebf4ba
Remove mobile chatbot from navbar
mimikwkk May 28, 2024
2dbfdd7
Remove unexpected argument
mimikwkk May 28, 2024
31a9e89
Change chatbot prompts
mimikwkk May 28, 2024
a410e99
Remove unused json file
mimikwkk May 28, 2024
322282e
Delete unused user_id.txt
mimikwkk May 28, 2024
fe87929
Remove unused code
mimikwkk May 28, 2024
f6aa3d9
Split up main.py to vercel serverless functions
mimikwkk May 28, 2024
0bb323f
Add vercel.json
mimikwkk May 28, 2024
ed29f2d
Merge branch 'Michelle_chatbot_frontend' into daniel-fixing-ui
DanielOkonov May 28, 2024
b695636
Merge remote-tracking branch 'origin' into daniel-fixing-ui
DanielOkonov May 28, 2024
b21cdd4
Modified chat container sizing and bot message position
DanielOkonov May 29, 2024
938bb56
Testing authentication for chat
DanielOkonov May 29, 2024
fd206c6
Add family charter page
mimikwkk May 29, 2024
8f0007d
Merge branch 'Michelle_charter' into daniel-fixing-ui
DanielOkonov May 29, 2024
ee794c7
Updated UI for charter
DanielOkonov May 29, 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
184 changes: 184 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
"@xenova/transformers": "^2.17.1",
"ai": "^3.1.8",
"axios": "^1.7.2",
"bootstrap": "^5.3.3",
"chart.js": "^4.4.2",
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.0",
Expand All @@ -75,6 +76,7 @@
"next-themes": "^0.3.0",
"openai": "^4.29.1",
"react": "^18",
"react-bootstrap": "^2.10.2",
"react-chartjs-2": "^5.2.0",
"react-chatbot-kit": "^2.2.2",
"react-day-picker": "^8.10.0",
Expand Down
13 changes: 13 additions & 0 deletions src/app/api/chat/ServerChatPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// src/app/api/chat/ServerChatPage.tsx
import AuthenticatedRoute from '../../(auth)/authenticated-route';
import ChatPage from '../../chat/ChatPage';

const ServerChatPage = async () => {
return (
<AuthenticatedRoute>
<ChatPage />
</AuthenticatedRoute>
);
};

export default ServerChatPage;
Loading
Loading