Merge pull request #50 from leandrosimoes/develop

Develop

.eslintrc

@@ -27,6 +27,7 @@
         "max-classes-per-file": 0,
         "class-methods-use-this": 0,
         "no-underscore-dangle": 0,
+        "@typescript-eslint/no-this-alias": 0,
         "@typescript-eslint/ban-ts-ignore": 0,
         "@typescript-eslint/interface-name-prefix": 0,
         "@typescript-eslint/explicit-module-boundary-types": 0,

.vscodeignore

@@ -1,9 +1,9 @@
-.vscode/**
-.vscode-test/**
-out/test/**
-src/**
+.github/
+.vscode/
+.vscode-test/
+src/
+node_modules/
 .gitignore
-vsc-extension-quickstart.md
 **/tsconfig.json
 **/.eslintrc.json
 **/*.map

CHANGELOG.md

@@ -8,6 +8,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 - You can see more about what's going on [here](https://github.com/leandrosimoes/project-urls-manager-vscode-extension/issues), even open a new issue with your sugestions/errors.
 
+## [1.3.0]
+- Now the URLs browser has pagination that shows only 6 URLs per page. You can change the page by clicking on the pagination buttons at the bottom of the page.
+
+## [1.2.6]
+- Fixed problem where no URLs were found when some ignored pattern URLs exists.
+
+## [1.2.5]
+- Now the tree view shows two icon buttons, one to open the URL in the browser, and another to open the URL source file with the cursor exactly where the URL was found.
+
 ## [1.2.4]
 - Docs improvements
 

LICENSE.txt

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 Leandro Simões 
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -22,7 +22,7 @@ This is what the Project URLs Manager looks like when open:
 * **URL Address**: Click at the URL address to open on your browser
 * **URL Description**: Add a quick description of the URL
 * **Status Bar/Open Button**: See how many URLs were found on your project and click to open the manager window
-* **Treview**: Pannels that shows all URLs separated by status. You can double-click them to open on the browser.
+* **Treview**: Pannels that shows all URLs separated by status. Each item has two buttons, one to open the URL in the browser, and another to open the file source of the URL with the cursor positioned exactly where the URL was found.
 
 ## Extension Settings
 

package.json

@@ -2,7 +2,18 @@
 	"name": "project-urls-manager",
 	"displayName": "Project URLs Manager",
 	"description": "Manage all urls of your project in one place",
-	"version": "1.2.6",
+	"version": "1.3.0",
+	"scripts": {
+		"dev": "npm-run-all clean compile copy-assets watch",
+		"prod": "npm-run-all clean lint:fix compile copy-assets",
+		"vscode:prepublish": "npm run prod",
+		"compile": "tsc --project tsconfig.json",
+		"lint": "tsc --project tsconfig.json --noEmit && eslint src --ext ts",
+		"lint:fix": "tsc --project tsconfig.json --noEmit && eslint src --ext ts --fix",
+		"watch": "tsc --project tsconfig.json --watch",
+		"copy-assets": "ts-node copy-assets.ts",
+		"clean": "rimraf out/*"
+	},
 	"icon": "docs/icon-256.png",
 	"publisher": "Leandro",
 	"galleryBanner": {
@@ -55,19 +66,13 @@
 			{
 				"command": "urlList.openInBrowser",
 				"title": "See in browswer",
-				"icon": {
-					"light": "docs/browser-icon-black.svg",
-					"dark": "docs/browser-icon-white.svg"
-				},
+				"icon": "$(browser)",
 				"when": "view == starredList || view == normalList || view == ignoredList"
 			},
 			{
 				"command": "urlList.openURLFile",
 				"title": "See in file",
-				"icon": {
-					"light": "docs/file-icon-black.svg",
-					"dark": "docs/file-icon-white.svg"
-				},
+				"icon": "$(file-symlink-file)",
 				"when": "view == starredList || view == normalList || view == ignoredList"
 			}
 		],
@@ -125,17 +130,6 @@
 			]
 		}
 	},
-	"scripts": {
-		"dev": "npm-run-all clean compile copy-assets watch",
-		"prod": "npm-run-all clean lint:fix compile copy-assets",
-		"vscode:prepublish": "npm run prod",
-		"compile": "tsc --project tsconfig.json",
-		"lint": "tsc --project tsconfig.json --noEmit && eslint src --ext ts",
-		"lint:fix": "tsc --project tsconfig.json --noEmit && eslint src --ext ts --fix",
-		"watch": "tsc --project tsconfig.json --watch",
-		"copy-assets": "ts-node copy-assets.ts",
-		"clean": "rimraf out/*"
-	},
 	"devDependencies": {
 		"@types/glob": "^7.2.0",
 		"@types/node": "^18.0.0",

src/assets/css/style.css

@@ -20,6 +20,10 @@ body {
   }
 }
 
+i.rotate-horizontal {
+  transform: rotate(180deg);
+}
+
 i.spinning {
   animation: pam-spin .5s linear infinite;
 }
@@ -34,8 +38,7 @@ a {
   text-decoration: none;
 }
 
-a#help-button,
-a#github-button {
+a#help-button {
     margin: 10px 10px 10px 0;
 }
 
@@ -117,7 +120,7 @@ main {
   z-index: 9999;
 }
 
-html:not(.show-ignored) .toggle-ignore-control .toggle {
+.toggle-ignore-control .toggle:not(.show-ignored) {
   right: 5px;
 }
 
@@ -226,6 +229,65 @@ html:not(.show-ignored) .toggle-ignore-control .toggle {
   cursor: pointer;
 }
 
+#pagination {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+    margin-top: 20px;
+}
+
+#pagination i {
+    font-size: 20px;
+    margin: 0 5px;
+    cursor: pointer;
+    opacity: 0.9;
+}
+
+#pagination i:hover {
+    opacity: 1;
+}
+
+#pagination div.pages {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+}
+
+#pagination div.pages div {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 30px;
+    height: 30px;
+    border-radius: 50%;
+    margin: 0 5px;
+    color: var(--vscode-editor-foreground);
+    background-color: var(--vscode-editorWidget-background);
+    border: 1px solid var(--vscode-text-input-border);
+    cursor: pointer;
+    opacity: 0.9;
+}
+
+#pagination div.pages div:hover {
+    opacity: 1;
+    text-decoration: underline;
+}
+
+#pagination div.pages div.active {
+    background-color: var(--vscode-editor-foreground);
+    color: var(--vscode-editor-background);
+    opacity: 1;
+}
+
+footer {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
 /* SCROLL */
 ::-webkit-scrollbar {
   width: 2px;

src/assets/index.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" class="{{SHOW_IGNORED}}">
+<html lang="en">
     <head>
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -15,14 +15,15 @@ <h1><i class="codicon codicon-link"></i>&nbsp;{{TITLE}}</h1>
                 <div class="control">
                     <input 
                         id="search-input" 
-                        type="text" 
-                        data-bind="delayChangeInputCallback: delayChangeSearchInputCallbackOptions" 
+                        type="text"
+                        value="{{SEARCH_TEXT}}"
+                        data-bind="value: searchText, delayChangeInputCallback: delayChangeSearchInputCallbackOptions" 
                         placeholder="Type to search">
                 </div>
                 <div class="toggle-ignore-control control">
-                    <div class="toggle"></div>
-                    <i class="codicon codicon-eye" data-bind="click: toggleShowIgnore" title="Show Ignored URLs"></i>
-                    <i class="codicon codicon-eye-closed" data-bind="click: toggleShowIgnore" title="Hide Ignored URLs"></i>
+                    <div class="toggle{{SHOW_IGNORED}}" data-bind="css: { 'show-ignored': isShowingIgnored }"></div>
+                    <i class="codicon codicon-eye" data-bind="click: function() { toggleShowIgnore(true); }" title="Show Ignored URLs"></i>
+                    <i class="codicon codicon-eye-closed" data-bind="click: function() { toggleShowIgnore(false); }" title="Hide Ignored URLs"></i>
                 </div>
             </div>
             <div id="errors" class="hidden"></div>
@@ -69,9 +70,20 @@ <h1><i class="codicon codicon-link"></i>&nbsp;{{TITLE}}</h1>
                     </div>
                 </div>
             </div>
-            <a type="button" id="github-button" href="https://github.com/leandrosimoes" target="_blank" data-bind="visible: !isLoading()">Made with <i class="codicon codicon-heart"></i> by Leandro Simões</a>
+            <div id="pagination" data-bind="visible: ShowPagination">
+                <i class="codicon codicon-run-all rotate-horizontal" data-bind="click: firstPage" title="First page"></i>
+                <i class="codicon codicon-chevron-left" data-bind="click: prevPage" title="Previous page"></i>
+                <div class="pages" data-bind="foreach: pages">
+                    <div data-bind="click: function() { $root.selectPage(number); }, text: number, css: { active: number === $root.currentPage() }"></div>
+                </div>
+                <i class="codicon codicon-chevron-right" data-bind="click: nextPage" title="Next page"></i>
+                <i class="codicon codicon-run-all" data-bind="click: lastPage" title="Last page"></i>
+            </div>
 
             {{SCRIPTS}}
         </main>
+        <footer>
+            <a type="button" id="github-button" href="https://github.com/leandrosimoes" target="_blank" data-bind="visible: !isLoading()">Made with <i class="codicon codicon-heart"></i> by Leandro Simões</a>
+        </footer>
     </body>
 </html>