Merge pull request 'feature/13-url_validator' (#15) from feature/13-url_validator into dev

Reviewed-on: #15

.drone.yml

@@ -4,20 +4,13 @@ name: gitea_token
 get:
   path: odit-git-bot
   name: apikey
-
----
-kind: secret
-name: ci_token
-get:
-  path: odit-ci-bot
-  name: apikey
-
 ---
 kind: pipeline
 type: kubernetes
-name: build:tag
+name: build
 steps:
   - name: run build
+    depends_on: ["clone"]
     image: node:15.11.0-alpine3.13
     commands:
       - apk add git zip -f
@@ -25,7 +18,8 @@ steps:
       - yarn build
       - mkdir out
       - zip -r out/dist.zip dist
-  - name: gitea add packages to build
+  - name: gitea_release
+    depends_on: ["run build"]
     image: plugins/gitea-release
     settings:
       api_key:
@@ -39,12 +33,8 @@ steps:
         - sha512
         - adler32
         - crc32
-  - name: trigger electron build
+    when:
-    image: idcooldi/drone-webhook
+      event: tag
-    settings:
-      urls: https://ci.odit.services/api/repos/lfk/scanclient-electron/builds?SOURCE_TAG=${DRONE_TAG}
-      bearer:
-        from_secret: ci_token
 trigger:
   event:
     - tag

licenses.md

@@ -1,3 +1,31 @@
+# validator
+**Author**: Chris O'Hara <cohara87@gmail.com>
+**Repo**: https://github.com/chriso/validator.js
+**License**: MIT
+**Description**: String validation and sanitization
+## License Text
+Copyright (c) 2018 Chris O'Hara <cohara87@gmail.com>
+
+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.
+ 
+
 # @odit/license-exporter
 **Author**: ODIT.Services
 **Repo**: https://git.odit.services/odit/license-exporter
@@ -222,35 +250,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
  
 
-# release-it
-**Author**: Lars Kappert
-**Repo**: https://github.com/release-it/release-it
-**License**: MIT
-**Description**: Generic CLI tool to automate versioning and package publishing related tasks.
-## License Text
-MIT License
-
-Copyright (c) 2018 Lars Kappert
-
-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.
- 
-
 # svelte
 **Author**: Rich Harris
 **Repo**: https://github.com/sveltejs/svelte

package.json

@@ -1,13 +1,12 @@
 {
 	"name": "@lfk/scanclient",
-	"version": "0.1.1",
+	"version": "0.0.0",
 	"scripts": {
 		"dev": "vite",
 		"build": "vite build",
 		"format": "prettier --write --plugin-search-dir=. ./**/*.html ./**/*.svelte",
 		"prepare": "husky install",
-		"license:export": "license-exporter --markdown && git stage licenses.md",
+		"license:export": "license-exporter --markdown && git stage licenses.md"
-		"release": "release-it --only-version"
 	},
 	"devDependencies": {
 		"@odit/license-exporter": "^0.0.11",
@@ -19,29 +18,13 @@
 		"husky": "^5.1.3",
 		"prettier": "^2.2.1",
 		"prettier-plugin-svelte": "^2.2.0",
-		"release-it": "^14.5.1",
 		"svelte": "^3.35.0",
 		"svelte-i18n": "^3.3.7",
 		"svelte-preprocess": "^4.6.9",
 		"vite": "^2.1.2",
 		"vite-plugin-windicss": "^0.9.2"
 	},
-	"release-it": {
+	"dependencies": {
-		"git": {
+		"validator": "^13.5.2"
-			"commit": true,
-			"requireCleanWorkingDir": false,
-			"commitMessage": "🚀Bumped version to ${version}",
-			"requireBranch": "dev",
-			"push": false,
-			"tag": true,
-			"tagName": null,
-			"tagAnnotation": "${version}"
-		},
-		"npm": {
-			"publish": false
-		},
-		"hooks": {
-			"after:bump": "npx auto-changelog --commit-limit false -p -u --hide-credit && git add CHANGELOG.md && node order.js  && git add src/locales"
-		}
 	}
 }

src/Login.svelte

@@ -1,4 +1,6 @@
 <script>
+  import isURL from "validator/lib/isURL";
+  import isUUID from "validator/lib/isUUID";
   import { apikey, lang, stationinfo, api_endpoint } from "./store.js";
   import axios from "axios";
   import { _, locale } from "svelte-i18n";
@@ -10,30 +12,7 @@
     token?.length === 44 &&
     token.split(".")[0].length === 7 &&
     isUUID(token.split(".")[1]);
-  $: isEndpointValid = validURL(api_endpoint_input);
+  $: isEndpointValid = isURL(api_endpoint_input);
-  function validURL(str) {
-    var pattern = new RegExp(
-      "^(https?:\\/\\/)?" + // protocol
-        "((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|" + // domain name
-        "((\\d{1,3}\\.){3}\\d{1,3}))" + // OR ip (v4) address
-        "(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*" + // port and path
-        "(\\?[;&a-z\\d%_.~+=-]*)?" + // query string
-        "(\\#[-a-z\\d_]*)?$",
-      "i"
-    ); // fragment locator
-    return !!pattern.test(str);
-  }
-  function isUUID(uuid) {
-    let s = "" + uuid;
-
-    s = s.match(
-      "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$"
-    );
-    if (s === null) {
-      return false;
-    }
-    return true;
-  }
 </script>
 
 <div class="w-full flex flex-wrap">