Skip to content

Commit 2462889

Browse files
committed
Merge branch 'main' of github.com:devvsakib/DevToolsArena into development
2 parents f2ad1bc + 4ddef9c commit 2462889

File tree

4 files changed

+18
-8
lines changed

4 files changed

+18
-8
lines changed

.github/workflows/greetings.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
issues: write
1010
pull-requests: write
1111
steps:
12-
- uses: actions/first-interaction@v1
12+
- uses: actions/first-interaction@v3
1313
with:
1414
repo-token: ${{ secrets.GITHUB_TOKEN }}
1515
issue-message: "Congratulations, ${{ github.actor }}! 🎉 Thank you for creating your first issue in GES. Your contribution is greatly appreciated and we look forward to working with you to resolve the issue. Keep up the great work!"

src/data/error.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,12 @@
323323
"title": "Git nothing to commit",
324324
"description": "The Git command line informs us that our local repository contains one more commit than our remote repository.",
325325
"solutions": "git push"
326+
},
327+
{
328+
"type": "branch",
329+
"title": "the branch [BRANCHNAME] is not fully merged",
330+
"description": "The error message you're encountering indicates that Git is preventing you from deleting the [BRANCHNAME] branch because it is not fully merged into your current branch or any other branch that you've specified. Git is trying to prevent you from accidentally losing work that hasn't been merged yet.",
331+
"solutions": "git branch -D [BRANCHNAME, multiple branchname can be use by using space]"
326332
}
327333
]
328-
}
334+
}

src/index.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ body {
2323
width: 100%;
2424
height: 100%;
2525
/* Add your background pattern here */
26-
background-color: #313131;
26+
/* background-color: #313131; */
27+
background-color: #d1cbf4;
2728
background-image: radial-gradient(rgba(255, 255, 255, 0.05) 2px, transparent 0);
2829
background-size: 30px 30px;
2930
background-position: -5px -5px

src/pages/Doc/index.jsx

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,26 +28,29 @@ const DocList = () => {
2828
};
2929

3030
fetchDocs();
31-
}, []);
31+
}, []);
3232

3333

3434

35-
if (loading) return <div className="flex justify-center items-center h-screen"><Spin size="large" /></div>;
3635
if (error) return <Alert message="Error" description={error} type="error" />;
3736

3837
return (
3938
<Layout>
4039
<div className="container mx-auto p-4 min-h-screen">
4140
<MainTitle highlight={'Documentation'} />
42-
<ul className='grid gap-5 mx-auto md:max-w-2xl'>
41+
{loading ? (
42+
<div className='grid place-content-center mx-auto md:max-w-2xl aspect-video'>
43+
<Spin size="large" />
44+
</div>
45+
) : (<ul className='grid gap-5 mx-auto md:max-w-2xl'>
4346
{
4447
docs.map(item =>
45-
<Link to={item.title} className='capitalize group flex items-center justify-between bg-white/10 p-5 rounded-md'>{item.title.replace(/_/g, ' ')}
48+
<Link key={item.title} to={item.title} className='capitalize group flex items-center justify-between bg-white/10 p-5 rounded-md'>{item.title.replace(/_/g, ' ')}
4649
<FaArrowRight className="dark:text-white opacity-0 group-hover:opacity-100 -translate-x-10 group-hover:translate-x-0 transition duration-300" />
4750
</Link>
4851
)
4952
}
50-
</ul>
53+
</ul>)}
5154
</div>
5255
</Layout>
5356
);

0 commit comments

Comments
 (0)