From 75c1eb9d76173caa40a4fbffb11a91688ea8132b Mon Sep 17 00:00:00 2001 From: Wyatt Miller Date: Wed, 13 Feb 2019 14:03:51 -0500 Subject: [PATCH] modified a bunch of things --- Dockerfile | 3 +- README.md | 2 + src/{ => assets}/tracks.jpg | Bin ...2019-02-01-container-it-up-docker.markdown | 6 +- .../_posts/2019-02-13-snapcraft-live.markdown | 13 ++ src/style.css | 4 +- src/style.scss | 175 ++++++++++++++++++ 7 files changed, 197 insertions(+), 6 deletions(-) rename src/{ => assets}/tracks.jpg (100%) create mode 100644 src/blog/_posts/2019-02-13-snapcraft-live.markdown create mode 100644 src/style.scss diff --git a/Dockerfile b/Dockerfile index 26538ef..3294b59 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,8 @@ # # Copying files in the dockerfile is kind of a mess. Actually not really. # Just remember when linking files in code, follow the method below. + FROM php:7.0-apache -RUN /bin/bash -c "cd /var/www/html && mkdir assets && mkdir css && mkdir img && mkdir webfonts" +# RUN /bin/bash -c "cd /var/www/html && mkdir assets && mkdir css && mkdir img && mkdir webfonts" COPY src/ /var/www/html EXPOSE 80 diff --git a/README.md b/README.md index b471613..efe5af0 100644 --- a/README.md +++ b/README.md @@ -2,3 +2,5 @@ [My personal website about me](https://wyattjmiller.com/) I don't expect anyone to mess with this but if you do, awesome sauce! Send in a pull request. + +TODO: Convert website to Sass diff --git a/src/tracks.jpg b/src/assets/tracks.jpg similarity index 100% rename from src/tracks.jpg rename to src/assets/tracks.jpg diff --git a/src/blog/_posts/2019-02-01-container-it-up-docker.markdown b/src/blog/_posts/2019-02-01-container-it-up-docker.markdown index e3ec68b..3cdd360 100644 --- a/src/blog/_posts/2019-02-01-container-it-up-docker.markdown +++ b/src/blog/_posts/2019-02-01-container-it-up-docker.markdown @@ -4,13 +4,13 @@ title: "Container it up: Massive Amounts of Docker!" published: true --- -I had a presentation today. It was about containers. "Wyatt" you are probably thinking "that's too broad of a topic. What are you doing??" Fear not friend, we gave a presentation about Docker, a containerized solution and Docker is used everywhere, from myself to the who's who like Google, Amazon, and Red Hat, to name a few. +I had a presentation today (in the future!). It was about containers. "Wyatt" you are probably thinking "that's too broad of a topic. What are you doing??" Fear not friend, we gave a presentation about Docker, a containerized solution and Docker is used everywhere, from myself to the who's who like Google, Amazon, and Red Hat, to name a few. Think of containers this way, if you don't know what containers in the software world do already. Let's say you're about to ship barrels of oil and a bear skin by cargo boat. You probably think that you need somewhere safe to store those, right? You store them in a big metal shipping box and now, those barrels of oil and bear skin won't be damaged by the sea or the boat. Software container work the same way, only they don't transport oil or bear skins, they transport software. Containers are a solution to move software to one machine to the other without any breaking changes, so no matter where you run your container, whether it be on a server, a developement machine or AWS, the environment will still be the same and it will run the same. -What makes containers so great? Well, I just explained that containers run everywhere so that eliminates the problem of "Well, it works on my machine." Containers also save resources, much more than virtual machines, which allocates system hardware to it using a hypervisor where as containers share system resources. Containers are very good at scaling as well, very well in fact when paired with Kuberntes or Docker Swarm which are orchestaration tools for Docker. Containers also enable microservices, which are layers of software that fit together. For example, take the Model-View-Presenter pattern. Have one container be the Model, have another be the View and the last container be the Presenter. Have them linked together and you have a program that one has the MVP pattern and two has microservices. How cool is that? +What makes containers so great? Well, I just explained that containers run everywhere so that eliminates the problem of "Well, it works on my machine." Containers also save resources, much more than virtual machines, which allocates system hardware to it using a hypervisor where as containers share system resources. Containers are very good at scaling as well, very well in fact when paired with Kuberntes or Docker Swarm which are orchestaration tools for Docker. Containers also enable microservices, which are layers of software that fit together. For example, take the Model-View-Presenter pattern. Have one container be the Model, have another be the View and the last container be the Presenter. Have them linked together in virtual network and you have a program that, one, has the MVP pattern and, two, has microservices. How cool is that?! -Docker has many different platforms, like GitLab, Wordpress and Rocket.Chat, which all run on Docker. Programming languages can also be run in Docker containers such as Ruby, Python, .NET, Java, Node, Rust, Golang and others so nobody is left out. Also, there are Docker images fro Windows so you Windows lovers out there can have your piece of the cake to with the Linux people. +Docker has many different platforms, like GitLab, Wordpress and Rocket.Chat, which all run on Docker. Programming languages can also be run in Docker containers such as Ruby, Python, .NET, Java, Node, Rust, Golang and others so nobody is left out. Also, there are Docker images forexit Windows so you Windows lovers out there can have your piece of the cake to with the Linux people. A few Docker commands must known however. diff --git a/src/blog/_posts/2019-02-13-snapcraft-live.markdown b/src/blog/_posts/2019-02-13-snapcraft-live.markdown new file mode 100644 index 0000000..6e9dd5c --- /dev/null +++ b/src/blog/_posts/2019-02-13-snapcraft-live.markdown @@ -0,0 +1,13 @@ +--- +layout: post +title: "Snapcraft is live!" +published: true +--- + +Hello all! Quick one today, sorry for the hastiness. + +I just want to let you know of live stream on YouTube. A live stream so fantasic that it'll knock your socks off. Yes, the Snapcraft team is hosting a live stream at 3pm Eastern (or 8pm Greenwich Mean Time, convert it, there is tools out on the net) that shows you how to snap stuff! That's a little vague, I'll try again. The Snapcraft team shows you how to package up your applications that you have built into Snap packages and they can be submitted to the Snap store. How neat is that?! + +I found this on the [Twitters](https://twitter.com/snapcraftio/status/1095351083462021121) and I thought I might chare this with all of you so you get on the bandwagon on why Snap packages are the bomb dot com. + +That's all and I hope to see you there! \ No newline at end of file diff --git a/src/style.css b/src/style.css index 6262813..b061db0 100644 --- a/src/style.css +++ b/src/style.css @@ -23,11 +23,11 @@ a:hover {color: seashell !important;} .footer a {color: white; text-decoration-color: white; text-decoration-line: none;} .footer a:hover {color: white;} -.main-section {position: relative; background-size: 100%; background-image: url("tracks.jpg"); background-color: black; padding: 30px 5px;} +.main-section {position: relative; background-size: 100%; background-image: url("assets/tracks.jpg"); background-color: black; padding: 30px 5px;} .main-section-about { position: relative; background-size: 100%; - background-image: url("tracks.jpg"); + background-image: url("assets/tracks.jpg"); background-color: black; padding: 30px 5px; } diff --git a/src/style.scss b/src/style.scss new file mode 100644 index 0000000..93d1c00 --- /dev/null +++ b/src/style.scss @@ -0,0 +1,175 @@ +/* Imports */ +@import url('https://fonts.googleapis.com/css?family=Oswald|Pacifico|Kavivanar'); + +/* Global rules */ +/* Elements */ + +html, body, h1, h2, h3, h4, h5, h6 {} + +a { + color: white !important; + &:hover { + color: seashell !important; + } + &:hover.nav-item.nav-link { + background-color: #efa0a0 !important; + text-decoration-color: white; + } + &.nav-item.nav-link { + font-family: "Oswald", cursive; + font-size: 30px; + } +} + +/* IDs */ + +#twitch-embed { + text-align: center; +} + +/* Classes */ + +.header { + background-color: #4c4e51; +} + +.header-title { + color: whitesmoke; + h1 { + font-family: "Pacifico", cursive; + font-size: 72px; + text-align: center; + margin: 0; + padding: 35px; + } + p { + font-size: 10px; + text-align: right; + margin: 1px; + color: #63666b; + } +} + +.footer { + font-family: "Oswald", sans-serif; + background-color: #4c4e51; + padding: 20px; + position: sticky; + width: 100%; + bottom: 0; + p { + font-size: 20px; + color: white; + text-align: center; + padding: 5px; + } + a { + color: white; + text-decoration-color: white; + text-decoration-line: none; + &:hover { + color: white; + } + } +} + +.main-section, .main-section-about { + position: relative; + background-size: 100%; + background-image: url("assets/tracks.jpg"); + background-color: black; + padding: 30px 5px; +} + +.main-background { + border-radius: 25px; + padding: 25px; + h2 { + font-family: "Kavivanar", cursive; + position: relative; + font-size: 54px; + color: white; + text-align: center; + } + h3, h4 { + font-family: "Kavivanar", cursive; + position: relative; + color: white; + text-align: center; + } + p { + font-family: "Kavivanar", cursive; + position: relative; + font-size: 36px; + color: white; + text-align: center; + } +} + +.main-background-text a { + color: #ff9999 !important; +} + +.about-background { + h2 { + position: relative; + font-size: 24px; + color: white; + } + p { + position: relative; + font-size: 20px; + color: white; + } +} + +.nav-pills .nav-link { + font-size: 24px; + background-color: #f08080 !important; + border-radius: 0 !important; + border-style: solid; + border-width: 2px; + border-color: black; +} + +.nav-link a { + font-family: "Oswald", cursive; + font-size: 30px; + color: white; + text-decoration-color: white; + &:hover { + background-color: #efa0a0 !important; + text-decoration-color: white; + } +} + +/*Media queries*/ +@media (min-width: 768px) { + .main-section { + padding: 50px 10px; + } + .main-section-about { + padding: 30px 5px; + } +} + +@media (min-width: 992px) { + .main-section { + padding: 70px 10px; + } + .main-section-about { + padding: 50px 10px; + } +} + +@media (min-width: 1200px) { + .main-section { + padding: 124px 200px; + h2, h3 { + text-align: center; + } + } + .main-section-about { + padding: 90px 125px; + } +} \ No newline at end of file