diff --git a/.bundle/config b/.bundle/config new file mode 100644 index 0000000..10c69f1 --- /dev/null +++ b/.bundle/config @@ -0,0 +1,2 @@ +--- +BUNDLE_WITHOUT: "development" diff --git a/.sass-cache/23af9ae2b1975ab22402a717b3809e8b49a4260d/_archives.scssc b/.sass-cache/23af9ae2b1975ab22402a717b3809e8b49a4260d/_archives.scssc new file mode 100644 index 0000000..1c2c8b1 Binary files /dev/null and b/.sass-cache/23af9ae2b1975ab22402a717b3809e8b49a4260d/_archives.scssc differ diff --git a/.sass-cache/23af9ae2b1975ab22402a717b3809e8b49a4260d/_article.scssc b/.sass-cache/23af9ae2b1975ab22402a717b3809e8b49a4260d/_article.scssc new file mode 100644 index 0000000..41b7c0f Binary files /dev/null and b/.sass-cache/23af9ae2b1975ab22402a717b3809e8b49a4260d/_article.scssc differ diff --git a/.sass-cache/23af9ae2b1975ab22402a717b3809e8b49a4260d/_buttons.scssc b/.sass-cache/23af9ae2b1975ab22402a717b3809e8b49a4260d/_buttons.scssc new file mode 100644 index 0000000..9ff21e4 Binary files /dev/null and b/.sass-cache/23af9ae2b1975ab22402a717b3809e8b49a4260d/_buttons.scssc differ diff --git a/.sass-cache/23af9ae2b1975ab22402a717b3809e8b49a4260d/_footer.scssc b/.sass-cache/23af9ae2b1975ab22402a717b3809e8b49a4260d/_footer.scssc new file mode 100644 index 0000000..b044388 Binary files /dev/null and b/.sass-cache/23af9ae2b1975ab22402a717b3809e8b49a4260d/_footer.scssc differ diff --git a/.sass-cache/23af9ae2b1975ab22402a717b3809e8b49a4260d/_header.scssc b/.sass-cache/23af9ae2b1975ab22402a717b3809e8b49a4260d/_header.scssc new file mode 100644 index 0000000..e4c74eb Binary files /dev/null and b/.sass-cache/23af9ae2b1975ab22402a717b3809e8b49a4260d/_header.scssc differ diff --git a/.sass-cache/23af9ae2b1975ab22402a717b3809e8b49a4260d/_navigation.scssc b/.sass-cache/23af9ae2b1975ab22402a717b3809e8b49a4260d/_navigation.scssc new file mode 100644 index 0000000..2c4832d Binary files /dev/null and b/.sass-cache/23af9ae2b1975ab22402a717b3809e8b49a4260d/_navigation.scssc differ diff --git a/.sass-cache/23af9ae2b1975ab22402a717b3809e8b49a4260d/_social.scssc b/.sass-cache/23af9ae2b1975ab22402a717b3809e8b49a4260d/_social.scssc new file mode 100644 index 0000000..4e6a2df Binary files /dev/null and b/.sass-cache/23af9ae2b1975ab22402a717b3809e8b49a4260d/_social.scssc differ diff --git a/.sass-cache/556e35e5c91527026bd4c5781f51090704fec625/_mixins.scssc b/.sass-cache/556e35e5c91527026bd4c5781f51090704fec625/_mixins.scssc new file mode 100644 index 0000000..5078482 Binary files /dev/null and b/.sass-cache/556e35e5c91527026bd4c5781f51090704fec625/_mixins.scssc differ diff --git a/.sass-cache/556e35e5c91527026bd4c5781f51090704fec625/_variables.scssc b/.sass-cache/556e35e5c91527026bd4c5781f51090704fec625/_variables.scssc new file mode 100644 index 0000000..771a90d Binary files /dev/null and b/.sass-cache/556e35e5c91527026bd4c5781f51090704fec625/_variables.scssc differ diff --git a/.sass-cache/5e095ad1a6adf99a345343ba7715ccdf0a278d8a/_syntax-highlighting.scssc b/.sass-cache/5e095ad1a6adf99a345343ba7715ccdf0a278d8a/_syntax-highlighting.scssc new file mode 100644 index 0000000..4c1c74f Binary files /dev/null and b/.sass-cache/5e095ad1a6adf99a345343ba7715ccdf0a278d8a/_syntax-highlighting.scssc differ diff --git a/.sass-cache/7a4b5ac3109067540f9eb129f171dd1d57c8cf80/_syntax-highlighting.scssc b/.sass-cache/7a4b5ac3109067540f9eb129f171dd1d57c8cf80/_syntax-highlighting.scssc new file mode 100644 index 0000000..08589b3 Binary files /dev/null and b/.sass-cache/7a4b5ac3109067540f9eb129f171dd1d57c8cf80/_syntax-highlighting.scssc differ diff --git a/.sass-cache/7ec17862bbffe1ce11699d4e4d5c08f0bd32439d/_layout.scssc b/.sass-cache/7ec17862bbffe1ce11699d4e4d5c08f0bd32439d/_layout.scssc new file mode 100644 index 0000000..535bfda Binary files /dev/null and b/.sass-cache/7ec17862bbffe1ce11699d4e4d5c08f0bd32439d/_layout.scssc differ diff --git a/.sass-cache/8fc9c64f34bf80976fe3ad76d11a884d60a0f9a4/_blue.scssc b/.sass-cache/8fc9c64f34bf80976fe3ad76d11a884d60a0f9a4/_blue.scssc new file mode 100644 index 0000000..b4f1c2f Binary files /dev/null and b/.sass-cache/8fc9c64f34bf80976fe3ad76d11a884d60a0f9a4/_blue.scssc differ diff --git a/.sass-cache/8fc9c64f34bf80976fe3ad76d11a884d60a0f9a4/_green.scssc b/.sass-cache/8fc9c64f34bf80976fe3ad76d11a884d60a0f9a4/_green.scssc new file mode 100644 index 0000000..65148d8 Binary files /dev/null and b/.sass-cache/8fc9c64f34bf80976fe3ad76d11a884d60a0f9a4/_green.scssc differ diff --git a/.sass-cache/8fc9c64f34bf80976fe3ad76d11a884d60a0f9a4/_grey.scssc b/.sass-cache/8fc9c64f34bf80976fe3ad76d11a884d60a0f9a4/_grey.scssc new file mode 100644 index 0000000..678a4e2 Binary files /dev/null and b/.sass-cache/8fc9c64f34bf80976fe3ad76d11a884d60a0f9a4/_grey.scssc differ diff --git a/.sass-cache/8fc9c64f34bf80976fe3ad76d11a884d60a0f9a4/_orange.scssc b/.sass-cache/8fc9c64f34bf80976fe3ad76d11a884d60a0f9a4/_orange.scssc new file mode 100644 index 0000000..61b1f0e Binary files /dev/null and b/.sass-cache/8fc9c64f34bf80976fe3ad76d11a884d60a0f9a4/_orange.scssc differ diff --git a/.sass-cache/8fc9c64f34bf80976fe3ad76d11a884d60a0f9a4/_purple.scssc b/.sass-cache/8fc9c64f34bf80976fe3ad76d11a884d60a0f9a4/_purple.scssc new file mode 100644 index 0000000..6ffd1d3 Binary files /dev/null and b/.sass-cache/8fc9c64f34bf80976fe3ad76d11a884d60a0f9a4/_purple.scssc differ diff --git a/.sass-cache/926f7e2755f4f14788ef351095b65ae647b10fa0/_mixins.scssc b/.sass-cache/926f7e2755f4f14788ef351095b65ae647b10fa0/_mixins.scssc new file mode 100644 index 0000000..445f193 Binary files /dev/null and b/.sass-cache/926f7e2755f4f14788ef351095b65ae647b10fa0/_mixins.scssc differ diff --git a/.sass-cache/926f7e2755f4f14788ef351095b65ae647b10fa0/_variables.scssc b/.sass-cache/926f7e2755f4f14788ef351095b65ae647b10fa0/_variables.scssc new file mode 100644 index 0000000..84484c5 Binary files /dev/null and b/.sass-cache/926f7e2755f4f14788ef351095b65ae647b10fa0/_variables.scssc differ diff --git a/.sass-cache/b022b2821ed6bc39dd2d4e6655d9f9b105c80a2c/_archives.scssc b/.sass-cache/b022b2821ed6bc39dd2d4e6655d9f9b105c80a2c/_archives.scssc new file mode 100644 index 0000000..e11d4fc Binary files /dev/null and b/.sass-cache/b022b2821ed6bc39dd2d4e6655d9f9b105c80a2c/_archives.scssc differ diff --git a/.sass-cache/b022b2821ed6bc39dd2d4e6655d9f9b105c80a2c/_article.scssc b/.sass-cache/b022b2821ed6bc39dd2d4e6655d9f9b105c80a2c/_article.scssc new file mode 100644 index 0000000..51b5fe6 Binary files /dev/null and b/.sass-cache/b022b2821ed6bc39dd2d4e6655d9f9b105c80a2c/_article.scssc differ diff --git a/.sass-cache/b022b2821ed6bc39dd2d4e6655d9f9b105c80a2c/_buttons.scssc b/.sass-cache/b022b2821ed6bc39dd2d4e6655d9f9b105c80a2c/_buttons.scssc new file mode 100644 index 0000000..c4100c5 Binary files /dev/null and b/.sass-cache/b022b2821ed6bc39dd2d4e6655d9f9b105c80a2c/_buttons.scssc differ diff --git a/.sass-cache/b022b2821ed6bc39dd2d4e6655d9f9b105c80a2c/_footer.scssc b/.sass-cache/b022b2821ed6bc39dd2d4e6655d9f9b105c80a2c/_footer.scssc new file mode 100644 index 0000000..cd6a212 Binary files /dev/null and b/.sass-cache/b022b2821ed6bc39dd2d4e6655d9f9b105c80a2c/_footer.scssc differ diff --git a/.sass-cache/b022b2821ed6bc39dd2d4e6655d9f9b105c80a2c/_header.scssc b/.sass-cache/b022b2821ed6bc39dd2d4e6655d9f9b105c80a2c/_header.scssc new file mode 100644 index 0000000..ef2e906 Binary files /dev/null and b/.sass-cache/b022b2821ed6bc39dd2d4e6655d9f9b105c80a2c/_header.scssc differ diff --git a/.sass-cache/b022b2821ed6bc39dd2d4e6655d9f9b105c80a2c/_navigation.scssc b/.sass-cache/b022b2821ed6bc39dd2d4e6655d9f9b105c80a2c/_navigation.scssc new file mode 100644 index 0000000..6fdd9d7 Binary files /dev/null and b/.sass-cache/b022b2821ed6bc39dd2d4e6655d9f9b105c80a2c/_navigation.scssc differ diff --git a/.sass-cache/b022b2821ed6bc39dd2d4e6655d9f9b105c80a2c/_social.scssc b/.sass-cache/b022b2821ed6bc39dd2d4e6655d9f9b105c80a2c/_social.scssc new file mode 100644 index 0000000..c366303 Binary files /dev/null and b/.sass-cache/b022b2821ed6bc39dd2d4e6655d9f9b105c80a2c/_social.scssc differ diff --git a/.sass-cache/b63a5404b2969ccb09fa031b85c4a73dea42018c/_layout.scssc b/.sass-cache/b63a5404b2969ccb09fa031b85c4a73dea42018c/_layout.scssc new file mode 100644 index 0000000..8d60826 Binary files /dev/null and b/.sass-cache/b63a5404b2969ccb09fa031b85c4a73dea42018c/_layout.scssc differ diff --git a/.sass-cache/c79d8c552669f0ad42b75d9ac4487bca718ba1d5/_reset.scssc b/.sass-cache/c79d8c552669f0ad42b75d9ac4487bca718ba1d5/_reset.scssc new file mode 100644 index 0000000..1054f26 Binary files /dev/null and b/.sass-cache/c79d8c552669f0ad42b75d9ac4487bca718ba1d5/_reset.scssc differ diff --git a/.sass-cache/f9ab14cd773d8c29fda8a0f54b0022eac29369df/_blue.scssc b/.sass-cache/f9ab14cd773d8c29fda8a0f54b0022eac29369df/_blue.scssc new file mode 100644 index 0000000..fec8fb3 Binary files /dev/null and b/.sass-cache/f9ab14cd773d8c29fda8a0f54b0022eac29369df/_blue.scssc differ diff --git a/.sass-cache/f9ab14cd773d8c29fda8a0f54b0022eac29369df/_green.scssc b/.sass-cache/f9ab14cd773d8c29fda8a0f54b0022eac29369df/_green.scssc new file mode 100644 index 0000000..2bde3b5 Binary files /dev/null and b/.sass-cache/f9ab14cd773d8c29fda8a0f54b0022eac29369df/_green.scssc differ diff --git a/.sass-cache/f9ab14cd773d8c29fda8a0f54b0022eac29369df/_grey.scssc b/.sass-cache/f9ab14cd773d8c29fda8a0f54b0022eac29369df/_grey.scssc new file mode 100644 index 0000000..b0acd0f Binary files /dev/null and b/.sass-cache/f9ab14cd773d8c29fda8a0f54b0022eac29369df/_grey.scssc differ diff --git a/.sass-cache/f9ab14cd773d8c29fda8a0f54b0022eac29369df/_orange.scssc b/.sass-cache/f9ab14cd773d8c29fda8a0f54b0022eac29369df/_orange.scssc new file mode 100644 index 0000000..837ec8e Binary files /dev/null and b/.sass-cache/f9ab14cd773d8c29fda8a0f54b0022eac29369df/_orange.scssc differ diff --git a/.sass-cache/f9ab14cd773d8c29fda8a0f54b0022eac29369df/_purple.scssc b/.sass-cache/f9ab14cd773d8c29fda8a0f54b0022eac29369df/_purple.scssc new file mode 100644 index 0000000..aaeb6e5 Binary files /dev/null and b/.sass-cache/f9ab14cd773d8c29fda8a0f54b0022eac29369df/_purple.scssc differ diff --git a/.sass-cache/fd96619a2d10ca49d067413d203453e1d423d399/_reset.scssc b/.sass-cache/fd96619a2d10ca49d067413d203453e1d423d399/_reset.scssc new file mode 100644 index 0000000..718f727 Binary files /dev/null and b/.sass-cache/fd96619a2d10ca49d067413d203453e1d423d399/_reset.scssc differ diff --git a/CHANGELOG.md b/CHANGELOG.md index 7bd3b7a..120822b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,12 @@ # Change Log +## [0.2.0] - 2023-5-1 +- **Updated** about page +- Unused pages no longer appear in bar + ## [0.1.1] - 2015-12-03 - **Added** themeing styles ## [0.1.0] - 2015-12-01 - **Added** base styles and jekyll files + diff --git a/Gemfile.lock b/Gemfile.lock index 4cb59a5..49918c9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,19 +1,20 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.6.0) - public_suffix (>= 2.0.2, < 4.0) + addressable (2.8.4) + public_suffix (>= 2.0.2, < 6.0) colorator (1.1.0) - concurrent-ruby (1.1.5) - em-websocket (0.5.1) + concurrent-ruby (1.2.2) + em-websocket (0.5.3) eventmachine (>= 0.12.9) - http_parser.rb (~> 0.6.0) + http_parser.rb (~> 0) eventmachine (1.2.7) eventmachine (1.2.7-x64-mingw32) - ffi (1.10.0) - ffi (1.10.0-x64-mingw32) + ffi (1.15.5) + ffi (1.15.5-x64-mingw32) + ffi (1.15.5-x64-unknown) forwardable-extended (2.6.0) - http_parser.rb (0.6.0) + http_parser.rb (0.8.0) i18n (0.9.5) concurrent-ruby (~> 1.0) jekyll (3.7.4) @@ -29,48 +30,47 @@ GEM pathutil (~> 0.9) rouge (>= 1.7, < 4) safe_yaml (~> 1.0) - jekyll-feed (0.12.1) + jekyll-feed (0.17.0) jekyll (>= 3.7, < 5.0) jekyll-sass-converter (1.5.2) sass (~> 3.4) - jekyll-seo-tag (2.6.0) - jekyll (~> 3.3) + jekyll-seo-tag (2.6.1) + jekyll (>= 3.3, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) kramdown (1.17.0) - liquid (4.0.3) - listen (3.1.5) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - ruby_dep (~> 1.2) + liquid (4.0.4) + listen (3.8.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.3.6) - minima (2.5.0) - jekyll (~> 3.5) + minima (2.5.1) + jekyll (>= 3.5, < 5.0) jekyll-feed (~> 0.9) jekyll-seo-tag (~> 2.1) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (3.0.3) - rb-fsevent (0.10.3) - rb-inotify (0.10.0) + public_suffix (5.0.1) + rb-fsevent (0.11.2) + rb-inotify (0.10.1) ffi (~> 1.0) - rouge (3.3.0) - ruby_dep (1.5.0) + rouge (3.30.0) safe_yaml (1.0.5) - sass (3.7.3) + sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - tzinfo (2.0.0) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2019.1) + tzinfo-data (1.2023.3) tzinfo (>= 1.0.0) wdm (0.1.1) PLATFORMS ruby x64-mingw32 + x64-unknown DEPENDENCIES jekyll (~> 3.7.4) @@ -80,4 +80,4 @@ DEPENDENCIES wdm (~> 0.1.0) BUNDLED WITH - 1.17.3 + 2.4.12 diff --git a/README.md b/README.md index ce63fc8..60d10f3 100644 --- a/README.md +++ b/README.md @@ -1,34 +1,35 @@ -# Meeting Minutes notes +# How to Edit the TSU ACM Website -- file name should be in the format yyyy-mm-dd-string.md -- title tag will be what is actually displayed on the webpage, so it should be meaningful -- place files in _posts folder +This guide is intended for new Webmasters for the ACM chapter of Truman State University. Please read the following guide carefully to understand the website. -# Install jekyll windows -- install ruby-dev from [this](https://rubyinstaller.org/downloads/) website -- pull website to computer -- hold shift and right click in acm website directory and open cmd -- type +# Requirements +- Understanding of git and Github + +# 1. Install Jekyll Windows +- Install ruby-dev from [this](https://rubyinstaller.org/downloads/) website. +- Pull the website code to your computer. +- Open a command line in the website directory. +- Type: ``` gem install bundler ``` -- while cmd prompt is in acm directory type +- While cmd prompt is in the acm directory type: ``` bundle update ``` -- then you can run +- Then you can run: ``` jekyll build ``` -to build the website +to build the website. -- if you get this error "You have already activated X, but your Gemfile requires Y" then you can do two things +- If you get this error "You have already activated X, but your Gemfile requires Y" then you can do two things ``` gem uninstall x ``` @@ -39,24 +40,82 @@ with x being the version thats newer, or bundle exec jekyll build ``` -which will force the use of the version you needed. This works with all the jekyll commands +which will force the use of the version you needed. This works with all the Jekyll commands. + +If you are having issues getting Ruby to work, try using an older version. + + +# 2. Understanding Jekyll +This website uses Jekyll, which compiles plain-text markdown files into HTML files. I highly recommend reading through this Jekyll tutorial, +starting [here](https://cloudcannon.com/tutorials/jekyll-tutorial/getting-started/). You can also look at the [documentation](https://jekyllrb.com/docs/) +if you have more questions. + +### Folders + +When you pulled the website code, you probably noticed that it has a lot of folders with odd names. +Jekyll lays out a website's folder structure in a specific way. + +`_includes` - This folder stores the site's HTML header, footer, and navigation. + +`_layouts` - These HTML documents describe how different types of pages should be put together. They generally do not need to be edited. + +`_pages` - This folder contains the actual content for the website's pages. These files will be edited most frequently. + +`_posts` - These contain old meeting minutes. Minutes are no longer recorded or displayed on the site, so this folder goes unused. + +`_sass` - This folder stores all of the site's CSS themes and does not need to be edited. + +`_site` - When you build the site, the compiled HTML and CSS are stored in this folder. **Do not edit the contents of this folder**, as any changes made in here will be overwritten when you build the site. + +`assets` - Contains files that appear on the website such as images and code. + +`css` - Contains main.scss, which tells jekyll how to pull the CSS files in `_sass` into a complete CSS style sheet. Does not need to be edited. + +**Each folder has its own README.md that contains a little more information on that folder.** -All of the main pages are in _pages, except the front page which is just index.markdown in the root directory. They are markdown files that you edit so a minimal amount of html and css knowledge is necessary. +### Files +There are a few important files in the main acm folder that you need to know about. -The meeting minutes are saved in _posts. There is a template for those. just make sure to save it and rename it before you start editing it. +`index.markdown` - This is the home page for the website. To edit the home page, just edit this file and build the site. + +`_config.yml` - This file stores all of the website's variables, from the title to our social media handles. Read all of the information at the top of the file. Feel free to edit items under the "Social" heading, but leave everything under "Build settings" alone unless you are confident in what you're doing. + + +# 3. Changing the Website +After making edits to the site, make sure to use +``` +jekyll build +``` +to compile the changes into `_site`. Keep in mind that the links used in the HTML depend on the base URL of the website defined in `_config.yml`, so many features such as styling and images will not work properly on your local machine. If you are satisfied with the changes, go ahead and push your code. Once your code has been edited and pushed, you need to pull it onto the web server: + +- Log into Truman's Linux server at *sand.truman.edu*. +- Navigate to *var/www/html/acm* and open the console +- Pull your changes +- Open *acm.truman.edu* to ensure your changes went through + +Congratulations! That's everything you need to know to edit the website. + + + + +# Other Items + +## material-jekyll-theme +This section is a remnant of the original jekyll theme used for the site. -# material-jekyll-theme [Demo](http://alexcarpenter.github.io/material-jekyll-theme) +[Theme Repository](https://github.com/alexcarpenter/material-jekyll-theme) + ![Material Jekyll Theme](https://d13yacurqjgara.cloudfront.net/users/37718/screenshots/2430279/slice_1.jpg) -## Getting started +### Getting started 1. `git clone https://github.com/alexcarpenter/material-jekyll-theme.git` 2. `cd material-jekyll-theme` 3. Configure the `_config.yml` file as needed 4. `jekyll serve` -## Options +### Options Customize your options within the `_config.yml` file. + Theme diff --git a/_config.yml b/_config.yml index dd65ec7..836a896 100644 --- a/_config.yml +++ b/_config.yml @@ -16,13 +16,14 @@ title: Truman ACM email: ecb5723@truman.edu description: "The website for Truman State's ACM chapter!" -# baseurl: "/acm" # the subpath of your site, e.g. /blog +baseurl: "/acm" # the subpath of your site, e.g. /blog url: http://acm.truman.edu # the base hostname & protocol for your site # Social -discord: 2J4zUZ5 -githubUsername: TrumanStateACM +discord: bDzuEGuy4G +githubUsername: tsuACM facebookGroup: trumanacm +instagramUsername: acm_truman dribbbleUsername: codepenUsername: @@ -36,7 +37,9 @@ permalink: /:year/:month/:title markdown: kramdown include: [_pages, _site, assets] exclude: [CHANGELOG.md, LICENSE, README.md] +keep_files: [README.md] sass: style: compressed + sass_dir: _sass excerpt_separator: \ No newline at end of file diff --git a/_includes/README.md b/_includes/README.md new file mode 100644 index 0000000..95a7a26 --- /dev/null +++ b/_includes/README.md @@ -0,0 +1,35 @@ +# _includes +This folder stores the site's HTML header, footer, and navigation. + + +### Footer +The footer lists our social medias. You might notice that each social media link in this file follows a formatting like +``` +{% if site.username %}Social Media{% endif %} +``` +The variable `site.username` is a variable found in `_config.yml` in the main acm folder. That variable is our handle for that social media. +For example, the variable for Github in `_config.yml` is "tsuACM", so in the HTML line +``` +{% if site.githubUsername %}Github{% endif %} +``` +the variable `{{ site.githubUsername }}` would be replaced with tsuACM, resulting in [this link](https://github.com/tsuACM). + +If you need to edit our social media handles, you *only* need to edit `_config.yml`. If the social medias we use change, make sure to add or remove the appropriate lines in `footer.html`. + + +### Navigation +You can edit `navigation.html` to change the nav bar at the top of each page. Each link in the bar is formatted like +``` +Events +``` + +You might notice that some of these pages have markers around them: ``. These mark the lines as comments, and these links will not appear on the website. We have preexisting pages for our yearly Codeathons and Game Jams, as well as a page for T-shirt sales. To activate these pages, remove those comment markers and rebuild the site. To deactivate the pages, simply add the comment markers back and rebuild. + + +### Other Files + +`button.html` - Creates a button with the text "ORDER HERE". This is used on the T-shirt order page. + +`discord.html` - Creates a widget that displays information about our Discord server. This is used on the About page. + +`head.html` - This just adds important metadata to each page. Avoid editing this file. \ No newline at end of file diff --git a/_includes/button.html b/_includes/button.html new file mode 100644 index 0000000..c8a166d --- /dev/null +++ b/_includes/button.html @@ -0,0 +1 @@ +ORDER HERE diff --git a/_includes/discord.html b/_includes/discord.html new file mode 100644 index 0000000..c6a73bd --- /dev/null +++ b/_includes/discord.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/_includes/footer.html b/_includes/footer.html index 820a7d8..d1290a9 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -3,6 +3,7 @@

© {{ site.title }} {{ site.time | date: '%Y' }}

{% if site.discord %}Discord{% endif %} + {% if site.instagramUsername %}Instagram{% endif %} {% if site.githubUsername %}Github{% endif %} {% if site.facebookGroup %}Facebook{% endif %}

diff --git a/_includes/navigation.html b/_includes/navigation.html index 0250812..43b48e6 100644 --- a/_includes/navigation.html +++ b/_includes/navigation.html @@ -1,11 +1,13 @@ diff --git a/_includes/social.html b/_includes/social.html deleted file mode 100644 index 94b5192..0000000 --- a/_includes/social.html +++ /dev/null @@ -1,23 +0,0 @@ -
- -
diff --git a/_layouts/README.md b/_layouts/README.md new file mode 100644 index 0000000..7f7a7a3 --- /dev/null +++ b/_layouts/README.md @@ -0,0 +1,3 @@ +# _layouts +These HTML documents describe how different types of pages should be put together. `default.html` is the base page layout that assembles the head, footer, and navigation from `_includes`. `page.html` adds the header with the page's title and provides a space for content. +`post.html` is currently unused, as it was originally for meeting minutes. These pages generally can be left alone - edit the files in `_includes` instead if page layouts need to be changed. \ No newline at end of file diff --git a/_pages/README.md b/_pages/README.md new file mode 100644 index 0000000..7cb6ef7 --- /dev/null +++ b/_pages/README.md @@ -0,0 +1,6 @@ +# _pages +This folder contains the actual content for the website's pages. Generally, you will need to edit `events.markdown` and `about.markdown` most frequently. The only site page not in this folder is the home page, which can be found in the main acm folder as `index.markdown`. + +`meetings.md` was used to display a list of meeting minutes, which ACM no longer keeps. + +`gamejam.md`, `hacktruman.md`, and `orderform.md` are used for game jams, codeathons, and T-shirt orders, respectively. If similar events are done again in the future, these pages can be added back to the site by re-enabling their navigation links in `navigation.html` in `_includes`. See the README in that folder for more information. \ No newline at end of file diff --git a/_pages/about.markdown b/_pages/about.markdown index 34fb46e..94a36d8 100644 --- a/_pages/about.markdown +++ b/_pages/about.markdown @@ -6,30 +6,34 @@ permalink: /about/ # Hello, World! -This is the website for Truman State University's ACM chapter. You can join or [mailing list][ML], visit our [Discord channel][DA], or check out our [Facebook page][FB]. Thank you for checking out our Website. +This is the website for Truman State University's ACM chapter. You can visit our [Discord server][DA] or check out our [Instagram][IN], as well as our [Facebook group][FB]. Finally, you can view this website's code at our [Github][GH]. Thank you for checking out our website! + +{% include discord.html %}
# Executives -President - Abanoub Ghaly +President - James Calder -Vice President - Thu Vo +Vice President - Devyn Logston -Treasurer - Ebenezer Osei +Treasurer - Travis Burkhardt -Secretary - Karl Ramberg +Secretary - Asher Hepner -Webmaster - Dat Tran +Recruitment Chair - Eddie Gibbons -Advisor - Dr. Donald Bindner, dbindner@truman.edu +Webmaster - Roshan Thapa Magar
-If you notice any issues with the website please email acm@truman.edu. Thank you for checking out our page. +If you notice any issues with the website, please email us at acm@truman.edu. Thank you for checking out our page! -[DA]: https://discordapp.com/invite/2J4zUZ5 -[FB]: https://www.facebook.com/groups/trumanacm +[DA]: https://discordapp.com/invite/{{ site.discord }} +[FB]: https://www.facebook.com/groups/{{ site.facebookGroup }} [ML]: https://groups.google.com/forum/#!forum/truman-acm-mailing +[IN]: https://www.instagram.com/{{ site.instagramUsername }} +[GH]: https://github.com/{{ site.githubUsername }} \ No newline at end of file diff --git a/_pages/events.markdown b/_pages/events.markdown index 7eea020..b10a945 100644 --- a/_pages/events.markdown +++ b/_pages/events.markdown @@ -4,29 +4,34 @@ title: Events permalink: /events/ --- -# Here we will post upcoming events +Here we will post upcoming events and the topics of upcoming meetings. -### [Hackathon 2019][HT] -- Date: 12 April - 14 April +## Upcoming Events +Keep checking back for more information about club events! +
- +## Upcoming Meetings +*Meetings are held every Monday at 6:00PM in Violette Hall 1148 unless otherwise specified.* + +Keep checking back for more information about club meetings! - [HT]: {{site.baseurl}}/hacktruman/ +[GJ]: {{site.baseurl}}/gamejam/ [HI]: https://hackisu.org [SH]: https://hackathon.mst.edu [RT]: https://www.eventbrite.com/e/shamhacks-2018-tickets-39820147132 [BI]: https://bsidesiowa.com [HUI]: https://bigdata.uiowa.edu/ [TH]: http://tigerhacks.missouri.edu/ +[THSignUp]: https://docs.google.com/forms/d/e/1FAIpQLSfr4ToMbz6rgbkddFVo2f28jlBnWvGhA_iqpOnnYJaxyXPjgQ/viewform [prereg]: https://docs.google.com/forms/d/e/1FAIpQLSchsn5GW4XCcQAdmWlcy_RlRr8HXViZeXF0hDagANh5dkHEhQ/viewform [S&T]: https://pickhacks.io/ [S&T_location]: https://www.google.com/maps/place/Havener+Center/@38.1959288,-91.9552169,9z/data=!4m5!3m4!1s0x87da54c8a1cb72e5:0x5433f63da26259b6!8m2!3d37.9548037!4d-91.7763536?shorturl=1 diff --git a/_pages/gamejam.markdown b/_pages/gamejam.markdown new file mode 100644 index 0000000..2f92ec3 --- /dev/null +++ b/_pages/gamejam.markdown @@ -0,0 +1,80 @@ +--- + +layout: page +title: ACM Game Jam Spring 2025 +permalink: /gamejam/ + +--- + +# ACM Game Jam + +## March 31st - April 14th + +## Rules + +* All skill levels are welcome! Judging will be based on execution and creativity, not complexity. + +* Submissions will be due at our meeting on April 14th, at 6:00PM. + +* Teams have a maximum size of 4. + +* Teams can write their games in any language or any tool. + +* Teams may not use any code written before the start of the game jam. They may use publicly available assets such as images as long as they are copyright-free. + +* An itch.io page, or a Github repository is required to submit the team's game. + +* All teams will give a live demo of their game for the judges, which must be 7 minutes or less. + + +## Format. +* You will have 2 weeks to complete a game incorporating the theme +* Work at your own pace! +* You can use any technology/language/engine you’d like +* Only the first place winner(s) will receive the prize +* There will only be one submission category + +# Rubric +* [This][Opening] is our opening presentation. + + +## Prizes +The prizes are: + +* A Gift Card of your choice worth $50 + + +# Prompt: Only One! + +Interpret as you like! + + +# Submission + +The deadline for submissions is April 14th, before the meeting at 6:00PM. [Submission Link][Submit] We will keep you updated on our discord server. + +# Submissions + +- (* Winner #1 *) Julian: [Optix][Julian_Game] +- (* Winner #2 *) Shibam: OneTwo (Unity game, contact him) +- (* Winner #3 *) Logan: [Single Shot][Logan_Game] +- (* Winner #3 *) Eddie: [Fragile Walk][Eddie_Game] +- Samir: [Battle Arena][Samir_Game] +- Asher and Benjamin: [One Last Case][Asher_Game] +- Owen and Dottie: [Block Pushing Game][Owen_Game] + + +[EE]: https://en.wikipedia.org/wiki/Easter_egg_(media) +[Rubric]: https://docs.google.com/document/d/1NGSTnWUxPJ841z1eyPtD3UQzEU8LelChaghmB3vcXGw/edit?usp=sharing +[Submit]: https://forms.gle/FrprVT2Fkj5H9eJGA +[P5]: https://p5js.org/ +[P5P]: {{site.baseurl}}/assets/gamejam/p5_GameJam-1.pdf +[Opening]: https://docs.google.com/presentation/d/19_SrhyzZjbp3KBPfqCmdM1csm_ElbJuj04VoTYnsgls/edit?usp=sharing + + +[Samir_Game]: https://github.com/Rhythmic-Ocean/ASMGame-Jam-Battle-Arena +[Logan_Game]: https://scratch.mit.edu/projects/1156578229/ +[Julian_Game]: https://github.com/Eidolon2003/Optix +[Eddie_Game]: https://github.com/EdwardGibbons/Fragile-Walk +[Asher_Game]: https://github.com/asherhepner12/acm-gamejam +[Owen_Game]: https://github.com/owentm/gamejam2025 diff --git a/_pages/hacktruman.markdown b/_pages/hacktruman.markdown index 5726434..4a16439 100644 --- a/_pages/hacktruman.markdown +++ b/_pages/hacktruman.markdown @@ -1,42 +1,61 @@ --- layout: page -title: HackTruman 2019 +title: ACM Codeathon Fall 2024 permalink: /hacktruman/ --- -## April 12th-14th +# ACM Codeathon! -## Location will be annouced, plans went awry. +## October 14th - October 28th ## Rules -Maximum Team Size of 3 +Welcome to the Fall 2024 Codeathon! Here is some important information: -Projects must be only code made between the Opening and Closing times +* All skill levels and majors are welcome! Judging will be based on execution and creativity, not complexity. -## Schedule +* Entries must be submitted before our October 28th meeting. -Fri 6:00pm - Opening +* All teams are required to give a short demonstration of their project at the judging meeting. -Sat 5:00pm - Dinner +* There will be free food provided at both the kickoff and the judging ceremony. -Sat 6:00pm - Game (TBD) +* Teams have a maximum size of 3. + +More information will be available closer to the judging date, so keep checking back! + + +## Theme: Return + +The theme of the Codeathon is Return! Teams are required to incorporate this theme into their project in some way, but they may interpret it however they choose. -Sun 12:00pm - Closing ## Prizes -1st - +There will be 3 awards given to 3 different projects. The awards are: + +* Most Technical - For the project which demonstrates the most technical skill. + +* Most Creative - For the project which best demonstrates outside-the-box thinking, separate from technical skill. + +* Executive Choice - The executive board will choose one other outstanding project to award the final prize to. + +Each winning team will receive a gift card as a prize. + + +## Interest Form + +If you are interested in participating in the Codeathon, please fill out the following form. All participants should fill out the form, however, filling it out does **not** require you to submit a project if you change your mind later. -2nd - + -Freshman - -## Sponsors +![Codeathon 2024 Poster]({{site.baseurl}}/assets/hackathon/CodeathonPosterFull.png) -- Cerner -Start looking for more info being added to this page in the future such as prizes, rules, sponsors and more. +[Interest]: https://docs.google.com/forms/d/e/1FAIpQLScIM4HGXZ-8UNUoMSpN8iEjjzb6z-Ado-xMkyV-NZ3caPP6EA/viewform?usp=sf_link +[Rubric]: {{site.baseurl}}/assets/hackathon/ACMHackathonInformation2023.pdf +[Submit]: https://forms.gle/BxQ8EGFBUMRZR3D48 \ No newline at end of file diff --git a/_pages/orderform.md b/_pages/orderform.md new file mode 100644 index 0000000..b12d780 --- /dev/null +++ b/_pages/orderform.md @@ -0,0 +1,23 @@ +--- + +layout: page +title: Order Form +permalink: /order/ + +--- + +# ACM T-Shirts + +ACM is selling T-shirts to support the club! T-shirts are **$20 each** and all funds go to future club events. Payments can be made to @andy-bernatow on Venmo or to Andy Bernatow in person with cash. + +## Designs + +![Shirt design mockup female model]({{site.baseurl}}/assets/img/tshirts/2023/shirt.png) + +![Shirt design mockup male model]({{site.baseurl}}/assets/img/tshirts/2023/shirt2.png) + + +Click the button below to order a shirt! + +{% include button.html url = 'https://forms.gle/t8QbVHCgiT3DfPsR6' %} + diff --git a/_posts/README.md b/_posts/README.md new file mode 100644 index 0000000..eb954b2 --- /dev/null +++ b/_posts/README.md @@ -0,0 +1,12 @@ +# _posts +These contain meeting minutes from 2018 and 2019. General meeting minutes are no longer recorded or displayed on the site, so this folder currently goes unused. + +## Meeting Minutes +Should ACM ever start keeping minutes again, follow these steps to add new minutes: + +- Open the file `yyyy-mm-dd-title.md` in the main acm folder +- Save the file under a new name, which should be in the format `yyyy-mm-dd-string.md` +- Fill out the file's contents. The title tag will be what is actually displayed on the webpage, so it should be meaningful +- Place the new file in `_posts` + +The new page should be added the next time you build the site. diff --git a/_sass/README.md b/_sass/README.md new file mode 100644 index 0000000..76aca7f --- /dev/null +++ b/_sass/README.md @@ -0,0 +1,2 @@ +# _sass +This folder stores all of the site's CSS themes included with the original jekyll theme. They should not need to be edited; only edit these if you have knowledge of CSS. \ No newline at end of file diff --git a/_sass/components/_buttons.scss b/_sass/components/_buttons.scss index 50cad2e..c9ea85f 100644 --- a/_sass/components/_buttons.scss +++ b/_sass/components/_buttons.scss @@ -4,12 +4,14 @@ // Base button .c-btn { - padding: 1.5rem 2rem; - @include fs--meta; + padding: 3.5rem 6rem; + line-height: 3em; + font-size: 5rem; text-decoration: none; - background: #FAFAFA; + background: $c__deep-purple; + color: #FAFAFA; box-shadow: 0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12); - border-radius: 3px; + border-radius: 16px; } // Button groups diff --git a/_site/2018/04/Bitcoin.html b/_site/2018/04/Bitcoin.html index 347fb10..0a55488 100644 --- a/_site/2018/04/Bitcoin.html +++ b/_site/2018/04/Bitcoin.html @@ -8,9 +8,9 @@ - - - + + + + + + + + + + + +
+
+
+

ACM Game Jam Spring 2025

+ +
+
+ +
+

ACM Game Jam

+ +

March 31st - April 14th

+ +

Rules

+ + + +

Format.

+ + +

Rubric

+ + +

Prizes

+

The prizes are:

+ + + +

Prompt: Only One!

+ +

Interpret as you like!

+ +

Submission

+ +

The deadline for submissions is April 14th, before the meeting at 6:00PM. Submission Link We will keep you updated on our discord server.

+ +

Submissions

+ + + + +
+
+ + + + + + diff --git a/_site/hacktruman/index.html b/_site/hacktruman/index.html index 4cc4c0f..01c90e9 100644 --- a/_site/hacktruman/index.html +++ b/_site/hacktruman/index.html @@ -4,13 +4,13 @@ - HackTruman 2019 + ACM Codeathon Fall 2024 - - - + + + + + + + + + + + +
+
+
+

Order Form

+ +
+
+ +
+

ACM T-Shirts

+ +

ACM is selling T-shirts to support the club! T-shirts are $20 each and all funds go to future club events. Payments can be made to @andy-bernatow on Venmo or to Andy Bernatow in person with cash.

+ +

Designs

+ +

Shirt design mockup female model

+ +

Shirt design mockup male model

+ +

Click the button below to order a shirt!

+ +

ORDER HERE

+ + +
+
+ + + + + + diff --git a/_site/robocode/index.html b/_site/robocode/index.html index 78cd61a..b6662e6 100644 --- a/_site/robocode/index.html +++ b/_site/robocode/index.html @@ -8,9 +8,9 @@ - - - + + +