v0.1.3

v0.1.3 chore: fix version fix: redirecting
alkinum · Aug 26, 2024 · 4b2e6cc · 4b2e6cc
1 parent 7e183ac
commit 4b2e6cc
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 28 deletions.
diff --git a/astro.config.mjs b/astro.config.mjs
@@ -18,4 +18,9 @@ export default defineConfig({
     }),
     auth(),
   ],
-});
+  vite: {
+    ssr: {
+      external: ['node:crypto', 'node:path'],
+    },
+  },
+});
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "alphapush",
   "type": "module",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "scripts": {
     "dev": "astro dev",
     "start": "astro dev",
@@ -12,7 +12,7 @@
     "db:migrate:local": "wrangler d1 migrations apply alphapush-prod --local",
     "db:migrate:prod": "wrangler d1 migrations apply alphapush-prod --remote",
     "db:migrate:dev": "wrangler d1 migrations apply --env dev alphapush-dev --remote",
-    "deploy": "astro build && wrangler deploy"
+    "deploy": "astro build && wrangler pages deploy dist"
   },
   "license": "MIT",
   "homepage": "https://github.com/alkinum/alphapush",
@@ -38,6 +38,7 @@
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.1",
     "drizzle-orm": "^0.33.0",
+    "highlight.js": "^11.10.0",
     "marked": "^14.0.0",
     "nanoid": "^5.0.7",
     "radix-vue": "^1.9.4",

diff --git a/src/components/notification/NotificationCard.vue b/src/components/notification/NotificationCard.vue
@@ -1,10 +1,11 @@
 <script setup lang="ts">
 import { ref, onMounted, computed } from 'vue';
+import hljs from 'highlight.js';
 import { marked } from 'marked';
 import { Card, CardHeader, CardTitle, CardContent } from '@/components/ui/card';
 import { Button } from '@/components/ui/button';
 import type { Notification } from '@/types/notification';
-import { highlighter } from '@/utils/highlighter';
+import 'highlight.js/styles/github-dark.css';
 
 interface Props {
   notification: Notification & { highlight?: boolean };
@@ -17,11 +18,8 @@ const isTruncated = ref(false);
 const buttonText = ref('View All');
 
 const renderer = new marked.Renderer();
-renderer.code = ({ text, lang }) => {
-  const highlightedCode = highlighter.codeToHtml(text, {
-    lang: lang || 'plaintext',
-    theme: 'github-dark',
-  });
+renderer.code = ({ text, language }) => {
+  const highlightedCode = hljs.highlight(text, { language });
   return `<div class="code-block">${highlightedCode}</div>`;
 };
 

diff --git a/src/pages/api/subscription.ts b/src/pages/api/subscription.ts
@@ -3,7 +3,6 @@ import { getSession } from 'auth-astro/server';
 import { eq, and } from 'drizzle-orm';
 import { getDb } from '@/db';
 import { subscriptions } from '@/schema';
-import { SubscriptionService } from '@/services/subscriptionService';
 
 // Helper function: Validate SHA256 hash
 function isValidSHA256(hash: string): boolean {

diff --git a/src/pages/index.astro b/src/pages/index.astro
@@ -10,13 +10,14 @@ let initialNotifications = [];
 let totalPages = 0;
 
 const allowedEmails = import.meta.env.ALLOWED_EMAILS?.split(',').map((email: string) => email.trim()) || [];
-const isAllowedUser = session?.user?.email && allowedEmails.includes(session.user.email);
+const isLogin = !!session?.user?.email;
+const isAllowedUser = isLogin && allowedEmails.includes(session?.user?.email);
 
-if (!isAllowedUser) {
+if (isLogin && !isAllowedUser) {
   return Astro.redirect('/403');
 }
 
-if (session?.user?.email) {
+if (isLogin) {
   const apiUrl = new URL('/api/notifications', Astro.url);
   apiUrl.searchParams.set('page', '1');
   apiUrl.searchParams.set('pageSize', '10');

diff --git a/src/utils/highlighter.ts b/src/utils/highlighter.ts
diff --git a/tsconfig.json b/tsconfig.json
@@ -3,11 +3,10 @@
   "compilerOptions": {
     "baseUrl": ".",
     "paths": {
-      "@/*": [
-        "./src/*"
-      ]
+      "@/*": ["./src/*"]
     },
     "jsx": "preserve",
     "types": ["@cloudflare/workers-types"]
-  }
-}
+  },
+  "exclude": ["dist", "public"]
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,4 +18,9 @@ export default defineConfig({ @@
         }),
         auth(),
       ],
-    });
+      vite: {
+        ssr: {
+          external: ['node:crypto', 'node:path'],
+        },
+      },
+    });