Fix UI scaling and update docs

Moved all web assets to static folder, added xitca-web's logging feature and added favicons
Make scrollbar a bit nicer
2025-11-10 06:03:50 -05:00 · 2024-07-12 13:26:40 +03:00 · 2024-07-11 18:21:31 +03:00 · 2024-07-11 17:32:59 +03:00 · 2024-07-11 13:32:43 +03:00 · 2024-07-11 13:29:11 +03:00
14 changed files with 442 additions and 94 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,27 +1,63 @@
-name: Build docker image
-
+name: Release
 on:
-  release:
-    types:
-      - published
-
-env:
-  CARGO_TERM_COLOR: always
+  push:
+    tags: ["v*.*.*"]

 jobs:
-  build:
+  get-tag:
+    runs-on: ubuntu-latest
+    outputs:
+      tag: ${{ steps.tag.outputs.tag }}
+    steps:
+      - name: Get current tag
+        id: tag
+        run: |
+          TAG=$(echo "$GITHUB_REF" | sed 's/^refs\/tags\///')
+          echo "Current tag: $TAG"
+          echo "tag=$TAG" >> $GITHUB_OUTPUT
+  build-binary:
+    strategy:
+      matrix:
+        platform:
+          - release_for: linux-aarch64
+            os: ubuntu-latest
+            target: aarch64-unknown-linux-musl
+            bin: cup
+            name: cup-linux-aarch64
+            command: build
+
+          - release_for: linux-x86_64
+            os: ubuntu-latest
+            target: x86_64-unknown-linux-musl
+            bin: cup
+            name: cup-linux-x86_64
+            command: build
+    runs-on: ${{ matrix.platform.os }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup rust
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+
+      - name: Install cross
+        run: cargo install cross --git https://github.com/cross-rs/cross
+
+      - name: Build binary
+        run: cross ${{ matrix.platform.command }} --target ${{ matrix.platform.target }} --release
+
+      - name: Upload binary
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.platform.name }}
+          path: target/${{ matrix.platform.target }}/release/${{ matrix.platform.bin }}
+
+  build-image:
+    needs: get-tag
    runs-on: ubuntu-latest
    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Get latest release tag
-        id: release
-        uses: pozetroninc/github-action-get-latest-release@master
-        with:
-          owner: sergi0g
-          repo: cup
-          excludes: prerelease, draft
+      - name: Checkout
+        uses: actions/checkout@v4

      - name: Set up QEMU
        uses: docker/setup-qemu-action@v3
@@ -33,17 +69,43 @@ jobs:
        uses: docker/login-action@v3
        with:
          registry: ghcr.io
-          username: ${{ github.actor }}
+          username: ${{ github.repository_owner }}
          password: ${{ secrets.GITHUB_TOKEN }}

-      - name: Build and push
-        uses: docker/build-push-action@v5
+      - name: Build and push image
+        uses: docker/build-push-action@v6
        with:
          context: .
+          platforms: linux/amd64, linux/arm64
          push: true
-          platforms: linux/amd64,linux/arm64
-          tags: |
-            ghcr.io/sergi0g/cup:latest
-            ghcr.io/sergi0g/cup:${{ steps.release.outputs.release }}
+          tags: ghcr.io/sergi0g/cup:${{ needs.get-tag.outputs.tag }},ghcr.io/sergi0g/cup:latest
          cache-from: type=gha
          cache-to: type=gha,mode=max
+
+  release:
+    runs-on: ubuntu-latest
+    needs: [get-tag, build-image, build-binary]
+    steps:
+      - name: Download arm64 binary
+        uses: actions/download-artifact@v4
+        with:
+          name: cup-linux-aarch64
+          path: cup-linux-aarch64
+
+      - name: Download x86 binary
+        uses: actions/download-artifact@v4
+        with:
+          name: cup-linux-x86_64
+          path: cup-linux-x86_64
+
+      - name: Create release
+        uses: softprops/action-gh-release@v2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          prerelease: true
+          tag_name: ${{ needs.get-tag.outputs.tag }}
+          name: ${{ needs.get-tag.outputs.tag }}
+          files: |
+            cup-linux-aarch64/cup-linux-aarch64
+            cup-linux-x86_64/cup-linux-x86_64
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -0,0 +1,123 @@
+name: Nightly Release
+on:
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: "Nightly version tag"
+        required: true
+
+jobs:
+  create-tag:
+    runs-on: ubuntu-latest
+    outputs:
+      tagname: ${{ steps.get_tag.outputs.tagname }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Get tag from Cargo.toml
+        id: get_tag
+        run: |
+          VERSION=$(cargo metadata --format-version=1 --no-deps | jq -r '.packages[0].version')
+          echo "tagname=v$VERSION-nightly.${{ github.event.inputs.tag }}" >> $GITHUB_OUTPUT
+
+      - uses: rickstaa/action-create-tag@v1
+        with:
+          tag: ${{ steps.get_tag.outputs.tagname }}
+
+  build-binary:
+    needs: create-tag
+    strategy:
+      matrix:
+        platform:
+          - release_for: linux-aarch64
+            os: ubuntu-latest
+            target: aarch64-unknown-linux-musl
+            bin: cup
+            name: cup-linux-aarch64
+            command: build
+
+          - release_for: linux-x86_64
+            os: ubuntu-latest
+            target: x86_64-unknown-linux-musl
+            bin: cup
+            name: cup-linux-x86_64
+            command: build
+
+    runs-on: ${{ matrix.platform.os }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup rust
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+
+      - name: Install cross
+        run: cargo install cross --git https://github.com/cross-rs/cross
+
+      - name: Build binary
+        run: cross ${{ matrix.platform.command }} --target ${{ matrix.platform.target }}
+
+      - name: Upload CLI
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.platform.name }}
+          path: target/${{ matrix.platform.target }}/debug/${{ matrix.platform.bin }}
+
+  build-image:
+    needs: create-tag
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          platforms: linux/amd64, linux/arm64
+          push: true
+          tags: ghcr.io/sergi0g/cup:${{ needs.create-tag.outputs.tagname }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+  nightly-release:
+    runs-on: ubuntu-latest
+    needs: [create-tag, build-image, build-binary]
+    steps:
+      - name: Download arm64 binary
+        uses: actions/download-artifact@v4
+        with:
+          name: cup-linux-aarch64
+          path: cup-linux-aarch64
+
+      - name: Download x86 binary
+        uses: actions/download-artifact@v4
+        with:
+          name: cup-linux-x86_64
+          path: cup-linux-x86_64
+
+      - name: Create nightly release
+        uses: softprops/action-gh-release@v2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          prerelease: true
+          tag_name: ${{ needs.create-tag.outputs.tagname }}
+          name: ${{ needs.create-tag.outputs.tagname }}
+          files: |
+            cup-linux-aarch64/cup-linux-aarch64
+            cup-linux-x86_64/cup-linux-x86_64
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -140,21 +140,6 @@ version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"

-[[package]]
-name = "bit-set"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
-dependencies = [
- "bit-vec",
-]
-
-[[package]]
-name = "bit-vec"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
-
 [[package]]
 name = "block-buffer"
 version = "0.10.4"
@@ -365,17 +350,17 @@ dependencies = [

 [[package]]
 name = "cup"
-version = "0.1.0"
+version = "1.1.2"
 dependencies = [
 "bollard",
 "clap",
- "fancy-regex",
 "http-auth",
 "indicatif",
 "json",
 "liquid",
 "once_cell",
 "rayon",
+ "regex",
 "termsize",
 "tokio",
 "ureq",
@@ -426,17 +411,6 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"

-[[package]]
-name = "fancy-regex"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "531e46835a22af56d1e3b66f04844bed63158bc094a628bec1d321d9b4c44bf2"
-dependencies = [
- "bit-set",
- "regex-automata",
- "regex-syntax",
-]
-
 [[package]]
 name = "flate2"
 version = "1.0.30"
@@ -944,6 +918,16 @@ dependencies = [
 "windows-sys 0.48.0",
 ]

+[[package]]
+name = "nu-ansi-term"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+dependencies = [
+ "overload",
+ "winapi",
+]
+
 [[package]]
 name = "num-conv"
 version = "0.1.0"
@@ -990,6 +974,12 @@ version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"

+[[package]]
+name = "overload"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
+
 [[package]]
 name = "percent-encoding"
 version = "2.3.1"
@@ -1329,6 +1319,15 @@ dependencies = [
 "digest",
 ]

+[[package]]
+name = "sharded-slab"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
+dependencies = [
+ "lazy_static",
+]
+
 [[package]]
 name = "signal-hook-registry"
 version = "1.4.2"
@@ -1429,6 +1428,16 @@ dependencies = [
 "syn",
 ]

+[[package]]
+name = "thread_local"
+version = "1.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+]
+
 [[package]]
 name = "time"
 version = "0.3.36"
@@ -1551,9 +1560,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
 dependencies = [
 "pin-project-lite",
+ "tracing-attributes",
 "tracing-core",
 ]

+[[package]]
+name = "tracing-attributes"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "tracing-core"
 version = "0.1.32"
@@ -1561,6 +1582,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
 dependencies = [
 "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-log"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
+dependencies = [
+ "log",
+ "once_cell",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
+dependencies = [
+ "nu-ansi-term",
+ "sharded-slab",
+ "smallvec",
+ "thread_local",
+ "tracing-core",
+ "tracing-log",
 ]

 [[package]]
@@ -1653,6 +1700,12 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"

+[[package]]
+name = "valuable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+
 [[package]]
 name = "version_check"
 version = "0.9.4"
@@ -1986,6 +2039,8 @@ dependencies = [
 "futures-core",
 "pin-project-lite",
 "tokio",
+ "tracing",
+ "tracing-subscriber",
 "xitca-http",
 "xitca-server",
 "xitca-service",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cup"
-version = "0.1.0"
+version = "1.1.2"
 edition = "2021"

 [dependencies]
@@ -10,13 +10,13 @@ tokio = {version = "1.38.0", features = ["rt", "rt-multi-thread", "macros"]}
 ureq = { version = "2.9.7", features = ["tls"] }
 json = "0.12.4"
 rayon = "1.10.0"
-xitca-web = { version = "0.5.0", optional = true }
+xitca-web = { version = "0.5.0", optional = true, features = ["logger"] }
 liquid = { version = "0.26.6", optional = true }
 bollard = "0.16.1"
 once_cell = "1.19.0"
-fancy-regex = "0.13.0"
 http-auth = { version = "0.1.9", features = [] }
 termsize = { version = "0.1.8", optional = true }
+regex = "1.10.5"

 [features]
 default = ["server", "cli"]
--- a/12
+++ b/12
@@ -3,12 +3,16 @@ WORKDIR /

 RUN apk add musl-dev

-RUN USER=root cargo new cup
+RUN USER=root cargo new --bin cup
 WORKDIR /cup
-COPY Cargo.toml Cargo.lock ./
-RUN cargo build --release

-COPY src ./src
+COPY Cargo.toml Cargo.lock .
+RUN cargo build --release
+RUN rm -rf src/
+
+COPY src src
+# This is a very bad workaround, but cargo only triggers a rebuild this way for some reason
+RUN printf "\n" >> src/main.rs
 RUN cargo build --release

 FROM scratch
--- a/README.md
+++ b/README.md
@@ -143,7 +143,7 @@ $ docker run -v /var/run/docker.sock:/var/run/docker.sock -p <PORT>:<PORT> cup s

 Cup is a work in progress. It might not have as many features as What's up Docker. If one of these features is really important for you, please consider using another tool.

- Cup currently doesn't support registries which use repositories without slashes. This includes Azure. This problem may sound a bit weird, but it's due to the regex that's used at the moment. This will (hopefully) be fixed in the future.
+- ~~Cup currently doesn't support registries which use repositories without slashes. This includes Azure. This problem may sound a bit weird, but it's due to the regex that's used at the moment. This will (hopefully) be fixed in the future.~~
 - Cup doesn't support private images. This is on the roadmap. Currently, it just returns unknown for those images.
 - Cup cannot trigger your integrations. If you want that to happen automatically, please use What's up docker instead. Cup was created to be simple. The data is there, and it's up to you to retrieve it (e.g. by running `cup check -r` with a cronjob or periodically requesting the `/json` url from the server)

@@ -160,7 +160,7 @@ Here are some ideas to get you started:

 To contribute, fork the repository, make your changes and the submit a pull request.

-Note: If you update the UI, please make sure to recompile the CSS with `tailwindcss -mo src/index.css`. You need to have the Tailwind CSS CLI installed ([instructions here](https://tailwindcss.com/docs/installation))
+Note: If you update the UI, please make sure to recompile the CSS with `tailwindcss -mo src/static/index.css`. You need to have the Tailwind CSS CLI installed ([instructions here](https://tailwindcss.com/docs/installation))

 ## Support

--- a/src/server.rs
+++ b/src/server.rs
@@ -4,21 +4,28 @@ use liquid::{object, Object};
 use rayon::iter::{IntoParallelRefIterator, ParallelIterator};
 use xitca_web::{
    body::ResponseBody,
-    handler::{handler_service, path::PathOwn, state::StateOwn},
-    http::{Method, WebResponse},
+    handler::{handler_service, state::StateOwn},
+    http::WebResponse,
    route::get,
    App,
+    middleware::Logger
 };

-const RAW_TEMPLATE: &str = include_str!("template.liquid");
-const STYLE: &str = include_str!("index.css");
+const RAW_TEMPLATE: &str = include_str!("static/template.liquid");
+const STYLE: &str = include_str!("static/index.css");
+const FAVICON_ICO: &[u8] = include_bytes!("static/favicon.ico");
+const FAVICON_SVG: &[u8] = include_bytes!("static/favicon.svg");
+const APPLE_TOUCH_ICON: &[u8] = include_bytes!("static/apple-touch-icon.png");

 pub async fn serve(port: &u16, updates: &[(String, Option<bool>)]) -> std::io::Result<()> {
-    println!("Serving on http://0.0.0.0:{}", port);
    App::new()
        .with_state(updates.to_owned())
        .at("/", get(handler_service(home)))
        .at("/json", get(handler_service(json)))
+        .at("/favicon.ico", handler_service(favicon_ico)) // These aren't pretty but this is xitca-web...
+        .at("/favicon.svg", handler_service(favicon_svg))
+        .at("/apple-touch-icon.png", handler_service(apple_touch_icon))
+        .enclosed(Logger::new())
        .serve()
        .bind(format!("0.0.0.0:{}", port))?
        .run()
@@ -27,8 +34,6 @@ pub async fn serve(port: &u16, updates: &[(String, Option<bool>)]) -> std::io::R

 async fn home(
    updates: StateOwn<Vec<(String, Option<bool>)>>,
-    method: Method,
-    path: PathOwn,
 ) -> WebResponse {
    let template = liquid::ParserBuilder::with_stdlib()
        .build()
@@ -70,14 +75,11 @@ async fn home(
        "style": STYLE
    });
    let result = template.render(&globals).unwrap();
-    println!("Received {} request on {}", method, path.0);
    WebResponse::new(ResponseBody::from(result))
 }

 async fn json(
-    updates: StateOwn<Vec<(String, Option<bool>)>>,
-    method: Method,
-    path: PathOwn,
+    updates: StateOwn<Vec<(String, Option<bool>)>>
 ) -> WebResponse {
    let result_mutex: Mutex<json::object::Object> = Mutex::new(json::object::Object::new());
    updates.par_iter().for_each(|image| match image.1 {
@@ -85,6 +87,17 @@ async fn json(
        None => result_mutex.lock().unwrap().insert(&image.0, json::Null),
    });
    let result = json::stringify(result_mutex.lock().unwrap().clone());
-    println!("Received {} request on {}", method, path.0);
    WebResponse::new(ResponseBody::from(result))
 }
+
+async fn favicon_ico() -> WebResponse {
+    WebResponse::new(ResponseBody::from(FAVICON_ICO))
+}
+
+async fn favicon_svg() -> WebResponse {
+    WebResponse::new(ResponseBody::from(FAVICON_SVG))
+}
+
+async fn apple_touch_icon() -> WebResponse {
+    WebResponse::new(ResponseBody::from(APPLE_TOUCH_ICON))
+}
--- a/src/static/apple-touch-icon.png
+++ b/src/static/apple-touch-icon.png
--- a/src/static/favicon.ico
+++ b/src/static/favicon.ico
--- a/src/static/favicon.svg
+++ b/src/static/favicon.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 128 128" style="enable-background:new 0 0 128 128;" xml:space="preserve">
+<path style="fill:#A6CFD6;" d="M65.12,17.55c-17.6-0.53-34.75,5.6-34.83,14.36c-0.04,5.2,1.37,18.6,3.62,48.68s2.25,33.58,3.5,34.95
+	c1.25,1.37,10.02,8.8,25.75,8.8s25.93-6.43,26.93-8.05c0.48-0.78,1.83-17.89,3.5-37.07c1.81-20.84,3.91-43.9,3.99-45.06
+	C97.82,30.66,94.2,18.43,65.12,17.55z"/>
+<path style="fill:#DCEDF6;" d="M41.4,45.29c-0.12,0.62,1.23,24.16,2.32,27.94c1.99,6.92,9.29,7.38,10.23,4.16
+	c0.9-3.07-0.38-29.29-0.38-29.29s-3.66-0.3-6.43-0.84C44,46.63,41.4,45.29,41.4,45.29z"/>
+<path style="fill:#6CA4AE;" d="M33.74,32.61c-0.26,8.83,20.02,12.28,30.19,12.22c13.56-0.09,29.48-4.29,29.8-11.7
+	S79.53,21.1,63.35,21.1C49.6,21.1,33.96,25.19,33.74,32.61z"/>
+<path style="fill:#DC0D27;" d="M84.85,13.1c-0.58,0.64-9.67,30.75-9.67,30.75s2.01-0.33,4-0.79c2.63-0.61,3.76-1.06,3.76-1.06
+	s7.19-22.19,7.64-23.09c0.45-0.9,21.61-7.61,22.31-7.93c0.7-0.32,1.39-0.4,1.46-0.78c0.06-0.38-2.34-6.73-3.11-6.73
+	C110.47,3.47,86.08,11.74,84.85,13.1z"/>
+<path style="fill:#8A1F0F;" d="M110.55,7.79c1.04,2.73,2.8,3.09,3.55,2.77c0.45-0.19,1.25-1.84,0.01-4.47
+	c-0.99-2.09-2.17-2.74-2.93-2.61C110.42,3.6,109.69,5.53,110.55,7.79z"/>
+<g>
+	<path style="fill:#8A1F0F;" d="M91.94,18.34c-0.22,0-0.44-0.11-0.58-0.3l-3.99-5.77c-0.22-0.32-0.14-0.75,0.18-0.97
+		c0.32-0.22,0.76-0.14,0.97,0.18l3.99,5.77c0.22,0.32,0.14,0.75-0.18,0.97C92.21,18.3,92.07,18.34,91.94,18.34z"/>
+</g>
+<g>
+	<path style="fill:#8A1F0F;" d="M90.28,19.43c-0.18,0-0.35-0.07-0.49-0.2l-5.26-5.12c-0.28-0.27-0.28-0.71-0.01-0.99
+		c0.27-0.28,0.71-0.28,0.99-0.01l5.26,5.12c0.28,0.27,0.28,0.71,0.01,0.99C90.64,19.36,90.46,19.43,90.28,19.43z"/>
+</g>
+<g>
+	<path style="fill:#8A1F0F;" d="M89.35,21.22c-0.12,0-0.25-0.03-0.36-0.1l-5.6-3.39c-0.33-0.2-0.44-0.63-0.24-0.96
+		c0.2-0.33,0.63-0.44,0.96-0.24l5.6,3.39c0.33,0.2,0.44,0.63,0.24,0.96C89.82,21.1,89.59,21.22,89.35,21.22z"/>
+</g>
+</svg>
--- a/src/static/index.css
+++ b/src/static/index.css
--- a/src/static/template.liquid
+++ b/src/static/template.liquid
@@ -2,6 +2,10 @@
 <html>
  <head>
    <meta charset="utf8">
+    <meta name="theme-color" content="#ffffff">
+    <link rel="icon" href="favicon.svg">
+    <link rel="apple-touch-icon" href="apple-touch-icon.png">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0"  />
    <style>
      {{ style }}
    </style>
@@ -21,8 +25,9 @@
      }

      @media (prefers-color-scheme: dark) {
-        .gi::before, .gi::after {
-            background-color: #1f2937;
+        .gi::before,
+        .gi::after {
+          background-color: #1f2937;
        }
      }

@@ -38,13 +43,77 @@
        inset-inline-start: 0;
        inset-block-start: -0.12rem;
      }
+
+      @supports (scrollbar-color: auto) {
+        html {
+          scrollbar-color: #707070 #343840;
+        }
+      }
+
+      @supports selector(::-webkit-scrollbar) {
+        html::-webkit-scrollbar {
+          width: 10px;
+        }
+
+        html::-webkit-scrollbar-track {
+          background: #343840;
+        }
+
+        html::-webkit-scrollbar-thumb {
+          background: #707070;
+          border-radius: 0.375rem;
+        }
+
+        html::-webkit-scrollbar-thumb:hover {
+          background: #b5b5b5;
+        }
+      }
    </style>
  </head>
  <body>
    <div class="flex justify-center items-center min-h-screen bg-gray-50 dark:bg-gray-950">
      <div class="lg:px-8 sm:px-6 px-4 max-w-[80rem] mx-auto h-full w-full">
        <div class="max-w-[48rem] mx-auto h-full my-8">
-          <h1 class="text-6xl font-bold dark:text-white">Cup🥤</h1>
+          <div class="flex items-center gap-1">
+            <h1 class="text-6xl font-bold dark:text-white">Cup</h1>
+            <svg
+              version="1.1"
+              id="Layer_2"
+              xmlns="http://www.w3.org/2000/svg"
+              xmlns:xlink="http://www.w3.org/1999/xlink"
+              x="0px"
+              y="0px"
+              viewBox="0 0 128 128"
+              style="enable-background:new 0 0 128 128;"
+              xml:space="preserve"
+              class="size-16"
+            >
+              <path style="fill:#A6CFD6;" d="M65.12,17.55c-17.6-0.53-34.75,5.6-34.83,14.36c-0.04,5.2,1.37,18.6,3.62,48.68s2.25,33.58,3.5,34.95
+                c1.25,1.37,10.02,8.8,25.75,8.8s25.93-6.43,26.93-8.05c0.48-0.78,1.83-17.89,3.5-37.07c1.81-20.84,3.91-43.9,3.99-45.06
+                C97.82,30.66,94.2,18.43,65.12,17.55z"/>
+              <path style="fill:#DCEDF6;" d="M41.4,45.29c-0.12,0.62,1.23,24.16,2.32,27.94c1.99,6.92,9.29,7.38,10.23,4.16
+                c0.9-3.07-0.38-29.29-0.38-29.29s-3.66-0.3-6.43-0.84C44,46.63,41.4,45.29,41.4,45.29z"/>
+              <path style="fill:#6CA4AE;" d="M33.74,32.61c-0.26,8.83,20.02,12.28,30.19,12.22c13.56-0.09,29.48-4.29,29.8-11.7
+                S79.53,21.1,63.35,21.1C49.6,21.1,33.96,25.19,33.74,32.61z"/>
+              <path style="fill:#DC0D27;" d="M84.85,13.1c-0.58,0.64-9.67,30.75-9.67,30.75s2.01-0.33,4-0.79c2.63-0.61,3.76-1.06,3.76-1.06
+                s7.19-22.19,7.64-23.09c0.45-0.9,21.61-7.61,22.31-7.93c0.7-0.32,1.39-0.4,1.46-0.78c0.06-0.38-2.34-6.73-3.11-6.73
+                C110.47,3.47,86.08,11.74,84.85,13.1z"/>
+              <path style="fill:#8A1F0F;" d="M110.55,7.79c1.04,2.73,2.8,3.09,3.55,2.77c0.45-0.19,1.25-1.84,0.01-4.47
+                c-0.99-2.09-2.17-2.74-2.93-2.61C110.42,3.6,109.69,5.53,110.55,7.79z"/>
+              <g>
+                <path style="fill:#8A1F0F;" d="M91.94,18.34c-0.22,0-0.44-0.11-0.58-0.3l-3.99-5.77c-0.22-0.32-0.14-0.75,0.18-0.97
+                  c0.32-0.22,0.76-0.14,0.97,0.18l3.99,5.77c0.22,0.32,0.14,0.75-0.18,0.97C92.21,18.3,92.07,18.34,91.94,18.34z"/>
+              </g>
+              <g>
+                <path style="fill:#8A1F0F;" d="M90.28,19.43c-0.18,0-0.35-0.07-0.49-0.2l-5.26-5.12c-0.28-0.27-0.28-0.71-0.01-0.99
+                  c0.27-0.28,0.71-0.28,0.99-0.01l5.26,5.12c0.28,0.27,0.28,0.71,0.01,0.99C90.64,19.36,90.46,19.43,90.28,19.43z"/>
+              </g>
+              <g>
+                <path style="fill:#8A1F0F;" d="M89.35,21.22c-0.12,0-0.25-0.03-0.36-0.1l-5.6-3.39c-0.33-0.2-0.44-0.63-0.24-0.96
+                  c0.2-0.33,0.63-0.44,0.96-0.24l5.6,3.39c0.33,0.2,0.44,0.63,0.24,0.96C89.82,21.1,89.59,21.22,89.35,21.22z"/>
+              </g>
+            </svg>
+          </div>
          <div class="shadow-sm bg-white dark:bg-gray-900 rounded-md my-8">
            <dl class="lg:grid-cols-4 md:grid-cols-2 gap-1 grid-cols-1 grid overflow-hidden *:relative">
              {% for metric in metrics %}
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -1,4 +1,4 @@
-use fancy_regex::Regex;
+use regex::Regex;
 use once_cell::sync::Lazy;

 #[macro_export]
@@ -9,27 +9,20 @@ macro_rules! error {
    })
 }

-// Takes an image and splits it into registry, repository and tag. For example ghcr.io/sergi0g/cup:latest becomes ['ghcr.io', 'sergi0g/cup', 'latest']. ONLY REGISTRIES THAT USE A / IN THE REPOSITORY ARE SUPPORTED CURRENTLY. THAT MEANS AZURE WILL NOT WORK.
+// Takes an image and splits it into registry, repository and tag. For example ghcr.io/sergi0g/cup:latest becomes ['ghcr.io', 'sergi0g/cup', 'latest'].
 pub fn split_image(image: &str) -> (String, String, String) {
    static RE: Lazy<Regex> = Lazy::new(|| {
        Regex::new(
-            r#"^(?P<registry>[\w.\-_]+((?::\d+|)(?=/[a-z0-9._-]+/[a-z0-9._-]+))|)(?:/|)(?P<repository>[a-z0-9.\-_]+(?:/[a-z0-9.\-_]+|))(:(?P<tag>[\w.\-_]{1,127})|)$"#, // From https://regex101.com/r/a98UqN/1
+            r#"^(?P<name>(?:(?P<registry>(?:(?:localhost|[\w-]+(?:\.[\w-]+)+)(?::\d+)?)|[\w]+:\d+)/)?(?P<repository>[a-z0-9_.-]+(?:/[a-z0-9_.-]+)*))(?::(?P<tag>[\w][\w.-]{0,127}))?$"#, // From https://regex101.com/r/nmSDPA/1
        )
        .unwrap()
    });
-    match RE.captures(image).unwrap() {
+    match RE.captures(image) {
        Some(c) => {
            return (
                match c.name("registry") {
-                    Some(registry) => {
-                        let reg = registry.as_str().to_owned();
-                        if reg.is_empty() {
-                            String::from("registry-1.docker.io")
-                        } else {
-                            reg
-                        }
-                    }
-                    None => error!("Failed to parse image {}", image),
+                    Some(registry) => registry.as_str().to_owned(),
+                    None => String::from("registry-1.docker.io"),
                },
                match c.name("repository") {
                    Some(repository) => {
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -1,7 +1,7 @@
 /** @type {import('tailwindcss').Config} */
 module.exports = {
  content: [
-    "src/template.liquid"
+    "src/static/template.liquid"
  ],
  theme: {
    extend: {},
Author	SHA1	Message	Date
Sergio	0a01c667da	Fix UI scaling and update docs	2024-07-12 13:26:40 +03:00
Sergio	271e299017	Moved all web assets to static folder, added xitca-web's logging feature and added favicons	2024-07-11 18:21:31 +03:00
Sergio	e0cad9d3ea	Make scrollbar a bit nicer	2024-07-11 17:32:59 +03:00
Sergio	ae0c6ed50f	Add caching	2024-07-11 13:32:43 +03:00
Sergio	f88f7d90f9	Fix release workflow	2024-07-11 13:29:11 +03:00
Sergio	75700cd692	Update nightly workflow to upload the correct binaries	2024-07-11 12:36:57 +03:00
Sergio	6573b43ce0	I know I'm not supposed to do this, but I have to.	2024-07-11 12:32:44 +03:00
Sergio	bee808e577	FINALLY fix Dockerfile	2024-07-11 12:27:02 +03:00
Sergio	ac8f97fbcd	Update workflows	2024-07-10 19:44:55 +03:00
Sergio	4ec661183f	Update nightly.yml Make jq output unquoted string	2024-07-10 15:20:08 +03:00
Sergio	39b2355c04	Update nightly.yml Try to fix workflow	2024-07-10 15:15:56 +03:00
Sergio	867ab4ba10	Update Cargo.toml I have to automate this	2024-07-10 14:49:01 +03:00
Sergio	9a75f5101f	Update Dockerfile Experimental dependency caching	2024-07-10 14:41:21 +03:00
Sergio	54eed353aa	Add nightly workflow	2024-07-10 14:39:03 +03:00
Sergio	e3319d9371	Update Dockerfile Hotfix	2024-07-10 14:23:05 +03:00
Sergio	38d775688a	Update Dockerfile Fix broken build process (attempt 1)	2024-07-10 14:07:22 +03:00
Sergio	31dd605efb	Update Cargo.toml I forgot to change the version	2024-07-10 12:08:00 +03:00
Sergio	06ec23520d	Updated image regex to support any image. Removed dependency on fancy_regex in favour of the regex crate	2024-07-10 09:59:00 +03:00