Skip to content

Commit

Permalink
Merge pull request #72 from vocascan/experimental
Browse files Browse the repository at this point in the history
Push v1.0.0 to production
  • Loading branch information
Julian authored Jun 12, 2021
2 parents 17afabb + aaada8a commit 50912ab
Show file tree
Hide file tree
Showing 227 changed files with 42,447 additions and 6,263 deletions.
11 changes: 11 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"extends": ["react-app", "react-app/jest", "plugin:prettier/recommended"],
"rules": {
"prettier/prettier": "warn"
},
"overrides": [
{
"files": "*.jsx"
}
]
}
5 changes: 3 additions & 2 deletions .github/workflows/pullrequest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ jobs:
list-files: json
filters: |
translations:
- "src/i18n/locales/!(en)*.json"
- "src/i18n/locales/!(en)/*.json"
- "src/i18n/locales/locales.json"
- name: format files output
if: steps.changes.outputs.translations == 'true'
Expand All @@ -36,7 +37,7 @@ jobs:
msg: |
Thank you for your pull request.
Please remove your translations. Change only the `en.json` if necessary.
If this pull request is merged into the `main` branch, it can be translated via localazy.
If this pull request is merged into the [`experimental`](https://github.com/vocascan/vocascan-desktop/tree/experimental) branch, it can be translated via [localazy](https://localazy.com/p/vocascan).
Please remove following files from pull request changes.
```
Expand Down
49 changes: 49 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: build app

on:
push:
branches:
- main

jobs:
release:
runs-on: ${{ matrix.os }}

strategy:
# keep building even if another job is failed
fail-fast: false
matrix:
os: [windows-latest, ubuntu-latest, macos-latest]

steps:
- name: Checkout
uses: actions/checkout@v2

- name: Setup node
uses: actions/setup-node@v2
with:
node-version: "14"

- name: Date
id: date
run: echo "::set-output name=date::$(date -u +'%Y-%m-%dT%H:%M:%SZ')"

- name: Install Snapcraft
uses: samuelmeuli/action-snapcraft@v1
if: startsWith(matrix.os, 'ubuntu')
with:
# Log in to Snap Store
snapcraft_token: ${{ secrets.snapcraft_token }}

- name: Install RPM
if: startsWith(matrix.os, 'ubuntu')
run: |
sudo apt install rpm
- name: Build/release Electron app
uses: samuelmeuli/action-electron-builder@v1
with:
build_script_name: react-build
github_token: ${{ secrets.VOCASCAN_BOT_TOKEN }}
args: "-c.extraMetadata.commit='${{ github.sha }}' -c.extraMetadata.date='${{ steps.date.outputs.date }}'"
release: true
8 changes: 6 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,9 @@ jobs:
- name: install
run: npm i

- name: lint
run: npm run lint
- name: lint js
run: npm run lint:js -- --max-warnings=0

- name: lint style
if: always()
run: npm run lint:style
12 changes: 9 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,20 @@ typings/
# Webpack
.webpack/

# Electron-Forge
out/

# vscode
.vscode

dist/

# react
build/

# electron-builder
builds/
dev-app-update.yml

# localazy
localazy.keys.json

# jetbrains
.idea/
21 changes: 21 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"tabWidth": 2,
"endOfLine": "auto",
"trailingComma": "es5",
"printWidth": 80,
"singleQuote": false,
"semi": true,
"useTabs": false,
"importOrder": [
"^(react|uniqid|i18next|redux|axios|clsx|semver|@testing-library)(.*)$",
"^@material-ui/core(.*)$",
"^@material-ui/icons(.*)$",
"^(.*).jsx$",
"^(.*).js$",
"^(.*).(png|jpg|svg|json)$",
"^(.*).(scss)$",
".*"
],
"importOrderSeparation": true,
"experimentalBabelParserPluginsList": ["jsx"]
}
9 changes: 9 additions & 0 deletions .stylelintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"extends": "stylelint-config-sass-guidelines",
"rules": {
"order/properties-alphabetical-order": null,
"max-nesting-depth": 4,
"string-quotes": "double",
"selector-max-compound-selectors": null
}
}
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,6 @@ For questions or ideas please use [Discussions](https://github.com/vocascan/voca

## Contributors

[<img src="https://avatars3.githubusercontent.com/u/54618409?s=400&v=4" width="50" />](https://github.com/noctera)
[<img src="https://avatars3.githubusercontent.com/u/60048565?s=400&v=4" width="50" />](https://github.com/luwol03)
[<img src="https://avatars3.githubusercontent.com/u/16488024?s=400&v=4" width="50" />](https://github.com/zikowang)
[<img src="https://github.com/noctera.png" width="50" />](https://github.com/noctera)
[<img src="https://github.com/luwol03.png" width="50" />](https://github.com/luwol03)
[<img src="https://github.com/zikowang.png" width="50" />](https://github.com/zikowang)
5 changes: 3 additions & 2 deletions localazy.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{
"upload": {
"type": "json",
"files": "src/i18n/locales/en.json",
"files": "src/i18n/locales/en/*.json",
"deprecateMissing": true,
"features": ["array", "filter_untranslated", "plural_postfix_us"]
},
"download": {
"files": "src/i18n/locales/${lang}.json"
"metadataFileJson": "src/i18n/locales/locales.json",
"files": "src/i18n/locales/${lang}/${file}"
}
}
Loading

0 comments on commit 50912ab

Please sign in to comment.