Skip to content

Commit 76a4674

Browse files
authored
Merge pull request #622 from SlideRuleEarth/carlos-dev
Carlos dev
2 parents 94f66e1 + 1614964 commit 76a4674

File tree

156 files changed

+3752
-1834
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

156 files changed

+3752
-1834
lines changed

.env.local

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
BASE_URL=http://localhost:5173

.env.prod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
BASE_URL=https://client.slideruleearth.io

.env.test

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
BASE_URL=https://testsliderule.org

.github/workflows/playwright.yml

Lines changed: 28 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,35 @@ on:
33
push:
44
branches: [ main, master ]
55
pull_request:
6-
branches: [ main, master ]
6+
77
jobs:
88
test:
9-
timeout-minutes: 60
109
runs-on: ubuntu-latest
10+
timeout-minutes: 60
1111
steps:
12-
- uses: actions/checkout@v4
13-
- uses: actions/setup-node@v4
14-
with:
15-
node-version: lts/*
16-
- name: Install dependencies
17-
run: npm ci
18-
- name: Install Playwright Browsers
19-
run: npx playwright install --with-deps
20-
- name: Run Playwright tests
21-
run: npx playwright test
22-
- uses: actions/upload-artifact@v4
23-
if: ${{ !cancelled() }}
24-
with:
25-
name: playwright-report
26-
path: playwright-report/
27-
retention-days: 30
12+
- uses: actions/checkout@v4
13+
14+
- uses: actions/setup-node@v4
15+
with:
16+
node-version: 20
17+
cache: 'npm'
18+
cache-dependency-path: web-client/package-lock.json
19+
20+
- name: Install dependencies
21+
working-directory: web-client
22+
run: npm ci
23+
24+
- name: Install Playwright browsers
25+
working-directory: web-client
26+
run: npx playwright install --with-deps
27+
28+
- name: Run Playwright tests
29+
working-directory: web-client
30+
run: npx playwright test
31+
32+
- uses: actions/upload-artifact@v4
33+
if: ${{ !cancelled() }}
34+
with:
35+
name: playwright-report
36+
path: web-client/playwright-report/
37+
retention-days: 30

Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,11 @@ live-update-testsliderule: ## Update the web client at testsliderule.org with ne
8080
live-update-client-dot-slideruleearth: ## Update the web client at client.slideruleearth.io with new build
8181
make live-update S3_BUCKET=slideruleearth-webclient-dot DOMAIN_APEX=slideruleearth.io DOMAIN=client.slideruleearth.io
8282

83-
build: ## Build the web client and update the dist folder
83+
convert-icons: ## Convert Maki SVG icons in src/assets/maki-svg to PNGs in public/icons
84+
@echo "🔄 Converting Maki SVG icons to PNGs..."
85+
node ./web-client/convert-maki-icons.js
86+
87+
build: convert-icons ## Build the web client and update the dist folder
8488
export VITE_BUILD_ENV=$(BUILD_ENV); \
8589
export VITE_APP_BUILD_DATE=$$(date +"%Y-%m-%d %T"); \
8690
export VITE_APP_VERSION=$$(git describe --tags --abbrev=0); \

0 commit comments

Comments
 (0)