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

Jump to bottom

UI : removed uncessary buttons and improve UI #35

Merged
merged 7 commits into from
Nov 7, 2023
Merged

UI : removed uncessary buttons and improve UI #35

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
540c546
UI : removed uncessary buttons and improve UI
sahsisunny Nov 6, 2023
b862085
feat: add test component
sahsisunny Nov 7, 2023
8e5a528
config: add changes to not generate snapshots
sahsisunny Nov 7, 2023
64dbee4
config: add changes to not generate snapshots
sahsisunny Nov 7, 2023
63073c9
test: removing test which generate snpshots
sahsisunny Nov 7, 2023
a476986
test: improve test of dashboard page
sahsisunny Nov 7, 2023
48cff5a
fix: change backend API URL
sahsisunny Nov 7, 2023
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
2 changes: 0 additions & 2 deletions __tests__/components/Navbar.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@ describe('Navbar', () => {
it('should have dropdown menu', () => {
const { container } = render(<Navbar />);
expect(container.querySelector('ul')).toBeInTheDocument();
expect(container.querySelector('ul')).toContainHTML('Profile');
expect(container.querySelector('ul')).toContainHTML('Dashboard');
expect(container.querySelector('ul')).toContainHTML('Settings');
expect(container.querySelector('ul')).toContainHTML('Sign Out');
});

Expand Down
10 changes: 0 additions & 10 deletions src/components/Navbar/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,21 +57,11 @@ const Navbar: React.FC = () => {
)}
</li>
<ul className={`${menuOpen ? 'block' : 'hidden'} absolute top-[8vh] right-0 bg-gray-800 p-2 z-10`}>
<li>
<a href="#" className="text-white hover:bg-gray-700 block px-4 py-2">
Profile
</a>
</li>
<li>
<a href="#" className="text-white hover:bg-gray-700 block px-4 py-2">
Dashboard
</a>
</li>
<li>
<a href="#" className="text-white hover:bg-gray-700 block px-4 py-2">
Settings
</a>
</li>
<li>
<a href={TINY_API_LOGOUT} className="text-white hover:bg-gray-700 block px-4 py-2">
sahsisunny marked this conversation as resolved.
Show resolved Hide resolved
Sign Out
Expand Down
57 changes: 16 additions & 41 deletions src/pages/dashboard/index.tsx
View file
Open in desktop
sahsisunny marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@ import InputBox from '@/components/InputBox';
import Layout from '@/components/Layout';
import { randomString } from '@/utils/constants';
import { useState } from 'react';
import AddIcon from '../../../public/assets/icons/add';
import CopyIcon from '../../../public/assets/icons/copy';
import ReloadIcon from '../../../public/assets/icons/reload';

const Dashboard = () => {
const [url, getUrl] = useState<string>('');
Expand All @@ -18,64 +16,41 @@ const Dashboard = () => {
<Layout title="Home | URL Shortener">
<div className="w-screen">
<div className="flex flex-col justify-center items-center m-4">
<div className="w-full lg:w-[42rem]">
<div className="w-full lg:w-[42rem] md:w-[32rem] sm:w-[22rem]">
<h1 className="text-4xl text-center text-white font-semibold">URL Shortener</h1>{' '}
<div className="flex flex-col md:flex-row justify-center items-center space-y-4 md:space-y-0 md:space-x-1 my-2">
<div className="bg-gray-200 flex flex-row justify-center items-center space-y-0 space-x-0 rounded-2xl mt-5 sm:mt-10">
<InputBox
type="text"
hideLabel={true}
className="w-full bg-gray-200 md:rounded-l-2xl p-4 md:rounded-none"
onChange={(e) => {
getUrl(e.target.value);
}}
className="bg-gray-200 w-full outline-none p-4 rounded-l-2xl"
onChange={(e) => getUrl(e.target.value)}
value={url}
placeholder="Enter the URL"
placeholder="🔗 Enter the URL"
name="URL"
/>
<Button
className="w-full md:w-auto bg-gray-200 md:rounded-r-2xl px-4 md:px-8 py-4 hover:bg-gray-300 mt-2 md:mt-0 md:rounded-none"
onClick={() => handleUniqueUrl()}
className="bg-gray-300 rounded-r-2xl p-4 hover:bg-gray-400"
onClick={handleUniqueUrl}
>
Generate
</Button>
</div>
<div className="flex flex-col md:flex-row justify-center items-center space-y-4 md:space-y-0 md:space-x-1">
<div className="bg-gray-200 flex flex-row justify-center items-center space-y-0 space-x-0 rounded-2xl mt-2">
<InputBox
type="text"
name="URL"
hideLabel={true}
className="w-full bg-gray-200 md:rounded-l-2xl p-4 md:rounded-none"
className="bg-gray-200 w-full outline-none p-4 rounded-l-2xl"
value={shortUrl}
disabled={true}
placeholder="Copy the URL"
/>
<div className="flex flex-row justify-center items-center space-x-1">
<Button
type="button"
className="w-full h-100 md:w-auto bg-gray-200 px-4 md:px-8 py-3 hover:bg-gray-300 mt-2 md:mt-0 md:rounded-none"
onClick={() => handleUniqueUrl()}
>
<ReloadIcon />
</Button>
<Button
type="button"
className="w-full md:w-auto bg-gray-200 px-4 md:px-8 py-3 hover:bg-gray-300 mt-2 md:mt-0 md:rounded-none"
onClick={() => {
setUrl('');
}}
>
<AddIcon />
</Button>
<Button
type="button"
className="w-full md:w-auto bg-gray-200 md:rounded-r-2xl px-4 md:px-8 py-3 hover:bg-gray-300 mt-2 md:mt-0 md:rounded-none"
onClick={() => {
navigator.clipboard.writeText(shortUrl);
}}
>
<CopyIcon />
</Button>
</div>
<Button
type="button"
className="bg-gray-200 rounded-r-2xl p-4 hover:bg-gray-400"
onClick={() => navigator.clipboard.writeText(shortUrl)}
>
<CopyIcon />
</Button>
</div>
</div>
</div>
Expand Down