Merge pull request 'main' (#62) from YasinOnm08/interstellar_ai:main into main

Reviewed-on: https://interstellardevelopment.org/code/code/React-Group/interstellar_ai/pulls/62
This commit is contained in:
Patrick 2024-09-28 11:27:43 +02:00
commit e4198e0fbd
6 changed files with 20 additions and 14 deletions

View file

@ -40,9 +40,9 @@ const Header: React.FC<HeaderProps> = ({ onViewChange, showDivs, toggleDivs, sho
</button> </button>
)} )}
</nav> </nav>
<button onClick={() => onViewChange('AI')} className="header-button header-logo"> <div className="header-button header-logo">
{/* AI logo or text */} {/* AI logo or text */}
</button> </div>
<div className="login-button"> <div className="login-button">
<Login /> <Login />
</div> </div>

View file

@ -53,7 +53,6 @@ const LandingPage: React.FC = () => {
return ( return (
<> <>
<div className="container">
<Header <Header
toggleDivs={toggleDivs} toggleDivs={toggleDivs}
showDivs={showDivs} showDivs={showDivs}
@ -61,6 +60,7 @@ const LandingPage: React.FC = () => {
showHistoryModelsToggle={true} showHistoryModelsToggle={true}
showToggle={view === 'AI'} // Pass the condition here showToggle={view === 'AI'} // Pass the condition here
/> />
<div className="container">
<div className={`left-panel ${showDivs ? 'visible' : 'hidden'}`}> <div className={`left-panel ${showDivs ? 'visible' : 'hidden'}`}>
{showDivs && ( {showDivs && (
<div className="history-models"> <div className="history-models">

View file

@ -2,10 +2,8 @@
.container, .container,
.content { .content {
display: flex; display: flex;
height: 100vh;
width: 100vw; width: 100vw;
overflow: hidden; padding-top: 0.025vh;
position: relative; /* Ensure relative positioning for proper transitions */
} }
.left-panel { .left-panel {
@ -30,6 +28,7 @@
transition: margin-left 0.3s ease; /* Smooth margin adjustment */ transition: margin-left 0.3s ease; /* Smooth margin adjustment */
background-color: var(--conversation-background-color); /* Use variable for background color */ background-color: var(--conversation-background-color); /* Use variable for background color */
border-radius: 1em 0 0 0; border-radius: 1em 0 0 0;
height: min-content;
} }
/* Adjust margin-left when panel is shown or hidden */ /* Adjust margin-left when panel is shown or hidden */
@ -39,4 +38,5 @@
.conversation-container.collapsed { .conversation-container.collapsed {
margin-left: 1vw; /* Space for the left panel */ margin-left: 1vw; /* Space for the left panel */
bottom: 0;
} }

View file

@ -1,12 +1,11 @@
html, html,
body { body {
height: 100vh; height: 100vh;
overflow: hidden; /* overflow: hidden; */
position: relative; position: relative;
} }
body { body {
margin-top: 2em;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
@ -14,7 +13,6 @@ body {
color: var(--text-color); color: var(--text-color);
font-family: var(--font-family); font-family: var(--font-family);
font-size: var(--font-size); font-size: var(--font-size);
margin-bottom: 0.5em;
} }
@ -24,6 +22,10 @@ header {
padding: 1rem; /* Adjust padding as needed */ padding: 1rem; /* Adjust padding as needed */
} }
main{
height: 100%;
}
button { button {
background-color: var(--button-background-color); background-color: var(--button-background-color);
color: var(--text-color); color: var(--text-color);

View file

@ -4,7 +4,7 @@ header{
top: 0; top: 0;
left: 0; left: 0;
width: 100%; width: 100%;
height: 5em; height: 10vh;
display: flex; display: flex;
align-items: center; align-items: center;
font-size: 1em; font-size: 1em;
@ -40,10 +40,10 @@ header{
.nav-links{ .nav-links{
position: absolute; position: absolute;
display: flex; display: flex;
top: 1em; top: 2vh;
gap: 1em; gap: 1em;
width: 25em; width: 25em;
height: 3em; height: 2em;
} }
.nav-btn{ .nav-btn{
@ -65,9 +65,9 @@ header{
} }
.login-button .header-login-button{ .login-button .header-login-button{
font-size: 1em; font-size: 2vh;
position: absolute; position: absolute;
top: 1.5em; top: 1.5vh;
right: 1vw; right: 1vw;
padding: 10px 20px; padding: 10px 20px;
background-color: var(--input-button-color); background-color: var(--input-button-color);

View file

@ -6,6 +6,7 @@
background-color: var(--output-background-color); background-color: var(--output-background-color);
padding: 1em; padding: 1em;
margin: 1em; margin: 1em;
margin-top: 0;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: flex-start; justify-content: flex-start;
@ -72,4 +73,7 @@
#copiedText{ #copiedText{
margin-top: 1em; margin-top: 1em;
cursor:default;
pointer-events: none;
user-select: none;
} }