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

feat: update header for sidebar #69

Merged
merged 1 commit into from
Dec 5, 2024
Merged

feat: update header for sidebar #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 13 additions & 3 deletions src/components/Sidebar/Sidebar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,24 @@
top: 0;
right: 0;
}

.sidebar-header {
background: linear-gradient(to left, rgb(58, 101, 108) 0px, rgb(0, 29, 34));
width: 100%;
height: 60px;

svg {
height: 30px;
}
}
}

.separator {
z-index: 100;
width: 100%;
height: 10px;
padding: 10px;
height: 5px;
padding: 5px;
background: -webkit-linear-gradient(270deg, rgba(0, 0, 0, 0.35), transparent);
background: linear-gradient(180deg, rgba(0, 0, 0, 0.35), transparent);
opacity: 0.2;
opacity: 0.3;
}
13 changes: 4 additions & 9 deletions src/components/Sidebar/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import APIError from '../APIError';
import ChatBox from '../ChatBox';
import Disclosure from '../Disclosure';
import MessageForm from '../MessageForm';
import { ReactComponent as XpertLogo } from '../../assets/xpert-logo.svg';
import './Sidebar.scss';

const Sidebar = ({
Expand Down Expand Up @@ -76,14 +77,8 @@ const Sidebar = ({

const getSidebar = () => (
<div className="h-100 d-flex flex-column justify-content-stretch" data-testid="sidebar-xpert">
<div className="d-flex flex-column align-items-center p-3">
<h1 className="font-weight-bold mb-3">
Hi, I&apos;m Xpert!
</h1>
<p className="px-3 mb-0 text-center">
Stuck on a concept? Need more clarification on a complicated topic?
Let&apos;s chat!
</p>
<div className="p-3 sidebar-header" data-testid="sidebar-xpert-header">
<XpertLogo />
</div>
<span className="separator" />
<ChatBox
Expand Down Expand Up @@ -116,7 +111,7 @@ const Sidebar = ({
alt="close"
aria-label="close"
variant="primary"
invertColors={!disclosureAcknowledged}
invertColors
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

data-testid="close-button"
/>
{disclosureAcknowledged ? (getSidebar()) : (<Disclosure>{getMessageForm()}</Disclosure>)}
Expand Down
8 changes: 4 additions & 4 deletions src/widgets/Xpert.test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const courseId = 'course-v1:edX+DemoX+Demo_Course';
const unitId = 'block-v1:edX+DemoX+Demo_Course+type@unit+block@unit1';

const assertSidebarElementsNotInDOM = () => {
expect(screen.queryByTestId('heading', { name: 'Hi, I\'m Xpert!' })).not.toBeInTheDocument();
expect(screen.queryByTestId('sidebar-xpert-header')).not.toBeInTheDocument();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice! I like that you made the test id more descriptive.

expect(screen.queryByRole('textbox')).not.toBeInTheDocument();

expect(screen.queryByRole('button', { name: 'submit' })).not.toBeInTheDocument();
Expand Down Expand Up @@ -109,7 +109,7 @@ test('clicking the call to action opens the sidebar', async () => {
await user.click(screen.queryByTestId('message-button'));

// assert that UI elements present in the sidebar are visible
expect(screen.getByRole('heading', { name: 'Hi, I\'m Xpert!' })).toBeVisible();
expect(screen.getByTestId('sidebar-xpert-header')).toBeVisible();
expect(screen.getByRole('textbox')).toBeVisible();
expect(screen.getByRole('button', { name: 'submit' })).toBeVisible();
expect(screen.getByTestId('close-button')).toBeVisible();
Expand All @@ -127,7 +127,7 @@ test('clicking the toggle button opens the sidebar', async () => {
await user.click(screen.queryByTestId('toggle-button'));

// assert that UI elements present in the sidebar are visible
expect(screen.getByRole('heading', { name: 'Hi, I\'m Xpert!' })).toBeVisible();
expect(screen.getByTestId('sidebar-xpert-header')).toBeVisible();
expect(screen.getByRole('textbox')).toBeVisible();
expect(screen.getByRole('button', { name: 'submit' })).toBeVisible();
expect(screen.getByTestId('close-button')).toBeVisible();
Expand Down Expand Up @@ -291,7 +291,7 @@ test('popup modal should open chat', async () => {
await user.click(screen.queryByTestId('check-button'));

// assert that UI elements present in the sidebar are visible
expect(screen.getByRole('heading', { name: 'Hi, I\'m Xpert!' })).toBeVisible();
expect(screen.getByTestId('sidebar-xpert-header')).toBeVisible();
expect(screen.getByRole('textbox')).toBeVisible();
expect(screen.getByRole('button', { name: 'submit' })).toBeVisible();
expect(screen.getByTestId('close-button')).toBeVisible();
Expand Down
Loading