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

Fixes: #2098 #2099

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+9 −5
Open

Fixes: #2098 #2099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa3f0b3
fix #2098
vikash28-cloud Nov 12, 2024
152ecbe
fix #2098
vikash28-cloud Nov 12, 2024
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
4 changes: 2 additions & 2 deletions .env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ STORAGE_URL=http://localhost:9000/default # default is the bucket name specified
# Database (Prisma/PostgreSQL)
# This can be swapped out to use any other database, like MySQL
# Note: This is used only in the compose.yml file
POSTGRES_PORT=5432
POSTGRES_PORT=5434
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can exclude these changes I guess?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes we can

POSTGRES_DB=postgres
POSTGRES_USER=postgres
POSTGRES_PASSWORD=postgres

# Database (Prisma/PostgreSQL)
DATABASE_URL=postgresql://postgres:postgres@localhost:5432/postgres?schema=public
DATABASE_URL=postgresql://postgres:postgres@localhost:5434/postgres?schema=public

# Authentication Secrets
# generated with `openssl rand -base64 64`
Expand Down
8 changes: 6 additions & 2 deletions apps/client/src/pages/builder/sidebars/left/dialogs/education.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,10 @@ export const EducationDialog = () => {
});

return (
<SectionDialog<FormValues> id="education" form={form} defaultValues={defaultEducation}>
<div className="grid grid-cols-1 gap-4 sm:grid-cols-2">
<SectionDialog<FormValues> id="education" form={form} defaultValues={defaultEducation}

>
<div className="grid grid-cols-1 gap-2 sm:grid-cols-2 ">
<FormField
name="institution"
control={form.control}
Expand Down Expand Up @@ -131,6 +133,7 @@ export const EducationDialog = () => {
/>

<FormField

name="summary"
control={form.control}
render={({ field }) => (
Expand All @@ -143,6 +146,7 @@ export const EducationDialog = () => {
footer={(editor) => (
<AiActions value={editor.getText()} onChange={editor.commands.setContent} />
)}
className="overflow-auto resize-none h-20 max-h-40"
onChange={(value) => {
field.onChange(value);
}}
Expand Down
2 changes: 1 addition & 1 deletion libs/ui/src/components/rich-input.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@ export const RichInput = forwardRef<Editor, RichInputProps>(
<EditorContent
editor={editor}
className={cn(
"grid min-h-[160px] w-full rounded-sm border bg-transparent px-3 py-2 text-sm placeholder:opacity-80 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-primary disabled:cursor-not-allowed disabled:opacity-50",
"grid min-h-[100px] w-full rounded-sm border bg-transparent px-3 py-1 text-sm placeholder:opacity-80 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-primary disabled:cursor-not-allowed disabled:opacity-50",
hideToolbar && "pt-2",
className,
)}
Expand Down