Skip to content

Commit

Permalink
Merge pull request #20 from sigurdcarlsen/main
Browse files Browse the repository at this point in the history
Changes for 2024
  • Loading branch information
lyret authored May 20, 2024
2 parents 185848e + ac3bd3f commit a72a6e1
Show file tree
Hide file tree
Showing 123 changed files with 5,762 additions and 7,911 deletions.
46 changes: 23 additions & 23 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
name: GitHub Pages Rollup Deploy
name: Deploy commits on 'main' to GitHub Pages

on:
push:
branches:
- main # Set a branch name to trigger deployment
push:
branches:
- main # Set a branch name to trigger deployment
# uncomment to do a deploy on every pull request (and changes to it)
# pull_request:

jobs:
deploy:
runs-on: ubuntu-20.04
permissions:
contents: write
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
steps:
- uses: actions/checkout@v3
with:
ref: main
deploy:
runs-on: ubuntu-20.04
permissions:
contents: write
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
steps:
- uses: actions/checkout@v3
with:
ref: main

- name: Install dependencies
run: npm install
- name: Install dependencies
run: npm ci

- name: Build
run: npm run build
- name: Build
run: npm run build

- name: Deploy to Pages
uses: peaceiris/actions-gh-pages@v3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./public
- name: Deploy to Pages
uses: peaceiris/actions-gh-pages@v3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./public
13 changes: 0 additions & 13 deletions .nova/Tasks/Rollup.json

This file was deleted.

25 changes: 9 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,28 +1,21 @@
The Borderland Map
==================
# The Borderland Map

https://www.theborderland.se/map/

Running the code
## Available commands

We use rollup to generate the javascript code.


Development
-----------

Use:
## Serve for development

```bash
npm install
npm run dev
npm ci
npm run serve
```

Build
-----
## Build for production

```bash
npm build
npm run ci
npm run build
```

All the production assets can be found in the folder `public`
All the production assets can then be found in the folder `public`, can be deployed to any web server for static files
2 changes: 2 additions & 0 deletions SETTINGS.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export const IS_EDITING_POSSIBLE = true;
export const NOTE_ABOUT_EDITING = 'THE MAP IS RESETTING TUESDAY 10.00 AM CET';
Loading

0 comments on commit a72a6e1

Please sign in to comment.