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.

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

Ahmed/dapi 715/chore resolve dashboard UI flow #128

4 changes: 4 additions & 0 deletions src/components/AccountSwitcher/account_switcher.module.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
@use 'src/styles/utility' as *;

.accountSwitcherWrapper > div {
max-width: 100%;
}

.customSelectItem {
display: flex;
width: 100%;
Expand Down
7 changes: 3 additions & 4 deletions src/components/AccountSwitcher/index.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import React, { useState, useRef } from 'react';
import { InputDropdown } from '@deriv-com/quill-ui';
import { isNotDemoCurrency } from '@site/src/utils';
import useAuthContext from '@site/src/hooks/useAuthContext';
import useOnClickOutside from '@site/src/hooks/useOnClickOutside';
import useAccountSelector from '@site/src/hooks/useAccountSelector';
import CurrencyIcon from '../CurrencyIcon';
import AccountDropdown from '../CustomSelectDropdown/account-dropdown/AccountDropdown';
import styles from './account_switcher.module.scss';
import { InputDropdown } from '@deriv-com/quill-ui';
import useAccountSelector from '@site/src/hooks/useAccountSelector';

const AccountSwitcher = () => {
const { onSelectAccount } = useAccountSelector();
Expand All @@ -28,7 +27,7 @@ const AccountSwitcher = () => {
}));

return (
<div ref={dropdownRef} className={`right-navigation ${styles.accountSwitcher}`}>
<div ref={dropdownRef} className={styles.accountSwitcherWrapper}>
<InputDropdown
label='Account type'
options={options}
Expand Down
2 changes: 1 addition & 1 deletion src/components/CustomAccordion/custom-accordion.scss
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
align-items: center;
justify-content: space-between;
font-size: 16px;
line-height: 1;
line-height: 1.5;
font-weight: 400;

@media screen and (max-width: 786px) {
Expand Down
16 changes: 13 additions & 3 deletions src/components/CustomTabs/custom-tabs.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@
flex-direction: column;
align-items: center;
justify-content: center;
font-size: 20px;
font-family: var(--ibm-font-family-base);
font-weight: var(--ifm-font-weight-semibold);

&_header {
margin-block: 64px;
margin-block: 45px;
background-color: var(--opacity-black-75);
padding: 12px;
border-radius: 24px;
Expand All @@ -17,10 +20,14 @@
align-items: center;
}
&__item {
padding: 18px;
min-width: 160px;
padding: 10px 18px;
min-width: 17rem;
cursor: pointer;

@media screen and (max-width: 500px) {
min-width: 160px;
}

&.active {
background-color: var(--solid-slate-50);
border-radius: 12px;
Expand All @@ -33,6 +40,9 @@
}

&_content {
width: 1310px;
margin: auto;

@media screen and (max-width: 1023px) {
width: 100%;
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/Footer/Footer.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
display: flex;
flex-direction: row;
gap: rem(9.6);
max-width: 1264px;
max-width: 1310px;
}

.FooterLogo {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ describe.skip('User Navbar Desktop Item', () => {
});

it('Should render login link navbar item', async () => {
const login_nav_button = screen.getByRole('button', { name: /login/i });
const login_nav_button = screen.getByRole('button', { name: /log in/i });
expect(login_nav_button).toBeVisible();

await act(async () => {
Expand Down
2 changes: 1 addition & 1 deletion src/components/UserNavbarItem/item.desktop.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React from 'react';
import clsx from 'clsx';
import Translate from '@docusaurus/Translate';
import { Button } from '@deriv-com/quill-ui';
import {
LabelPairedGridLgRegularIcon,
Expand All @@ -9,7 +10,6 @@ import useLogout from '@site/src/hooks/useLogout';
import useDeviceType from '@site/src/hooks/useDeviceType';
import { IUserNavbarItemProps } from './item.types';
import styles from './UserNavbarItem.module.scss';
import Translate from '@docusaurus/Translate';

interface IActionProps {
handleClick: () => void;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
.playgroundBox {
border-radius: 6px;
border: none;
margin-left: rem(0.5);
margin-top: rem(2);
position: relative;
display: flex;
Expand Down Expand Up @@ -79,7 +78,7 @@ div[role='dialog'] {
}
}

@media (max-width: 425px) {
@media (max-width: 500px) {
div[role='dialog'] {
height: unset;
width: rem(32);
Expand Down
2 changes: 1 addition & 1 deletion src/features/Apiexplorer/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export default function ApiExplorerFeatures() {
const has_info = Object.keys(request_info).length === 0;
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we rename the folder Apiexplorer to ApiExplorer?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@prince-deriv Yes, We can but this will add more file changes due to folder name changes which I think we shouldn't do that we can't do it later.

return (
<>
<div className='breadcrumbs'>
<div className='breadcrumbs_wrapper'>
<Breadcrumbs
links={[
{
Expand Down
5 changes: 5 additions & 0 deletions src/features/Apiexplorer/styles.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@
display: flex;
color: var(--ifm-color-emphasis-1000);

@media screen and (min-width: 1440px) {
width: 1310px;
margin: auto;
}

.playground {
display: flex;
justify-content: center;
Expand Down
2 changes: 1 addition & 1 deletion src/features/Home/ApiFeatures/ApiFeatures.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
}
}

@media (min-width: 425px) {
@media (min-width: 500px) {
margin-left: rem(4);
}
.FeatureParagraph {
Expand Down
2 changes: 1 addition & 1 deletion src/features/Home/Benefits/Benefits.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
gap: rem(8.8);
}

@media screen and (max-width: 425px) {
@media screen and (max-width: 500px) {
flex-direction: column;
gap: rem(3);
}
Expand Down
2 changes: 1 addition & 1 deletion src/features/Home/HeroHeader/HeroHeader.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
padding-top: unset;
}

@media screen and (min-width: 320px) and (max-width: 415px) {
@media screen and (min-width: 320px) and (max-width: 500px) {
height: rem(35);
}
.HeroContainerStyle {
Expand Down
6 changes: 6 additions & 0 deletions src/features/Home/WaysToEarn/WaysToEarn.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
align-items: center;
justify-content: space-around;
margin: 0 auto;

@media screen and (min-width: 1400px) {
width: fit-content;
gap: rem(20);
}

@media screen and (max-width: 992px) {
width: 100%;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,12 @@

table {
z-index: 1;
position: relative;
table-layout: fixed;
border-collapse: collapse;
@extend .flex-center;
padding: 48px;
padding-top: 0px !important;
max-height: 500px;
display: flex;
flex-direction: column;
align-items: center;
margin-inline: 48px;

th,
td,
Expand Down Expand Up @@ -91,7 +90,7 @@
justify-content: space-between;
align-items: flex-start;
align-self: stretch;
padding: 48px;
padding: 48px 48px 25px;
gap: 16px;

@media (max-width: 1023px) {
Expand All @@ -101,15 +100,23 @@
padding: unset;
}

p {
margin-top: 5px;
}

&__button {
margin-top: 16px;
@media screen and (max-width: 1023px) {
margin-top: 1rem;
}

@media (max-width: 500px) {
width: 100%;
padding-inline: 0;
}

&__text {
font-size: 16px;

@media screen and (max-width: 786px) {
padding: 0 1rem;
}
Expand All @@ -132,10 +139,6 @@
&__texts {
flex: 1;
display: block;

h3 {
margin-bottom: 16px;
}
}
}
}
1 change: 1 addition & 0 deletions src/features/dashboard/components/ApiTokenTable/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ const tableColumns: TTokenColumn[] = [
Header: 'Token scopes',
accessor: 'scopes',
Cell: ScopesCell,
minWidth: 300,
},
{
Header: 'Last used',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
display: flex;
flex-direction: column;
align-items: center;
padding-block: 72px;
padding-block: 40px;
width: 100%;

&_top {
Expand Down
14 changes: 8 additions & 6 deletions src/features/dashboard/components/AppsTable/apps-table.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
.apps_table {
border: 1px solid var(--opacity-black-100);
border-radius: 32px;
margin: 48px;
margin-top: 0;

&.mobile {
Expand Down Expand Up @@ -81,7 +80,6 @@
padding: unset;
}
&__button {
margin-top: 16px;
@media screen and (max-width: 1023px) {
margin: 10px 20px 0;
padding-inline: 20px;
Expand All @@ -93,6 +91,8 @@
}

&__text {
font-size: 16px;

@media screen and (max-width: 1023px) {
padding: 0 1rem;
}
Expand All @@ -102,14 +102,15 @@
&__texts {
display: block;
max-width: 72%;

p {
margin-top: 5px;
}

@media screen and (max-width: 786px) {
max-width: 100%;
padding-inline: 45px;
margin-bottom: 10px;

p {
margin-top: 10px;
}
}

@media screen and (max-width: 500px) {
Expand All @@ -132,6 +133,7 @@

&__button {
padding-inline: 20px;
font-size: 16px;
@media screen and (max-width: 500px) {
width: 50%;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@use 'src/styles/utility' as *;

.appActions {
width: 168px;
display: flex;

svg {
Expand Down
5 changes: 3 additions & 2 deletions src/features/dashboard/components/AppsTable/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -271,13 +271,14 @@ const AppsTable = ({ apps }: AppsTableProps) => {
{
Header: translate({ message: 'OAuth scopes' }),
accessor: 'scopes',
minWidth: 200,
Cell: ScopesCell,
minWidth: 230,
},
{
Header: translate({ message: 'OAuth redirect URL' }),
accessor: 'redirect_uri',
minWidth: 350,
width: 400,
maxWidth: 520,
Cell: CopyTextCell,
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
@media (max-width: 768px) {
padding: unset;
}
@media (max-width: 425px) {
@media (max-width: 500px) {
font-size: rem(1.2);
}

Expand Down
10 changes: 9 additions & 1 deletion src/features/dashboard/components/Table/copy-text.cell.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
.copy_text_cell {
display: ruby-text;
display: flex;
text-align: left;
align-items: center;
cursor: pointer;

p {
width: 100%;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}

&__icon {
margin-left: 8px;
vertical-align: middle;
Expand Down
3 changes: 2 additions & 1 deletion src/features/dashboard/components/Table/copy-text.cell.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React from 'react';
import { LabelPairedCopyLgRegularIcon } from '@deriv/quill-icons';
import './copy-text.cell.scss';
import { Text } from '@deriv-com/quill-ui';

const CopyTextCell: React.FC<{
cell: {
Expand All @@ -16,7 +17,7 @@ const CopyTextCell: React.FC<{
navigator.clipboard.writeText(cell.value.toString());
}}
>
{cell.value}
<Text>{cell.value}</Text>
<span className={'copy_text_cell__icon'}>
<LabelPairedCopyLgRegularIcon />
</span>
Expand Down
Loading