Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed the error in deployment of sites #14

Merged
merged 4 commits into from
Oct 29, 2023
Merged

Fixed the error in deployment of sites #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
24e9169
sites error resolving
himohitmehta Oct 29, 2023
51fb440
test sites deployment on vercel
himohitmehta Oct 29, 2023
03b2ecf
trying to resolve the build
himohitmehta Oct 29, 2023
5386eb5
[Test]: found the error was schema.prisma got deleted accidentally
himohitmehta Oct 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions apps/sites/app/[domain]/[slug]/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import { notFound } from "next/navigation";
import { getPostData } from "@/lib/fetchers";
import BlogCard from "@/components/blog-card";
import BlurImage from "@/components/blur-image";
import MDX from "@/components/mdx";
import { placeholderBlurhash, toDateString } from "@/lib/utils";
import { toDateString } from "@/lib/utils";

export async function generateMetadata({
params,
Expand Down
9 changes: 4 additions & 5 deletions apps/sites/app/[domain]/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import Image from "next/image";
// import Image from "next/image";
import Link from "next/link";
import { ReactNode } from "react";
import prisma from "@/lib/prisma";
import CTA from "@/components/cta";
import ReportAbuse from "@/components/report-abuse";
// import CTA from "@/components/cta";
import { notFound, redirect } from "next/navigation";
import { getSiteData } from "@/lib/fetchers";
import { fontMapper } from "@/styles/fonts";
Expand Down Expand Up @@ -126,12 +125,12 @@ export default async function SiteLayout({

<div className="mt-20">{children}</div>

{params.domain == `demo.${process.env.NEXT_PUBLIC_ROOT_DOMAIN}` ||
{/* {params.domain == `demo.${process.env.NEXT_PUBLIC_ROOT_DOMAIN}` ||
params.domain == `saroh.site` ? (
<CTA />
) : (
<ReportAbuse />
)}
)} */}
</div>
);
}
89 changes: 0 additions & 89 deletions apps/sites/components/report-abuse.tsx
View file
Open in desktop

This file was deleted.

16 changes: 16 additions & 0 deletions apps/sites/next.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,22 @@ const nextConfig = {
return config;
},
reactStrictMode: false,
experimental: {
serverActions: true,
},
images: {
domains: [
"public.blob.vercel-storage.com",
"res.cloudinary.com",
"abs.twimg.com",
"pbs.twimg.com",
"avatars.githubusercontent.com",
"www.google.com",
"flag.vercel.app",
"illustrations.popsy.co",
"lh3.googleusercontent.com",
],
},
};

module.exports = nextConfig;
12 changes: 7 additions & 5 deletions apps/sites/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"dev": "next dev --port 3003",
"build": "next build",
"start": "next start",
"lint": "next lint"
"lint": "next lint",
"predev": "prisma generate"
},
"dependencies": {
"@prisma/client": "^5.3.1",
Expand All @@ -25,7 +26,6 @@
"sonner": "^1.0.3",
"tailwind-merge": "^1.14.0",
"unist-util-visit": "^5.0.0"

},
"devDependencies": {
"@types/node": "^20",
Expand All @@ -34,9 +34,11 @@
"autoprefixer": "^10",
"database": "workspace:*",
"eslint": "^8",
"eslint-config-next": "14.0.0",
"postcss": "^8",
"tailwindcss": "^3",
"eslint-config-next": "13.5.6",
"postcss": "^8.4.31",
"tailwind-config": "workspace:*",
"tailwindcss": "^3.3.3",
"prisma": "^5.3.1",
"typescript": "^5"
}
}
116 changes: 116 additions & 0 deletions packages/database/prisma/schema.prisma
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
// This is your Prisma schema file,
// learn more about it in the docs: https://pris.ly/d/prisma-schema

datasource db {
provider = "mysql"
url = env("DATABASE_URL") // uses connection pooling
relationMode = "prisma"

// directUrl = env("POSTGRES_URL_NON_POOLING") // uses a direct connection
// shadowDatabaseUrl = env("POSTGRES_URL_NON_POOLING") // used for migrations
}

generator client {
provider = "prisma-client-js"
// previewFeatures = ["jsonProtocol"]
previewFeatures = ["fullTextSearch", "fullTextIndex"]
}

model User {
id String @id @default(cuid())
name String?
// if you are using Github OAuth, you can get rid of the username attribute (that is for Twitter OAuth)
username String?
gh_username String?
email String? @unique
emailVerified DateTime?
image String?
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt
accounts Account[]
sessions Session[]
sites Site[]
posts Post[]
}

model Account {
id String @id @default(cuid())
userId String
type String
provider String
providerAccountId String
refresh_token String? @db.LongText
refresh_token_expires_in Int?
access_token String? @db.LongText
expires_at Int?
token_type String?
scope String?
id_token String? @db.LongText
session_state String?
oauth_token_secret String?
oauth_token String?

user User @relation(fields: [userId], references: [id], onDelete: Cascade)

@@unique([provider, providerAccountId])
@@index([userId])
}

model Session {
id String @id @default(cuid())
sessionToken String @unique
userId String
expires DateTime
user User @relation(fields: [userId], references: [id], onDelete: Cascade)

@@index([userId])
}

model VerificationToken {
identifier String
token String @unique
expires DateTime

@@unique([identifier, token])
}

model Post {
id String @id @default(cuid())
title String? @db.Text
description String? @db.Text
content String? @db.LongText
slug String @default(cuid())
image String? @db.LongText
imageBlurhash String? @db.LongText
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt
published Boolean @default(false)
site Site? @relation(fields: [siteId], references: [id], onDelete: Cascade, onUpdate: Cascade)
siteId String?
user User? @relation(fields: [userId], references: [id], onDelete: Cascade, onUpdate: Cascade)
userId String?

@@unique([slug, siteId])
@@index([siteId])
@@index([userId])
}

model Site {
id String @id @default(cuid())
name String?
description String? @db.Text
logo String? @db.Text
font String @default("font-cal")
image String? @db.LongText
imageBlurhash String? @db.LongText
subdomain String? @unique
customDomain String? @unique
message404 String? @db.Text
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt
user User? @relation(fields: [userId], references: [id], onDelete: Cascade, onUpdate: Cascade)
userId String?
posts Post[]

@@index([userId])
}
Loading
Loading