From 0b2e81d6f84b7fdf4420fee7b62373cbd6d2bd79 Mon Sep 17 00:00:00 2001 From: Medium Fries Date: Sat, 22 Dec 2018 22:31:53 -0800 Subject: [PATCH 01/11] new regular text color --- style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/style.css b/style.css index b20f9eb..fe89bf2 100644 --- a/style.css +++ b/style.css @@ -41,7 +41,7 @@ html { /* now some stuff for the text */ body { /* regular tex color(for the front page it won't matter much since everything is blockquotes*/ - color: #373854; + color: #3b444b; background-color: #faebd7; font-family: Fixedsys; font-size: 12px; From 4d0faf2f7641f7e8f28cfec554b5f259deebcd4e Mon Sep 17 00:00:00 2001 From: Medium Fries Date: Sat, 22 Dec 2018 22:32:34 -0800 Subject: [PATCH 02/11] wtf happened to these urls --- page/bstyle.css | 3 ++- post/bstyle.css | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/page/bstyle.css b/page/bstyle.css index 75a3c4d..8207d0d 100644 --- a/page/bstyle.css +++ b/page/bstyle.css @@ -41,7 +41,7 @@ html { /* now some stuff for the text */ body { /* regular tex color(for the front page it won't matter much since everything is blockquotes*/ - color: #373854; + color: #3b444b; background-color: #faebd7; font-family: Fixedsys; font-size: 12px; @@ -141,6 +141,7 @@ h6 { } blockquote { + /* this bit for the text color */ color: #3b444b; margin: 0; padding-left: 3em; diff --git a/post/bstyle.css b/post/bstyle.css index 75a3c4d..8207d0d 100644 --- a/post/bstyle.css +++ b/post/bstyle.css @@ -41,7 +41,7 @@ html { /* now some stuff for the text */ body { /* regular tex color(for the front page it won't matter much since everything is blockquotes*/ - color: #373854; + color: #3b444b; background-color: #faebd7; font-family: Fixedsys; font-size: 12px; @@ -141,6 +141,7 @@ h6 { } blockquote { + /* this bit for the text color */ color: #3b444b; margin: 0; padding-left: 3em; From 8eb2db9be7958ae3adaeaac8a11bc5fea27b0887 Mon Sep 17 00:00:00 2001 From: Medium Fries Date: Sat, 22 Dec 2018 22:43:10 -0800 Subject: [PATCH 03/11] big succ text color --- style.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/style.css b/style.css index b61466f..82206e4 100644 --- a/style.css +++ b/style.css @@ -7,11 +7,11 @@ html { @font-face { font-family: 'Fixedsys'; - src: url(./fonts/FSEX300.ttf); + src: url(../fonts/FSEX300.ttf); } @font-face { font-family: 'Freemono'; - src: url(./fonts/FreeMono.otf); + src: url(../fonts/FreeMono.otf); } /* sick nav bar */ .topnav { @@ -21,7 +21,7 @@ html { float: left; display: block; /* text color */ - color: #f2f2f2; + color: #3b444b; text-align: center; padding: 14px 16px; text-decoration: none; @@ -96,7 +96,7 @@ a::selection { p { margin: 1em 0; - color: #F1C6A7; + color: #3b444b; } img { From 7ab30949d62f698383f40a2b26713333b1576673 Mon Sep 17 00:00:00 2001 From: Medium Fries Date: Sat, 22 Dec 2018 22:43:28 -0800 Subject: [PATCH 04/11] bad regexing causing missing fonts is gone now --- make.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/make.sh b/make.sh index d4821f3..34639ef 100755 --- a/make.sh +++ b/make.sh @@ -15,15 +15,14 @@ post() { updatestyle() { # Updating index style cp style.css $rootDir/style.css - sed -i 's/.\/fonts/..\/fonts/g' $rootDir/style.css # Updating page style cp style.css $rootDir/page/style.css - sed -i 's/.\/fonts/..\/fonts/g' $rootDir/page/style.css + sed -i 's/(.\/fonts/(..\/fonts/g' $rootDir/page/style.css # Updating post style cp style.css $rootDir/post/style.css - sed -i 's/.\/fonts/..\/fonts/g' $rootDir/page/style.css + sed -i 's/(.\/fonts/(..\/fonts/g' $rootDir/post/style.css } page() { From 419a938414e2ce6a49d861a31fadf13f61fd98f2 Mon Sep 17 00:00:00 2001 From: Medium Fries Date: Sat, 22 Dec 2018 22:43:49 -0800 Subject: [PATCH 05/11] no more duplicate headers in markdown --- markdown/post/bash-1.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/markdown/post/bash-1.md b/markdown/post/bash-1.md index 77da0aa..8129786 100644 --- a/markdown/post/bash-1.md +++ b/markdown/post/bash-1.md @@ -1,7 +1,5 @@ # [Bash is weird sometimes](../index.html) -# Bash is weird sometimes - Bash is actually pretty nice but is... weird sometimes. \ Take this for instance: `alias v='vim'` This is an actual bind I use daily however if you don't have tab-completion setup for vim you know that tab-completion usually results in: From abd341bb8746ec1d388aae37d9ee4468db80dc27 Mon Sep 17 00:00:00 2001 From: Medium Fries Date: Sat, 22 Dec 2018 22:47:01 -0800 Subject: [PATCH 06/11] renamed file and nearly replaced virgin make file with chad rebuild everytime file --- rebuild.sh => build.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) rename rebuild.sh => build.sh (53%) diff --git a/rebuild.sh b/build.sh similarity index 53% rename from rebuild.sh rename to build.sh index 4a4f3ee..0b118ec 100755 --- a/rebuild.sh +++ b/build.sh @@ -14,4 +14,18 @@ page() { pandoc $file --css style.css -s -o $rootDir/page/${fileName%.*}.html done } + +style() { + # Updating index style + cp style.css $rootDir/style.css + + # Updating page style + cp style.css $rootDir/page/style.css + sed -i 's/(.\/fonts/(..\/fonts/g' $rootDir/page/style.css + + # Updating post style + cp style.css $rootDir/post/style.css + sed -i 's/(.\/fonts/(..\/fonts/g' $rootDir/post/style.css + +} "$@" From 79d6a3ab4e51640f2513dd7fbb62fa8b4ae2dc60 Mon Sep 17 00:00:00 2001 From: Medium Fries Date: Sun, 23 Dec 2018 00:12:06 -0800 Subject: [PATCH 07/11] removed notes not needed anymore --- notes.md | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 notes.md diff --git a/notes.md b/notes.md deleted file mode 100644 index fa79acc..0000000 --- a/notes.md +++ /dev/null @@ -1,24 +0,0 @@ -# Building - -using pandoc script `make.sh` -bash make.sh inputFile styleSheet outputFile - -1. Full path to the file from the script location \ - -2. Path to style sheet relative to where the output file *will be* located \ - -3. Full path to the output file \ - - -# Todo section - -* site banner which is easier to click on for mobile users, also so that it looks pretty for the site in general - -* Housekeeping - updating site css as time goes on so that I looks good and whatnot - -* make script to handle automatically targetting a given file and producing the proper html output file. The only one which may need something special is the index page since it might need some kind of menu to navigate to other places in the site like links/blog/about etc - -# Daily Todo/Order list - -Layer for index updater which cats out the proper headers/title from a finished markdown post and into the markdown file so that we can compile it like normal - From e6b1427258ba0a9ee33f0e1d37aa9ce43f0e1296 Mon Sep 17 00:00:00 2001 From: Medium Fries Date: Sun, 23 Dec 2018 00:15:18 -0800 Subject: [PATCH 08/11] modern readme --- README.md | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index e297391..c0bfe10 100644 --- a/README.md +++ b/README.md @@ -6,22 +6,24 @@ Below is a description of what each directory contains and why. ## ~/ -* `index.md` - markdown of the main page, is rendered using `make.sh` into an html file which is then used on neocities - * `index.html` - the main page where most links can be found in the site -* `notes.md` - random notes that I use to remind myself of how things work on occasion. - * `make.sh` - build file for basically everything -## /markdown +* `build.sh` - build script that basically does what `make.sh` but in a lazy(stupid) as hell way + +## ./markdown Container for all/post articles and/or posts to the site, including but not limited to the homepage, site philosophy post and others. These are then rendered into actual html files using the `make.sh` file. -## /post - -Stylesheets for the actual posts as well as the previously mentioned html render files which pandoc produces. - -## /img +## ./img Images used for the site go here + +## ./fonts + +Fonts that are really cool + +## ./_site + +Though this directory doesn't show up on in the repository it's where the public files go once they are built and ready for the actualy website From d1e9659cd1d1a7f66aff6054dd1ef62cae5875ee Mon Sep 17 00:00:00 2001 From: Medium Fries Date: Sun, 23 Dec 2018 00:55:02 -0800 Subject: [PATCH 09/11] these don't belong in this branch waddu heck --- markdown/post/inthefile.md | 58 -------------------------------------- markdown/post/neatgit.md | 15 ---------- markdown/post/train.md | 17 ----------- markdown/post/yes | 1 - 4 files changed, 91 deletions(-) delete mode 100644 markdown/post/inthefile.md delete mode 100644 markdown/post/neatgit.md delete mode 100644 markdown/post/train.md delete mode 100644 markdown/post/yes diff --git a/markdown/post/inthefile.md b/markdown/post/inthefile.md deleted file mode 100644 index 953677d..0000000 --- a/markdown/post/inthefile.md +++ /dev/null @@ -1,58 +0,0 @@ -# [In the file](../index.html) - -* first draft of this little writing - -## Preamble Note -Before I go into any detail at all I should mention that in fact this whole post is somewhat of a rant on a pet peeve of mine. -At the same time I want to discuss why this mostly exists as a problem I have with the """_absolute state_""" of computer science education. - -## I'm in the file what now? - -I've lost track of how many times this has been thrown my by students learning about the commandline in a \*nix environment. -It's not that I loathe this phrasing but, I completely loathe it. -Something about it feels as though many don't realize that they're not actually saying anything with this phrase. -It's like going to change your oil and saying, "_alright im in the engine_". - -For those trying to learn "the _commandline/terminal_" I have on piece of advice: a directory is a folder. -To be honest I know this stems from students being taught """_the commandline_""" with literally 0 context given. -I use a terminal for everything, hell this whole website was built in the termianl but, even I don't know what people mean when they say, "I know the commandline". -All I know is that they refer to Linux _stuff_ but even then I'm not completely sure what that is supposed to mean. - -## The part where I blame academia - -How many times has academia managed to fist its way into every crevice of the world with no complaints I'll never know, but I do know it sucks for everyone. -I say this because for learning theory academia has always been great, structuring that which needed it most. -For _everything_ outside of that realm, eh. - -It seems like at least in CSU Monterey Bay the staff have a hard-on for Unix but have little idea of how to teach it. - -### Another section for my prosed solution so its easy find - -Stop directly teaching how to use the commandline. -Instead setup students in a situation where commandline utilities would be the easiest to setup or the best choice to use. - -> B-b-but if we do that they might not do it pro- - -_Stop_, they're going to fuck things up regardless, at least this way they'll learn the dumb meme you're targeting but in a practical manner. -Trust me whatever they end up learning, they _will not_ forget. -Details sure; everyone forgets details, but at least most students(apart from the stupid ones) will know at least some basic tricks to help them later in (CS) life. - -## Pet Peeve - -Nearly everytime I help another student with command line _stuff_ I hold back cringe upon hearing the phrase, "_I'm in the file what do i do now????_". -If anyone can decipher the meaning of this phrase I would love to know but as of right now I'm stumped. -It reminds of when a mechanic friend of mine told me of how he can't stand hering customers say, "_yea the engine is on the fritz_". - -## Filesystems are vry hrd - -Recently at my university more and more of the curriculum has been focused on teaching student of the Unix command line environment. -This entails a few things: - -1. Teach students some basic utility in case they find themselves needing to do some remote work -2. Exposure to new tools(_more on this point in another section_) - -Though the prospect may be enticing its the execution which ruins the whole thing. -Primarily the problem with teaching unix to students is the lack of context. -Tools like _Git_, _Bash_, or even an editor like _Nano_ end up being confusing to students for some new arbitrary reason. -When I say that these things are confusing I mean I've literally had a student ask me, "_What's the point of Git even? I don't get why we're learning this_". - diff --git a/markdown/post/neatgit.md b/markdown/post/neatgit.md deleted file mode 100644 index 0a3258d..0000000 --- a/markdown/post/neatgit.md +++ /dev/null @@ -1,15 +0,0 @@ -# [Git and Vim for Notes](../index.html) - -It's no fun looking for a good note-taking program for school since so many of them seem to just kinda succ. -The good thing however is that you don't really need a good note taking program like you need a good text editor. -In case you haven't yet considered it, I'll show you how you can make _your favorite text editor_ the comfiest note taker out there. -Of course I want to also show you how to get your stuff synced between multiple devices, because that's also super useful. - -## Editing, Syncing, File Formats Galore - -In my case [vim](https://www.vim.org/) is my go-to editor that I use for basically everything. -This is partly due to the fact that I am just efficient using it and partly that I have some plugins which make it super nice for basically every type of text editing that I could ever want or need. - -There's all sorts of plugins for vim that you can find out in the ether. -Utilities like spell-checkers, auto-complete, and in the case of this post, _Goyo_, a special plugin to make vim more distraction free to focus on your work. - diff --git a/markdown/post/train.md b/markdown/post/train.md deleted file mode 100644 index be2761a..0000000 --- a/markdown/post/train.md +++ /dev/null @@ -1,17 +0,0 @@ -[![HomePage](../img/banner.png)](../index.html) - -My Thanksgiving holiday came to a close recently which means I had to go back to university but since I was stuck on the train _literally all day_ I figured why not spin some stuff that's pretty neat. - -California Public transportation sucks. -However, the train for long distance travel seems to be ""_a small bit_"" of an exception. -I only put it like that because when there are no delays it feels like you're getting somewhere and there's no real worry about much else, just sit back and relax while you wait to get to your destination. -California's public transportation system though, basically rekts all of this nearly everytime. -When a train is delayed it keeps getting delayed. -This means once you get on, it's going to keep getting delayed at nearly every stop. - -The ride is at least comfy neverless. -Bonus points if you take the surfliner train which goes along the coast for the majority of the central coast. - -I didn't take pictures of the ocean because sleep but there was still some neat stuff to see, mainly tons of shoreline with a great spots that I've marked with my phone's GPS. - -Here are the coords in case you're curious: `34.6277141, -120.6281343`. diff --git a/markdown/post/yes b/markdown/post/yes deleted file mode 100644 index 2c82bf2..0000000 --- a/markdown/post/yes +++ /dev/null @@ -1 +0,0 @@ -[![HomePage](../img/banner.png)](../index.html) From bcbe145ab4bed9b890abf4fab2425031c7663951 Mon Sep 17 00:00:00 2001 From: Medium Fries Date: Sun, 23 Dec 2018 00:55:40 -0800 Subject: [PATCH 10/11] Ability to yeet my website into cyberspace is now here(f u t u r e) --- build.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/build.sh b/build.sh index 0b118ec..28e324c 100755 --- a/build.sh +++ b/build.sh @@ -28,4 +28,13 @@ style() { sed -i 's/(.\/fonts/(..\/fonts/g' $rootDir/post/style.css } + +yeet() { + post + page + style + # finally we'll upload the site itself to neocities + neocities push _site/ +} + "$@" From e278dc14c0016653f477c8da2077e5bdc8aafa6d Mon Sep 17 00:00:00 2001 From: shockrahwow Date: Tue, 1 Jan 2019 20:56:54 -0800 Subject: [PATCH 11/11] adding init function to build script --- build.sh | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/build.sh b/build.sh index 28e324c..e88edee 100755 --- a/build.sh +++ b/build.sh @@ -1,5 +1,10 @@ # Because sometimes you just have to rebuild everything rootDir='./_site/' + +index() { + pandoc ./markdown/index.md --css style.css -s -o $rootDir/index.html +} + post() { for file in ./markdown/post/* do @@ -37,4 +42,28 @@ yeet() { neocities push _site/ } + +# Setups site directory from scratch +init() { + mkdir -p "$rootDir/page/" "$rootDir/post/" "$rootDir/fonts/" "$rootDir/img/" + + cp ./img/* "$rootDir/img/" + cp ./fonts/* "$rootDir/fonts/" + + post + page + index + style +} + "$@" + +if [ -z $1 ] +then + echo './build.sh init - create website from scratch' + echo './build.sh post - builds posts' + echo './build.sh page - builds pages' + echo './build.sh style - builds style' + echo './build.sh yeet - upload to neocties' +fi +