Skip to content

Commit 1e8e54b

Browse files
committed
Improves documentation, github templates and readme
1 parent 089ceb3 commit 1e8e54b

File tree

7 files changed

+452
-43
lines changed

7 files changed

+452
-43
lines changed

.github/pull_request_template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
**Issue Number** (if applicable):
1111

12-
**Briefley outline your changes**:
12+
**Briefly outline your changes**:
1313

1414
**Before submitting, please ensure that**:
1515
- [ ] Must be backwards compatible

README.md

Lines changed: 57 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<img width="220" src="https://i.ibb.co/yhbt6CY/dashy.png" />
1111
</p>
1212

13+
1314
## Features 🌈
1415

1516
- Instant search by name, domain and tags - just start typing
@@ -38,7 +39,7 @@
3839

3940
---
4041

41-
## Running the App 🏃‍♂️
42+
## Getting Started 🛫
4243

4344
> For full setup instructions, see: [**Getting Started**](./docs/getting-started.md)
4445
#### Deploying from Docker Hub 🐳
@@ -118,22 +119,70 @@ Hot reload is enabled, so changes will be detected automatically, triggering the
118119
If you are new to Vue.js or web development and want to learn more, [here are some resources](docs/developing.md#resources-for-beginners) to help get you started. Dashy is a pretty straight-forward application, so would make an ideal candidate for your first PR!
119120

120121
---
121-
## Notes ✏
122+
123+
## Contributing 😇
124+
125+
> For full contributing guide, see: [**Contributing**](/docs/contributing.md)
126+
127+
Pull requests are welcome, and would by much appreciated!
128+
129+
Some ideas for PRs include: bug fixes, improve the docs, add new themes, implement a new widget, add or improve the display options, improve or refactor the code, or implement a new feature.
130+
131+
Before you submit your pull request, please ensure the following:
132+
- Must be backwards compatible
133+
- All lint checks and tests must pass
134+
- If a new option in the the config file is added, it needs to be added into the schema, and documented in the configuring guide
135+
- If a new dependency is required, it must be essential, and it must be thoroughly checked out for security or efficiency issues
136+
- Your pull request will need to be up-to-date with master, and the PR template must be filled in
137+
138+
---
139+
140+
## Support 🙋‍♀️
141+
142+
If you've found a bug, or something that isn't working as you'd expect, please raise an issue, so that it can be resolved. Similarly, if you're having trouble getting things up and running, feel free to ask a question. Feature requests and feedback are also welcome, as it helps Dashy improve.
143+
144+
- [Raise a Bug 🐛](https://github.com/Lissy93/dashy/issues/new?assignees=Lissy93&labels=%F0%9F%90%9B+Bug&template=bug-report---.md&title=%5BBUG%5D)
145+
- [Submit a Feature Request 🦄](https://github.com/Lissy93/dashy/issues/new?assignees=Lissy93&labels=%F0%9F%A6%84+Feature+Request&template=feature-request---.md&title=%5BFEATURE_REQUEST%5D)
146+
- [Ask a Question 🤷‍♀️](https://github.com/Lissy93/dashy/issues/new?assignees=Lissy93&labels=%F0%9F%A4%B7%E2%80%8D%E2%99%82%EF%B8%8F+Question&template=question------.md&title=%5BQUESTION%5D)
147+
- [Share Feedback 🌈](https://github.com/Lissy93/dashy/issues/new?assignees=&labels=%F0%9F%8C%88+Feedback&template=share-feedback---.md&title=%5BFEEDBACK%5D)
148+
149+
For general questions about any of the technologies used, you should search the [web](https://duckduckgo.com), or open a question on [StackOverflow](https://stackoverflow.com/questions/)
150+
151+
If you need to get in touch securely with the author me, you can send any messages to me at:
152+
- **Email**: `alicia at omg dot lol`
153+
- **Public Key** [`0688 F8D3 4587 D954 E9E5 1FB8 FEDB 68F5 5C02 83A7`](https://keybase.io/aliciasykes/pgp_keys.asc?fingerprint=0688f8d34587d954e9e51fb8fedb68f55c0283a7)
154+
155+
---
156+
157+
## Documentation 📘
158+
159+
- [Getting Started](/docs/getting-started.md)
160+
- [Configuring](/docs/configuring.md)
161+
- [Developing](/docs/developing.md)
162+
- [Contributing](/docs/contributing.md)
163+
- [User Guide](/docs/user-guide.md)
164+
- [Troubleshooting](/docs/troubleshooting.md)
165+
- [Backup & Restore](/docs/backup-restore.md)
166+
- [Theming](/docs/theming.md)
167+
168+
---
169+
170+
## Credits 🏆
122171

123172
### Contributors 👥
124173

125174
![Auto-generated contributors](https://raw.githubusercontent.com/Lissy93/dashy/03fbaf35ff4653d16a622cfce00a1347c13d0192/docs/assets/CONTRIBUTORS.svg)
126175

127-
_(^^ The above is auto-generated, submit a PR to become listed as a contributor!)_
176+
_(^^ It's lonely here all by myself - submit a PR to become listed as a contributor!)_
128177

129-
### Credits 🏆
178+
### Dependencies 🔗
130179

131180
This app definitely wouldn't have been quite so possible without the making use of the following package and components. Full credit and big kudos to their respective authors, who've done an amazing job in building and maintaining them.
132181

133-
#### Core
182+
##### Core
134183
At it's core, the application uses [Vue.js](https://github.com/vuejs/vue), as well as it's services. Styling is done with [SCSS](https://github.com/sass/sass), JavaScript is currently [Babel](https://github.com/babel/babel), (but I am in the process of converting to [TypeScript](https://github.com/Microsoft/TypeScript)), linting is done with [ESLint](https://github.com/eslint/eslint), the config is defined in [YAML](https://github.com/yaml/yaml), and there is a simple [Node.js](https://github.com/nodejs/node) server to serve up the static app.
135184

136-
#### Frontend Components
185+
##### Frontend Components
137186
- [`vue-select`](https://github.com/sagalbot/vue-select) - Dropdown component by @sagalbot `MIT`
138187
- [`vue-js-modal`](https://github.com/euvl/vue-js-modal) - Modal component by @euvl `MIT`
139188
- [`v-tooltip`](https://github.com/Akryum/v-tooltip) - Tooltip component by @Akryum `MIT`
@@ -144,12 +193,12 @@ At it's core, the application uses [Vue.js](https://github.com/vuejs/vue), as we
144193
- [`vue-prism-editor`](https://github.com/koca/vue-prism-editor) - Lightweight code editor by @koca `MIT`
145194
- Forked from [`prism.js`](https://github.com/PrismJS/prism) `MIT`
146195

147-
#### Utilities
196+
##### Utilities
148197
- [`crypto-js`](https://github.com/brix/crypto-js) - Encryption implementations by @evanvosberg and community `MIT`
149198
- [`axios`](https://github.com/axios/axios) - Promise based HTTP client by @mzabriskie and community `MIT`
150199
- [`ajv`](https://github.com/ajv-validator/ajv) - JSON schema Validator by @epoberezkin and community `MIT`
151200

152-
#### Backup & Sync Server
201+
##### Backup & Sync Server
153202
Although the app is purely frontend, there is an optional cloud backup and restore feature. This is built as a serverless function on [Cloudflare workers](https://workers.cloudflare.com/) using [KV](https://developers.cloudflare.com/workers/runtime-apis/kv) and [web crypto](https://developers.cloudflare.com/workers/runtime-apis/web-crypto)
154203

155204
### Alternatives 🙌

docs/contributing.md

Lines changed: 129 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,129 @@
1+
2+
3+
First off, thank you for considering contributing to Dashy! There are two main ways you can help out: [Submitting a Pull Request](#submitting-a-pr) or [Raising an Issue](#raising-an-issue).
4+
5+
### Submitting a PR
6+
7+
Pull requests are proposed code changes, that can then be directly merged into Dashy's master branch and deployed to users. Even a small PR would be a big help.
8+
9+
Not sure what to work on? Here are some ideas:
10+
- Fix a bug, or solve an open issue
11+
- Improve the docs
12+
- Add a new theme
13+
- Implement a new widget
14+
- Add more display options
15+
- Refactor or improve an area of the code
16+
- Implement a new feature, or improve an existing one
17+
18+
Before you submit your pull request, please ensure the following:
19+
- Must be backwards compatible
20+
- All lint checks and tests must pass
21+
- If a new option in the the config file is added, it needs to be added into the schema, and documented in the configuring guide
22+
- If a new dependency is required, it must be essential, and it must be thoroughly checked out for security or efficiency issues
23+
24+
Please also include the following information in your PR:
25+
- PR type (bug fix, feature, code style updates, documentation, etc)
26+
- Issue number (if applicable)
27+
- A brief description of your changes
28+
- A note confirming that your code follows the checklist (above)
29+
30+
#### Getting Started
31+
32+
To set up your development environment, and get Dashy running locally, please see: [Developing Docs](/docs/developing.md)
33+
34+
#### For new Contributors
35+
36+
If you have never created a pull request before, welcome :tada: :smile: [Here is a great tutorial](https://egghead.io/series/how-to-contribute-to-an-open-source-project-on-github)
37+
on how to create a pull request..
38+
39+
1. [Fork](http://help.github.com/fork-a-repo/) the project, clone your fork,
40+
and configure the remotes:
41+
42+
```bash
43+
# Clone your fork of the repo into the current directory
44+
git clone https://github.com/<your-username>/<repo-name>
45+
# Navigate to the newly cloned directory
46+
cd <repo-name>
47+
# Assign the original repo to a remote called "upstream"
48+
git remote add upstream https://github.com/hoodiehq/<repo-name>
49+
```
50+
51+
2. If you cloned a while ago, get the latest changes from upstream:
52+
53+
```bash
54+
git checkout master
55+
git pull upstream master
56+
```
57+
58+
3. Create a new topic branch (off the main project development branch) to
59+
contain your feature, change, or fix:
60+
61+
```bash
62+
git checkout -b <topic-branch-name>
63+
```
64+
65+
4. Make sure to update, or add to the tests when appropriate. Patches and
66+
features will not be accepted without tests. Run `yarn test` to check that
67+
all tests pass after you've made changes.
68+
69+
5. If you added or changed a feature, make sure to document it accordingly in
70+
the docs and if applicable, in the `README.md` file.
71+
72+
6. Push your topic branch up to your fork:
73+
74+
```bash
75+
git push origin <topic-branch-name>
76+
```
77+
78+
8. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/)
79+
with a clear title and description.
80+
81+
#### Testing the Production App
82+
83+
For larger pull requests, please also check that it works as expected in a production environment.
84+
85+
Testing production app in development environment:
86+
- Natively
87+
- Build: `yarn build`
88+
- Run: `yarn start`
89+
- With Docker:
90+
- Build: `docker build -t dashy .`
91+
- Run: `docker run -p 8080:80 dashy`
92+
93+
Please also ensure that running the following scripts return no errors:
94+
- `yarn lint`
95+
- `yarn test`
96+
- `yarn validate-config`
97+
98+
A good resource for testing the Docker image on a totally fresh system, is by using [Play with Docker](https://labs.play-with-docker.com/). This will let you clone or pull your image, and spin up a container. This is useful for checking that everything behaves as it should on an independent system, and should get around the _'works on my computer'_ issue.
99+
100+
#### Merging a PR
101+
102+
Only maintainers can merge a PR. A pull request can only be merged if:
103+
- All CI checks are passing
104+
- It has been approved by either the author, or at least two maintainers
105+
- It has no requested changes
106+
- It is up to date with current master
107+
108+
---
109+
110+
### Raising an Issue
111+
112+
If you've found a bug, or something that isn't working as you'd expect, please raise an issue, so that it can be resolved. If you're having trouble getting things up and running, feel free to ask a question. Feature requests and feedback are also welcome, as it helps Dashy improve.
113+
114+
Click one of the links below, to open an issue:
115+
- [Raise a Bug 🐛](https://github.com/Lissy93/dashy/issues/new?assignees=Lissy93&labels=%F0%9F%90%9B+Bug&template=bug-report---.md&title=%5BBUG%5D) - Found a bug, or something not working as it should?
116+
- [Submit a Feature Request 🦄](https://github.com/Lissy93/dashy/issues/new?assignees=Lissy93&labels=%F0%9F%A6%84+Feature+Request&template=feature-request---.md&title=%5BFEATURE_REQUEST%5D) - Is there a feature that you think is missing from Dashy?
117+
- [Ask a Question 🤷‍♀️](https://github.com/Lissy93/dashy/issues/new?assignees=Lissy93&labels=%F0%9F%A4%B7%E2%80%8D%E2%99%82%EF%B8%8F+Question&template=question------.md&title=%5BQUESTION%5D) - Got a question about using, building or developing Dashy?
118+
- [Share Feedback 🌈](https://github.com/Lissy93/dashy/issues/new?assignees=&labels=%F0%9F%8C%88+Feedback&template=share-feedback---.md&title=%5BFEEDBACK%5D) - Got any thoughts on the current or future development of Dashy?
119+
120+
---
121+
122+
### Contributors
123+
124+
![Auto-generated contributors](https://raw.githubusercontent.com/Lissy93/dashy/03fbaf35ff4653d16a622cfce00a1347c13d0192/docs/assets/CONTRIBUTORS.svg)
125+
126+
### Star-Gazers Over Time
127+
128+
![Stargazers](https://starchart.cc/Lissy93/dashy.svg)
129+

docs/readme.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@
22

33
## Contents
44

5-
- [Getting Started](./getting-started.md)
6-
- [Configuring](./backup-restore.md)
7-
- [Backup & Restore](./backup-restore.md)
8-
- [Theming](./backup-restore.md)
9-
- [Developing](./developing.md)
5+
- [Getting Started](/docs/getting-started.md)
6+
- [Configuring](/docs/configuring.md)
7+
- [Developing](/docs/developing.md)
8+
- [Contributing](/docs/contributing.md)
9+
- [User Guide](/docs/user-guide.md)
10+
- [Troubleshooting](/docs/troubleshooting.md)
11+
- [Backup & Restore](/docs/backup-restore.md)
12+
- [Theming](/docs/theming.md)

docs/troubleshooting.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
2+
Coming Soon...

0 commit comments

Comments
 (0)