Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@qkrdmstlr3
qkrdmstlr3 committed Sep 13, 2024
2 parents b071963 + b7583e5 commit ff97912
Show file tree
Hide file tree
Showing 33 changed files with 738 additions and 81 deletions.
38 changes: 38 additions & 0 deletions .pnp.cjs
View file

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

Binary file added .yarn/cache/lottie-react-npm-2.4.0-d4d95c55aa-e9ea4a89be.zip
View file
Binary file not shown.
Binary file added .yarn/cache/lottie-web-npm-5.12.2-942dc9e22a-af5bc3bc40.zip
View file
Binary file not shown.
13 changes: 12 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
## BBOGAK
## BBOGAK Client

취업 자료 아카이빙 서비스 뽀각의 클라이언트 레포입니다.

## How to Start

```jsx
yarn dlx @yarnpkg/sdks vscode
yarn && yarn dev
```

## How to Contribute

기여사항은 이슈로 남겨주세요
1 change: 1 addition & 0 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
"cookies-next": "^4.2.1",
"date-fns": "^3.6.0",
"framer-motion": "^11.3.8",
"lottie-react": "^2.4.0",
"lowlight": "^3.1.0",
"lucide-react": "^0.411.0",
"next": "14.2.4",
Expand Down
297 changes: 297 additions & 0 deletions public/saving_dot.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,297 @@
{
"v": "5.4.3",
"fr": 25,
"ip": 0,
"op": 28,
"w": 1000,
"h": 1000,
"nm": "loading_1",
"ddd": 0,
"assets": [],
"layers": [
{
"ddd": 0,
"ind": 1,
"ty": 4,
"nm": "ball_3",
"sr": 1,
"ks": {
"o": { "a": 0, "k": 100, "ix": 11 },
"r": { "a": 0, "k": 0, "ix": 10 },
"p": {
"a": 1,
"k": [
{
"i": { "x": 0.667, "y": 1 },
"o": { "x": 0.333, "y": 0 },
"n": "0p667_1_0p333_0",
"t": 12,
"s": [754.951, 497.902, 0],
"e": [754.951, 415.902, 0],
"to": null,
"ti": null
},
{
"i": { "x": 0.667, "y": 1 },
"o": { "x": 0.333, "y": 0 },
"n": "0p667_1_0p333_0",
"t": 18,
"s": [754.951, 415.902, 0],
"e": [754.951, 497.902, 0],
"to": [0, 0, 0],
"ti": [0, -13.666672706604, 0]
},
{ "t": 24 }
],
"ix": 2
},
"a": { "a": 0, "k": [0, 0, 0], "ix": 1 },
"s": { "a": 0, "k": [100, 100, 100], "ix": 6 }
},
"ao": 0,
"shapes": [
{
"ty": "gr",
"it": [
{
"d": 1,
"ty": "el",
"s": { "a": 0, "k": [127.049, 127.049], "ix": 2 },
"p": { "a": 0, "k": [0, 0], "ix": 3 },
"nm": "Ellipse Path 1",
"mn": "ADBE Vector Shape - Ellipse",
"hd": false,
"_render": true
},
{
"ty": "fl",
"c": { "a": 0, "k": [0.6314, 0.6784, 0.7176, 1], "ix": 4 },
"o": { "a": 0, "k": 100, "ix": 5 },
"r": 1,
"bm": 0,
"nm": "Fill 1",
"mn": "ADBE Vector Graphic - Fill",
"hd": false,
"_render": true
},
{
"ty": "tr",
"p": { "a": 0, "k": [0, 0], "ix": 2 },
"a": { "a": 0, "k": [0, 0], "ix": 1 },
"s": { "a": 0, "k": [100, 100], "ix": 3 },
"r": { "a": 0, "k": 0, "ix": 6 },
"o": { "a": 0, "k": 100, "ix": 7 },
"sk": { "a": 0, "k": 0, "ix": 4 },
"sa": { "a": 0, "k": 0, "ix": 5 },
"nm": "Transform",
"_render": true
}
],
"nm": "Ellipse 1",
"np": 3,
"cix": 2,
"bm": 0,
"ix": 1,
"mn": "ADBE Vector Group",
"hd": false,
"_render": true
}
],
"ip": 0,
"op": 101,
"st": 0,
"bm": 0,
"completed": true
},
{
"ddd": 0,
"ind": 2,
"ty": 4,
"nm": "ball_2",
"sr": 1,
"ks": {
"o": { "a": 0, "k": 100, "ix": 11 },
"r": { "a": 0, "k": 0, "ix": 10 },
"p": {
"a": 1,
"k": [
{
"i": { "x": 0.667, "y": 1 },
"o": { "x": 0.333, "y": 0 },
"n": "0p667_1_0p333_0",
"t": 6,
"s": [497.451, 497.902, 0],
"e": [497.451, 415.902, 0],
"to": null,
"ti": null
},
{
"i": { "x": 0.667, "y": 1 },
"o": { "x": 0.333, "y": 0 },
"n": "0p667_1_0p333_0",
"t": 12,
"s": [497.451, 415.902, 0],
"e": [497.451, 497.902, 0],
"to": [0, 0, 0],
"ti": [0, -13.666672706604, 0]
},
{ "t": 18 }
],
"ix": 2
},
"a": { "a": 0, "k": [0, 0, 0], "ix": 1 },
"s": { "a": 0, "k": [100, 100, 100], "ix": 6 }
},
"ao": 0,
"shapes": [
{
"ty": "gr",
"it": [
{
"d": 1,
"ty": "el",
"s": { "a": 0, "k": [127.049, 127.049], "ix": 2 },
"p": { "a": 0, "k": [0, 0], "ix": 3 },
"nm": "Ellipse Path 1",
"mn": "ADBE Vector Shape - Ellipse",
"hd": false,
"_render": true
},
{
"ty": "fl",
"c": { "a": 0, "k": [0.6314, 0.6784, 0.7176, 1], "ix": 4 },
"o": { "a": 0, "k": 100, "ix": 5 },
"r": 1,
"bm": 0,
"nm": "Fill 1",
"mn": "ADBE Vector Graphic - Fill",
"hd": false,
"_render": true
},
{
"ty": "tr",
"p": { "a": 0, "k": [0, 0], "ix": 2 },
"a": { "a": 0, "k": [0, 0], "ix": 1 },
"s": { "a": 0, "k": [100, 100], "ix": 3 },
"r": { "a": 0, "k": 0, "ix": 6 },
"o": { "a": 0, "k": 100, "ix": 7 },
"sk": { "a": 0, "k": 0, "ix": 4 },
"sa": { "a": 0, "k": 0, "ix": 5 },
"nm": "Transform",
"_render": true
}
],
"nm": "Ellipse 1",
"np": 3,
"cix": 2,
"bm": 0,
"ix": 1,
"mn": "ADBE Vector Group",
"hd": false,
"_render": true
}
],
"ip": 0,
"op": 101,
"st": 0,
"bm": 0,
"completed": true
},
{
"ddd": 0,
"ind": 3,
"ty": 4,
"nm": "ball_1",
"sr": 1,
"ks": {
"o": { "a": 0, "k": 100, "ix": 11 },
"r": { "a": 0, "k": 0, "ix": 10 },
"p": {
"a": 1,
"k": [
{
"i": { "x": 0.667, "y": 1 },
"o": { "x": 0.333, "y": 0 },
"n": "0p667_1_0p333_0",
"t": 0,
"s": [239.951, 497.902, 0],
"e": [239.951, 415.902, 0],
"to": null,
"ti": null
},
{
"i": { "x": 0.667, "y": 1 },
"o": { "x": 0.333, "y": 0 },
"n": "0p667_1_0p333_0",
"t": 6,
"s": [239.951, 415.902, 0],
"e": [239.951, 497.902, 0],
"to": [0, 0, 0],
"ti": [0, -13.6666669845581, 0]
},
{ "t": 12 }
],
"ix": 2
},
"a": { "a": 0, "k": [0, 0, 0], "ix": 1 },
"s": { "a": 0, "k": [100, 100, 100], "ix": 6 }
},
"ao": 0,
"shapes": [
{
"ty": "gr",
"it": [
{
"d": 1,
"ty": "el",
"s": { "a": 0, "k": [127.049, 127.049], "ix": 2 },
"p": { "a": 0, "k": [0, 0], "ix": 3 },
"nm": "Ellipse Path 1",
"mn": "ADBE Vector Shape - Ellipse",
"hd": false,
"_render": true
},
{
"ty": "fl",
"c": { "a": 0, "k": [0.6314, 0.6784, 0.7176, 1], "ix": 4 },
"o": { "a": 0, "k": 100, "ix": 5 },
"r": 1,
"bm": 0,
"nm": "Fill 1",
"mn": "ADBE Vector Graphic - Fill",
"hd": false,
"_render": true
},
{
"ty": "tr",
"p": { "a": 0, "k": [0, 0], "ix": 2 },
"a": { "a": 0, "k": [0, 0], "ix": 1 },
"s": { "a": 0, "k": [100, 100], "ix": 3 },
"r": { "a": 0, "k": 0, "ix": 6 },
"o": { "a": 0, "k": 100, "ix": 7 },
"sk": { "a": 0, "k": 0, "ix": 4 },
"sa": { "a": 0, "k": 0, "ix": 5 },
"nm": "Transform",
"_render": true
}
],
"nm": "Ellipse 1",
"np": 3,
"cix": 2,
"bm": 0,
"ix": 1,
"mn": "ADBE Vector Group",
"hd": false,
"_render": true
}
],
"ip": 0,
"op": 101,
"st": 0,
"bm": 0,
"completed": true
}
],
"markers": [],
"__complete": true
}
2 changes: 1 addition & 1 deletion src/app/(sidebar)/write/[id]/components/MemoContainer/Memo/Memo.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export default function Memo({ id: memoId, content, updatedDate }: GetMemosRespo
spellCheck={false}
ref={textareaRef}
rows={1}
className="w-full whitespace-pre-wrap min-h-0 border-none p-0 memo-14 resize-none focus:outline-0 focus-visible:ring-0 focus-visible:ring-offset-0 rounded-0"
className="w-full whitespace-pre-wrap min-h-0 border-none p-0 memo-14 resize-none focus:outline-0 focus-visible:ring-0 focus-visible:ring-offset-0 rounded-0"
value={memo}
onChange={(e) => setMemo(e.target.value)}
autoFocus
Expand Down
Loading

0 comments on commit ff97912

Please sign in to comment.