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.

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

fix: text-formatting #138

Merged
merged 1 commit into from
Dec 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
190 changes: 188 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@
"date-fns": "^4.1.0",
"dayjs": "^1.11.11",
"dotenv": "^16.3.1",
"draft-js": "^0.11.7",
"draftjs-to-html": "^0.9.1",
"emoji-picker-react": "^4.9.3",
"esbuild": "^0.20.2",
"framer-motion": "^11.0.25",
Expand All @@ -65,6 +67,7 @@
"react": "18.2.0",
"react-date-range": "^2.0.1",
"react-dom": "^18.2.0",
"react-draft-wysiwyg": "^1.15.0",
"react-hook-form": "^7.51.2",
"react-hot-toast": "^2.4.1",
"react-icons": "^4.11.0",
Expand Down Expand Up @@ -98,8 +101,11 @@
"@types/aos": "^3.0.7",
"@types/cookie": "^0.6.0",
"@types/crypto-js": "^4.2.2",
"@types/draft-js": "^0.11.18",
"@types/draftjs-to-html": "^0.8.4",
"@types/jest": "^29.5.11",
"@types/react-date-range": "^1.4.9",
"@types/react-draft-wysiwyg": "^1.13.8",
"@types/react-slick": "^0.23.13",
"@typescript-eslint/eslint-plugin": "^6.15.0",
"@typescript-eslint/parser": "^6.15.0",
Expand Down
8 changes: 4 additions & 4 deletions src/app/(withLayout)/timeline/page.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
'use client'
import PostContainer from '@/components/organisms/PostsContainer'
import TimelinePostContainer from '@/components/organisms/TimelinePostContainer'
import UserPostContainer from '@/components/organisms/UserPostContainer'
import { PostInputType, PostType } from '@/types/constants'
import UserPostForm from '@/components/organisms/userPostForm'
import { PostInputType } from '@/types/constants'
import React, { useRef } from 'react'

export default function Timeline() {
const containerRef = useRef<HTMLDivElement>(null)

return (
<div ref={containerRef} className="h-with-navbar hideScrollbar">
<UserPostContainer type={PostInputType.Timeline} />
<UserPostForm type={PostInputType.Timeline} />
{/*<UserPostContainer type={PostInputType.Timeline} />*/}
<TimelinePostContainer containerRef={containerRef} />
</div>
)
Expand Down
2 changes: 1 addition & 1 deletion src/app/login/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import React from 'react'

const Login = () => {
return (
<div className="flex justify-center items-center h-with-navbar bg-neutral-50">
<div className="flex justify-center items-start md:items-center h-with-navbar bg-neutral-50">
<LoginBox />
</div>
)
Expand Down
3 changes: 3 additions & 0 deletions src/assets/bold.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions src/assets/bulletList.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions src/assets/centerAlign.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/code.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/italic.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions src/assets/leftAlign.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading