From 24413d400c93f5f51be06b01c28e1cb51e7a550c Mon Sep 17 00:00:00 2001 From: Cxxshyy Date: Mon, 26 Sep 2022 20:40:20 +0100 Subject: [PATCH 1/4] feat: Add Css style related to user vscode theme for text and background color --- media/vscode.css | 5 +++++ .../features/Request/Authorization/RequestAuthSelectMenu.js | 2 -- webview/features/Request/Body/RequestBodyRawOptions.js | 2 -- webview/features/Request/CodeSnippet/RequestCodeSnippet.js | 2 -- webview/features/Request/Url/RequestUrl.js | 1 - webview/features/Response/Body/ResponseBodyMenuOption.js | 2 -- 6 files changed, 5 insertions(+), 9 deletions(-) diff --git a/media/vscode.css b/media/vscode.css index 1686ee2..49837a3 100644 --- a/media/vscode.css +++ b/media/vscode.css @@ -92,3 +92,8 @@ textarea::placeholder { table { border: var(--default-border-size) solid var(--border); } + +a{ + background-color: var(--vscode-editor-background); + color: var(--vscode-textLink-foreground); +} diff --git a/webview/features/Request/Authorization/RequestAuthSelectMenu.js b/webview/features/Request/Authorization/RequestAuthSelectMenu.js index e1cb8eb..60130aa 100644 --- a/webview/features/Request/Authorization/RequestAuthSelectMenu.js +++ b/webview/features/Request/Authorization/RequestAuthSelectMenu.js @@ -45,8 +45,6 @@ const OptionWrapper = styled.select` border-radius: 0.25rem; font-size: 1.1rem; font-weight: 600; - background: transparent; - color: rgba(255, 255, 255, 0.78); `; export default RequestAuthSelectMenu; diff --git a/webview/features/Request/Body/RequestBodyRawOptions.js b/webview/features/Request/Body/RequestBodyRawOptions.js index ad8e6d4..686ba8a 100644 --- a/webview/features/Request/Body/RequestBodyRawOptions.js +++ b/webview/features/Request/Body/RequestBodyRawOptions.js @@ -67,8 +67,6 @@ const SelectOptionWrapper = styled.select` border-radius: 0.25rem; font-size: 1rem; font-weight: 500; - background: transparent; - color: rgba(255, 255, 255, 0.78); `; export default RequestBodyRawOptions; diff --git a/webview/features/Request/CodeSnippet/RequestCodeSnippet.js b/webview/features/Request/CodeSnippet/RequestCodeSnippet.js index 3e7cd38..02c24f9 100644 --- a/webview/features/Request/CodeSnippet/RequestCodeSnippet.js +++ b/webview/features/Request/CodeSnippet/RequestCodeSnippet.js @@ -167,8 +167,6 @@ const SelectOptionWrapper = styled.select` border-radius: 0.25rem; font-size: 1rem; font-weight: 500; - background: transparent; - color: rgba(255, 255, 255, 0.78); `; export default RequestCodeSnippet; diff --git a/webview/features/Request/Url/RequestUrl.js b/webview/features/Request/Url/RequestUrl.js index dbdb5bf..26d2b4b 100644 --- a/webview/features/Request/Url/RequestUrl.js +++ b/webview/features/Request/Url/RequestUrl.js @@ -56,7 +56,6 @@ const RequestUrl = () => { const InputContainer = styled.input` padding-left: 1.5rem; font-size: 1.15rem; - color: rgba(255, 255, 255, 0.78); `; export default RequestUrl; diff --git a/webview/features/Response/Body/ResponseBodyMenuOption.js b/webview/features/Response/Body/ResponseBodyMenuOption.js index 097690a..7e1e731 100644 --- a/webview/features/Response/Body/ResponseBodyMenuOption.js +++ b/webview/features/Response/Body/ResponseBodyMenuOption.js @@ -52,8 +52,6 @@ const SelectOptionWrapper = styled.select` border-radius: 0.25rem; font-size: 1rem; font-weight: 500; - background: transparent; - color: rgba(255, 255, 255, 0.78); `; export default ResponseBodyViewOption; From a6d043c4272e767cfb8de6f0b13b60da1655e182 Mon Sep 17 00:00:00 2001 From: Cxxshyy Date: Tue, 27 Sep 2022 12:46:19 +0100 Subject: [PATCH 2/4] Merge pull request #47 from REST-API-Client/feature/github-actions-pipeline [2022/09/03] - Add Github Actions CI/CD workflows --- .github/workflows/cicd.yaml | 27 +++++++++++++++++++++++++++ CHANGELOG.md | 4 ++++ README.md | 2 +- package-lock.json | 4 ++-- package.json | 2 +- src/extension.js | 2 +- webview/{app.js => App/index.js} | 2 +- 7 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 .github/workflows/cicd.yaml rename webview/{app.js => App/index.js} (69%) diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml new file mode 100644 index 0000000..cae7ba0 --- /dev/null +++ b/.github/workflows/cicd.yaml @@ -0,0 +1,27 @@ +name: Release and publish + +on: + push: + branches: + - main + +jobs: + release: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-node@v1 + with: + node-version: 16 + + - name: Install the dependencies + run: npm i + + - name: Install vsce + run: npm i -g vsce + + - name: Publish to marketplace + run: vsce publish -p $PERSONAL_ACCESS_TOKEN + env: + PERSONAL_ACCESS_TOKEN: ${{ secrets.VSCE_PAT }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 63eb52a..92ba69c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 1.0.8 + +#### Feature CI/CD github actions to deploy vscode extension to marketplace + ## 1.0.7 #### Feature Clicking history collection from sidebar now fills up the UI in main request panel diff --git a/README.md b/README.md index 5cfc088..3a8b06b 100644 --- a/README.md +++ b/README.md @@ -153,7 +153,7 @@ Simply click Open Menu button or open the Command Palette and type the command b ## 🗒 Changelog -#### Current version 1.0.7 +#### Current version 1.0.8 Visit [here](https://github.com/REST-API-Client/API-Client-VSCode-Extension/blob/main/CHANGELOG.md) for a detailed release notes diff --git a/package-lock.json b/package-lock.json index b759cf1..8c97267 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rest-api-client", - "version": "1.0.7", + "version": "1.0.8", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "rest-api-client", - "version": "1.0.7", + "version": "1.0.8", "license": "MIT", "dependencies": { "@monaco-editor/react": "^4.4.5", diff --git a/package.json b/package.json index 46be79c..7f18ceb 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "displayName": "REST API Client", "icon": "icons/images/icon.png", "description": "Simple and intuitive API Client made into a VSCode extension.", - "version": "1.0.7", + "version": "1.0.8", "license": "MIT", "bugs": { "url": "https://github.com/REST-API-Client/API-Client-VSCode-Extension/issues" diff --git a/src/extension.js b/src/extension.js index db49f86..6e6bfac 100644 --- a/src/extension.js +++ b/src/extension.js @@ -3,7 +3,7 @@ import vscode from "vscode"; import { COLLECTION, COMMAND, MESSAGE } from "./constants"; import ExtentionStateManager from "./ExtensionStateManger"; import MainWebViewPanel from "./MainWebViewPanel"; -import SidebarWebViewPanel from "./SideBarWebViewPanel"; +import SidebarWebViewPanel from "./SidebarWebViewPanel"; export async function activate(context) { const StateManager = new ExtentionStateManager(context); diff --git a/webview/app.js b/webview/App/index.js similarity index 69% rename from webview/app.js rename to webview/App/index.js index 847fa7a..8501bf2 100644 --- a/webview/app.js +++ b/webview/App/index.js @@ -1,6 +1,6 @@ import React from "react"; -import MainPage from "./pages/MainPage"; +import MainPage from "../pages/MainPage"; const App = () => { return ; From cc8cec88ae627248df20443c3e84a36b3414a58f Mon Sep 17 00:00:00 2001 From: Cxxshyy Date: Tue, 27 Sep 2022 13:11:14 +0100 Subject: [PATCH 3/4] feat: Add CSS Style --- .../features/Request/Authorization/RequestAuthSelectMenu.js | 2 +- webview/features/Request/Body/RequestBodyRawOptions.js | 2 +- webview/features/Request/CodeSnippet/RequestCodeSnippet.js | 2 +- webview/features/Request/Url/RequestUrl.js | 1 + webview/features/Response/Body/ResponseBodyMenuOption.js | 2 +- webview/features/Sidebar/Collection/SidebarCollection.js | 3 ++- 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/webview/features/Request/Authorization/RequestAuthSelectMenu.js b/webview/features/Request/Authorization/RequestAuthSelectMenu.js index e1cb8eb..4099f42 100644 --- a/webview/features/Request/Authorization/RequestAuthSelectMenu.js +++ b/webview/features/Request/Authorization/RequestAuthSelectMenu.js @@ -45,7 +45,7 @@ const OptionWrapper = styled.select` border-radius: 0.25rem; font-size: 1.1rem; font-weight: 600; - background: transparent; + background-color: var(--vscode-editor-background); color: rgba(255, 255, 255, 0.78); `; diff --git a/webview/features/Request/Body/RequestBodyRawOptions.js b/webview/features/Request/Body/RequestBodyRawOptions.js index ad8e6d4..8f87bf7 100644 --- a/webview/features/Request/Body/RequestBodyRawOptions.js +++ b/webview/features/Request/Body/RequestBodyRawOptions.js @@ -67,7 +67,7 @@ const SelectOptionWrapper = styled.select` border-radius: 0.25rem; font-size: 1rem; font-weight: 500; - background: transparent; + background-color: var(--vscode-editor-background); color: rgba(255, 255, 255, 0.78); `; diff --git a/webview/features/Request/CodeSnippet/RequestCodeSnippet.js b/webview/features/Request/CodeSnippet/RequestCodeSnippet.js index 3e7cd38..5a9208f 100644 --- a/webview/features/Request/CodeSnippet/RequestCodeSnippet.js +++ b/webview/features/Request/CodeSnippet/RequestCodeSnippet.js @@ -167,7 +167,7 @@ const SelectOptionWrapper = styled.select` border-radius: 0.25rem; font-size: 1rem; font-weight: 500; - background: transparent; + background-color: var(--vscode-editor-background); color: rgba(255, 255, 255, 0.78); `; diff --git a/webview/features/Request/Url/RequestUrl.js b/webview/features/Request/Url/RequestUrl.js index dbdb5bf..6e47934 100644 --- a/webview/features/Request/Url/RequestUrl.js +++ b/webview/features/Request/Url/RequestUrl.js @@ -56,6 +56,7 @@ const RequestUrl = () => { const InputContainer = styled.input` padding-left: 1.5rem; font-size: 1.15rem; + background-color: var(--vscode-editor-background); color: rgba(255, 255, 255, 0.78); `; diff --git a/webview/features/Response/Body/ResponseBodyMenuOption.js b/webview/features/Response/Body/ResponseBodyMenuOption.js index 097690a..bf26cef 100644 --- a/webview/features/Response/Body/ResponseBodyMenuOption.js +++ b/webview/features/Response/Body/ResponseBodyMenuOption.js @@ -52,7 +52,7 @@ const SelectOptionWrapper = styled.select` border-radius: 0.25rem; font-size: 1rem; font-weight: 500; - background: transparent; + background-color: var(--vscode-editor-background); color: rgba(255, 255, 255, 0.78); `; diff --git a/webview/features/Sidebar/Collection/SidebarCollection.js b/webview/features/Sidebar/Collection/SidebarCollection.js index eb9102f..15ec328 100644 --- a/webview/features/Sidebar/Collection/SidebarCollection.js +++ b/webview/features/Sidebar/Collection/SidebarCollection.js @@ -142,7 +142,8 @@ const UtilitySectionWrapper = styled.div` margin-top: 1rem; padding: 0.4rem 0.6rem; border-radius: 0.35rem; - color: white; + color: var(--default-text); + opacity: 0.78; } `; From 9a93cd69af9066292bad2e45918db5b4f33e39ce Mon Sep 17 00:00:00 2001 From: Cxxshyy Date: Tue, 27 Sep 2022 13:13:41 +0100 Subject: [PATCH 4/4] feat: Add CSS Style --- media/vscode.css | 4 ---- .../features/Request/Authorization/RequestAuthSelectMenu.js | 3 --- webview/features/Request/Body/RequestBodyRawOptions.js | 3 --- webview/features/Request/CodeSnippet/RequestCodeSnippet.js | 3 --- webview/features/Request/Url/RequestUrl.js | 3 --- webview/features/Response/Body/ResponseBodyMenuOption.js | 3 --- 6 files changed, 19 deletions(-) diff --git a/media/vscode.css b/media/vscode.css index 49837a3..f29e650 100644 --- a/media/vscode.css +++ b/media/vscode.css @@ -93,7 +93,3 @@ table { border: var(--default-border-size) solid var(--border); } -a{ - background-color: var(--vscode-editor-background); - color: var(--vscode-textLink-foreground); -} diff --git a/webview/features/Request/Authorization/RequestAuthSelectMenu.js b/webview/features/Request/Authorization/RequestAuthSelectMenu.js index 043ca46..4099f42 100644 --- a/webview/features/Request/Authorization/RequestAuthSelectMenu.js +++ b/webview/features/Request/Authorization/RequestAuthSelectMenu.js @@ -45,11 +45,8 @@ const OptionWrapper = styled.select` border-radius: 0.25rem; font-size: 1.1rem; font-weight: 600; -<<<<<<< HEAD background-color: var(--vscode-editor-background); color: rgba(255, 255, 255, 0.78); -======= ->>>>>>> e8a78b516d7612be146673ec1a8b392edf2373c7 `; export default RequestAuthSelectMenu; diff --git a/webview/features/Request/Body/RequestBodyRawOptions.js b/webview/features/Request/Body/RequestBodyRawOptions.js index 4d145af..8f87bf7 100644 --- a/webview/features/Request/Body/RequestBodyRawOptions.js +++ b/webview/features/Request/Body/RequestBodyRawOptions.js @@ -67,11 +67,8 @@ const SelectOptionWrapper = styled.select` border-radius: 0.25rem; font-size: 1rem; font-weight: 500; -<<<<<<< HEAD background-color: var(--vscode-editor-background); color: rgba(255, 255, 255, 0.78); -======= ->>>>>>> e8a78b516d7612be146673ec1a8b392edf2373c7 `; export default RequestBodyRawOptions; diff --git a/webview/features/Request/CodeSnippet/RequestCodeSnippet.js b/webview/features/Request/CodeSnippet/RequestCodeSnippet.js index ca480d1..5a9208f 100644 --- a/webview/features/Request/CodeSnippet/RequestCodeSnippet.js +++ b/webview/features/Request/CodeSnippet/RequestCodeSnippet.js @@ -167,11 +167,8 @@ const SelectOptionWrapper = styled.select` border-radius: 0.25rem; font-size: 1rem; font-weight: 500; -<<<<<<< HEAD background-color: var(--vscode-editor-background); color: rgba(255, 255, 255, 0.78); -======= ->>>>>>> e8a78b516d7612be146673ec1a8b392edf2373c7 `; export default RequestCodeSnippet; diff --git a/webview/features/Request/Url/RequestUrl.js b/webview/features/Request/Url/RequestUrl.js index f8aa32b..6e47934 100644 --- a/webview/features/Request/Url/RequestUrl.js +++ b/webview/features/Request/Url/RequestUrl.js @@ -56,11 +56,8 @@ const RequestUrl = () => { const InputContainer = styled.input` padding-left: 1.5rem; font-size: 1.15rem; -<<<<<<< HEAD background-color: var(--vscode-editor-background); color: rgba(255, 255, 255, 0.78); -======= ->>>>>>> e8a78b516d7612be146673ec1a8b392edf2373c7 `; export default RequestUrl; diff --git a/webview/features/Response/Body/ResponseBodyMenuOption.js b/webview/features/Response/Body/ResponseBodyMenuOption.js index 68a9f78..bf26cef 100644 --- a/webview/features/Response/Body/ResponseBodyMenuOption.js +++ b/webview/features/Response/Body/ResponseBodyMenuOption.js @@ -52,11 +52,8 @@ const SelectOptionWrapper = styled.select` border-radius: 0.25rem; font-size: 1rem; font-weight: 500; -<<<<<<< HEAD background-color: var(--vscode-editor-background); color: rgba(255, 255, 255, 0.78); -======= ->>>>>>> e8a78b516d7612be146673ec1a8b392edf2373c7 `; export default ResponseBodyViewOption;