e29f508bf3
This update introduces a dismissable warning for merging upstream work from the base branch. The user can now choose not to show this warning again, and this choice is remembered by the system. This is achieved by adding a checkbox that triggers a new function, `projectMergeUpstreamWarningDismissed`, altering the interface's vertical space, and tweaking the execution of the `branchController.updateBaseBranch` method. Detailed changes: - Introduced a checkbox to the warning modal, binded to `mergeUpstreamWarningDismissedCheckbox`. - Adjusted the vertical spacing between elements in the warning modal, from `space-y-2` to `space-y-4`. - Modified the onclick method of the merge button to call `mergeUpstreamWarningDismissed.set(true)`, if `mergeUpstreamWarningDismissedCheckbox` is checked. - Added `mergeUpstreamWarningDismissed` and `mergeUpstreamWarningDismissedCheckbox` variables to control the checkbox state, using the new `projectMergeUpstreamWarningDismissed` method. - New `projectMergeUpstreamWarningDismissed` method added to handle persistent dismissal of the warning across sessions |
||
|---|---|---|
| .github | ||
| .vscode | ||
| butler | ||
| scripts | ||
| src | ||
| src-tauri | ||
| .env.development | ||
| .env.nightly | ||
| .env.production | ||
| .eslintignore | ||
| .eslintrc.cjs | ||
| .gitignore | ||
| .npmrc | ||
| .prettierignore | ||
| .prettierrc | ||
| histoire.config.ts | ||
| histoire.setup.ts | ||
| package.json | ||
| pnpm-lock.yaml | ||
| postcss.config.cjs | ||
| README.md | ||
| svelte.config.js | ||
| tailwind.config.cjs | ||
| tsconfig.json | ||
| vite.config.ts | ||
Development
Prerequisites
see here for the list of software required to build / develope the app.
Setup
Then, make sure to install app dependencies:
$ pnpm install
Develop
Running the app
Now you should be able to run the app in development mode:
$ pnpm tauri dev
Run Stories
Stories is our easy way to view our app components. Running the following command will launch in your default browser.
$ pnpm story:dev
Lint & format
Frontend:
$ pnpm lint
$ pnpm format
Backend:
$ cd ./src-tauri
$ cargo clippy # see linting errors
$ cargo fmt # format code
Debug
Logs
App writes logs into:
- stdout in development mode
- Logs directory
Tokio
We are also collecting tokio's runtime tracing information that could be viewed using tokio-console:
- developlent:
$ tokio-console - nightly:
$ tokio-console http://127.0.0.1:6668 - production:
$ tokio-console http://127.0.0.1:6667
Build
To build the app in production mode, run:
$ pnpm tauri build --features devtools --config src-tauri/tauri.conf.nightly.json
This will make an asset similar to our nightly build.
Icon generation
$ pnpm tauri icon path/to/icon.png
Release
Building is done via GitHub Action.
Go to the link and select Run workflow from the desired branch.
Versioning
When running the release action,
you will have to choose one of major, minor, or patch release type. Action will generate a new version based on your input and current
version found at https://app.gitbutler.com/releases.
Publishing
To publish a version that you've just build, use Release Manager.