create-ej-app 26.0.0 → 27.0.0

package/template/nextjs/terraform/forwarding-rule.tf

@@ -1,43 +0,0 @@
-resource "google_compute_global_forwarding_rule" "main_lb_https_ipv4_frontend" {
-  name                  = "main-lb-https-ipv4-frontend"
-  ip_protocol           = "TCP"
-  ip_address            = google_compute_global_address.main_lb_ipv4.address
-  load_balancing_scheme = "EXTERNAL_MANAGED"
-  port_range            = "443"
-  target                = google_compute_target_https_proxy.main_lb_target_proxy.id
-
-  depends_on = [google_compute_global_address.main_lb_ipv4, google_compute_target_https_proxy.main_lb_target_proxy]
-}
-
-resource "google_compute_global_forwarding_rule" "main_lb_https_ipv6_frontend" {
-  name                  = "main-lb-https-ipv6-frontend"
-  ip_protocol           = "TCP"
-  ip_address            = google_compute_global_address.main_lb_ipv6.address
-  load_balancing_scheme = "EXTERNAL_MANAGED"
-  port_range            = "443"
-  target                = google_compute_target_https_proxy.main_lb_target_proxy.id
-
-  depends_on = [google_compute_global_address.main_lb_ipv6, google_compute_target_https_proxy.main_lb_target_proxy]
-}
-
-resource "google_compute_global_forwarding_rule" "main_lb_ipv4_http_forwarding_rule" {
-  name                  = "main-lb-ipv4-http-forwarding-rule"
-  ip_protocol           = "TCP"
-  ip_address            = google_compute_global_address.main_lb_ipv4.address
-  load_balancing_scheme = "EXTERNAL_MANAGED"
-  port_range            = "80"
-  target                = google_compute_target_http_proxy.main_lb_http_redirect_proxy.id
-
-  depends_on = [google_compute_global_forwarding_rule.main_lb_https_ipv4_frontend]
-}
-
-resource "google_compute_global_forwarding_rule" "main_lb_ipv6_http_forwarding_rule" {
-  name                  = "main-lb-ipv6-http-forwarding-rule"
-  ip_protocol           = "TCP"
-  ip_address            = google_compute_global_address.main_lb_ipv6.address
-  load_balancing_scheme = "EXTERNAL_MANAGED"
-  port_range            = "80"
-  target                = google_compute_target_http_proxy.main_lb_http_redirect_proxy.id
-
-  depends_on = [google_compute_global_forwarding_rule.main_lb_https_ipv6_frontend]
-}

package/template/nextjs/terraform/gitignore

@@ -1,4 +0,0 @@
-.terraform
-*.tfstate
-*.tfstate.*
-.terraform.lock.hcl

package/template/nextjs/terraform/ip-address.tf

@@ -1,11 +0,0 @@
-resource "google_compute_global_address" "main_lb_ipv4" {
-  name         = "main-lb-ipv4"
-  ip_version   = "IPV4"
-  address_type = "EXTERNAL"
-}
-
-resource "google_compute_global_address" "main_lb_ipv6" {
-  name         = "main-lb-ipv6"
-  ip_version   = "IPV6"
-  address_type = "EXTERNAL"
-}

package/template/nextjs/terraform/network-endpoint-group.tf

@@ -1,11 +0,0 @@
-resource "google_compute_region_network_endpoint_group" "my_app_prod_neg" {
-  name                  = "my-app-prod-neg"
-  network_endpoint_type = "SERVERLESS"
-  region                = var.region
-
-  cloud_run {
-    service = google_cloud_run_v2_service.my_app_prod.name
-  }
-
-  depends_on = [google_cloud_run_v2_service.my_app_prod]
-}

package/template/nextjs/terraform/network.tf

@@ -1,21 +0,0 @@
-resource "google_compute_network" "vpc_network" {
-  name = "terraform-network"
-}
-
-resource "google_compute_global_address" "private_ip_range" {
-  name          = "private-ip-range"
-  prefix_length = 16
-  address_type  = "INTERNAL"
-  purpose       = "VPC_PEERING"
-  network       = google_compute_network.vpc_network.self_link
-
-  depends_on = [google_compute_network.vpc_network]
-}
-
-resource "google_service_networking_connection" "private_connection" {
-  network                 = google_compute_network.vpc_network.id
-  service                 = "servicenetworking.googleapis.com"
-  reserved_peering_ranges = [google_compute_global_address.private_ip_range.name]
-
-  depends_on = [google_compute_global_address.private_ip_range]
-}

package/template/nextjs/terraform/pre.sh

@@ -1,3 +0,0 @@
-gcloud config set project project-id
-
-gcloud auth application-default set-quota-project project-id

package/template/nextjs/terraform/providers.tf

@@ -1,18 +0,0 @@
-terraform {
-  required_providers {
-    google = {
-      source  = "hashicorp/google"
-      version = "7.8.0"
-    }
-  }
-
-  backend "gcs" {
-    bucket = "project-id-tf-state"
-  }
-}
-
-provider "google" {
-  project = var.project
-  region  = var.region
-  zone    = var.zone
-}

package/template/nextjs/terraform/secret.txt

@@ -1,11 +0,0 @@
-BETTER_AUTH_URL
-BETTER_AUTH_SECRET
-BETTER_AUTH_GITHUB_ID
-BETTER_AUTH_GITHUB_SECRET
-BETTER_AUTH_GOOGLE_ID
-BETTER_AUTH_GOOGLE_SECRET
-EMAIL_SERVER_USER
-EMAIL_SERVER_PASSWORD
-EMAIL_SERVER_HOST
-EMAIL_SERVER_PORT
-EMAIL_FROM

package/template/nextjs/terraform/setup.sh

@@ -1,25 +0,0 @@
-echo "Starting pre.sh script..."
-
-gcloud config set project project-id
-
-gcloud auth application-default set-quota-project project-id
-
-echo "Setting up Google Cloud SDK and enabling required APIs..."
-
-gcloud services enable logging.googleapis.com monitoring.googleapis.com compute.googleapis.com run.googleapis.com artifactregistry.googleapis.com vpcaccess.googleapis.com cloudbuild.googleapis.com servicenetworking.googleapis.com networkconnectivity.googleapis.com certificatemanager.googleapis.com sql-component.googleapis.com storage-component.googleapis.com storage.googleapis.com cloudapis.googleapis.com secretmanager.googleapis.com
-
-echo "Enabling APIs completed."
-
-echo "Please manually create a db secret in Secret Manager with names in file secret.txt"
-
-echo "Creating storage bucket for Terraform state..."
-
-gcloud storage buckets create gs://project-id-tf-state --location=us
-
-gcloud storage buckets update gs://project-id-tf-state --versioning
-
-echo "Creating storage bucket for Terraform state completed."
-
-echo "Please manually connect github repositories on cloud build repositories from here https://console.cloud.google.com/cloud-build/repositories/1st-gen"
-
-echo "And then copy the service account (eg:- 123456-compute@developer.gserviceaccount.com) to vars terraform.tfvars file from this link https://console.cloud.google.com/iam-admin/iam"

package/template/nextjs/terraform/ssl-certs.tf

@@ -1,32 +0,0 @@
-resource "google_certificate_manager_certificate" "my_app_cert" {
-  name = "my-app-cert"
-
-  managed {
-    domains = [
-      "myapp.com"
-    ]
-    dns_authorizations = [
-      google_certificate_manager_dns_authorization.my_app_prod_auth.id,
-    ]
-  }
-
-  depends_on = [
-    google_certificate_manager_dns_authorization.my_app_prod_auth,
-  ]
-}
-
-resource "google_certificate_manager_dns_authorization" "my_app_prod_auth" {
-  name   = "my-app-prod-auth"
-  domain = "myapp.com"
-}
-
-resource "google_certificate_manager_certificate_map" "default" {
-  name = "default-cert-map"
-}
-
-resource "google_certificate_manager_certificate_map_entry" "my_app_prod_entry" {
-  name         = "my-app-prod-entry"
-  map          = google_certificate_manager_certificate_map.default.name
-  hostname     = "myapp.com"
-  certificates = [google_certificate_manager_certificate.my_app_cert.id]
-}

package/template/nextjs/terraform/target-https-proxy copy.tf

@@ -1,14 +0,0 @@
-resource "google_compute_target_https_proxy" "main_lb_target_proxy" {
-  name            = "main-lb-target-proxy"
-  url_map         = google_compute_url_map.main_lb.id
-  certificate_map = "//certificatemanager.googleapis.com/projects/${var.project}/locations/global/certificateMaps/${google_certificate_manager_certificate_map.default.name}"
-
-  depends_on = [google_compute_url_map.main_lb]
-}
-
-resource "google_compute_target_http_proxy" "main_lb_http_redirect_proxy" {
-  name    = "main-lb-http-redirect-proxy"
-  url_map = google_compute_url_map.main_lb_http_redirect.id
-
-  depends_on = [google_compute_url_map.main_lb_http_redirect]
-}

package/template/nextjs/terraform/target-https-proxy.tf

@@ -1,14 +0,0 @@
-resource "google_compute_target_https_proxy" "main_lb_target_proxy" {
-  name            = "main-lb-target-proxy"
-  url_map         = google_compute_url_map.main_lb.id
-  certificate_map = "//certificatemanager.googleapis.com/projects/${var.project}/locations/global/certificateMaps/${google_certificate_manager_certificate_map.default.name}"
-
-  depends_on = [google_compute_url_map.main_lb]
-}
-
-resource "google_compute_target_http_proxy" "main_lb_http_redirect_proxy" {
-  name    = "main-lb-http-redirect-proxy"
-  url_map = google_compute_url_map.main_lb_http_redirect.id
-
-  depends_on = [google_compute_url_map.main_lb_http_redirect]
-}

package/template/nextjs/terraform/terraform.tfvars

@@ -1,4 +0,0 @@
-project                 = "project-id"
-region                  = "us-central1"
-zone                    = "us-central1-a"
-compute_service_account = "123456-compute@developer.gserviceaccount.com"

package/template/nextjs/terraform/url-map.tf

@@ -1,23 +0,0 @@
-resource "google_compute_url_map" "main_lb" {
-  name            = "main-lb"
-  default_service = google_compute_backend_service.my_app_prod_service.id
-
-  host_rule {
-    path_matcher = "path-matcher-my-app-prod"
-    hosts        = ["myapp.com"]
-  }
-  path_matcher {
-    name            = "path-matcher-my-app-prod"
-    default_service = google_compute_backend_service.my_app_prod_service.id
-  }
-}
-
-resource "google_compute_url_map" "main_lb_http_redirect" {
-  name = "main-lb-http-to-https-redirect"
-
-  default_url_redirect {
-    https_redirect         = true
-    strip_query            = false
-    redirect_response_code = "MOVED_PERMANENTLY_DEFAULT"
-  }
-}

package/template/nextjs/terraform/variables.tf

@@ -1,21 +0,0 @@
-variable "project" {
-  description = "Google Cloud Project ID"
-  type        = string
-}
-
-variable "region" {
-  description = "Google Cloud Region"
-  type        = string
-  default     = "us-central1"
-}
-
-variable "zone" {
-  description = "Google Cloud Zone"
-  type        = string
-  default     = "us-central1-a"
-}
-
-variable "compute_service_account" {
-  description = "Default compiute Service account"
-  type        = string
-}

package/template/saas-starter/next-env.d.ts

@@ -1,6 +0,0 @@
-/// <reference types="next" />
-/// <reference types="next/image-types/global" />
-import "./.next/dev/types/routes.d.ts";
-
-// NOTE: This file should not be edited
-// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.

package/template/saas-starter/src/actions/uploads.ts

@@ -1,28 +0,0 @@
-'use server'
-
-import { assertUserMembership } from '~/lib/organization-access'
-import { authActionClient } from '~/lib/safe-action'
-import { generateUploadUrl, isR2Configured } from '~/lib/storage'
-import { generateUploadUrlSchema } from './uploads.validation'
-
-export const generateUploadUrlAction = authActionClient
-  .inputSchema(generateUploadUrlSchema)
-  .action(async ({ parsedInput, ctx: { user } }) => {
-    if (!isR2Configured()) {
-      return { mode: 'base64' as const }
-    }
-
-    if (parsedInput.organizationId) {
-      await assertUserMembership(parsedInput.organizationId)
-    }
-
-    const { uploadUrl, key } = await generateUploadUrl({
-      filename: parsedInput.filename,
-      mimeType: parsedInput.mimeType,
-      size: parsedInput.size,
-      uploadedBy: user.id,
-      organizationId: parsedInput.organizationId
-    })
-
-    return { mode: 'r2' as const, uploadUrl, key }
-  })

package/template/saas-starter/src/actions/uploads.validation.ts

@@ -1,14 +0,0 @@
-import { z } from 'zod'
-import { MAX_FILE_SIZE_BYTES, MAX_FILE_SIZE_MB } from '~/lib/constants'
-import { stringValidation } from '~/lib/validations'
-
-export const generateUploadUrlSchema = z.object({
-  filename: stringValidation,
-  mimeType: stringValidation,
-  size: z
-    .number()
-    .int()
-    .positive()
-    .max(MAX_FILE_SIZE_BYTES, `File must be under ${MAX_FILE_SIZE_MB}MB`),
-  organizationId: stringValidation
-})

package/template/saas-starter/src/app/(admin)/admin/settings/users/_components/create-user-dialog.tsx

@@ -1,183 +0,0 @@
-'use client'
-
-import { zodResolver } from '@hookform/resolvers/zod'
-import { useQueryClient } from '@tanstack/react-query'
-import { Loader2 } from 'lucide-react'
-import { useEffect, useState } from 'react'
-import { Controller, useForm } from 'react-hook-form'
-import { z } from 'zod'
-import { Button } from '~/components/ui/button'
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-  DialogTrigger
-} from '~/components/ui/dialog'
-import {
-  Field,
-  FieldContent,
-  FieldError,
-  FieldTitle
-} from '~/components/ui/field'
-import { Input } from '~/components/ui/input'
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue
-} from '~/components/ui/select'
-import { admin } from '~/lib/auth-client'
-import { toastErrorMessage, toastSuccessMessage } from '~/lib/toast-message'
-import { emailValidation, stringValidation } from '~/lib/validations'
-
-const schema = z.object({
-  name: stringValidation,
-  email: emailValidation,
-  role: z.enum(['user', 'admin', 'superadmin'])
-})
-
-type Form = z.infer<typeof schema>
-
-interface CreateUserDialogProps {
-  children: React.ReactNode
-}
-
-export function CreateUserDialog({ children }: CreateUserDialogProps) {
-  const queryClient = useQueryClient()
-  const [open, setOpen] = useState(false)
-
-  const {
-    register,
-    handleSubmit,
-    reset,
-    control,
-    formState: { errors, isSubmitting }
-  } = useForm<Form>({
-    resolver: zodResolver(schema),
-    defaultValues: { name: '', email: '', role: 'user' }
-  })
-
-  useEffect(() => {
-    if (open) reset({ name: '', email: '', role: 'user' })
-  }, [open, reset])
-
-  async function onSubmit(values: Form) {
-    const { error } = await admin.createUser({
-      name: values.name,
-      email: values.email,
-      role: values.role as any,
-      data: {}
-    })
-
-    if (error) {
-      toastErrorMessage(error.message ?? 'Failed to create user')
-      return
-    }
-
-    toastSuccessMessage(`Account created for ${values.email}`)
-    setOpen(false)
-    queryClient.invalidateQueries({ queryKey: ['admin-users'] })
-  }
-
-  return (
-    <Dialog open={open} onOpenChange={setOpen}>
-      <DialogTrigger asChild>{children}</DialogTrigger>
-      <DialogContent className="sm:max-w-md">
-        <DialogHeader>
-          <DialogTitle>Create user</DialogTitle>
-          <DialogDescription>
-            Create a new account. The user will sign in via magic link.
-          </DialogDescription>
-        </DialogHeader>
-
-        <form onSubmit={handleSubmit(onSubmit)} className="space-y-4 py-1">
-          <Field orientation="vertical">
-            <FieldContent>
-              <FieldTitle className="text-foreground mb-1.5 text-[13px] font-semibold">
-                Name
-              </FieldTitle>
-              <Input
-                autoFocus
-                placeholder="Jane Doe"
-                {...register('name')}
-                aria-invalid={!!errors.name}
-              />
-              <FieldError
-                errors={[errors.name]}
-                className="mt-1.5 text-[13px]"
-              />
-            </FieldContent>
-          </Field>
-
-          <Field orientation="vertical">
-            <FieldContent>
-              <FieldTitle className="text-foreground mb-1.5 text-[13px] font-semibold">
-                Email
-              </FieldTitle>
-              <Input
-                type="email"
-                placeholder="jane@example.com"
-                autoComplete="off"
-                {...register('email')}
-                aria-invalid={!!errors.email}
-              />
-              <FieldError
-                errors={[errors.email]}
-                className="mt-1.5 text-[13px]"
-              />
-            </FieldContent>
-          </Field>
-
-          <Field orientation="vertical">
-            <FieldContent>
-              <FieldTitle className="text-foreground mb-1.5 text-[13px] font-semibold">
-                Role
-              </FieldTitle>
-              <Controller
-                control={control}
-                name="role"
-                render={({ field }) => (
-                  <Select value={field.value} onValueChange={field.onChange}>
-                    <SelectTrigger className="w-full">
-                      <SelectValue placeholder="Select role" />
-                    </SelectTrigger>
-                    <SelectContent>
-                      <SelectItem value="user">User</SelectItem>
-                      <SelectItem value="admin">Admin</SelectItem>
-                      <SelectItem value="superadmin">Superadmin</SelectItem>
-                    </SelectContent>
-                  </Select>
-                )}
-              />
-              <FieldError
-                errors={[errors.role]}
-                className="mt-1.5 text-[13px]"
-              />
-            </FieldContent>
-          </Field>
-
-          <DialogFooter>
-            <Button
-              type="button"
-              variant="outline"
-              onClick={() => setOpen(false)}
-              disabled={isSubmitting}
-            >
-              Cancel
-            </Button>
-            <Button type="submit" disabled={isSubmitting}>
-              {isSubmitting && (
-                <Loader2 className="mr-2 h-4 w-4 animate-spin" />
-              )}
-              Create account
-            </Button>
-          </DialogFooter>
-        </form>
-      </DialogContent>
-    </Dialog>
-  )
-}

package/template/saas-starter/src/app/(admin)/admin/settings/users/_components/edit-name-dialog.tsx

@@ -1,129 +0,0 @@
-'use client'
-
-import { zodResolver } from '@hookform/resolvers/zod'
-import { useQueryClient } from '@tanstack/react-query'
-import { Loader2 } from 'lucide-react'
-import { useEffect, useState } from 'react'
-import { useForm } from 'react-hook-form'
-import { z } from 'zod'
-import { Button } from '~/components/ui/button'
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-  DialogTrigger
-} from '~/components/ui/dialog'
-import {
-  Field,
-  FieldContent,
-  FieldError,
-  FieldTitle
-} from '~/components/ui/field'
-import { Input } from '~/components/ui/input'
-import { admin } from '~/lib/auth-client'
-import { toastErrorMessage, toastSuccessMessage } from '~/lib/toast-message'
-import { stringValidation } from '~/lib/validations'
-
-const schema = z.object({
-  name: stringValidation
-})
-
-type Form = z.infer<typeof schema>
-
-interface EditNameDialogProps {
-  userId: string
-  currentName: string
-  children: React.ReactNode
-}
-
-export function EditNameDialog({
-  userId,
-  currentName,
-  children
-}: EditNameDialogProps) {
-  const queryClient = useQueryClient()
-  const [open, setOpen] = useState(false)
-
-  const {
-    register,
-    handleSubmit,
-    reset,
-    formState: { errors, isSubmitting, isDirty }
-  } = useForm<Form>({
-    resolver: zodResolver(schema),
-    defaultValues: { name: currentName }
-  })
-
-  useEffect(() => {
-    if (open) reset({ name: currentName })
-  }, [open, currentName, reset])
-
-  async function onSubmit(values: Form) {
-    const { error } = await admin.updateUser({
-      userId,
-      data: { name: values.name }
-    })
-
-    if (error) {
-      toastErrorMessage(error.message ?? 'Failed to update name')
-      return
-    }
-
-    toastSuccessMessage('Name updated')
-    setOpen(false)
-    queryClient.invalidateQueries({ queryKey: ['admin-users'] })
-  }
-
-  return (
-    <Dialog open={open} onOpenChange={setOpen}>
-      <DialogTrigger asChild>{children}</DialogTrigger>
-      <DialogContent className="sm:max-w-sm">
-        <DialogHeader>
-          <DialogTitle>Edit name</DialogTitle>
-          <DialogDescription>
-            Update the user&apos;s display name.
-          </DialogDescription>
-        </DialogHeader>
-
-        <form onSubmit={handleSubmit(onSubmit)} className="space-y-4 py-1">
-          <Field orientation="vertical">
-            <FieldContent>
-              <FieldTitle className="text-foreground mb-1.5 text-[13px] font-semibold">
-                Name
-              </FieldTitle>
-              <Input
-                autoFocus
-                {...register('name')}
-                aria-invalid={!!errors.name}
-              />
-              <FieldError
-                errors={[errors.name]}
-                className="mt-1.5 text-[13px]"
-              />
-            </FieldContent>
-          </Field>
-
-          <DialogFooter>
-            <Button
-              type="button"
-              variant="outline"
-              onClick={() => setOpen(false)}
-              disabled={isSubmitting}
-            >
-              Cancel
-            </Button>
-            <Button type="submit" disabled={isSubmitting || !isDirty}>
-              {isSubmitting && (
-                <Loader2 className="mr-2 h-4 w-4 animate-spin" />
-              )}
-              Save
-            </Button>
-          </DialogFooter>
-        </form>
-      </DialogContent>
-    </Dialog>
-  )
-}