Skip to content

Commit

Permalink
[MS] Added prettier imports
Browse files Browse the repository at this point in the history
  • Loading branch information
Max-7 committed Dec 18, 2023
1 parent ba5d280 commit 5b05cd8
Show file tree
Hide file tree
Showing 127 changed files with 858 additions and 609 deletions.
1 change: 1 addition & 0 deletions client/.prettierrc.json5
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@
},
},
],
plugins: ['prettier-plugin-organize-imports'],
}
2 changes: 1 addition & 1 deletion client/electron/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import type { CapacitorElectronConfig } from '@capacitor-community/electron';
import { getCapacitorElectronConfig, setupElectronDeepLinking } from '@capacitor-community/electron';
import type { MenuItemConstructorOptions } from 'electron';
import { app, MenuItem, ipcMain, shell } from 'electron';
import { MenuItem, app, ipcMain, shell } from 'electron';
import electronIsDev from 'electron-is-dev';
import unhandled from 'electron-unhandled';
// import { autoUpdater } from 'electron-updater';
Expand Down
2 changes: 1 addition & 1 deletion client/electron/src/rt/electron-rt.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Parsec Cloud (https://parsec.cloud) Copyright (c) BUSL-1.1 2016-present Scille SAS

import { randomBytes } from 'crypto';
import { ipcRenderer, contextBridge } from 'electron';
import { contextBridge, ipcRenderer } from 'electron';
import { EventEmitter } from 'events';

import plugins = require('./electron-plugins');
Expand Down
3 changes: 1 addition & 2 deletions client/electron/src/setup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@ import type { CapacitorElectronConfig } from '@capacitor-community/electron';
import { CapElectronEventEmitter, CapacitorSplashScreen, setupCapacitorElectronPlugins } from '@capacitor-community/electron';
import chokidar from 'chokidar';
import type { MenuItemConstructorOptions } from 'electron';
import { app, BrowserWindow, Menu, MenuItem, nativeImage, Tray, session, dialog, ipcMain } from 'electron';
import { BrowserWindow, Menu, MenuItem, Tray, app, nativeImage, session, shell } from 'electron';
import electronIsDev from 'electron-is-dev';
import electronServe from 'electron-serve';
import windowStateKeeper from 'electron-window-state';
import { join } from 'path';
import { shell } from 'electron';

// Define components for a watcher to detect when the webapp is changed so we can reload in Dev mode.
const reloadWatcher = {
Expand Down
250 changes: 250 additions & 0 deletions client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
"@typescript-eslint/eslint-plugin": "^6.10.0",
"@typescript-eslint/parser": "^6.10.0",
"@vitejs/plugin-vue": "^4.4.1",
"@volar/vue-typescript": "^1.6.5",
"@vue/eslint-config-typescript": "^12.0.0",
"@vue/test-utils": "^2.4.1",
"@zxcvbn-ts/core": "^3.0.4",
Expand All @@ -82,6 +83,7 @@
"eslint-plugin-vue-scoped-css": "^2.5.1",
"happy-dom": "^12.10.3",
"prettier": "3.1.0",
"prettier-plugin-organize-imports": "^3.2.4",
"sass": "^1.69.5",
"sass-loader": "^13.3.2",
"start-server-and-test": "^2.0.3",
Expand Down
8 changes: 4 additions & 4 deletions client/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
</template>

<script setup lang="ts">
import { IonApp, IonRouterOutlet } from '@ionic/vue';
import { inject, onMounted } from 'vue';
import { SplashScreen } from '@capacitor/splash-screen';
import { toggleDarkMode } from '@/states/darkMode';
import { StorageManagerKey } from '@/common/injectionKeys';
import { StorageManager } from '@/services/storageManager';
import { toggleDarkMode } from '@/states/darkMode';
import { SplashScreen } from '@capacitor/splash-screen';
import { IonApp, IonRouterOutlet } from '@ionic/vue';
import { inject, onMounted } from 'vue';
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const storageManager: StorageManager = inject(StorageManagerKey)!;
Expand Down
2 changes: 1 addition & 1 deletion client/src/common/injectionKeys.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ const StorageManagerKey = 'storageManager';
const NotificationKey = 'notification';
const ImportManagerKey = 'importManager';

export { FormattersKey, StorageManagerKey, NotificationKey, ImportManagerKey };
export { FormattersKey, ImportManagerKey, NotificationKey, StorageManagerKey };
2 changes: 1 addition & 1 deletion client/src/common/passwordValidation.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Parsec Cloud (https://parsec.cloud) Copyright (c) BUSL-1.1 2016-present Scille SAS

import { ComposerTranslation } from 'vue-i18n';
import { zxcvbn, zxcvbnOptions } from '@zxcvbn-ts/core';
import * as zxcvbnCommonPackage from '@zxcvbn-ts/language-common';
import { ComposerTranslation } from 'vue-i18n';

export enum PasswordStrength {
None = 0,
Expand Down
8 changes: 4 additions & 4 deletions client/src/common/validators.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
// Parsec Cloud (https://parsec.cloud) Copyright (c) BUSL-1.1 2016-present Scille SAS

import {
parseBackendAddr,
isValidUserName,
isValidEmail,
isValidDeviceName,
isValidWorkspaceName,
isValidEmail,
isValidEntryName,
isValidOrganizationName,
isValidUserName,
isValidWorkspaceName,
parseBackendAddr,
} from '@/parsec';
import { ParsedBackendAddrTag } from '@/plugins/libparsec';

Expand Down
Loading

0 comments on commit 5b05cd8

Please sign in to comment.