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

Feature/f 33 chat implementation #15

Merged
merged 57 commits into from
Nov 8, 2024
Merged

Feature/f 33 chat implementation #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
b99ee3c
feat: add new ignore into gitignore
Oct 29, 2024
ff8794a
feat: set stable version of yarn
Oct 29, 2024
284041b
feat: init trigger chat button
Oct 29, 2024
08b2e2e
feat: install new package
Oct 30, 2024
0836ac6
Merge branch 'main' into feature/f-33-chat-implementation
Nov 1, 2024
6bececf
feat: modify chatbot interface
Nov 1, 2024
a3affe5
feat: modify interface
Nov 1, 2024
7d63cb0
feat: modify interface to align design
Nov 1, 2024
07a6e93
feat: modify default prompt button of interface
Nov 2, 2024
811cccd
feat: modify chat message interface
Nov 2, 2024
e4804ff
feat: modify chat layout
Nov 2, 2024
158738d
fix: modify overflow issue
Nov 2, 2024
1520114
feat: typing animation
Nov 2, 2024
615be37
feat: dark mode
Nov 2, 2024
cdfd6fa
feat: integrate chatbot with map
Nov 2, 2024
40b0de9
Merge branch 'main' into feature/f-33-chat-implementation
Nov 2, 2024
6707a75
fix: fix merge main request
Nov 2, 2024
3156596
feat: typing animation
Nov 3, 2024
9831b6f
fix: no border in fullscreen mode
Nov 3, 2024
cfa67c5
fix: delete no needed tailwind config
Nov 3, 2024
5726881
docs: add comments to functions
Nov 3, 2024
bf2ebe3
feat: implement communication with back-end for the chatbot
ahmtslmngcl Nov 3, 2024
754b04a
fix: comment in necessary interfaces
ahmtslmngcl Nov 3, 2024
633ca36
Merge pull request #8 from jst-seminar-rostlab-tum/feature/f-33-chat-…
Esoteriker Nov 3, 2024
94dbee9
fix: refactoring submit request part
Nov 3, 2024
d5772ee
fix: improve typing animation
Nov 3, 2024
d8e2675
fix: align the width and height of bot with design
Nov 3, 2024
3886338
fix: new chat-names have name "chat x", not "new chat x"
ahmtslmngcl Nov 4, 2024
5f5865c
fix: failure message displayed inside chat when error is thrown
ahmtslmngcl Nov 4, 2024
142aac6
Merge branch 'main' into feature/f-33-chat-implementation
Nov 4, 2024
0c1e392
fix: refactoring style by using clsx
Nov 4, 2024
e73b1db
fix: change dark mode bg color and fix mobile version corner issue
Nov 4, 2024
06393f4
fix: fix eslint issue and move file into correct folder
Nov 4, 2024
58026d7
fix: add enum and delete constant variable in dom
Nov 4, 2024
8ef9c98
fix: move chatbot css file from global into component
Nov 4, 2024
92d05e5
fix: add id to each message
ahmtslmngcl Nov 5, 2024
222c02b
fix: remove css file by using tailwind
Nov 5, 2024
783f7bc
Merge branch 'main' into feature/f-33-chat-implementation
Nov 5, 2024
c7389fe
fix: remove style by using tailwind until line 200
Nov 5, 2024
30f4f54
fix: remove css and style
Nov 6, 2024
55ac765
fix: improve tailwind css setting
Nov 6, 2024
bbeeeaa
fix: remove debug thing
Nov 6, 2024
8b8a7a5
fix: restructur the chatbot.tsx and
Nov 6, 2024
c7d15be
fix: update divider color
Nov 6, 2024
eb27dbb
fix: move api url into env
Nov 6, 2024
801eef7
fix: add new package
Nov 7, 2024
a544e77
fix: remove chatbot comp from app page
Nov 7, 2024
3cc672f
style: change html tag
Nov 7, 2024
7db71f3
style: fix event name and function style in chatbot.ts
Nov 7, 2024
f5329b8
style: add func return type
Nov 7, 2024
68d889b
fix: refactoring backend communication
ahmtslmngcl Nov 7, 2024
1a0310e
style: deep clone object
Nov 7, 2024
8f5c664
Merge branch 'feature/f-33-chat-implementation' of https://github.com…
Nov 7, 2024
9deaf91
fix: eslint and chat state update issue
Nov 8, 2024
58478cb
fix: move chatbot into layout
Nov 8, 2024
04a8b7a
Merge branch 'main' into feature/f-33-chat-implementation
Nov 8, 2024
bb64136
Merge branch 'main' into feature/f-33-chat-implementation
marinovl7 Nov 8, 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
1 change: 1 addition & 0 deletions .eslintrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"simple-import-sort/imports": "error",
"simple-import-sort/exports": "error",
"prettier/prettier": "error",
"no-nested-ternary": "warn",
"react/react-in-jsx-scope": "off",
"jsx-a11y/anchor-is-valid": "off",
"react/require-default-props": "off",
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
.yarn
.idea

# dependencies
/node_modules
Expand Down
1 change: 1 addition & 0 deletions .yarnrc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodeLinker: node-modules
6 changes: 4 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
"@nextui-org/card": "^2.0.34",
"@nextui-org/chip": "^2.0.33",
"@nextui-org/code": "2.0.33",
"@nextui-org/dropdown": "^2.1.31",
"@nextui-org/image": "^2.0.32",
"@nextui-org/input": "2.2.5",
"@nextui-org/dropdown": "^2.1.31",
"@nextui-org/kbd": "2.0.34",
"@nextui-org/link": "2.0.35",
"@nextui-org/listbox": "^2.1.27",
Expand All @@ -44,8 +44,10 @@
"leaflet": "^1.9.4",
"leaflet-defaulticon-compatibility": "^0.1.2",
"leaflet-geosearch": "^4.0.0",
"lucide-react": "^0.454.0",
"next": "14.2.10",
"next-themes": "^0.2.1",
"nextui-cli": "^0.3.4",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-leaflet": "^4.2.1",
Expand Down Expand Up @@ -94,4 +96,4 @@
]
}
}
}
}
Binary file added public/wfp-logo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions src/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import clsx from 'clsx';
import { Metadata, Viewport } from 'next';

import { AlertsMenuWrapper } from '@/components/AlertsMenu/AlertsMenuWrapper';
import Chatbot from '@/components/Chatbot/Chatbot';
import { Sidebar } from '@/components/Sidebar/Sidebar';
import { fontSans } from '@/config/fonts';
import { siteConfig } from '@/config/site';
Expand Down Expand Up @@ -35,6 +36,7 @@ export default function RootLayout({ children }: { children: React.ReactNode })
<body className={clsx('min-h-screen bg-background font-sans antialiased', fontSans.variable)}>
<Providers themeProps={{ attribute: 'class', defaultTheme: 'dark' }}>
<div className="relative h-screen">
<Chatbot />
<Sidebar />
<AlertsMenuWrapper />
<main className="h-full w-full">{children}</main>
Expand Down
Loading
Loading