Pull Gamejam to Main

.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_WITHOUT: "development"

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
+

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

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

_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: <!--more-->

_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 %}<a href="https://socialmedia.com/{{ site.username }}">Social Media</a>{% 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 %}<a href="https://github.com/{{ site.githubUsername }}">Github</a>{% 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
+```
+<a class="c-navigation__item {% if page.url == 'events/' %}is-active{% endif %}" href="{{ "/events/" | prepend: site.baseurl }}">Events</a>
+```
+
+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.

_includes/button.html

@@ -0,0 +1 @@
+<a class="c-btn" href="{{include.url}}"><strong>ORDER HERE</strong></a>

_includes/discord.html

@@ -0,0 +1 @@
+<iframe src="https://discord.com/widget?id=899815128546046033&theme=dark" width="100%" height="500" allowtransparency="true" frameborder="0" sandbox="allow-popups allow-popups-to-escape-sandbox allow-same-origin allow-scripts"></iframe>

_includes/footer.html

@@ -3,6 +3,7 @@
     <p>&copy; {{ site.title }} {{ site.time | date: '%Y' }}</p>
     <p>
       {% if site.discord %}<a href="https://discordapp.com/invite/{{ site.discord }}">Discord</a>{% endif %}
+	  {% if site.instagramUsername %}<a href="https://www.instagram.com/{{ site.instagramUsername }}">Instagram</a>{% endif %}
       {% if site.githubUsername %}<a href="https://github.com/{{ site.githubUsername }}">Github</a>{% endif %}
 	  {% if site.facebookGroup %}<a href="https://www.facebook.com/groups/{{ site.facebookGroup }}">Facebook</a>{% endif %}
     </p>

_includes/navigation.html

@@ -1,11 +1,13 @@
 <nav class="c-navigation {% if site.fixedNav == 'true' %}is-fixed{% endif %}">
   <div class="c-navigation__container u-container">
     <a class="c-navigation__item {% if page.url == '/' %}is-active{% endif %}" href="{{ "/" | prepend: site.baseurl }}">Home</a>
-    <a class="c-navigation__item {% if page.url == '/events/' %}is-active{% endif %}" href="{{ "/events/" | prepend: site.baseurl }}">Events</a>
-    <a class="c-navigation__item {% if page.url == '/hacktruman/' %}is-active{% endif %}" href="{{ "/hacktruman/" | prepend: site.baseurl }}">HackTruman</a> 
+    <a class="c-navigation__item {% if page.url == 'events/' %}is-active{% endif %}" href="{{ "/events/" | prepend: site.baseurl }}">Events</a>
+    <!--<a class="c-navigation__item {% if page.url == '/hacktruman/' %}is-active{% endif %}" href="{{ "/hacktruman/" | prepend: site.baseurl }}">Codeathon</a>-->
+    <a class="c-navigation__item {% if page.url == '/gamejam/' %}is-active{% endif %}" href="{{ "/gamejam/" | prepend: site.baseurl }}">Game Jam</a>
+    <!-- <a class="c-navigation__item {% if page.url == '/order/' %}is-active{% endif %}" href="{{ "/order/" | prepend: site.baseurl }}">T-Shirts</a> -->
     <!-- <a class="c-navigation__item {% if page.url == '/codecomp/' %}is-active{% endif %}" href="{{ "/codecomp/" | prepend: site.baseurl }}">Code Competition 2018</a> -->
     <!--<a class="c-navigation__item {% if page.url == '/robocode/' %}is-active{% endif %}" href="{{ "/robocode/" | prepend: site.baseurl }}">Robocode</a> -->
-    <a class="c-navigation__item {% if page.url == '/about/' %}is-active{% endif %}" href="{{ "/about/" | prepend: site.baseurl }}">About</a>
-    <a class="c-navigation__item {% if page.url == '/meetings/' %}is-active{% endif %}" href="{{ "/meetings/" | prepend: site.baseurl }}">Meeting Minutes</a>
+    <a class="c-navigation__item {% if page.url == 'about/' %}is-active{% endif %}" href="{{ "/about/" | prepend: site.baseurl }}">About</a>
+    <!--<a class="c-navigation__item {% if page.url == '/meetings/' %}is-active{% endif %}" href="{{ "/meetings/" | prepend: site.baseurl }}">Meeting Minutes</a> -->
   </div>
 </nav>

_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. 

_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.