Merge branch 'main' of git.odit.services:kauft.es/linkylinky-chrome

Reviewed-on: #6

.woodpecker/build.yml

@@ -0,0 +1,20 @@
+steps:
+  - name: build latest
+    image: woodpeckerci/plugin-docker-buildx
+    settings:
+      repo: registry.odit.services/customers/gutfeel-web
+      tags:
+        - latest
+      registry: registry.odit.services
+      platforms: linux/amd64,linux/arm64
+      cache_from: registry.odit.services/customers/gutfeel-web:latest
+      username:
+        from_secret: odit-registry-builder-username
+      password:
+        from_secret: odit-registry-builder-password
+    secrets:
+      - source: odit-npm-cache-url
+        target: NPM_REGISTRY_URL
+when:
+  branch: main
+  event: push

.woodpecker/release.yml

@@ -1,40 +1,26 @@
----
-kind: secret
-name: gitea_token
-get:
-  path: odit-git-bot
-  name: apikey
-
----
-kind: pipeline
-type: kubernetes
-name: build:tag
-
-steps:
-  - name: build and package
-    depends_on: ["clone"]
-    image: registry.odit.services/hub/library/node:16-alpine3.14
-    commands:
-      - apk add git zip -f
-      - yarn
-      - yarn build
-      - yarn build:package
-  - name: gitea_release
-    depends_on: ["build and package"]
-    image: plugins/gitea-release
-    settings:
-      title: Release ${DRONE_TAG}
-      api_key:
-        from_secret: gitea_token
-      base_url: https://git.odit.services
-      files: linkylinky-chrome.zip
-      checksum:
-        - md5
-        - sha1
-        - sha256
-        - sha512
-        - adler32
-        - crc32
-trigger:
-  event:
-    - tag
+steps:
+  - name: build and package
+    image: registry.odit.services/hub/library/node:16-alpine3.14
+    commands:
+      - apk add git zip -f
+      - yarn
+      - yarn build
+      - yarn build:package
+  - name: gitea_release
+    image: plugins/gitea-release
+    settings:
+      title: Release ${DRONE_TAG}
+      api_key:
+        from_secret: odit-git-bot-apikey
+      base_url: https://git.odit.services
+      files: linkylinky-chrome.zip
+      checksum:
+        - md5
+        - sha1
+        - sha256
+        - sha512
+        - adler32
+        - crc32
+
+when:
+  event: tag

CHANGELOG.md

@@ -2,9 +2,32 @@
 
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
+#### [0.3.1](https://git.odit.services/kauft.es/linkylinky-chrome/compare/0.3.0...0.3.1)
+
+- Smol js fix (fuck html attribute names) [`371e74e`](https://git.odit.services/kauft.es/linkylinky-chrome/commit/371e74ebb40ce07b41efebbcf3bdd6f5f507368a)
+- Readme update 4 roadmap [`318ebc7`](https://git.odit.services/kauft.es/linkylinky-chrome/commit/318ebc7125f738f02d3a799d472ef2a652c629d1)
+
+#### [0.3.0](https://git.odit.services/kauft.es/linkylinky-chrome/compare/0.2.0...0.3.0)
+
+> 25 September 2021
+
+- Now w/ clientside switch [`00da368`](https://git.odit.services/kauft.es/linkylinky-chrome/commit/00da368436bb03de628c002d473a220d95e4c984)
+- 🚀RELEASE 0.3.0 [`ccb22ba`](https://git.odit.services/kauft.es/linkylinky-chrome/commit/ccb22bad6a5d79ead28620ebac7303896bb08b54)
+
+#### [0.2.0](https://git.odit.services/kauft.es/linkylinky-chrome/compare/0.1.2...0.2.0)
+
+> 25 September 2021
+
+- Extension users can now disable bot preview [`f389f88`](https://git.odit.services/kauft.es/linkylinky-chrome/commit/f389f88825958beb3d74cb0d50a118435b40652e)
+- 🚀RELEASE 0.2.0 [`7cd4771`](https://git.odit.services/kauft.es/linkylinky-chrome/commit/7cd4771fbc358ca4048cda2d1f09ffaf6d200ad3)
+- Added "docs" images [`595695f`](https://git.odit.services/kauft.es/linkylinky-chrome/commit/595695fe4f4cb696a47d0e8177b51f4ded15ed5b)
+
 #### [0.1.2](https://git.odit.services/kauft.es/linkylinky-chrome/compare/0.1.1...0.1.2)
 
+> 21 August 2021
+
 - Better then resolution [`32196bb`](https://git.odit.services/kauft.es/linkylinky-chrome/commit/32196bb8f2f64dc83ef4aeeb211c26a917b7bee2)
+- 🚀RELEASE 0.1.2 [`bada398`](https://git.odit.services/kauft.es/linkylinky-chrome/commit/bada398877d99d380394eac4da8ee0b30c609022)
 
 #### [0.1.1](https://git.odit.services/kauft.es/linkylinky-chrome/compare/0.1.0...0.1.1)
 

README.md

@@ -4,8 +4,12 @@
   <h3 align="center">A simple, privacy focused urls shortner</h3>
 </p>
 
-<!-- ## 👀 Preview
-TODO: -->
+## 👀 Preview
+<img height="300" src="./docs/fullpage_opened.webp">
+<img height="300" src="./docs/fullpage_created.webp">
+<img height="150" src="./docs/extension_opened.webp">
+<img height="150" src="./docs/extension_created.webp">
+<img height="400" src="./docs/fullpage_copy.webp">
 
 ## ⚡ Installation
 - Download the `linkylinky-chrome.zip` from [the lastest release](https://git.odit.services/kauft.es/linkylinky-chrome/releases)
@@ -56,8 +60,10 @@ npm run build:package
     - [x] Copy shorturl to deskop
     - [x] Notify on copy
     - [x] Generate another url
+    - [x] Disable bot crawling/chat preview on demand
+    - [x] Use clientside redirect w/ animation
 - [x] Provide different url
-- [ ] Project Logo™
+- [x] Project Logo™
 - [x] Basic error handling
 - [x] Finalize styling
 - [x] Advanced project stuff

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@odit/linkylinky-chrome",
-  "version": "0.1.2",
+  "version": "0.3.1",
   "license": "MIT",
   "private": false,
   "author": {
@@ -29,9 +29,9 @@
     "cpx": "^1.5.0",
     "cross-zip-cli": "^1.0.0",
     "live-server": "^1.2.1",
-    "release-it": "^14.11.5",
+    "release-it": "^15.0.0",
     "rimraf": "^3.0.2",
-    "tailwindcss": "^2.2.7"
+    "tailwindcss": "^3.0.0"
   },
   "release-it": {
     "git": {

renovate.json

@@ -0,0 +1,16 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "dependencyDashboard": true,
+  "baseBranches": [
+    "main"
+  ],
+  "addLabels": [
+    "status:review_needed",
+    "enhancement",
+    "priority:medium"
+  ],
+  "reviewers": [
+    "niggl",
+    "philipp"
+  ]
+}

src/index.html

@@ -13,6 +13,19 @@
 		}
 	</style>
 </head>
+<style>
+	/* CHECKBOX TOGGLE SWITCH */
+	/* @apply rules for documentation, these do not work as inline style */
+	.toggle-checkbox:checked {
+	  @apply: right-0 border-green-400;
+	  right: 0;
+	  border-color: #68D391;
+	}
+	.toggle-checkbox:checked + .toggle-label {
+	  @apply: bg-green-400;
+	  background-color: #68D391;
+	}
+	</style>
 
 <body>
 	<div class="p-4 flex items-center justify-center bg-white">
@@ -69,6 +82,24 @@
 						placeholder="custom url" />
 				</div>
 			</div>
+			<div id="bot_container">
+				<div class="mt-1 flex rounded-md shadow-sm">
+					<label for="toggle" class="text-base text-gray-700 pr-2">Disable Preview:</label>
+					<div class="relative inline-block w-10 mr-2 align-middle select-none transition duration-200 ease-in">
+						<input type="checkbox" name="toggle" id="bot_toggle" class="toggle-checkbox absolute block w-6 h-6 rounded-full bg-white border-4 appearance-none cursor-pointer"/>
+						<label for="toggle" class="toggle-label block overflow-hidden h-6 rounded-full bg-gray-300 cursor-pointer"></label>
+					</div>
+				</div>
+			</div>
+			<div id="clientside_container">
+				<div class="mt-1 flex rounded-md shadow-sm">
+					<label for="toggle" class="text-base text-gray-700 pr-2">Clientside Redirect:</label>
+					<div class="relative inline-block w-10 mr-2 align-middle select-none transition duration-200 ease-in">
+						<input type="checkbox" name="toggle" id="clientside_toggle" class="toggle-checkbox absolute block w-6 h-6 rounded-full bg-white border-4 appearance-none cursor-pointer"/>
+						<label for="toggle" class="toggle-label block overflow-hidden h-6 rounded-full bg-gray-300 cursor-pointer"></label>
+					</div>
+				</div>
+			</div>
 			<div class="hidden" name="shorturl_container" id="shorturl_container">
 				<div class="inline-flex w-full" id="shorturl_copy" data-clipboard-target="#shorturl">
 					<p name="shorturl" id="shorturl" class:bg-green-200={copied}

src/main.js

@@ -25,7 +25,9 @@ document.getElementById("create").onclick = createUrl;
 function createUrl() {
     let shorturl = {
         target: document.getElementById("target").value,
-        shortcode: document.getElementById("shortcode").value
+        shortcode: document.getElementById("shortcode").value,
+        no_preview: document.getElementById("bot_toggle").checked,
+        clientside: document.getElementById("clientside_toggle").checked
     };
 
     if (shorturl.shortcode == "" | !shorturl.shortcode) {
@@ -49,8 +51,12 @@ function createUrl() {
                     document.getElementById("shorturl_container").className = "";
                     document.getElementById("target_container").className = "hidden";
                     document.getElementById("shortcode_container").className = "hidden";
+                    document.getElementById("bot_container").classList.add("hidden");
+                    document.getElementById("clientside_container").classList.add("hidden");
                     document.getElementById("create").classList.add("hidden");
                     document.getElementById("reset").classList.remove("hidden");
+                    document.getElementById("bot_toggle").checked = false;
+                    document.getElementById("clientside_toggle").checked = false;
                 });
             }
         });
@@ -94,6 +100,10 @@ function reset() {
         document.getElementById("target").value = tabs[0].url;
         document.getElementById("target_container").className = "";
         document.getElementById("shortcode_container").className = "";
+        document.getElementById("bot_container").classList.remove("hidden");
+        document.getElementById("bot_container").value = false;
+        document.getElementById("clientside_container").classList.remove("hidden");
+        document.getElementById("clientside_container").value = false;
         document.getElementById("create").classList.remove("hidden");
     });
 }