Skip to content

Commit

Permalink
global: run prettier & eslint on all files
Browse files Browse the repository at this point in the history
  • Loading branch information
thecodrr committed Jun 26, 2023
1 parent 42a76c6 commit 408cd5a
Show file tree
Hide file tree
Showing 26 changed files with 83 additions and 87 deletions.
6 changes: 3 additions & 3 deletions .github/actions/setup-node-with-cache/action.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: 'Setup node with cache action'
description: 'Setups node with cache'
name: "Setup node with cache action"
description: "Setups node with cache"

runs:
using: "composite"
Expand All @@ -24,4 +24,4 @@ runs:
packages/editor/package-lock.json
packages/logger/package-lock.json
packages/streamable-fs/package-lock.json
packages/theme/package-lock.json
packages/theme/package-lock.json
4 changes: 0 additions & 4 deletions .github/dco.yml

This file was deleted.

8 changes: 4 additions & 4 deletions .github/workflows/android.publish.internal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ jobs:
- name: Use specific Java version for the builds
uses: joschi/setup-jdk@v2
with:
java-version: '11'
architecture: 'x64'
java-version: "11"
architecture: "x64"

- name: Install node modules
run: |
Expand All @@ -37,7 +37,7 @@ jobs:
signingKeyBase64: ${{ secrets.SIGNING_KEY }}
alias: ${{ secrets.ALIAS }}
keyStorePassword: ${{ secrets.KEY_PASSWORD }}
keyPassword: ${{ secrets.KEY_PASSWORD }}
keyPassword: ${{ secrets.KEY_PASSWORD }}

- name: Publish to Playstore
id: deploy
Expand All @@ -48,4 +48,4 @@ jobs:
releaseFile: ${{steps.sign_app.outputs.signedReleaseFile}}
track: internal
status: completed
whatsNewDirectory: apps/mobile/native/android/releasenotes/
whatsNewDirectory: apps/mobile/native/android/releasenotes/
12 changes: 6 additions & 6 deletions .github/workflows/android.publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ jobs:
- name: Use specific Java version for the builds
uses: joschi/setup-jdk@v2
with:
java-version: '11'
architecture: 'x64'
java-version: "11"
architecture: "x64"

- name: Install node modules
run: |
Expand All @@ -37,7 +37,7 @@ jobs:
signingKeyBase64: ${{ secrets.SIGNING_KEY }}
alias: ${{ secrets.ALIAS }}
keyStorePassword: ${{ secrets.KEY_PASSWORD }}
keyPassword: ${{ secrets.KEY_PASSWORD }}
keyPassword: ${{ secrets.KEY_PASSWORD }}

- name: Publish to Playstore
id: deploy
Expand All @@ -48,7 +48,7 @@ jobs:
releaseFiles: ${{steps.sign_app.outputs.signedReleaseFile}}
track: production
status: completed
whatsNewDirectory: apps/mobile/native/android/releasenotes/
whatsNewDirectory: apps/mobile/native/android/releasenotes/

- name: Build apks for Github release
run: yarn release:android
Expand All @@ -61,7 +61,7 @@ jobs:
signingKeyBase64: ${{ secrets.PUBLIC_SIGNING_KEY }}
alias: ${{ secrets.PUBLIC_ALIAS }}
keyStorePassword: ${{ secrets.PUBLIC_KEY_PASSWORD }}
keyPassword: ${{ secrets.PUBLIC_KEY_PASSWORD }}
keyPassword: ${{ secrets.PUBLIC_KEY_PASSWORD }}

- name: Rename apk files
run: |
Expand Down Expand Up @@ -89,4 +89,4 @@ jobs:
apps/mobile/native/android/app/build/outputs/apk/release/notesnook-arm64-v8a.apk
apps/mobile/native/android/app/build/outputs/apk/release/notesnook-armeabi-v7a.apk
apps/mobile/native/android/app/build/outputs/apk/release/notesnook-x86.apk
apps/mobile/native/android/app/build/outputs/apk/release/notesnook-x86_64.apk
apps/mobile/native/android/app/build/outputs/apk/release/notesnook-x86_64.apk
2 changes: 1 addition & 1 deletion .github/workflows/core.tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
paths:
- "packages/core/**"
# re-run workflow if workflow file changes
- ".github/workflows/core.tests.yml"
- ".github/workflows/core.tests.yml"
pull_request:
types:
- "ready_for_review"
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/desktop.publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ jobs:
echo ::set-output name=app_bundle_id::$(cat package.json | jq -r .build.appId)
echo ::set-output name=app_version::$(cat package.json | jq -r .version)
echo ::set-output name=bundle_version::$(cat package.json | jq -r .build.mac.bundleVersion)
- name: Get App Store Version
id: appstore
uses: streetwriters/appstore-connect-app-version@develop
Expand All @@ -114,7 +114,7 @@ jobs:
run: |
npm i --ignore-scripts --prefer-offline --no-audit
npx lerna bootstrap --scope=@notesnook/desktop --scope=@notesnook/crypto --scope=@notesnook/sodium -- --prefer-offline --no-audit
- name: Install provisioning profile
run: echo "${{ secrets.MAC_PROVISIONING_PROFILE }}" | base64 --decode > embedded.provisionprofile
working-directory: ./apps/desktop
Expand Down Expand Up @@ -151,7 +151,7 @@ jobs:
env:
API_KEY_ID: ${{ secrets.api_key_id }}
API_KEY_ISSUER_ID: ${{ secrets.api_key_issuer_id }}
run: |
run: |
package=$(find ./output/mas-universal/notesnook*.pkg)
echo "Uploading ${package} using altool..."
Expand Down Expand Up @@ -252,4 +252,4 @@ jobs:
} else {
yarn electron-builder --win --publish never
}
working-directory: ./apps/desktop
working-directory: ./apps/desktop
2 changes: 1 addition & 1 deletion .github/workflows/nscurl.test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ jobs:

steps:
- name: Run ats-diagnostics
run: nscurl --ats-diagnostics https://payments.streetwriters.co
run: nscurl --ats-diagnostics https://payments.streetwriters.co
2 changes: 1 addition & 1 deletion apps/mobile/.vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@
"request": "attach"
}
]
}
}
Empty file.
2 changes: 1 addition & 1 deletion apps/mobile/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@
"@notesnook/logger": "*",
"@notesnook/common": "*"
}
}
}
4 changes: 3 additions & 1 deletion apps/mobile/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
"types": ["node", "jest", "detox"],
"paths": {
"@notesnook/*": ["../../packages"],
"@notifee/react-native": ["./node_modules/@ammarahmed/notifee-react-native"]
"@notifee/react-native": [
"./node_modules/@ammarahmed/notifee-react-native"
]
},
"incremental": true
},
Expand Down
1 change: 0 additions & 1 deletion apps/web/src/components/icons/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,6 @@ import {
mdiInformationOutline,
mdiHeadCogOutline,
mdiFormTextarea,
mdiDatabaseExportOutline,
mdiGavel,
mdiDesktopClassic,
mdiBellBadgeOutline
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/hooks/use-database.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

import { useEffect, useState } from "react";
import { initializeDatabase, db } from "../common/db";
import { initializeDatabase } from "../common/db";
import "allotment/dist/style.css";
import "../utils/analytics";
import "../app.css";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ The following steps will help you import your notes from EverNote easily.
<img style="margin-bottom:15px;" src="/static/evernote-importer/6.png" alt="Download importer .zip file"/>

7. After you have downloaded the `.zip` file, go to Notesnook app > Settings > Notesnook Importer and click on "Import from ZIP file" & select the .zip you downloaded earlier.
<img style="margin-bottom:15px;" src="/static/import-zip-app.png" alt="Import .zip in Notesnook app"/>
<img style="margin-bottom:15px;" src="/static/import-zip-app.png" alt="Import .zip in Notesnook app"/>

8. Once importing completes you should see all your notes in Notesnook. If you face any issues during importing, [report it on github](https://github.com/streetwriters/notesnook).
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ To import html files to notesnook go to Notesnook Importer on your PC/Laptop.
2. Drop your html files or click anywhere inside the box to browse and select your html files. Once selected, click on "Start processing".
<img style="margin-bottom:15px;" src="/static/html/2.png" alt="From the list of formats to import, select Plain Text."/>

5. Once importer completes processing, download the .zip file.
3. Once importer completes processing, download the .zip file.
<img style="margin-bottom:15px;" src="/static/html/3.png" alt="Download importer .zip file"/>

6. After you have downloaded the `.zip` file, go to Notesnook app > Settings > Notesnook Importer and click on "Import from ZIP file" & select the .zip you downloaded earlier.
<img style="margin-bottom:15px;" src="/static/import-zip-app.png" alt="Import .zip in Notesnook app"/>
4. After you have downloaded the `.zip` file, go to Notesnook app > Settings > Notesnook Importer and click on "Import from ZIP file" & select the .zip you downloaded earlier.
<img style="margin-bottom:15px;" src="/static/import-zip-app.png" alt="Import .zip in Notesnook app"/>

7. Once importing completes you should see all your notes in Notesnook. If you face any issues during importing, [report it on github](https://github.com/streetwriters/notesnook).
5. Once importing completes you should see all your notes in Notesnook. If you face any issues during importing, [report it on github](https://github.com/streetwriters/notesnook).
10 changes: 5 additions & 5 deletions docs/help/contents/importing-notes/import-notes-from-joplin.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ title: Joplin
# How do I import notes from Joplin notes app?

The following steps will help you import your notes from Joplin easily.

1. Open Joplin app on Desktop and click on `File` and select `Export All -> JEX - Joplin Export File` and save it in desired location.
<img style="margin-bottom:15px;" src="/static/joplin-importer/1.png" alt="Click on `File` and select `Export All -> JEX - Joplin Export File`"/>

Expand All @@ -15,10 +15,10 @@ The following steps will help you import your notes from Joplin easily.
3. Drop the .jex backup file you exported earlier from Joplin in the box or click anywhere to open system file picker to select the backup.
<img style="margin-bottom:15px;" src="/static/joplin-importer/3.png" alt="Drop the .zip backup file you exported earlier from Standard Notes in the box or click anywhere to open system file picker to select the backup."/>

5. Once importer completes processing, download the .zip file.
4. Once importer completes processing, download the .zip file.
<img style="margin-bottom:15px;" src="/static/joplin-importer/4.png" alt="Download importer .zip file"/>

6. After you have downloaded the `.zip` file, go to Notesnook app > Settings > Notesnook Importer and click on "Import from ZIP file" & select the .zip you downloaded earlier.
<img style="margin-bottom:15px;" src="/static/import-zip-app.png" alt="Import .zip in Notesnook app"/>
5. After you have downloaded the `.zip` file, go to Notesnook app > Settings > Notesnook Importer and click on "Import from ZIP file" & select the .zip you downloaded earlier.
<img style="margin-bottom:15px;" src="/static/import-zip-app.png" alt="Import .zip in Notesnook app"/>

7. Once importing completes you should see all your notes in Notesnook. If you face any issues during importing, [report it on github](https://github.com/streetwriters/notesnook).
6. Once importing completes you should see all your notes in Notesnook. If you face any issues during importing, [report it on github](https://github.com/streetwriters/notesnook).
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ To import markdown files to notesnook go to Notesnook Importer on your PC/Laptop
2. Drop your markdown files or click anywhere inside the box to browse and select your markdown files and then click "Start processing".
<img style="margin-bottom:15px;" src="/static/markdown-importer/2.png" alt="Drop your markdown files or click anywhere inside the box to browse and select your markdown files."/>

5. Once importer completes processing, download the .zip file.
3. Once importer completes processing, download the .zip file.
<img style="margin-bottom:15px;" src="/static/markdown-importer/6.png" alt="Download importer .zip file"/>

6. After you have downloaded the `.zip` file, go to Notesnook app > Settings > Notesnook Importer and click on "Import from ZIP file" & select the .zip you downloaded earlier.
<img style="margin-bottom:15px;" src="/static/import-zip-app.png" alt="Import .zip in Notesnook app"/>
4. After you have downloaded the `.zip` file, go to Notesnook app > Settings > Notesnook Importer and click on "Import from ZIP file" & select the .zip you downloaded earlier.
<img style="margin-bottom:15px;" src="/static/import-zip-app.png" alt="Import .zip in Notesnook app"/>

7. Once importing completes you should see all your notes in Notesnook. If you face any issues during importing, [report it on github](https://github.com/streetwriters/notesnook).
5. Once importing completes you should see all your notes in Notesnook. If you face any issues during importing, [report it on github](https://github.com/streetwriters/notesnook).
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ The following steps will help you import your notes from Simplenote easily.
6. Drop the .zip backup file you exported earlier from Simplenote in the box or click anywhere to open system file picker to select the backup and click "Start processing".
<img style="margin-bottom:15px;" src="/static/simplenote-importer/4.png" alt="Drop the .zip backup file you exported earlier from Standard Notes in the box or click anywhere to open system file picker to select the backup."/>

5. Once importer completes processing, download the .zip file.
7. Once importer completes processing, download the .zip file.
<img style="margin-bottom:15px;" src="/static/simplenote-importer/5.png" alt="Download importer .zip file"/>

6. After you have downloaded the `.zip` file, go to Notesnook app > Settings > Notesnook Importer and click on "Import from ZIP file" & select the .zip you downloaded earlier.
<img style="margin-bottom:15px;" src="/static/import-zip-app.png" alt="Import .zip in Notesnook app"/>
8. After you have downloaded the `.zip` file, go to Notesnook app > Settings > Notesnook Importer and click on "Import from ZIP file" & select the .zip you downloaded earlier.
<img style="margin-bottom:15px;" src="/static/import-zip-app.png" alt="Import .zip in Notesnook app"/>

7. Once importing completes you should see all your notes in Notesnook. If you face any issues during importing, [report it on github](https://github.com/streetwriters/notesnook).
9. Once importing completes you should see all your notes in Notesnook. If you face any issues during importing, [report it on github](https://github.com/streetwriters/notesnook).
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ The following steps will help you import your notes from Standard notes easily.
6. Drop the .zip backup file you exported earlier from Standard Notes in the box or click anywhere to open system file picker to select the backup.
<img style="margin-bottom:15px;" src="/static/standard-notes-importer/4.png" alt="Drop the .zip backup file you exported earlier from Standard Notes in the box or click anywhere to open system file picker to select the backup."/>

5. Once importer completes processing, download the .zip file.
7. Once importer completes processing, download the .zip file.
<img style="margin-bottom:15px;" src="/static/standard-notes-importer/5.png" alt="Download importer .zip file"/>

6. After you have downloaded the `.zip` file, go to Notesnook app > Settings > Notesnook Importer and click on "Import from ZIP file" & select the .zip you downloaded earlier.
<img style="margin-bottom:15px;" src="/static/import-zip-app.png" alt="Import .zip in Notesnook app"/>
8. After you have downloaded the `.zip` file, go to Notesnook app > Settings > Notesnook Importer and click on "Import from ZIP file" & select the .zip you downloaded earlier.
<img style="margin-bottom:15px;" src="/static/import-zip-app.png" alt="Import .zip in Notesnook app"/>

7. Once importing completes you should see all your notes in Notesnook. If you face any issues during importing, [report it on github](https://github.com/streetwriters/notesnook).
9. Once importing completes you should see all your notes in Notesnook. If you face any issues during importing, [report it on github](https://github.com/streetwriters/notesnook).
2 changes: 1 addition & 1 deletion docs/help/contents/mobile-integration/README.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
# Mobile integration
# Mobile integration
26 changes: 12 additions & 14 deletions extensions/web-clipper/public/index.html
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1" />

<title></title>
</head>

<body>
<div id="root"></div>
</body>

</html>
<head>
<meta charset="UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1" />

<title></title>
</head>

<body>
<div id="root"></div>
</body>
</html>
2 changes: 1 addition & 1 deletion packages/clipper/src/images.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ async function inlineImage(element: HTMLImageElement, options?: FetchOptions) {
return element;
}

return new Promise<HTMLImageElement | null>(function(resolve, reject) {
return new Promise<HTMLImageElement | null>(function (resolve, reject) {
if (element.parentElement?.tagName === "PICTURE") {
element.parentElement?.replaceWith(element);
}
Expand Down
3 changes: 2 additions & 1 deletion packages/editor/src/components/resizer/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ export function Resizer(props: PropsWithChildren<ResizerProps>) {
style
} = props;

if (!editor.isEditable) return <Flex sx={{position:"relative"}}>{children}</Flex>;
if (!editor.isEditable)
return <Flex sx={{ position: "relative" }}>{children}</Flex>;

return (
<Resizable
Expand Down
20 changes: 10 additions & 10 deletions packages/editor/src/extensions/attachment/component.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export function AttachmentComponent(
const { editor, node, selected } = props;
const { filename, size, progress } = node.attrs;
const elementRef = useRef<HTMLSpanElement>();

return (
<>
<Box
Expand Down Expand Up @@ -87,15 +87,15 @@ export function AttachmentComponent(
{selected && (
<ToolbarGroup
editor={editor}
tools={ editor.isEditable ? [
"removeAttachment",
"downloadAttachment",
"previewAttachment"
] : [
"downloadAttachment",
"previewAttachment"
]
}
tools={
editor.isEditable
? [
"removeAttachment",
"downloadAttachment",
"previewAttachment"
]
: ["downloadAttachment", "previewAttachment"]
}
sx={{
boxShadow: "menu",
borderRadius: "default",
Expand Down
4 changes: 2 additions & 2 deletions packages/editor/src/extensions/key-map/key-map.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ export const KeyMap = Extension.create({
},
Backspace: ({ editor }) => {
return joinUpWithLastListItem(editor);
},
}
};
},
}
});

/**
Expand Down
Loading

0 comments on commit 408cd5a

Please sign in to comment.