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

Enhancement/custom share #61

Merged
merged 2 commits into from
Jan 8, 2025
Merged

Enhancement/custom share #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbac4f9
add `custom_share` path to open `ShareModal` directly
F-Shahali Jan 6, 2025
dc370ca
improve removal of params when clicking on the logo in the navbar
F-Shahali Jan 6, 2025
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
17 changes: 8 additions & 9 deletions src/Views/Layout/Navbar/NavBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,20 @@ import { setOpenShareModal, useLocalCache } from '@src/Tools/Store/slices/LocalC
const NavBar = () => {
const { activePage } = useLocalCache();
const { dispatch } = useStore();
const setSearchParams = useSearchParams()[1];
const [searchParams, setSearchParams] = useSearchParams();

return (
<div className='navbar-layout'>
<Navbar className='navbar'>
<Navbar.Brand
className='nav-brand'
onClick={() =>
setSearchParams(params => {
params.forEach((val, key) => {
params.delete(key);
});
return params;
})
}>
onClick={() => {
const newParams = new URLSearchParams(searchParams);
searchParams.forEach((_, key) => {
newParams.delete(key);
});
setSearchParams(newParams);
}}>
<Logo className='logo-text' />
</Navbar.Brand>

Expand Down
56 changes: 33 additions & 23 deletions src/Views/Layout/ShareModal/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import './index.scss';
import { useState } from 'react';
import { ValueType } from 'rsuite/esm/Checkbox';
import useStore from '@src/Tools/Store/useStore';
import { classes } from '@src/Tools/Utils/React';
Expand All @@ -9,15 +8,24 @@ import { Services, services_url } from '@src/Data/services.data';
import EditableInput from '@src/Components/EditableInput/EditableInput';
import { setOpenShareModal, useLocalCache } from '@src/Tools/Store/slices/LocalCacheSlice';
import { Checkbox, CheckboxGroup, Col, Modal, Radio, RadioGroup, Row, Tooltip, Whisper } from 'rsuite';
import { useSearchParams } from 'react-router-dom';
import { useData } from '@src/Tools/Hooks/useData';

const ShareModal = () => {
const { dispatch } = useStore();
const [url, setUrl] = useState('');
const [subject, setSubject] = useState('');
const urlParams = useSearchParams()[0];
const path = urlParams.get('path');
const { openShareModal } = useLocalCache();
const [isValid, setIsValid] = useState(true);
const [encodingValue, setEncodingValue] = useState<any[]>([]);
const [shareMode, setShareMode] = useState('direct');
const { set, temp, discard } = useData(
{
url: path === 'custom_share' ? urlParams.get('link') || '' : '',
subject: path === 'custom_share' ? urlParams.get('subject') || '' : '',
isValid: true,
encodingValue: [],
shareMode: 'direct',
},
[urlParams]
);

// ? ------------------------- Functions -----------------------

Expand All @@ -32,17 +40,17 @@ const ShareModal = () => {
};

const getShareLink = (service_title: string, url: string) => {
const path = `?path=share&service=${service_title}&subject=${subject}&link=${url}`;
if (!!encodingValue) {
const path = `?path=share&service=${service_title}&subject=${temp.subject}&link=${url}`;
if (temp.encodingValue?.length) {
const encoded_path = encode(path);
return `${CONFIG.FRONT_DOMAIN}/?encoded=${encoded_path}`;
}
return `${CONFIG.FRONT_DOMAIN}/${path}`;
};

const onCheckboxChanged = (val: ValueType, checked: boolean) => {
if (checked) setEncodingValue([val]);
else setEncodingValue([]);
if (checked) set.ou.temp('encodingValue', [val]);
else set.ou.temp('encodingValue', []);
};

// --------------------------------------------------------------
Expand All @@ -52,7 +60,7 @@ const ShareModal = () => {
size='sm'
onClose={() => {
dispatch(setOpenShareModal(false));
setIsValid(true);
discard();
}}
backdrop
className='share-modal'>
Expand All @@ -62,17 +70,19 @@ const ShareModal = () => {
<EditableInput
label='Link'
onChange={e => {
if (!isValid) setIsValid(true);
setUrl(e.target.value);
if (!temp.isValid) set.ou.temp('isValid', true);
set.ou.temp('url', e.target.value);
}}
value={temp.url}
errorMessage='required'
isValid={isValid}
isValid={temp.isValid}
placeholder='https://www.example.com'
/>
<EditableInput
label='Subject'
value={temp.subject}
onChange={e => {
setSubject(e.target.value);
set.ou.temp('subject', e.target.value);
}}
placeholder='Subject'
/>
Expand All @@ -92,8 +102,8 @@ const ShareModal = () => {
inline
className='mode-picker'
appearance='picker'
defaultValue={shareMode}
onChange={value => setShareMode(value.toString())}>
defaultValue={temp.shareMode}
onChange={value => set.ou.temp('shareMode', value.toString())}>
<label className='box-label'>Sharing Mode: </label>
<Radio value='direct'>Direct</Radio>
<Radio value='indirect'>Indirect</Radio>
Expand All @@ -102,9 +112,9 @@ const ShareModal = () => {
</Whisper>
<div
{...classes('encoding-mode-checkbox ', {
'is-visible': shareMode === 'indirect',
'is-visible': temp.shareMode === 'indirect',
})}>
<CheckboxGroup inline name='checkbox-group' value={encodingValue}>
<CheckboxGroup inline name='checkbox-group' value={temp.encodingValue}>
<Checkbox value='base64' onChange={onCheckboxChanged}>
Base64 Encoding (more robust)
</Checkbox>
Expand All @@ -113,17 +123,17 @@ const ShareModal = () => {
<div className='services-list'>
<Row>
{Services.map((service, i) => {
const validated_url = urlValidation(url);
const validated_url = urlValidation(temp.url);
const href =
shareMode === 'direct'
? services_url(validated_url, subject)[service.title]
temp.shareMode === 'direct'
? services_url(validated_url, temp.subject)[service.title]
: getShareLink(service.title, validated_url);
return (
<Col xs={12} sm={8} key={i}>
<div
className='service-container'
onClick={() => {
if (url === '') setIsValid(false);
if (temp.url === '') set.ou.temp('isValid', false);
else window.open(href, '_blank');
}}>
<div className='service-logo' style={{ backgroundColor: service.bg }}>
Expand Down
5 changes: 4 additions & 1 deletion src/Views/Layout/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import PagesRouter from '../Pages/PagesRouter';
import useStore from '@src/Tools/Store/useStore';
import { useSearchParams } from 'react-router-dom';
import { ReactComponent as Bg } from '@assets/Images/bg.svg';
import { setActivePage } from '@src/Tools/Store/slices/LocalCacheSlice';
import { setActivePage, setOpenShareModal } from '@src/Tools/Store/slices/LocalCacheSlice';
import { decode } from '@src/Tools/Utils/URLEncoding';

const Layout = () => {
Expand All @@ -18,6 +18,9 @@ const Layout = () => {

useEffect(() => {
dispatch(setActivePage(path));
if (path === 'custom_share') {
dispatch(setOpenShareModal(true));
}
}, [path]);

return (
Expand Down
Loading