update folder

zktx-io · Nov 28, 2024 · 1b17dcc · 1b17dcc
1 parent 7d11e2b
commit 1b17dcc
Show file tree

Hide file tree

Showing 51 changed files with 28 additions and 26 deletions.
diff --git a/.vscodeignore b/.vscodeignore
@@ -7,8 +7,8 @@ out/test/**
 
 # Ignore source code
 src/**
-!src/webview/build/
-!src/webview/build/**
+!src/webview/activitybar/build/
+!src/webview/activitybar/build/**
 
 # Ignore Misc
 .yarnrc

diff --git a/package.json b/package.json
@@ -39,7 +39,7 @@
     "views": {
       "extensionSidebarAptos": [
         {
-          "id": "webviewViewProviderAptos",
+          "id": "activitybarPoviderAptos",
           "type": "webview",
           "name": "Aptos Extension"
         }
@@ -59,7 +59,7 @@
       "view/title": [
         {
           "command": "aptos-extension.openDocs",
-          "when": "view == webviewViewProviderAptos",
+          "when": "view == activitybarPoviderAptos",
           "group": "navigation"
         }
       ]
@@ -79,10 +79,10 @@
   "scripts": {
     "open-in-browser": "npm run build:all && vscode-test-web --extensionDevelopmentPath=. .",
     "build:all": "npm run build:webview && npm run compile",
-    "install:all": "npm install && cd src/webview && npm install",
-    "start:webview": "cd src/webview && npm run start",
-    "build:webview": "cd src/webview && npm run build",
-    "test:webview": "cd src/webview && npm run test",
+    "install:all": "npm install && cd src/webview/activitybar && npm install",
+    "start:webview": "cd src/webview/activitybar && npm run start",
+    "build:webview": "cd src/webview/activitybar && npm run build",
+    "test:webview": "cd src/webview/activitybar && npm run test",
     "vscode:prepublish": "npm run package",
     "compile": "webpack",
     "watch": "webpack --watch",

diff --git a/src/extension.ts b/src/extension.ts
@@ -1,11 +1,11 @@
 import * as vscode from 'vscode';
-import { WebviewViewProvider } from './webviewPovider';
+import { ActivitybarPovider } from './webview/activitybarPovider';
 
 export function activate(context: vscode.ExtensionContext) {
-  const provider = new WebviewViewProvider(context);
+  const provider = new ActivitybarPovider(context);
   context.subscriptions.push(
     vscode.window.registerWebviewViewProvider(
-      WebviewViewProvider.viewType,
+      ActivitybarPovider.viewType,
       provider,
     ),
   );

diff --git a/src/utilities/account.ts b/src/utilities/account.ts
@@ -1,5 +1,5 @@
 import * as vscode from 'vscode';
-import { IAccount } from '../webview/src/recoil';
+import { IAccount } from '../webview/activitybar/src/recoil';
 
 export const accountStore = async (
   context: vscode.ExtensionContext,

diff --git a/src/utilities/authCode.ts b/src/utilities/authCode.ts
@@ -4,7 +4,7 @@ import {
   ClientSecret,
   UrlAuthCode,
   UrlCallback,
-} from '../webview/src/utilities/commends';
+} from '../webview/activitybar/src/utilities/commends';
 
 const exchangeAuthCodeForJwt = async (
   authCode: string,

diff --git a/src/utilities/fileWatcher.ts b/src/utilities/fileWatcher.ts
@@ -1,7 +1,7 @@
 import * as vscode from 'vscode';
 import * as path from 'path';
-import { COMMENDS } from '../webview/src/utilities/commends';
-import { ByteDump } from '../webview/src/utilities/cli';
+import { COMMENDS } from '../webview/activitybar/src/utilities/commends';
+import { ByteDump } from '../webview/activitybar/src/utilities/cli';
 
 const MoveToml = 'Move.toml';
 

diff --git a/src/webview/.gitignore → src/webview/activitybar/.gitignore b/src/webview/.gitignore → src/webview/activitybar/.gitignore
diff --git a/src/webview/README.md → src/webview/activitybar/README.md b/src/webview/README.md → src/webview/activitybar/README.md
diff --git a/src/webview/package-lock.json → src/webview/activitybar/package-lock.json b/src/webview/package-lock.json → src/webview/activitybar/package-lock.json
diff --git a/src/webview/package.json → src/webview/activitybar/package.json b/src/webview/package.json → src/webview/activitybar/package.json
diff --git a/src/webview/public/favicon.ico → src/webview/activitybar/public/favicon.ico b/src/webview/public/favicon.ico → src/webview/activitybar/public/favicon.ico
diff --git a/src/webview/public/index.html → src/webview/activitybar/public/index.html b/src/webview/public/index.html → src/webview/activitybar/public/index.html
diff --git a/src/webview/public/logo192.png → src/webview/activitybar/public/logo192.png b/src/webview/public/logo192.png → src/webview/activitybar/public/logo192.png
diff --git a/src/webview/public/logo512.png → src/webview/activitybar/public/logo512.png b/src/webview/public/logo512.png → src/webview/activitybar/public/logo512.png
diff --git a/src/webview/public/manifest.json → src/webview/activitybar/public/manifest.json b/src/webview/public/manifest.json → src/webview/activitybar/public/manifest.json
diff --git a/src/webview/public/robots.txt → src/webview/activitybar/public/robots.txt b/src/webview/public/robots.txt → src/webview/activitybar/public/robots.txt
diff --git a/src/webview/scripts/build-react-no-split.js → ...tivitybar/scripts/build-react-no-split.js b/src/webview/scripts/build-react-no-split.js → ...tivitybar/scripts/build-react-no-split.js
diff --git a/src/webview/src/App.css → src/webview/activitybar/src/App.css b/src/webview/src/App.css → src/webview/activitybar/src/App.css
diff --git a/src/webview/src/App.test.tsx → src/webview/activitybar/src/App.test.tsx b/src/webview/src/App.test.tsx → src/webview/activitybar/src/App.test.tsx
diff --git a/src/webview/src/App.tsx → src/webview/activitybar/src/App.tsx b/src/webview/src/App.tsx → src/webview/activitybar/src/App.tsx
diff --git a/src/webview/src/components/Account.tsx → ...ew/activitybar/src/components/Account.tsx b/src/webview/src/components/Account.tsx → ...ew/activitybar/src/components/Account.tsx
diff --git a/...ebview/src/components/ExplorerPackage.tsx → ...itybar/src/components/ExplorerPackage.tsx b/...ebview/src/components/ExplorerPackage.tsx → ...itybar/src/components/ExplorerPackage.tsx
diff --git a/src/webview/src/components/Function.tsx → ...w/activitybar/src/components/Function.tsx b/src/webview/src/components/Function.tsx → ...w/activitybar/src/components/Function.tsx
diff --git a/src/webview/src/components/Package.tsx → ...ew/activitybar/src/components/Package.tsx b/src/webview/src/components/Package.tsx → ...ew/activitybar/src/components/Package.tsx
diff --git a/src/webview/src/components/SpinButton.tsx → ...activitybar/src/components/SpinButton.tsx b/src/webview/src/components/SpinButton.tsx → ...activitybar/src/components/SpinButton.tsx
diff --git a/...view/src/components/VectorInputFields.tsx → ...ybar/src/components/VectorInputFields.tsx b/...view/src/components/VectorInputFields.tsx → ...ybar/src/components/VectorInputFields.tsx
diff --git a/src/webview/src/components/Workspace.tsx → .../activitybar/src/components/Workspace.tsx b/src/webview/src/components/Workspace.tsx → .../activitybar/src/components/Workspace.tsx
diff --git a/src/webview/src/index.tsx → src/webview/activitybar/src/index.tsx b/src/webview/src/index.tsx → src/webview/activitybar/src/index.tsx
diff --git a/src/webview/src/react-app-env.d.ts → ...ebview/activitybar/src/react-app-env.d.ts b/src/webview/src/react-app-env.d.ts → ...ebview/activitybar/src/react-app-env.d.ts
diff --git a/src/webview/src/recoil/index.ts → src/webview/activitybar/src/recoil/index.ts b/src/webview/src/recoil/index.ts → src/webview/activitybar/src/recoil/index.ts
diff --git a/src/webview/src/reportWebVitals.ts → ...ebview/activitybar/src/reportWebVitals.ts b/src/webview/src/reportWebVitals.ts → ...ebview/activitybar/src/reportWebVitals.ts
diff --git a/src/webview/src/setupTests.ts → src/webview/activitybar/src/setupTests.ts b/src/webview/src/setupTests.ts → src/webview/activitybar/src/setupTests.ts
diff --git a/src/webview/src/utilities/cli.ts → src/webview/activitybar/src/utilities/cli.ts b/src/webview/src/utilities/cli.ts → src/webview/activitybar/src/utilities/cli.ts
diff --git a/src/webview/src/utilities/commends.ts → ...iew/activitybar/src/utilities/commends.ts b/src/webview/src/utilities/commends.ts → ...iew/activitybar/src/utilities/commends.ts
diff --git a/src/webview/src/utilities/createNonce.ts → .../activitybar/src/utilities/createNonce.ts b/src/webview/src/utilities/createNonce.ts → .../activitybar/src/utilities/createNonce.ts
diff --git a/src/webview/src/utilities/createProof.ts → .../activitybar/src/utilities/createProof.ts b/src/webview/src/utilities/createProof.ts → .../activitybar/src/utilities/createProof.ts
diff --git a/src/webview/src/utilities/faucet.ts → ...bview/activitybar/src/utilities/faucet.ts b/src/webview/src/utilities/faucet.ts → ...bview/activitybar/src/utilities/faucet.ts
diff --git a/src/webview/src/utilities/getBalance.ts → ...w/activitybar/src/utilities/getBalance.ts b/src/webview/src/utilities/getBalance.ts → ...w/activitybar/src/utilities/getBalance.ts
diff --git a/src/webview/src/utilities/googleLogin.ts → .../activitybar/src/utilities/googleLogin.ts b/src/webview/src/utilities/googleLogin.ts → .../activitybar/src/utilities/googleLogin.ts
diff --git a/src/webview/src/utilities/helper.ts → ...bview/activitybar/src/utilities/helper.ts b/src/webview/src/utilities/helper.ts → ...bview/activitybar/src/utilities/helper.ts
diff --git a/src/webview/src/utilities/loadPackageData.ts → ...ivitybar/src/utilities/loadPackageData.ts b/src/webview/src/utilities/loadPackageData.ts → ...ivitybar/src/utilities/loadPackageData.ts
diff --git a/src/webview/src/utilities/moveCall.ts → ...iew/activitybar/src/utilities/moveCall.ts b/src/webview/src/utilities/moveCall.ts → ...iew/activitybar/src/utilities/moveCall.ts
diff --git a/src/webview/src/utilities/moveView.ts → ...iew/activitybar/src/utilities/moveView.ts b/src/webview/src/utilities/moveView.ts → ...iew/activitybar/src/utilities/moveView.ts
diff --git a/src/webview/src/utilities/packagePublish.ts → ...tivitybar/src/utilities/packagePublish.ts b/src/webview/src/utilities/packagePublish.ts → ...tivitybar/src/utilities/packagePublish.ts
diff --git a/src/webview/src/utilities/parameterFilter.ts → ...ivitybar/src/utilities/parameterFilter.ts b/src/webview/src/utilities/parameterFilter.ts → ...ivitybar/src/utilities/parameterFilter.ts
diff --git a/src/webview/src/utilities/signAndExcute.ts → ...ctivitybar/src/utilities/signAndExcute.ts b/src/webview/src/utilities/signAndExcute.ts → ...ctivitybar/src/utilities/signAndExcute.ts
diff --git a/src/webview/src/utilities/stateController.ts → ...ivitybar/src/utilities/stateController.ts b/src/webview/src/utilities/stateController.ts → ...ivitybar/src/utilities/stateController.ts
diff --git a/src/webview/src/utilities/vscode.ts → ...bview/activitybar/src/utilities/vscode.ts b/src/webview/src/utilities/vscode.ts → ...bview/activitybar/src/utilities/vscode.ts
diff --git a/src/webview/tsconfig.json → src/webview/activitybar/tsconfig.json b/src/webview/tsconfig.json → src/webview/activitybar/tsconfig.json
diff --git a/src/webviewPovider.ts → src/webview/activitybarPovider.ts b/src/webviewPovider.ts → src/webview/activitybarPovider.ts
@@ -1,20 +1,20 @@
 import * as vscode from 'vscode';
-import { getUri } from './utilities/getUri';
-import { getNonce } from './utilities/getNonce';
-import { hasTerminal } from './utilities/hasTerminal';
-import { COMMENDS } from './webview/src/utilities/commends';
-import { FileWathcer } from './utilities/fileWatcher';
-import { accountLoad, accountStore } from './utilities/account';
-import { exchangeToken } from './utilities/authCode';
+import { getUri } from '../utilities/getUri';
+import { getNonce } from '../utilities/getNonce';
+import { hasTerminal } from '../utilities/hasTerminal';
+import { COMMENDS } from '../webview/activitybar/src/utilities/commends';
+import { FileWathcer } from '../utilities/fileWatcher';
+import { accountLoad, accountStore } from '../utilities/account';
+import { exchangeToken } from '../utilities/authCode';
 import {
   CHANNEL,
   COMPILER,
   COMPILER_URL,
   MoveToml,
-} from './webview/src/utilities/cli';
+} from './activitybar/src/utilities/cli';
 
-export class WebviewViewProvider implements vscode.WebviewViewProvider {
-  public static readonly viewType = 'webviewViewProviderAptos';
+export class ActivitybarPovider implements vscode.WebviewViewProvider {
+  public static readonly viewType = 'activitybarPoviderAptos';
   private _view?: vscode.WebviewView;
 
   private readonly _context;
@@ -168,6 +168,7 @@ export class WebviewViewProvider implements vscode.WebviewViewProvider {
     const stylesUri = getUri(webview, extensionUri, [
       'src',
       'webview',
+      'activitybar',
       'build',
       'static',
       'css',
@@ -176,6 +177,7 @@ export class WebviewViewProvider implements vscode.WebviewViewProvider {
     const scriptUri = getUri(webview, extensionUri, [
       'src',
       'webview',
+      'activitybar',
       'build',
       'static',
       'js',

diff --git a/tsconfig.json b/tsconfig.json
@@ -8,5 +8,5 @@
     "outDir": "out",
     "strict": true
   },
-  "exclude": ["node_modules", "src/webview", ".vscode-test-web"]
+  "exclude": ["node_modules", "src/webview/activitybar", ".vscode-test-web"]
 }