Skip to content

Commit 6701708

Browse files
authored
Merge pull request #6 from dhrumilp12/devlopment
ui2
2 parents fa25657 + 9428068 commit 6701708

File tree

12 files changed

+601
-318
lines changed

12 files changed

+601
-318
lines changed

meme_mingle/src/app/auth/sign-in/sign-in.component.scss

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,12 @@
8888
transform: scale(1.1); /* Slight scale for hover effect */
8989
}
9090

91+
.OR{
92+
color:#000000;
93+
}
94+
95+
96+
9197
/* Media Queries */
9298
@media (max-width: 768px) {
9399
.signin-container {
@@ -406,7 +412,7 @@
406412

407413
/* Update placeholder text color */
408414
::placeholder {
409-
color: #ffffff; /* White placeholders */
415+
color: gray; /* Changed from white to black */
410416
opacity: 1; /* Ensure visibility */
411417
}
412418

meme_mingle/src/app/layout/sidebar/sidebar.component.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,19 @@
2626
<div class="menu-items">
2727
<!-- New Chat -->
2828
<button class="menu-btn" title="{{ translatedTexts['New Chat'] || 'New Chat' }}" routerLink="/main/live-conversion">
29-
<i class="bi bi-plus-square-fill"></i>
30-
<span data-translate>New Chat</span>
29+
<i class="bi bi-magic"></i> <!-- Updated to magic wand icon -->
30+
<span data-translate> Chat Wizard</span>
3131
</button>
3232
<!-- AI Avatar -->
3333
<button class="menu-btn" title="{{ translatedTexts['AI Avatar'] || 'AI Avatar' }}" routerLink="/main/avatar">
34-
<i class="bi bi-person-circle"></i>
35-
<span data-translate>AI Avatar</span>
34+
<span role="img" aria-label="girl">👧</span>
35+
<span data-translate>Buddy</span>
3636
</button>
3737

38-
<!-- Quiz-ai -->
38+
<!-- Quiz AI -->
3939
<button class="menu-btn" title="{{ translatedTexts['Quiz AI'] || 'Quiz AI' }}" routerLink="/main/quiz-ai">
40-
<i class="bi bi-list-check"></i>
41-
<span data-translate>Quiz AI</span>
40+
<span role="img" aria-label="question"></span> <!-- Updated to question mark emoji -->
41+
<span data-translate>Quizify</span>
4242
<span class="score-badge" title="Total Score" *ngIf="totalScore !== null">{{ totalScore }}</span>
4343
</button>
4444
</div>

meme_mingle/src/app/layout/sidebar/sidebar.component.scss

Lines changed: 45 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
.sidebar-wrapper {
1818
width: $sidebar-width;
1919
height: 98.4vh; /* Adjust height to include margins if needed */
20-
background: linear-gradient(to right, #fff3db, #ffb84d);
21-
box-shadow: 0 0 15px rgba(0, 0, 0, 0.2);
20+
background-image: linear-gradient(90deg, #FFBD59 0%, #ffffff 25%, #FFBD59 100%); // Adjusted gradient for brightness
21+
box-shadow: 0 4px 20px rgba(0, 0, 0, 0.1); /* Enhanced shadow for depth */
2222
display: flex;
2323
flex-direction: column;
2424
justify-content: space-between;
@@ -29,6 +29,7 @@
2929
top: 10px;
3030
left: 10px;
3131
z-index: 1000;
32+
border: #1e1e1e 2px solid;
3233

3334
/*
3435
* =============== DESKTOP COLLAPSED ===============
@@ -72,11 +73,17 @@
7273
height: 50px;
7374
justify-content: center;
7475
border: 2px solid #1e1e1e;
76+
background-color: #ffc966; /* Adjusted for better visibility in collapsed state */
7577

7678
/* Hide text labels */
7779
span {
7880
display: none;
7981
}
82+
83+
&:hover {
84+
background-color: #ffb333; /* More vibrant hover color */
85+
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15); /* Enhanced hover shadow */
86+
}
8087
}
8188
}
8289
}
@@ -90,12 +97,18 @@
9097
align-items: center;
9198
justify-content: space-between;
9299
margin-bottom: 1rem;
100+
93101

94102
.logo-wrapper {
95103
.sidebar-logo-img {
96104
width: 150px;
97105
height: auto;
98-
border-radius: 10px;
106+
// border-radius: 10px;
107+
}
108+
img{
109+
110+
// margin: 10px;
111+
// background-color: #fff;
99112
}
100113
}
101114

@@ -130,27 +143,27 @@
130143
gap: 1rem;
131144

132145
.menu-btn {
133-
display: flex;
134-
align-items: center;
135-
gap: 1rem;
136-
padding: 0.8rem;
137-
background-color: #fff;
138-
border: none;
139-
border-radius: 8px;
140-
font-size: 1rem;
141-
font-weight: 600;
142-
color: #333;
143-
box-shadow: 0px 2px 8px rgba(0, 0, 0, 0.1);
144-
position: relative;
145-
transition: background-color 0.3s, transform 0.3s;
146-
border: 2px solid #1e1e1e;
146+
display: flex;
147+
align-items: center;
148+
gap: 1rem;
149+
padding: 0.8rem;
150+
background-color: #ffd9a5; /* Slightly deeper color for better contrast */
151+
border: 2px solid #333; /* Darker border */
152+
font-size: 1rem;
153+
font-weight: 600;
154+
color: #2c2c2c; /* Darker text color for readability */
155+
box-shadow: 0px 2px 8px rgba(0, 0, 0, 0.1);
156+
position: relative;
157+
transition: background-color 0.3s, transform 0.3s;
158+
border-radius: 30px;
147159

148160
i {
149161
font-size: 1.2rem;
150162
}
151163

152164
&:hover {
153-
background-color: #f7f7f7;
165+
background-color: #ffbf73; /* More vibrant hover color */
166+
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15); /* Enhanced hover shadow */
154167
}
155168

156169
.score-badge {
@@ -187,18 +200,18 @@
187200
align-items: center;
188201
gap: 1rem;
189202
padding: 0.8rem;
190-
background-color: #fff;
191-
border: none;
192-
border-radius: 8px;
203+
background-color: #ffd9a5; /* Consistent background color */
204+
border: 2px solid #333; /* Darker border */
193205
font-size: 1rem;
194206
font-weight: 600;
195-
color: #333;
207+
color: #2c2c2c; /* Darker text color */
196208
box-shadow: 0px 2px 8px rgba(0, 0, 0, 0.1);
197209
transition: background-color 0.3s, transform 0.3s;
198-
border: 2px solid #1e1e1e;
210+
199211

200212
&:hover {
201-
background-color: #f7f7f7;
213+
background-color: #ffbf73; /* Vibrant hover color */
214+
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15); /* Enhanced hover shadow */
202215
}
203216
}
204217

@@ -208,8 +221,7 @@
208221
height: 30px;
209222
border-radius: 50%;
210223
object-fit: cover;
211-
box-shadow: 0 2px 6px rgba(0, 0, 0, 0.2);
212-
224+
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15); /* Enhanced shadow for avatar */
213225
}
214226
}
215227
}
@@ -251,12 +263,18 @@
251263
border-radius: 50%;
252264
width: 50px;
253265
height: 50px;
266+
background-color: #ffc966; /* Adjusted for better visibility in collapsed state */
267+
border: 2px solid #333; /* Darker border */
254268
span {
255269
display: none;
256270
}
271+
272+
&:hover {
273+
background-color: #ffb333; /* More vibrant hover color */
274+
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15); /* Enhanced hover shadow */
275+
}
257276
}
258277
}
259278
}
260279
}
261280
}
262-
Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
11
.three-avatar-container {
2-
position: relative;
2+
position: relative;
3+
width: 100%;
4+
height: 100%;
5+
margin: 0;
6+
padding: 0; // Ensure no padding
7+
box-sizing: border-box; // Include padding and border in the element's total width and height
8+
background-color: #f8b6b6; // Brighter background color
9+
background-image: linear-gradient(45deg, #fb8383 0%, #ffffff 25%, #ff8c8c 100%); // Adjusted gradient for brightness
10+
// top side of border 15px, right side of border 15px
11+
border-radius: 15px 15px 0 0; // Rounded corners on top
12+
13+
canvas {
314
width: 100%;
415
height: 100%;
5-
margin: 0;
6-
background-color: #faaca8;
7-
background-image: linear-gradient(19deg, #faaca8 0%, #ddd6f3 100%);
8-
9-
canvas {
10-
width: 100%;
11-
height: 100%;
12-
display: block;
13-
}
16+
display: block;
1417
}
15-
16-
// body {
18+
}
19+
20+
// body {
1721

18-
// }
22+
// }

meme_mingle/src/app/main/chat-ui/chat-ui.component.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@ <h2>Welcome to AI Chat</h2>
4545
[currentMessage]="latestMentorMessage?.message ?? null"
4646
[audioUrl]="latestMentorMessage?.audioUrl ?? null"
4747
[avatarAudio]="latestMentorMessage?.avatarAudio ?? null"
48-
[animation]="latestMentorMessage?.animation ?? 'Idle'"
48+
[animation]="latestMentorMessage?.animation ?? null"
4949
[facialExpression]="latestMentorMessage?.facialExpression ?? 'default'"
5050
[lipSyncData]="latestMentorMessage?.lipSyncData ?? null"
5151
(avatarEvent)="handleAvatarEvent($event)"
5252
>
5353
</app-avatar3d>
5454
</div>
55-
55+
<div class = "common-container ">
5656
<!-- New Input Area -->
5757
<div class="input-area">
5858
<!-- File Preview Section -->
@@ -156,3 +156,4 @@ <h2>Welcome to AI Chat</h2>
156156
</button> -->
157157
</div>
158158
</div>
159+
</div>

0 commit comments

Comments
 (0)