26 Commits

Author SHA1 Message Date
nicwands
2dc3079c01 Merge branch 'main' of https://git.alt-tuning.co/takerofnotes/takerofnotes-app 2026-06-04 15:31:58 -04:00
nicwands
bfe45df954 test mac build 2026-06-04 15:31:35 -04:00
Nic Wands
32a2f93484 windows temp build 2026-05-18 16:21:59 -04:00
nicwands
f3263f3a03 Change latest.yml upload location 2026-05-18 15:29:52 -04:00
nicwands
740454d87e bump version 2026-05-18 15:21:55 -04:00
nicwands
18a5730605 latest.yml fix 2026-05-18 15:20:54 -04:00
nicwands
65094d3df6 stop tracking out folder 2026-05-08 13:34:43 -04:00
nicwands
ef3af6ae75 bump version 2026-05-08 13:29:15 -04:00
nicwands
9a897ef3a7 release docs readme 2026-05-08 13:28:46 -04:00
nicwands
a43c3221da fix new window loading bug 2026-05-08 13:18:16 -04:00
nicwands
75d3488de0 delete modal + btn 2026-05-07 13:11:16 -04:00
nicwands
1806a612b6 functionality updates for preferences 2026-04-09 14:58:06 -04:00
nicwands
b4b627b6bb update publishing flow 2026-04-06 16:04:42 -04:00
nicwands
921c4a29a7 new publishing flow - s3 compatible 2026-04-06 15:48:43 -04:00
nicwands
5e633d9dd6 Locked menu on first open 2026-04-06 11:44:49 -04:00
nicwands
fc33a9c051 bring directory back 2026-04-06 11:36:21 -04:00
nicwands
2a9e0ef9be Add capacitor 2026-04-06 11:35:26 -04:00
nicwands
1fc972a3f0 click to add new line 2026-04-02 12:21:35 -04:00
nicwands
9cd936c256 ui updates 2026-04-02 12:05:44 -04:00
nicwands
ad961fd31a refactor + warning for failed decryptions 2026-04-02 11:45:46 -04:00
nicwands
a0a5cde33a ui tweaks 2026-04-01 10:06:22 -04:00
nicwands
555cfd4a93 new title structure 2026-03-31 13:39:08 -04:00
nicwands
a3f82fb74c add summarium to move menu 2026-03-27 10:47:51 -04:00
nicwands
86146f1ecf find feature 2026-03-26 16:33:03 -04:00
nicwands
2ab76684cc preferences inputs WIP 2026-03-26 15:32:44 -04:00
nicwands
3c0184cf63 Preferences inputs WIP 2026-03-26 15:32:13 -04:00
114 changed files with 5303 additions and 1152 deletions

View File

@@ -2,10 +2,6 @@
An Electron application with Vue An Electron application with Vue
## Recommended IDE Setup
- [VSCode](https://code.visualstudio.com/) + [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint) + [Prettier](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode) + [Volar](https://marketplace.visualstudio.com/items?itemName=Vue.volar)
## Project Setup ## Project Setup
### Install ### Install
@@ -32,3 +28,20 @@ $ npm run build:mac
# For Linux # For Linux
$ npm run build:linux $ npm run build:linux
``` ```
### Releasing Versions
Before releasing a new version, make sure that all code is committed and pushed to the remote repository. Then, update the version number in `package.json`.
Create a new release tag and push it to the remote repository.
```bash
$ git tag -a <version> -m "Release <version>"
$ git push --tags
```
Run the release script to build and package the application and upload it to the SeaweedFS bucket.
```bash
$ npm run release:<platform>
```

101
android/.gitignore vendored Normal file
View File

@@ -0,0 +1,101 @@
# Using Android gitignore template: https://github.com/github/gitignore/blob/HEAD/Android.gitignore
# Built application files
*.apk
*.aar
*.ap_
*.aab
# Files for the ART/Dalvik VM
*.dex
# Java class files
*.class
# Generated files
bin/
gen/
out/
# Uncomment the following line in case you need and you don't have the release build type files in your app
# release/
# Gradle files
.gradle/
build/
# Local configuration file (sdk path, etc)
local.properties
# Proguard folder generated by Eclipse
proguard/
# Log Files
*.log
# Android Studio Navigation editor temp files
.navigation/
# Android Studio captures folder
captures/
# IntelliJ
*.iml
.idea/workspace.xml
.idea/tasks.xml
.idea/gradle.xml
.idea/assetWizardSettings.xml
.idea/dictionaries
.idea/libraries
# Android Studio 3 in .gitignore file.
.idea/caches
.idea/modules.xml
# Comment next line if keeping position of elements in Navigation Editor is relevant for you
.idea/navEditor.xml
# Keystore files
# Uncomment the following lines if you do not want to check your keystore files in.
#*.jks
#*.keystore
# External native build folder generated in Android Studio 2.2 and later
.externalNativeBuild
.cxx/
# Google Services (e.g. APIs or Firebase)
# google-services.json
# Freeline
freeline.py
freeline/
freeline_project_description.json
# fastlane
fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots
fastlane/test_output
fastlane/readme.md
# Version control
vcs.xml
# lint
lint/intermediates/
lint/generated/
lint/outputs/
lint/tmp/
# lint/reports/
# Android Profiling
*.hprof
# Cordova plugins for Capacitor
capacitor-cordova-android-plugins
# Copied web assets
app/src/main/assets/public
# Generated Config files
app/src/main/assets/capacitor.config.json
app/src/main/assets/capacitor.plugins.json
app/src/main/res/xml/config.xml

2
android/app/.gitignore vendored Normal file
View File

@@ -0,0 +1,2 @@
/build/*
!/build/.npmkeep

54
android/app/build.gradle Normal file
View File

@@ -0,0 +1,54 @@
apply plugin: 'com.android.application'
android {
namespace = "com.takerofnotes.app"
compileSdk = rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "com.takerofnotes.app"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
aaptOptions {
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
// Default: https://android.googlesource.com/platform/frameworks/base/+/282e181b58cf72b6ca770dc7ca5f91f135444502/tools/aapt/AaptAssets.cpp#61
ignoreAssetsPattern = '!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~'
}
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
}
repositories {
flatDir{
dirs '../capacitor-cordova-android-plugins/src/main/libs', 'libs'
}
}
dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
implementation "androidx.coordinatorlayout:coordinatorlayout:$androidxCoordinatorLayoutVersion"
implementation "androidx.core:core-splashscreen:$coreSplashScreenVersion"
implementation project(':capacitor-android')
testImplementation "junit:junit:$junitVersion"
androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
implementation project(':capacitor-cordova-android-plugins')
}
apply from: 'capacitor.build.gradle'
try {
def servicesJSON = file('google-services.json')
if (servicesJSON.text) {
apply plugin: 'com.google.gms.google-services'
}
} catch(Exception e) {
logger.info("google-services.json not found, google-services plugin not applied. Push Notifications won't work")
}

View File

@@ -0,0 +1,19 @@
// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
android {
compileOptions {
sourceCompatibility JavaVersion.VERSION_21
targetCompatibility JavaVersion.VERSION_21
}
}
apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
dependencies {
implementation project(':capacitor-preferences')
}
if (hasProperty('postBuildExtras')) {
postBuildExtras()
}

21
android/app/proguard-rules.pro vendored Normal file
View File

@@ -0,0 +1,21 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}
# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable
# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile

View File

@@ -0,0 +1,26 @@
package com.getcapacitor.myapp;
import static org.junit.Assert.*;
import android.content.Context;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.platform.app.InstrumentationRegistry;
import org.junit.Test;
import org.junit.runner.RunWith;
/**
* Instrumented test, which will execute on an Android device.
*
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
*/
@RunWith(AndroidJUnit4.class)
public class ExampleInstrumentedTest {
@Test
public void useAppContext() throws Exception {
// Context of the app under test.
Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
assertEquals("com.getcapacitor.app", appContext.getPackageName());
}
}

View File

@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode|navigation|density"
android:name=".MainActivity"
android:label="@string/title_activity_main"
android:theme="@style/AppTheme.NoActionBarLaunch"
android:launchMode="singleTask"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="${applicationId}.fileprovider"
android:exported="false"
android:grantUriPermissions="true">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/file_paths"></meta-data>
</provider>
</application>
<!-- Permissions -->
<uses-permission android:name="android.permission.INTERNET" />
</manifest>

View File

@@ -0,0 +1,5 @@
package com.takerofnotes.app;
import com.getcapacitor.BridgeActivity;
public class MainActivity extends BridgeActivity {}

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

View File

@@ -0,0 +1,34 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="108dp"
android:height="108dp"
android:viewportHeight="108"
android:viewportWidth="108">
<path
android:fillType="evenOdd"
android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
android:strokeColor="#00000000"
android:strokeWidth="1">
<aapt:attr name="android:fillColor">
<gradient
android:endX="78.5885"
android:endY="90.9159"
android:startX="48.7653"
android:startY="61.0927"
android:type="linear">
<item
android:color="#44000000"
android:offset="0.0" />
<item
android:color="#00000000"
android:offset="1.0" />
</gradient>
</aapt:attr>
</path>
<path
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
android:strokeColor="#00000000"
android:strokeWidth="1" />
</vector>

View File

@@ -0,0 +1,170 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportHeight="108"
android:viewportWidth="108">
<path
android:fillColor="#26A69A"
android:pathData="M0,0h108v108h-108z" />
<path
android:fillColor="#00000000"
android:pathData="M9,0L9,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,0L19,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M29,0L29,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M39,0L39,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M49,0L49,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M59,0L59,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M69,0L69,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M79,0L79,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M89,0L89,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M99,0L99,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,9L108,9"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,19L108,19"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,29L108,29"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,39L108,39"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,49L108,49"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,59L108,59"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,69L108,69"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,79L108,79"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,89L108,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,99L108,99"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,29L89,29"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,39L89,39"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,49L89,49"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,59L89,59"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,69L89,69"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,79L89,79"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M29,19L29,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M39,19L39,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M49,19L49,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M59,19L59,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M69,19L69,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M79,19L79,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
</vector>

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".MainActivity">
<WebView
android:layout_width="match_parent"
android:layout_height="match_parent" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>

View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launcher_background">#FFFFFF</color>
</resources>

View File

@@ -0,0 +1,7 @@
<?xml version='1.0' encoding='utf-8'?>
<resources>
<string name="app_name">Taker of Notes</string>
<string name="title_activity_main">Taker of Notes</string>
<string name="package_name">com.takerofnotes.app</string>
<string name="custom_url_scheme">com.takerofnotes.app</string>
</resources>

View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
</style>
<style name="AppTheme.NoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<item name="android:background">@null</item>
</style>
<style name="AppTheme.NoActionBarLaunch" parent="Theme.SplashScreen">
<item name="android:background">@drawable/splash</item>
</style>
</resources>

View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<paths xmlns:android="http://schemas.android.com/apk/res/android">
<external-path name="my_images" path="." />
<cache-path name="my_cache_images" path="." />
</paths>

View File

@@ -0,0 +1,18 @@
package com.getcapacitor.myapp;
import static org.junit.Assert.*;
import org.junit.Test;
/**
* Example local unit test, which will execute on the development machine (host).
*
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
*/
public class ExampleUnitTest {
@Test
public void addition_isCorrect() throws Exception {
assertEquals(4, 2 + 2);
}
}

29
android/build.gradle Normal file
View File

@@ -0,0 +1,29 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
repositories {
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.13.0'
classpath 'com.google.gms:google-services:4.4.4'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
}
apply from: "variables.gradle"
allprojects {
repositories {
google()
mavenCentral()
}
}
task clean(type: Delete) {
delete rootProject.buildDir
}

View File

@@ -0,0 +1,6 @@
// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
include ':capacitor-android'
project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor')
include ':capacitor-preferences'
project(':capacitor-preferences').projectDir = new File('../node_modules/@capacitor/preferences/android')

22
android/gradle.properties Normal file
View File

@@ -0,0 +1,22 @@
# Project-wide Gradle settings.
# IDE (e.g. Android Studio) users:
# Gradle settings configured through the IDE *will override*
# any settings specified in this file.
# For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx1536m
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
# AndroidX package structure to make it clearer which packages are bundled with the
# Android operating system, and which are packaged with your app's APK
# https://developer.android.com/topic/libraries/support-library/androidx-rn
android.useAndroidX=true

Binary file not shown.

View File

@@ -0,0 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

251
android/gradlew vendored Executable file
View File

@@ -0,0 +1,251 @@
#!/bin/sh
#
# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#
##############################################################################
#
# Gradle start up script for POSIX generated by Gradle.
#
# Important for running:
#
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
# noncompliant, but you have some other compliant shell such as ksh or
# bash, then to run this script, type that shell name before the whole
# command line, like:
#
# ksh Gradle
#
# Busybox and similar reduced shells will NOT work, because this script
# requires all of these POSIX shell features:
# * functions;
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
# * compound commands having a testable exit status, especially «case»;
# * various built-in commands including «command», «set», and «ulimit».
#
# Important for patching:
#
# (2) This script targets any POSIX shell, so it avoids extensions provided
# by Bash, Ksh, etc; in particular arrays are avoided.
#
# The "traditional" practice of packing multiple parameters into a
# space-separated string is a well documented source of bugs and security
# problems, so this is (mostly) avoided, by progressively accumulating
# options in "$@", and eventually passing that to Java.
#
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
# see the in-line comments for details.
#
# There are tweaks for specific operating systems such as AIX, CygWin,
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
#
##############################################################################
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
app_path=$0
# Need this for daisy-chained symlinks.
while
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
[ -h "$app_path" ]
do
ls=$( ls -ld "$app_path" )
link=${ls#*' -> '}
case $link in #(
/*) app_path=$link ;; #(
*) app_path=$APP_HOME$link ;;
esac
done
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
warn () {
echo "$*"
} >&2
die () {
echo
echo "$*"
echo
exit 1
} >&2
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "$( uname )" in #(
CYGWIN* ) cygwin=true ;; #(
Darwin* ) darwin=true ;; #(
MSYS* | MINGW* ) msys=true ;; #(
NONSTOP* ) nonstop=true ;;
esac
CLASSPATH="\\\"\\\""
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD=$JAVA_HOME/jre/sh/java
else
JAVACMD=$JAVA_HOME/bin/java
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD=java
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi
# Increase the maximum file descriptors if we can.
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
fi
# Collect all arguments for the java command, stacking in reverse order:
# * args from the command line
# * the main class name
# * -classpath
# * -D...appname settings
# * --module-path (only if needed)
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
# For Cygwin or MSYS, switch paths to Windows format before running java
if "$cygwin" || "$msys" ; then
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
JAVACMD=$( cygpath --unix "$JAVACMD" )
# Now convert the arguments - kludge to limit ourselves to /bin/sh
for arg do
if
case $arg in #(
-*) false ;; # don't mess with options #(
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
[ -e "$t" ] ;; #(
*) false ;;
esac
then
arg=$( cygpath --path --ignore --mixed "$arg" )
fi
# Roll the args list around exactly as many times as the number of
# args, so each arg winds up back in the position where it started, but
# possibly modified.
#
# NB: a `for` loop captures its iteration list before it begins, so
# changing the positional parameters here affects neither the number of
# iterations, nor the values presented in `arg`.
shift # remove old arg
set -- "$@" "$arg" # push replacement arg
done
fi
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
"$@"
# Stop when "xargs" is not available.
if ! command -v xargs >/dev/null 2>&1
then
die "xargs is not available"
fi
# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
#
# In Bash we could simply go:
#
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
# set -- "${ARGS[@]}" "$@"
#
# but POSIX shell has neither arrays nor command substitution, so instead we
# post-process each arg (as a line of input to sed) to backslash-escape any
# character that might be a shell metacharacter, then use eval to reverse
# that process (while maintaining the separation between arguments), and wrap
# the whole thing up as a single "set" statement.
#
# This will of course break if any of these variables contains a newline or
# an unmatched quote.
#
eval "set -- $(
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
xargs -n1 |
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
tr '\n' ' '
)" '"$@"'
exec "$JAVACMD" "$@"

94
android/gradlew.bat vendored Normal file
View File

@@ -0,0 +1,94 @@
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2
goto fail
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2
goto fail
:execute
@rem Setup the command line
set CLASSPATH=
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
:end
@rem End local scope for the variables with windows NT shell
if %ERRORLEVEL% equ 0 goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%
:mainEnd
if "%OS%"=="Windows_NT" endlocal
:omega

5
android/settings.gradle Normal file
View File

@@ -0,0 +1,5 @@
include ':app'
include ':capacitor-cordova-android-plugins'
project(':capacitor-cordova-android-plugins').projectDir = new File('./capacitor-cordova-android-plugins/')
apply from: 'capacitor.settings.gradle'

16
android/variables.gradle Normal file
View File

@@ -0,0 +1,16 @@
ext {
minSdkVersion = 24
compileSdkVersion = 36
targetSdkVersion = 36
androidxActivityVersion = '1.11.0'
androidxAppCompatVersion = '1.7.1'
androidxCoordinatorLayoutVersion = '1.3.0'
androidxCoreVersion = '1.17.0'
androidxFragmentVersion = '1.8.9'
coreSplashScreenVersion = '1.2.0'
androidxWebkitVersion = '1.14.0'
junitVersion = '4.13.2'
androidxJunitVersion = '1.3.0'
androidxEspressoCoreVersion = '3.7.0'
cordovaAndroidVersion = '14.0.1'
}

View File

@@ -1,3 +0,0 @@
import crypto from 'crypto'
console.log(crypto.randomBytes(32).toString('hex'))

163
bin/uploadArtifacts.js Normal file
View File

@@ -0,0 +1,163 @@
import fs from 'fs'
import path from 'path'
import { execSync } from 'child_process'
import { S3Client, PutObjectCommand } from '@aws-sdk/client-s3'
import dotenv from 'dotenv'
dotenv.config({ quiet: true })
const DIST_DIR = path.resolve('dist')
const BUCKET = 'dist'
const client = new S3Client({
region: 'us-east-1',
endpoint: 'https://s3.takerofnotes.com',
forcePathStyle: true,
credentials: {
accessKeyId: process.env.AWS_ACCESS_KEY_ID,
secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
},
})
const getContentType = (file) => {
if (file.endsWith('.yml')) return 'text/yaml'
if (file.endsWith('.json')) return 'application/json'
if (file.endsWith('.AppImage')) return 'application/octet-stream'
if (file.endsWith('.deb')) return 'application/vnd.debian.binary-package'
if (file.endsWith('.exe'))
return 'application/vnd.microsoft.portable-executable'
if (file.endsWith('.dmg')) return 'application/x-apple-diskimage'
return 'application/octet-stream'
}
const getCurrentTag = () => {
try {
const tag = execSync('git describe --tags --exact-match 2>/dev/null', {
encoding: 'utf8',
stdio: ['pipe', 'pipe', 'pipe'],
}).trim()
return tag
} catch {
return null
}
}
const isGitTagDirty = () => {
try {
const status = execSync('git status --porcelain', {
encoding: 'utf8',
stdio: ['pipe', 'pipe', 'pipe'],
}).trim()
return status.length > 0
} catch {
return true
}
}
const uploadFile = async (filePath, platform, version) => {
const fileStream = fs.createReadStream(filePath)
const fileName = path.basename(filePath)
const key = `${platform}/${version}/${fileName}`
console.log(`Uploading ${fileName}${key}`)
await client.send(
new PutObjectCommand({
Bucket: BUCKET,
Key: key,
Body: fileStream,
ContentType: getContentType(fileName),
}),
)
}
const uploadFileToRoot = async (filePath) => {
const fileStream = fs.createReadStream(filePath)
const fileName = path.basename(filePath)
const key = `${fileName}`
console.log(`Uploading ${fileName}${key} (latest)`)
await client.send(
new PutObjectCommand({
Bucket: BUCKET,
Key: key,
Body: fileStream,
ContentType: getContentType(fileName),
}),
)
}
const main = async () => {
const platform = process.argv[2]
const version = process.argv[3]
if (!platform || !version) {
console.error('Usage: node uploadArtifacts.js <platform> <version>')
console.error('Example: node uploadArtifacts.js win 1.0.0')
process.exit(1)
}
// const currentTag = getCurrentTag()
// if (!currentTag) {
// console.log(
// 'No git tag found. Skipping upload (artifacts are only uploaded on tagged commits).',
// )
// return
// }
// if (currentTag !== version && !currentTag.startsWith(version)) {
// console.log(
// `Git tag (${currentTag}) does not match version (${version}). Skipping upload.`,
// )
// return
// }
// if (isGitTagDirty()) {
// console.log('Git working directory is dirty. Skipping upload.')
// return
// }
console.log(
`Uploading artifacts for ${platform} v${version} (tag: ${currentTag})`,
)
if (!fs.existsSync(DIST_DIR)) {
throw new Error('dist directory not found. Run build first.')
}
const files = fs.readdirSync(DIST_DIR)
const uploadTargets = files.filter((file) => {
return (
file.endsWith('.yml') ||
file.endsWith('.AppImage') ||
file.endsWith('.deb') ||
file.endsWith('.exe') ||
file.endsWith('.dmg')
)
})
if (uploadTargets.length === 0) {
console.log('No artifacts found to upload.')
return
}
for (const file of uploadTargets) {
const fullPath = path.join(DIST_DIR, file)
// Keep latest.yml up to date for platform
if (file.startsWith('latest') && file.endsWith('.yml')) {
await uploadFileToRoot(fullPath)
} else {
await uploadFile(fullPath, platform, version)
}
}
console.log('Upload complete.')
}
main().catch((err) => {
console.error(err)
process.exit(1)
})

5
capacitor.config.json Normal file
View File

@@ -0,0 +1,5 @@
{
"appId": "com.takerofnotes.app",
"appName": "Taker of Notes",
"webDir": "dist/renderer"
}

View File

@@ -1,3 +0,0 @@
provider: generic
url: https://example.com/auto-updates
updaterCacheDirName: app.takerofnotes.com-updater

View File

@@ -12,12 +12,16 @@ asarUnpack:
- resources/** - resources/**
win: win:
executableName: app.takerofnotes.com executableName: app.takerofnotes.com
cscLink: C:\Users\nicwands\Desktop\takerofnotes.pfx
cscKeyPassword: password
nsis: nsis:
artifactName: ${name}-${version}-setup.${ext} artifactName: ${name}-${version}-setup.${ext}
shortcutName: ${productName} shortcutName: ${productName}
uninstallDisplayName: ${productName} uninstallDisplayName: ${productName}
createDesktopShortcut: always createDesktopShortcut: always
mac: mac:
identity: '-'
hardenedRuntime: false
entitlementsInherit: build/entitlements.mac.plist entitlementsInherit: build/entitlements.mac.plist
extendInfo: extendInfo:
- NSCameraUsageDescription: Application requests access to the device's camera. - NSCameraUsageDescription: Application requests access to the device's camera.
@@ -30,7 +34,6 @@ dmg:
linux: linux:
target: target:
- AppImage - AppImage
- snap
- deb - deb
maintainer: electronjs.org maintainer: electronjs.org
category: Utility category: Utility
@@ -39,4 +42,4 @@ appImage:
npmRebuild: false npmRebuild: false
publish: publish:
provider: generic provider: generic
url: https://example.com/auto-updates url: https://s3.takerofnotes.com/dist

View File

@@ -1,498 +0,0 @@
import "dotenv/config";
import { electronApp, optimizer, is } from "@electron-toolkit/utils";
import { app, ipcMain, BrowserWindow, shell } from "electron";
import filesystemPlugin from "@takerofnotes/plugin-filesystem";
import supabasePlugin from "@takerofnotes/plugin-supabase";
import sodium from "libsodium-wrappers";
import { v4 } from "uuid";
import { Index } from "flexsearch";
import { join } from "path";
import __cjs_mod__ from "node:module";
const __filename = import.meta.filename;
const __dirname = import.meta.dirname;
const require2 = __cjs_mod__.createRequire(import.meta.url);
const createPluginManager = (registry) => {
let activePluginId = null;
let adapter = null;
return {
listPlugins() {
return registry.list();
},
getPlugin(pluginId) {
return registry.get(pluginId);
},
getAdapter(pluginId, adapterConfig = {}) {
const plugin = registry.get(pluginId);
if (!plugin) {
throw new Error(`Plugin not found: ${pluginId}`);
}
return plugin.createAdapter(adapterConfig);
},
setActivePlugin(pluginId, adapterConfig = {}) {
activePluginId = pluginId;
adapter = this.getAdapter(pluginId, adapterConfig);
return adapter;
},
async testPlugin(pluginId, adapterConfig = {}) {
const plugin = registry.get(pluginId);
if (!plugin) {
throw new Error(`Plugin not found: ${pluginId}`);
}
const adapter2 = this.getAdapter(pluginId, adapterConfig);
await adapter2.init();
return await adapter2.testConnection();
},
getActiveAdapter() {
return adapter;
},
getActivePluginId() {
return activePluginId;
}
};
};
class PluginRegistry {
constructor() {
this.plugins = /* @__PURE__ */ new Map();
}
register(plugin) {
if (!plugin.id) {
throw new Error("Plugin must have an id");
}
this.plugins.set(plugin.id, plugin);
}
get(id) {
return this.plugins.get(id);
}
list() {
return Array.from(this.plugins.values()).map((plugin) => ({
id: plugin.id,
name: plugin.name,
description: plugin.description,
configSchema: plugin.configSchema
}));
}
}
const getDefaultConfig = () => {
return {
activeAdapter: "browser",
theme: "dark"
};
};
const createConfigManager = (storage) => {
let config = null;
return {
async loadConfig() {
if (config) return config;
const stored = await storage.load();
config = stored || getDefaultConfig();
if (!stored) {
await storage.save(config);
}
return config;
},
getConfig() {
return config;
},
async setConfig(newConfig) {
config = newConfig;
await storage.save(newConfig);
},
async refreshConfig() {
config = await storage.load();
}
};
};
class NotesAPI {
constructor(adapter, encryptionKey = null) {
if (!adapter) {
throw new Error("NotesAPI requires a storage adapter");
}
this.adapter = adapter;
this.notesCache = /* @__PURE__ */ new Map();
this.encryptionKey = encryptionKey;
this._sodiumReady = false;
this.index = new Index({
tokenize: "forward"
});
}
async _initSodium() {
if (!this._sodiumReady) {
await sodium.ready;
this._sodiumReady = true;
}
}
_hexToUint8Array(hex) {
const bytes = new Uint8Array(hex.length / 2);
for (let i = 0; i < bytes.length; i++) {
bytes[i] = parseInt(hex.substr(i * 2, 2), 16);
}
return bytes;
}
_concatUint8Arrays(a, b) {
const result = new Uint8Array(a.length + b.length);
result.set(a, 0);
result.set(b, a.length);
return result;
}
_uint8ArrayToBase64(bytes) {
let binary = "";
for (let i = 0; i < bytes.length; i++) {
binary += String.fromCharCode(bytes[i]);
}
return btoa(binary);
}
_base64ToUint8Array(base64) {
const binary = atob(base64);
const bytes = new Uint8Array(binary.length);
for (let i = 0; i < binary.length; i++) {
bytes[i] = binary.charCodeAt(i);
}
return bytes;
}
_encrypt(note) {
if (!this.encryptionKey) {
throw new Error("Encryption key not set");
}
const key = this._hexToUint8Array(this.encryptionKey);
if (key.length !== 32) {
throw new Error(
"Encryption key must be 64 hex characters (32 bytes)"
);
}
const nonce = sodium.randombytes_buf(sodium.crypto_secretbox_NONCEBYTES);
const message = JSON.stringify(note);
const ciphertext = sodium.crypto_secretbox_easy(
new TextEncoder().encode(message),
nonce,
key
);
const combined = this._concatUint8Arrays(nonce, ciphertext);
return this._uint8ArrayToBase64(combined);
}
_decrypt(encryptedData) {
if (!this.encryptionKey) {
throw new Error("Encryption key not set");
}
const key = this._hexToUint8Array(this.encryptionKey);
if (key.length !== 32) {
throw new Error(
"Encryption key must be 64 hex characters (32 bytes)"
);
}
let combined;
try {
combined = this._base64ToUint8Array(encryptedData);
} catch (e) {
throw new Error("Invalid encrypted data: not valid base64");
}
if (combined.length < sodium.crypto_secretbox_NONCEBYTES + sodium.crypto_secretbox_MACBYTES) {
throw new Error("Invalid encrypted data: too short");
}
const nonce = combined.slice(0, sodium.crypto_secretbox_NONCEBYTES);
const ciphertext = combined.slice(sodium.crypto_secretbox_NONCEBYTES);
let decrypted;
try {
decrypted = sodium.crypto_secretbox_open_easy(
ciphertext,
nonce,
key
);
} catch (e) {
throw new Error("Decryption failed: wrong key or corrupted data");
}
if (!decrypted) {
throw new Error("Decryption failed: no data returned");
}
const decryptedStr = new TextDecoder().decode(decrypted);
try {
return JSON.parse(decryptedStr);
} catch (e) {
throw new Error(
`Decryption succeeded but invalid JSON: ${decryptedStr}`
);
}
}
async init() {
await this._initSodium();
await this.adapter.init();
this.notesCache.clear();
const encryptedNotes = await this.adapter.getAll();
for (const encryptedNote of encryptedNotes) {
try {
const note = this._decrypt(encryptedNote.data || encryptedNote);
this.notesCache.set(note.id, note);
const searchText = note.plainText || this._extractPlainText(note.content);
this.index.add(note.id, note.title + "\n" + searchText);
} catch (error) {
console.error("Failed to decrypt note:", error);
}
}
}
_extractPlainText(content) {
if (!content) return "";
if (typeof content === "string") return content;
const extractText = (node) => {
if (typeof node === "string") return node;
if (!node || !node.content) return "";
return node.content.map(extractText).join(" ");
};
return extractText(content);
}
getCategories() {
const categories = /* @__PURE__ */ new Set();
for (const note of this.notesCache.values()) {
if (note.category) {
categories.add(note.category);
}
}
return Array.from(categories).sort();
}
getCategoryNotes(categoryName = null) {
return Array.from(this.notesCache.values()).filter((n) => n.category === categoryName).sort((a, b) => new Date(b.updatedAt) - new Date(a.updatedAt)).map((n) => ({ ...n }));
}
getNote(id) {
const note = this.notesCache.get(id);
return note ? { ...note } : null;
}
async createNote(metadata = {}, content = "", plainText = "") {
const id = v4();
const now = (/* @__PURE__ */ new Date()).toISOString();
const note = {
id,
title: metadata.title || "Untitled",
category: metadata.category || null,
createdAt: now,
updatedAt: now,
content,
plainText
};
const encryptedNote = {
id: note.id,
data: this._encrypt(note)
};
this.notesCache.set(id, note);
this.index.add(id, note.title + "\n" + plainText);
await this.adapter.create(encryptedNote);
return note;
}
async deleteNote(id) {
await this.adapter.delete(id);
this.notesCache.delete(id);
this.index.remove(id);
}
async updateNote(id, updates = {}) {
const note = this.notesCache.get(id);
if (!note) throw new Error("Note not found");
const allowedFields = ["title", "category", "content", "plainText"];
for (const key of Object.keys(updates)) {
if (!allowedFields.includes(key)) {
throw new Error(`Invalid update field: ${key}`);
}
}
const updatedNote = {
...note,
...updates,
updatedAt: (/* @__PURE__ */ new Date()).toISOString()
};
const encryptedNote = {
id: updatedNote.id,
data: this._encrypt(updatedNote)
};
this.notesCache.set(id, updatedNote);
const searchText = updatedNote.plainText || this._extractPlainText(updatedNote.content);
this.index.update(id, updatedNote.title + "\n" + searchText);
await this.adapter.update(encryptedNote);
return updatedNote;
}
search(query) {
const ids = this.index.search(query, {
limit: 50,
suggest: true
});
return ids.map((id) => this.notesCache.get(id));
}
}
const generateEncryptionKey = () => {
const array = new Uint8Array(32);
crypto.getRandomValues(array);
return Array.from(array).map((b) => b.toString(16).padStart(2, "0")).join("");
};
const initPluginManager = (runtime, plugins, config) => {
const registry = new PluginRegistry();
for (const plugin of plugins) {
registry.register(plugin);
}
const manager = createPluginManager(registry);
manager.setActivePlugin(
config.activeAdapter,
config.adapters[config.activeAdapter]
);
return manager;
};
const initConfigManager = async (runtime) => {
let storage;
{
const { createNodeStorage } = await import("./NodeStorage-B8VFtrTS.js");
const filesystemPlugin2 = (await import("@takerofnotes/plugin-filesystem")).default;
storage = createNodeStorage(filesystemPlugin2);
}
return createConfigManager(storage);
};
const initializeCore = async (runtime, { plugins }) => {
const configManager = await initConfigManager();
const config = await configManager.loadConfig();
const pluginManager = initPluginManager(runtime, plugins, config);
let notesAPI = null;
let initPromise = null;
const getNotesAPI = async () => {
if (notesAPI) return notesAPI;
if (!initPromise) {
initPromise = (async () => {
const config2 = await configManager.loadConfig();
let encryptionKey = config2?.encryptionKey;
if (!encryptionKey) {
encryptionKey = generateEncryptionKey();
await configManager.setConfig({
...config2,
encryptionKey
});
}
const pluginId = config2?.activeAdapter || "filesystem";
const adapterConfig = config2?.adapters?.[pluginId] || {};
const adapter = pluginManager.getAdapter(
pluginId,
adapterConfig
);
notesAPI = new NotesAPI(adapter, encryptionKey);
await notesAPI.init();
return notesAPI;
})();
}
return initPromise;
};
return {
runtime,
pluginManager,
configManager,
getNotesAPI
};
};
const DEFAULT_WINDOW_SIZE = { width: 354, height: 549 };
const DEFAULT_MOVE_WINDOW_SIZE = { width: 708, height: 549 };
const preloadPath = join(__dirname, "../preload/index.mjs");
const rendererPath = join(__dirname, "../renderer/index.html");
function createWindow() {
const mainWindow = new BrowserWindow({
width: DEFAULT_WINDOW_SIZE.width,
height: DEFAULT_WINDOW_SIZE.height,
show: false,
autoHideMenuBar: true,
webPreferences: {
preload: preloadPath,
sandbox: false
}
});
mainWindow.on("ready-to-show", () => {
mainWindow.show();
});
mainWindow.webContents.setWindowOpenHandler((details) => {
shell.openExternal(details.url);
return { action: "deny" };
});
if (is.dev && process.env["ELECTRON_RENDERER_URL"]) {
mainWindow.loadURL(process.env["ELECTRON_RENDERER_URL"]);
} else {
mainWindow.loadFile(rendererPath);
}
}
function createNoteWindow(noteId) {
const noteWindow = new BrowserWindow({
width: DEFAULT_WINDOW_SIZE.width,
height: DEFAULT_WINDOW_SIZE.height,
autoHideMenuBar: true,
webPreferences: {
preload: preloadPath,
contextIsolation: true,
nodeIntegration: false,
sandbox: false
}
});
if (is.dev && process.env["ELECTRON_RENDERER_URL"]) {
noteWindow.loadURL(
`${process.env["ELECTRON_RENDERER_URL"]}/#/note/${noteId}`
);
} else {
noteWindow.loadFile(rendererPath, {
hash: `/note/${noteId}`
});
}
}
app.whenReady().then(async () => {
ipcMain.on("open-note-window", (_, noteId) => {
createNoteWindow(noteId);
});
const broadcastNoteChange = (event, data) => {
BrowserWindow.getAllWindows().forEach((win) => {
win.webContents.send(event, data);
});
};
const { pluginManager, configManager } = await initializeCore(
"electron-main",
{
plugins: [filesystemPlugin, supabasePlugin]
}
);
ipcMain.handle("pluginManager:call", async (_, method, ...args) => {
const methodCall = await pluginManager[method](...args);
if (method === "setActivePlugin") {
broadcastNoteChange("plugin-changed");
}
return methodCall;
});
ipcMain.handle("configManager:call", async (_, method, ...args) => {
return await configManager[method](...args);
});
ipcMain.handle("adapter:call", async (_, method, ...args) => {
const adapter = pluginManager.getActiveAdapter();
if (!adapter[method]) {
throw new Error(`Invalid adapter method: ${method}`);
}
return await adapter[method](...args);
});
ipcMain.on("note-changed", (_, event, data) => {
broadcastNoteChange(event, data);
});
ipcMain.handle("move-opened", (_) => {
const activeWindow = BrowserWindow.getFocusedWindow();
const windowSize = activeWindow.getSize();
if (windowSize[0] < DEFAULT_MOVE_WINDOW_SIZE.width) {
activeWindow.setSize(
DEFAULT_MOVE_WINDOW_SIZE.width,
DEFAULT_MOVE_WINDOW_SIZE.height
);
}
});
ipcMain.handle("move-closed", (_) => {
const activeWindow = BrowserWindow.getFocusedWindow();
const windowSize = activeWindow.getSize();
if (windowSize[0] === 708) {
activeWindow.setSize(
DEFAULT_WINDOW_SIZE.width,
DEFAULT_WINDOW_SIZE.height
);
}
});
electronApp.setAppUserModelId("com.electron");
app.on("browser-window-created", (_, window) => {
optimizer.watchWindowShortcuts(window);
});
createWindow();
app.on("activate", function() {
if (BrowserWindow.getAllWindows().length === 0) createWindow();
});
});
app.on("window-all-closed", () => {
if (process.platform !== "darwin") {
app.quit();
}
});

View File

@@ -1,51 +0,0 @@
import { contextBridge, ipcRenderer } from "electron";
const api = {
pluginManagerCall: (method, ...args) => ipcRenderer.invoke(
"pluginManager:call",
method,
...args.length ? args : []
),
configManagerCall: (method, ...args) => ipcRenderer.invoke(
"configManager:call",
method,
...args.length ? args : []
),
adapterCall: (method, ...args) => ipcRenderer.invoke(
"adapter:call",
method,
...args.length ? args : []
),
openNoteWindow: (noteId) => {
ipcRenderer.send("open-note-window", noteId);
},
onNoteCreated: (callback) => {
ipcRenderer.on("note-created", (_, data) => callback(data));
},
onNoteUpdated: (callback) => {
ipcRenderer.on("note-updated", (_, data) => callback(data));
},
onNoteDeleted: (callback) => {
ipcRenderer.on("note-deleted", (_, data) => callback(data));
},
onPluginChanged: (callback) => {
ipcRenderer.on("plugin-changed", (_, data) => callback(data));
},
notifyNoteChanged: (event, data) => {
ipcRenderer.send("note-changed", event, data);
},
moveOpened: () => {
ipcRenderer.invoke("move-opened");
},
moveClosed: () => {
ipcRenderer.invoke("move-closed");
}
};
if (process.contextIsolated) {
try {
contextBridge.exposeInMainWorld("api", api);
} catch (error) {
console.error(error);
}
} else {
window.api = api;
}

2452
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,6 @@
{ {
"name": "takerofnotes-app", "name": "takerofnotes-app",
"version": "0.1.0", "version": "0.3.0",
"description": "An Electron application with Vue", "description": "An Electron application with Vue",
"main": "./out/main/index.js", "main": "./out/main/index.js",
"author": "example.com", "author": "example.com",
@@ -19,17 +19,25 @@
"build": "electron-vite build", "build": "electron-vite build",
"build:web": "vite build", "build:web": "vite build",
"postinstall": "electron-builder install-app-deps", "postinstall": "electron-builder install-app-deps",
"build:unpack": "npm run build && electron-builder --dir",
"build:win": "npm run build && electron-builder --win", "build:win": "npm run build && electron-builder --win",
"build:mac": "npm run build && electron-builder --mac", "build:mac": "npm run build && electron-builder --mac",
"build:linux": "npm run build && electron-builder --linux" "build:linux": "npm run build && electron-builder --linux",
"release:win": "node bin/uploadArtifacts.js win $npm_package_version",
"release:mac": "node bin/uploadArtifacts.js mac $npm_package_version",
"release:linux": "node bin/uploadArtifacts.js linux $npm_package_version"
}, },
"dependencies": { "dependencies": {
"@capacitor/android": "^8.3.0",
"@capacitor/core": "^8.3.0",
"@capacitor/ios": "^8.3.0",
"@capacitor/preferences": "^8.0.1",
"@electron-toolkit/preload": "^3.0.2", "@electron-toolkit/preload": "^3.0.2",
"@electron-toolkit/utils": "^4.0.0", "@electron-toolkit/utils": "^4.0.0",
"@fuzzco/font-loader": "^1.0.2", "@fuzzco/font-loader": "^1.0.2",
"@takerofnotes/plugin-browser": "^0.2.0", "@takerofnotes/plugin-browser": "^0.2.0",
"@takerofnotes/plugin-filesystem": "^0.3.0", "@takerofnotes/plugin-filesystem": "^0.3.0",
"@takerofnotes/plugin-postgre-sql": "^0.1.0",
"@takerofnotes/plugin-s3": "^0.2.0",
"@takerofnotes/plugin-supabase": "^0.2.0", "@takerofnotes/plugin-supabase": "^0.2.0",
"@tiptap/extension-code-block-lowlight": "^3.20.0", "@tiptap/extension-code-block-lowlight": "^3.20.0",
"@tiptap/extension-document": "^3.19.0", "@tiptap/extension-document": "^3.19.0",
@@ -39,6 +47,7 @@
"@tiptap/starter-kit": "^3.19.0", "@tiptap/starter-kit": "^3.19.0",
"@tiptap/vue-3": "^3.19.0", "@tiptap/vue-3": "^3.19.0",
"@vueuse/core": "^14.2.1", "@vueuse/core": "^14.2.1",
"ajv": "^6.14.0",
"archiver": "^7.0.1", "archiver": "^7.0.1",
"dotenv": "^17.3.1", "dotenv": "^17.3.1",
"electron-updater": "^6.3.9", "electron-updater": "^6.3.9",
@@ -57,6 +66,8 @@
"vue-router": "^5.0.3" "vue-router": "^5.0.3"
}, },
"devDependencies": { "devDependencies": {
"@aws-sdk/client-s3": "^3.1025.0",
"@capacitor/cli": "^8.3.0",
"@vitejs/plugin-vue": "^6.0.2", "@vitejs/plugin-vue": "^6.0.2",
"electron": "^39.2.6", "electron": "^39.2.6",
"electron-builder": "^26.0.12", "electron-builder": "^26.0.12",

62
release-mac.command Executable file
View File

@@ -0,0 +1,62 @@
#!/bin/bash
# Taker of Notes — macOS Release Script
# Double-click this file in Finder to run it.
set -e
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
cd "$SCRIPT_DIR"
echo "============================================"
echo " Taker of Notes — macOS Release"
echo "============================================"
echo ""
# ── 1. Git pull ──
echo "[1/3] Pulling latest code from git..."
echo ""
if git pull; then
echo ""
echo " ✅ Git pull successful."
else
echo ""
echo " ❌ Git pull failed. Check your network or git status."
echo " (If you have uncommitted changes, commit or stash them first.)"
exit 1
fi
echo ""
# ── 2. Build for macOS ──
echo "[2/3] Building the application for macOS..."
echo " This will compile the app and create a .dmg/.zip."
echo ""
if npm run build:mac; then
echo ""
echo " ✅ Build successful."
else
echo ""
echo " ❌ Build failed. Check the error messages above."
exit 1
fi
echo ""
# ── 3. Release (upload artifacts) ──
echo "[3/3] Uploading release artifacts..."
echo ""
if npm run release:mac; then
echo ""
echo " ✅ Release uploaded successfully."
else
echo ""
echo " ❌ Release upload failed. Check the error messages above."
exit 1
fi
echo ""
echo "============================================"
echo " 🎉 macOS release complete!"
echo "============================================"
echo ""
echo "Press Enter to close this window."
read -r

View File

@@ -0,0 +1,20 @@
import { Preferences } from '@capacitor/preferences'
const CONFIG_KEY = 'app_config'
export function createCapacitorStorage() {
return {
async load() {
const { value } = await Preferences.get({ key: CONFIG_KEY })
return value ? JSON.parse(value) : null
},
async save(data) {
await Preferences.set({
key: CONFIG_KEY,
value: JSON.stringify(data),
})
},
}
}
export default createCapacitorStorage

View File

@@ -1,11 +1,75 @@
import Ajv from 'ajv'
const ajv = new Ajv({ allErrors: true, strict: false })
const getDefaultConfig = () => { const getDefaultConfig = () => {
return { return {
activeAdapter: 'browser', activeAdapter: 'browser',
theme: 'dark', theme: 'dark',
enableBlackletter: 'true',
openNotesInNewWindow: 'true',
} }
} }
export const createConfigManager = (storage) => { const CONFIG_SCHEMA = {
type: 'object',
properties: {
activeAdapter: { type: 'string' },
theme: { type: 'string', enum: ['dark', 'light'] },
encryptionKey: { type: 'string' },
adapters: { type: 'object' },
},
required: ['activeAdapter'],
additionalProperties: true,
}
const validateConfig = ajv.compile(CONFIG_SCHEMA)
const convertSchemaToJson = (schemaArray) => {
const properties = {}
const required = []
for (const field of schemaArray) {
properties[field.key] = { type: 'string' }
if (field.required) {
required.push(field.key)
}
}
return {
type: 'object',
properties,
required,
additionalProperties: false,
}
}
const validateAdapterConfigs = (adapters, pluginManager) => {
if (!adapters || !pluginManager) return { valid: true, errors: [] }
const errors = []
for (const [adapterId, adapterConfig] of Object.entries(adapters)) {
const plugin = pluginManager.getPlugin(adapterId)
if (!plugin?.configSchema) continue
const schema = convertSchemaToJson(plugin.configSchema)
const validate = ajv.compile(schema)
const valid = validate(adapterConfig)
if (!valid) {
const adapterErrors = validate.errors.map(
(e) => `${adapterId}${e.instancePath}: ${e.message}`,
)
errors.push(...adapterErrors)
}
}
return { valid: errors.length === 0, errors }
}
export const createConfigManager = (storage, pluginManager) => {
let config = null let config = null
return { return {
@@ -27,6 +91,24 @@ export const createConfigManager = (storage) => {
}, },
async setConfig(newConfig) { async setConfig(newConfig) {
const valid = validateConfig(newConfig)
if (!valid) {
const errors = validateConfig.errors
.map((e) => `${e.instancePath || 'root'}: ${e.message}`)
.join('; ')
throw new Error(`Config validation failed: ${errors}`)
}
const adapterValidation = validateAdapterConfigs(
newConfig.adapters,
pluginManager,
)
if (!adapterValidation.valid) {
throw new Error(
`Adapter config validation failed: ${adapterValidation.errors.join('; ')}`,
)
}
config = newConfig config = newConfig
await storage.save(newConfig) await storage.save(newConfig)
}, },

View File

@@ -1,7 +1,5 @@
export default class IpcAdapter { export default class IpcAdapter {
constructor() { constructor() {}
this._methods = ['init', 'getAll', 'create', 'update', 'delete']
}
async init() { async init() {
return await window.api.adapterCall('init') return await window.api.adapterCall('init')

View File

@@ -10,8 +10,10 @@ export default class NotesAPI {
this.adapter = adapter this.adapter = adapter
this.notesCache = new Map() this.notesCache = new Map()
this.categories = new Set()
this.encryptionKey = encryptionKey this.encryptionKey = encryptionKey
this._sodiumReady = false this._sodiumReady = false
this._decryptionFailures = []
this.index = new Index({ this.index = new Index({
tokenize: 'forward', tokenize: 'forward',
@@ -26,11 +28,9 @@ export default class NotesAPI {
} }
_hexToUint8Array(hex) { _hexToUint8Array(hex) {
const bytes = new Uint8Array(hex.length / 2) return Uint8Array.from(hex.match(/.{1,2}/g), (byte) =>
for (let i = 0; i < bytes.length; i++) { parseInt(byte, 16),
bytes[i] = parseInt(hex.substr(i * 2, 2), 16) )
}
return bytes
} }
_concatUint8Arrays(a, b) { _concatUint8Arrays(a, b) {
@@ -41,20 +41,12 @@ export default class NotesAPI {
} }
_uint8ArrayToBase64(bytes) { _uint8ArrayToBase64(bytes) {
let binary = '' return btoa(String.fromCharCode(...bytes))
for (let i = 0; i < bytes.length; i++) {
binary += String.fromCharCode(bytes[i])
}
return btoa(binary)
} }
_base64ToUint8Array(base64) { _base64ToUint8Array(base64) {
const binary = atob(base64) const binary = atob(base64)
const bytes = new Uint8Array(binary.length) return Uint8Array.from(binary, (c) => c.charCodeAt(0))
for (let i = 0; i < binary.length; i++) {
bytes[i] = binary.charCodeAt(i)
}
return bytes
} }
_encrypt(note) { _encrypt(note) {
@@ -142,23 +134,34 @@ export default class NotesAPI {
await this._initSodium() await this._initSodium()
await this.adapter.init() await this.adapter.init()
this.notesCache.clear() this.notesCache.clear()
this.categories.clear()
this._decryptionFailures = []
const encryptedNotes = await this.adapter.getAll() const encryptedNotes = await this.adapter.getAll()
for (const encryptedNote of encryptedNotes) { for (const encryptedNote of encryptedNotes) {
const noteId = encryptedNote.id || 'unknown'
try { try {
const note = this._decrypt(encryptedNote.data || encryptedNote) const note = this._decrypt(encryptedNote.data || encryptedNote)
this.notesCache.set(note.id, note) this.notesCache.set(note.id, note)
if (note.category) {
this.categories.add(note.category)
}
const searchText = const searchText =
note.plainText || this._extractPlainText(note.content) note.plainText || this._extractPlainText(note.content)
this.index.add(note.id, note.title + '\n' + searchText) this.index.add(note.id, note.title + '\n' + searchText)
} catch (error) { } catch (error) {
console.error('Failed to decrypt note:', error) console.error('Failed to decrypt note:', error)
this._decryptionFailures.push(noteId)
} }
} }
} }
getDecryptionFailures() {
return [...this._decryptionFailures]
}
_extractPlainText(content) { _extractPlainText(content) {
if (!content) return '' if (!content) return ''
if (typeof content === 'string') return content if (typeof content === 'string') return content
@@ -173,15 +176,7 @@ export default class NotesAPI {
} }
getCategories() { getCategories() {
const categories = new Set() return Array.from(this.categories).sort()
for (const note of this.notesCache.values()) {
if (note.category) {
categories.add(note.category)
}
}
return Array.from(categories).sort()
} }
getCategoryNotes(categoryName = null) { getCategoryNotes(categoryName = null) {
@@ -193,6 +188,7 @@ export default class NotesAPI {
getNote(id) { getNote(id) {
const note = this.notesCache.get(id) const note = this.notesCache.get(id)
return note ? { ...note } : null return note ? { ...note } : null
} }
@@ -216,6 +212,9 @@ export default class NotesAPI {
} }
this.notesCache.set(id, note) this.notesCache.set(id, note)
if (note.category) {
this.categories.add(note.category)
}
this.index.add(id, note.title + '\n' + plainText) this.index.add(id, note.title + '\n' + plainText)
await this.adapter.create(encryptedNote) await this.adapter.create(encryptedNote)
@@ -224,10 +223,30 @@ export default class NotesAPI {
} }
async deleteNote(id) { async deleteNote(id) {
const note = this.notesCache.get(id)
const category = note?.category
await this.adapter.delete(id) await this.adapter.delete(id)
this.notesCache.delete(id) this.notesCache.delete(id)
this.index.remove(id) this.index.remove(id)
// Delete category if needed
if (category) {
const notesWithCategory = Array.from(
this.notesCache.values(),
).filter((n) => n.category === category)
if (notesWithCategory.length === 0) {
this.categories.delete(category)
}
}
// Update decryption failures
if (this._decryptionFailures.includes(id)) {
this._decryptionFailures = this._decryptionFailures.filter(
(id) => id !== id,
)
}
} }
async updateNote(id, updates = {}) { async updateNote(id, updates = {}) {
@@ -242,6 +261,8 @@ export default class NotesAPI {
} }
} }
const oldCategory = note.category
const updatedNote = { const updatedNote = {
...note, ...note,
...updates, ...updates,
@@ -255,6 +276,20 @@ export default class NotesAPI {
this.notesCache.set(id, updatedNote) this.notesCache.set(id, updatedNote)
if (updates.category !== undefined) {
if (oldCategory) {
const notesWithOldCategory = Array.from(
this.notesCache.values(),
).filter((n) => n.category === oldCategory && n.id !== id)
if (notesWithOldCategory.length === 0) {
this.categories.delete(oldCategory)
}
}
if (updatedNote.category) {
this.categories.add(updatedNote.category)
}
}
const searchText = const searchText =
updatedNote.plainText || this._extractPlainText(updatedNote.content) updatedNote.plainText || this._extractPlainText(updatedNote.content)

View File

@@ -72,7 +72,12 @@ export const createPluginManagerClient = () => {
}, },
async testPlugin(id, config) { async testPlugin(id, config) {
return window.api.pluginManagerCall('testPlugin', { id, config }) const test = await window.api.pluginManagerCall(
'testPlugin',
id,
config,
)
return test
}, },
} }
} }

View File

@@ -18,7 +18,7 @@ const generateEncryptionKey = () => {
.join('') .join('')
} }
const initPluginManager = (runtime, plugins, config) => { const initPluginManager = (runtime, plugins) => {
if (runtime === 'electron-renderer') return createPluginManagerClient() if (runtime === 'electron-renderer') return createPluginManagerClient()
const registry = new PluginRegistry() const registry = new PluginRegistry()
@@ -27,14 +27,10 @@ const initPluginManager = (runtime, plugins, config) => {
registry.register(plugin) registry.register(plugin)
} }
const manager = createPluginManager(registry) return createPluginManager(registry)
const activeConfig = config.adapters?.[config.activeAdapter] || {}
manager.setActivePlugin(config.activeAdapter, activeConfig)
return manager
} }
const initConfigManager = async (runtime) => { const initConfigManager = async (runtime, pluginManager) => {
if (runtime === 'electron-renderer') return createConfigManagerClient() if (runtime === 'electron-renderer') return createConfigManagerClient()
let storage let storage
@@ -46,52 +42,58 @@ const initConfigManager = async (runtime) => {
storage = createNodeStorage(filesystemPlugin) storage = createNodeStorage(filesystemPlugin)
} else if (runtime === 'web') { } else if (runtime === 'web') {
storage = createWebStorage() storage = createWebStorage()
} else if (runtime === 'capacitor') {
const { createCapacitorStorage } = await import('./CapacitorStorage.js')
storage = createCapacitorStorage()
} }
return createConfigManager(storage) return createConfigManager(storage, pluginManager)
} }
export const initializeCore = async (runtime, { plugins }) => {
const configManager = await initConfigManager(runtime)
const config = await configManager.loadConfig()
const pluginManager = initPluginManager(runtime, plugins, config)
// -------------------------
// NotesAPI bootstrap
// -------------------------
let notesAPI = null let notesAPI = null
let initPromise = null let initPromise = null
const initNotesAPI = async (configManager, pluginManager) => {
// Get fresh config to ensure adapters are populated from main process
const latestConfig = await configManager.loadConfig()
const getNotesAPI = async () => { let encryptionKey = latestConfig?.encryptionKey
if (notesAPI) return notesAPI
if (!initPromise) {
initPromise = (async () => {
const config = await configManager.loadConfig()
let encryptionKey = config?.encryptionKey
if (!encryptionKey) { if (!encryptionKey) {
encryptionKey = generateEncryptionKey() encryptionKey = generateEncryptionKey()
await configManager.setConfig({ await configManager.setConfig({
...config, ...latestConfig,
encryptionKey, encryptionKey,
}) })
} }
const pluginId = config?.activeAdapter || 'filesystem' const pluginId = latestConfig?.activeAdapter || 'filesystem'
const adapterConfig = config?.adapters?.[pluginId] || {} const adapterConfig = latestConfig?.adapters?.[pluginId] || {}
const adapter = pluginManager.getAdapter( const adapter = pluginManager.getAdapter(pluginId, adapterConfig)
pluginId,
adapterConfig,
)
notesAPI = new NotesAPI(adapter, encryptionKey) const api = new NotesAPI(adapter, encryptionKey)
await notesAPI.init() await api.init()
return notesAPI notesAPI = api
})()
return api
}
export const initializeCore = async (runtime, { plugins }) => {
const pluginManager = initPluginManager(runtime, plugins)
const configManager = await initConfigManager(runtime, pluginManager)
const config = await configManager.loadConfig()
// Set active plugin
const activeConfig = config.adapters?.[config.activeAdapter] || {}
pluginManager.setActivePlugin(config.activeAdapter, activeConfig)
// Create API instance
const getNotesAPI = async () => {
if (notesAPI) return notesAPI
if (!initPromise) {
initPromise = initNotesAPI(configManager, pluginManager)
} }
return initPromise return initPromise

View File

@@ -1,8 +1,10 @@
import 'dotenv/config' import 'dotenv/config'
import { electronApp, optimizer, is } from '@electron-toolkit/utils' import { electronApp, optimizer, is } from '@electron-toolkit/utils'
import { app, shell, BrowserWindow, ipcMain } from 'electron' import { app, shell, BrowserWindow, ipcMain, dialog } from 'electron'
import filesystemPlugin from '@takerofnotes/plugin-filesystem' import filesystemPlugin from '@takerofnotes/plugin-filesystem'
import supabasePlugin from '@takerofnotes/plugin-supabase' import supabasePlugin from '@takerofnotes/plugin-supabase'
import s3Plugin from '@takerofnotes/plugin-s3'
import postgresPlugin from '@takerofnotes/plugin-postgre-sql'
import { initializeCore } from '../core/index.js' import { initializeCore } from '../core/index.js'
import { join } from 'path' import { join } from 'path'
@@ -78,7 +80,12 @@ app.whenReady().then(async () => {
const { pluginManager, configManager } = await initializeCore( const { pluginManager, configManager } = await initializeCore(
'electron-main', 'electron-main',
{ {
plugins: [filesystemPlugin, supabasePlugin], plugins: [
filesystemPlugin,
s3Plugin,
postgresPlugin,
supabasePlugin,
],
}, },
) )
@@ -130,6 +137,13 @@ app.whenReady().then(async () => {
} }
}) })
ipcMain.handle('open-directory-dialog', async () => {
const result = await dialog.showOpenDialog({
properties: ['openDirectory'],
})
return result.canceled ? null : result.filePaths[0]
})
electronApp.setAppUserModelId('com.electron') electronApp.setAppUserModelId('com.electron')
app.on('browser-window-created', (_, window) => { app.on('browser-window-created', (_, window) => {

View File

@@ -44,6 +44,9 @@ const api = {
moveClosed: () => { moveClosed: () => {
ipcRenderer.invoke('move-closed') ipcRenderer.invoke('move-closed')
}, },
openDirectoryDialog: () => {
return ipcRenderer.invoke('open-directory-dialog')
},
} }
if (process.contextIsolated) { if (process.contextIsolated) {

View File

@@ -0,0 +1,31 @@
<template>
<component :is="tag" class="btn">
<svg-btn-outline />
<slot />
</component>
</template>
<script setup>
import SvgBtnOutline from '@/components/svg/BtnOutline.vue'
const props = defineProps({
tag: {
type: String,
default: 'button',
},
})
</script>
<style lang="scss">
.btn {
text-transform: uppercase;
padding: 5px 16px 6px;
color: var(--grey-100);
position: relative;
&:hover {
color: var(--theme-accent);
}
}
</style>

View File

@@ -0,0 +1,103 @@
<template>
<div v-if="failedIds.length && visible" class="decryption-warning">
<div class="warning">
<button class="warning-text" @click="detailsOpen = !detailsOpen">
<strong>{{ failedIds.length }}&nbsp;</strong>
<span>
{{ failedIds.length === 1 ? 'note could' : 'notes could' }}
not be decrypted
</span>
</button>
<button class="close-button" @click="visible = false"></button>
</div>
<div v-show="detailsOpen" class="details">
<span>Failed note IDs:</span>
<ul class="id-list">
<li v-for="id in failedIds" :key="id">{{ id }}</li>
</ul>
<p class="instructions">
These notes may have been encrypted with a different key. Either
change your encryption key in preferences, or delete these
notes.
</p>
<button class="delete-button" @click="onDeleteNotes">
Delete Notes (Permanent)
</button>
</div>
</div>
</template>
<script setup>
import useNotes from '@/composables/useNotes'
import { ref } from 'vue'
const props = defineProps({
failedIds: {
type: Array,
required: true,
},
})
const visible = ref(true)
const detailsOpen = ref(false)
const { deleteNote } = useNotes()
const onDeleteNotes = async () => {
await Promise.all(props.failedIds.map((id) => deleteNote(id)))
visible.value = false
}
</script>
<style lang="scss" scoped>
.decryption-warning {
position: fixed;
left: 0;
right: 0;
bottom: 0;
background: var(--theme-bg);
border-top: 1px solid var(--grey-100);
padding: 10px var(--layout-margin);
.warning {
display: flex;
justify-content: space-between;
gap: 10px;
.warning-text {
&:hover {
color: var(--theme-accent);
}
}
}
.details {
margin-top: 20px;
ul {
list-style-type: none;
margin-top: 10px;
color: var(--grey-100);
}
.instructions {
margin-top: 10px;
}
.delete-button {
display: block;
margin: 20px auto 0;
border: 1px solid var(--theme-fg);
padding: 0.2em 0.5em;
border-radius: 0.2em;
&:hover {
color: var(--theme-accent);
border-color: var(--theme-accent);
}
}
}
}
</style>

View File

@@ -0,0 +1,36 @@
<template>
<div class="delete-menu">
<button
:class="['delete-button', { active: model }]"
@click="model = true"
>
Delete Items
</button>
<button v-if="model" class="close-button" @click="model = false">
X Close
</button>
</div>
</template>
<script setup>
const model = defineModel()
</script>
<style lang="scss">
.delete-menu {
flex: 1;
display: flex;
align-items: center;
justify-content: space-between;
.delete-button {
color: var(--grey-100);
&:hover,
&.active {
color: var(--red);
}
}
}
</style>

View File

@@ -1,7 +1,11 @@
<template> <template>
<transition name="menu"> <transition name="menu">
<div v-if="menuOpen" class="menu" ref="container"> <div
<Nav /> v-if="menuOpen || lockOpen"
:class="['menu', { locked: lockOpen }]"
ref="container"
>
<Nav v-if="!lockOpen" />
<div class="menu-wrap layout-block"> <div class="menu-wrap layout-block">
<new-note class="menu-item" @noteOpened="closeMenu" /> <new-note class="menu-item" @noteOpened="closeMenu" />
@@ -12,7 +16,7 @@
<router-link class="menu-item" to="/instructions"> <router-link class="menu-item" to="/instructions">
Instructio Instructio
</router-link> </router-link>
<button class="menu-item">Import</button> <!-- <button class="menu-item">Import</button> -->
<button class="menu-item" @click="handleExport">Export</button> <button class="menu-item" @click="handleExport">Export</button>
<router-link class="menu-item" to="/preferences"> <router-link class="menu-item" to="/preferences">
Preferences Preferences
@@ -32,6 +36,10 @@ import useMenu from '@/composables/useMenu'
import { useRoute } from 'vue-router' import { useRoute } from 'vue-router'
import useExport from '@/composables/useExport' import useExport from '@/composables/useExport'
const props = defineProps({
lockOpen: { type: Boolean, default: () => false },
})
const container = ref() const container = ref()
const { menuOpen, closeMenu } = useMenu() const { menuOpen, closeMenu } = useMenu()
@@ -85,6 +93,10 @@ const handleExport = async () => {
} }
} }
&.locked .menu-wrap {
padding-top: 0;
}
&.menu-enter-active, &.menu-enter-active,
&.menu-leave-active { &.menu-leave-active {
transition: transform 300ms var(--ease-out-expo); transition: transform 300ms var(--ease-out-expo);

View File

@@ -0,0 +1,51 @@
<template>
<div class="modal theme-dark">
<div class="modal-container" ref="container">
<slot />
</div>
</div>
</template>
<script setup>
import { onClickOutside } from '@vueuse/core'
import { ref } from 'vue'
const emit = defineEmits(['close'])
const container = ref(null)
onClickOutside(container, () => {
emit('close')
})
</script>
<style lang="scss">
.modal {
position: fixed;
inset: 0;
background: rgba(0, 0, 0, 0.5);
display: flex;
justify-content: center;
align-items: center;
.modal-container {
background: var(--theme-bg);
color: var(--theme-fg);
border: 1px solid var(--grey-100);
border-radius: 16px;
padding: 27px 21px;
text-align: center;
.btn-row {
display: flex;
justify-content: center;
gap: 12px;
margin-top: 26px;
.btn {
min-width: 80px;
}
}
}
}
</style>

View File

@@ -2,14 +2,18 @@
<div v-if="open" class="move-menu layout-block"> <div v-if="open" class="move-menu layout-block">
<button class="cancel-button" @click="close">Cancel</button> <button class="cancel-button" @click="close">Cancel</button>
<button class="summarium-button" @click="onCategoryClick(null)">
SUMMARIUM
</button>
<template v-for="(category, i) in categories"> <template v-for="(category, i) in categories">
<category-row <category-row
v-if="category !== fromCategory" v-if="category !== fromCategory"
:category="category" :category="category"
:index="i" :index="i"
wrapper="button" wrapper="button"
@click="onCategoryClick(category)"
:key="category" :key="category"
@click="onCategoryClick(category)"
/> />
</template> </template>
</div> </div>
@@ -17,10 +21,9 @@
<script setup> <script setup>
import CategoryRow from '@/components/CategoryRow.vue' import CategoryRow from '@/components/CategoryRow.vue'
import { computed, onBeforeUnmount, watch } from 'vue' import { computed, watch } from 'vue'
import { useRoute, useRouter } from 'vue-router' import { useRoute, useRouter } from 'vue-router'
import useNotes from '@/composables/useNotes' import useNotes from '@/composables/useNotes'
import useState from '@/composables/useState'
import _omit from 'lodash/omit' import _omit from 'lodash/omit'
const { categories, updateNote } = useNotes() const { categories, updateNote } = useNotes()
@@ -39,7 +42,7 @@ const close = async () => {
await window.api.moveClosed() await window.api.moveClosed()
} }
const onCategoryClick = async (category) => { const onCategoryClick = async (category) => {
if (!category || !noteId.value) return if (!noteId.value) return
await updateNote(noteId.value, { category: category }) await updateNote(noteId.value, { category: category })
@@ -53,12 +56,26 @@ watch(open, async () => {
<style lang="scss"> <style lang="scss">
.move-menu { .move-menu {
width: 50vw; width: 50vw;
height: 100%; height: 100vh;
position: sticky;
top: 0;
overflow-y: auto;
padding-bottom: 20px;
border-left: 1px solid var(--grey-100); border-left: 1px solid var(--grey-100);
display: flex;
flex-direction: column;
.cancel-button { .cancel-button {
color: var(--grey-100); color: var(--grey-100);
padding: 9px 0 16px; padding: 9px 0 16px;
} }
.summarium-button {
display: block;
margin: 10px 0;
&:hover {
color: var(--theme-accent);
}
}
} }
</style> </style>

View File

@@ -5,6 +5,8 @@
<script setup> <script setup>
import useOpenNote from '@/composables/useOpenNote' import useOpenNote from '@/composables/useOpenNote'
import useNotes from '@/composables/useNotes' import useNotes from '@/composables/useNotes'
import { useMagicKeys } from '@vueuse/core'
import { watchEffect } from 'vue'
const props = defineProps({ category: String }) const props = defineProps({ category: String })
const emit = defineEmits(['noteOpened']) const emit = defineEmits(['noteOpened'])
@@ -19,12 +21,15 @@ const onClick = async () => {
}, },
'', '',
) )
openNote(note.id) await openNote(note.id)
emit('noteOpened') emit('noteOpened')
} }
</script>
<style lang="scss"> // Add keyboard shortcut
.new-note { const { ctrl, n } = useMagicKeys()
watchEffect(() => {
if (ctrl.value && n.value) {
onClick()
} }
</style> })
</script>

View File

@@ -1,37 +1,76 @@
<template> <template>
<div :class="['note-row', { 'move-active': moveActive }]"> <div
<span class="date">{{ formatDate(note.createdAt) }}</span> :class="[
'note-row',
{ 'move-active': moveActive, 'delete-active': deleteActive },
]"
>
<button
v-if="deleteActive"
class="delete"
@click="deleteModalOpen = true"
>
Delete
</button>
<span v-else class="date">{{ formatDate(note.updatedAt) }}</span>
<div class="title-actions"> <div class="title-actions">
<button class="title bold" @click="openNote(note.id)"> <button
class="title bold"
@click="!deleteActive && openNote(note.id)"
>
{{ note.title }} {{ note.title }}
</button> </button>
<button class="action bold" @click="openNote(note.id)"> <button
class="action bold"
@click="!deleteActive && openNote(note.id)"
>
(open) (open)
</button> </button>
<button class="action bold move" @click="onMoveOpened"> <button class="action bold move" @click="onMoveOpened">
(move) (move)
</button> </button>
</div> </div>
<teleport to="body">
<modal v-if="deleteModalOpen" @close="deleteModalOpen = false">
<p>Are you sure?</p>
<div class="btn-row">
<btn @click="onDelete">Yes</btn>
<btn @click="deleteModalOpen = false">No</btn>
</div>
</modal>
</teleport>
</div> </div>
</template> </template>
<script setup> <script setup>
import useOpenNote from '@/composables/useOpenNote' import useOpenNote from '@/composables/useOpenNote'
import useState from '@/composables/useState'
import { useRoute, useRouter } from 'vue-router' import { useRoute, useRouter } from 'vue-router'
import { computed } from 'vue' import useNotes from '@/composables/useNotes'
import Modal from '@/components/Modal.vue'
import Btn from '@/components/Btn.vue'
import { computed, ref } from 'vue'
import { format } from 'fecha' import { format } from 'fecha'
const props = defineProps({ note: Object }) const props = defineProps({ note: Object, deleteActive: Boolean })
const deleteModalOpen = ref(false)
const { openNote } = useOpenNote() const { openNote } = useOpenNote()
const { deleteNote } = useNotes()
const formatDate = (date) => { const formatDate = (date) => {
const d = new Date(date) const d = new Date(date)
return format(d, 'MM/DD/YYYY') return format(d, 'MM/DD/YYYY')
} }
const onDelete = async () => {
await deleteNote(props.note.id)
}
// Moving // Moving
const route = useRoute() const route = useRoute()
const router = useRouter() const router = useRouter()
@@ -60,6 +99,11 @@ const moveActive = computed(() => route.query.move === props.note.id)
align-items: flex-start; align-items: flex-start;
gap: 2px; gap: 2px;
.title {
white-space: break-spaces;
word-break: break-word;
@include line-clamp(3);
}
.action { .action {
opacity: 0; opacity: 0;
@@ -68,6 +112,22 @@ const moveActive = computed(() => route.query.move === props.note.id)
} }
} }
} }
&.delete-active {
align-items: flex-start;
.title,
.action {
cursor: default;
}
.delete {
cursor: pointer;
}
&:hover {
color: var(--red);
}
}
&:not(.delete-active) {
&:hover, &:hover,
&.move-active { &.move-active {
color: var(--theme-accent); color: var(--theme-accent);
@@ -76,6 +136,8 @@ const moveActive = computed(() => route.query.move === props.note.id)
opacity: 1; opacity: 1;
} }
} }
}
&.move-active { &.move-active {
.title-actions .move { .title-actions .move {
color: var(--theme-accent); color: var(--theme-accent);

View File

@@ -15,6 +15,7 @@ import SvgSpinner from '@/components/svg/Spinner.vue'
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
pointer-events: none;
svg { svg {
width: 20px; width: 20px;

View File

@@ -1,5 +1,5 @@
<template> <template>
<div v-if="showScrollBar" class="scroll-bar"> <div v-if="showScrollBar" :class="['scroll-bar', { active: isDragging }]">
<div class="inner" ref="inner"> <div class="inner" ref="inner">
<div class="handle" ref="handle" /> <div class="handle" ref="handle" />
</div> </div>
@@ -7,10 +7,14 @@
</template> </template>
<script setup> <script setup>
import { ref, onBeforeUnmount, computed, watch } from 'vue' import {
import { useElementSize, useWindowScroll, useWindowSize } from '@vueuse/core' useElementSize,
import Tempus from 'tempus' useWindowScroll,
useWindowSize,
useEventListener,
} from '@vueuse/core'
import { useDragControls } from '@/composables/useDragControls' import { useDragControls } from '@/composables/useDragControls'
import { ref, computed } from 'vue'
const inner = ref() const inner = ref()
const handle = ref() const handle = ref()
@@ -23,12 +27,13 @@ const { height: innerHeight } = useElementSize(inner)
const { height: handleHeight } = useElementSize(handle) const { height: handleHeight } = useElementSize(handle)
// Drag controls // Drag controls
// useDragControls({ const { isDragging } = useDragControls({
// target: handle, target: inner,
// onUpdate: ({ y }) => { onUpdate: ({ y }) => {
// console.log(y.value) if (!handle.value) return
// }, window.scrollTo(0, y.value * (documentHeight.value - wHeight.value))
// }) },
})
const updateScrollbar = () => { const updateScrollbar = () => {
const scrollHeight = documentHeight.value const scrollHeight = documentHeight.value
@@ -46,27 +51,11 @@ const updateScrollbar = () => {
} }
} }
useEventListener(window, 'scroll', updateScrollbar)
const showScrollBar = computed(() => { const showScrollBar = computed(() => {
return documentHeight.value > wHeight.value return documentHeight.value > wHeight.value
}) })
// RAF
const removeRaf = ref()
const addRaf = () => (removeRaf.value = Tempus.add(updateScrollbar))
onBeforeUnmount(() => {
removeRaf.value?.()
})
watch(
showScrollBar,
(show) => {
if (show) {
addRaf()
} else {
removeRaf.value?.()
}
},
{ immediate: true },
)
</script> </script>
<style lang="scss"> <style lang="scss">
@@ -78,6 +67,8 @@ watch(
width: 8px; width: 8px;
will-change: transform; will-change: transform;
border-left: 1px solid var(--grey-100); border-left: 1px solid var(--grey-100);
background: var(--theme-bg);
cursor: grab;
.inner { .inner {
height: 100%; height: 100%;
@@ -85,7 +76,7 @@ watch(
.handle { .handle {
width: 100%; width: 100%;
height: 388px; height: 70vh;
background: var(--grey-100); background: var(--grey-100);
border-radius: 20px; border-radius: 20px;
position: absolute; position: absolute;
@@ -93,5 +84,8 @@ watch(
will-change: transform; will-change: transform;
} }
} }
&.active {
cursor: grabbing;
}
} }
</style> </style>

View File

@@ -7,10 +7,13 @@
ref="input" ref="input"
@input="emit('input', model.value)" @input="emit('input', model.value)"
/> />
<svg-btn-outline />
</div> </div>
</template> </template>
<script setup> <script setup>
import SvgBtnOutline from '@/components/svg/BtnOutline.vue'
import { ref } from 'vue' import { ref } from 'vue'
const props = defineProps({ const props = defineProps({
@@ -38,37 +41,10 @@ defineExpose({
position: relative; position: relative;
padding: 5px 15px 6px; padding: 5px 15px 6px;
background: var(--theme-bg); background: var(--theme-bg);
--clip-start: 16px;
clip-path: polygon(
var(--clip-start) 1px,
calc(100% - var(--clip-start)) 1px,
calc(100% - 1.5px) 50%,
calc(100% - var(--clip-start)) calc(100% - 1px),
var(--clip-start) calc(100% - 1px),
1.5px 50%
);
&::placeholder { &::placeholder {
color: var(--grey-100); color: var(--grey-100);
} }
} }
&::before {
content: '';
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background: var(--theme-fg);
--clip-start: 15px;
clip-path: polygon(
var(--clip-start) 0,
calc(100% - var(--clip-start)) 0,
100% 50%,
calc(100% - var(--clip-start)) 100%,
var(--clip-start) 100%,
0% 50%
);
}
} }
</style> </style>

View File

@@ -1,38 +1,27 @@
<template> <template>
<div class="note-download"> <div class="note-download">
<button @click="download">{{ noteTitle }}.md </button> <button v-if="noteTitle && props.editor" @click="download">
<span class="title-text">{{ noteTitle }}</span>
<span class="extension">.md </span>
</button>
</div> </div>
</template> </template>
<script setup> <script setup>
import { computed } from 'vue'
import _kebabCase from 'lodash/kebabCase' import _kebabCase from 'lodash/kebabCase'
import { computed } from 'vue'
const DEFAULT_TITLE = 'Untitled' const DEFAULT_TITLE = 'Untitled'
const props = defineProps({ const props = defineProps({
editor: { title: String,
type: Object, editor: Object,
required: true,
},
}) })
const noteTitle = computed(() => { const noteTitle = computed(() => _kebabCase(props.title || DEFAULT_TITLE))
if (!props.editor) return DEFAULT_TITLE
let title
const doc = props.editor.state.doc
const firstNode = doc.firstChild
if (!firstNode || firstNode.type.name !== 'heading') title = DEFAULT_TITLE
title = firstNode.textContent.trim() || DEFAULT_TITLE
return _kebabCase(title)
})
const download = () => { const download = () => {
if (!props.editor) return if (!noteTitle.value || !props.editor) return
const content = props.editor.getMarkdown() const content = props.editor.getMarkdown()
const blob = new Blob([content], { type: 'text/plain' }) const blob = new Blob([content], { type: 'text/plain' })
@@ -53,6 +42,24 @@ const download = () => {
justify-content: center; justify-content: center;
button { button {
display: inline-flex;
margin: auto;
justify-content: center;
.title-text {
display: block;
max-width: min(
300px,
calc(100vw - var(--layout-margin) * 2) - 36px
);
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
}
.extension {
display: block;
flex-shrink: 0;
}
&:hover { &:hover {
color: var(--theme-accent); color: var(--theme-accent);
} }

View File

@@ -1,5 +1,15 @@
<template> <template>
<div v-if="editor" class="note-editor"> <div v-if="editor" class="note-editor">
<div class="title">
<div
:class="['title-input p', { placeholder: !title }]"
contenteditable="true"
ref="titleInput"
@input="onTitleChange"
@keydown="onTitleKeydown"
/>
</div>
<editor-content :editor="editor" class="editor-wrap" /> <editor-content :editor="editor" class="editor-wrap" />
<editor-menu :editor="editor" /> <editor-menu :editor="editor" />
@@ -9,78 +19,130 @@
</template> </template>
<script setup> <script setup>
import { onBeforeUnmount, onMounted, shallowRef } from 'vue' import {
onBeforeUnmount,
onMounted,
shallowRef,
ref,
watch,
nextTick,
} from 'vue'
import PageLoading from '@/components/PageLoading.vue' import PageLoading from '@/components/PageLoading.vue'
import { Editor, EditorContent } from '@tiptap/vue-3' import { Editor, EditorContent } from '@tiptap/vue-3'
import { extensions } from '@/libs/editorExtensions'
import useNotes from '@/composables/useNotes' import useNotes from '@/composables/useNotes'
import _debounce from 'lodash/debounce' import _debounce from 'lodash/debounce'
import EditorMenu from './Menu.vue' import EditorMenu from './Menu.vue'
import { extensions } from '@/libs/editorExtensions'
const TITLE_CHAR_LIMIT = 100
const props = defineProps({ const props = defineProps({
id: { note: {
type: String, type: Object,
required: true, required: true,
}, },
}) })
const editor = shallowRef() const editor = shallowRef()
const title = ref('')
const titleInput = ref()
const { loadNote, updateNote } = useNotes() const { updateNote } = useNotes()
const onUpdate = _debounce(async ({ editor }) => { const onUpdate = _debounce(async ({ editor }) => {
const json = editor.getJSON() const json = editor.getJSON()
const text = editor.getText() const text = editor.getText()
// Get doc title await updateNote(props.note.id, {
let title
const doc = editor.state.doc
const firstNode = doc.firstChild
if (!firstNode || firstNode.type.name !== 'heading') title = 'Untitled'
title = firstNode.textContent.trim() || 'Untitled'
await updateNote(props.id, {
title,
content: json, content: json,
plainText: text, plainText: text,
}) })
}, 300) }, 500)
onMounted(async () => { onMounted(async () => {
const note = await loadNote(props.id) if (props.note.title !== 'Untitled') {
title.value = props.note.title || ''
}
editor.value = new Editor({ editor.value = new Editor({
extensions, extensions,
content: note.content || [], content: props.note.content || [],
onUpdate: onUpdate, onUpdate: onUpdate,
}) })
// Clear any highlights from find feature
editor.value.chain().selectAll().unsetHighlight().run()
await nextTick()
if (titleInput.value) {
titleInput.value.textContent = title.value
if (['', 'Untitled'].includes(title.value)) {
titleInput.value.focus()
}
}
}) })
onBeforeUnmount(() => { onBeforeUnmount(() => {
editor.value?.destroy?.() editor.value?.destroy?.()
}) })
// Make sure title input is synced
watch(title, async (newVal) => {
if (!titleInput.value) return
if (titleInput.value.textContent !== newVal) {
titleInput.value.textContent = newVal
}
})
const updateTitle = _debounce((title) => {
updateNote(props.note.id, {
title: title === '' ? 'Untitled' : title,
})
}, 500)
const onTitleChange = (e) => {
title.value = e.target.textContent
updateTitle(title.value)
}
const onTitleKeydown = (e) => {
if (e.key === 'Enter') {
e.preventDefault()
editor.value?.commands?.focus()
}
if (title.value.length >= TITLE_CHAR_LIMIT && e.key.length === 1) {
e.preventDefault()
}
}
defineExpose({ defineExpose({
title,
editor, editor,
}) })
</script> </script>
<style lang="scss"> <style lang="scss">
.note-editor { .note-editor {
.title {
width: 100%;
margin-bottom: 40px;
padding-bottom: 0.5em;
border-bottom: 1px dashed currentColor;
.title-input {
white-space: break-spaces;
word-break: break-word;
@include drop-cap;
&.placeholder:before {
content: 'Title';
color: var(--grey-100);
}
}
}
h1 { h1 {
font-weight: 700 !important; font-weight: 700 !important;
@include p; @include p;
&:first-child {
@include drop-cap;
}
}
h1.is-editor-empty:first-child::before {
color: var(--grey-100);
content: attr(data-placeholder);
pointer-events: none;
@include drop-cap;
} }
p strong { p strong {
font-weight: 700; font-weight: 700;
@@ -152,10 +214,13 @@ defineExpose({
background: currentColor; background: currentColor;
} }
} }
mark { u {
text-decoration: underline;
}
.highlighted {
background: var(--theme-accent); background: var(--theme-accent);
color: var(--theme-bg); color: var(--theme-bg);
padding: 0 0.2em; border-radius: 0.2em;
} }
ul[data-type='taskList'] { ul[data-type='taskList'] {

View File

@@ -1,34 +1,20 @@
<template> <template>
<div v-if="visible" class="note-find"> <div v-if="visible" class="note-find">
<div class="find-bar"> <div class="find-bar">
<!-- <input
@keydown.enter="findNext"
@keydown.escape="close"
ref="inputRef"
/> -->
<search-input <search-input
v-model="searchQuery" v-model="searchQuery"
placeholder="Find..." placeholder="Find..."
ref="inputRef" ref="inputRef"
@keydown.escape="close"
/> />
<span class="match-count">
{{ currentMatch + 1 }} / {{ matches.length }}
</span>
<button @click="findPrev" :disabled="matches.length === 0">
</button>
<button @click="findNext" :disabled="matches.length === 0">
</button>
<button @click="close"></button> <button @click="close"></button>
</div> </div>
</div> </div>
</template> </template>
<script setup> <script setup>
import { ref, watch, nextTick } from 'vue' import { ref, watch, nextTick, onBeforeUnmount, onMounted } from 'vue'
import SearchInput from '@/components/SearchInput.vue' import SearchInput from '@/components/SearchInput.vue'
import { Highlight } from '@tiptap/extension-highlight'
const props = defineProps({ const props = defineProps({
editor: { editor: {
@@ -45,7 +31,6 @@ const emit = defineEmits(['close'])
const searchQuery = ref('') const searchQuery = ref('')
const matches = ref([]) const matches = ref([])
const currentMatch = ref(0)
const inputRef = ref(null) const inputRef = ref(null)
const findInDocument = () => { const findInDocument = () => {
@@ -78,82 +63,25 @@ const findInDocument = () => {
}) })
matches.value = foundMatches matches.value = foundMatches
currentMatch.value = 0 highlightMatches()
if (foundMatches.length > 0) {
highlightMatch(0)
scrollToMatch(0)
}
} }
const highlightMatch = (index) => { const highlightMatches = () => {
if (!props.editor || !matches.value[index]) return if (!props.editor || !matches.value) return
const { from, to } = matches.value[index]
matches.value.forEach(({ from, to }) => {
props.editor props.editor
.chain() .chain()
.setTextSelection({ from, to }) .setTextSelection({ from, to })
.setHighlight({ color: 'var(--theme-accent)' }) .setHighlight({ color: 'var(--theme-accent)' })
.run() .run()
})
inputRef.value?.focus()
} }
const clearHighlights = () => { const clearHighlights = () => {
if (!props.editor) return if (!props.editor) return
const { state } = props.editor props.editor.chain().selectAll().unsetHighlight().run()
const { doc } = state
doc.descendants((node, pos) => {
if (node.marks && node.marks.length > 0) {
node.marks.forEach((mark) => {
if (mark.type.name === 'highlight') {
props.editor.chain().focus().unsetHighlight().run()
}
})
}
})
props.editor.commands.unsetHighlight()
}
const scrollToMatch = (index) => {
if (!props.editor || !matches.value[index]) return
const { from } = matches.value[index]
props.editor.commands.setTextSelection({ from, to: from })
const dom = props.editor.view.dom
const selection = window.getSelection()
if (selection && selection.rangeCount > 0) {
const range = selection.getRangeAt(0)
range.commonAncestorContainer.scrollIntoView({
behavior: 'smooth',
block: 'center',
})
}
}
const findNext = () => {
if (matches.value.length === 0) return
clearHighlights()
currentMatch.value = (currentMatch.value + 1) % matches.value.length
highlightMatch(currentMatch.value)
scrollToMatch(currentMatch.value)
}
const findPrev = () => {
if (matches.value.length === 0) return
clearHighlights()
currentMatch.value =
(currentMatch.value - 1 + matches.value.length) % matches.value.length
highlightMatch(currentMatch.value)
scrollToMatch(currentMatch.value)
} }
const close = () => { const close = () => {
@@ -170,27 +98,25 @@ watch(
await nextTick() await nextTick()
inputRef.value?.focus() inputRef.value?.focus()
if (props.editor && searchQuery.value) { if (props.editor && searchQuery.value) {
console.log('visible change')
findInDocument() findInDocument()
} }
} }
}, },
) )
watch( watch(
() => props.editor, () => props.editor,
(newEditor) => { (newEditor) => {
if (newEditor && props.visible && searchQuery.value) { if (newEditor && props.visible && searchQuery.value) {
console.log('editor change')
findInDocument() findInDocument()
} }
}, },
) )
watch(searchQuery, () => { watch(searchQuery, () => {
console.log('search change')
findInDocument() findInDocument()
}) })
onMounted(() => clearHighlights())
onBeforeUnmount(() => clearHighlights())
</script> </script>
<style lang="scss"> <style lang="scss">

View File

@@ -13,12 +13,6 @@
> >
Italic Italic
</button> </button>
<button
@click="editor.chain().focus().toggleHighlight().run()"
:class="{ active: editor.isActive('highlight') }"
>
Highlight
</button>
</div> </div>
</bubble-menu> </bubble-menu>
</template> </template>

View File

@@ -0,0 +1,67 @@
<template>
<div class="preferences-boolean-input">
<label :for="key">
{{ label }}
</label>
<button
:class="['toggle-container', { active: model === 'true' }]"
@click="onToggleClick"
>
<div class="toggle-button" />
</button>
</div>
</template>
<script setup>
const props = defineProps({
label: String,
key: String,
required: Boolean,
default: String,
})
const model = defineModel()
const onToggleClick = () => {
if (model.value === 'true') {
model.value = 'false'
} else {
model.value = 'true'
}
}
</script>
<style lang="scss">
.preferences-boolean-input {
display: flex;
align-items: center;
justify-content: space-between;
.toggle-container {
width: 26px;
height: 15px;
border-radius: 10px;
border: 1px solid var(--theme-fg);
position: relative;
.toggle-button {
position: absolute;
top: 0;
left: 0;
width: 13px;
height: 13px;
border-radius: 50%;
background-color: var(--theme-fg);
}
&.active {
background: var(--grey-100);
.toggle-button {
transform: translateX(11px);
}
}
}
}
</style>

View File

@@ -0,0 +1,68 @@
<template>
<div class="preferences-directory-input">
<label :for="key"> {{ label }}{{ required ? '*' : '' }} </label>
<div class="input-row">
<input
v-model="model"
:id="key"
type="text"
:placeholder="default"
:required="required"
readonly
/>
<button @click="openDirectoryPicker" type="button">Browse</button>
</div>
</div>
</template>
<script setup>
const props = defineProps({
label: String,
key: String,
required: Boolean,
default: String,
})
const model = defineModel()
const openDirectoryPicker = async () => {
const path = await window.api.openDirectoryDialog()
if (path) {
model.value = path
}
}
</script>
<style lang="scss">
.preferences-directory-input {
label {
display: block;
margin-bottom: 6px;
}
.input-row {
display: flex;
gap: 8px;
}
input {
flex: 1;
border: 1px solid var(--grey-100);
border-radius: 0.2em;
padding: 0.2em 0.5em;
}
button {
padding: 0.2em 0.5em;
background: var(--theme-bg);
color: var(--theme-fg);
border: 1px solid var(--grey-100);
border-radius: 0.2em;
&:hover {
background: var(--theme-fg);
color: var(--theme-bg);
border-color: var(--theme-fg);
}
}
}
</style>

View File

@@ -0,0 +1,38 @@
<template>
<div v-if="config" class="preferences-encryption">
<h2 class="section-title h1 mono">Encryption</h2>
<preferences-text-input
v-model.trim="config.encryptionKey"
type="password"
label="Encryption Key"
key="encryptionKey"
required
/>
</div>
</template>
<script setup>
import PreferencesTextInput from '@/components/preferences/TextInput.vue'
import useConfig from '@/composables/useConfig'
import { onMounted } from 'vue'
const { config, ensureConfig } = useConfig()
onMounted(async () => {
await ensureConfig()
})
const validate = async () => {
if (!config.value.encryptionKey) {
throw new Error('Please fill in the encryption key')
}
}
defineExpose({ validate })
</script>
<style lang="scss">
.preferences-encryption {
}
</style>

View File

@@ -0,0 +1,48 @@
<template>
<div v-if="config" class="preferences-general">
<h2 class="section-title h1 mono">General</h2>
<div class="options">
<preferences-boolean-input
v-model="config.enableBlackletter"
label="Enable Blackletter"
key="enableBlackletter"
/>
<preferences-boolean-input
v-model="config.openNotesInNewWindow"
label="Open Notes in New Window"
key="openNotesInNewWindow"
/>
</div>
</div>
</template>
<script setup>
import PreferencesBooleanInput from '@/components/preferences/BooleanInput.vue'
import useConfig from '@/composables/useConfig'
import { onMounted } from 'vue'
const { config, ensureConfig } = useConfig()
onMounted(async () => {
await ensureConfig()
})
const validate = async () => {
// if (!config.value.encryptionKey) {
// throw new Error('Please fill in the encryption key')
// }
}
defineExpose({ validate })
</script>
<style lang="scss">
.preferences-general {
.options {
display: flex;
flex-direction: column;
gap: 16px;
}
}
</style>

View File

@@ -0,0 +1,160 @@
<template>
<div v-if="config" class="preferences-storage">
<h2 class="section-title h1 mono">Storage Plugin</h2>
<div v-for="plugin in plugins" class="plugin" :key="plugin.id">
<input
v-model="selectedPluginId"
name="plugins"
type="radio"
:id="plugin.id"
:value="plugin.id"
/>
<div class="info">
<p class="name bold">{{ plugin.name }}</p>
<p class="description">{{ plugin.description }}</p>
<div v-if="plugin.configSchema.length" class="config">
<div
v-for="field in plugin.configSchema"
class="config-field"
:key="field.key"
>
<!-- Inputs -->
<text-input
v-if="
[
'text',
'email',
'password',
'number',
].includes(field.type)
"
v-model="config.adapters[plugin.id][field.key]"
v-bind="field"
/>
<directory-input
v-else-if="field.type === 'directory'"
v-model="config.adapters[plugin.id][field.key]"
v-bind="field"
/>
<boolean-input
v-else-if="field.type === 'boolean'"
v-model="config.adapters[plugin.id][field.key]"
v-bind="field"
/>
</div>
</div>
</div>
</div>
</div>
</template>
<script setup>
import DirectoryInput from '@/components/preferences/DirectoryInput.vue'
import BooleanInput from '@/components/preferences/BooleanInput.vue'
import TextInput from '@/components/preferences/TextInput.vue'
import usePlugins from '@/composables/usePlugins'
import useConfig from '@/composables/useConfig'
import { ref, computed, onMounted } from 'vue'
const { plugins, setActivePlugin, testPlugin } = await usePlugins()
const { config, ensureConfig } = useConfig()
onMounted(async () => {
await ensureConfig()
// Make sure every plugin config has defaults set
const normalizeConfig = () => {
if (!config.value.adapters) {
config.value.adapters = {}
}
for (const plugin of plugins.value) {
if (!config.value.adapters[plugin.id]) {
config.value.adapters[plugin.id] = {}
}
for (const field of plugin.configSchema) {
if (config.value.adapters[plugin.id][field.key] === undefined) {
config.value.adapters[plugin.id][field.key] =
field.default ?? ''
}
}
}
}
normalizeConfig()
})
// Track selected plugin
const selectedPluginId = ref(config.value.activeAdapter)
const selectedPlugin = computed(() => {
return plugins.value.find((p) => p.id === selectedPluginId.value)
})
// Validation for parent
const validate = async () => {
const plugin = selectedPlugin.value
const adapterConfig = config.value.adapters[plugin.id] || {}
if (plugin && plugin.configSchema.length) {
// Check required fields
for (const field of plugin.configSchema) {
if (field.required && !adapterConfig[field.key]) {
throw new Error(
`Please fill in all required fields for ${plugin.name}`,
)
}
}
// Test connection
const testResult = await testPlugin(plugin.id, adapterConfig)
if (!testResult) {
throw new Error(`Failed to connect to ${plugin.name}`)
}
}
await setActivePlugin(selectedPluginId.value, adapterConfig)
}
defineExpose({ validate })
</script>
<style lang="scss">
.preferences-storage {
.plugin {
display: flex;
margin-bottom: 16px;
}
input[type='radio'] {
display: block;
flex-shrink: 0;
width: 10px;
height: 10px;
margin-right: 10px;
border: 1px solid var(--theme-fg);
cursor: pointer;
&:checked {
background-color: var(--theme-fg);
}
}
.info {
flex: 1;
.description {
color: var(--grey-100);
margin-top: 6px;
}
}
.config {
display: flex;
flex-direction: column;
gap: 16px;
margin-top: 16px;
}
}
</style>

View File

@@ -0,0 +1,69 @@
<template>
<div class="preferences-text-input">
<label :for="key"> {{ label }}{{ required ? '*' : '' }} </label>
<div class="input-wrapper">
<input
v-model="model"
:id="key"
:type="isPasswordVisible ? 'text' : type"
:placeholder="default"
:required="required"
/>
<button
v-if="type === 'password'"
type="button"
class="toggle-password"
@click="isPasswordVisible = !isPasswordVisible"
>
👁
</button>
</div>
</div>
</template>
<script setup>
import { ref } from 'vue'
const props = defineProps({
label: String,
key: String,
required: Boolean,
type: String,
default: String,
})
const model = defineModel()
const isPasswordVisible = ref(false)
</script>
<style lang="scss">
.preferences-text-input {
label {
display: block;
margin-bottom: 6px;
}
.input-wrapper {
position: relative;
display: flex;
align-items: center;
}
input {
width: 100%;
border: 1px solid var(--grey-100);
border-radius: 0.2em;
padding: 0.2em 0.5em;
padding-right: 2.5em;
}
.toggle-password {
position: absolute;
right: 0.5em;
background: none;
border: none;
cursor: pointer;
padding: 0;
font-size: 1em;
}
}
</style>

View File

@@ -0,0 +1,67 @@
<template>
<div class="svg-btn-outline">
<svg
class="side left"
width="16"
height="28"
viewBox="0 0 16 28"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M15.7207 0.5H14.7207L0.720634 14.8612L14.7207 27.5H15.7207"
stroke="currentColor"
/>
</svg>
<div class="fill">
<div class="borders" />
</div>
<svg
class="side right"
width="16"
height="28"
viewBox="0 0 16 28"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M15.7207 0.5H14.7207L0.720634 14.8612L14.7207 27.5H15.7207"
stroke="currentColor"
/>
</svg>
</div>
</template>
<style lang="scss">
.svg-btn-outline {
grid-template-columns: auto 1fr auto;
display: grid;
align-items: center;
position: absolute;
inset: 0;
width: 100%;
height: 100%;
pointer-events: none;
.side {
height: 100%;
&.right {
transform: scaleX(-1);
}
}
.fill {
height: 100%;
position: relative;
.borders {
position: absolute;
inset: 0 -1px;
border: solid currentColor;
border-width: 1px 0;
}
}
}
</style>

View File

@@ -9,6 +9,9 @@ export function useDragControls(options = {}) {
const isDragging = ref(false) const isDragging = ref(false)
let bounds = null let bounds = null
let cleanupSelectListener = null
const disableSelect = (e) => e.preventDefault()
const updateBounds = () => { const updateBounds = () => {
if (target) { if (target) {
@@ -35,6 +38,9 @@ export function useDragControls(options = {}) {
isDragging.value = true isDragging.value = true
updateBounds() updateBounds()
move(e) move(e)
// Disable text selection
cleanupSelectListener = useEventListener('selectstart', disableSelect)
} }
const move = (e) => { const move = (e) => {
@@ -49,6 +55,8 @@ export function useDragControls(options = {}) {
const end = () => { const end = () => {
isDragging.value = false isDragging.value = false
cleanupSelectListener?.()
} }
onMounted(() => { onMounted(() => {

View File

@@ -1,6 +1,7 @@
export enum ENVIRONMENTS { export enum ENVIRONMENTS {
ELECTRON = 'electron', ELECTRON = 'electron',
WEB = 'web', WEB = 'web',
CAPACITOR = 'capacitor',
} }
export const useEnvironment = (): ENVIRONMENTS => { export const useEnvironment = (): ENVIRONMENTS => {
@@ -35,7 +36,26 @@ export const useEnvironment = (): ENVIRONMENTS => {
return false return false
} }
const environment = isElectron() ? ENVIRONMENTS.ELECTRON : ENVIRONMENTS.WEB function isCapacitor() {
if (typeof window !== 'undefined' && (window as any).Capacitor) {
return true
}
if (typeof navigator === 'object' && navigator.userAgent) {
const ua = navigator.userAgent
return (
ua.includes('Capacitor') ||
ua.includes('Android') ||
ua.includes('iPhone')
)
}
return false
}
const environment = isElectron()
? ENVIRONMENTS.ELECTRON
: isCapacitor()
? ENVIRONMENTS.CAPACITOR
: ENVIRONMENTS.WEB
return environment return environment
} }

View File

@@ -0,0 +1,52 @@
import { useEnvironment } from '@/composables/useEnvironment.js'
import useCore from '@/composables/useCore'
import _omit from 'lodash/omit'
import { ref } from 'vue'
let listenersInitialized = false
const changeCount = ref(0)
export default () => {
const environment = useEnvironment()
const { getNotesAPI } = useCore()
const setupListeners = () => {
if (environment !== 'electron' || listenersInitialized) return
listenersInitialized = true
const updateCacheCount = async (note) => {
const api = await getNotesAPI()
await api.updateNote(
note.id,
_omit(note, ['id', 'createdAt', 'updatedAt']),
)
changeCount.value++
}
window.api.onNoteCreated(updateCacheCount)
window.api.onNoteUpdated(updateCacheCount)
window.api.onPluginChanged(async () => {
const api = await getNotesAPI()
await api.init()
changeCount.value++
})
// Todo update cache
window.api.onNoteDeleted(() => {
changeCount.value++
})
}
const broadcastChange = (event, data) => {
if (environment !== 'electron') return
window.api.notifyNoteChanged(event, data)
}
return {
setupListeners,
broadcastChange,
changeCount,
}
}

View File

@@ -1,77 +1,41 @@
import _omit from 'lodash/omit' import useNoteListeners from '@/composables/useNoteListeners'
import useCore from '@/composables/useCore'
import { ref } from 'vue' import { ref } from 'vue'
import { getNotesAPI } from '@/libs/getNotesAPI'
import { useEnvironment } from '@/composables/useEnvironment.js'
const categories = ref([]) const categories = ref([])
const searchResults = ref([]) const searchResults = ref([])
const notesChangeCount = ref(0) const decryptionFailures = ref([])
let listenersInitialized = false
const environment = useEnvironment()
const setupListeners = () => {
if (listenersInitialized || typeof window === 'undefined') return
listenersInitialized = true
const updateCacheCount = async (note) => {
const api = await getNotesAPI()
await api.updateNote(
note.id,
_omit(note, ['id', 'createdAt', 'updatedAt']),
)
notesChangeCount.value++
}
window.api.onNoteCreated(updateCacheCount)
window.api.onNoteUpdated(updateCacheCount)
window.api.onPluginChanged(async () => {
const api = await getNotesAPI()
await api.init()
notesChangeCount.value++
})
// Todo update cache
window.api.onNoteDeleted(() => {
notesChangeCount.value++
})
}
const broadcastChange = (event, data) => {
if (environment === 'electron') {
window.api.notifyNoteChanged(event, data)
}
}
if (environment === 'electron') {
setupListeners()
}
export default () => { export default () => {
/* ------------------------- const { getNotesAPI } = useCore()
Initialization
--------------------------*/ // Change listeners for electron
const { setupListeners, broadcastChange, changeCount } = useNoteListeners()
setupListeners()
getNotesAPI()
const getDecryptionFailures = async () => {
const api = await getNotesAPI()
decryptionFailures.value = api.getDecryptionFailures()
}
getDecryptionFailures()
// Load
const loadCategories = async () => { const loadCategories = async () => {
const api = await getNotesAPI() const api = await getNotesAPI()
categories.value = api.getCategories() categories.value = api.getCategories()
} }
const loadCategoryNotes = async (category = null) => { const loadCategoryNotes = async (category = null) => {
const api = await getNotesAPI() const api = await getNotesAPI()
return api.getCategoryNotes(category) return api.getCategoryNotes(category)
} }
const loadNote = async (id) => { const loadNote = async (id) => {
const api = await getNotesAPI() const api = await getNotesAPI()
return api.getNote(id) console.log(api)
return await api.getNote(id)
} }
/* ------------------------- // Create
Create
--------------------------*/
const createNote = async (metadata, content, plainText = '') => { const createNote = async (metadata, content, plainText = '') => {
const api = await getNotesAPI() const api = await getNotesAPI()
const note = await api.createNote(metadata, content, plainText) const note = await api.createNote(metadata, content, plainText)
@@ -80,9 +44,7 @@ export default () => {
return note return note
} }
/* ------------------------- // Update
Update
--------------------------*/
const updateNote = async (id, updates) => { const updateNote = async (id, updates) => {
const api = await getNotesAPI() const api = await getNotesAPI()
@@ -96,7 +58,6 @@ export default () => {
return note return note
} }
const updateCategory = async (category, update) => { const updateCategory = async (category, update) => {
const notes = await loadCategoryNotes(category) const notes = await loadCategoryNotes(category)
@@ -107,19 +68,16 @@ export default () => {
await loadCategories() await loadCategories()
} }
/* ------------------------- // Delete
Delete
--------------------------*/
const deleteNote = async (id) => { const deleteNote = async (id) => {
const api = await getNotesAPI() const api = await getNotesAPI()
await api.deleteNote(id) await api.deleteNote(id)
await loadCategories() await loadCategories()
broadcastChange('note-deleted', { id }) broadcastChange('note-deleted', { id })
getDecryptionFailures()
} }
/* ------------------------- // Search
Search
--------------------------*/
const search = async (query) => { const search = async (query) => {
const api = await getNotesAPI() const api = await getNotesAPI()
@@ -134,7 +92,8 @@ export default () => {
return { return {
categories, categories,
searchResults, searchResults,
notesChangeCount, decryptionFailures,
changeCount,
loadCategories, loadCategories,
loadCategoryNotes, loadCategoryNotes,

View File

@@ -1,11 +1,15 @@
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import { useEnvironment, ENVIRONMENTS } from './useEnvironment' import { useEnvironment, ENVIRONMENTS } from './useEnvironment'
import useConfig from '@/composables/useConfig'
export default () => { export default () => {
const router = useRouter() const router = useRouter()
const { config, ensureConfig } = useConfig()
function openNote(noteId, options = {}) { const openNote = async (noteId) => {
const { newWindow = true } = options await ensureConfig()
const newWindow =
config.value.openNotesInNewWindow === 'true' ? true : false
const environment = useEnvironment() const environment = useEnvironment()

View File

@@ -16,7 +16,7 @@ export default async () => {
} }
const testPlugin = async (pluginId, config = {}) => { const testPlugin = async (pluginId, config = {}) => {
await pluginManager.testPlugin(pluginId, { ...config }) return await pluginManager.testPlugin(pluginId, { ...config })
} }
return { return {

Some files were not shown because too many files have changed in this diff Show More