self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-10-31 00:07:48 +02:00
Code Issues Releases Activity

All: Made model naming more consistent

Browse Source
This commit is contained in:
Laurent Cozic
2017-12-14 18:12:14 +00:00
parent 888ac8f4c2
commit df05d04dad
100 changed files with 261 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -44,6 +44,6 @@ before_install:
script: script:
- | - |
cd ElectronClient/app cd ElectronClient/app
rsync -aP ../../ReactNativeClient/lib/ lib/ rsync -aP --delete ../../ReactNativeClient/lib/ lib/
npm install npm install
yarn dist yarn dist

4
BUILD.md
View File

@@ -21,7 +21,7 @@ If you get a node-gyp related error you might need to manually install it: `npm
``` ```
cd ElectronClient/app cd ElectronClient/app
rsync -a ../../ReactNativeClient/lib/ lib/ rsync --delete -a ../../ReactNativeClient/lib/ lib/
npm install npm install
yarn dist yarn dist
``` ```
@@ -41,5 +41,5 @@ From `/ReactNativeClient`, run `npm install`, then `react-native run-ios` or `re
From `/CliClient`: From `/CliClient`:
- Run `npm install` - Run `npm install`
- Then `build.sh` - Then `build.sh`
- Copy the translations to the build directory: `rsync -aP ../ReactNativeClient/locales/ build/locales/` - Copy the translations to the build directory: `rsync --delete -aP ../ReactNativeClient/locales/ build/locales/`
- Run `run.sh` to start the application for testing. - Run `run.sh` to start the application for testing.

2
CliClient/app/ResourceServer.js
View File

@@ -1,6 +1,6 @@
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');
const { Logger } = require('lib/logger.js'); const { Logger } = require('lib/logger.js');
const { Resource } = require('lib/models/resource.js'); const Resource = require('lib/models/Resource.js');
const { netUtils } = require('lib/net-utils.js'); const { netUtils } = require('lib/net-utils.js');
const http = require("http"); const http = require("http");

10
CliClient/app/app-gui.js
View File

@@ -1,9 +1,9 @@
const { Logger } = require('lib/logger.js'); const { Logger } = require('lib/logger.js');
const { Folder } = require('lib/models/folder.js'); const Folder = require('lib/models/Folder.js');
const { Tag } = require('lib/models/tag.js'); const Tag = require('lib/models/Tag.js');
const { BaseModel } = require('lib/base-model.js'); const BaseModel = require('lib/BaseModel.js');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
const { Resource } = require('lib/models/resource.js'); const Resource = require('lib/models/Resource.js');
const { cliUtils } = require('./cli-utils.js'); const { cliUtils } = require('./cli-utils.js');
const { reducer, defaultState } = require('lib/reducer.js'); const { reducer, defaultState } = require('lib/reducer.js');
const { splitCommandString } = require('lib/string-utils.js'); const { splitCommandString } = require('lib/string-utils.js');

12
CliClient/app/app.js
View File

@@ -5,12 +5,12 @@ const { JoplinDatabase } = require('lib/joplin-database.js');
const { Database } = require('lib/database.js'); const { Database } = require('lib/database.js');
const { FoldersScreenUtils } = require('lib/folders-screen-utils.js'); const { FoldersScreenUtils } = require('lib/folders-screen-utils.js');
const { DatabaseDriverNode } = require('lib/database-driver-node.js'); const { DatabaseDriverNode } = require('lib/database-driver-node.js');
const { BaseModel } = require('lib/base-model.js'); const BaseModel = require('lib/BaseModel.js');
const { Folder } = require('lib/models/folder.js'); const Folder = require('lib/models/Folder.js');
const { BaseItem } = require('lib/models/base-item.js'); const BaseItem = require('lib/models/BaseItem.js');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
const { Tag } = require('lib/models/tag.js'); const Tag = require('lib/models/Tag.js');
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
const { Logger } = require('lib/logger.js'); const { Logger } = require('lib/logger.js');
const { sprintf } = require('sprintf-js'); const { sprintf } = require('sprintf-js');
const { reg } = require('lib/registry.js'); const { reg } = require('lib/registry.js');

8
CliClient/app/cli-integration-tests.js
View File

@@ -5,10 +5,10 @@ const { Logger } = require('lib/logger.js');
const { dirname } = require('lib/path-utils.js'); const { dirname } = require('lib/path-utils.js');
const { DatabaseDriverNode } = require('lib/database-driver-node.js'); const { DatabaseDriverNode } = require('lib/database-driver-node.js');
const { JoplinDatabase } = require('lib/joplin-database.js'); const { JoplinDatabase } = require('lib/joplin-database.js');
const { BaseModel } = require('lib/base-model.js'); const BaseModel = require('lib/BaseModel.js');
const { Folder } = require('lib/models/folder.js'); const Folder = require('lib/models/Folder.js');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
const { sprintf } = require('sprintf-js'); const { sprintf } = require('sprintf-js');
const exec = require('child_process').exec const exec = require('child_process').exec

2
CliClient/app/command-attach.js
View File

@@ -1,7 +1,7 @@
const { BaseCommand } = require('./base-command.js'); const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js'); const { app } = require('./app.js');
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');
const { BaseModel } = require('lib/base-model.js'); const BaseModel = require('lib/BaseModel.js');
const { shim } = require('lib/shim.js'); const { shim } = require('lib/shim.js');
const fs = require('fs-extra'); const fs = require('fs-extra');

6
CliClient/app/command-cat.js
View File

@@ -1,9 +1,9 @@
const { BaseCommand } = require('./base-command.js'); const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js'); const { app } = require('./app.js');
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');
const { BaseModel } = require('lib/base-model.js'); const BaseModel = require('lib/BaseModel.js');
const { Folder } = require('lib/models/folder.js'); const Folder = require('lib/models/Folder.js');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
class Command extends BaseCommand { class Command extends BaseCommand {

2
CliClient/app/command-config.js
View File

@@ -1,7 +1,7 @@
const { BaseCommand } = require('./base-command.js'); const { BaseCommand } = require('./base-command.js');
const { _, setLocale } = require('lib/locale.js'); const { _, setLocale } = require('lib/locale.js');
const { app } = require('./app.js'); const { app } = require('./app.js');
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
class Command extends BaseCommand { class Command extends BaseCommand {

6
CliClient/app/command-cp.js
View File

@@ -1,9 +1,9 @@
const { BaseCommand } = require('./base-command.js'); const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js'); const { app } = require('./app.js');
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');
const { BaseModel } = require('lib/base-model.js'); const BaseModel = require('lib/BaseModel.js');
const { Folder } = require('lib/models/folder.js'); const Folder = require('lib/models/Folder.js');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
class Command extends BaseCommand { class Command extends BaseCommand {

6
CliClient/app/command-done.js
View File

@@ -1,9 +1,9 @@
const { BaseCommand } = require('./base-command.js'); const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js'); const { app } = require('./app.js');
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');
const { BaseModel } = require('lib/base-model.js'); const BaseModel = require('lib/BaseModel.js');
const { Folder } = require('lib/models/folder.js'); const Folder = require('lib/models/Folder.js');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
const { time } = require('lib/time-utils.js'); const { time } = require('lib/time-utils.js');
class Command extends BaseCommand { class Command extends BaseCommand {

6
CliClient/app/command-dump.js
View File

@@ -1,9 +1,9 @@
const { BaseCommand } = require('./base-command.js'); const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js'); const { app } = require('./app.js');
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');
const { Folder } = require('lib/models/folder.js'); const Folder = require('lib/models/Folder.js');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
const { Tag } = require('lib/models/tag.js'); const Tag = require('lib/models/Tag.js');
class Command extends BaseCommand { class Command extends BaseCommand {

8
CliClient/app/command-edit.js
View File

@@ -3,10 +3,10 @@ const { BaseCommand } = require('./base-command.js');
const { uuid } = require('lib/uuid.js'); const { uuid } = require('lib/uuid.js');
const { app } = require('./app.js'); const { app } = require('./app.js');
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');
const { Folder } = require('lib/models/folder.js'); const Folder = require('lib/models/Folder.js');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
const { BaseModel } = require('lib/base-model.js'); const BaseModel = require('lib/BaseModel.js');
const { cliUtils } = require('./cli-utils.js'); const { cliUtils } = require('./cli-utils.js');
const { time } = require('lib/time-utils.js'); const { time } = require('lib/time-utils.js');

2
CliClient/app/command-encrypt-config.js
View File

@@ -3,7 +3,7 @@ const { _ } = require('lib/locale.js');
const { cliUtils } = require('./cli-utils.js'); const { cliUtils } = require('./cli-utils.js');
const EncryptionService = require('lib/services/EncryptionService'); const EncryptionService = require('lib/services/EncryptionService');
const MasterKey = require('lib/models/MasterKey'); const MasterKey = require('lib/models/MasterKey');
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
class Command extends BaseCommand { class Command extends BaseCommand {

2
CliClient/app/command-export-sync-status.js
View File

@@ -1,7 +1,7 @@
const { BaseCommand } = require('./base-command.js'); const { BaseCommand } = require('./base-command.js');
const { Database } = require('lib/database.js'); const { Database } = require('lib/database.js');
const { app } = require('./app.js'); const { app } = require('./app.js');
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');
const { ReportService } = require('lib/services/report.js'); const { ReportService } = require('lib/services/report.js');
const fs = require('fs-extra'); const fs = require('fs-extra');

4
CliClient/app/command-export.js
View File

@@ -1,7 +1,7 @@
const { BaseCommand } = require('./base-command.js'); const { BaseCommand } = require('./base-command.js');
const { Exporter } = require('lib/services/exporter.js'); const { Exporter } = require('lib/services/exporter.js');
const { BaseModel } = require('lib/base-model.js'); const BaseModel = require('lib/BaseModel.js');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
const { reg } = require('lib/registry.js'); const { reg } = require('lib/registry.js');
const { app } = require('./app.js'); const { app } = require('./app.js');
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');

6
CliClient/app/command-geoloc.js
View File

@@ -1,9 +1,9 @@
const { BaseCommand } = require('./base-command.js'); const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js'); const { app } = require('./app.js');
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');
const { BaseModel } = require('lib/base-model.js'); const BaseModel = require('lib/BaseModel.js');
const { Folder } = require('lib/models/folder.js'); const Folder = require('lib/models/Folder.js');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
class Command extends BaseCommand { class Command extends BaseCommand {

2
CliClient/app/command-help.js
View File

@@ -2,7 +2,7 @@ const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js'); const { app } = require('./app.js');
const { renderCommandHelp } = require('./help-utils.js'); const { renderCommandHelp } = require('./help-utils.js');
const { Database } = require('lib/database.js'); const { Database } = require('lib/database.js');
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
const { wrap } = require('lib/string-utils.js'); const { wrap } = require('lib/string-utils.js');
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');
const { cliUtils } = require('./cli-utils.js'); const { cliUtils } = require('./cli-utils.js');

2
CliClient/app/command-import-enex.js
View File

@@ -1,7 +1,7 @@
const { BaseCommand } = require('./base-command.js'); const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js'); const { app } = require('./app.js');
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');
const { Folder } = require('lib/models/folder.js'); const Folder = require('lib/models/Folder.js');
const { importEnex } = require('lib/import-enex'); const { importEnex } = require('lib/import-enex');
const { filename, basename } = require('lib/path-utils.js'); const { filename, basename } = require('lib/path-utils.js');
const { cliUtils } = require('./cli-utils.js'); const { cliUtils } = require('./cli-utils.js');

8
CliClient/app/command-ls.js
View File

@@ -1,10 +1,10 @@
const { BaseCommand } = require('./base-command.js'); const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js'); const { app } = require('./app.js');
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');
const { BaseModel } = require('lib/base-model.js'); const BaseModel = require('lib/BaseModel.js');
const { Folder } = require('lib/models/folder.js'); const Folder = require('lib/models/Folder.js');
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
const { sprintf } = require('sprintf-js'); const { sprintf } = require('sprintf-js');
const { time } = require('lib/time-utils.js'); const { time } = require('lib/time-utils.js');
const { cliUtils } = require('./cli-utils.js'); const { cliUtils } = require('./cli-utils.js');

2
CliClient/app/command-mkbook.js
View File

@@ -1,7 +1,7 @@
const { BaseCommand } = require('./base-command.js'); const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js'); const { app } = require('./app.js');
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');
const { Folder } = require('lib/models/folder.js'); const Folder = require('lib/models/Folder.js');
const { reg } = require('lib/registry.js'); const { reg } = require('lib/registry.js');
class Command extends BaseCommand { class Command extends BaseCommand {

2
CliClient/app/command-mknote.js
View File

@@ -1,7 +1,7 @@
const { BaseCommand } = require('./base-command.js'); const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js'); const { app } = require('./app.js');
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
class Command extends BaseCommand { class Command extends BaseCommand {

2
CliClient/app/command-mktodo.js
View File

@@ -1,7 +1,7 @@
const { BaseCommand } = require('./base-command.js'); const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js'); const { app } = require('./app.js');
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
class Command extends BaseCommand { class Command extends BaseCommand {

6
CliClient/app/command-mv.js
View File

@@ -1,9 +1,9 @@
const { BaseCommand } = require('./base-command.js'); const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js'); const { app } = require('./app.js');
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');
const { BaseModel } = require('lib/base-model.js'); const BaseModel = require('lib/BaseModel.js');
const { Folder } = require('lib/models/folder.js'); const Folder = require('lib/models/Folder.js');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
class Command extends BaseCommand { class Command extends BaseCommand {

6
CliClient/app/command-ren.js
View File

@@ -1,9 +1,9 @@
const { BaseCommand } = require('./base-command.js'); const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js'); const { app } = require('./app.js');
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');
const { BaseModel } = require('lib/base-model.js'); const BaseModel = require('lib/BaseModel.js');
const { Folder } = require('lib/models/folder.js'); const Folder = require('lib/models/Folder.js');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
class Command extends BaseCommand { class Command extends BaseCommand {

8
CliClient/app/command-rmbook.js
View File

@@ -1,10 +1,10 @@
const { BaseCommand } = require('./base-command.js'); const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js'); const { app } = require('./app.js');
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');
const { BaseItem } = require('lib/models/base-item.js'); const BaseItem = require('lib/models/BaseItem.js');
const { Folder } = require('lib/models/folder.js'); const Folder = require('lib/models/Folder.js');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
const { BaseModel } = require('lib/base-model.js'); const BaseModel = require('lib/BaseModel.js');
const { cliUtils } = require('./cli-utils.js'); const { cliUtils } = require('./cli-utils.js');
class Command extends BaseCommand { class Command extends BaseCommand {

8
CliClient/app/command-rmnote.js
View File

@@ -1,10 +1,10 @@
const { BaseCommand } = require('./base-command.js'); const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js'); const { app } = require('./app.js');
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');
const { BaseItem } = require('lib/models/base-item.js'); const BaseItem = require('lib/models/BaseItem.js');
const { Folder } = require('lib/models/folder.js'); const Folder = require('lib/models/Folder.js');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
const { BaseModel } = require('lib/base-model.js'); const BaseModel = require('lib/BaseModel.js');
const { cliUtils } = require('./cli-utils.js'); const { cliUtils } = require('./cli-utils.js');
class Command extends BaseCommand { class Command extends BaseCommand {

6
CliClient/app/command-search.js
View File

@@ -1,9 +1,9 @@
const { BaseCommand } = require('./base-command.js'); const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js'); const { app } = require('./app.js');
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');
const { BaseModel } = require('lib/base-model.js'); const BaseModel = require('lib/BaseModel.js');
const { Folder } = require('lib/models/folder.js'); const Folder = require('lib/models/Folder.js');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
const { sprintf } = require('sprintf-js'); const { sprintf } = require('sprintf-js');
const { time } = require('lib/time-utils.js'); const { time } = require('lib/time-utils.js');
const { uuid } = require('lib/uuid.js'); const { uuid } = require('lib/uuid.js');

8
CliClient/app/command-set.js
View File

@@ -1,11 +1,11 @@
const { BaseCommand } = require('./base-command.js'); const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js'); const { app } = require('./app.js');
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');
const { BaseModel } = require('lib/base-model.js'); const BaseModel = require('lib/BaseModel.js');
const { Database } = require('lib/database.js'); const { Database } = require('lib/database.js');
const { Folder } = require('lib/models/folder.js'); const Folder = require('lib/models/Folder.js');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
const { BaseItem } = require('lib/models/base-item.js'); const BaseItem = require('lib/models/BaseItem.js');
class Command extends BaseCommand { class Command extends BaseCommand {

2
CliClient/app/command-status.js
View File

@@ -1,7 +1,7 @@
const { BaseCommand } = require('./base-command.js'); const { BaseCommand } = require('./base-command.js');
const { Database } = require('lib/database.js'); const { Database } = require('lib/database.js');
const { app } = require('./app.js'); const { app } = require('./app.js');
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');
const { ReportService } = require('lib/services/report.js'); const { ReportService } = require('lib/services/report.js');

4
CliClient/app/command-sync.js
View File

@@ -2,8 +2,8 @@ const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js'); const { app } = require('./app.js');
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');
const { OneDriveApiNodeUtils } = require('./onedrive-api-node-utils.js'); const { OneDriveApiNodeUtils } = require('./onedrive-api-node-utils.js');
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
const { BaseItem } = require('lib/models/base-item.js'); const BaseItem = require('lib/models/BaseItem.js');
const { Synchronizer } = require('lib/synchronizer.js'); const { Synchronizer } = require('lib/synchronizer.js');
const { reg } = require('lib/registry.js'); const { reg } = require('lib/registry.js');
const { cliUtils } = require('./cli-utils.js'); const { cliUtils } = require('./cli-utils.js');

4
CliClient/app/command-tag.js
View File

@@ -1,8 +1,8 @@
const { BaseCommand } = require('./base-command.js'); const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js'); const { app } = require('./app.js');
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');
const { Tag } = require('lib/models/tag.js'); const Tag = require('lib/models/Tag.js');
const { BaseModel } = require('lib/base-model.js'); const BaseModel = require('lib/BaseModel.js');
class Command extends BaseCommand { class Command extends BaseCommand {

6
CliClient/app/command-todo.js
View File

@@ -1,9 +1,9 @@
const { BaseCommand } = require('./base-command.js'); const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js'); const { app } = require('./app.js');
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');
const { BaseModel } = require('lib/base-model.js'); const BaseModel = require('lib/BaseModel.js');
const { Folder } = require('lib/models/folder.js'); const Folder = require('lib/models/Folder.js');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
const { time } = require('lib/time-utils.js'); const { time } = require('lib/time-utils.js');
class Command extends BaseCommand { class Command extends BaseCommand {

6
CliClient/app/command-undone.js
View File

@@ -1,9 +1,9 @@
const { BaseCommand } = require('./base-command.js'); const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js'); const { app } = require('./app.js');
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');
const { BaseModel } = require('lib/base-model.js'); const BaseModel = require('lib/BaseModel.js');
const { Folder } = require('lib/models/folder.js'); const Folder = require('lib/models/Folder.js');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
const { time } = require('lib/time-utils.js'); const { time } = require('lib/time-utils.js');
const CommandDone = require('./command-done.js'); const CommandDone = require('./command-done.js');

4
CliClient/app/command-use.js
View File

@@ -1,8 +1,8 @@
const { BaseCommand } = require('./base-command.js'); const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js'); const { app } = require('./app.js');
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');
const { BaseModel } = require('lib/base-model.js'); const BaseModel = require('lib/BaseModel.js');
const { Folder } = require('lib/models/folder.js'); const Folder = require('lib/models/Folder.js');
class Command extends BaseCommand { class Command extends BaseCommand {

2
CliClient/app/command-version.js
View File

@@ -1,5 +1,5 @@
const { BaseCommand } = require('./base-command.js'); const { BaseCommand } = require('./base-command.js');
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');
class Command extends BaseCommand { class Command extends BaseCommand {

2
CliClient/app/fuzzing.js
View File

@@ -2,7 +2,7 @@
const { time } = require('lib/time-utils.js'); const { time } = require('lib/time-utils.js');
const { Logger } = require('lib/logger.js'); const { Logger } = require('lib/logger.js');
const { Resource } = require('lib/models/resource.js'); const Resource = require('lib/models/Resource.js');
const { dirname } = require('lib/path-utils.js'); const { dirname } = require('lib/path-utils.js');
const { FsDriverNode } = require('./fs-driver-node.js'); const { FsDriverNode } = require('./fs-driver-node.js');
const lodash = require('lodash'); const lodash = require('lodash');

2
CliClient/app/help-utils.js
View File

@@ -1,6 +1,6 @@
const fs = require('fs-extra'); const fs = require('fs-extra');
const { wrap } = require('lib/string-utils.js'); const { wrap } = require('lib/string-utils.js');
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
const { fileExtension, basename, dirname } = require('lib/path-utils.js'); const { fileExtension, basename, dirname } = require('lib/path-utils.js');
const { _, setLocale, languageCode } = require('lib/locale.js'); const { _, setLocale, languageCode } = require('lib/locale.js');

14
CliClient/app/main.js
View File

@@ -4,14 +4,14 @@
require('app-module-path').addPath(__dirname); require('app-module-path').addPath(__dirname);
const { app } = require('./app.js'); const { app } = require('./app.js');
const { Folder } = require('lib/models/folder.js'); const Folder = require('lib/models/Folder.js');
const { Resource } = require('lib/models/resource.js'); const Resource = require('lib/models/Resource.js');
const { BaseItem } = require('lib/models/base-item.js'); const BaseItem = require('lib/models/BaseItem.js');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
const { Tag } = require('lib/models/tag.js'); const Tag = require('lib/models/Tag.js');
const { NoteTag } = require('lib/models/note-tag.js'); const NoteTag = require('lib/models/NoteTag.js');
const MasterKey = require('lib/models/MasterKey'); const MasterKey = require('lib/models/MasterKey');
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
const { Logger } = require('lib/logger.js'); const { Logger } = require('lib/logger.js');
const { FsDriverNode } = require('lib/fs-driver-node.js'); const { FsDriverNode } = require('lib/fs-driver-node.js');
const { shimInit } = require('lib/shim-init-node.js'); const { shimInit } = require('lib/shim-init-node.js');

2
CliClient/build.sh
View File

@@ -4,6 +4,6 @@ ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
BUILD_DIR="$ROOT_DIR/build" BUILD_DIR="$ROOT_DIR/build"
rsync -a --exclude "node_modules/" "$ROOT_DIR/app/" "$BUILD_DIR/" rsync -a --exclude "node_modules/" "$ROOT_DIR/app/" "$BUILD_DIR/"
rsync -a "$ROOT_DIR/../ReactNativeClient/lib/" "$BUILD_DIR/lib/" rsync -a --delete "$ROOT_DIR/../ReactNativeClient/lib/" "$BUILD_DIR/lib/"
cp "$ROOT_DIR/package.json" "$BUILD_DIR" cp "$ROOT_DIR/package.json" "$BUILD_DIR"
chmod 755 "$BUILD_DIR/main.js" chmod 755 "$BUILD_DIR/main.js"

12
CliClient/tests/encryption.js
View File

@@ -2,13 +2,13 @@ require('app-module-path').addPath(__dirname);
const { time } = require('lib/time-utils.js'); const { time } = require('lib/time-utils.js');
const { setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js'); const { setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
const { Folder } = require('lib/models/folder.js'); const Folder = require('lib/models/Folder.js');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
const { Tag } = require('lib/models/tag.js'); const Tag = require('lib/models/Tag.js');
const { Database } = require('lib/database.js'); const { Database } = require('lib/database.js');
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
const { BaseItem } = require('lib/models/base-item.js'); const BaseItem = require('lib/models/BaseItem.js');
const { BaseModel } = require('lib/base-model.js'); const BaseModel = require('lib/BaseModel.js');
const MasterKey = require('lib/models/MasterKey'); const MasterKey = require('lib/models/MasterKey');
const SyncTargetRegistry = require('lib/SyncTargetRegistry.js'); const SyncTargetRegistry = require('lib/SyncTargetRegistry.js');
const EncryptionService = require('lib/services/EncryptionService.js'); const EncryptionService = require('lib/services/EncryptionService.js');

12
CliClient/tests/synchronizer.js
View File

@@ -2,14 +2,14 @@ require('app-module-path').addPath(__dirname);
const { time } = require('lib/time-utils.js'); const { time } = require('lib/time-utils.js');
const { setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, encryptionService, loadEncryptionMasterKey } = require('test-utils.js'); const { setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, encryptionService, loadEncryptionMasterKey } = require('test-utils.js');
const { Folder } = require('lib/models/folder.js'); const Folder = require('lib/models/Folder.js');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
const { Tag } = require('lib/models/tag.js'); const Tag = require('lib/models/Tag.js');
const { Database } = require('lib/database.js'); const { Database } = require('lib/database.js');
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
const MasterKey = require('lib/models/MasterKey'); const MasterKey = require('lib/models/MasterKey');
const { BaseItem } = require('lib/models/base-item.js'); const BaseItem = require('lib/models/BaseItem.js');
const { BaseModel } = require('lib/base-model.js'); const BaseModel = require('lib/BaseModel.js');
const SyncTargetRegistry = require('lib/SyncTargetRegistry.js'); const SyncTargetRegistry = require('lib/SyncTargetRegistry.js');
process.on('unhandledRejection', (reason, p) => { process.on('unhandledRejection', (reason, p) => {

16
CliClient/tests/test-utils.js
View File

@@ -1,16 +1,16 @@
const fs = require('fs-extra'); const fs = require('fs-extra');
const { JoplinDatabase } = require('lib/joplin-database.js'); const { JoplinDatabase } = require('lib/joplin-database.js');
const { DatabaseDriverNode } = require('lib/database-driver-node.js'); const { DatabaseDriverNode } = require('lib/database-driver-node.js');
const { BaseModel } = require('lib/base-model.js'); const BaseModel = require('lib/BaseModel.js');
const { Folder } = require('lib/models/folder.js'); const Folder = require('lib/models/Folder.js');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
const { Resource } = require('lib/models/resource.js'); const Resource = require('lib/models/Resource.js');
const { Tag } = require('lib/models/tag.js'); const Tag = require('lib/models/Tag.js');
const { NoteTag } = require('lib/models/note-tag.js'); const NoteTag = require('lib/models/NoteTag.js');
const { Logger } = require('lib/logger.js'); const { Logger } = require('lib/logger.js');
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
const MasterKey = require('lib/models/MasterKey'); const MasterKey = require('lib/models/MasterKey');
const { BaseItem } = require('lib/models/base-item.js'); const BaseItem = require('lib/models/BaseItem.js');
const { Synchronizer } = require('lib/synchronizer.js'); const { Synchronizer } = require('lib/synchronizer.js');
const { FileApi } = require('lib/file-api.js'); const { FileApi } = require('lib/file-api.js');
const { FileApiDriverMemory } = require('lib/file-api-driver-memory.js'); const { FileApiDriverMemory } = require('lib/file-api-driver-memory.js');

6
ElectronClient/app/app.js
View File

@@ -2,14 +2,14 @@ require('app-module-path').addPath(__dirname);
const { BaseApplication } = require('lib/BaseApplication'); const { BaseApplication } = require('lib/BaseApplication');
const { FoldersScreenUtils } = require('lib/folders-screen-utils.js'); const { FoldersScreenUtils } = require('lib/folders-screen-utils.js');
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
const { shim } = require('lib/shim.js'); const { shim } = require('lib/shim.js');
const { BaseModel } = require('lib/base-model.js'); const BaseModel = require('lib/BaseModel.js');
const MasterKey = require('lib/models/MasterKey'); const MasterKey = require('lib/models/MasterKey');
const { _, setLocale } = require('lib/locale.js'); const { _, setLocale } = require('lib/locale.js');
const os = require('os'); const os = require('os');
const fs = require('fs-extra'); const fs = require('fs-extra');
const { Tag } = require('lib/models/tag.js'); const Tag = require('lib/models/Tag.js');
const { reg } = require('lib/registry.js'); const { reg } = require('lib/registry.js');
const { sprintf } = require('sprintf-js'); const { sprintf } = require('sprintf-js');
const { JoplinDatabase } = require('lib/joplin-database.js'); const { JoplinDatabase } = require('lib/joplin-database.js');

2
ElectronClient/app/gui/ConfigScreen.jsx
View File

@@ -1,7 +1,7 @@
const React = require('react'); const React = require('react');
const { connect } = require('react-redux'); const { connect } = require('react-redux');
const { reg } = require('lib/registry.js'); const { reg } = require('lib/registry.js');
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
const { bridge } = require('electron').remote.require('./bridge'); const { bridge } = require('electron').remote.require('./bridge');
const { Header } = require('./Header.min.js'); const { Header } = require('./Header.min.js');
const { themeStyle } = require('../theme.js'); const { themeStyle } = require('../theme.js');

2
ElectronClient/app/gui/ImportScreen.jsx
View File

@@ -1,7 +1,7 @@
const React = require('react'); const React = require('react');
const { connect } = require('react-redux'); const { connect } = require('react-redux');
const { reg } = require('lib/registry.js'); const { reg } = require('lib/registry.js');
const { Folder } = require('lib/models/folder.js'); const Folder = require('lib/models/Folder.js');
const { bridge } = require('electron').remote.require('./bridge'); const { bridge } = require('electron').remote.require('./bridge');
const { Header } = require('./Header.min.js'); const { Header } = require('./Header.min.js');
const { themeStyle } = require('../theme.js'); const { themeStyle } = require('../theme.js');

10
ElectronClient/app/gui/MainScreen.jsx
View File

@@ -5,12 +5,12 @@ const { SideBar } = require('./SideBar.min.js');
const { NoteList } = require('./NoteList.min.js'); const { NoteList } = require('./NoteList.min.js');
const { NoteText } = require('./NoteText.min.js'); const { NoteText } = require('./NoteText.min.js');
const { PromptDialog } = require('./PromptDialog.min.js'); const { PromptDialog } = require('./PromptDialog.min.js');
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
const { BaseModel } = require('lib/base-model.js'); const BaseModel = require('lib/BaseModel.js');
const { Tag } = require('lib/models/tag.js'); const Tag = require('lib/models/Tag.js');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
const { uuid } = require('lib/uuid.js'); const { uuid } = require('lib/uuid.js');
const { Folder } = require('lib/models/folder.js'); const Folder = require('lib/models/Folder.js');
const { themeStyle } = require('../theme.js'); const { themeStyle } = require('../theme.js');
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');
const layoutUtils = require('lib/layout-utils.js'); const layoutUtils = require('lib/layout-utils.js');

4
ElectronClient/app/gui/NoteText.jsx
View File

@@ -1,7 +1,7 @@
const React = require('react'); const React = require('react');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
const { time } = require('lib/time-utils.js'); const { time } = require('lib/time-utils.js');
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
const { IconButton } = require('./IconButton.min.js'); const { IconButton } = require('./IconButton.min.js');
const Toolbar = require('./Toolbar.min.js'); const Toolbar = require('./Toolbar.min.js');
const { connect } = require('react-redux'); const { connect } = require('react-redux');

2
ElectronClient/app/gui/Root.jsx
View File

@@ -4,7 +4,7 @@ const { createStore } = require('redux');
const { connect, Provider } = require('react-redux'); const { connect, Provider } = require('react-redux');
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
const { MainScreen } = require('./MainScreen.min.js'); const { MainScreen } = require('./MainScreen.min.js');
const { OneDriveLoginScreen } = require('./OneDriveLoginScreen.min.js'); const { OneDriveLoginScreen } = require('./OneDriveLoginScreen.min.js');

8
ElectronClient/app/gui/SideBar.jsx
View File

@@ -2,10 +2,10 @@ const React = require('react');
const { connect } = require('react-redux'); const { connect } = require('react-redux');
const shared = require('lib/components/shared/side-menu-shared.js'); const shared = require('lib/components/shared/side-menu-shared.js');
const { Synchronizer } = require('lib/synchronizer.js'); const { Synchronizer } = require('lib/synchronizer.js');
const { BaseModel } = require('lib/base-model.js'); const BaseModel = require('lib/BaseModel.js');
const { Folder } = require('lib/models/folder.js'); const Folder = require('lib/models/Folder.js');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
const { Tag } = require('lib/models/tag.js'); const Tag = require('lib/models/Tag.js');
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');
const { themeStyle } = require('../theme.js'); const { themeStyle } = require('../theme.js');
const { bridge } = require('electron').remote.require('./bridge'); const { bridge } = require('electron').remote.require('./bridge');

2
ElectronClient/app/gui/StatusScreen.jsx
View File

@@ -1,7 +1,7 @@
const React = require('react'); const React = require('react');
const { connect } = require('react-redux'); const { connect } = require('react-redux');
const { reg } = require('lib/registry.js'); const { reg } = require('lib/registry.js');
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
const { bridge } = require('electron').remote.require('./bridge'); const { bridge } = require('electron').remote.require('./bridge');
const { Header } = require('./Header.min.js'); const { Header } = require('./Header.min.js');
const { themeStyle } = require('../theme.js'); const { themeStyle } = require('../theme.js');

14
ElectronClient/app/main-html.js
View File

@@ -4,14 +4,14 @@
require('app-module-path').addPath(__dirname); require('app-module-path').addPath(__dirname);
const { app } = require('./app.js'); const { app } = require('./app.js');
const { Folder } = require('lib/models/folder.js'); const Folder = require('lib/models/Folder.js');
const { Resource } = require('lib/models/resource.js'); const Resource = require('lib/models/Resource.js');
const { BaseItem } = require('lib/models/base-item.js'); const BaseItem = require('lib/models/BaseItem.js');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
const { Tag } = require('lib/models/tag.js'); const Tag = require('lib/models/Tag.js');
const { NoteTag } = require('lib/models/note-tag.js'); const NoteTag = require('lib/models/NoteTag.js');
const MasterKey = require('lib/models/MasterKey'); const MasterKey = require('lib/models/MasterKey');
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
const { Logger } = require('lib/logger.js'); const { Logger } = require('lib/logger.js');
const { FsDriverNode } = require('lib/fs-driver-node.js'); const { FsDriverNode } = require('lib/fs-driver-node.js');
const { shimInit } = require('lib/shim-init-node.js'); const { shimInit } = require('lib/shim-init-node.js');

2
ElectronClient/app/theme.js
View File

@@ -1,4 +1,4 @@
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
const globalStyle = { const globalStyle = {
fontSize: 12, fontSize: 12,

2
ElectronClient/build.sh
View File

@@ -3,7 +3,7 @@
ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
BUILD_DIR="$ROOT_DIR/app" BUILD_DIR="$ROOT_DIR/app"
rsync -a "$ROOT_DIR/../ReactNativeClient/lib/" "$BUILD_DIR/lib/" rsync -a --delete "$ROOT_DIR/../ReactNativeClient/lib/" "$BUILD_DIR/lib/"
cd "$BUILD_DIR" cd "$BUILD_DIR"
npm run compile npm run compile

12
ReactNativeClient/lib/BaseApplication.js
View File

@@ -4,12 +4,12 @@ const { JoplinDatabase } = require('lib/joplin-database.js');
const { Database } = require('lib/database.js'); const { Database } = require('lib/database.js');
const { FoldersScreenUtils } = require('lib/folders-screen-utils.js'); const { FoldersScreenUtils } = require('lib/folders-screen-utils.js');
const { DatabaseDriverNode } = require('lib/database-driver-node.js'); const { DatabaseDriverNode } = require('lib/database-driver-node.js');
const { BaseModel } = require('lib/base-model.js'); const BaseModel = require('lib/BaseModel.js');
const { Folder } = require('lib/models/folder.js'); const Folder = require('lib/models/Folder.js');
const { BaseItem } = require('lib/models/base-item.js'); const BaseItem = require('lib/models/BaseItem.js');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
const { Tag } = require('lib/models/tag.js'); const Tag = require('lib/models/Tag.js');
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
const { Logger } = require('lib/logger.js'); const { Logger } = require('lib/logger.js');
const { splitCommandString } = require('lib/string-utils.js'); const { splitCommandString } = require('lib/string-utils.js');
const { sprintf } = require('sprintf-js'); const { sprintf } = require('sprintf-js');

2
ReactNativeClient/lib/base-model.js → ReactNativeClient/lib/BaseModel.js
View File

@@ -406,4 +406,4 @@ BaseModel.TYPE_MASTER_KEY = 9;
BaseModel.db_ = null; BaseModel.db_ = null;
BaseModel.dispatch = function(o) {}; BaseModel.dispatch = function(o) {};
module.exports = { BaseModel }; module.exports = BaseModel;

2
ReactNativeClient/lib/MdToHtml.js
View File

@@ -1,7 +1,7 @@
const MarkdownIt = require('markdown-it'); const MarkdownIt = require('markdown-it');
const Entities = require('html-entities').AllHtmlEntities; const Entities = require('html-entities').AllHtmlEntities;
const htmlentities = (new Entities()).encode; const htmlentities = (new Entities()).encode;
const { Resource } = require('lib/models/resource.js'); const Resource = require('lib/models/Resource.js');
const ModelCache = require('lib/ModelCache'); const ModelCache = require('lib/ModelCache');
const { shim } = require('lib/shim.js'); const { shim } = require('lib/shim.js');
const md5 = require('md5'); const md5 = require('md5');

2
ReactNativeClient/lib/SyncTargetFilesystem.js
View File

@@ -1,6 +1,6 @@
const BaseSyncTarget = require('lib/BaseSyncTarget.js'); const BaseSyncTarget = require('lib/BaseSyncTarget.js');
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
const { FileApi } = require('lib/file-api.js'); const { FileApi } = require('lib/file-api.js');
const { FileApiDriverLocal } = require('lib/file-api-driver-local.js'); const { FileApiDriverLocal } = require('lib/file-api-driver-local.js');
const { Synchronizer } = require('lib/synchronizer.js'); const { Synchronizer } = require('lib/synchronizer.js');

2
ReactNativeClient/lib/SyncTargetMemory.js
View File

@@ -1,6 +1,6 @@
const BaseSyncTarget = require('lib/BaseSyncTarget.js'); const BaseSyncTarget = require('lib/BaseSyncTarget.js');
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
const { FileApi } = require('lib/file-api.js'); const { FileApi } = require('lib/file-api.js');
const { FileApiDriverMemory } = require('lib/file-api-driver-memory.js'); const { FileApiDriverMemory } = require('lib/file-api-driver-memory.js');
const { Synchronizer } = require('lib/synchronizer.js'); const { Synchronizer } = require('lib/synchronizer.js');

2
ReactNativeClient/lib/SyncTargetOneDrive.js
View File

@@ -1,7 +1,7 @@
const BaseSyncTarget = require('lib/BaseSyncTarget.js'); const BaseSyncTarget = require('lib/BaseSyncTarget.js');
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');
const { OneDriveApi } = require('lib/onedrive-api.js'); const { OneDriveApi } = require('lib/onedrive-api.js');
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
const { parameters } = require('lib/parameters.js'); const { parameters } = require('lib/parameters.js');
const { FileApi } = require('lib/file-api.js'); const { FileApi } = require('lib/file-api.js');
const { Synchronizer } = require('lib/synchronizer.js'); const { Synchronizer } = require('lib/synchronizer.js');

2
ReactNativeClient/lib/SyncTargetOneDriveDev.js
View File

@@ -2,7 +2,7 @@ const BaseSyncTarget = require('lib/BaseSyncTarget.js');
const SyncTargetOneDrive = require('lib/SyncTargetOneDrive.js'); const SyncTargetOneDrive = require('lib/SyncTargetOneDrive.js');
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');
const { OneDriveApi } = require('lib/onedrive-api.js'); const { OneDriveApi } = require('lib/onedrive-api.js');
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
const { parameters } = require('lib/parameters.js'); const { parameters } = require('lib/parameters.js');
const { FileApi } = require('lib/file-api.js'); const { FileApi } = require('lib/file-api.js');
const { Synchronizer } = require('lib/synchronizer.js'); const { Synchronizer } = require('lib/synchronizer.js');

2
ReactNativeClient/lib/components/global-style.js
View File

@@ -1,4 +1,4 @@
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
const globalStyle = { const globalStyle = {
fontSize: 16, fontSize: 16,

4
ReactNativeClient/lib/components/note-body-viewer.js
View File

@@ -1,8 +1,8 @@
const React = require('react'); const Component = React.Component; const React = require('react'); const Component = React.Component;
const { Platform, WebView, View, Linking } = require('react-native'); const { Platform, WebView, View, Linking } = require('react-native');
const { globalStyle } = require('lib/components/global-style.js'); const { globalStyle } = require('lib/components/global-style.js');
const { Resource } = require('lib/models/resource.js'); const Resource = require('lib/models/Resource.js');
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
const { reg } = require('lib/registry.js'); const { reg } = require('lib/registry.js');
const MdToHtml = require('lib/MdToHtml.js'); const MdToHtml = require('lib/MdToHtml.js');

2
ReactNativeClient/lib/components/note-item.js
View File

@@ -5,7 +5,7 @@ const { Log } = require('lib/log.js');
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');
const { Checkbox } = require('lib/components/checkbox.js'); const { Checkbox } = require('lib/components/checkbox.js');
const { reg } = require('lib/registry.js'); const { reg } = require('lib/registry.js');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
const { time } = require('lib/time-utils.js'); const { time } = require('lib/time-utils.js');
const { globalStyle, themeStyle } = require('lib/components/global-style.js'); const { globalStyle, themeStyle } = require('lib/components/global-style.js');

4
ReactNativeClient/lib/components/note-list.js
View File

@@ -6,8 +6,8 @@ const { _ } = require('lib/locale.js');
const { Checkbox } = require('lib/components/checkbox.js'); const { Checkbox } = require('lib/components/checkbox.js');
const { NoteItem } = require('lib/components/note-item.js'); const { NoteItem } = require('lib/components/note-item.js');
const { reg } = require('lib/registry.js'); const { reg } = require('lib/registry.js');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
const { time } = require('lib/time-utils.js'); const { time } = require('lib/time-utils.js');
const { themeStyle } = require('lib/components/global-style.js'); const { themeStyle } = require('lib/components/global-style.js');

6
ReactNativeClient/lib/components/screen-header.js
View File

@@ -7,9 +7,9 @@ const { BackButtonService } = require('lib/services/back-button.js');
const { ReportService } = require('lib/services/report.js'); const { ReportService } = require('lib/services/report.js');
const { Menu, MenuOptions, MenuOption, MenuTrigger } = require('react-native-popup-menu'); const { Menu, MenuOptions, MenuOption, MenuTrigger } = require('react-native-popup-menu');
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
const { Folder } = require('lib/models/folder.js'); const Folder = require('lib/models/Folder.js');
const { FileApi } = require('lib/file-api.js'); const { FileApi } = require('lib/file-api.js');
const { FileApiDriverOneDrive } = require('lib/file-api-driver-onedrive.js'); const { FileApiDriverOneDrive } = require('lib/file-api-driver-onedrive.js');
const { reg } = require('lib/registry.js'); const { reg } = require('lib/registry.js');

2
ReactNativeClient/lib/components/screens/config.js
View File

@@ -6,7 +6,7 @@ const { _, setLocale } = require('lib/locale.js');
const { BaseScreenComponent } = require('lib/components/base-screen.js'); const { BaseScreenComponent } = require('lib/components/base-screen.js');
const { Dropdown } = require('lib/components/Dropdown.js'); const { Dropdown } = require('lib/components/Dropdown.js');
const { themeStyle } = require('lib/components/global-style.js'); const { themeStyle } = require('lib/components/global-style.js');
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
class ConfigScreenComponent extends BaseScreenComponent { class ConfigScreenComponent extends BaseScreenComponent {

4
ReactNativeClient/lib/components/screens/folder.js
View File

@@ -3,8 +3,8 @@ const { View, Button, TextInput, StyleSheet } = require('react-native');
const { connect } = require('react-redux'); const { connect } = require('react-redux');
const { Log } = require('lib/log.js'); const { Log } = require('lib/log.js');
const { ActionButton } = require('lib/components/action-button.js'); const { ActionButton } = require('lib/components/action-button.js');
const { Folder } = require('lib/models/folder.js'); const Folder = require('lib/models/Folder.js');
const { BaseModel } = require('lib/base-model.js'); const BaseModel = require('lib/BaseModel.js');
const { ScreenHeader } = require('lib/components/screen-header.js'); const { ScreenHeader } = require('lib/components/screen-header.js');
const { reg } = require('lib/registry.js'); const { reg } = require('lib/registry.js');
const { BaseScreenComponent } = require('lib/components/base-screen.js'); const { BaseScreenComponent } = require('lib/components/base-screen.js');

10
ReactNativeClient/lib/components/screens/note.js
View File

@@ -4,12 +4,12 @@ const { connect } = require('react-redux');
const { uuid } = require('lib/uuid.js'); const { uuid } = require('lib/uuid.js');
const { Log } = require('lib/log.js'); const { Log } = require('lib/log.js');
const RNFS = require('react-native-fs'); const RNFS = require('react-native-fs');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
const { Resource } = require('lib/models/resource.js'); const Resource = require('lib/models/Resource.js');
const { Folder } = require('lib/models/folder.js'); const Folder = require('lib/models/Folder.js');
const { BackButtonService } = require('lib/services/back-button.js'); const { BackButtonService } = require('lib/services/back-button.js');
const { BaseModel } = require('lib/base-model.js'); const BaseModel = require('lib/BaseModel.js');
const { ActionButton } = require('lib/components/action-button.js'); const { ActionButton } = require('lib/components/action-button.js');
const Icon = require('react-native-vector-icons/Ionicons').default; const Icon = require('react-native-vector-icons/Ionicons').default;
const { fileExtension, basename, safeFileExtension } = require('lib/path-utils.js'); const { fileExtension, basename, safeFileExtension } = require('lib/path-utils.js');

8
ReactNativeClient/lib/components/screens/notes.js
View File

@@ -4,10 +4,10 @@ const { connect } = require('react-redux');
const { reg } = require('lib/registry.js'); const { reg } = require('lib/registry.js');
const { Log } = require('lib/log.js'); const { Log } = require('lib/log.js');
const { NoteList } = require('lib/components/note-list.js'); const { NoteList } = require('lib/components/note-list.js');
const { Folder } = require('lib/models/folder.js'); const Folder = require('lib/models/Folder.js');
const { Tag } = require('lib/models/tag.js'); const Tag = require('lib/models/Tag.js');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
const { themeStyle } = require('lib/components/global-style.js'); const { themeStyle } = require('lib/components/global-style.js');
const { ScreenHeader } = require('lib/components/screen-header.js'); const { ScreenHeader } = require('lib/components/screen-header.js');
const { MenuOption, Text } = require('react-native-popup-menu'); const { MenuOption, Text } = require('react-native-popup-menu');

2
ReactNativeClient/lib/components/screens/onedrive-login.js
View File

@@ -3,7 +3,7 @@ const { View } = require('react-native');
const { WebView, Button, Text } = require('react-native'); const { WebView, Button, Text } = require('react-native');
const { connect } = require('react-redux'); const { connect } = require('react-redux');
const { Log } = require('lib/log.js'); const { Log } = require('lib/log.js');
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
const { ScreenHeader } = require('lib/components/screen-header.js'); const { ScreenHeader } = require('lib/components/screen-header.js');
const { reg } = require('lib/registry.js'); const { reg } = require('lib/registry.js');
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');

2
ReactNativeClient/lib/components/screens/search.js
View File

@@ -4,7 +4,7 @@ const { connect } = require('react-redux');
const { ScreenHeader } = require('lib/components/screen-header.js'); const { ScreenHeader } = require('lib/components/screen-header.js');
const Icon = require('react-native-vector-icons/Ionicons').default; const Icon = require('react-native-vector-icons/Ionicons').default;
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
const { NoteItem } = require('lib/components/note-item.js'); const { NoteItem } = require('lib/components/note-item.js');
const { BaseScreenComponent } = require('lib/components/base-screen.js'); const { BaseScreenComponent } = require('lib/components/base-screen.js');
const { themeStyle } = require('lib/components/global-style.js'); const { themeStyle } = require('lib/components/global-style.js');

6
ReactNativeClient/lib/components/screens/status.js
View File

@@ -1,15 +1,15 @@
const React = require('react'); const Component = React.Component; const React = require('react'); const Component = React.Component;
const { ListView, StyleSheet, View, Text, Button, FlatList } = require('react-native'); const { ListView, StyleSheet, View, Text, Button, FlatList } = require('react-native');
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
const { connect } = require('react-redux'); const { connect } = require('react-redux');
const { Log } = require('lib/log.js'); const { Log } = require('lib/log.js');
const { reg } = require('lib/registry.js'); const { reg } = require('lib/registry.js');
const { ScreenHeader } = require('lib/components/screen-header.js'); const { ScreenHeader } = require('lib/components/screen-header.js');
const { time } = require('lib/time-utils'); const { time } = require('lib/time-utils');
const { Logger } = require('lib/logger.js'); const { Logger } = require('lib/logger.js');
const { BaseItem } = require('lib/models/base-item.js'); const BaseItem = require('lib/models/BaseItem.js');
const { Database } = require('lib/database.js'); const { Database } = require('lib/database.js');
const { Folder } = require('lib/models/folder.js'); const Folder = require('lib/models/Folder.js');
const { ReportService } = require('lib/services/report.js'); const { ReportService } = require('lib/services/report.js');
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');
const { BaseScreenComponent } = require('lib/components/base-screen.js'); const { BaseScreenComponent } = require('lib/components/base-screen.js');

2
ReactNativeClient/lib/components/screens/tag.js
View File

@@ -4,7 +4,7 @@ const { connect } = require('react-redux');
const { ScreenHeader } = require('lib/components/screen-header.js'); const { ScreenHeader } = require('lib/components/screen-header.js');
const Icon = require('react-native-vector-icons/Ionicons').default; const Icon = require('react-native-vector-icons/Ionicons').default;
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
const { NoteItem } = require('lib/components/note-item.js'); const { NoteItem } = require('lib/components/note-item.js');
const { BaseScreenComponent } = require('lib/components/base-screen.js'); const { BaseScreenComponent } = require('lib/components/base-screen.js');
const { globalStyle } = require('lib/components/global-style.js'); const { globalStyle } = require('lib/components/global-style.js');

6
ReactNativeClient/lib/components/shared/note-screen-shared.js
View File

@@ -1,7 +1,7 @@
const { reg } = require('lib/registry.js'); const { reg } = require('lib/registry.js');
const { Folder } = require('lib/models/folder.js'); const Folder = require('lib/models/Folder.js');
const { BaseModel } = require('lib/base-model.js'); const BaseModel = require('lib/BaseModel.js');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
const shared = {}; const shared = {};

2
ReactNativeClient/lib/components/shared/side-menu-shared.js
View File

@@ -31,7 +31,7 @@ shared.renderSearches = function(props, renderItem) {
} }
shared.synchronize_press = async function(comp) { shared.synchronize_press = async function(comp) {
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
const { reg } = require('lib/registry.js'); const { reg } = require('lib/registry.js');
const action = comp.props.syncStarted ? 'cancel' : 'start'; const action = comp.props.syncStarted ? 'cancel' : 'start';

6
ReactNativeClient/lib/components/side-menu-content.js
View File

@@ -3,9 +3,9 @@ const { TouchableOpacity , Button, Text, Image, StyleSheet, ScrollView, View } =
const { connect } = require('react-redux'); const { connect } = require('react-redux');
const Icon = require('react-native-vector-icons/Ionicons').default; const Icon = require('react-native-vector-icons/Ionicons').default;
const { Log } = require('lib/log.js'); const { Log } = require('lib/log.js');
const { Tag } = require('lib/models/tag.js'); const Tag = require('lib/models/Tag.js');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
const { FoldersScreenUtils } = require('lib/folders-screen-utils.js'); const { FoldersScreenUtils } = require('lib/folders-screen-utils.js');
const { Synchronizer } = require('lib/synchronizer.js'); const { Synchronizer } = require('lib/synchronizer.js');
const { reg } = require('lib/registry.js'); const { reg } = require('lib/registry.js');

2
ReactNativeClient/lib/file-api-driver-local.js
View File

@@ -1,7 +1,7 @@
const fs = require('fs-extra'); const fs = require('fs-extra');
const { promiseChain } = require('lib/promise-utils.js'); const { promiseChain } = require('lib/promise-utils.js');
const moment = require('moment'); const moment = require('moment');
const { BaseItem } = require('lib/models/base-item.js'); const BaseItem = require('lib/models/BaseItem.js');
const { time } = require('lib/time-utils.js'); const { time } = require('lib/time-utils.js');
// NOTE: when synchronising with the file system the time resolution is the second (unlike milliseconds for OneDrive for instance). // NOTE: when synchronising with the file system the time resolution is the second (unlike milliseconds for OneDrive for instance).

2
ReactNativeClient/lib/folders-screen-utils.js
View File

@@ -1,4 +1,4 @@
const { Folder } = require('lib/models/folder.js'); const Folder = require('lib/models/Folder.js');
class FoldersScreenUtils { class FoldersScreenUtils {

2
ReactNativeClient/lib/geolocation-react.js
View File

@@ -1,4 +1,4 @@
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
class GeolocationReact { class GeolocationReact {

10
ReactNativeClient/lib/import-enex.js
View File

@@ -2,11 +2,11 @@ const { uuid } = require('lib/uuid.js');
const moment = require('moment'); const moment = require('moment');
const { promiseChain } = require('lib/promise-utils.js'); const { promiseChain } = require('lib/promise-utils.js');
const { folderItemFilename } = require('lib/string-utils.js'); const { folderItemFilename } = require('lib/string-utils.js');
const { BaseModel } = require('lib/base-model.js'); const BaseModel = require('lib/BaseModel.js');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
const { Tag } = require('lib/models/tag.js'); const Tag = require('lib/models/Tag.js');
const { Resource } = require('lib/models/resource.js'); const Resource = require('lib/models/Resource.js');
const { Folder } = require('lib/models/folder.js'); const Folder = require('lib/models/Folder.js');
const { enexXmlToMd } = require('./import-enex-md-gen.js'); const { enexXmlToMd } = require('./import-enex-md-gen.js');
const { time } = require('lib/time-utils.js'); const { time } = require('lib/time-utils.js');
const Levenshtein = require('levenshtein'); const Levenshtein = require('levenshtein');

4
ReactNativeClient/lib/models/Alarm.js
View File

@@ -1,5 +1,5 @@
const { BaseModel } = require('lib/base-model.js'); const BaseModel = require('lib/BaseModel.js');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
class Alarm extends BaseModel { class Alarm extends BaseModel {

6
ReactNativeClient/lib/models/base-item.js → ReactNativeClient/lib/models/BaseItem.js
View File

@@ -1,6 +1,6 @@
const { BaseModel } = require('lib/base-model.js'); const BaseModel = require('lib/BaseModel.js');
const { Database } = require('lib/database.js'); const { Database } = require('lib/database.js');
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
const { time } = require('lib/time-utils.js'); const { time } = require('lib/time-utils.js');
const { sprintf } = require('sprintf-js'); const { sprintf } = require('sprintf-js');
const moment = require('moment'); const moment = require('moment');
@@ -511,4 +511,4 @@ BaseItem.syncItemDefinitions_ = [
{ type: BaseModel.TYPE_MASTER_KEY, className: 'MasterKey' }, { type: BaseModel.TYPE_MASTER_KEY, className: 'MasterKey' },
]; ];
module.exports = { BaseItem }; module.exports = BaseItem;

10
ReactNativeClient/lib/models/folder.js → ReactNativeClient/lib/models/Folder.js
View File

@@ -1,13 +1,13 @@
const { BaseModel } = require('lib/base-model.js'); const BaseModel = require('lib/BaseModel.js');
const { Log } = require('lib/log.js'); const { Log } = require('lib/log.js');
const { promiseChain } = require('lib/promise-utils.js'); const { promiseChain } = require('lib/promise-utils.js');
const { time } = require('lib/time-utils.js'); const { time } = require('lib/time-utils.js');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
const { Database } = require('lib/database.js'); const { Database } = require('lib/database.js');
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');
const moment = require('moment'); const moment = require('moment');
const { BaseItem } = require('lib/models/base-item.js'); const BaseItem = require('lib/models/BaseItem.js');
const lodash = require('lodash'); const lodash = require('lodash');
class Folder extends BaseItem { class Folder extends BaseItem {
@@ -165,4 +165,4 @@ class Folder extends BaseItem {
} }
module.exports = { Folder }; module.exports = Folder;

4
ReactNativeClient/lib/models/MasterKey.js
View File

@@ -1,5 +1,5 @@
const { BaseModel } = require('lib/base-model.js'); const BaseModel = require('lib/BaseModel.js');
const { BaseItem } = require('lib/models/base-item.js'); const BaseItem = require('lib/models/BaseItem.js');
class MasterKey extends BaseItem { class MasterKey extends BaseItem {

8
ReactNativeClient/lib/models/note.js → ReactNativeClient/lib/models/Note.js
View File

@@ -1,8 +1,8 @@
const { BaseModel } = require('lib/base-model.js'); const BaseModel = require('lib/BaseModel.js');
const { Log } = require('lib/log.js'); const { Log } = require('lib/log.js');
const { sprintf } = require('sprintf-js'); const { sprintf } = require('sprintf-js');
const { BaseItem } = require('lib/models/base-item.js'); const BaseItem = require('lib/models/BaseItem.js');
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
const { shim } = require('lib/shim.js'); const { shim } = require('lib/shim.js');
const { time } = require('lib/time-utils.js'); const { time } = require('lib/time-utils.js');
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');
@@ -453,4 +453,4 @@ class Note extends BaseItem {
Note.updateGeolocationEnabled_ = true; Note.updateGeolocationEnabled_ = true;
Note.geolocationUpdating_ = false; Note.geolocationUpdating_ = false;
module.exports = { Note }; module.exports = Note;

6
ReactNativeClient/lib/models/note-tag.js → ReactNativeClient/lib/models/NoteTag.js
View File

@@ -1,5 +1,5 @@
const { BaseItem } = require('lib/models/base-item.js'); const BaseItem = require('lib/models/BaseItem.js');
const { BaseModel } = require('lib/base-model.js'); const BaseModel = require('lib/BaseModel.js');
class NoteTag extends BaseItem { class NoteTag extends BaseItem {
@@ -33,4 +33,4 @@ class NoteTag extends BaseItem {
} }
module.exports = { NoteTag }; module.exports = NoteTag;

8
ReactNativeClient/lib/models/resource.js → ReactNativeClient/lib/models/Resource.js
View File

@@ -1,6 +1,6 @@
const { BaseModel } = require('lib/base-model.js'); const BaseModel = require('lib/BaseModel.js');
const { BaseItem } = require('lib/models/base-item.js'); const BaseItem = require('lib/models/BaseItem.js');
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
const { mime } = require('lib/mime-utils.js'); const { mime } = require('lib/mime-utils.js');
const { filename } = require('lib/path-utils.js'); const { filename } = require('lib/path-utils.js');
const { FsDriverDummy } = require('lib/fs-driver-dummy.js'); const { FsDriverDummy } = require('lib/fs-driver-dummy.js');
@@ -84,4 +84,4 @@ class Resource extends BaseItem {
Resource.IMAGE_MAX_DIMENSION = 1920; Resource.IMAGE_MAX_DIMENSION = 1920;
module.exports = { Resource }; module.exports = Resource;

4
ReactNativeClient/lib/models/setting.js → ReactNativeClient/lib/models/Setting.js
View File

@@ -1,4 +1,4 @@
const { BaseModel } = require('lib/base-model.js'); const BaseModel = require('lib/BaseModel.js');
const { Database } = require('lib/database.js'); const { Database } = require('lib/database.js');
const { Logger } = require('lib/logger.js'); const { Logger } = require('lib/logger.js');
const SyncTargetRegistry = require('lib/SyncTargetRegistry.js'); const SyncTargetRegistry = require('lib/SyncTargetRegistry.js');
@@ -442,4 +442,4 @@ Setting.constants_ = {
openDevTools: false, openDevTools: false,
} }
module.exports = { Setting }; module.exports = Setting;

10
ReactNativeClient/lib/models/tag.js → ReactNativeClient/lib/models/Tag.js
View File

@@ -1,7 +1,7 @@
const { BaseModel } = require('lib/base-model.js'); const BaseModel = require('lib/BaseModel.js');
const { BaseItem } = require('lib/models/base-item.js'); const BaseItem = require('lib/models/BaseItem.js');
const { NoteTag } = require('lib/models/note-tag.js'); const NoteTag = require('lib/models/NoteTag.js');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
const { time } = require('lib/time-utils.js'); const { time } = require('lib/time-utils.js');
class Tag extends BaseItem { class Tag extends BaseItem {
@@ -140,4 +140,4 @@ class Tag extends BaseItem {
} }
module.exports = { Tag }; module.exports = Tag;

2
ReactNativeClient/lib/parameters.js
View File

@@ -1,4 +1,4 @@
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
const parameters_ = {}; const parameters_ = {};

4
ReactNativeClient/lib/reducer.js
View File

@@ -1,5 +1,5 @@
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
const { Folder } = require('lib/models/folder.js'); const Folder = require('lib/models/Folder.js');
const ArrayUtils = require('lib/ArrayUtils.js'); const ArrayUtils = require('lib/ArrayUtils.js');
const defaultState = { const defaultState = {

2
ReactNativeClient/lib/registry.js
View File

@@ -1,5 +1,5 @@
const { Logger } = require('lib/logger.js'); const { Logger } = require('lib/logger.js');
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
const { shim } = require('lib/shim.js'); const { shim } = require('lib/shim.js');
const SyncTargetRegistry = require('lib/SyncTargetRegistry.js'); const SyncTargetRegistry = require('lib/SyncTargetRegistry.js');
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');

2
ReactNativeClient/lib/services/AlarmService.js
View File

@@ -1,4 +1,4 @@
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
const Alarm = require('lib/models/Alarm.js'); const Alarm = require('lib/models/Alarm.js');
class AlarmService { class AlarmService {

2
ReactNativeClient/lib/services/EncryptionService.js
View File

@@ -1,6 +1,6 @@
const { padLeft } = require('lib/string-utils.js'); const { padLeft } = require('lib/string-utils.js');
const { shim } = require('lib/shim.js'); const { shim } = require('lib/shim.js');
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
const MasterKey = require('lib/models/MasterKey'); const MasterKey = require('lib/models/MasterKey');
function hexPad(s, length) { function hexPad(s, length) {

14
ReactNativeClient/lib/services/exporter.js
View File

@@ -1,10 +1,10 @@
const { BaseItem } = require('lib/models/base-item.js'); const BaseItem = require('lib/models/BaseItem.js');
const { BaseModel } = require('lib/base-model.js'); const BaseModel = require('lib/BaseModel.js');
const { Resource } = require('lib/models/resource.js'); const Resource = require('lib/models/Resource.js');
const { Folder } = require('lib/models/folder.js'); const Folder = require('lib/models/Folder.js');
const { NoteTag } = require('lib/models/note-tag.js'); const NoteTag = require('lib/models/NoteTag.js');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
const { Tag } = require('lib/models/tag.js'); const Tag = require('lib/models/Tag.js');
const { basename } = require('lib/path-utils.js'); const { basename } = require('lib/path-utils.js');
const fs = require('fs-extra'); const fs = require('fs-extra');

6
ReactNativeClient/lib/services/report.js
View File

@@ -1,8 +1,8 @@
const { time } = require('lib/time-utils'); const { time } = require('lib/time-utils');
const { BaseItem } = require('lib/models/base-item.js'); const BaseItem = require('lib/models/BaseItem.js');
const Alarm = require('lib/models/Alarm'); const Alarm = require('lib/models/Alarm');
const { Folder } = require('lib/models/folder.js'); const Folder = require('lib/models/Folder.js');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
const { _ } = require('lib/locale.js'); const { _ } = require('lib/locale.js');
class ReportService { class ReportService {

6
ReactNativeClient/lib/shim-init-node.js
View File

@@ -30,7 +30,7 @@ function shimInit() {
const resizeImage_ = async function(filePath, targetPath) { const resizeImage_ = async function(filePath, targetPath) {
const sharp = require('sharp'); const sharp = require('sharp');
const { Resource } = require('lib/models/resource.js'); const Resource = require('lib/models/Resource.js');
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
sharp(filePath) sharp(filePath)
@@ -48,11 +48,11 @@ function shimInit() {
} }
shim.attachFileToNote = async function(note, filePath) { shim.attachFileToNote = async function(note, filePath) {
const { Resource } = require('lib/models/resource.js'); const Resource = require('lib/models/Resource.js');
const { uuid } = require('lib/uuid.js'); const { uuid } = require('lib/uuid.js');
const { basename, fileExtension, safeFileExtension } = require('lib/path-utils.js'); const { basename, fileExtension, safeFileExtension } = require('lib/path-utils.js');
const mime = require('mime/lite'); const mime = require('mime/lite');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
if (!(await fs.pathExists(filePath))) throw new Error(_('Cannot access %s', filePath)); if (!(await fs.pathExists(filePath))) throw new Error(_('Cannot access %s', filePath));

10
ReactNativeClient/lib/synchronizer.js
View File

@@ -1,8 +1,8 @@
const { BaseItem } = require('lib/models/base-item.js'); const BaseItem = require('lib/models/BaseItem.js');
const { Folder } = require('lib/models/folder.js'); const Folder = require('lib/models/Folder.js');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
const { Resource } = require('lib/models/resource.js'); const Resource = require('lib/models/Resource.js');
const { BaseModel } = require('lib/base-model.js'); const BaseModel = require('lib/BaseModel.js');
const { sprintf } = require('sprintf-js'); const { sprintf } = require('sprintf-js');
const { time } = require('lib/time-utils.js'); const { time } = require('lib/time-utils.js');
const { Logger } = require('lib/logger.js'); const { Logger } = require('lib/logger.js');

16
ReactNativeClient/root.js
View File

@@ -12,15 +12,15 @@ const { Log } = require('lib/log.js');
const { time } = require('lib/time-utils.js'); const { time } = require('lib/time-utils.js');
const { AppNav } = require('lib/components/app-nav.js'); const { AppNav } = require('lib/components/app-nav.js');
const { Logger } = require('lib/logger.js'); const { Logger } = require('lib/logger.js');
const { Note } = require('lib/models/note.js'); const Note = require('lib/models/Note.js');
const { Folder } = require('lib/models/folder.js'); const Folder = require('lib/models/Folder.js');
const BaseSyncTarget = require('lib/BaseSyncTarget.js'); const BaseSyncTarget = require('lib/BaseSyncTarget.js');
const { FoldersScreenUtils } = require('lib/folders-screen-utils.js'); const { FoldersScreenUtils } = require('lib/folders-screen-utils.js');
const { Resource } = require('lib/models/resource.js'); const Resource = require('lib/models/Resource.js');
const { Tag } = require('lib/models/tag.js'); const Tag = require('lib/models/Tag.js');
const { NoteTag } = require('lib/models/note-tag.js'); const NoteTag = require('lib/models/NoteTag.js');
const { BaseItem } = require('lib/models/base-item.js'); const BaseItem = require('lib/models/BaseItem.js');
const { BaseModel } = require('lib/base-model.js'); const BaseModel = require('lib/BaseModel.js');
const { JoplinDatabase } = require('lib/joplin-database.js'); const { JoplinDatabase } = require('lib/joplin-database.js');
const { Database } = require('lib/database.js'); const { Database } = require('lib/database.js');
const { NotesScreen } = require('lib/components/screens/notes.js'); const { NotesScreen } = require('lib/components/screens/notes.js');
@@ -32,7 +32,7 @@ const { StatusScreen } = require('lib/components/screens/status.js');
const { WelcomeScreen } = require('lib/components/screens/welcome.js'); const { WelcomeScreen } = require('lib/components/screens/welcome.js');
const { SearchScreen } = require('lib/components/screens/search.js'); const { SearchScreen } = require('lib/components/screens/search.js');
const { OneDriveLoginScreen } = require('lib/components/screens/onedrive-login.js'); const { OneDriveLoginScreen } = require('lib/components/screens/onedrive-login.js');
const { Setting } = require('lib/models/setting.js'); const Setting = require('lib/models/Setting.js');
const { MenuContext } = require('react-native-popup-menu'); const { MenuContext } = require('react-native-popup-menu');
const { SideMenu } = require('lib/components/side-menu.js'); const { SideMenu } = require('lib/components/side-menu.js');
const { SideMenuContent } = require('lib/components/side-menu-content.js'); const { SideMenuContent } = require('lib/components/side-menu-content.js');