Skip to content

Connect, collaborate, and grow with a community of TypeScript developers

done (#319)

bautistaaa462b91ae2a0e
diff --git a/package.json b/package.json
index f493df2c..cbacfbcb 100644
--- a/package.json
+++ b/package.json
@@ -53,6 +53,7 @@
"framer-motion": "^10.12.22",
"lodash": "^4.17.21",
"lucide-react": "^0.260.0",
+ "lz-string": "^1.5.0",
"monaco-editor": "^0.40.0",
"monaco-vim": "^0.4.0",
"next": "^13.4.10",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 71d971dc..a1371f3a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -118,6 +118,9 @@ dependencies:
lucide-react:
specifier: ^0.260.0
version: 0.260.0([email protected])
+ lz-string:
+ specifier: ^1.5.0
+ version: 1.5.0
monaco-editor:
specifier: ^0.40.0
version: 0.40.0
@@ -4927,6 +4930,11 @@ packages:
react: 18.2.0
dev: false
+ resolution: {integrity: sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==}
+ hasBin: true
+ dev: false
+
resolution: {integrity: sha512-Z1NL3Tb1M9wH4XESsCDEksWoKTdlUafKc4pt0GRwjUyXaCFZ+dc3g2erqB6zm3szA2IUSi7VnPI+o/9jnxh9hw==}
dev: false
diff --git a/src/components/challenge/code-panel/index.tsx b/src/components/challenge/code-panel/index.tsx
index adda1409..e8928237 100644
--- a/src/components/challenge/code-panel/index.tsx
+++ b/src/components/challenge/code-panel/index.tsx
@@ -6,7 +6,7 @@ import { Loader2, Settings } from 'lucide-react';
import type * as monaco from 'monaco-editor';
import { useSession } from 'next-auth/react';
import dynamic from 'next/dynamic';
-import { useRouter } from 'next/navigation';
+import { useRouter, useSearchParams } from 'next/navigation';
import { useRef, useState } from 'react';
import { type ChallengeRouteData } from '~/app/challenge/[id]/getChallengeRouteData';
import { Button } from '~/components/ui/button';
@@ -27,6 +27,7 @@ import { SettingsForm } from '../settings-form';
import { USER_CODE_START, USER_CODE_START_REGEX } from './constants';
import { libSource } from './editor-types';
import { createTwoslashInlayProvider } from './twoslash';
+import lzstring from 'lz-string';
const VimStatusBar = dynamic(() => import('./vimMode').then((v) => v.VimStatusBar), {
ssr: false,
@@ -52,6 +53,7 @@ export type TsErrors = [
];
export const CodePanel = (props: Props) => {
+ const params = useSearchParams();
const router = useRouter();
const { toast } = useToast();
const { data: session } = useSession();
@@ -62,14 +64,19 @@ export const CodePanel = (props: Props) => {
'',
);
+ const defaultCode =
+ lzstring.decompressFromEncodedURIComponent(params.get('code') ?? '') ?? localStorageCode;
+
const getDefaultCode = () => {
- if (!localStorageCode) {
+ if (!defaultCode) {
return props.challenge.prompt;
}
+ console.log({ defaultCode });
+
const [appendSolutionToThis, separator] = props.challenge.prompt.split(USER_CODE_START_REGEX);
- return `${appendSolutionToThis ?? ''}${separator ?? ''}${localStorageCode}`;
+ return `${appendSolutionToThis ?? ''}${separator ?? ''}${defaultCode}`;
};
const [code, setCode] = useState(() => getDefaultCode());
diff --git a/src/components/challenge/share-form.tsx b/src/components/challenge/share-form.tsx
index dd8dc025..9825f3f1 100644
--- a/src/components/challenge/share-form.tsx
+++ b/src/components/challenge/share-form.tsx
@@ -1,12 +1,18 @@
'use client';
+import { CheckCircle2 as CheckCircle2Icon, Clipboard as ClipboardIcon } from 'lucide-react';
+import lzstring from 'lz-string';
+import { useParams } from 'next/navigation';
import { useCallback, useState } from 'react';
-import { Clipboard as ClipboardIcon, CheckCircle2 as CheckCircle2Icon } from 'lucide-react';
+import { useLocalStorage } from '~/utils/useLocalStorage';
import { DialogFooter } from '../ui/dialog';
export function ShareForm() {
- const url = window.location.href;
+ const { id: challengeId } = useParams();
const [copied, setCopied] = useState(false);
+ const [copiedWithCode, setCopiedWithCode] = useState(false);
+ const [codeToCompress] = useLocalStorage(`challenge-${challengeId}`, '');
+ const url = `${window.location.origin}/challenge/${challengeId}`;
const copyToClipboard = useCallback(async () => {
const url = window.location.href;
@@ -21,7 +27,23 @@ export function ShareForm() {
console.error('copyToClipboard', e);
setCopied(false);
}
- }, [setCopied, copied]);
+ }, [copied]);
+
+ const copyToClipboardWithCode = useCallback(async () => {
+ const compressedCode = lzstring.compressToEncodedURIComponent(codeToCompress);
+ const url = `${window.location.href}?code=${compressedCode}`;
+
+ try {
+ if (navigator.clipboard && !copiedWithCode) {
+ await navigator.clipboard.writeText(url);
+ setCopiedWithCode(true);
+ window.setTimeout(() => setCopiedWithCode(false), 3000);
+ }
+ } catch (e) {
+ console.error('copyToClipboard', e);
+ setCopiedWithCode(false);
+ }
+ }, [copiedWithCode, codeToCompress]);
return (
<div className="flex flex-col space-y-4">
@@ -29,6 +51,18 @@ export function ShareForm() {
<code className="rounded-md border px-4 py-2 dark:border-gray-300">{url}</code>
<DialogFooter>
+ <button
+ className={`flex items-center justify-between space-x-2 rounded-lg px-2 py-1 duration-300 active:scale-75
+ ${
+ copiedWithCode
+ ? 'border border-green-500 text-green-500 dark:border-green-700 dark:bg-green-700 dark:text-white'
+ : 'border border-gray-100 text-black hover:bg-gray-100 dark:bg-white'
+ }`}
+ onClick={copyToClipboardWithCode}
+ >
+ <span>{copiedWithCode ? 'Copied!' : 'Share with Code'}</span>
+ {copiedWithCode ? <CheckCircle2Icon /> : <ClipboardIcon />}
+ </button>
<button
className={`flex items-center justify-between space-x-2 rounded-lg px-2 py-1 duration-300 active:scale-75
${
diff --git a/src/middleware.ts b/src/middleware.ts
index 1c6b1e8b..1547eeb5 100644
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -1,4 +1,4 @@
-import { NextRequest, NextResponse } from 'next/server';
+import { type NextRequest, NextResponse } from 'next/server';
export function middleware(req: NextRequest) {
if (process.env.NODE_ENV === 'production') {