Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat:use aw-webui as default #65

Merged
merged 2 commits into from
Feb 3, 2025
Merged

Conversation

0xbrayo
Copy link
Member

@0xbrayo 0xbrayo commented Feb 1, 2025

Important

Switches default UI to aw-webui by removing Vue setup and updating Tauri configuration.

  • Behavior:
    • Default UI changed to aw-webui by removing Vue-related files (index.html, src/App.vue, src/main.ts, src/styles.css, vite.config.ts, etc.).
    • run() in lib.rs now launches the web UI by navigating the main window to the local server URL.
  • Dependencies:
    • Removed Vue-related dependencies and scripts from package.json.
    • Updated Tauri dependencies to specific versions in package.json.
  • Configuration:
    • Removed build commands and frontend distribution settings from tauri.conf.json.

This description was created by Ellipsis for 556cd2d. It will automatically update as commits are pushed.

Copy link

@ellipsis-dev ellipsis-dev bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 Looks good to me! Reviewed everything up to 556cd2d in 1 minute and 16 seconds

More details
  • Looked at 453 lines of code in 10 files
  • Skipped 5 files when reviewing.
  • Skipped posting 3 drafted comments based on config settings.
1. package.json:6
  • Draft comment:
    The removal of 'dev' and 'build' scripts might be unintentional. These scripts are typically essential for development and building the project. Consider adding them back if they are still needed.
  • Reason this comment was not posted:
    Comment did not seem useful.
2. package.json:9
  • Draft comment:
    Ensure that all necessary dependencies for the new setup with aw-webui are included, as Vue.js related dependencies have been removed.
  • Reason this comment was not posted:
    Confidence changes required: 50%
    The PR removes the Vue.js related dependencies and scripts, which seems intentional as the project is switching to use aw-webui as default. However, it's important to ensure that all necessary dependencies for the new setup are included.
3. src-tauri/tauri.conf.json:5
  • Draft comment:
    Ensure that the removal of 'beforeDevCommand', 'devUrl', 'beforeBuildCommand', and 'frontendDist' is intentional and that the new setup with aw-webui doesn't require these configurations.
  • Reason this comment was not posted:
    Confidence changes required: 50%
    The PR removes the 'beforeDevCommand', 'devUrl', 'beforeBuildCommand', and 'frontendDist' from the tauri.conf.json file. This might be intentional due to the switch to aw-webui, but it's important to ensure that the new setup doesn't require these configurations.

Workflow ID: wflow_3QkXTnRcgUVoOQaf


You can customize Ellipsis with 👍 / 👎 feedback, review rules, user-specific overrides, quiet mode, and more.

@0xbrayo
Copy link
Member Author

0xbrayo commented Feb 1, 2025

#16

@0xbrayo 0xbrayo requested a review from ErikBjare February 1, 2025 20:49
Comment on lines +413 to +415
main_window
.navigate(url)
.expect("error navigating main window");
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This routing means that we could also have an alternate UI for module management or whatever. And a option to open the alternate UI via the tray menu.

@0xbrayo 0xbrayo merged commit c29011c into ActivityWatch:master Feb 3, 2025
5 checks passed
@0xbrayo 0xbrayo mentioned this pull request Feb 4, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant