Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

global map on summary page #339

Merged
merged 40 commits into from
Sep 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
d817549
first r3f map version
sebsteinig Aug 6, 2024
eb15e4e
first map version
sebsteinig Sep 5, 2024
85d3f00
first r3f map version
sebsteinig Aug 6, 2024
06df1d8
first map version
sebsteinig Sep 5, 2024
1eb7bcf
added all chunks to animation
sebsteinig Sep 5, 2024
9349d0c
merge
sebsteinig Sep 5, 2024
f37e77c
added slider
sebsteinig Sep 5, 2024
4a3976c
added location markers
sebsteinig Sep 6, 2024
3c63dad
added globe projection
sebsteinig Sep 6, 2024
67d03ed
improved time control
sebsteinig Sep 6, 2024
2b3bf05
added PM10
sebsteinig Sep 6, 2024
4a8a6d7
switched to deployed data_tetxures
sebsteinig Sep 11, 2024
4745085
instanced location amrkers
sebsteinig Sep 11, 2024
9670435
reduced number of texture lookups
sebsteinig Sep 12, 2024
c023c5f
new camera controls
sebsteinig Sep 12, 2024
a835eaf
added toggle switch to page
sebsteinig Sep 12, 2024
c9cba30
updtaed to mui icons
sebsteinig Sep 12, 2024
1b31582
fixed markers for missing insitud data
sebsteinig Sep 13, 2024
eb8a69b
fixed typescript issues
sebsteinig Sep 13, 2024
bf77e5d
fixed remaining TS hints
sebsteinig Sep 13, 2024
5459000
auto lint fixes
sebsteinig Sep 13, 2024
1104cc3
fixed remaining linting issues
sebsteinig Sep 13, 2024
c5bf628
try to mock WebGL environment for Jest tests
sebsteinig Sep 13, 2024
de54a81
jest webgl mocking
sebsteinig Sep 13, 2024
62454e7
updated jest mocking
sebsteinig Sep 13, 2024
bc64a65
jest mocking
sebsteinig Sep 13, 2024
cf09c36
map GLSL files for jest tests
sebsteinig Sep 13, 2024
6ba5760
updated jest mocking
sebsteinig Sep 13, 2024
f78e4f8
jest mocking
sebsteinig Sep 13, 2024
06cca05
jest mocking
sebsteinig Sep 13, 2024
b24f61a
jest mocking
sebsteinig Sep 13, 2024
d585788
fixed linting
sebsteinig Sep 13, 2024
2e3019a
simplified texture loading
sebsteinig Sep 13, 2024
46ca428
fixed linting
sebsteinig Sep 13, 2024
06c54cb
make map hidden by default
sebsteinig Sep 13, 2024
fcd04ea
removed unnecesary assets
sebsteinig Sep 13, 2024
6747477
added UI URL environment variable
sebsteinig Sep 13, 2024
e6a3de4
fixed texture updates
sebsteinig Sep 13, 2024
47b0309
increased Firefox compatibility
sebsteinig Sep 13, 2024
87cc5b3
remove debugging log statements
sebsteinig Sep 13, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/frontend-ui-docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: build
run: |
cd air-quality-ui
docker build . -t ghcr.io/${REPO}/vairify-frontend:latest --build-arg VITE_AIR_QUALITY_API_URL=${{ vars.VAIRIFY_API_URL }}
docker build . -t ghcr.io/${REPO}/vairify-frontend:latest --build-arg VITE_AIR_QUALITY_API_URL=${{ vars.VAIRIFY_API_URL }} --build-arg VITE_AIR_QUALITY_UI_URL=${{ vars.VAIRIFY_UI_URL }}
- name: publish
run: |
docker push ghcr.io/${REPO}/vairify-frontend:latest
1 change: 1 addition & 0 deletions air-quality-ui/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ CMD ["npm", "run", "dev"]
FROM development AS build

ARG VITE_AIR_QUALITY_API_URL
ARG VITE_AIR_QUALITY_UI_URL
RUN npm run build

FROM nginx:alpine
Expand Down
1 change: 1 addition & 0 deletions air-quality-ui/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ From within air-quality-ui:
### Create .env file with content
```
VITE_AIR_QUALITY_API_URL=http://localhost:8000
VITE_AIR_QUALITY_UI_URL=http://localhost:5173
```

### Start
Expand Down
2 changes: 2 additions & 0 deletions air-quality-ui/jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export default {
metaObjectReplacement: {
env: {
VITE_AIR_QUALITY_API_URL: testUrl,
VITE_AIR_QUALITY_UI_URL: testUrl,
},
},
},
Expand All @@ -31,6 +32,7 @@ export default {
moduleNameMapper: {
'\\.(gif|ttf|eot|svg|png)$': '<rootDir>/test/__ mocks __/fileMock.js',
'\\.(css|less)$': 'identity-obj-proxy',
'^.+.(vert|frag|glsl)$': 'jest-transform-stub',
},
testPathIgnorePatterns: ['/node_modules/', '/system_tests/'],
setupFiles: ['./jest.setup.ts'],
Expand Down
20 changes: 20 additions & 0 deletions air-quality-ui/jest.setup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,23 @@ Object.defineProperty(global.self, 'crypto', {
subtle: crypto.webcrypto.subtle,
},
})

// mock three.js and react-three-fiber components which rely on WebGL
jest.mock('three', () => ({
WebGLRenderer: jest.fn(),
Scene: jest.fn(),
PerspectiveCamera: jest.fn(),
}))

jest.mock('three-stdlib', () => ({
LottieLoader: jest.fn(),
}))

// Mock @react-three/drei components like CameraControls
jest.mock('@react-three/drei', () => ({
CameraControls: jest.fn(),
}))

jest.mock('three-custom-shader-material', () => {
return jest.fn(() => null) // Mock CustomShaderMaterial
})
Loading
Loading