~jeffa/jeffa.io

fb096bf94b58b0d183a8625d7107f3836ef9b269 — Jeff a month ago 9ce2dad
Imrpove caching and move remote assets to local to improve performance
M .dockerignore => .dockerignore +1 -1
@@ 1,1 1,1 @@
build/
client/build/

M Dockerfile => Dockerfile +3 -2
@@ 13,7 13,7 @@ WORKDIR /jeffa.io/

COPY . .

CMD ["sh", "client/build.sh"]
RUN sh client/build.sh

# Run
FROM nginx:latest


@@ 23,7 23,8 @@ RUN useradd jeffa.io-nginx
WORKDIR /jeffa.io/

COPY nginx.conf /etc/nginx/nginx.conf
COPY --from=build-client /jeffa.io/client/build/ /jeffa.io/

COPY --from=build-client /jeffa.io/client/build/ /jeffa.io/client/build/

RUN mkdir ./logs/


M client/build.sh => client/build.sh +1 -1
@@ 42,7 42,7 @@ uglifycss client/build/tmp/*.css > client/build/index.css && \
# Copy assets to client/build

cp client/src/images/* client/build/ && \
    cp client/src/stylesheets/woff2/* client/build/woff2 && \
    cp client/src/stylesheets/woff2/* client/build/woff2/ && \
    mv client/build/jeffa.ico client/build/favicon.ico &&

# Step 4

M client/pandoc/page.html => client/pandoc/page.html +1 -1
@@ 30,7 30,7 @@
            <main>${body}</main>
            <footer class="row offset-by-one">
                <!-- License from https://creativecommons.org/ -->
                <p xmlns:dct="http://purl.org/dc/terms/" xmlns:cc="http://creativecommons.org/ns#"><a rel="cc:attributionURL" property="dct:title" href="https://jeffa.io">jeffa.io</a> by <a rel="cc:attributionURL dct:creator" property="cc:attributionName" href="https://jeffa.io">Jeff Anderson</a> is licensed under <a href="https://creativecommons.org/licenses/by/4.0?ref=chooser-v1" target="_blank" rel="license noopener noreferrer" style="display:inline-block;">CC BY 4.0<img style="height:22px!important;margin-left:3px;vertical-align:text-bottom;" src="https://mirrors.creativecommons.org/presskit/icons/cc.svg?ref=chooser-v1"><img style="height:22px!important;margin-left:3px;vertical-align:text-bottom;" src="https://mirrors.creativecommons.org/presskit/icons/by.svg?ref=chooser-v1"></a></p>
                <p><a href="https://jeffa.io">jeffa.io</a> by <a href="https://jeffa.io">Jeff Anderson</a> is licensed under <a href="https://creativecommons.org/licenses/by/4.0?ref=chooser-v1" style="display:inline-block;">CC BY 4.0<img style="height:22px!important;margin-left:3px;vertical-align:text-bottom;" src="cc.svg"><img style="height:22px!important;margin-left:3px;vertical-align:text-bottom;" src="by.svg"></a></p>
            </footer>
        </article>
    </div>

A client/src/images/by.svg => client/src/images/by.svg +11 -0
@@ 0,0 1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="64px" height="64px" viewBox="5.5 -3.5 64 64" enable-background="new 5.5 -3.5 64 64" xml:space="preserve">
<g>
	<circle fill="#FFFFFF" cx="37.637" cy="28.806" r="28.276"/>
	<g>
		<path d="M37.443-3.5c8.988,0,16.57,3.085,22.742,9.257C66.393,11.967,69.5,19.548,69.5,28.5c0,8.991-3.049,16.476-9.145,22.456    C53.879,57.319,46.242,60.5,37.443,60.5c-8.649,0-16.153-3.144-22.514-9.43C8.644,44.784,5.5,37.262,5.5,28.5    c0-8.761,3.144-16.342,9.429-22.742C21.101-0.415,28.604-3.5,37.443-3.5z M37.557,2.272c-7.276,0-13.428,2.553-18.457,7.657    c-5.22,5.334-7.829,11.525-7.829,18.572c0,7.086,2.59,13.22,7.77,18.398c5.181,5.182,11.352,7.771,18.514,7.771    c7.123,0,13.334-2.607,18.629-7.828c5.029-4.838,7.543-10.952,7.543-18.343c0-7.276-2.553-13.465-7.656-18.571    C50.967,4.824,44.795,2.272,37.557,2.272z M46.129,20.557v13.085h-3.656v15.542h-9.944V33.643h-3.656V20.557    c0-0.572,0.2-1.057,0.599-1.457c0.401-0.399,0.887-0.6,1.457-0.6h13.144c0.533,0,1.01,0.2,1.428,0.6    C45.918,19.5,46.129,19.986,46.129,20.557z M33.042,12.329c0-3.008,1.485-4.514,4.458-4.514s4.457,1.504,4.457,4.514    c0,2.971-1.486,4.457-4.457,4.457S33.042,15.3,33.042,12.329z"/>
	</g>
</g>
</svg>
\ No newline at end of file

A client/src/images/cc.svg => client/src/images/cc.svg +9 -0
@@ 0,0 1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="64px" height="64px" viewBox="5.5 -3.5 64 64" enable-background="new 5.5 -3.5 64 64" xml:space="preserve">
<g>
	<circle fill="#FFFFFF" cx="37.785" cy="28.501" r="28.836"/>
	<path d="M37.441-3.5c8.951,0,16.572,3.125,22.857,9.372c3.008,3.009,5.295,6.448,6.857,10.314   c1.561,3.867,2.344,7.971,2.344,12.314c0,4.381-0.773,8.486-2.314,12.313c-1.543,3.828-3.82,7.21-6.828,10.143   c-3.123,3.085-6.666,5.448-10.629,7.086c-3.961,1.638-8.057,2.457-12.285,2.457s-8.276-0.808-12.143-2.429   c-3.866-1.618-7.333-3.961-10.4-7.027c-3.067-3.066-5.4-6.524-7-10.372S5.5,32.767,5.5,28.5c0-4.229,0.809-8.295,2.428-12.2   c1.619-3.905,3.972-7.4,7.057-10.486C21.08-0.394,28.565-3.5,37.441-3.5z M37.557,2.272c-7.314,0-13.467,2.553-18.458,7.657   c-2.515,2.553-4.448,5.419-5.8,8.6c-1.354,3.181-2.029,6.505-2.029,9.972c0,3.429,0.675,6.734,2.029,9.913   c1.353,3.183,3.285,6.021,5.8,8.516c2.514,2.496,5.351,4.399,8.515,5.715c3.161,1.314,6.476,1.971,9.943,1.971   c3.428,0,6.75-0.665,9.973-1.999c3.219-1.335,6.121-3.257,8.713-5.771c4.99-4.876,7.484-10.99,7.484-18.344   c0-3.543-0.648-6.895-1.943-10.057c-1.293-3.162-3.18-5.98-5.654-8.458C50.984,4.844,44.795,2.272,37.557,2.272z M37.156,23.187   l-4.287,2.229c-0.458-0.951-1.019-1.619-1.685-2c-0.667-0.38-1.286-0.571-1.858-0.571c-2.856,0-4.286,1.885-4.286,5.657   c0,1.714,0.362,3.084,1.085,4.113c0.724,1.029,1.791,1.544,3.201,1.544c1.867,0,3.181-0.915,3.944-2.743l3.942,2   c-0.838,1.563-2,2.791-3.486,3.686c-1.484,0.896-3.123,1.343-4.914,1.343c-2.857,0-5.163-0.875-6.915-2.629   c-1.752-1.752-2.628-4.19-2.628-7.313c0-3.048,0.886-5.466,2.657-7.257c1.771-1.79,4.009-2.686,6.715-2.686   C32.604,18.558,35.441,20.101,37.156,23.187z M55.613,23.187l-4.229,2.229c-0.457-0.951-1.02-1.619-1.686-2   c-0.668-0.38-1.307-0.571-1.914-0.571c-2.857,0-4.287,1.885-4.287,5.657c0,1.714,0.363,3.084,1.086,4.113   c0.723,1.029,1.789,1.544,3.201,1.544c1.865,0,3.18-0.915,3.941-2.743l4,2c-0.875,1.563-2.057,2.791-3.541,3.686   c-1.486,0.896-3.105,1.343-4.857,1.343c-2.896,0-5.209-0.875-6.941-2.629c-1.736-1.752-2.602-4.19-2.602-7.313   c0-3.048,0.885-5.466,2.658-7.257c1.77-1.79,4.008-2.686,6.713-2.686C51.117,18.558,53.938,20.101,55.613,23.187z"/>
</g>
</svg>
\ No newline at end of file

M client/src/stylesheets/index.css => client/src/stylesheets/index.css +2 -0
@@ 1,3 1,5 @@
@import "iosevka-sparkle.css";

:root {
    --bg: #13171F;
    --blend: #445780;

M nginx.conf => nginx.conf +4 -1
@@ 6,6 6,7 @@ events {}

http {
    include /etc/nginx/mime.types;

    keepalive_timeout 65;

    log_format main '$remote_addr - $remote_user [$time_local]  $status '


@@ 24,13 25,15 @@ http {
        gzip_proxied no-cache no-store private expired auth;
        gzip_min_length 1000;

        root /jeffa.io/;
        root /jeffa.io/client/build/;
        index  index.html index.htm;

        location / {
            try_files $uri $uri.html $uri/ 404;
            gzip_static on;

            add_header Cache-Control private;
            expires modified 0;
        }

        error_page  404 /404.txt;