Skip to content

Commit

Permalink
Merge pull request #114 from sebastienbarbier/develop
Browse files Browse the repository at this point in the history
Release v1.2.0
  • Loading branch information
sebastienbarbier authored Jul 6, 2023
2 parents 44d5bda + bda5dd2 commit 7f83d7b
Show file tree
Hide file tree
Showing 86 changed files with 7,191 additions and 6,033 deletions.
19 changes: 16 additions & 3 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,37 @@ jobs:
matrix:
node-version: [18.12.1]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
services:
seven23:
image: sebastienbarbier/seven23
env:
ALLOW_ACCOUNT_CREATION: True
ports:
# Maps tcp port 5432 on service container to the host
- 8000:8000
steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
- run: npm install caniuse-lite --legacy-peer-deps
- run: npm install --legacy-peer-deps
- run: npm install caniuse-lite
- run: npm install
- run: npm run build:no-progress --if-present
env:
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
- run: npx browserslist@latest --update-db
- run: npm run test
# - run: npm run e2e:cli
- name: Cypress install
uses: cypress-io/[email protected] # use the explicit version number
with:
# Disable running of tests within install job
install-command: npm install --legacy-peer-deps
install-command: npm install
runTests: true
start: npm run serve:build http://127.0.0.1:8080
record: true
Expand Down
15 changes: 14 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,20 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
See for sample https://raw.githubusercontent.com/favoloso/conventional-changelog-emoji/master/CHANGELOG.md
-->

## [1.2.0] - 2022-07-06
### 🛠 Improvements
- Handle uncaught exception with a bug report view (#84)
- Implement a developer mode in app (#85)
- Refactor the settings panel using react-router (#88)
- Different icon between current and next version (#92)
- List of categories includes a no category value (#94)
- Confirmation view for your encryption key (#95)
- Run e2e with local docker backend (#112)
### 🐛 Bug Fixes
- Fix Snackbar manager not working if no account (#87)
- Dashboard crash (#108)
- Add missing 'No category label' on mobile list of category (#111)
- Fix npm install by updating dependencies (#113)

## [1.1.4] - 2022-02-27
### 🐛 Bug Fixes
Expand Down
10 changes: 6 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
> **Warning**
>
> This project is a one person project, currently in **alpha** quality. We don't yet guarantee stability, data integrity or a clean upgrade path. Only use this project if you are interested in experimenting with it.
# Seven23 webapp

[![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)
Expand Down Expand Up @@ -30,3 +26,9 @@ nvm use
npm i
npm start
```

### Run backend lcoally

```
npm run backend
```
4 changes: 2 additions & 2 deletions cypress.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const { defineConfig } = require('cypress')

module.exports = defineConfig({
host: 'https://test.seven23.io',
host: 'http://localhost:8000',
projectId: 'sutkxf',
numTestsKeptInMemory: 1,
defaultCommandTimeout: 15000,
Expand All @@ -14,4 +14,4 @@ module.exports = defineConfig({
baseUrl: 'http://localhost:3000',
specPattern: 'cypress/e2e/**/*.{js,jsx,ts,tsx}',
},
})
})
4 changes: 2 additions & 2 deletions cypress/config/cypress.production.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const { defineConfig } = require('cypress')

module.exports = defineConfig({
host: 'https://test.seven23.io',
host: 'http://localhost:8000',
projectId: 'sutkxf',
numTestsKeptInMemory: 1,
video: true,
Expand All @@ -17,4 +17,4 @@ module.exports = defineConfig({
baseUrl: "http://127.0.0.1:8080",
specPattern: 'cypress/e2e/**/*.{js,jsx,ts,tsx}',
},
})
})
5 changes: 4 additions & 1 deletion cypress/e2e/user_sync_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@ describe("Users Sync", () => {
cy.get("#user-popper").should("be.visible").click();

// Delete first category

cy.get('[href="/categories"]').should("be.visible").click();
cy.get('[style="padding-left: 24px;"]').should("be.visible").click();
cy.get(
'[style="display: flex; justify-content: flex-end; align-items: center; margin: 8px 20px;"] > .MuiButtonBase-root'
Expand Down Expand Up @@ -218,14 +220,15 @@ describe("Users Sync", () => {
cy.get("#toolbar > .wrapperMobile > .MuiButtonBase-root")
.should("be.visible")
.click();

cy.get(".MuiPaper-root > :nth-child(1) > .MuiButtonBase-root")
.should("be.visible")
.click();

// Wait for a PUT request on udpate
cy.intercept({
method: 'PUT',
url: 'https://test.seven23.io/api/v1/debitscredits',
url: `${Cypress.config('host')}/api/v1/debitscredits`,
}).as('apiUpdate');
cy.wait('@apiUpdate');

Expand Down
6 changes: 3 additions & 3 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,17 +48,17 @@

# General information about the project.
project = u'Seven23'
copyright = u'2022, Sébastien BARBIER'
copyright = u'2023, Sébastien BARBIER'
author = u'Sébastien BARBIER'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
version = '1.0'
version = '1.2'
# The full version, including alpha/beta/rc tags.
release = '1.0.1'
release = '1.2.0'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
Loading

0 comments on commit 7f83d7b

Please sign in to comment.