Merge pull request #46 from plebnet-dev/fix-redirect

 redirect join page, permalink

astro.config.mjs

@@ -10,16 +10,19 @@ import compress from 'astro-compress';
 import { readingTimeRemarkPlugin } from './src/utils/frontmatter.mjs';
 import { SITE } from './src/config.mjs';
 import svelte from "@astrojs/svelte";
-// import node from '@astrojs/node';
-// import vercelEdge from '@astrojs/vercel/edge';
 import vercel from "@astrojs/vercel/serverless";
 import 'dotenv/config';
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const whenExternalScripts = (items = []) => SITE.googleAnalyticsId ? Array.isArray(items) ? items.map(item => item()) : [items()] : [];
 
-
 // https://astro.build/config
 export default defineConfig({
+  redirects: {
+    '/join': {
+      status: 302,
+      destination: '/join-us'
+    }
+  },
   site: SITE.origin,
   base: SITE.basePathname,
   trailingSlash: SITE.trailingSlash ? 'always' : 'never',

src/config.mjs

@@ -25,7 +25,7 @@ const CONFIG = {
   }),
 
   googleAnalyticsId: false, // or "G-XXXXXXXXXX",
-  googleSiteVerificationId: 'orcPxI47GSa-cRvY11tUe6iGg2IO_RPvnA1q95iEM3M',
+  googleSiteVerificationId: '', //'orcPxI47GSa-cRvY11tUe6iGg2IO_RPvnA1q95iEM3M',
 
   blog: {
     disabled: false,

src/content/post/resources.md

@@ -43,6 +43,6 @@ For design enthusiasts and contributors, we're contemplating whether to list the
 
 Your feedback and suggestions drive us. We'd love to hear your thoughts on this, whether it's on [GitHub](https://github.com/plebnet-dev) or any of our other platforms.
 
-**Join us if you're interested in contributing as a senior dev, junior dev, or a code advocate who wants to learn more by starting [here](https://plebnet.dev/join)**
+**Join us if you're interested in contributing as a senior dev, junior dev, or a code advocate who wants to learn more by starting [here](https://plebnet.dev/join-us)**
 
 **Attribution: This content is a PlebNet Dev Contribution. The article was authored by [bitc0inDad](https://github.com/Bitc0indad)**

src/data.js

@@ -1,4 +1,4 @@
-import { getPermalink, getBlogPermalink, getAsset } from './utils/permalinks';
+import {getBlogPermalink, getJoinPermalink, getAsset } from './utils/permalinks';
 
 export const headerData = {
   links: [
@@ -7,11 +7,11 @@ export const headerData = {
       links: [
         {
           text: 'Join Us',
-          href: '/join',    
+          href:  getJoinPermalink(),
         },
         {
           text: 'FAQ',
-          href: '/join#faq',    
+          href:  getJoinPermalink() + '#faq',
         },
         {
           text: 'Projects',
@@ -98,8 +98,8 @@ export const footerData = {
     {
       title: 'Members',
       links: [
-        { text: 'Join Us', href: '/join' },
-        { text: 'FAQ', href: '/join#faq' },
+        { text: 'Join Us', href:  getJoinPermalink() },
+        { text: 'FAQ', href:  getJoinPermalink() + '#faq' },
         { text: 'Projects', href: '/projects' },
         { text: 'Blog', href: '/blog' },
         // { text: 'Directory', href: '/directory' },

src/pages/Corp.astro

@@ -3,6 +3,7 @@ import Layout from "~/layouts/PageLayout.astro";
 import Header from "~/components/widgets/Header.astro";
 import { headerData } from "~/data";
 import SignUpFormCorp from '../components/SignUpFormCorp.svelte';
+import {getJoinPermalink } from '../utils/permalinks';
 
 const meta = {
   title: "PLEBNET.DEV Join Us",
@@ -17,7 +18,7 @@ const meta = {
           {
             type: "primary",
             text: "Sign Up",
-            href: "/join",
+            href:  getJoinPermalink(),
           },
         ]}
         isSticky

src/pages/Indiv.astro

@@ -3,6 +3,7 @@ import Layout from "~/layouts/PageLayout.astro";
 import Header from "~/components/widgets/Header.astro";
 import { headerData } from "~/data";
 import SignUpFormIndiv from '../components/SignUpFormIndiv.svelte';
+import { getJoinPermalink } from '../utils/permalinks';
 
 const meta = {
   title: "PLEBNET.DEV Join Us",
@@ -17,8 +18,8 @@ const meta = {
         actions={[
           {
             type: "primary",
-            text: "Sign Up",
-            href: "/join",
+            text: "Join Us",
+            href:  getJoinPermalink(),
           },
         ]}
         isSticky

src/pages/index.astro

@@ -8,6 +8,7 @@ import Content from '~/components/widgets/Content.astro';
 import CallToAction from '~/components/widgets/CallToAction.astro';
 import BlogLatestPosts from '~/components/widgets/BlogLatestPosts.astro';
 
+import {getJoinPermalink } from '../utils/permalinks';
 
 import { headerData } from '~/data';
 
@@ -24,7 +25,7 @@ const meta = {
         {
           type: "primary",
           text: 'Join Us',
-          href: '/join',
+          href:  getJoinPermalink(),
         },
       ]}
       isSticky
@@ -34,7 +35,7 @@ const meta = {
   <!-- Hero2 Widget ******************* -->
 
   <Hero2
-    callToAction={{ text: 'Join Us', href: '/join' }}
+    callToAction={{ text: 'Join Us', href:  getJoinPermalink() }}
     callToAction2={{ text: 'Learn More', href: '#more' }}
     image={{ src: import('~/assets/images/electricbitcoin.jpg'), alt: 'Plebnet.dev Hero Image' }}
   >
@@ -108,7 +109,7 @@ const meta = {
    <CallToAction
    callToAction={{
      text: 'Join Us',
-     href: '/join',
+     href:  getJoinPermalink(),
    }}
  >
    <Fragment slot="title">

src/pages/join.astro → src/pages/join-us.astro

@@ -11,7 +11,6 @@ const meta = {
 };
 
 ---
-
 <Layout {meta}>
   <Fragment slot="header">
     <Header

src/pages/projects.astro

@@ -5,6 +5,8 @@ import Header from '~/components/widgets/Header.astro';
 import FeaturesLink from '~/components/widgets/FeaturesLink.astro';
 
 import { headerData } from '~/data';
+import { getJoinPermalink } from '../utils/permalinks';
+
 
 const meta = {
   title: 'PLEBNET.DEV Projects',
@@ -18,8 +20,8 @@ const meta = {
       actions={[
         {
           type: "primary",
-          text: 'Sign Up',
-          href: '/join',
+          text: 'Join Us',
+          href: getJoinPermalink(),
         },
       ]}
       isSticky

src/pages/rss.xml.ts

@@ -8,7 +8,7 @@ export const get = async () => {
   if (BLOG.disabled) {
     return new Response(null, {
       status: 404,
-      statusText: 'Not found',
+      statusText: 'Content Not found',
     });
   }
 

src/pages/sponsors.astro

@@ -2,6 +2,7 @@
 import Layout from '~/layouts/PageLayout.astro';
 import Header from '~/components/widgets/Header.astro';
 import Content from '~/components/widgets/Content.astro';
+import {getJoinPermalink } from '../utils/permalinks';
 
 import { headerData } from '~/data';
 
@@ -17,8 +18,8 @@ const meta = {
       actions={[
         {
           type: 'primary',
-          text: 'Sign Up',
-          href: '/join',
+          text: 'Join Us',
+          href: getJoinPermalink(),
         },
       ]}
       isSticky

src/pages/svelte-contact.astro

@@ -4,6 +4,7 @@ import Header from '~/components/widgets/Header.astro';
 import ContactForm from "../components/ContactForm.svelte";
 
 import { headerData } from '~/data';
+import {getJoinPermalink } from '../utils/permalinks';
 
 const meta = {
   title: 'PLEBNET.DEV Contact us',
@@ -17,8 +18,8 @@ const meta = {
       actions={[
         {
           type: "primary",
-          text: 'Sign Up',
-          href: '/join',
+          text: 'Join Us',
+          href: getJoinPermalink(),
         },
       ]}
       isSticky

src/utils/permalinks.ts

@@ -25,6 +25,7 @@ export const POST_PERMALINK_PATTERN = trimSlash(BLOG?.post?.permalink || '/%slug
 export const BLOG_BASE = cleanSlug(BLOG?.list?.pathname);
 export const CATEGORY_BASE = cleanSlug(BLOG?.category?.pathname || 'category');
 export const TAG_BASE = cleanSlug(BLOG?.tag?.pathname) || 'tag';
+export const JOIN_US = 'join-us';
 
 /** */
 export const getCanonical = (path = ''): string | URL => {
@@ -70,6 +71,9 @@ export const getHomePermalink = (): string => getPermalink('/');
 /** */
 export const getBlogPermalink = (): string => getPermalink(BLOG_BASE);
 
+/** */
+export const getJoinPermalink = (): string => getPermalink(JOIN_US);
+
 /** */
 export const getAsset = (path: string): string =>
   '/' +