Skip to content

Commit 36b1224

Browse files
Merge branch 'master' of https://github.com/DisTwitchChate/App
2 parents 2f0b3ed + 21d0a40 commit 36b1224

File tree

2 files changed

+150
-26
lines changed

2 files changed

+150
-26
lines changed

CONTRIBUTING.md

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
If you don't have git on your machine, [install it]( https://help.github.com/articles/set-up-git/).
2+
3+
## Fork this repository
4+
5+
Fork this repository by clicking on the fork button on the top of this page.
6+
This will create a copy of this repository in your account.
7+
8+
## Clone the repository
9+
10+
<img align="right" width="300" src="https://raw.githubusercontent.com/firstcontributions/first-contributions/master/assets/clone.png" alt="clone this repository" />
11+
12+
Now clone the forked repository to your machine. Go to your GitHub account, open the forked repository, click on the clone button and then click the *copy to clipboard* icon.
13+
14+
Open a terminal and run the following git command:
15+
16+
```
17+
git clone "url you just copied"
18+
```
19+
where "url you just copied" (without the quote marks) is the url to this repository (your fork of this project). See the previous steps to obtain the url.
20+
21+
<img align="right" width="300" src="https://raw.githubusercontent.com/firstcontributions/first-contributions/master/assets/copy-to-clipboard.png" alt="copy URL to clipboard" />
22+
23+
For example:
24+
```
25+
git clone https://github.com/this-is-you/App.git
26+
```
27+
where `this-is-you` is your GitHub username. Here you're copying the contents of the minimal-portfolio repository on GitHub to your computer.
28+
29+
## Create a branch
30+
31+
Change to the repository directory on your computer (if you are not already there):
32+
33+
```
34+
cd App
35+
```
36+
Now create a branch using the `git checkout` command:
37+
```
38+
git checkout -b <add-your-new-branch-name>
39+
```
40+
41+
For example:
42+
```
43+
git checkout -b add-macho-coder
44+
```
45+
(The name of the branch does not need to have the word *add* in it, but it's a reasonable thing to include because the purpose of this branch is to add your name to a list.)
46+
47+
## Make necessary changes and commit those changes
48+
49+
Now open the project folder to make changes.
50+
Don't know what to change. Don't worry.
51+
Join our discord channel to discuss about the issue and its fix with the community. [Invite link](http://discord.disstreamchat.com).
52+
Or open the issues tab (right next to code tab) and pickup any `good first issue`. Properly understand the issue and put up a comment 'Assign this issue to me' if you to give a fix this issue.
53+
54+
55+
Now, save the file.
56+
57+
58+
If you go to the project directory and execute the command `git status`, you'll see there are changes.
59+
60+
61+
Add those changes to the branch you just created using the `git add` command:
62+
63+
```
64+
git add .
65+
```
66+
67+
Now commit those changes using the `git commit` command:
68+
```
69+
git commit -m "Add <your-name> to Contributors list"
70+
```
71+
replacing `<your-name>` with your name.
72+
73+
## Push changes to GitHub
74+
75+
Push your changes using the command `git push`:
76+
```
77+
git push origin <add-your-branch-name>
78+
```
79+
replacing `<add-your-branch-name>` with the name of the branch you created earlier.
80+
81+
## Submit your changes for review
82+
83+
If you go to your repository on GitHub, you'll see a `Compare & pull request` button. Click on that button.
84+
85+
<img style="float: right;" src="https://raw.githubusercontent.com/firstcontributions/first-contributions/master/assets/compare-and-pull.png" alt="create a pull request" />
86+
87+
Now submit the pull request.
88+
89+
<img style="float: right;" src="https://raw.githubusercontent.com/firstcontributions/first-contributions/master/assets/submit-pull-request.png" alt="submit pull request" />
90+
91+
Soon I'll be merging all your changes into the master branch of this project. You will get a notification email once the changes have been merged.
92+
93+
## Where to go from here?
94+
95+
Congrats! You just completed the standard _fork -> clone -> edit -> PR_ workflow that you'll encounter often as a contributor!

README.md

Lines changed: 55 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,43 +2,72 @@
22
<a href="https://www.disstreamchat.com"><img src="https://www.disstreamchat.com/logo.png" width=200/></a>
33
</p>
44
<h1 align="center"> DisStreamChat App </h1>
5+
<hr/>
6+
<p align="center">
7+
<img src="https://img.shields.io/github/license/disstreamchat/app?style=for-the-badge" alt="Stream chat manager"/>
8+
<img src="https://img.shields.io/github/last-commit/disstreamchat/app?color=%462b45&style=for-the-badge" alt="Stream chat manager" />
9+
<img src="https://img.shields.io/github/labels/disstreamchat/app/help%20wanted?color=%462b45&style=for-the-badge" alt="Stream chat manager" />
10+
<img src="https://img.shields.io/github/issues/disstreamchat/app?color=%462b45&style=for-the-badge" alt="Stream chat manager" />
11+
</p>
12+
13+
<p align="center"><img src="https://media.discordapp.net/attachments/727356806552092675/755062471789641748/unknown.png?width=1923&height=1250"></p>
14+
15+
16+
## 🚀 Getting Started
17+
18+
These instructions will get you a copy of the project up and running on your local machine for development and testing purposes.
19+
20+
You'll need [Git](https://git-scm.com), [Node.js](https://nodejs.org/en/download/) (which comes with [npm](http://npmjs.com)) installed on your computer, and [yarn](https://yarnpkg.com/)
21+
22+
```
23+
24+
25+
26+
27+
```
28+
29+
## 🔧 Installation
30+
31+
From your command line, clone and run the app in development:
32+
33+
```bash
34+
# Clone this repository
35+
$ git clone https://github.com/DisStreamChat/App.git
36+
37+
# Go into the repository
38+
$ cd App
39+
40+
# Install dependencies
41+
$ npm install
42+
43+
# Run
44+
$ npm start
45+
46+
```
547

648
---
7-
## Support
49+
## 💵 Support
850

951
This project is a part of DisStreamChat. Whether you use this project, another DisStreamChat project, have learned something from it, or just like it, please consider supporting it by becoming a patreon, so we can dedicate more time on more projects like this 😀.
1052

1153
<a href="https://www.patreon.com/disstreamchat?fan_landing=true" target="_blank"><img src="https://cdn.discordapp.com/attachments/727356806552092675/754198973027319868/Digital-Patreon-Wordmark_FieryCoral.png" alt="Patreon" width=200 style="height: auto !important;width: 200px !important;" ></a>
1254

13-
# Framework/Tech use
14-
* electron
15-
* React
16-
* Firebase
55+
## :technologist: Technologies used
1756

18-
# Contributing
19-
All contributions and feature requests are welcome. Feel free to make a pull request or open an issue
57+
- [React](https://reactjs.org/)
58+
- [Electron](https://www.electronjs.org/)
59+
- [SCSS](https://sass-lang.com/documentation/syntax)
60+
- [Firebase](https://firebase.google.com/)
61+
- [Material UI](https://material-ui.com/) for icons and inputs
2062

21-
# Installation
63+
## 📄 License
2264

23-
## Install for Devolopment
24-
1. Clone this repository.
25-
```
26-
git clone https://github.com/DisStreamChat/App.git
27-
```
28-
2. Install Dependencies
29-
```
30-
npm install
31-
```
32-
3. If you havent already, install Yarn globally.
33-
```
34-
npm install -g yarn
35-
```
36-
4. Create a .env and add enviromnent variables from `.env.sample`. unless you are using a development version of the backend, the socket url should be set to `https://api.disstreamchat.com/`
37-
6. Run dev server.
38-
```
39-
npm run start
40-
```
65+
This project is licensed under the MIT License - see the [LICENSE.md](./LICENSE) file for details
4166

67+
# Contributing
68+
All contributions and feature requests are welcome. Feel free to make a pull request or open an issue. For more info see the [contributing guide](./CONTRIBUTING.md)
4269

4370

4471
[![GitHub followers](https://img.shields.io/github/followers/gypsydangerous.svg?label=Follow%20@gypsydangerous&style=social)](https://github.com/gypsydangerous/) [![Twitter Follow](https://img.shields.io/twitter/follow/disstreamchat?style=social)](https://twitter.com/disstreamchat)
72+
73+
Made with ♥️ by the [DisStreamChat Team](https://www.disstreamchat.com/#/members) and gracious [contributors](https://github.com/DisStreamChat/Contributors)

0 commit comments

Comments
 (0)