Skip to content

Commit

Permalink
Merge branch 'release/1.0.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
DominusKelvin committed Jul 28, 2023
2 parents 21a8ed4 + c874d8d commit 5338247
Show file tree
Hide file tree
Showing 35 changed files with 7,805 additions and 1,485 deletions.
22 changes: 22 additions & 0 deletions .github/workflows/prettier.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Prettier

on: [push, pull_request]

jobs:
prettier:
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: 18

- name: Run npm ci
run: npm ci

- name: Run Prettier
run: npx prettier --write .
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
node_modules
docs/.vitepress/cache
docs/.vitepress/dist
4 changes: 4 additions & 0 deletions .husky/commit-msg
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

npx --no -- commitlint --edit ${1}
4 changes: 4 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

npx lint-staged
98 changes: 98 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
# Contributing to The Sailscasts Docs

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.

Please take a moment to read the guidelines below before contributing to the project.

## Project Description

This project contains the official documentations for all projects both open source and commercial by The Sailscasts Company.

## Contribution Workflow

When contributing to this project, we adhere to the [Gitflow branching model](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow).

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.

## Before Contributing

Before diving into the contribution process and setting up your environment, it is essential to select an issue you would like to work on.

#### Here's a simple guide to follow:

1. Search through the list of [open issues](https://github.com/sailscastshq/docs.sailscasts.com/issues).
2. Find the issue you want to work on.

⚠️**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)

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.

## Getting Started

#### To ensure a seamless contribution and review process, please follow these guidelines:

1. Open your preferred text editor.
2. Fork and clone the repository into your own github account.
[Here is a guide](https://docs.github.com/en/get-started/quickstart/fork-a-repo).

⚠️**Note:** If you cloned the repository a while back, we recommend fetching the latest changes from the upstream repository.

You can do this by using Github Desktop or running the following commands:

```
git checkout develop
```

```
git pull upstream develop
```

3. Create a new branch in your forked repository

```
git checkout -b <my-branch> develop
```

⚠️**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.

4. In your text editor, Select the file related to the issue you want to fix, and make your changes.

⚠️**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.

5. Commit your changes with a descriptive commit message [using conventional commits](https://www.conventionalcommits.org/en/v1.0.0/).

#### We highly encourage the use of conventional commits. Here are some examples:

- **feat:** Use this when introducing a new feature.
- **fix:** Use this when resolving any issues in the codebase.
- **chore:** Use this when adding new links/resources or making minor changes.
(e.g, `chore: Add database credentials`)
- Please ensure that your **commit messages are concise and clear**.
- Write commit messages in the **present tense**, as they reflect the current state of the codebase after the changes have been applied.
<br/>

6. Push your branch to GitHub

```
git push origin <my-branch>
```

7. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/) with a clear title and description matching the issue you fixed.

⚠️**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.

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.

- Link the issue you have resolved in the Pull Request Template using the following syntax:
- If your Pull Request fixes issue #25, add `Fixes #25` to the description.
- 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.
<br/>
This helps us track and automatically close the relevant issue when your Pull Request is merged.

## Contribution Etiquettes

- 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.

- 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.

#### Thank you for reading the guide. We look forward to merging your contributions.
42 changes: 42 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1 +1,43 @@
# The official docs for The Sailscasts Company

This repo consist of the documentations of every product under the Sailscasts Company.

## Want to be a contributor?

Whether it's big or small, we love contributions. Check out our [guide](CONTRIBUTING.md) to see how to get started.

Not sure where to get started? You can join our [Discord](http://sailscasts.com/chat), and ask us any questions there.

## Projects

### [guppy](https://docs.sailscasts.com/guppy/)

The tinker tool for backend javascript. Guppy is the perfect companion for you to test out your ideas in javascript.

### [create-sails](https://docs.sailscasts.com/create-sails/)

Scaffold a modern full-stack Sails project. Gain all the benefit of an SPA while maintaining a server-centric development.

### [inertia-sails](https://docs.sailscasts.com/inertia-sails/)

The Sails adapter for inertia. Build single-page apps, without building an API.

### [sails-wish](https://docs.sailscasts.com/inertia-sails/)

The OAuth hook you wish exists for Sails. Easily setup OAuth flows in your Sails applications.

### [captain-vane](https://docs.sailscasts.com/captain-vane/)

The missing Sails factory generator. Generate realistically test data in a Sails application.

## Contributors

<p style="text-align:center">
<a href="https://github.com/sailscastshq/docs.sailscasts.com/graphs/contributors">
<img src="https://contrib.rocks/image?repo=sailscastshq/docs.sailscasts.com" />
</a>
</p>

## Enjoy

You rock!!
1 change: 1 addition & 0 deletions commitlint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = { extends: ['@commitlint/config-conventional'] }
110 changes: 67 additions & 43 deletions docs/.vitepress/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ export default {
title: 'Sailscasts Docs',
description: 'Docs on everything we are working on at Sailscasts',
lastUpdated: true,
cleanUrls: true,

themeConfig: {
nav: nav(),
sidebar: {
Expand All @@ -13,20 +15,27 @@ export default {
'/inertia-sails/': inertiaSailsGuide()
},
editLink: {
pattern: 'https://github.com/sailscastshq/docs.sailscasts.com/edit/main/docs/:path',
pattern:
'https://github.com/sailscastshq/docs.sailscasts.com/edit/develop/docs/:path',
text: 'Edit this page on GitHub'
},
socialLinks: [
{ icon: 'github', link: 'https://github.com/sailscastshq/docs.sailscasts.com' },
{
icon: 'github',
link: 'https://github.com/sailscastshq/docs.sailscasts.com'
},
{ icon: 'twitter', link: 'https://twitter.com/sailscastshq' },
{ icon: 'discord', link: 'https://discord.com/invite/gbJZuNm' },
{ icon: 'youtube', link: 'https://www.youtube.com/channel/UCje9Wo6cbh3IERItPbyq1QA' }
{
icon: 'youtube',
link: 'https://www.youtube.com/channel/UCje9Wo6cbh3IERItPbyq1QA'
}
],
footer: {
message: 'All open source projects are released under the MIT License.',
copyright: 'Copyright © 2022-present The Sailscasts Company'
},
algolia: {
algolia: {
appId: 'MEUVZAVDGZ',
apiKey: '6c5e9ae85dc5c0672b6df0b2e305f6cb',
indexName: 'sailscasts'
Expand All @@ -38,17 +47,15 @@ function nav() {
return [
{
text: 'Software',
items: [
{ text: 'guppy', link: '/guppy/' },
]
items: [{ text: 'guppy', link: '/guppy/' }]
},
{
text: 'Open Source',
items: [
{ text: 'create-sails', link: '/create-sails/' },
{ text: 'inertia-sails', link: '/inertia-sails/' },
{ text: 'wish', link: '/wish/' },
{ text: 'captain-vane', link: '/captain-vane/' },
{ text: 'captain-vane', link: '/captain-vane/' }
// { text: 'sailboat', link: '/sailboat/' },
]
},
Expand All @@ -68,16 +75,17 @@ function captainVaneGuide() {
collapsible: true,
items: [
{ text: 'Introduction', link: '/captain-vane/' },
{ text: 'What is captain-vane?', link: '/captain-vane/what-is-captain-vane' },
{ text: 'Installation', link: '/captain-vane/installation' },
{
text: 'What is captain-vane?',
link: '/captain-vane/what-is-captain-vane'
},
{ text: 'Installation', link: '/captain-vane/installation' }
]
},
{
text: 'Basic usage',
collapsible: true,
items: [
{ text: 'Basic usage', link: '/captain-vane/basic-usage' }
]
items: [{ text: 'Basic usage', link: '/captain-vane/basic-usage' }]
}
]
}
Expand All @@ -98,20 +106,33 @@ function guppyGuide() {
{
text: 'Basic usage',
collapsible: true,
items: [
{ text: 'Running code', link: '/guppy/running-code' },
]
items: [{ text: 'Running code', link: '/guppy/running-code' }]
},
{
text: 'Changelogs',
collapsible: true,
items: [
{ text: 'v1.1.2', link: 'https://glink.so/kelvin/guppy/changelogs/v1-1-2' },
{ text: 'v1.1.1', link: 'https://glink.so/kelvin/guppy/changelogs/guppy-v1-1-1' },
{ text: 'v1.1.0', link: 'https://glink.so/kelvin/guppy/changelogs/guppy-v1-1-0' },
{ text: 'v1.0.1', link: 'https://glink.so/kelvin/guppy/changelogs/guppy-v1-0-1' },
{ text: 'v1.0.0', link: 'https://glink.so/kelvin/guppy/changelogs/guppy-v1-0-0' },
{ text: 'Changelogs', link: 'https://glink.so/kelvin/guppy/changelogs' },
{
text: 'v1.1.2',
link: 'https://glink.so/kelvin/guppy/changelogs/v1-1-2'
},
{
text: 'v1.1.1',
link: 'https://glink.so/kelvin/guppy/changelogs/guppy-v1-1-1'
},
{
text: 'v1.1.0',
link: 'https://glink.so/kelvin/guppy/changelogs/guppy-v1-1-0'
},
{
text: 'v1.0.1',
link: 'https://glink.so/kelvin/guppy/changelogs/guppy-v1-0-1'
},
{
text: 'v1.0.0',
link: 'https://glink.so/kelvin/guppy/changelogs/guppy-v1-0-0'
},
{ text: 'Changelogs', link: 'https://glink.so/kelvin/guppy/changelogs' }
]
}
]
Expand All @@ -125,14 +146,15 @@ function wishGuide() {
items: [
{ text: 'Introduction', link: '/wish/' },
{ text: 'What is wish?', link: '/wish/what-is-wish' },
{ text: 'Installation', link: '/wish/installation' },
{ text: 'Installation', link: '/wish/installation' }
]
},
{
text: 'Basic usage',
collapsible: true,
items: [
{ text: 'GitHub OAuth', link: '/wish/github' }
{ text: 'GitHub OAuth', link: '/wish/github' },
{ text: 'Google OAuth', link: '/wish/google' }
]
}
]
Expand All @@ -141,40 +163,42 @@ function wishGuide() {
function createSailsGuide() {
return [
{
text: 'Getting started',
collapsible: true,
items: [
{ text: 'Introduction', link: '/create-sails/' },
{ text: 'What is create-sails?', link: '/create-sails/what-is-create-sails' }
]
text: 'Getting started',
collapsible: true,
items: [
{ text: 'Introduction', link: '/create-sails/' },
{
text: 'What is create-sails?',
link: '/create-sails/what-is-create-sails'
}
]
},
{
text: 'Basic usage',
collapsible: true,
items: [
{ text: 'Basic usage', link: '/create-sails/basic-usage' }
]
items: [{ text: 'Basic usage', link: '/create-sails/basic-usage' }]
}
]
}

function inertiaSailsGuide() {
return [
{
text: 'Getting started',
collapsible: true,
items: [
{ text: 'Introduction', link: '/inertia-sails/' },
{ text: 'What is inertia-sails?', link: '/inertia-sails/what-is-inertia-sails' },
{ text: 'Installation', link: '/inertia-sails/installation' }
]
text: 'Getting started',
collapsible: true,
items: [
{ text: 'Introduction', link: '/inertia-sails/' },
{
text: 'What is inertia-sails?',
link: '/inertia-sails/what-is-inertia-sails'
},
{ text: 'Installation', link: '/inertia-sails/installation' }
]
},
{
text: 'Basic usage',
collapsible: true,
items: [
{ text: 'Basic usage', link: '/inertia-sails/basic-usage' }
]
items: [{ text: 'Basic usage', link: '/inertia-sails/basic-usage' }]
}
]
}
Loading

0 comments on commit 5338247

Please sign in to comment.