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

58 share options #88

Merged
merged 5 commits into from
Feb 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
60 changes: 60 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
"react": "^18",
"react-dom": "^18",
"react-hook-form": "^7.48.2",
"react-share": "^5.0.3",
"react-toastify": "^10.0.4",
"zod": "^3.22.4",
"zustand": "^4.4.7"
},
Expand Down
61 changes: 61 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,23 @@ import { useRouter } from 'next/navigation';
import { useState } from 'react';
import { Option } from './option.models';
import { PrimaryButton } from '@/components/ui/buttons/primary';
import { deleteFromCloundinary, downloadImage } from '@/utils/utils';
import { toast } from 'react-toastify';
import ShareBtns from '@/components/feature/share-btns';
import Modal from '@/components/ui/modal';
import {
deleteFromCloundinary,
copyToClipboard,
downloadImage,
} from '@/utils/utils';

export function PostOptions({
post_id,
title,
image_url,
doesUserOwnPost,
}: {
post_id: number;
title: string;
image_url: string;
doesUserOwnPost: boolean;
}) {
Expand All @@ -22,6 +31,7 @@ export function PostOptions({
const router = useRouter();

const [showDropdown, setShowDropdown] = useState(false);
const [showShareModal, setShowShareModal] = useState(false);
const [indexOfOptionLoading, setIndexOfOptionLoading] = useState<
number | null
>(null);
Expand Down Expand Up @@ -58,14 +68,31 @@ export function PostOptions({
];

const PUBLIC_OPTIONS: Option[] = [
{ title: 'Share', action: () => {} },
{
title: 'Share',
action: () => toggleShareModal(),
},
{ title: 'Download', action: async () => await downloadImage(image_url) },
{
title: 'Copy URL',
action: async () => {
(await copyToClipboard(image_url))
? toast.success(`Copied ${image_url} to clipboard`, {
position: 'top-center',
})
: toast.error('error copying', { position: 'top-center' });
},
},
];

const FINAL_OPTIONS = [...OWNER_OPTIONS, ...PUBLIC_OPTIONS];

function toggleDropdown() {
setShowDropdown(!showDropdown);
setShowDropdown((prev) => !prev);
}
function toggleShareModal() {
setShowShareModal((prev) => !prev);
toggleDropdown();
}

return (
Expand Down Expand Up @@ -95,6 +122,15 @@ export function PostOptions({
))}
</ul>
)}
{showShareModal && (
<Modal
isOpen={showShareModal}
onClose={() => setShowShareModal(false)}
heading={`Share ${title} on: `}
>
<ShareBtns shareUrl={image_url} title={title} />
</Modal>
)}
</div>
);
}
1 change: 1 addition & 0 deletions src/app/(site)/app/post/[postid]/components/post/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ export async function Post({
)}
</section>
<PostOptions
title={post.title}
post_id={post.id}
doesUserOwnPost={doesUserOwnPost}
image_url={post.asset_url}
Expand Down
24 changes: 12 additions & 12 deletions src/app/(site)/app/settings/components/settings-aside/index.tsx
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
"use client";
'use client';

import { DesktopAside } from "@/components/feature/aside-menu/desktop-aside";
import { BackwardsNav } from "@/components/feature/nav/backwards";
import { IRLink } from "@/components/feature/nav/models";
import { DesktopAside } from '@/components/feature/aside-menu/desktop-aside';
import { BackwardsNav } from '@/components/feature/nav/backwards';
import { IRLink } from '@/components/feature/nav/models';
import {
CircleUserIcon,
LockIcon,
SunMoonIcon,
UserRoundCog,
} from "lucide-react";
} from 'lucide-react';

const LINKS: IRLink[] = [
{
icon: CircleUserIcon,
href: "profile",
href: 'profile',
},
{
icon: LockIcon,
href: "reset-password",
href: 'reset-password',
},
{
icon: SunMoonIcon,
href: "accesibility",
href: 'Accessibility',
},
{
icon: UserRoundCog,
href: "account",
href: 'account',
},
];

Expand All @@ -42,9 +42,9 @@ console.log(LINKS_MAPPED);

export function SettingsAside() {
return (
<div className="w-full h-full bg-neutral-200 dark:bg-cm-gray">
<div className="pt-5 flex items-center justify-center">
<BackwardsNav catchHref="/app" />
<div className='w-full h-full bg-neutral-200 dark:bg-cm-gray'>
<div className='pt-5 flex items-center justify-center'>
<BackwardsNav catchHref='/app' />
</div>
<DesktopAside links={LINKS_MAPPED} />
</div>
Expand Down
Loading
Loading