Skip to content

Commit

Permalink
fix imports
Browse files Browse the repository at this point in the history
  • Loading branch information
isazaharadeen committed Jan 26, 2025
1 parent 9c93aad commit a1eaeda
Show file tree
Hide file tree
Showing 4 changed files with 60 additions and 95 deletions.
13 changes: 3 additions & 10 deletions frontend/src/components/layout/header/Header.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,14 @@ import useLockBodyScroll from '../../../hooks/useLockBodyScroll';
import MobDropdownMenu from '../mob-dropdown-menu/MobDropdownMenu';
import './header.css';
import '../../../globals.css';
import { ReportBugButton } from 'components/report-button/ReportBugButton';
import { ReportBugModal } from 'components/report-modal/ReportBugModal';
import { ReportBugButton } from '../../../components/report-button/ReportBugButton';
import { ReportBugModal } from '../../../components/report-modal/ReportBugModal';

function Header({ onConnectWallet, onLogout }) {
const [isModalOpen, setIsModalOpen] = useState(false);
const [isMenuOpen, setIsMenuOpen] = useState(false);
const location = useLocation();


const makeNavStick = [
'/overview',
'/documentation',
Expand Down Expand Up @@ -59,12 +58,10 @@ function Header({ onConnectWallet, onLogout }) {
setIsMenuOpen(false);
};


const openModal = () => {
setIsModalOpen(true);
};


const closeModal = () => {
setIsModalOpen(false);
};
Expand All @@ -89,13 +86,9 @@ function Header({ onConnectWallet, onLogout }) {
</div>
</nav>


{!isModalOpen && <ReportBugButton onClick={openModal} />}


{isModalOpen && (
<ReportBugModal onClose={closeModal} />
)}
{isModalOpen && <ReportBugModal onClose={closeModal} />}
</>
);
}
Expand Down
115 changes: 46 additions & 69 deletions frontend/src/components/report-modal/ReportBugModal.jsx
Original file line number Diff line number Diff line change
@@ -1,75 +1,52 @@
import React, { useState } from "react";
import "./ReportBugModal.css";
import telegramIcon from "../../assets/icons/telegram.svg";
import { Button } from "components/ui/custom-button/Button";
import { useWalletStore } from "stores/useWalletStore";
import { useBugReport } from "hooks/useBugReport";
import React, { useState } from 'react';
import './ReportBugModal.css';
import telegramIcon from '../../assets/icons/telegram.svg';
import { Button } from '../../components/ui/custom-button/Button';
import { useWalletStore } from '../../stores/useWalletStore';
import { useBugReport } from '../../hooks/useBugReport';

export function ReportBugModal({ onClose }) {
const { walletId } = useWalletStore();
const [bugDescription, setBugDescription] = useState("");
const { mutation, handleSubmit } = useBugReport(walletId, bugDescription, onClose);
const { walletId } = useWalletStore();
const [bugDescription, setBugDescription] = useState('');
const { mutation, handleSubmit } = useBugReport(walletId, bugDescription, onClose);

return (
<div
onClick={onClose}
className="modall-overlay"
>
<form
className="report-bug-form"
onClick={(e) => e.stopPropagation()}
onSubmit={handleSubmit}
>
<div className="modall-content">
<div className="text-group">
<h3>Report Bug</h3>
<p className="modal-paragraph-text">
Please describe the bug you've encountered
</p>
<textarea
value={bugDescription}
onChange={(e) => setBugDescription(e.target.value)}
placeholder="The bug I'm experiencing..."
className="bug-textarea"

/>
<a
className="dev-group-link"
href="https://t.me/spotnet_dev"
target="_blank"
rel="noopener noreferrer"
>
<img
src={telegramIcon}
alt="telegram-icon"
className="telegram-icon"
/>
Ask in our Dev group
</a>
</div>
return (
<div onClick={onClose} className="modall-overlay">
<form className="report-bug-form" onClick={(e) => e.stopPropagation()} onSubmit={handleSubmit}>
<div className="modall-content">
<div className="text-group">
<h3>Report Bug</h3>
<p className="modal-paragraph-text">Please describe the bug you've encountered</p>
<textarea
value={bugDescription}
onChange={(e) => setBugDescription(e.target.value)}
placeholder="The bug I'm experiencing..."
className="bug-textarea"
/>
<a className="dev-group-link" href="https://t.me/spotnet_dev" target="_blank" rel="noopener noreferrer">
<img src={telegramIcon} alt="telegram-icon" className="telegram-icon" />
Ask in our Dev group
</a>
</div>

<div className="button-group">
<Button
variant="secondary"
type="button"
className="cancel-button"
onClick={(e) => {
e.stopPropagation();
onClose();
}}
>
Cancel
</Button>
<Button
variant="primary"
type="submit"
className="submit-button"
>
{mutation.isPending ? "Sending..." : "Send Report"}
</Button>
</div>
</div>
</form>
<div className="button-group">
<Button
variant="secondary"
type="button"
className="cancel-button"
onClick={(e) => {
e.stopPropagation();
onClose();
}}
>
Cancel
</Button>
<Button variant="primary" type="submit" className="submit-button">
{mutation.isPending ? 'Sending...' : 'Send Report'}
</Button>
</div>
</div>
);
</form>
</div>
);
}
6 changes: 3 additions & 3 deletions frontend/src/hooks/useBugReport.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useMutation } from '@tanstack/react-query';
import { axiosInstance } from 'utils/axios';
import { generateTelegramLink } from 'services/telegram';
import { notify } from 'components/layout/notifier/Notifier';
import { axiosInstance } from '../utils/axios';
import { generateTelegramLink } from '../services/telegram';
import { notify } from '../components/layout/notifier/Notifier';

export const useBugReport = (walletId, bugDescription, onClose) => {
const mutation = useMutation({
Expand Down
21 changes: 8 additions & 13 deletions frontend/src/pages/DashboardLayout.jsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
import React from 'react';
import Sidebar from 'components/layout/sidebar/Sidebar';
import Sidebar from '../components/layout/sidebar/Sidebar';
import './DashboardLayout.css';

import clockIcon from 'assets/icons/clock.svg';
import computerIcon from 'assets/icons/computer-icon.svg';
import depositIcon from 'assets/icons/deposit.svg';
import withdrawIcon from 'assets/icons/withdraw.svg'


import clockIcon from '../assets/icons/clock.svg';
import computerIcon from '../assets/icons/computer-icon.svg';
import depositIcon from '../assets/icons/deposit.svg';
import withdrawIcon from '../assets/icons/withdraw.svg';

const dashboardItems = [
{
Expand All @@ -33,7 +30,7 @@ const dashboardItems = [
name: 'Withdraw All',
link: '/dashboard/withdraw',
icon: withdrawIcon,
}
},
];

export default function DashboardLayout({ children, title = 'zkLend Position' }) {
Expand All @@ -43,11 +40,9 @@ export default function DashboardLayout({ children, title = 'zkLend Position' })
<div className="dashboard-wrapper">
<div className="dashboard-container">
<h1 className="dashboard-title">{title}</h1>
<div className="dashboard-content">
{children}
</div>
<div className="dashboard-content">{children}</div>
</div>
</div>
</div>
);
}
}

0 comments on commit a1eaeda

Please sign in to comment.