Skip to content

Commit 3a00c5d

Browse files
Merge pull request #200 from sebastienbarbier/develop
Release v2.0.2
2 parents 75fea49 + bd6c73b commit 3a00c5d

File tree

143 files changed

+2281
-1420
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

143 files changed

+2281
-1420
lines changed

.eslintrc

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
{
2-
"parser": "babel-eslint",
32
"rules": {
43
"react/jsx-uses-react": 2,
54
"react/jsx-uses-vars": 2,
6-
"react/react-in-jsx-scope": 2,
7-
"indent": ["error", 2],
5+
"react/react-in-jsx-scope": 0,
6+
"react/prop-types": 0,
87
"curly": [2],
98
"quotes": [1, "double"],
109
"linebreak-style": [2, "unix"],
@@ -26,19 +25,16 @@
2625
"node": true,
2726
"cypress/globals": true
2827
},
29-
"parserOptions": {
30-
"sourceType": "module",
31-
"allowImportExportEverywhere": false,
32-
"codeFrame": true,
33-
"ecmaFeatures": {
34-
"modules": true,
35-
"jsx": true,
36-
"experimentalObjectRestSpread": true
37-
},
28+
parserOptions: {
29+
ecmaVersion: 12,
30+
parser: '@babel/eslint-parser',
31+
requireConfigFile: false,
32+
sourceType: 'module',
3833
},
3934
"extends": [
4035
"eslint:recommended",
41-
"plugin:cypress/recommended"
36+
"plugin:cypress/recommended",
37+
"plugin:react/recommended"
4238
],
4339
"plugins": [
4440
"react",

.github/workflows/build.yaml

Lines changed: 62 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -16,63 +16,65 @@ jobs:
1616
# Maps tcp port 5432 on service container to the host
1717
- 8000:8000
1818
steps:
19-
- uses: actions/checkout@v3
20-
- name: Use Node.js ${{ matrix.node-version }}
21-
uses: actions/setup-node@v3
22-
with:
23-
node-version: ${{ matrix.node-version }}
24-
cache: 'npm'
25-
- run: npm install caniuse-lite
26-
- run: npm install
27-
- run: npx browserslist@latest --update-db
28-
- run: npm run build:no-progress --if-present
29-
env:
30-
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
31-
SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
32-
SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
33-
SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
34-
- run: npm run test
35-
# - run: npm run e2e:cli
36-
- name: Cypress install
37-
uses: cypress-io/github-action@v5.0.0 # use the explicit version number
38-
with:
39-
# Disable running of tests within install job
40-
install-command: npm install
41-
runTests: true
42-
start: npm run serve:build http://127.0.0.1:8080
43-
record: true
44-
config-file: ./cypress/config/cypress.production.config.js
45-
env:
46-
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
47-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
48-
- uses: actions/upload-artifact@v3.1.1
49-
if: failure()
50-
with:
51-
name: cypress-screenshots
52-
path: cypress/screenshots
53-
# Test run video was always captured, so this action uses "always()" condition
54-
- uses: actions/upload-artifact@v3.1.1
55-
if: failure()
56-
with:
57-
name: cypress-videos
58-
path: cypress/videos
59-
- name: Update gh-pages
60-
if: github.ref == 'refs/heads/develop'
61-
uses: Cecilapp/GitHub-Pages-deploy@v3
62-
env:
63-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
64-
with:
65-
email: contact@sebastienbarbier.com
66-
build_dir: build
67-
cname: next.seven23.io
68-
- name: "Predeploy"
69-
if: github.ref == 'refs/heads/main'
70-
run: npm run predeploy
71-
- name: "Deploy with Swift"
72-
if: github.ref == 'refs/heads/main'
73-
env: # Set the secret as an input
74-
OS_PASSWORD: ${{ secrets.OS_PASSWORD }}
75-
OS_USERNAME: ${{ secrets.OS_USERNAME }}
76-
OS_TENANT_ID: ${{ secrets.OS_TENANT_ID }}
77-
OS_TENANT_NAME: ${{ secrets.OS_TENANT_NAME }}
78-
run: npm run deploy
19+
- uses: actions/checkout@v4
20+
- name: Use Node.js ${{ matrix.node-version }}
21+
uses: actions/setup-node@v4
22+
with:
23+
node-version: ${{ matrix.node-version }}
24+
cache: "npm"
25+
- run: npm install caniuse-lite
26+
- run: npm install
27+
- run: npx browserslist@latest --update-db
28+
- run: npm run build:no-progress --if-present
29+
env:
30+
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
31+
SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
32+
SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
33+
SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
34+
- run: npm run format
35+
- run: npm run lint
36+
- run: npm run test
37+
# - run: npm run e2e:cli
38+
- name: Cypress install
39+
uses: cypress-io/github-action@v5.0.0 # use the explicit version number
40+
with:
41+
# Disable running of tests within install job
42+
install-command: npm install
43+
runTests: true
44+
start: npm run serve:build http://127.0.0.1:8080
45+
record: true
46+
config-file: ./cypress/config/cypress.production.config.js
47+
env:
48+
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
49+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
50+
- uses: actions/upload-artifact@v4
51+
if: failure()
52+
with:
53+
name: cypress-screenshots
54+
path: cypress/screenshots
55+
# Test run video was always captured, so this action uses "always()" condition
56+
- uses: actions/upload-artifact@v4
57+
if: failure()
58+
with:
59+
name: cypress-videos
60+
path: cypress/videos
61+
- name: Update gh-pages
62+
if: github.ref == 'refs/heads/develop'
63+
uses: Cecilapp/GitHub-Pages-deploy@v3
64+
env:
65+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
66+
with:
67+
email: contact@sebastienbarbier.com
68+
build_dir: build
69+
cname: next.seven23.io
70+
- name: "Predeploy"
71+
if: github.ref == 'refs/heads/main'
72+
run: npm run predeploy
73+
- name: "Deploy with Swift"
74+
if: github.ref == 'refs/heads/main'
75+
env: # Set the secret as an input
76+
OS_PASSWORD: ${{ secrets.OS_PASSWORD }}
77+
OS_USERNAME: ${{ secrets.OS_USERNAME }}
78+
OS_TENANT_ID: ${{ secrets.OS_TENANT_ID }}
79+
OS_TENANT_NAME: ${{ secrets.OS_TENANT_NAME }}
80+
run: npm run deploy

.github/workflows/docker.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,20 @@ jobs:
1919
runs-on: ubuntu-latest
2020
steps:
2121
- name: Check out the repo
22-
uses: actions/checkout@v3
23-
22+
uses: actions/checkout@v4
23+
2424
- name: Log in to Docker Hub
2525
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
2626
with:
2727
username: ${{ secrets.DOCKER_USERNAME }}
2828
password: ${{ secrets.DOCKERHUB_TOKEN }}
29-
29+
3030
- name: Extract metadata (tags, labels) for Docker
3131
id: meta
3232
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
3333
with:
3434
images: sebastienbarbier/seven23_app
35-
35+
3636
- name: Build and push Docker image
3737
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
3838
with:
@@ -41,4 +41,4 @@ jobs:
4141
no-cache: true
4242
progress: plain
4343
tags: ${{ steps.meta.outputs.tags }}
44-
labels: ${{ steps.meta.outputs.labels }}
44+
labels: ${{ steps.meta.outputs.labels }}

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ apps/
88
.env
99
coverage/
1010
cypress/videos/
11-
cypress/screenshots/
11+
cypress/screenshots/
12+
.vscode/

.husky/pre-commit

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/usr/bin/env sh
22
. "$(dirname -- "$0")/_/husky.sh"
33

4-
npm run prettier
4+
npx pretty-quick

.readthedocs.yaml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# Read the Docs configuration file for Sphinx projects
2+
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
3+
4+
# Required
5+
version: 2
6+
7+
# Set the OS, Python version and other tools you might need
8+
build:
9+
os: ubuntu-22.04
10+
tools:
11+
python: "3.9"
12+
# You can also specify other tool versions:
13+
# nodejs: "20"
14+
# rust: "1.70"
15+
# golang: "1.20"
16+
17+
# Build documentation in the "docs/" directory with Sphinx
18+
sphinx:
19+
configuration: docs/conf.py
20+
# You can configure Sphinx to use a different builder, for instance use the dirhtml builder for simpler URLs
21+
# builder: "dirhtml"
22+
# Fail on all warnings to avoid broken references
23+
# fail_on_warning: true
24+
25+
# Optionally build your docs in additional formats such as PDF and ePub
26+
# formats:
27+
# - pdf
28+
# - epub
29+
30+
# Optional but recommended, declare the Python requirements required
31+
# to build your documentation
32+
# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
33+
python:
34+
install:
35+
- requirements: docs/requirements.txt

CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
2121
See for sample https://raw.githubusercontent.com/favoloso/conventional-changelog-emoji/master/CHANGELOG.md
2222
-->
2323

24+
## [2.0.2] - 2025-10-27
25+
### 📚 Documentation
26+
- Fix documentation (#156)
27+
### ✨ Feature
28+
- Migrate node sass to dart sass (#199)
29+
2430
## [2.0.1] - 2024-03-04
2531
### 🐛 Bug Fixes
26-
- Remove pending payments from trends (#132)
32+
- Remove pending payments from trends (#132)
2733
### 🔒 Security
2834
- Update dependencies (#133)
2935

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Seven23 webapp
22

3-
[![Build action badge](https://github.com/sebastienbarbier/seven23/actions/workflows/build.yaml/badge.svg?branch=main)](https://github.com/sebastienbarbier/seven23/actions/) [![Documentation Status](https://readthedocs.org/projects/seven23/badge/?version=latest)](https://seven23.readthedocs.io/en/latest/?badge=latest) [![Status](https://status.seven23.io/badge.svg)](https://status.seven23.io) [![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](https://github.com/sebastienbarbier/seven23/blob/main/LICENSE)
3+
[![Build action badge](https://github.com/sebastienbarbier/seven23/actions/workflows/build.yaml/badge.svg?branch=main)](https://github.com/sebastienbarbier/seven23/actions/) [![Documentation Status](https://readthedocs.org/projects/seven23/badge/?version=latest)](https://seven23.readthedocs.io/en/latest/?badge=latest) [![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](https://github.com/sebastienbarbier/seven23/blob/main/LICENSE)
44

55
Fully manual budget app to track your expenses. Completely opensource, with privacy by design.
66

@@ -27,7 +27,7 @@ npm i
2727
npm start
2828
```
2929

30-
### Run backend lcoally
30+
### Run backend locally
3131

3232
```
3333
npm run backend

cypress/e2e/local_accounts_spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ describe("Accounts", () => {
99
// then go to settings to create a second account, look if it exist
1010
it("Create, update, and delete an account on device", () => {
1111

12-
cy.verifyUserButtonCurrencyHas('Euro');
12+
// cy.verifyUserButtonCurrencyHas('Euro');
1313

1414
// // Navigate to settings account view
1515

docs/changelogs.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
```{include} ../CHANGELOG.md
2+
```

0 commit comments

Comments
 (0)