diff --git a/.github/workflows/jekyll.yml b/.github/workflows/jekyll.yml new file mode 100644 index 0000000..5297949 --- /dev/null +++ b/.github/workflows/jekyll.yml @@ -0,0 +1,20 @@ +name: Jekyll site CI + +on: + push: + branches: [ main ] + pull_request: + branches: [ main ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Build the site in the jekyll/builder container + run: | + docker run \ + -v ${{ github.workspace }}:/srv/jekyll -v ${{ github.workspace }}/_site:/srv/jekyll/_site \ + jekyll/builder:latest /bin/bash -c "chmod -R 777 /srv/jekyll && jekyll build --future" diff --git a/Gemfile.lock b/Gemfile.lock index 4806361..5eab2b5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,7 +8,9 @@ GEM em-websocket (0.5.2) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) + eventmachine (1.2.7) eventmachine (1.2.7-x64-mingw32) + ffi (1.15.4) ffi (1.15.4-x64-mingw32) forwardable-extended (2.6.0) http_parser.rb (0.6.0) @@ -59,6 +61,8 @@ GEM rexml (3.2.5) rouge (3.26.0) safe_yaml (1.0.5) + sassc (2.4.0) + ffi (~> 1.9) sassc (2.4.0-x64-mingw32) ffi (~> 1.9) terminal-table (2.0.0) @@ -68,6 +72,7 @@ GEM PLATFORMS x64-mingw32 + x86_64-linux DEPENDENCIES jekyll @@ -76,4 +81,4 @@ DEPENDENCIES webrick BUNDLED WITH - 2.2.24 + 2.2.32 diff --git a/_config.yml b/_config.yml index 9a5050d..939ee9c 100644 --- a/_config.yml +++ b/_config.yml @@ -1,4 +1,7 @@ title: SudoJunior -description: Systems Programmer; Backend & DevOps Engineer; Unity, JavaScript & Web Experiments... Student. +description: | + Systems Programmer; Backend & DevOps Engineer; Unity, JavaScript & Web Experiments... Student. -permalink: /:year/:month/:day/:title \ No newline at end of file + I run a discord community named [TinkerStorm](https://discord.gg/Bb3JQQG) on [GitHub](https://github.com/TinkerStorm) which is dedicated to researching the decisions of communities and their players. + +permalink: /:year/:month/:day/:title diff --git a/_posts/2020-08-19-welcome-to-jekyll.md b/_drafts/2020-08-19-welcome-to-jekyll.md similarity index 99% rename from _posts/2020-08-19-welcome-to-jekyll.md rename to _drafts/2020-08-19-welcome-to-jekyll.md index 552bf2c..813babc 100644 --- a/_posts/2020-08-19-welcome-to-jekyll.md +++ b/_drafts/2020-08-19-welcome-to-jekyll.md @@ -1,6 +1,7 @@ --- layout: post title: "Welcome to Jekyll!" +draft: true date: 2020-08-19 11:29:01 +0100 categories: jekyll update --- diff --git a/_includes/projects.html b/_includes/projects.html new file mode 100644 index 0000000..5e8c2be --- /dev/null +++ b/_includes/projects.html @@ -0,0 +1,33 @@ +{% comment %} +[Inputs] +- tag: string +- limit: int +{% endcomment %} + +
+ {% assign projects = site.pages + | where: "layout", "project" | sort_natural: "title" + | where_exp: "page", "page.tags contains include.tag and page.archived != true" + %} + + {% for project in projects limit:include.limit %} +
+
+ {% if project.image %} +
+ {{ project.title }} +
+ {% endif %} + +
+ {{ project.description }} +
+ {% if project.created %} +
{{ project.created | date_to_string }}
+ {% endif %} +
+
+ {% endfor %} +
\ No newline at end of file diff --git a/_layouts/default.html b/_layouts/default.html index 2055dbe..c43b330 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -41,6 +41,7 @@ + diff --git a/assets/css/index.css b/assets/css/index.css index 2f54fa6..2379409 100644 --- a/assets/css/index.css +++ b/assets/css/index.css @@ -39,6 +39,10 @@ a { text-align: center; } +.center .twitter-tweet { + margin: auto; +} + .post-content { margin: 0px 50px; } @@ -147,6 +151,8 @@ nav li a.active { } .grid { + max-width: 1280px; + margin: auto; display: grid; grid-template-columns: repeat(3, 30%); grid-template-rows: repeat(3, auto); diff --git a/assets/images/jaffacat-factory-game.png b/assets/images/jaffacat-factory-game.png new file mode 100644 index 0000000..b598608 Binary files /dev/null and b/assets/images/jaffacat-factory-game.png differ diff --git a/assets/images/paralight-overlook.png b/assets/images/paralight-overlook.png new file mode 100644 index 0000000..cef5e2b Binary files /dev/null and b/assets/images/paralight-overlook.png differ diff --git a/index.html b/index.html index 3c7e66e..41ab399 100644 --- a/index.html +++ b/index.html @@ -1,37 +1,19 @@ --- layout: default --- - -{% assign projects = site.pages - | where: "layout", "project" - | where_exp: "project", "project.show_on_homepage == true" -%} -

{{ site.title | downcase }}

-

{{ site.description }}

+

{{ site.description | markdownify }}

-
- {% for project in projects limit:3 %} -
-
- {% if project.image %} -
- {{ project.title }} -
- {% endif %} - -
- {{ project.description }} -
- {% if project.created %} -
{{ project.created | date_to_string }}
- {% endif %} -
-
- {% endfor %} +
+

Game Projects

+

At this time, all projects here were made in a group.

+ + {% include projects.html tag="game-dev" limit=3 %} + +

Discord Projects

+ + {% include projects.html tag="discord" limit=3 %}
\ No newline at end of file diff --git a/projects/JaffaCat-Factory-JC2021.md b/projects/JaffaCat-Factory-JC2021.md new file mode 100644 index 0000000..2d10217 --- /dev/null +++ b/projects/JaffaCat-Factory-JC2021.md @@ -0,0 +1,17 @@ +--- +layout: project +title: JaffaCat Factory +description: A game made for Jingle Jam 2021 over a weekend. +image: /assets/images/jaffacat-factory-game.png +tags: [game-dev, unity] +created: 2021-11-27 +links: + - label: itch.io Page + href: https://lucypoole.itch.io/jaffa-cats + - label: Reddit Post + href: https://www.reddit.com/r/Yogscast/comments/qlwvxp/comment/hmf5v3v/?utm_source=share&utm_medium=web2x&context=3 +--- + +Made by a team of 6 (4 programmers, 1 artist and 1 designer) with a very T-shaped and frantic development cycle over a weekend, with 127 commits over two days. I became an artist with help from some fellow team members and just had some fun with photoshop. + +
\ No newline at end of file diff --git a/projects/Paralight.md b/projects/Paralight.md new file mode 100644 index 0000000..c9c0b78 --- /dev/null +++ b/projects/Paralight.md @@ -0,0 +1,21 @@ +--- +layout: project +title: Paralight +description: Co-op puzzle adventure game. +image: /assets/images/paralight-overlook.png +tags: [game-dev, unity] +created: 2021-06-01 +links: + - label: itch.io Page + href: https://mistiare.itch.io/paralight +--- + +Paralight is a Co-Op Puzzle Adventure game where players choose between Sana or Ari, and work together to get back home. After crash landing onto a mysterious new planet, the two players must use their unique abilities cooperatively to traverse their new environment. While moving obstacles, levitating, or grappling, players will discover awe-inspiring forests covered in bioluminescence. + +> This game was made in my second year of study with a group of 14 comprising of the following: +> - 1 animator +> - 1 writer +> - 1 audio designer +> - 2 designers (systems and levels) +> - 3 programmers (narrative, repo and systems) +> - 6 artists (environment, concept, character, models) \ No newline at end of file diff --git a/projects/TagSpace.md b/projects/TagSpace.md index 55048d6..cdb64fd 100644 --- a/projects/TagSpace.md +++ b/projects/TagSpace.md @@ -4,6 +4,7 @@ title: TagSpace archived: true description: A bot to handle tags in user curated namespaces. image: /assets/images/tagspace-usage.png +tags: [discord] links: - label: Repository href: https://github.com/sudojunior/TagSpace diff --git a/projects/access-groups.md b/projects/access-groups.md deleted file mode 100644 index 9b7cf17..0000000 --- a/projects/access-groups.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -layout: project -title: Access Groups Action -description: A GitHub action to assist with access control. -links: - - label: Repository - href: https://github.com/sudojunior/access-groups ---- - -While [first interaction](https://github.com/marketplace/actions/first-interaction) is a great way to welcome new users in, it does what it says on the tin. Access Groups has been designed to be extensive and flexible based on the data it is provided. - -### Supported groups - -- `site admin` -- `repo owner` -> `site admin` -- `repo admin` -> `site admin` -- `repo maintainer` -> `repo admin` -- `repo triage` -> `repo maintainer` -- `repo observer` -> `repo triage` -- `bounty-hunter` -- `campus-expert` -- `developer-program-member` \ No newline at end of file diff --git a/projects/building-bridges.md b/projects/building-bridges.md index ae21f67..9751d29 100644 --- a/projects/building-bridges.md +++ b/projects/building-bridges.md @@ -3,6 +3,8 @@ layout: project title: Building bridges description: A game built by a team of 10 over a weekend at University. image: https://ggj.s3.amazonaws.com/styles/game_sidebar__normal/featured_image/2020/02/299202/title_screen_0.png?itok=-FUDHi1K×tamp=1580660896 +tags: [game-dev, unity] +created: 2020-02-01 links: - label: Repository href: https://github.com/sudojunior/BuildingBridges diff --git a/projects/channel-backup.md b/projects/channel-backup.md index fe8f668..d7e6ae4 100644 --- a/projects/channel-backup.md +++ b/projects/channel-backup.md @@ -1,11 +1,11 @@ --- layout: project title: Channel Backup -date: 2020-07-15 description: A utility to assist server adminstrators with the consistency of their information channels. image: /assets/images/channel-backup-capture.png show_on_homepage: true -tags: [discord, github] +created: 2020-07-15 +tags: [discord, github, slash-commands] links: - label: NPM Package href: https://npm.im/channel-backup diff --git a/projects/hack-n-slash.md b/projects/hack-n-slash.md index fc19aaf..3a5fdd1 100644 --- a/projects/hack-n-slash.md +++ b/projects/hack-n-slash.md @@ -1,11 +1,11 @@ --- layout: project title: Hack n' Slash -date: 2021-09-28 +created: 2021-09-28 description: A slash commands bot using guild commands as a custom commands alternative. image: /assets/images/hack-n-slash-capture.png show_on_homepage: true -tags: [discord, slash-commands] +tags: [discord, github, slash-commands] links: - label: Repository href: https://github.com/sudojunior/hack-n-slash diff --git a/projects/shuffle-theory.md b/projects/shuffle-theory.md index 4659076..e1c92ce 100644 --- a/projects/shuffle-theory.md +++ b/projects/shuffle-theory.md @@ -1,11 +1,11 @@ --- layout: project title: Shuffle Theory -date: 2021-10-24 +created: 2021-10-24 description: Research into different shuffling theories and how they may effect a service as it scales across shards and clusters. image: /assets/images/shuffle-theory-table.png show_on_homepage: false -tags: [random, github-actions] +tags: [random, mafia-game, github, research] links: - label: Repository href: https://github.com/TinkerStorm/shuffle-theory diff --git a/projects/story-engine.md b/projects/story-engine.md index 0e82c6f..ddc959d 100644 --- a/projects/story-engine.md +++ b/projects/story-engine.md @@ -4,6 +4,7 @@ layout: project description: A discord interactions service that provides a platform for interactive stories written by the community. image: /assets/images/story-engine-demo.gif show_on_homepage: true +tags: [discord, github, slash-commands, narrative] created: 2021-11-20 links: - href: https://tinkerstorm.github.io/story-engine