diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 75aed93..0000000 --- a/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM php:latest -COPY . /usr/src/myapp -WORKDIR /usr/src/myapp/public/ -CMD [ "php", "./index.php" ] \ No newline at end of file diff --git a/README.md b/README.md index fb3f7ca..952090b 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,7 @@ # Very kewl website -Made by yours truly \ No newline at end of file +Made by yours truly + +# Setup + +See [docker/README.md](./docker/README.md) \ No newline at end of file diff --git a/docker/Dockerfile b/docker/Dockerfile new file mode 100644 index 0000000..ba3e68a --- /dev/null +++ b/docker/Dockerfile @@ -0,0 +1,17 @@ +FROM alpine:latest + +# Nginx package is available in the Alpine Linux repositories. To install it run: +RUN apk update && \ + apk add nginx php-fpm + +# Creating new user and group 'www' for nginx +RUN adduser -D -g 'www' www + +# Create a directory for html files +RUN mkdir /www && \ + chown -R www:www /var/lib/nginx && \ + chown -R www:www /www + +COPY nginx.conf /etc/nginx/nginx.conf + +CMD ["nginx"] \ No newline at end of file diff --git a/docker/README.md b/docker/README.md new file mode 100644 index 0000000..ebdca68 --- /dev/null +++ b/docker/README.md @@ -0,0 +1 @@ +# Docker install \ No newline at end of file diff --git a/docker/nginx.conf b/docker/nginx.conf new file mode 100644 index 0000000..395b53a --- /dev/null +++ b/docker/nginx.conf @@ -0,0 +1,33 @@ +user www; +worker_processes 1; + +error_log /var/log/nginx/error.log warn; +pid /var/run/nginx/nginx.pid; + +events { + worker_connections 1024; +} + +http { + include /etc/nginx/mime.types; + default_type application/octet-stream; + sendfile on; + access_log /var/log/nginx/access.log; + keepalive_timeout 3000; + server { + listen 8080; + root /www; + index index.html index.htm index.php; + server_name localhost; + client_max_body_size 32m; + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root /var/lib/nginx/html; + } + location ~ \.php$ { + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + include fastcgi.conf; + } + } +} diff --git a/public/static/img/banner.png b/public/static/img/banner.png deleted file mode 100644 index dad8efe..0000000 Binary files a/public/static/img/banner.png and /dev/null differ diff --git a/public/static/img/logo.png b/public/static/img/logo.png new file mode 100644 index 0000000..e10fbac Binary files /dev/null and b/public/static/img/logo.png differ diff --git a/public/static/js/snow.js b/public/static/js/snow.js index 673ece2..586c980 100644 --- a/public/static/js/snow.js +++ b/public/static/js/snow.js @@ -1,9 +1,7 @@ -/** - * Cool snow that was TOTALLY NOT stolen from someone else :-) - */ +// Cool snow that was TOTALLY NOT stolen from someone else :-) // Amount of Snowflakes -var snowMax = 100; +var snowMax = 64; // Snowflake Colours var snowColor = ["#fff"]; @@ -15,10 +13,10 @@ var snowEntity = "*"; var snowSpeed = 0.75; // Minimum Flake Size -var snowMinSize = 8; +var snowMinSize = 16; // Maximum Flake Size -var snowMaxSize = 24; +var snowMaxSize = 32; // Refresh Rate (in milliseconds) var snowRefresh = 75; diff --git a/public/static/style/main.css b/public/static/style/main.css index 91492d3..c9cd295 100644 --- a/public/static/style/main.css +++ b/public/static/style/main.css @@ -1,41 +1,27 @@ html, body { height: 100%; } - body { margin: 0; - background: #560707; - color: #431718; + background: midnightblue; + color: #111; font-size: 1rem; - font-family: 'Times New Roman', Times, serif; - line-height: 1.5; + font-family: Arial, Helvetica, sans-serif; + line-height: 1.75; } - -header { - image-rendering: pixelated; -} - h1 { margin-top: .5rem; margin-bottom: .5rem; - border-bottom: 1px solid; } - a { color: blue; } - .container { margin: auto; - max-width: 600px; - background: bisque; -} - -main { + max-width: 37rem; + background: #fff; padding: 1rem; - padding-top: 0; } - img { display: block; max-width: 100%; @@ -52,19 +38,18 @@ td, th { padding: 8px; } tr:nth-child(even) { - background: #eed3b3; + background: #eee; } -@media (max-width: 600px) { +@media (max-width: 39rem) { .container { min-height: 100%; } } - pre, code { font-family: "DejaVu Sans Mono", Consolas, monospace; - background: #431718; - color: bisque; + background: #111; + color: #fff; padding: .5rem; max-width: 100%; display: block; diff --git a/views/pages/home.php b/views/pages/home.php index 3e5af48..3b14e70 100644 --- a/views/pages/home.php +++ b/views/pages/home.php @@ -1,8 +1,12 @@ - 'Welcome to the willy club'])?> + 'Welcome to the Willy Club'])?> -

Welcome to the willy club

+

Welcome to the Willy Club

-

Theres more than just willies! This site hosts some services for me and friends.

+

Theres more than just willies! Most of the time.

+ +

Not at all associated with thewilly.club ASSHOLES squatting my domain name with their shitty NFTs, this is the original.

+ +

This space hosts some services for me and friends, maybe it will host some other stuff down the line if I'm not too lazy.

@@ -11,30 +15,26 @@ - + - + - +
GiteaUnknownTBD
MatrixUnknownTBD
MumbleUnknownTBD
-

Contact

+

Flirt with the WEBMASTER

-

Send me a nice and positive message at @william:willy.club

+

Send me a nice and positive message on matrix: @william:willy.club

-

Webring

+

Awesome webring or something

-

Check out any of these other websites

+

Check out any of these other aweeesome websites!

Well maybe there will be a webring here in the future.

-

I don't know what more to put here

- -

This is just some text to make the page feel more complete? Yeah

- \ No newline at end of file diff --git a/views/pages/matrix.php b/views/pages/matrix.php index 95c3fa7..c820579 100644 --- a/views/pages/matrix.php +++ b/views/pages/matrix.php @@ -2,12 +2,14 @@

Matrix Homeserver

-

Come solve all of the worlds problems on the willy club public matrix homeserver.

+

Come hang out with the other terminally online losers and bitch about all of the worlds problems on the Willy Club matrix homeserver. You can also use it to communicate freely or whatever.

You can register on a client that supports it by adding:

https://matrix.willy.club -

as the homeserver, enjoy!

+

as the homeserver, have fun and be nice!

+ +

There is an Element web client hosted here but it's recommended you use your own client for security as a compromised client may leak your private keys potentially allowing hackers to decrypt messages in the case of a data breach or by logging into your account.

\ No newline at end of file diff --git a/views/templates/header.php b/views/templates/header.php index 29136ec..1353331 100644 --- a/views/templates/header.php +++ b/views/templates/header.php @@ -1,6 +1,9 @@ @@ -14,16 +17,20 @@ function special_events(): string { - +
-
- - Click here to go to the homepage. - -
+ + + + +
+ +
\ No newline at end of file