From bd32a1f0e09279b03e6e8195af989dfe3308b793 Mon Sep 17 00:00:00 2001 From: chris062689 Date: Sun, 4 Jun 2017 11:52:35 -0400 Subject: [PATCH 01/23] Testing package caching with yarn for TravisCI. --- .travis.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 29ad162..f289fa4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,32 +2,33 @@ language: node_js -node_js: - - "6" +node_js: "6" + +cache: yarn before_script: - echo '========== Importing wiki articles into hugo ==========' - cd ./scripts/wiki/ - - npm install + - yarn install - node app.js - cd $TRAVIS_BUILD_DIR - echo '========== Importing games wiki articles into hugo ==========' - cd ./scripts/games/ - - npm install + - yarn install - node app.js - cd $TRAVIS_BUILD_DIR - echo '========== Importing twitter tweets into hugo ==========' - cd ./scripts/twitter/ - - npm install + - yarn install - node app.js - cd $TRAVIS_BUILD_DIR - echo '========== Installing gulp / hugo dependencies ==========' - - npm install -g @alrra/travis-scripts - - npm install -g gulp - - npm install -g hugo-bin + - yarn global add @alrra/travis-scripts + - yarn global add gulp + - yarn global add hugo-bin - hugo version - echo '========== Configuring Github Pages ==========' From 2cc5f83e1ba235bf1bd0bf80183c456fc236e419 Mon Sep 17 00:00:00 2001 From: chris062689 Date: Sun, 4 Jun 2017 11:55:55 -0400 Subject: [PATCH 02/23] Adding yarn.lock for TravisCI builds. --- yarn.lock | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 yarn.lock diff --git a/yarn.lock b/yarn.lock new file mode 100644 index 0000000..e69de29 From 979f0c8e1c7210ee5209e756685e8e0ede11dbab Mon Sep 17 00:00:00 2001 From: chris062689 Date: Sun, 4 Jun 2017 11:57:20 -0400 Subject: [PATCH 03/23] Tweaking caching section in TravisCI. --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f289fa4..0c9133b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,10 @@ language: node_js node_js: "6" -cache: yarn +cache: + yarn: true + directories: + - node_modules before_script: - echo '========== Importing wiki articles into hugo ==========' From e499eb4dc293a3a0a582c2cef1d1e6f599ab3b3f Mon Sep 17 00:00:00 2001 From: chris062689 Date: Sun, 4 Jun 2017 12:07:08 -0400 Subject: [PATCH 04/23] Temporarily removing gulp task removing unused CSS. --- gulpfile.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 5de0d62..2e7915a 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -44,7 +44,7 @@ gulp.task('hugo', ['setup'], function (cb) { gulp.task("css", ['hugo'], () => ( gulp.src(`${distPath}/css/**/*.css`, {base: './'}) .pipe(postcss([cssnext(), cssImport({from: `${distPath}/css/main.css`})])) - .pipe(uncss({ + /*.pipe(uncss({ html: [`${distPath}/**/*.html`], ignore: [/\w\.in/, ".fade", @@ -55,7 +55,7 @@ gulp.task("css", ['hugo'], () => ( /(#|\.)navbar(\-[a-zA-Z]+)?/, /(#|\.)dropdown(\-[a-zA-Z]+)?/, /(#|\.)carousel(\-[a-zA-Z]+)?/, - ]})) + ]}))*/ .pipe(cleanCSS()) .pipe(md5(10, `${distPath}/**/*.html`)) .pipe(gulp.dest('./')) From 58cfd0ad74d7ef8f15cd88e421e826f37515111b Mon Sep 17 00:00:00 2001 From: chris062689 Date: Sun, 4 Jun 2017 12:07:08 -0400 Subject: [PATCH 05/23] Temporarily removing gulp task removing unused CSS. --- gulpfile.js | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 5de0d62..5bc473d 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -44,18 +44,6 @@ gulp.task('hugo', ['setup'], function (cb) { gulp.task("css", ['hugo'], () => ( gulp.src(`${distPath}/css/**/*.css`, {base: './'}) .pipe(postcss([cssnext(), cssImport({from: `${distPath}/css/main.css`})])) - .pipe(uncss({ - html: [`${distPath}/**/*.html`], - ignore: [/\w\.in/, - ".fade", - ".collapse", - ".collapsing", - ".table", - ".thumbnail", - /(#|\.)navbar(\-[a-zA-Z]+)?/, - /(#|\.)dropdown(\-[a-zA-Z]+)?/, - /(#|\.)carousel(\-[a-zA-Z]+)?/, - ]})) .pipe(cleanCSS()) .pipe(md5(10, `${distPath}/**/*.html`)) .pipe(gulp.dest('./')) From 5dd4206e2554ca0d610c2fe99e22bd1e2b557e59 Mon Sep 17 00:00:00 2001 From: chris062689 Date: Sun, 4 Jun 2017 13:49:32 -0400 Subject: [PATCH 06/23] Added regions flags for Title IDs. --- site/static/images/regions/AUS.png | Bin 0 -> 673 bytes site/static/images/regions/CHN.png | Bin 0 -> 472 bytes site/static/images/regions/EUR.png | Bin 0 -> 479 bytes site/static/images/regions/JPN.png | Bin 0 -> 420 bytes site/static/images/regions/KOR.png | Bin 0 -> 592 bytes site/static/images/regions/TWN.png | Bin 0 -> 465 bytes site/static/images/regions/USA.png | Bin 0 -> 609 bytes .../citra-bs-theme/layouts/game/single.html | 3 ++- 8 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 site/static/images/regions/AUS.png create mode 100644 site/static/images/regions/CHN.png create mode 100644 site/static/images/regions/EUR.png create mode 100644 site/static/images/regions/JPN.png create mode 100644 site/static/images/regions/KOR.png create mode 100644 site/static/images/regions/TWN.png create mode 100644 site/static/images/regions/USA.png diff --git a/site/static/images/regions/AUS.png b/site/static/images/regions/AUS.png new file mode 100644 index 0000000000000000000000000000000000000000..a01389a745d51e16b01a9dc0a707572564a17625 GIT binary patch literal 673 zcmV;S0$%-zP)>fJ3En$GhGS>sbE%%m3$AD)q?8M9y>88-}kR7#RKlk!P~Y_PLuF7~U~3`~nC7 zF#yj00ZUDdpLsm{7ajP|&HwoK0Usg|6%f4L_{`Mi{rvv-`ukf=Ed&Gs-sA7L!Q7*a zj{*QO0M7pb%?Sw^g@yy{>ihEY{`vU@3=8@G0rvO$i3mOL`~mv-`W+b$Mmr&io5dg< z5v!7q0*L95jt`TzK8Kd(Utv)OSp_aLv){6ccV+Z`{Q2+asKUU&aO3`Kpz6wW8wp`< z28M3{0mSqnB#A*-c*8%1=RD#sSOwMznKA3=e&iEzwo{cA=PgXK`2OQ}gqId83!|%* zA_Kz@fB*n70M7pdECCwp4H&@R`1|(w-}M5x*74i)0}%fAt;XafA{48))#>Z>?CD#}*e}Ret0tl$#*RMZ7}Jl7Z|M45`5*URzH9L z{rmSnPy;{!u>dsyO%meg+00000NkvXX Hu0mjfN{&}S literal 0 HcmV?d00001 diff --git a/site/static/images/regions/CHN.png b/site/static/images/regions/CHN.png new file mode 100644 index 0000000000000000000000000000000000000000..89144146219e6fbec7eaa89e1bf4b073d299569e GIT binary patch literal 472 zcmV;}0Vn>6P)$bmtfBa_T{rmsVufH!rO2O)W0!b+P{TrwO zAb?mv&i(NBbu;G`sX*)cv$d*%>MiL-(QdhpkjakVmyu%k;sfcNRj;yhJaxT5MTg0u5&QfH8#Bf O0000W@Y84;!#FdBh{DWNV{85G^eR=U#)*62qRvoaLX5p!7Lm^{g>IM$Q zMs{Q_?l?+2NRuC{19iOmU$>t9;*>tnC_qaIU+T2fR7nFyd0Z0-b-MgLN zL~_)yI%8}kwU1=sY!YIJllUc_pyhtI4TcZ)*Lyi~^>58dcXu!D%H5T!AO`R!zyPR# VdiZ30KxO~{002ovPDHLkV1g_p%GUq@ literal 0 HcmV?d00001 diff --git a/site/static/images/regions/JPN.png b/site/static/images/regions/JPN.png new file mode 100644 index 0000000000000000000000000000000000000000..325fbad3ffd3075a4a84d8d898ad26ef7d3e0d56 GIT binary patch literal 420 zcmV;V0bBlwP)9whYk?f=!Q|Ns8||JN@lTD;`{R1ZWk|EGa3dAO8ObDh3E3Cb;oH_5X#1 z|NHy@|M?558b}5Q|Cf`4hZv9q2p|@?lb|{i68>{>{ol0lx`{mi O0000k7RCwBA z{P_JV0}}Z6?;n_iu%H+Q{s1vR05Jij`8c?M=-GouSI=K${m;n9!7aeW#m~(x$j!^i z%zXLG*~fS9it_V|2?zl-00a;V#NgMjUvJ&I^~3uQB4T37ii-d5-u?gQ&wmw_XD?o^ zUAsm=P*7M%NJdr`Xazt3fo%By|Nn;%AAbM-ZD?YwEG7BBxA%WR!T-FR|8><0Vxn$d zUT@yKdH&)BP#Mq$fB<3y`hl076R7Rgt5;mSyo`Gea7>-}|M%}Nf0%y${3VbO@hKwm zAWK?W z+TGp#<;$01Vv<1pdP-ancZ!Qkd3bmLHK?nrgX5I}Ab=R3zkQ1wk#LIP517FKVgLC9 eRt>}e0R{ktF&Q^6#MUGL0000<~s!0-E7R}a|Ns2?4|9|}gs%Dgx1=;`*KrBFO{{8#+``2Fv2B6@-@8AFY{`(K80jdYk13&{qW|y?pud`Sa)3|NY&vWd%S0u>b>P!2!lUe;6EF*#G_c zFVXVt@6Q{uX@40W{p0iY2Aa+A^Cu7i8KT+YH}2j52q4BskM2rJ$^k9;2Xxc_|Np=M z&VaLlA*IO5FlECMfB<5VUNC{tBZO(|zW*;@GJN;|bTJ71`0*d;`d`2P!x=ymOA`2> z+y@9C##^^8%gd{MW@Y91_2d742B2~OQNf=-zkmD?Vqkdk_wPTUNeuu2#KPTG{_;O4 v7C%8E5*DLB7#Kb?Fnj}}-(W6879hX?8lYRg`Y`<~00000NkvXXu0mjfD6Jtx literal 0 HcmV?d00001 diff --git a/site/themes/citra-bs-theme/layouts/game/single.html b/site/themes/citra-bs-theme/layouts/game/single.html index 152d7f5..9e0acf5 100644 --- a/site/themes/citra-bs-theme/layouts/game/single.html +++ b/site/themes/citra-bs-theme/layouts/game/single.html @@ -1,4 +1,5 @@ {{ define "main" }} + {{ $BaseURL := .Site.BaseURL }} {{ $gameName := .File.BaseFileName }} {{ $rating := index .Site.Data.compatibility ( string .Params.compatibility | default "0" ) }} @@ -46,7 +47,7 @@ Title IDs {{ range .Params.releases }} - {{ .title }} ({{ .region }})
+
{{ .title }}
{{ end }} From 46b1997e2873a7f95ff1edd3b474d78d8d94fcbc Mon Sep 17 00:00:00 2001 From: chris062689 Date: Sun, 4 Jun 2017 13:52:25 -0400 Subject: [PATCH 07/23] Moved flag to be left aligned. --- site/themes/citra-bs-theme/layouts/game/single.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/themes/citra-bs-theme/layouts/game/single.html b/site/themes/citra-bs-theme/layouts/game/single.html index 9e0acf5..e773e8e 100644 --- a/site/themes/citra-bs-theme/layouts/game/single.html +++ b/site/themes/citra-bs-theme/layouts/game/single.html @@ -47,7 +47,7 @@ Title IDs {{ range .Params.releases }} -
{{ .title }}
+
{{ .title }}
{{ end }} From 15f89e2966bd1a22727332b1a9dca4acbecf28f8 Mon Sep 17 00:00:00 2001 From: chris062689 Date: Sun, 4 Jun 2017 13:57:52 -0400 Subject: [PATCH 08/23] Tweaked games listings for smaller icons and more entries per page. --- site/themes/citra-bs-theme/layouts/game/list.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/site/themes/citra-bs-theme/layouts/game/list.html b/site/themes/citra-bs-theme/layouts/game/list.html index 340b570..abbac28 100644 --- a/site/themes/citra-bs-theme/layouts/game/list.html +++ b/site/themes/citra-bs-theme/layouts/game/list.html @@ -1,8 +1,7 @@ {{ define "main" }} - {{ $paginator := .Paginate .Data.Pages }}

Game Compatibility List

The Citra Emulator compatibility list contains all the games we tested, sorted by how well they work on the emulator.

- + @@ -41,7 +40,7 @@
- +

Games

@@ -53,10 +52,11 @@ + {{ $paginator := .Paginate .Data.Pages 50 }} {{ range $paginator.Pages }} {{ $rating := index .Site.Data.compatibility ( string .Params.compatibility | default "0" ) }} - + From 8a215c4043e6a7cbdf41f6909e68427c9d5f5937 Mon Sep 17 00:00:00 2001 From: chris062689 Date: Sun, 4 Jun 2017 14:06:33 -0400 Subject: [PATCH 09/23] Layout tweaks as per @bunnei --- site/themes/citra-bs-theme/layouts/game/list.html | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/site/themes/citra-bs-theme/layouts/game/list.html b/site/themes/citra-bs-theme/layouts/game/list.html index abbac28..45d8235 100644 --- a/site/themes/citra-bs-theme/layouts/game/list.html +++ b/site/themes/citra-bs-theme/layouts/game/list.html @@ -2,13 +2,7 @@

Game Compatibility List

The Citra Emulator compatibility list contains all the games we tested, sorted by how well they work on the emulator.

-
{{ .Params.title }} {{ $rating.name }} {{ dateFormat "January 2, 2006" .Params.tested_date }}
- - - - - - +
RatingDescription
@@ -56,7 +50,7 @@ {{ range $paginator.Pages }} {{ $rating := index .Site.Data.compatibility ( string .Params.compatibility | default "0" ) }} - + From 2c3bbeaaf5fb25230ab5da60652a1a823870c669 Mon Sep 17 00:00:00 2001 From: chris062689 Date: Sun, 4 Jun 2017 14:12:44 -0400 Subject: [PATCH 10/23] Added regions flags for Title IDs. --- .../citra-bs-theme/layouts/game/list.html | 77 +++++++------------ 1 file changed, 27 insertions(+), 50 deletions(-) diff --git a/site/themes/citra-bs-theme/layouts/game/list.html b/site/themes/citra-bs-theme/layouts/game/list.html index 45d8235..6ec0001 100644 --- a/site/themes/citra-bs-theme/layouts/game/list.html +++ b/site/themes/citra-bs-theme/layouts/game/list.html @@ -4,60 +4,37 @@
Perfect
{{ .Params.title }} {{ $rating.name }} {{ dateFormat "January 2, 2006" .Params.tested_date }}
- - - - - - - - - - - - - - - - - - - - - - - - - - - - + {{ range .Site.Data.compatibility }} + + + + + {{ end }}
PerfectGame functions flawless with no audio or graphical glitches, all tested functionality works as intended without any workarounds needed.
ExcellentGame functions with minor graphical or audio glitches, game is playable from start to finish without any workarounds needed.
GreatGame functions with minor graphical or audio glitches, but game is playable from start to finish with workarounds.
OkayGame functions with major graphical or audio glitches, but game is playable from start to finish with workarounds.
BadGame functions, but with major graphical or audio glitches. Unable to progress in specific areas due to glitches even with workarounds.
Intro/MenuGame is completely unplayable due to major graphical or audio glitches. Unable to progress past the Start Screen.
Won't BootThe game crashes when attempting to startup.
{{ .name }}{{ .description }}
-

Games

- - +
+ + + + + + + + + + {{ $paginator := .Paginate .Data.Pages 50 }} + {{ range $paginator.Pages }} + {{ $rating := index .Site.Data.compatibility ( string .Params.compatibility | default "0" ) }} - - - - + + + + - - - {{ $paginator := .Paginate .Data.Pages 50 }} - {{ range $paginator.Pages }} - {{ $rating := index .Site.Data.compatibility ( string .Params.compatibility | default "0" ) }} - - - - - - - {{ end }} - -
TitleCompatibilityDate Tested
TitleCompatibilityDate Tested{{ .Params.title }}{{ $rating.name }}{{ dateFormat "January 2, 2006" .Params.tested_date }}
{{ .Params.title }}{{ $rating.name }}{{ dateFormat "January 2, 2006" .Params.tested_date }}
+ {{ end }} + + - {{ partial "pagination" . }} + {{ partial "pagination" . }} {{ end }} From 00648ed975f4c9ad0db0fa10d9618745cc840b58 Mon Sep 17 00:00:00 2001 From: chris062689 Date: Sun, 4 Jun 2017 14:26:34 -0400 Subject: [PATCH 11/23] Tweaked layout of boxart on game page. --- site/themes/citra-bs-theme/layouts/game/single.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/themes/citra-bs-theme/layouts/game/single.html b/site/themes/citra-bs-theme/layouts/game/single.html index e773e8e..3d07dac 100644 --- a/site/themes/citra-bs-theme/layouts/game/single.html +++ b/site/themes/citra-bs-theme/layouts/game/single.html @@ -29,7 +29,7 @@

{{ .Title }}

- +
From cc9a2ca84b822f024ff7fcb39ca32b5979bd594c Mon Sep 17 00:00:00 2001 From: chris062689 Date: Sun, 4 Jun 2017 14:28:06 -0400 Subject: [PATCH 12/23] Added resizing images for boxart and icons in gulpfile. --- gulpfile.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gulpfile.js b/gulpfile.js index 5bc473d..554f4ac 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -58,6 +58,12 @@ gulp.task('images', ['hugo'], () => ( gulp.src(`${distPath}/images/banners/*`, {base: './'}) .pipe(jimp({ sizes: [{"width": 824, "height": 306 }] })) .pipe(gulp.dest('./')) + gulp.src(`${distPath}/images/game/boxart/*`, {base: './'}) + .pipe(jimp({ sizes: [{"width": 328, "height": 300 }] })) + .pipe(gulp.dest('./')) + gulp.src(`${distPath}/images/game/icons/*`, {base: './'}) + .pipe(jimp({ sizes: [{"width": 48, "height": 48 }] })) + .pipe(gulp.dest('./')) )); gulp.task('html', ['hugo', 'css', 'images'], () => ( From 05125dc26c7892683e4669f2e17895c2e2a379be Mon Sep 17 00:00:00 2001 From: chris062689 Date: Sun, 4 Jun 2017 14:30:07 -0400 Subject: [PATCH 13/23] Fixing runtime errors with gulpfile. --- gulpfile.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 554f4ac..790f2ae 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -57,10 +57,10 @@ gulp.task('images', ['hugo'], () => ( .pipe(gulp.dest('./')), gulp.src(`${distPath}/images/banners/*`, {base: './'}) .pipe(jimp({ sizes: [{"width": 824, "height": 306 }] })) - .pipe(gulp.dest('./')) + .pipe(gulp.dest('./')), gulp.src(`${distPath}/images/game/boxart/*`, {base: './'}) .pipe(jimp({ sizes: [{"width": 328, "height": 300 }] })) - .pipe(gulp.dest('./')) + .pipe(gulp.dest('./')), gulp.src(`${distPath}/images/game/icons/*`, {base: './'}) .pipe(jimp({ sizes: [{"width": 48, "height": 48 }] })) .pipe(gulp.dest('./')) From ac000a3988f67b8df05b45a5b57e72bb9cfae52f Mon Sep 17 00:00:00 2001 From: Schplee Date: Sun, 4 Jun 2017 12:48:12 -0700 Subject: [PATCH 14/23] re-ordered ratings list/consolidated "great/excellent" --- site/data/compatibility.json | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/site/data/compatibility.json b/site/data/compatibility.json index 9436f87..6b81723 100644 --- a/site/data/compatibility.json +++ b/site/data/compatibility.json @@ -1,9 +1,8 @@ { - "0": { "name": "Won't Boot", "description": "The game crashes when attempting to startup." }, - "1": { "name": "Intro/Menu", "description": "Game is completely unplayable due to major graphical or audio glitches. Unable to progress past the Start Screen." }, - "2": { "name": "Bad", "description": "Game functions, but with major graphical or audio glitches. Unable to progress in specific areas due to glitches even with workarounds." }, + "5": { "name": "Perfect", "description": "Game functions flawless with no audio or graphical glitches, all tested functionality works as intended without any workarounds needed." } + "4": { "name": "Great", "description": "Game functions with minor graphical or audio glitches and is playable from start to finish. May require some workarounds." }, "3": { "name": "Okay", "description": "Game functions with major graphical or audio glitches, but game is playable from start to finish with workarounds." }, - "4": { "name": "Great", "description": "Game functions with minor graphical or audio glitches, but game is playable from start to finish with workarounds." }, - "5": { "name": "Excellent", "description": "Game functions with minor graphical or audio glitches, game is playable from start to finish without any workarounds needed." }, - "6": { "name": "Perfect", "description": "Game functions flawless with no audio or graphical glitches, all tested functionality works as intended without any workarounds needed." } + "2": { "name": "Bad", "description": "Game functions, but with major graphical or audio glitches. Unable to progress in specific areas due to glitches even with workarounds." }, + "1": { "name": "Intro/Menu", "description": "Game is completely unplayable due to major graphical or audio glitches. Unable to progress past the Start Screen." }, + "0": { "name": "Won't Boot", "description": "The game crashes when attempting to startup." }, } From ca1b4ea1f9fcbaec480b6d05123529ea3163dc23 Mon Sep 17 00:00:00 2001 From: chris062689 Date: Sun, 4 Jun 2017 15:52:48 -0400 Subject: [PATCH 15/23] Updated Sitemap for better indexing from Google. Updated base page to not feature images on wiki pages. --- .../layouts/_default/baseof.html | 2 +- .../themes/citra-bs-theme/layouts/sitemap.xml | 29 +++++++++++++++---- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/site/themes/citra-bs-theme/layouts/_default/baseof.html b/site/themes/citra-bs-theme/layouts/_default/baseof.html index 4b8815a..d8c7c71 100755 --- a/site/themes/citra-bs-theme/layouts/_default/baseof.html +++ b/site/themes/citra-bs-theme/layouts/_default/baseof.html @@ -23,7 +23,7 @@      {{ if (eq .Section "entry") | or (eq .Section "wiki") | or (eq .Section "game") }}    - {{ if (eq .Section "entry") | or (eq .Section "wiki") }} + {{ if (eq .Section "entry") }} {{ else if (eq .Section "game") }} diff --git a/site/themes/citra-bs-theme/layouts/sitemap.xml b/site/themes/citra-bs-theme/layouts/sitemap.xml index 3244e1a..7d14a30 100644 --- a/site/themes/citra-bs-theme/layouts/sitemap.xml +++ b/site/themes/citra-bs-theme/layouts/sitemap.xml @@ -1,10 +1,29 @@ - +   {{ range .Data.Pages }} + {{ if (eq .IsPage true) }} + {{ $rating := index .Site.Data.compatibility ( string .Params.compatibility | default "0" ) }}    -        {{ .Permalink }}{{ if not .Lastmod.IsZero }} -        {{ safeHTML ( .Lastmod.Format "2006-01-02T15:04:05-07:00" ) }}{{ end }}{{ with .Sitemap.ChangeFreq }} -    {{ . }}{{ end }}{{ if ge .Sitemap.Priority 0.0 }} -    {{ .Sitemap.Priority }}{{ end }} + + {{ .Permalink }} + + {{ if (eq .Section "game") }} + {{ $rating.name }} - {{ $rating.description }} + {{ end }} + + {{ if (eq .Section "entry") }} + + {{ .Site.BaseURL }}images/banners/{{ .Params.Banner | default (print .File.BaseFileName ".png") }} + + {{ else if (eq .Section "game") }} + + {{ .Site.BaseURL }}images/game/boxart/{{ .Params.Banner | default (print .File.BaseFileName ".png") }} + + {{ end }} + + {{ if not .Lastmod.IsZero }}{{ safeHTML ( .Lastmod.Format "2006-01-02T15:04:05-07:00" ) }}{{ end }} + {{ with .Sitemap.ChangeFreq }}{{ . }}{{ end }} + {{ if ge .Sitemap.Priority 0.0 }}{{ .Sitemap.Priority }}{{ end }}      {{ end }} + {{ end }} From 3de08947c635077e4c97bb7c5299c725596fd890 Mon Sep 17 00:00:00 2001 From: chris062689 Date: Sun, 4 Jun 2017 15:56:07 -0400 Subject: [PATCH 16/23] Correcting build errors from invalid JSON. --- site/data/compatibility.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site/data/compatibility.json b/site/data/compatibility.json index 6b81723..e8dce6f 100644 --- a/site/data/compatibility.json +++ b/site/data/compatibility.json @@ -1,8 +1,8 @@ { - "5": { "name": "Perfect", "description": "Game functions flawless with no audio or graphical glitches, all tested functionality works as intended without any workarounds needed." } + "5": { "name": "Perfect", "description": "Game functions flawless with no audio or graphical glitches, all tested functionality works as intended without any workarounds needed." }, "4": { "name": "Great", "description": "Game functions with minor graphical or audio glitches and is playable from start to finish. May require some workarounds." }, "3": { "name": "Okay", "description": "Game functions with major graphical or audio glitches, but game is playable from start to finish with workarounds." }, "2": { "name": "Bad", "description": "Game functions, but with major graphical or audio glitches. Unable to progress in specific areas due to glitches even with workarounds." }, "1": { "name": "Intro/Menu", "description": "Game is completely unplayable due to major graphical or audio glitches. Unable to progress past the Start Screen." }, - "0": { "name": "Won't Boot", "description": "The game crashes when attempting to startup." }, + "0": { "name": "Won't Boot", "description": "The game crashes when attempting to startup." } } From 3e6d2218db7a6bbb1ca0d74d333b8a56fc3bc380 Mon Sep 17 00:00:00 2001 From: chris062689 Date: Sun, 4 Jun 2017 16:02:35 -0400 Subject: [PATCH 17/23] Updated SEO metadata information. --- .../layouts/_default/baseof.html | 21 +++++++++++++------ .../themes/citra-bs-theme/layouts/sitemap.xml | 4 ---- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/site/themes/citra-bs-theme/layouts/_default/baseof.html b/site/themes/citra-bs-theme/layouts/_default/baseof.html index d8c7c71..fdf0c97 100755 --- a/site/themes/citra-bs-theme/layouts/_default/baseof.html +++ b/site/themes/citra-bs-theme/layouts/_default/baseof.html @@ -5,6 +5,7 @@ + {{ .Hugo.Generator }} @@ -12,12 +13,23 @@ {{ if .RSSLink }} - - + + {{ end }} + {{ if .IsHome }}Homepage{{ else }}{{ .Title }}{{ end }} | {{ .Site.Title }} | Nintendo 3DS Emulator + + + + {{ if (eq .Section "game") }} + + + {{ else }} + + {{ end }} +         @@ -35,10 +47,7 @@     {{ else }}     {{ end }} - - {{ with .Site.Params.description }}{{ end }} - - {{ if .IsHome }}Homepage{{ else }}{{ .Title }}{{ end }} | {{ .Site.Title }} | Nintendo 3DS Emulator + {{ if eq (getenv "GULP") "true" }} diff --git a/site/themes/citra-bs-theme/layouts/sitemap.xml b/site/themes/citra-bs-theme/layouts/sitemap.xml index 7d14a30..d9fbdfd 100644 --- a/site/themes/citra-bs-theme/layouts/sitemap.xml +++ b/site/themes/citra-bs-theme/layouts/sitemap.xml @@ -6,10 +6,6 @@ {{ .Permalink }} - {{ if (eq .Section "game") }} - {{ $rating.name }} - {{ $rating.description }} - {{ end }} - {{ if (eq .Section "entry") }} {{ .Site.BaseURL }}images/banners/{{ .Params.Banner | default (print .File.BaseFileName ".png") }} From a644cc899ec13df2252fab6632629e7e5dabca14 Mon Sep 17 00:00:00 2001 From: chris062689 Date: Sun, 4 Jun 2017 16:06:41 -0400 Subject: [PATCH 18/23] Corrected build errors, modified metadata icon for games to use icon instead of boxart. --- site/themes/citra-bs-theme/layouts/_default/baseof.html | 3 ++- site/themes/citra-bs-theme/layouts/game/single.html | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/site/themes/citra-bs-theme/layouts/_default/baseof.html b/site/themes/citra-bs-theme/layouts/_default/baseof.html index fdf0c97..c8c558b 100755 --- a/site/themes/citra-bs-theme/layouts/_default/baseof.html +++ b/site/themes/citra-bs-theme/layouts/_default/baseof.html @@ -23,6 +23,7 @@ {{ if (eq .Section "game") }} + {{ $rating := index .Site.Data.compatibility ( string .Params.compatibility | default "0" ) }} {{ else }} @@ -38,7 +39,7 @@ {{ if (eq .Section "entry") }} {{ else if (eq .Section "game") }} - + {{ end }}      {{ range .Params.tags }} diff --git a/site/themes/citra-bs-theme/layouts/game/single.html b/site/themes/citra-bs-theme/layouts/game/single.html index 3d07dac..cbe1070 100644 --- a/site/themes/citra-bs-theme/layouts/game/single.html +++ b/site/themes/citra-bs-theme/layouts/game/single.html @@ -41,7 +41,7 @@ Game Icon - + Title IDs From 53e317ea3e1305c76e651a211cfcd00fc98584b0 Mon Sep 17 00:00:00 2001 From: chris062689 Date: Sun, 4 Jun 2017 16:09:47 -0400 Subject: [PATCH 19/23] Use icons instead of boxart in the sitemap. --- site/themes/citra-bs-theme/layouts/sitemap.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/themes/citra-bs-theme/layouts/sitemap.xml b/site/themes/citra-bs-theme/layouts/sitemap.xml index d9fbdfd..1af4b07 100644 --- a/site/themes/citra-bs-theme/layouts/sitemap.xml +++ b/site/themes/citra-bs-theme/layouts/sitemap.xml @@ -12,7 +12,7 @@ {{ else if (eq .Section "game") }} - {{ .Site.BaseURL }}images/game/boxart/{{ .Params.Banner | default (print .File.BaseFileName ".png") }} + {{ .Site.BaseURL }}images/game/icons/{{ .File.BaseFileName }}.png {{ end }} From 4dc74bb27df50020486e273c6a785f9f8376345b Mon Sep 17 00:00:00 2001 From: chris062689 Date: Sun, 4 Jun 2017 17:11:41 -0400 Subject: [PATCH 20/23] Backend now stores savefiles in ZIP format. We want to change this to csav when it's pushed to the website. --- scripts/games/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/games/app.js b/scripts/games/app.js index f021a3d..bc097a8 100644 --- a/scripts/games/app.js +++ b/scripts/games/app.js @@ -106,7 +106,7 @@ try { // Copy all savefiles into the output folder and store their contents. fs.readdirSync(inputDirectorySavefilesGame).forEach(file => { if (file.slice(-5) == '.csav') { - fsextra.copySync(`${inputDirectorySavefilesGame}/${file}`, `${outputDirectorySavefilesGame}/${file}`); + fsextra.copySync(`${inputDirectorySavefilesGame}/${file}`, `${outputDirectorySavefilesGame}/${file.replace('.zip', '.csav')}`); } else if (file.slice(-4) == '.dat') { // Store the contents of the file in memory for adding it into the markdown later. savefileMetadataContents.push({ filename: file.replace('.dat', '.csav'), contents: fs.readFileSync(`${inputDirectorySavefilesGame}/${file}`, 'utf8') }); From 5d2fc8cac5f1ba9a331951aa20ab0b72feed46fb Mon Sep 17 00:00:00 2001 From: chris062689 Date: Sun, 4 Jun 2017 17:11:58 -0400 Subject: [PATCH 21/23] Backend now stores savefiles in ZIP format. We want to change this to csav when it's pushed to the website. --- scripts/games/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/games/app.js b/scripts/games/app.js index bc097a8..9d77ff7 100644 --- a/scripts/games/app.js +++ b/scripts/games/app.js @@ -105,7 +105,7 @@ try { // Copy all savefiles into the output folder and store their contents. fs.readdirSync(inputDirectorySavefilesGame).forEach(file => { - if (file.slice(-5) == '.csav') { + if (file.slice(-5) == '.zip') { fsextra.copySync(`${inputDirectorySavefilesGame}/${file}`, `${outputDirectorySavefilesGame}/${file.replace('.zip', '.csav')}`); } else if (file.slice(-4) == '.dat') { // Store the contents of the file in memory for adding it into the markdown later. From 9563833fdf207b73746727ea5fad9f5a79e2acad Mon Sep 17 00:00:00 2001 From: chris062689 Date: Sun, 4 Jun 2017 17:19:50 -0400 Subject: [PATCH 22/23] Using path.extname instead of slice for detecting file extensions. --- scripts/games/app.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/games/app.js b/scripts/games/app.js index 9d77ff7..409ccf9 100644 --- a/scripts/games/app.js +++ b/scripts/games/app.js @@ -105,9 +105,9 @@ try { // Copy all savefiles into the output folder and store their contents. fs.readdirSync(inputDirectorySavefilesGame).forEach(file => { - if (file.slice(-5) == '.zip') { + if (path.extname(file) == '.zip') { fsextra.copySync(`${inputDirectorySavefilesGame}/${file}`, `${outputDirectorySavefilesGame}/${file.replace('.zip', '.csav')}`); - } else if (file.slice(-4) == '.dat') { + } else if (path.extname(file) == '.dat') { // Store the contents of the file in memory for adding it into the markdown later. savefileMetadataContents.push({ filename: file.replace('.dat', '.csav'), contents: fs.readFileSync(`${inputDirectorySavefilesGame}/${file}`, 'utf8') }); } @@ -126,7 +126,7 @@ try { // Copy all screenshots into the output folder. fs.readdirSync(inputDirectoryScreenshotsGame).forEach(file => { - if (file.slice(-4) == '.png') { + if (path.extname(file) == '.png') { fsextra.copySync(`${inputDirectoryScreenshotsGame}/${file}`, `${outputDirectoryScreenshotsGame}/${file}`); } }); From bb67f0160926d2dc8d5f66fc19ed020331cc9c30 Mon Sep 17 00:00:00 2001 From: chris062689 Date: Sun, 4 Jun 2017 17:23:33 -0400 Subject: [PATCH 23/23] Changed csav to zip. --- scripts/games/app.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/games/app.js b/scripts/games/app.js index 409ccf9..a28506d 100644 --- a/scripts/games/app.js +++ b/scripts/games/app.js @@ -106,10 +106,10 @@ try { // Copy all savefiles into the output folder and store their contents. fs.readdirSync(inputDirectorySavefilesGame).forEach(file => { if (path.extname(file) == '.zip') { - fsextra.copySync(`${inputDirectorySavefilesGame}/${file}`, `${outputDirectorySavefilesGame}/${file.replace('.zip', '.csav')}`); + fsextra.copySync(`${inputDirectorySavefilesGame}/${file}`, `${outputDirectorySavefilesGame}/${file.replace('.zip', '.zip')}`); } else if (path.extname(file) == '.dat') { // Store the contents of the file in memory for adding it into the markdown later. - savefileMetadataContents.push({ filename: file.replace('.dat', '.csav'), contents: fs.readFileSync(`${inputDirectorySavefilesGame}/${file}`, 'utf8') }); + savefileMetadataContents.push({ filename: file.replace('.dat', '.zip'), contents: fs.readFileSync(`${inputDirectorySavefilesGame}/${file}`, 'utf8') }); } }); }