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

Adding changes to auto-deploy #27

Merged
merged 30 commits into from
Oct 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
de79616
Improve chart interactions on mobile, add color maps, add comments
dzole0311 Sep 30, 2024
0d6b21b
Add conversion to celsius
dzole0311 Sep 30, 2024
732801a
Add loading spinner
dzole0311 Sep 30, 2024
49652b9
Make the search blur more prominent
dzole0311 Sep 30, 2024
3537991
Increase the zIndex to the transition component
dzole0311 Sep 30, 2024
b42f663
Add RotateOverlay for mobile screens in landscape mode
dzole0311 Sep 30, 2024
069e96f
Update media queries for the esri attributions
dzole0311 Sep 30, 2024
644bec3
Add media query
dzole0311 Sep 30, 2024
83c1753
Stop pausing the native video player and decrease time step
dzole0311 Sep 30, 2024
a17a545
Change position prop for the attributions
dzole0311 Sep 30, 2024
ec32bb5
Add precedence to the position rule
dzole0311 Sep 30, 2024
9dd0a09
Add debugging log
dzole0311 Sep 30, 2024
0ac5727
Add padding to the sceneview
dzole0311 Sep 30, 2024
2617cc5
Change position for the attributions
dzole0311 Sep 30, 2024
ca670a3
Disable outline around scene
dzole0311 Sep 30, 2024
4ce5d78
Add WebGL error handler
dzole0311 Sep 30, 2024
c1494e6
Merge Tour functionality with new texts
dzole0311 Oct 1, 2024
e9ca79b
Update videos
dzole0311 Oct 1, 2024
7ae3cf4
Tour button fix position
dzole0311 Oct 1, 2024
fdd2fda
Additionally check readyState before attempting to set the frames
dzole0311 Oct 1, 2024
c7b5227
Fixes
dzole0311 Oct 1, 2024
2387148
Update dynamic coloring for the tabs, add y axis lines
dzole0311 Oct 1, 2024
5743a79
Update hexes
dzole0311 Oct 1, 2024
573706b
Add solid color icons
dzole0311 Oct 1, 2024
025f427
Add a copy link button in the ShareModal
dzole0311 Oct 1, 2024
6704d88
Add fallback images for each video
dzole0311 Oct 1, 2024
16429b0
Increase opacity of transition comp
dzole0311 Oct 1, 2024
2039bee
Only start the animation frame if all videos are loaded
dzole0311 Oct 1, 2024
4cd585e
Merge pull request #15 from NASA-IMPACT/eic-mobile-v3-mobile-climate-…
dzole0311 Oct 1, 2024
bcea235
Adding CICD to main
amarouane-ABDELHAK Oct 1, 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
154 changes: 147 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"date-fns": "^3.6.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-joyride": "^2.9.2",
"react-share": "^5.1.0",
"styled-components": "^6.1.12"
},
Expand Down
Binary file removed public/composited_1fps_g1_crf18.mp4
Binary file not shown.
Binary file added public/tasmax_monthly_ssp126_first_frame.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/tasmax_monthly_ssp126_max12_8192_1024x512.mp4
Binary file not shown.
Binary file modified public/tasmax_monthly_ssp126_max12_8192_512x256.mp4
Binary file not shown.
Binary file added public/tasmax_monthly_ssp245_first_frame.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/tasmax_monthly_ssp245_max12_8192_1024x512.mp4
Binary file not shown.
Binary file not shown.
Binary file added public/tasmax_monthly_ssp370_first_frame.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/tasmax_monthly_ssp370_max12_8192_1024x512.mp4
Binary file not shown.
Binary file modified public/tasmax_monthly_ssp370_max12_8192_512x256.mp4
Binary file not shown.
Binary file added public/tasmax_monthly_ssp585_first_frame.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/tasmax_monthly_ssp585_max12_8192_1024x512.mp4
Binary file not shown.
Binary file modified public/tasmax_monthly_ssp585_max12_8192_512x256.mp4
Binary file not shown.
51 changes: 35 additions & 16 deletions src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@ import EICLogo from './components/Logo';
import {
MapViewContext,
ChartDataContext,
DataSelectionContext
DataSelectionContext,
ErrorContext
} from './contexts/AppContext';
import { VideoProvider } from './contexts/VideoContext';
import config from './config.json';
import RotateOverlay from './components/RotateOverlay';
import Tour from './components/Tour';

export default function App() {
const defaultDataset = config.datasets[0];
Expand All @@ -19,22 +22,38 @@ export default function App() {
]);
const [mapView, setMapView] = useState(null);
const [chartData, setChartData] = useState([]);
const [hasWebGLError, setHasWebGLError] = useState(false);

return (
<MapViewContext.Provider value={{ mapView, setMapView }}>
<DataSelectionContext.Provider
value={{ dataSelection, setDataSelection }}
>
<VideoProvider>
<ChartDataContext.Provider
value={{ chartData, setChartData }}
>
<EICLogo />
<Panel />
<Map />
</ChartDataContext.Provider>
</VideoProvider>
</DataSelectionContext.Provider>
</MapViewContext.Provider>
<ErrorContext.Provider value={{ hasWebGLError, setHasWebGLError }}>
<MapViewContext.Provider value={{ mapView, setMapView }}>
<DataSelectionContext.Provider
value={{ dataSelection, setDataSelection }}
>
<VideoProvider>
<ChartDataContext.Provider
value={{ chartData, setChartData }}
>
{hasWebGLError ? (
<div>
Your WebGL implementation doesn't seem to
support hardware accelerated rendering.
Check your browser settings or if your GPU
is in a blocklist.
</div>
) : (
<>
<Tour />
<RotateOverlay />
<EICLogo />
<Panel />
<Map />
</>
)}
</ChartDataContext.Provider>
</VideoProvider>
</DataSelectionContext.Provider>
</MapViewContext.Provider>
</ErrorContext.Provider>
);
}
6 changes: 3 additions & 3 deletions src/components/DataLayerModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export default function DataLayerModal({

return (
<div
className="fixed inset-0 z-[99] w-full h-full bg-black bg-opacity-30 backdrop-blur-lg flex justify-center items-center"
className="fixed inset-0 z-[999] w-full h-full bg-black bg-opacity-30 backdrop-blur-lg flex justify-center items-center"
onClick={handleClickOutside}
>
<div id="modal-background" className="relative w-full h-full bg-transparent flex flex-col justify-center items-center p-6 max-w-none">
Expand All @@ -53,7 +53,7 @@ export default function DataLayerModal({
<div className="flex justify-start mt-8">
<button
className={`px-4 py-2 border rounded-l-lg text-[14px] font-semibold transition-colors ${
isFahrenheit ? 'bg-blue-600 text-white' : 'bg-gray-800 text-gray-400'
isFahrenheit ? 'bg-[#14367D] text-white' : 'bg-gray-800 text-gray-400'
}`}
style={{
borderRadius: '4px 0 0 4px',
Expand All @@ -66,7 +66,7 @@ export default function DataLayerModal({
</button>
<button
className={`px-4 py-2 border rounded-r-lg text-[14px] font-semibold transition-colors ${
!isFahrenheit ? 'bg-blue-600 text-white' : 'bg-gray-800 text-gray-400'
!isFahrenheit ? 'bg-[#14367D] text-white' : 'bg-gray-800 text-gray-400'
}`}
style={{
borderRadius: '0 4px 4px 0',
Expand Down
Loading
Loading