Skip to content

Commit 5338247

Browse files
committed
Merge branch 'release/1.0.4'
2 parents 21a8ed4 + c874d8d commit 5338247

35 files changed

+7805
-1485
lines changed

.github/workflows/prettier.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Prettier
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
prettier:
7+
runs-on: ubuntu-latest
8+
9+
steps:
10+
- name: Checkout code
11+
uses: actions/checkout@v3
12+
13+
- name: Setup Node.js
14+
uses: actions/setup-node@v3
15+
with:
16+
node-version: 18
17+
18+
- name: Run npm ci
19+
run: npm ci
20+
21+
- name: Run Prettier
22+
run: npx prettier --write .

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
node_modules
2+
docs/.vitepress/cache
3+
docs/.vitepress/dist

.husky/commit-msg

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/usr/bin/env sh
2+
. "$(dirname -- "$0")/_/husky.sh"
3+
4+
npx --no -- commitlint --edit ${1}

.husky/pre-commit

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/usr/bin/env sh
2+
. "$(dirname -- "$0")/_/husky.sh"
3+
4+
npx lint-staged

CONTRIBUTING.md

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
# Contributing to The Sailscasts Docs
2+
3+
We appreciate your interest in contributing to this docs! Your contributions are very valuable to us, and we want to ensure that the process is easy and productive for everyone involved.
4+
5+
Please take a moment to read the guidelines below before contributing to the project.
6+
7+
## Project Description
8+
9+
This project contains the official documentations for all projects both open source and commercial by The Sailscasts Company.
10+
11+
## Contribution Workflow
12+
13+
When contributing to this project, we adhere to the [Gitflow branching model](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow).
14+
15+
In this workflow, we use the develop branch as the central branch for active development. Therefore, we request that all Pull Requests be targeted towards the develop branch instead of the main branch. This approach ensures the stability of our main branch while allowing continuous development on the develop branch.
16+
17+
## Before Contributing
18+
19+
Before diving into the contribution process and setting up your environment, it is essential to select an issue you would like to work on.
20+
21+
#### Here's a simple guide to follow:
22+
23+
1. Search through the list of [open issues](https://github.com/sailscastshq/docs.sailscasts.com/issues).
24+
2. Find the issue you want to work on.
25+
26+
⚠️**Note:** If you notice a bug or you want to add a feature to the project, create a new issue using this [guide](https://docs.github.com/en/issues/tracking-your-work-with-issues/creating-an-issue)
27+
28+
3. Check to confirm if someone else has already worked on and made a pull request on said issue. To properly confirm, look out for a "pull request icon" on the issue. If there is none, you are good to go! If someone else has worked on the issue, kindly find a new issue to fix.
29+
30+
## Getting Started
31+
32+
#### To ensure a seamless contribution and review process, please follow these guidelines:
33+
34+
1. Open your preferred text editor.
35+
2. Fork and clone the repository into your own github account.
36+
[Here is a guide](https://docs.github.com/en/get-started/quickstart/fork-a-repo).
37+
38+
⚠️**Note:** If you cloned the repository a while back, we recommend fetching the latest changes from the upstream repository.
39+
40+
You can do this by using Github Desktop or running the following commands:
41+
42+
```
43+
git checkout develop
44+
```
45+
46+
```
47+
git pull upstream develop
48+
```
49+
50+
3. Create a new branch in your forked repository
51+
52+
```
53+
git checkout -b <my-branch> develop
54+
```
55+
56+
⚠️**Note:** For clarity, please name `<my-branch>` as "update-xxx" or "fix-xxx". For instance, you can use names like "update-readme" or "fix-typo-on-contribution-md" as examples.
57+
58+
4. In your text editor, Select the file related to the issue you want to fix, and make your changes.
59+
60+
⚠️**Note:** To contribute to a documentation, you would need to have Markdown knowledge. Visit [here](https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax) to read about GitHub Markdown and [here](https://www.markdowntutorial.com/) to practice.
61+
62+
5. Commit your changes with a descriptive commit message [using conventional commits](https://www.conventionalcommits.org/en/v1.0.0/).
63+
64+
#### We highly encourage the use of conventional commits. Here are some examples:
65+
66+
- **feat:** Use this when introducing a new feature.
67+
- **fix:** Use this when resolving any issues in the codebase.
68+
- **chore:** Use this when adding new links/resources or making minor changes.
69+
(e.g, `chore: Add database credentials`)
70+
- Please ensure that your **commit messages are concise and clear**.
71+
- Write commit messages in the **present tense**, as they reflect the current state of the codebase after the changes have been applied.
72+
<br/>
73+
74+
6. Push your branch to GitHub
75+
76+
```
77+
git push origin <my-branch>
78+
```
79+
80+
7. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/) with a clear title and description matching the issue you fixed.
81+
82+
⚠️**Note:** To ensure a smoother review process, kindly use the following format for the Pull Request title:`[chore]`, `[feat]`, or `[fix]`, followed by a descriptive title.
83+
84+
For instace, a feat-related change could have a title like `[feat] setup pasword reset`. This helps us categorize and understand the nature of the changes made in each PR.
85+
86+
- Link the issue you have resolved in the Pull Request Template using the following syntax:
87+
- If your Pull Request fixes issue #25, add `Fixes #25` to the description.
88+
- If your Pull Request addresses multiple issues, list them using the same syntax (`Fixes #23, Fixes #15`) however, we'll advise you create seperate PRs for each.
89+
<br/>
90+
This helps us track and automatically close the relevant issue when your Pull Request is merged.
91+
92+
## Contribution Etiquettes
93+
94+
- When you pick an issue to fix, we recommended that you review the comment thread first to check if someone is already working on it. In case no one has claimed it yet, kindly leave a comment stating your intention to work on it. This way, others will be aware, and we can avoid accidental duplication of effort.
95+
96+
- If someone has shown interest in fixing an issue but doesn't follow up for a specific period, let's say 2-3 weeks, it's permissible to pick up the same issue later. However, please ensure that you leave a comment to inform others of your intention before proceeding.
97+
98+
#### Thank you for reading the guide. We look forward to merging your contributions.

README.md

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,43 @@
11
# The official docs for The Sailscasts Company
2+
3+
This repo consist of the documentations of every product under the Sailscasts Company.
4+
5+
## Want to be a contributor?
6+
7+
Whether it's big or small, we love contributions. Check out our [guide](CONTRIBUTING.md) to see how to get started.
8+
9+
Not sure where to get started? You can join our [Discord](http://sailscasts.com/chat), and ask us any questions there.
10+
11+
## Projects
12+
13+
### [guppy](https://docs.sailscasts.com/guppy/)
14+
15+
The tinker tool for backend javascript. Guppy is the perfect companion for you to test out your ideas in javascript.
16+
17+
### [create-sails](https://docs.sailscasts.com/create-sails/)
18+
19+
Scaffold a modern full-stack Sails project. Gain all the benefit of an SPA while maintaining a server-centric development.
20+
21+
### [inertia-sails](https://docs.sailscasts.com/inertia-sails/)
22+
23+
The Sails adapter for inertia. Build single-page apps, without building an API.
24+
25+
### [sails-wish](https://docs.sailscasts.com/inertia-sails/)
26+
27+
The OAuth hook you wish exists for Sails. Easily setup OAuth flows in your Sails applications.
28+
29+
### [captain-vane](https://docs.sailscasts.com/captain-vane/)
30+
31+
The missing Sails factory generator. Generate realistically test data in a Sails application.
32+
33+
## Contributors
34+
35+
<p style="text-align:center">
36+
<a href="https://github.com/sailscastshq/docs.sailscasts.com/graphs/contributors">
37+
<img src="https://contrib.rocks/image?repo=sailscastshq/docs.sailscasts.com" />
38+
</a>
39+
</p>
40+
41+
## Enjoy
42+
43+
You rock!!

commitlint.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = { extends: ['@commitlint/config-conventional'] }

docs/.vitepress/config.js

Lines changed: 67 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ export default {
33
title: 'Sailscasts Docs',
44
description: 'Docs on everything we are working on at Sailscasts',
55
lastUpdated: true,
6+
cleanUrls: true,
7+
68
themeConfig: {
79
nav: nav(),
810
sidebar: {
@@ -13,20 +15,27 @@ export default {
1315
'/inertia-sails/': inertiaSailsGuide()
1416
},
1517
editLink: {
16-
pattern: 'https://github.com/sailscastshq/docs.sailscasts.com/edit/main/docs/:path',
18+
pattern:
19+
'https://github.com/sailscastshq/docs.sailscasts.com/edit/develop/docs/:path',
1720
text: 'Edit this page on GitHub'
1821
},
1922
socialLinks: [
20-
{ icon: 'github', link: 'https://github.com/sailscastshq/docs.sailscasts.com' },
23+
{
24+
icon: 'github',
25+
link: 'https://github.com/sailscastshq/docs.sailscasts.com'
26+
},
2127
{ icon: 'twitter', link: 'https://twitter.com/sailscastshq' },
2228
{ icon: 'discord', link: 'https://discord.com/invite/gbJZuNm' },
23-
{ icon: 'youtube', link: 'https://www.youtube.com/channel/UCje9Wo6cbh3IERItPbyq1QA' }
29+
{
30+
icon: 'youtube',
31+
link: 'https://www.youtube.com/channel/UCje9Wo6cbh3IERItPbyq1QA'
32+
}
2433
],
2534
footer: {
2635
message: 'All open source projects are released under the MIT License.',
2736
copyright: 'Copyright © 2022-present The Sailscasts Company'
2837
},
29-
algolia: {
38+
algolia: {
3039
appId: 'MEUVZAVDGZ',
3140
apiKey: '6c5e9ae85dc5c0672b6df0b2e305f6cb',
3241
indexName: 'sailscasts'
@@ -38,17 +47,15 @@ function nav() {
3847
return [
3948
{
4049
text: 'Software',
41-
items: [
42-
{ text: 'guppy', link: '/guppy/' },
43-
]
50+
items: [{ text: 'guppy', link: '/guppy/' }]
4451
},
4552
{
4653
text: 'Open Source',
4754
items: [
4855
{ text: 'create-sails', link: '/create-sails/' },
4956
{ text: 'inertia-sails', link: '/inertia-sails/' },
5057
{ text: 'wish', link: '/wish/' },
51-
{ text: 'captain-vane', link: '/captain-vane/' },
58+
{ text: 'captain-vane', link: '/captain-vane/' }
5259
// { text: 'sailboat', link: '/sailboat/' },
5360
]
5461
},
@@ -68,16 +75,17 @@ function captainVaneGuide() {
6875
collapsible: true,
6976
items: [
7077
{ text: 'Introduction', link: '/captain-vane/' },
71-
{ text: 'What is captain-vane?', link: '/captain-vane/what-is-captain-vane' },
72-
{ text: 'Installation', link: '/captain-vane/installation' },
78+
{
79+
text: 'What is captain-vane?',
80+
link: '/captain-vane/what-is-captain-vane'
81+
},
82+
{ text: 'Installation', link: '/captain-vane/installation' }
7383
]
7484
},
7585
{
7686
text: 'Basic usage',
7787
collapsible: true,
78-
items: [
79-
{ text: 'Basic usage', link: '/captain-vane/basic-usage' }
80-
]
88+
items: [{ text: 'Basic usage', link: '/captain-vane/basic-usage' }]
8189
}
8290
]
8391
}
@@ -98,20 +106,33 @@ function guppyGuide() {
98106
{
99107
text: 'Basic usage',
100108
collapsible: true,
101-
items: [
102-
{ text: 'Running code', link: '/guppy/running-code' },
103-
]
109+
items: [{ text: 'Running code', link: '/guppy/running-code' }]
104110
},
105111
{
106112
text: 'Changelogs',
107113
collapsible: true,
108114
items: [
109-
{ text: 'v1.1.2', link: 'https://glink.so/kelvin/guppy/changelogs/v1-1-2' },
110-
{ text: 'v1.1.1', link: 'https://glink.so/kelvin/guppy/changelogs/guppy-v1-1-1' },
111-
{ text: 'v1.1.0', link: 'https://glink.so/kelvin/guppy/changelogs/guppy-v1-1-0' },
112-
{ text: 'v1.0.1', link: 'https://glink.so/kelvin/guppy/changelogs/guppy-v1-0-1' },
113-
{ text: 'v1.0.0', link: 'https://glink.so/kelvin/guppy/changelogs/guppy-v1-0-0' },
114-
{ text: 'Changelogs', link: 'https://glink.so/kelvin/guppy/changelogs' },
115+
{
116+
text: 'v1.1.2',
117+
link: 'https://glink.so/kelvin/guppy/changelogs/v1-1-2'
118+
},
119+
{
120+
text: 'v1.1.1',
121+
link: 'https://glink.so/kelvin/guppy/changelogs/guppy-v1-1-1'
122+
},
123+
{
124+
text: 'v1.1.0',
125+
link: 'https://glink.so/kelvin/guppy/changelogs/guppy-v1-1-0'
126+
},
127+
{
128+
text: 'v1.0.1',
129+
link: 'https://glink.so/kelvin/guppy/changelogs/guppy-v1-0-1'
130+
},
131+
{
132+
text: 'v1.0.0',
133+
link: 'https://glink.so/kelvin/guppy/changelogs/guppy-v1-0-0'
134+
},
135+
{ text: 'Changelogs', link: 'https://glink.so/kelvin/guppy/changelogs' }
115136
]
116137
}
117138
]
@@ -125,14 +146,15 @@ function wishGuide() {
125146
items: [
126147
{ text: 'Introduction', link: '/wish/' },
127148
{ text: 'What is wish?', link: '/wish/what-is-wish' },
128-
{ text: 'Installation', link: '/wish/installation' },
149+
{ text: 'Installation', link: '/wish/installation' }
129150
]
130151
},
131152
{
132153
text: 'Basic usage',
133154
collapsible: true,
134155
items: [
135-
{ text: 'GitHub OAuth', link: '/wish/github' }
156+
{ text: 'GitHub OAuth', link: '/wish/github' },
157+
{ text: 'Google OAuth', link: '/wish/google' }
136158
]
137159
}
138160
]
@@ -141,40 +163,42 @@ function wishGuide() {
141163
function createSailsGuide() {
142164
return [
143165
{
144-
text: 'Getting started',
145-
collapsible: true,
146-
items: [
147-
{ text: 'Introduction', link: '/create-sails/' },
148-
{ text: 'What is create-sails?', link: '/create-sails/what-is-create-sails' }
149-
]
166+
text: 'Getting started',
167+
collapsible: true,
168+
items: [
169+
{ text: 'Introduction', link: '/create-sails/' },
170+
{
171+
text: 'What is create-sails?',
172+
link: '/create-sails/what-is-create-sails'
173+
}
174+
]
150175
},
151176
{
152177
text: 'Basic usage',
153178
collapsible: true,
154-
items: [
155-
{ text: 'Basic usage', link: '/create-sails/basic-usage' }
156-
]
179+
items: [{ text: 'Basic usage', link: '/create-sails/basic-usage' }]
157180
}
158181
]
159182
}
160183

161184
function inertiaSailsGuide() {
162185
return [
163186
{
164-
text: 'Getting started',
165-
collapsible: true,
166-
items: [
167-
{ text: 'Introduction', link: '/inertia-sails/' },
168-
{ text: 'What is inertia-sails?', link: '/inertia-sails/what-is-inertia-sails' },
169-
{ text: 'Installation', link: '/inertia-sails/installation' }
170-
]
187+
text: 'Getting started',
188+
collapsible: true,
189+
items: [
190+
{ text: 'Introduction', link: '/inertia-sails/' },
191+
{
192+
text: 'What is inertia-sails?',
193+
link: '/inertia-sails/what-is-inertia-sails'
194+
},
195+
{ text: 'Installation', link: '/inertia-sails/installation' }
196+
]
171197
},
172198
{
173199
text: 'Basic usage',
174200
collapsible: true,
175-
items: [
176-
{ text: 'Basic usage', link: '/inertia-sails/basic-usage' }
177-
]
201+
items: [{ text: 'Basic usage', link: '/inertia-sails/basic-usage' }]
178202
}
179203
]
180204
}

0 commit comments

Comments
 (0)