Merge pull request #45 from thedevdavid/release/0.7.1

Release/0.7.1

.env.example

@@ -9,6 +9,9 @@ NEXT_PUBLIC_UMAMI_WEBSITE_ID=
 NEXT_PUBLIC_PLAUSIBLE_DOMAIN=
 NEXT_PUBLIC_PLAUSIBLE_SCRIPT_URL=
 
+#Google Analytics
+NEXT_PUBLIC_GOOGLE_ANALYTICS_ID=
+
 #Email
 EMAIL_API_BASE=
 NEXT_PUBLIC_EMAIL_API_KEY=

CHANGELOG.md

@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.7.1] - 2023-08-22
+
+### Added
+
+- Google Analytics provider
+
+### Fixed
+
+- Footer social icons responsive issues
+
 ## [0.7.0] - 2023-08-19
 
 ### Added

README.md

@@ -1,6 +1,6 @@
 # Modern Developer Blog Template (Digital Garden Starter)
 
-![Image2](/screenshots/garden2.png)
+![GardenPromo](/screenshots/garden-promo.jpg)
 [More screenshots here](/screenshots/)
 
 [![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/clone?repository-url=https%3A%2F%2Fgithub.com%2Fthedevdavid%2Fdigital-garden%2F)
@@ -33,6 +33,7 @@ If you love this template and/or use it, please give it a star on GitHub. This w
     - [Vercel](#vercel)
     - [Umami](#umami)
     - [Plausible](#plausible)
+    - [Google Analytics](#google-analytics)
     - [Other analytics providers](#other-analytics-providers)
   - [Newsletter subscription](#newsletter-subscription)
     - [MailerLite](#mailerlite)
@@ -158,6 +159,13 @@ Plausible is a simple, lightweight, open-source alternative to Google Analytics.
 Configure:
 Set `NEXT_PUBLIC_PLAUSIBLE_DOMAIN` & `NEXT_PUBLIC_PLAUSIBLE_SCRIPT_URL` environment variables on your `.env.local` file and on Vercel dashboard. If you're concerned about ad blockers, you can proxy the plausible script through your own domain. You can read more about it [here](https://plausible.io/docs/proxy/guides/nextjs).
 
+#### Google Analytics
+
+Google Analytics is a web analytics service offered by Google that tracks and reports website traffic, currently as a platform inside the Google Marketing Platform brand. You can read more about it on [Google Analytics website](https://analytics.google.com/).
+
+Configure:
+Set `NEXT_PUBLIC_GOOGLE_ANALYTICS_ID` environment variable on your `.env.local` file and on Vercel dashboard.
+
 #### Other analytics providers
 
 Supporting other analytics providers are in progress. Feel free to open an issue if you have any suggestions or a PR if you want to implement it yourself.
@@ -219,7 +227,7 @@ Note: DO NOT overdo it. You can easily make images look bad with lossy compressi
 - [x] projects page
 - [x] about section on homepage
 - [x] search & command bar
-- [x] Analytics: Vercel, Umami, Plausible
+- [x] Analytics: Vercel, Umami, Plausible, Google Analytics
 - [x] Post series
 - [x] Not found page
 - [x] contributing docs

components/analytics.tsx

@@ -12,7 +12,7 @@ export const Analytics = () => {
             async
             defer
             data-website-id={process.env.NEXT_PUBLIC_UMAMI_WEBSITE_ID}
-            src={process.env.NEXT_PUBLIC_UMAMI_SCRIPT_URL}
+            src={process.env.NEXT_PUBLIC_UMAMI_SCRIPT_URL || "https://analytics.umami.is/script.js"}
           />
         );
       case "plausible":
@@ -21,9 +21,29 @@ export const Analytics = () => {
             async
             defer
             data-domain={process.env.NEXT_PUBLIC_PLAUSIBLE_DOMAIN}
-            src={process.env.NEXT_PUBLIC_PLAUSIBLE_SCRIPT_URL}
+            src={process.env.NEXT_PUBLIC_PLAUSIBLE_SCRIPT_URL || "https://plausible.io/js/plausible.js"}
           />
         );
+      case "google":
+        return (
+          <>
+            <Script
+              async
+              defer
+              strategy="afterInteractive"
+              src={`https://www.googletagmanager.com/gtag/js?id=${process.env.NEXT_PUBLIC_GOOGLE_ANALYTICS_ID}`}
+            />
+
+            <Script strategy="afterInteractive" id="ga-script">
+              {`
+            window.dataLayer = window.dataLayer || [];
+            function gtag(){dataLayer.push(arguments);}
+            gtag('js', new Date());
+            gtag('config', '${process.env.NEXT_PUBLIC_GOOGLE_ANALYTICS_ID}');
+        `}
+            </Script>
+          </>
+        );
       case "vercel":
         return <VercelAnalytics />;
       default:

components/footer.tsx

@@ -8,11 +8,11 @@ import { SocialButton } from "@/components/social-button";
 
 const Footer = () => {
   return (
-    <footer className="mx-auto flex max-w-6xl flex-col items-center gap-6 border-t py-6">
+    <footer className="mx-auto flex max-w-6xl flex-col items-center gap-6 border-t py-6 pb-28 sm:pb-6">
       <Signature />
       <div className="container flex flex-col items-center justify-between space-y-5 text-center lg:flex-row lg:space-y-0 lg:text-left">
         <div className="flex flex-col items-center gap-4 px-8 md:flex-row md:gap-2 md:px-0 lg:order-2">
-          <div className="flex flex-row space-x-2 text-sm text-muted-foreground">
+          <div className="flex flex-row flex-wrap justify-center space-x-2 text-sm text-muted-foreground">
             {defaultAuthor.socialProfiles.map((platform) => (
               <SocialButton
                 key={platform.name}
@@ -32,7 +32,7 @@ const Footer = () => {
           <p className="text-sm text-muted-foreground md:text-left">
             &copy; {new Date().getFullYear()} Built by {defaultAuthor.name}. &nbsp;
             <a
-              href={defaultAuthor.socialProfiles.find((platform) => platform.name === "twitter")?.link}
+              href={defaultAuthor.socialProfiles.find((platform) => platform.name === "x")?.link}
               target="_blank"
               rel="noreferrer"
               className="font-medium underline underline-offset-4"

content/posts/get-started.mdx

@@ -39,7 +39,7 @@ Editing list pages is done in the `lib` folder.
 - `/projects` - `lib/projects-data.ts`
 - `/social` - `lib/social-data.ts`
 
-```hello.js
+```js title="hello.js"
 let hello = "hello darkness";
 
 console.log(hello, "my old friend");

lib/metadata.ts

@@ -32,6 +32,7 @@ const siteMetadata: SiteMetaData = {
   },
   description: defaultDescription,
   siteRepo: "https://github.com/thedevdavid/digital-garden",
+  newsletterProvider: "mailerlite",
   newsletterUrl: "https://developreneur.davidlevai.com",
   analyticsProvider: "umami",
   defaultTheme: "system",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "digital-garden",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "private": true,
   "repository": "https://github.com/thedevdavid/digital-garden",
   "author": {

types/index.tsx

@@ -26,7 +26,9 @@ export interface MobileLinkProps extends LinkProps {
   className?: string;
 }
 
-export type AnalyticsProvider = "umami" | "vercel" | "plausible";
+export type AnalyticsProvider = "umami" | "vercel" | "plausible" | "google";
+
+export type NewsletterProvider = "convertkit" | "substack" | "mailerlite";
 
 export type SiteMetaData = {
   title: {
@@ -35,6 +37,7 @@ export type SiteMetaData = {
   };
   description: string;
   siteRepo: string;
+  newsletterProvider?: NewsletterProvider;
   newsletterUrl?: string;
   analyticsProvider?: AnalyticsProvider;
   defaultTheme: "light" | "dark" | "system";