diff --git a/Dockerfile b/Dockerfile index d96b0aa..6fe6f37 100644 --- a/Dockerfile +++ b/Dockerfile @@ -53,6 +53,7 @@ COPY docker-entrypoint.sh lldap_config.docker_template.toml ./ RUN set -x \ && apk add --no-cache bash \ && for file in $(cat app/static/libraries.txt); do wget -P app/static "$file"; done \ + && for file in $(cat app/static/fonts/fonts.txt); do wget -P app/static/fonts "$file"; done \ && chmod a+r -R . ENV LDAP_PORT=3890 diff --git a/app/static/fonts.css b/app/static/fonts.css index 27bb97c..48d482d 100644 --- a/app/static/fonts.css +++ b/app/static/fonts.css @@ -4,7 +4,7 @@ font-style: normal; font-weight: 400; font-display: swap; - src: url(JTUSjIg69CK48gW7PXoo9Wdhyzbi.woff2) format('woff2'); + src: url(fonts/JTUSjIg69CK48gW7PXoo9Wdhyzbi.woff2) format('woff2'); unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; } /* latin */ @@ -13,6 +13,6 @@ font-style: normal; font-weight: 400; font-display: swap; - src: url(JTUSjIg69CK48gW7PXoo9Wlhyw.woff2) format('woff2'); + src: url(fonts/JTUSjIg69CK48gW7PXoo9Wlhyw.woff2) format('woff2'); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } \ No newline at end of file diff --git a/app/static/fonts/fonts.txt b/app/static/fonts/fonts.txt new file mode 100644 index 0000000..31396bb --- /dev/null +++ b/app/static/fonts/fonts.txt @@ -0,0 +1,3 @@ +https://cdn.jsdelivr.net/npm/bootstrap-icons@1.5.0/font/fonts/bootstrap-icons.woff2?856008caa5eb66df68595e734e59580d +https://fonts.gstatic.com/s/bebasneue/v2/JTUSjIg69CK48gW7PXoo9Wdhyzbi.woff2 +https://fonts.gstatic.com/s/bebasneue/v2/JTUSjIg69CK48gW7PXoo9Wlhyw.woff2 \ No newline at end of file diff --git a/app/static/libraries.txt b/app/static/libraries.txt index c71a0da..8f513d9 100644 --- a/app/static/libraries.txt +++ b/app/static/libraries.txt @@ -1,7 +1,4 @@ https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/css/bootstrap.min.css https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js https://cdn.jsdelivr.net/npm/bootstrap-icons@1.5.0/font/bootstrap-icons.css -https://cdn.jsdelivr.net/npm/bootstrap-icons@1.5.0/font/fonts/bootstrap-icons.woff2?856008caa5eb66df68595e734e59580d -https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css -https://fonts.gstatic.com/s/bebasneue/v2/JTUSjIg69CK48gW7PXoo9Wdhyzbi.woff2 -https://fonts.gstatic.com/s/bebasneue/v2/JTUSjIg69CK48gW7PXoo9Wlhyw.woff2 \ No newline at end of file +https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css \ No newline at end of file diff --git a/server/src/infra/tcp_server.rs b/server/src/infra/tcp_server.rs index 4093318..6a67521 100644 --- a/server/src/infra/tcp_server.rs +++ b/server/src/infra/tcp_server.rs @@ -72,6 +72,8 @@ fn http_config( .service(Files::new("/pkg", "./app/pkg")) // Serve static files .service(Files::new("/static", "./app/static")) + // Serve static fonts + .service(Files::new("/static/fonts", "./app/static/fonts")) // Serve the index .service( web::scope("/")