Skip to content
Snippets Groups Projects
Unverified Commit 3ec2cbb0 authored by Griefed's avatar Griefed :joystick: Committed by GitHub
Browse files

Merge pull request #14 from Griefed/develop 

Develop
parents 97d7c5ca 3b496deb
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.github/workflows/gh-pages.yml deleted 100644 → 0
+ 0
− 36
View file @ 97d7c5ca
name: Deploy to GitHub pages
on:
push:
branches:
- master
workflow_dispatch:
jobs:
pages:
runs-on: ubuntu-latest
steps:
- name: Paused until further notice
run: |
echo "This action is paused until further notice."
echo "I need to figure out how to work with the assets folder for the tile images."
echo "Currently, they are in public/tiles, which ends in a 404 when running on GitHub pages."
- uses: actions/checkout@v2
- name: Setup Node.js environment
uses: actions/setup-node@v2.4.0
with:
# Version Spec of the version to use. Examples: 12.x, 10.15.1, >=10.15.0
node-version: '>= 16.9.1'
# Set this option if you want the action to check for the latest available version that satisfies the version spec
check-latest: false
- run: npm install -g @quasar/cli
- run: npm install
- run: quasar build
- run: pwd && ls -al *
# DEPLOY TO GH-PAGES
- name: Deploy to GitHub-Pages
uses: JamesIves/github-pages-deploy-action@4.1.5
with:
branch: gh-pages
folder: dist/spa
.github/workflows/github_release.yml
+ 96
− 11
View file @ 3ec2cbb0
......@@ -8,6 +8,12 @@ on:
jobs:
release:
runs-on: ubuntu-latest
# OUTPUTS
outputs:
newtag: ${{ steps.tag.outputs.tag }}
uploadurl: ${{ steps.create_release.outputs.upload_url }}
steps:
# GET LATEST CODE
- name: Checkout latest code
......@@ -56,24 +62,25 @@ jobs:
- name: Install packages
run: npm install
- name: Build project
- name: Build project for NGINX release package
run: quasar build
- name: List files
run: pwd && ls -al *
- name: Create Build Archive tar.gz
# NGINX Archives
- name: Create NGINX Archive tar.gz
run: |
echo "**** Creating archive of quasar build ****"
tar -czf lttmm-${{ steps.tag.outputs.tag }}.tar.gz dist/spa
- name: Create Build Archive zip
tar -czf lttmm-NGINX-${{ steps.tag.outputs.tag }}.tar.gz dist/spa
- name: Create NGINX Archive zip
uses: papeloto/action-zip@v1
with:
files: dist/spa
recursive: true
dest: lttmm-${{ steps.tag.outputs.tag }}.zip
dest: lttmm-NGINX-${{ steps.tag.outputs.tag }}.zip
# Upload NGINX Assets
- name: Upload Release Archive tar.gz
id: upload-release-asset-archive-targz
uses: actions/upload-release-asset@v1
......@@ -81,10 +88,9 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ./lttmm-${{ steps.tag.outputs.tag }}.tar.gz
asset_name: lttmm-${{ steps.tag.outputs.tag }}.tar.gz
asset_path: ./lttmm-NGINX-${{ steps.tag.outputs.tag }}.tar.gz
asset_name: lttmm-NGINX-${{ steps.tag.outputs.tag }}.tar.gz
asset_content_type: application/gzip
- name: Upload Release Archive zip
id: upload-release-asset-archive-zip
uses: actions/upload-release-asset@v1
......@@ -92,10 +98,17 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ./lttmm-${{ steps.tag.outputs.tag }}.zip
asset_name: lttmm-${{ steps.tag.outputs.tag }}.zip
asset_path: ./lttmm-NGINX-${{ steps.tag.outputs.tag }}.zip
asset_name: lttmm-NGINX-${{ steps.tag.outputs.tag }}.zip
asset_content_type: application/zip
# DEPLOY TO GH-PAGES
- name: Deploy to GitHub-Pages
uses: JamesIves/github-pages-deploy-action@4.1.5
with:
branch: gh-pages
folder: dist/spa
# DOCKER RELATED
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
......@@ -124,3 +137,75 @@ jobs:
ghcr.io/griefed/ltt-mapmaker:${{ steps.tag.outputs.tag }}
griefed/ltt-mapmaker:latest
griefed/ltt-mapmaker:${{ steps.tag.outputs.tag }}
electron:
needs: release
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-latest, ubuntu-latest, windows-latest]
steps:
# GET LATEST CODE
- name: Checkout latest code
uses: actions/checkout@master
with:
fetch-depth: 0
# SETUP NODE ENVIRONMENT
- name: Setup Node.js environment
uses: actions/setup-node@v2.4.0
with:
# Version Spec of the version to use. Examples: 12.x, 10.15.1, >=10.15.0
node-version: '>= 16.9.1'
# Set this option if you want the action to check for the latest available version that satisfies the version spec
check-latest: false
- name: Build/release Electron app
uses: vedaprakashms/quasar_electron_build@V0.0.1
with:
# GitHub token, automatically provided to the action
# (No need to define this secret in the repo settings)
github_token: ${{ secrets.github_token }}
- name: List files
run: ls dist/electron
- name: Rename folders
run: |
mv dist/electron/Let* dist/electron/lttmm-${{ matrix.os }}
# Electron Archives
- name: Create zip
uses: ihiroky/archive-action@v1
with:
root_dir: dist/electron/lttmm-${{ matrix.os }}
file_path: lttmm-app-${{ matrix.os }}-${{ needs.release.outputs.newtag }}.zip
- name: Create tar.gz
uses: ihiroky/archive-action@v1
with:
root_dir: dist/electron/lttmm-${{ matrix.os }}
file_path: lttmm-app-${{ matrix.os }}-${{ needs.release.outputs.newtag }}.tar.gz
# Upload App Assets
- name: Upload App Archive tar.gz
id: upload-release-asset-archive-targz
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ needs.release.outputs.uploadurl }}
asset_path: ./lttmm-app-${{ matrix.os }}-${{ needs.release.outputs.newtag }}.tar.gz
asset_name: lttmm-app-${{ matrix.os }}-${{ needs.release.outputs.newtag }}.tar.gz
asset_content_type: application/gzip
- name: Upload App Archive zip
id: upload-release-asset-archive-zip
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ needs.release.outputs.uploadurl }}
asset_path: ./lttmm-app-${{ matrix.os }}-${{ needs.release.outputs.newtag }}.zip
asset_name: lttmm-app-${{ matrix.os }}-${{ needs.release.outputs.newtag }}.zip
asset_content_type: application/zip
.github/workflows/test.yml
+ 57
− 0
View file @ 3ec2cbb0
......@@ -39,3 +39,60 @@ jobs:
file: ./Dockerfile
platforms: linux/amd64,linux/arm/v7,linux/arm64
push: false
electron:
needs: test
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-latest, ubuntu-latest, windows-latest]
steps:
# GET LATEST CODE
- name: Checkout latest code
uses: actions/checkout@master
with:
fetch-depth: 0
- name: We are running on
run: echo matrix.os is ${{ matrix.os }}
# Either:
# 1. macos-latest
# 2. ubuntu-latest
# 3. windows-latest
# SETUP NODE ENVIRONMENT
- name: Setup Node.js environment
uses: actions/setup-node@v2.4.0
with:
# Version Spec of the version to use. Examples: 12.x, 10.15.1, >=10.15.0
node-version: '>= 16.9.1'
# Set this option if you want the action to check for the latest available version that satisfies the version spec
check-latest: false
- name: Build/release Electron app
uses: vedaprakashms/quasar_electron_build@V0.0.1
with:
# GitHub token, automatically provided to the action
# (No need to define this secret in the repo settings)
github_token: ${{ secrets.github_token }}
- name: List files
run: ls dist/electron
- name: Rename folders
run: |
mv dist/electron/Let* dist/electron/lttmm-${{ matrix.os }}
# Electron Archives
- name: Create zip
uses: ihiroky/archive-action@v1
with:
root_dir: dist/electron/lttmm-${{ matrix.os }}
file_path: lttmm-app-$ARCHIVEOS.zip
- name: Create tar.gz
uses: ihiroky/archive-action@v1
with:
root_dir: dist/electron/lttmm-${{ matrix.os }}
file_path: lttmm-app-$ARCHIVEOS.tar.gz
src/pages/Index.vue
+ 48
− 45
View file @ 3ec2cbb0
......@@ -23,47 +23,54 @@
</span>
</span>
<span v-else>
<div class="row no-wrap q-pa-md">
<div class="column" style="width: 600px;">
<div class="text-h6 q-mb-md text-grey-1">MapDimensions</div>
<q-item>
<q-item-section avatar>
<q-icon size="30px" color="secondary" name="mdi-arrow-expand-horizontal" />
</q-item-section>
<q-item-section>
<q-slider v-model="store.state.mapSizeX" :min="1" :max="101" label color="secondary" :step="1" label-always/>
</q-item-section>
</q-item>
<q-item>
<q-item-section avatar>
<q-icon size="30px" color="secondary" name="mdi-arrow-expand-vertical" />
</q-item-section>
<q-item-section>
<q-slider v-model="store.state.mapSizeY" :min="1" :max="101" label color="secondary" :step="1" label-always/>
</q-item-section>
</q-item>
<q-btn class="q-mr-xs" color="secondary" label="Generate New Map" @click='createMap()'>
<q-tooltip :disable="$q.platform.is.mobile">
Create New Map
</q-tooltip>
</q-btn>
</div>
<div class="column">
<q-input
v-model="mapString"
filled
autogrow
placeholder="Paste Map Data"
type="textarea"
input-class="pastCodeArea"
></q-input>
<q-btn class="q-mr-xs" color="secondary" label="Load Map From Filedata" @click='loadMapData()'>
<q-tooltip :disable="$q.platform.is.mobile">
Load Map From Data
</q-tooltip>
</q-btn>
</div>
<div class="row no-wrap q-pa-md absolute-center">
<q-card>
<q-card-section>
<div class="column" style="width: 600px;">
<div class="text-h6 q-mb-md text-black">New Map Dimensions</div>
<q-item>
<q-item-section avatar>
<q-icon size="30px" color="secondary" name="mdi-arrow-expand-horizontal" />
</q-item-section>
<q-item-section>
<q-slider v-model="store.state.mapSizeX" :min="1" :max="101" label color="secondary" :step="1" label-always/>
</q-item-section>
</q-item>
<q-item>
<q-item-section avatar>
<q-icon size="30px" color="secondary" name="mdi-arrow-expand-vertical" />
</q-item-section>
<q-item-section>
<q-slider v-model="store.state.mapSizeY" :min="1" :max="101" label color="secondary" :step="1" label-always/>
</q-item-section>
</q-item>
<q-btn class="q-mr-xs" color="secondary" label="Generate New Map" @click='createMap()'>
<q-tooltip :disable="$q.platform.is.mobile">
Generate new map with size set above
</q-tooltip>
</q-btn>
</div>
</q-card-section>
<q-card-section>
<div class="column">
<div class="text-h6 q-mb-md text-black">Load Existing Map</div>
<q-input
v-model="mapString"
filled
placeholder="Paste Map Data"
type="textarea"
input-class="pastCodeArea"
></q-input>
<q-btn class="q-mr-xs" color="secondary" label="Load Map From Filedata" @click='loadMapData()'>
<q-tooltip :disable="$q.platform.is.mobile">
Load Map From Data
</q-tooltip>
</q-btn>
</div>
</q-card-section>
</q-card>
</div>
</span>
......@@ -123,8 +130,4 @@ export default defineComponent({
.moveup {
margin-top: -31px;
}
.pastCodeArea {
color: white;
}
</style>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Me haz all ze repositoriiiiiiiiiiiiiiiiiies