From 8577b1e39657247705101c6e3a8fff8158b47f66 Mon Sep 17 00:00:00 2001
From: Anthony <anthonychwong@live.com>
Date: Sun, 5 Jul 2020 23:54:05 +0800
Subject: [PATCH 1/7] Add share function

---
 index.html                        |  4 +++
 src/js/gunpla-calculator.class.js | 43 ++++++++++++++++++++++++++++---
 2 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/index.html b/index.html
index 05b32dc..4d14708 100644
--- a/index.html
+++ b/index.html
@@ -69,6 +69,10 @@ <h1>GBGW Calculator v1.2.4</h1>
           </div>
         </div>
       </header>
+      <div style="width: calc(1380px + 1em); margin: auto">
+        <h3>Share selected parts and gear</h3>
+        <div class="share-link-display" style="overflow-wrap: anywhere;"></div>
+      </div>
       <div class="container js-container"></div>
       <footer>
         <div class="notice">
diff --git a/src/js/gunpla-calculator.class.js b/src/js/gunpla-calculator.class.js
index 1027682..d925db7 100644
--- a/src/js/gunpla-calculator.class.js
+++ b/src/js/gunpla-calculator.class.js
@@ -1,4 +1,4 @@
-class GunplaCalculator {
+class GunplaCalculator { 
   constructor(dataStoreManager) {
     this.dataStoreManager = dataStoreManager;
 
@@ -30,6 +30,7 @@ class GunplaCalculator {
     this.searchPart = '';
     this.sort = '';
     this.currentPart = '';
+    this.shareLinkDisplay = document.querySelector('.share-link-display');
   }
 
   init() {
@@ -49,6 +50,7 @@ class GunplaCalculator {
     this._initApplyMapBonus();
     this._initSearchPart();
     this._initRemove();
+    this._initSharedData();
   }
 
   _generateSkillIcon(exData) {
@@ -150,7 +152,39 @@ class GunplaCalculator {
     this._showPartList(slot);
     this._displayPartInfo(input);
   }
-
+  
+  _showShareLink(){
+    var selected = {};
+    
+    const inputs = this.inputs;
+    for (let input in inputs) {
+      if (inputs.hasOwnProperty(input) && inputs[input]) {
+        selected[inputs[input].dataset.part]=inputs[input].dataset.partname;
+      }
+    }
+    
+    var result = JSON.stringify(selected);
+    var curLink = new URL(window.location.href);
+    var genLink = curLink.protocol + "//" + curLink.host + curLink.pathname + "?d=" + window.btoa(result);
+    
+    this.shareLinkDisplay.innerHTML = '<a href="' + genLink + '">' + genLink + '</a>';
+  }
+  
+  _initSharedData(){
+    var curLink = new URL(window.location.href);
+    var selected = {};
+    
+    var nextUrlParam = curLink.searchParams.entries().next();
+    if(!nextUrlParam.done){
+      selected = JSON.parse(window.atob(nextUrlParam.value[1]));
+      
+      for(let key in selected){
+        this._handleInputClick(document.querySelector(".js-input-"+key));
+        this._handlePartSelection(document.querySelector('div[data-partname="' + selected[key] + '"]'));
+      }
+    }
+  }
+  
   _checkFilter(part) {
     const filters = this.filters;
     if (this.filters.attr && part.attribute && part.attribute != this.filters.attr) {
@@ -278,6 +312,7 @@ class GunplaCalculator {
       }
     }
     this._calculate(partData);
+    this._showShareLink();
   }
 
   _getPartSlotClass(dataset, forcePart) {
@@ -771,7 +806,7 @@ class GunplaCalculator {
   }
 
   _displayPartInfo(part) {
-    if (part && part.dataset.partname && MainSlot.indexOf(part.dataset.part) > -1) {
+    if (part && part.dataset.partname && MainSlot.indexOf(part.dataset.part) > -1) {      
       const wordTag = JSON.parse(part.dataset.wt),
           ex = JSON.parse(part.dataset.ex);
       let markMultiplier = 0;
@@ -951,4 +986,4 @@ GunplaCalculator.normalizeString = (str) => {
 };
 GunplaCalculator.containsNormalized = (str, term) => {
   return GunplaCalculator.normalizeString(str).indexOf(GunplaCalculator.normalizeString(term)) !== -1;
-};
\ No newline at end of file
+};

From 0747f8d8bdc979a9a36642c721e0ff566cdbae2c Mon Sep 17 00:00:00 2001
From: Anthony <anthonychwong@live.com>
Date: Sun, 5 Jul 2020 15:13:10 +0800
Subject: [PATCH 2/7] Place artifacts to `dist/deploy` folder

---
 Gruntfile.js | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 2f41493..6430886 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -4,7 +4,7 @@ module.exports = function (grunt) {
 
     meta: {
       src: 'src',
-      dest: 'dist',
+      dest: 'dist/deploy',
       banner: '/*\n <%= pkg.name %> <%= pkg.version %> <%= grunt.template.today("yyyy-mm-dd") %> \n*/'
     },
 
@@ -23,7 +23,7 @@ module.exports = function (grunt) {
         sourceMap : true
       },
       dev: {
-        files: {'<%= meta.dest %>/js/bundle.js': '<%= meta.src %>/js/**/*.js'},
+        files: {'<%= meta.dest %>/dist/js/bundle.js': '<%= meta.src %>/js/**/*.js'},
         options: {
           beautify: true,
           mangle: false,
@@ -33,7 +33,7 @@ module.exports = function (grunt) {
       },
       prod: {
         files: {
-          '<%= meta.dest %>/js/bundle.min.js': [
+          '<%= meta.dest %>/dist/js/bundle.min.js': [
             '<%= meta.src %>/js/data.js',
             '<%= meta.src %>/js/globals.js',
             '<%= meta.src %>/js/data-store.class.js',
@@ -49,7 +49,7 @@ module.exports = function (grunt) {
     less: {
       build: {
         files: {
-          '<%= meta.dest %>/css/bundle.css': [
+          '<%= meta.dest %>/dist/css/bundle.css': [
             '<%= meta.src %>/css/gbgw-icons.css',
             '<%= meta.src %>/css/style.css',
             '<%= meta.src %>/css/themes/dark.css'
@@ -64,7 +64,7 @@ module.exports = function (grunt) {
       },
       build: {
         files: {
-          '<%= meta.dest %>/css/bundle.min.css': [
+          '<%= meta.dest %>/dist/css/bundle.min.css': [
             '<%= meta.src %>/css/gbgw-icons.css',
             '<%= meta.src %>/css/style.css',
             '<%= meta.src %>/css/themes/dark.css'
@@ -80,25 +80,28 @@ module.exports = function (grunt) {
           cwd: '<%= meta.src %>/data',
           src: '**/*.json',
           flatten: true,
-          dest: '<%= meta.dest %>/data',
+          dest: '<%= meta.dest %>/dist/data',
         },{
           expand: true,
           cwd: '<%= meta.src %>/assets/icons',
           src: '**/*.png',
           flatten: true,
-          dest: '<%= meta.dest %>/assets',
+          dest: '<%= meta.dest %>/dist/assets',
         }, {
           expand: true,
           cwd: '<%= meta.src %>/assets/third-party',
           src: [ '**/*.svg', '**/*.jpg' ],
           flatten: true,
-          dest: '<%= meta.dest %>/assets',
+          dest: '<%= meta.dest %>/dist/assets',
         }, {
           expand: true,
           cwd: '<%= meta.src %>/css/fonts',
           src: '*',
           flatten: true,
-          dest: '<%= meta.dest %>/css/fonts',
+          dest: '<%= meta.dest %>/dist/css/fonts',
+        }, {
+          src: '<%= meta.src %>/../index.html',
+          dest: '<%= meta.dest %>/index.html',
         }]
       }
     },

From 71f4e27dcb01112b830727f57c237310d2afee0f Mon Sep 17 00:00:00 2001
From: Anthony <anthonychwong@live.com>
Date: Sun, 5 Jul 2020 14:36:48 +0800
Subject: [PATCH 3/7] Add GitHub Action for automatic GitHub Pages deployment
 upon master commit

---
 .github/workflows/publish-gh-pages.yml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 .github/workflows/publish-gh-pages.yml

diff --git a/.github/workflows/publish-gh-pages.yml b/.github/workflows/publish-gh-pages.yml
new file mode 100644
index 0000000..99946c0
--- /dev/null
+++ b/.github/workflows/publish-gh-pages.yml
@@ -0,0 +1,22 @@
+name: Build and Deploy
+on: [push]
+jobs:
+  build-and-deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout 🛎️
+        uses: actions/checkout@v2 # If you're using actions/checkout@v2 you must set persist-credentials to false in most cases for the deployment to work correctly.
+        with:
+          persist-credentials: false
+
+      - name: Install and Build 🔧 # This example project is built using npm and outputs the result to the 'build' folder. Replace with the commands required to build your project, or remove this step entirely if your site is pre-built.
+        run: |
+          npm install
+          npm run build
+
+      - name: Deploy 🚀
+        uses: JamesIves/github-pages-deploy-action@releases/v3
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          BRANCH: gh-pages # The branch the action should deploy to.
+          FOLDER: dist/deploy # The folder the action should deploy.

From 97dc11565d68565a5d313d5b9cae7266552b26c0 Mon Sep 17 00:00:00 2001
From: Anthony <anthonychwong@live.com>
Date: Sun, 5 Jul 2020 21:13:10 +0800
Subject: [PATCH 4/7] Update README.md

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1943efe..ed432fd 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+![Build and Deploy](https://github.com/anthonychwong/gbgwcalculator/workflows/Build%20and%20Deploy/badge.svg)
+
 # GBGW Calculator
 
 ## About
@@ -32,4 +34,4 @@ For version history, please view the [change log](./CHANGELOG.md).
 * [AutoRiceCooker @ GitHub](https://github.com/autoricecooker)
 * [Acylos @ Reddit](https://www.reddit.com/user/Acylos)
 * [SmilyT1 @ GamePress](https://gamepress.gg/user/684586)
-* And many others @ [GBGW: Newtype Labs](https://discord.gg/6aMUnBD)
\ No newline at end of file
+* And many others @ [GBGW: Newtype Labs](https://discord.gg/6aMUnBD)

From cf91ebd4f928af3aff809016cb5d5ae36de538ae Mon Sep 17 00:00:00 2001
From: Anthony <anthonychwong@live.com>
Date: Fri, 24 Jul 2020 14:32:52 +0800
Subject: [PATCH 5/7] Create scheduled github action to merge up stream branch

---
 .github/workflows/scheduled-merge.yml | 31 +++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 .github/workflows/scheduled-merge.yml

diff --git a/.github/workflows/scheduled-merge.yml b/.github/workflows/scheduled-merge.yml
new file mode 100644
index 0000000..307d34f
--- /dev/null
+++ b/.github/workflows/scheduled-merge.yml
@@ -0,0 +1,31 @@
+name: Merge upstream branches every Thursday 00:00
+on:
+  schedule:
+    - cron:  '0 */12 * * *'
+jobs:
+  merge:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          persist-credentials: false
+          token: ${{secrets.GHPAGE_SECRET}}
+      - name: Merge upstream
+        run: |
+          git config --global user.name 'GitHub Action by Anthony'
+          git config --global user.email 'anthonychwong@live.com'
+
+          # "git checkout master" is unnecessary, already here by default
+          git pull --unshallow  # this option is very important, you would get
+                                # complains about unrelated histories without it.
+                                # (but actions/checkout@v2 can also be instructed
+                                # to fetch all git depth right from the start)
+
+          git remote set-url origin https://${{secrets.GHPAGE_SECRET}}@github.com/anthonychwong/gbgwcalculator
+
+          git remote add upstream https://github.com/rmkane/gbgwcalculator.github.io.git
+          git fetch upstream
+
+          git checkout master
+          git merge --no-edit upstream/master
+          git push origin master

From 14e1409e074044c50e52aec7cdaadc6f99abc1be Mon Sep 17 00:00:00 2001
From: Anthony <anthonychwong@live.com>
Date: Sat, 1 Aug 2020 10:44:46 +0800
Subject: [PATCH 6/7] Allow merge to be triggered manually

---
 .github/workflows/scheduled-merge.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/scheduled-merge.yml b/.github/workflows/scheduled-merge.yml
index 307d34f..3b97c3b 100644
--- a/.github/workflows/scheduled-merge.yml
+++ b/.github/workflows/scheduled-merge.yml
@@ -2,6 +2,8 @@ name: Merge upstream branches every Thursday 00:00
 on:
   schedule:
     - cron:  '0 */12 * * *'
+  workflow_dispatch:
+
 jobs:
   merge:
     runs-on: ubuntu-latest

From bed5185e1df506e4bb1e9b12f99b7753cd3255df Mon Sep 17 00:00:00 2001
From: Anthony <anthonychwong@live.com>
Date: Sat, 1 Aug 2020 17:10:37 +0800
Subject: [PATCH 7/7] Reduce scheduled merge frequency

---
 .github/workflows/scheduled-merge.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/scheduled-merge.yml b/.github/workflows/scheduled-merge.yml
index 3b97c3b..36e8a7e 100644
--- a/.github/workflows/scheduled-merge.yml
+++ b/.github/workflows/scheduled-merge.yml
@@ -1,7 +1,8 @@
 name: Merge upstream branches every Thursday 00:00
 on:
   schedule:
-    - cron:  '0 */12 * * *'
+    - cron:  '0 4,8,12,16 * * 3'
+    - cron:  '0 0,8,16 * * 4'
   workflow_dispatch:
 
 jobs: