Skip to content

Commit 2d817ce

Browse files
authored
Merge pull request #102 from cheeaun/staging
Update from staging
2 parents aa9b134 + 743110c commit 2d817ce

File tree

1,512 files changed

+159445
-3525674
lines changed

Some content is hidden

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

1,512 files changed

+159445
-3525674
lines changed

.github/workflows/e2e-tests.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: E2E Tests
2+
permissions:
3+
contents: read
4+
on:
5+
push:
6+
branches:
7+
- main
8+
pull_request:
9+
branches:
10+
- main
11+
jobs:
12+
test:
13+
timeout-minutes: 60
14+
runs-on: ubuntu-latest
15+
steps:
16+
- uses: actions/checkout@v4
17+
- uses: actions/setup-node@v4
18+
with:
19+
node-version: lts/*
20+
- name: Install dependencies
21+
run: npm ci
22+
- name: Install Playwright Browsers
23+
run: npx playwright install --with-deps --only-shell
24+
- name: Run Playwright tests
25+
run: npm run test:e2e
26+
- uses: actions/upload-artifact@v4
27+
if: ${{ !cancelled() }}
28+
with:
29+
name: playwright-report
30+
path: playwright-report/
31+
retention-days: 30

.gitignore

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,10 @@ tmp
77
.parcel-cache
88
.env
99
data/3/route-lines
10-
.vscode
10+
.vscode
11+
12+
# Playwright
13+
/test-results/
14+
/playwright-report/
15+
/blob-report/
16+
/playwright/.cache/

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ The scripts for the web app:
5555

5656
[![Crowdin](https://badges.crowdin.net/busrouter-sg/localized.svg)](https://crowdin.com/project/busrouter-sg)
5757

58-
**[➡️ Start translating ⬅️](https://crwd.in/busrouter-sg)**
58+
**[➡️ Start translating ⬅️](https://crowdin.com/project/busrouter-sg)**
5959

6060
### Visualization
6161

assets/app.css

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'npm:mapbox-gl/dist/mapbox-gl.css';
1+
@import 'npm:maplibre-gl/dist/maplibre-gl.css';
22

33
html,
44
body {
@@ -60,45 +60,45 @@ a:active {
6060
pointer-events: none;
6161
}
6262

63-
.mapboxgl-canvas {
63+
.maplibregl-canvas {
6464
outline: 0;
6565
}
66-
.mapboxgl-ctrl-group {
66+
.maplibregl-ctrl-group {
6767
background-color: rgba(255, 255, 255, 0.8);
6868
border-radius: 123123px;
6969
}
7070
@supports (backdrop-filter: blur(10px)) {
71-
.mapboxgl-ctrl-group {
71+
.maplibregl-ctrl-group {
7272
background-color: rgba(255, 255, 255, 0.7);
7373
backdrop-filter: blur(10px) saturate(3);
7474
}
7575
}
76-
.mapboxgl-ctrl-group button {
76+
.maplibregl-ctrl-group button {
7777
opacity: 0.8;
7878
width: 36px;
7979
height: 36px;
8080
}
81-
.mapboxgl-ctrl.mapboxgl-ctrl-attrib {
81+
.maplibregl-ctrl.maplibregl-ctrl-attrib {
8282
box-sizing: content-box;
8383
}
8484
@supports (top: max(1px)) {
85-
.mapboxgl-ctrl-top-right {
85+
.maplibregl-ctrl-top-right {
8686
top: max(0px, env(safe-area-inset-top));
8787
right: max(0px, env(safe-area-inset-right));
8888
}
8989
}
90-
.mapboxgl-ctrl-group button.mapboxgl-ctrl-compass {
90+
.maplibregl-ctrl-group button.maplibregl-ctrl-compass {
9191
display: none;
9292
}
93-
.mapboxgl-ctrl-group button.mapboxgl-ctrl-compass.show {
93+
.maplibregl-ctrl-group button.maplibregl-ctrl-compass.show {
9494
display: block;
9595
}
96-
.mapboxgl-ctrl-bottom-left {
96+
.maplibregl-ctrl-bottom-left {
9797
transform: translateY(-60px);
9898
transition: transform 0.3s ease-in-out;
9999
}
100100
@supports (top: max(1px)) {
101-
.mapboxgl-ctrl-bottom-left {
101+
.maplibregl-ctrl-bottom-left {
102102
transform: translateY(calc(-60px - env(safe-area-inset-bottom)));
103103
}
104104
}
@@ -1332,7 +1332,7 @@ a.service-tag:hover {
13321332
margin-left: 0;
13331333
}
13341334

1335-
.mapboxgl-ctrl-bottom-left {
1335+
.maplibregl-ctrl-bottom-left {
13361336
transform: translateY(0) !important;
13371337
}
13381338
}
@@ -1438,23 +1438,23 @@ a.service-tag:hover {
14381438

14391439
/* Geolocation */
14401440

1441-
.mapboxgl-ctrl-custom-geolocate {
1441+
.maplibregl-ctrl-custom-geolocate {
14421442
color: #333;
14431443
transition: color 0.3s;
14441444
}
1445-
.mapboxgl-ctrl-custom-geolocate.loading {
1445+
.maplibregl-ctrl-custom-geolocate.loading {
14461446
color: #007aff;
14471447
pointer-events: none;
14481448
animation: glowing infinite alternate 1s linear both;
14491449
}
1450-
.mapboxgl-ctrl-custom-geolocate.active {
1450+
.maplibregl-ctrl-custom-geolocate.active {
14511451
color: #007aff;
14521452
}
1453-
.mapboxgl-ctrl-custom-geolocate svg {
1453+
.maplibregl-ctrl-custom-geolocate svg {
14541454
vertical-align: middle;
14551455
fill: currentColor;
14561456
}
1457-
.mapboxgl-ctrl-custom-geolocate.active svg .inner {
1457+
.maplibregl-ctrl-custom-geolocate.active svg .inner {
14581458
fill: currentColor;
14591459
}
14601460
.user-location {

0 commit comments

Comments
 (0)