Skip to content

Commit 9cab657

Browse files
committed
Mobify index.tsx and Header.tsx for the new layuout
1 parent f74d78b commit 9cab657

File tree

5 files changed

+79
-62
lines changed

5 files changed

+79
-62
lines changed

CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# Contributing to devgallery.io repository
1+
# Contributing to Fork, Commit, Merge web repository
22

33
First off, thanks for taking the time to contribute!
44

55
The following is a set of guidelines for contributing to this project. These are mostly guidelines, not rules. Use your best judgment, and feel free to propose changes to this document in a pull request.
66

77
## Code of Conduct
88

9-
This project and everyone participating in it are governed by the [devgallery.io Code of Conduct](code_of_conduct.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to [[email protected]](mailto:[email protected]).
9+
This project and everyone participating in it are governed by the [Fork, Commit, Merge Code of Conduct](code_of_conduct.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to [[email protected]](mailto:[email protected]).
1010

1111
## How Can I Contribute?
1212

README.md

+27-15
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<div align="center">
22

3-
![Dev Gallery Screenshot](/public/devgallerybanner.png)
3+
![Dev Gallery Screenshot](/public/fork-commit-merge-web-banner.png)
44
[![LICENSE](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
5-
[![Version 1.0.0](https://img.shields.io/badge/Version-1.0.0-brightgreen.svg)](https://github.com/nikohoffren/devgallery.io/pulls)
6-
[![Issues](https://img.shields.io/github/issues/nikohoffren/devgallery.io.svg?style=flat)](https://github.com/nikohoffren/devgallery.io/issues)
7-
[![PR:s Welcome](https://img.shields.io/badge/PR:s-Welcome-green.svg)](https://github.com/nikohoffren/devgallery.io/pulls)
8-
[![Contributors Welcome](https://img.shields.io/badge/Contributors-Welcome-green.svg)](https://github.com/nikohoffren/devgallery.io/pulls)
9-
![GitHub repo size](https://img.shields.io/github/repo-size/nikohoffren/devgallery.io)
5+
[![Version 1.0.0](https://img.shields.io/badge/Version-1.0.0-brightgreen.svg)](https://github.com/nikohoffren/fork-commit-merge-web/pulls)
6+
[![Issues](https://img.shields.io/github/issues/nikohoffren/fork-commit-merge-web.svg?style=flat)](https://github.com/nikohoffren/fork-commit-merge-web/issues)
7+
[![PR:s Welcome](https://img.shields.io/badge/PR:s-Welcome-green.svg)](https://github.com/nikohoffren/fork-commit-merge-web/pulls)
8+
[![Contributors Welcome](https://img.shields.io/badge/Contributors-Welcome-green.svg)](https://github.com/nikohoffren/fork-commit-merge-web/pulls)
9+
![GitHub repo size](https://img.shields.io/github/repo-size/nikohoffren/fork-commit-merge-web)
1010

11-
devgallery.io serves as a platform where talented developers can spotlight their projects. It allows developers to not only feature their works but also create personal profiles for added visibility.
11+
Welcome to Fork Commit Merge, your one-stop resource hub for mastering GitHub contributions! Whether you're a novice coder or an experienced developer, our comprehensive guides are designed to streamline your GitHub journey. We delve into everything from basic Git commands to intricate pull request processes, making collaboration seamless and efficient. Learn the ins and outs of forking, committing, and merging with our easy-to-follow tutorials and expert advice. At Fork Commit Merge, we're passionate about empowering you to contribute confidently and effectively to the open-source world. Let's code, collaborate, and create together!
1212

1313
</div>
1414

@@ -24,9 +24,21 @@ devgallery.io serves as a platform where talented developers can spotlight their
2424

2525
## Features
2626

27-
- Browse various development projects
28-
- Add your own projects
29-
- Create personal profiles
27+
- **Comprehensive Guides**: Easy to follow step-by-step guides for various GitHub processes, from creating a repository to managing pull requests.
28+
29+
- **Command Tutorials**: Detailed tutorials on Git commands to enhance your productivity and workflow efficiency.
30+
31+
- **Best Practices**: Recommendations on Git and GitHub best practices to promote high-quality code and effective collaboration.
32+
33+
- **Contribution Guidelines**: Detailed guides on how to properly contribute to open-source projects, including etiquette and effective communication with project maintainers.
34+
35+
- **FAQs and Troubleshooting**: A comprehensive section dedicated to frequently asked questions and common issues users face while contributing on GitHub.
36+
37+
- **Community Forum**: A dedicated space for users to interact, share their experiences, ask questions, and learn from each other.
38+
39+
- **Resource Library**: An extensive collection of external resources such as books, blog posts, and video tutorials on Git and GitHub.
40+
41+
- **Regular Updates**: Stay up-to-date with the latest features and changes in GitHub's dynamic ecosystem with our regular update notifications.
3042

3143
## Tech Stack
3244

@@ -44,13 +56,13 @@ Follow these steps to run the application in your local environment:
4456
1. Clone this repository.
4557

4658
```bash
47-
git clone https://github.com/yourusername/devgallery.io.git
59+
git clone https://github.com/yourusername/fork-commit-merge-web.git
4860
```
4961

5062
2. Install the project dependencies.
5163

5264
```bash
53-
cd devgallery.io
65+
cd fork-commit-merge-web
5466
npm i
5567
```
5668

@@ -110,14 +122,14 @@ Follow these steps to run the application in your local environment:
110122

111123
## Contributing
112124

113-
Contributions to devgallery.io are always welcome, whether it be improvements to the documentation, new features, bug fixes, or even feedback on the project.
125+
Contributions to fork-commit-merge-web are always welcome, whether it be improvements to the documentation, new features, bug fixes, or even feedback on the project.
114126

115127
**1.** Fork the project.
116128

117129
**2.** Add a reference to the original repository:
118130

119131
```bash
120-
git remote add upstream https://github.com/nikohoffren/devgallery.io.git
132+
git remote add upstream https://github.com/nikohoffren/fork-commit-merge-web.git
121133
```
122134

123135
**3.** Check the remotes for this repository:
@@ -180,7 +192,7 @@ These roadmap items are subject to change based on user feedback and development
180192

181193
## Questions
182194

183-
If you have any questions about the repo, open an issue or contact us directly at devgallery.io@gmail.com
195+
If you have any questions about the repo, open an issue or contact us directly at niko.hoffren@gmail.com
184196

185197
## License
186198

components/Header.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ const Header = () => {
4949
<Link href="/">
5050
<div className="py-2 px-6 block text-sm cursor-pointer hover:scale-105">
5151
<Image
52-
src="/dev-gallery.png"
53-
alt="devgallery.io logo"
52+
src="/fork-commit-merge-logo.jpg"
53+
alt="Fork, Commit, Merge -logo"
5454
width={40}
5555
height={40}
5656
/>
@@ -167,7 +167,7 @@ const Header = () => {
167167
</div>
168168
)}
169169
<header className="bg-slate-950 text-slate-50 sticky top-0 z-10 hidden md:block">
170-
<div className="container mx-auto px-6 py-1 pb-6">
170+
<div className="mx-auto px-12 py-1 pb-6 shadow-bottom">
171171
<div className="mt-3 md:flex items-center space-x-1 justify-end">
172172
<div className="relative" ref={node}>
173173
<button

pages/index.tsx

+19-19
Original file line numberDiff line numberDiff line change
@@ -26,35 +26,35 @@ export default function Home({ projects }: { projects: Project[] }) {
2626
style={{ width: 180, height: 180 }}
2727
>
2828
<Image
29-
src="/dev-gallery.png"
30-
alt="Dev Gallery Logo"
29+
src="/fork-commit-merge-logo.jpg"
30+
alt="Fork, Commit, Merge -logo"
3131
width={180}
3232
height={180}
3333
priority
3434
/>
3535
</div>
3636
<h1 className="mt-5 text-5xl font-bold text-slate-50">
37-
Welcome to devgallery.io
37+
Welcome to Fork, Commit, Merge
3838
</h1>
39-
<p className="mt-2 mb-20 text-lg font-light text-gray-100">
40-
Explore amazing projects developed by talented developers
39+
<p className="mt-4 mb-20 text-lg font-light text-gray-100">
40+
Your one-stop resource hub for mastering GitHub
41+
contributions
4142
</p>
4243
<div className="bg-slate-900 w-full py-2">
4344
<div className="my-5 text-xl font-light text-gray-100 mx-auto max-w-2xl">
44-
<code>devgallery.io</code> is a platform for showcasing
45-
and discovering amazing projects created by talented
46-
developers around the globe.
47-
<br />
48-
<br />
49-
By joining our community and adding your projects and
50-
profiles, you&apos;re not just increasing your
51-
visibility but also inspiring and motivating other
52-
developers.
53-
<br />
54-
<br />
55-
Don&apos;t miss out on this chance to be a part of a
56-
vibrant and supportive community. Register and upload
57-
your projects now. Let the world see your capabilities!
45+
<code>Fork, Commit, Merge</code> is your one-stop
46+
resource hub for mastering GitHub contributions! Whether
47+
you&apos;re a novice coder or an experienced developer,
48+
our comprehensive guides are designed to streamline your
49+
GitHub journey. We delve into everything from basic Git
50+
commands to intricate pull request processes, making
51+
collaboration seamless and efficient. Learn the ins and
52+
outs of forking, committing, and merging with our
53+
easy-to-follow tutorials and expert advice. At Fork
54+
Commit Merge, we&apos;re passionate about empowering you
55+
to contribute confidently and effectively to the
56+
open-source world. Let&apos;s code, collaborate, and
57+
create together!
5858
</div>
5959
<div className="my-10">
6060
<Link

tailwind.config.js

+28-23
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,31 @@
11
// tailwind.config.js
22
module.exports = {
3-
purge: ['./pages/**/*.{js,ts,jsx,tsx}', './components/**/*.{js,ts,jsx,tsx}'],
4-
darkMode: false, // or 'media' or 'class'
5-
theme: {
6-
extend: {
7-
colors: {
8-
'slate': {
9-
'960': '#191730',
10-
}
11-
},
12-
backdropBlur: {
13-
'none': '0',
14-
'blur': 'blur(2px)',
15-
'blur-lg': 'blur(4px)',
16-
'blur-xl': 'blur(8px)',
17-
'blur-2xl': 'blur(12px)',
18-
'blur-3xl': 'blur(16px)',
19-
}
3+
content: [
4+
"./pages/**/*.{js,ts,jsx,tsx}",
5+
"./components/**/*.{js,ts,jsx,tsx}",
6+
],
7+
theme: {
8+
extend: {
9+
colors: {
10+
slate: {
11+
960: "#191730",
12+
},
13+
},
14+
backdropBlur: {
15+
none: "0",
16+
blur: "blur(2px)",
17+
"blur-lg": "blur(4px)",
18+
"blur-xl": "blur(8px)",
19+
"blur-2xl": "blur(12px)",
20+
"blur-3xl": "blur(16px)",
21+
},
22+
boxShadow: {
23+
bottom: "0 13px 10px -10px rgba(0.8, 0.8, 0.8, 0.8)",
24+
},
25+
},
2026
},
21-
},
22-
variants: {
23-
extend: {},
24-
},
25-
plugins: [],
26-
}
27+
variants: {
28+
extend: {},
29+
},
30+
plugins: [],
31+
};

0 commit comments

Comments
 (0)