-
Notifications
You must be signed in to change notification settings - Fork 89
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
Home page, about page and build your own Data Commons page, and footer #4599
Merged
dwnoble
merged 107 commits into
datacommonsorg:new-homepage
from
Half-Integer:new-homepage
Sep 9, 2024
+2,361
−1,922
Merged
Changes from 1 commit
Commits
Show all changes
107 commits
Select commit
Hold shift + click to select a range
baa3794
Feature/home page react (#1)
nick-next 1738d8c
This push addresses a number of comments in the PR:
nick-next 4393072
File, path and import renaming.
nick-next 8b3ac39
File formatting, tagged the homepage metadata data container as "meta…
nick-next 547bf5e
To keep full backwards compatibility with templates using the old hom…
nick-next 8758913
Following up from the previous commit, the .ts file for v2 (the new v…
nick-next 3b788c1
Factored out the calls to `document.getElementById` so that it is onl…
nick-next d468964
Commenting of interfaces, interface properties and files.
nick-next ea913a3
This push brings back the application container for the original home…
nick-next db7146f
Used macros to help render the label and route data containers.
nick-next 4bf9b18
Updating the label and route proxy objects to take the type as a gene…
nick-next 8ff02ae
The label proxy object now emits a log when the requested label does …
nick-next 9d35401
Template routes must now be wrapped in `{}` in order to be resolved, …
nick-next 6ea848f
WIP: A functional implementation of the rich menu. A note that this h…
nick-next 12abba5
WIP We now have the ability to put direct links in the header menu (s…
nick-next c6b98d5
Menu Styles WIP
pablonoel 859a19f
better search bar
pablonoel baeeb68
Added in {} tags to remaining routes, and removed an extra logo from …
nick-next 1edc0e6
Menu WIP shadow + arrows
pablonoel 585cc29
Menu item link coloring update.
nick-next 8991754
Improvement over menu item behaviour
pablonoel 166e32e
Animated icon when page is open.
nick-next dfe6c21
WIP improvements for the menu
pablonoel 17a6c45
Added in TODOs to be resolved before the final PR.
nick-next 37ef92a
Improvements on menu structure and sizes
pablonoel 8c97b7b
Cleaned up the menu sliding action so that it has the appearance of a…
nick-next 6e6c296
Update header content to include missing links.
nick-next bdbd474
Minor tweaks to the header styles.
nick-next 149f0fe
Temporarily removed the stand-in for the mobile menu toggle button.
nick-next 6eae1b4
Breakpoints and responsive spacing
pablonoel 676d0c8
Merge branch 'feature/header' of https://github.com/Half-Integer/data…
pablonoel b449369
Removal of stray console log and some formatting.
nick-next 1162697
Merge branch 'feature/homepage-revamp' into feature/header
nick-next a425a31
Refactor search bar component to fix Firefox Issue
pablonoel bc80cda
Merge branch 'feature/header' of https://github.com/Half-Integer/data…
pablonoel 1466751
new desktop header
jenibelle08 49aed83
WIP: implementation of the mobile menu version of the rich menu. A no…
nick-next 63423d2
Some refactoring of how the header CSS is applied, so that it is avai…
nick-next 50d4966
Added in a missing route resolver.
nick-next 52e4993
If the user scrolls and the desktop rich menu is open, it now closes …
nick-next c30cf86
better styles for mobile menu
pablonoel 34e917f
Some component renaming
nick-next 16c4fde
Mobile Menu Design Details
pablonoel 41fe22e
Merge branch 'feature/header-mobile' of https://github.com/Half-Integ…
pablonoel f914dd1
Small fix on hamburger menu icon font size
pablonoel 34b79ea
Removal of unused prop.
nick-next e77f40d
Visual fixes
pablonoel 012278b
Merge branch 'new-homepage' into feature/header-mobile
nick-next 027772c
Removal of unneeded files and imports, as well as an unneeded prop.
nick-next cff3114
New homepage initial commit
pablonoel c9b6dae
Scaffolding for the two new pages to be built: a revamp of the about …
nick-next f8bf97e
New Images
pablonoel 629a8b8
Refactor reusable variables
pablonoel 458bc23
The sample questions are now coming through to the React app via the …
nick-next bd04751
Formatting follow-up to previous push.
nick-next d42bb0a
Addition of missing keys and minor formatting updates.
nick-next 8433e96
Hero refactor + video
pablonoel 9ba7690
Merge branch 'feature/new-pages' of https://github.com/Half-Integer/d…
pablonoel 1fb4380
remove margin from main container
pablonoel ab7b553
testing component specific scss files
pablonoel 46ccdb3
refactor component styles
pablonoel 2da79a2
The partners are now being passed through to the about page.
nick-next 33d3d70
New location for files, new basic content components
pablonoel 4eec52b
Cleanup, Refactor images location, WIP component styles
pablonoel 861310c
Font sizes refactor
pablonoel f3db4df
WIP: Implementation of a slide carousel for the home page and the abo…
nick-next 2c363da
Merge remote-tracking branch 'origin/feature/new-pages' into feature/…
nick-next 112c9c9
SCSS cleanup (formatting fixes) as well as a fix to the height of the…
nick-next 4dc09e0
Fixes carousel shadow visual bug
pablonoel a786739
Added in a timer (with a TODO to review the length of it) to delay th…
nick-next 35c1aac
Reactify media_text component
pablonoel 476a2e9
Added in a TODO on the server side for moving to version two of the h…
nick-next 3ac04d6
Directory refactor (placing the header-related components in their ow…
nick-next 0e28fcc
Added in a TODO for the potential to fold the rich desktop and rich m…
nick-next 5796151
Directory reorganization, formatting and small fixes.
nick-next bce27dc
WIP component styles
pablonoel a7530d9
Merge branch 'new-homepage' into feature/new-pages
nick-next 5c21f14
An interim improvement for the content flash when loading older pages…
nick-next 45ac859
Trimming down the footer in preparation for styling of the new footer.
nick-next 9204678
Clean up and refactor of font sizes and spacing
pablonoel 5be10ce
Merge branch 'feature/new-pages' of https://github.com/Half-Integer/d…
pablonoel 5dbc6ec
Removing the old homepage and converting the v2 fork to the primary h…
nick-next eaa84cb
Build page WIP
pablonoel fa1f5ff
Merge branch 'feature/new-pages' of https://github.com/Half-Integer/d…
pablonoel afb3b52
Fix some spacing
pablonoel 0957590
better styles for text-columns component
pablonoel b11feb8
Refactoring, making some components generic, and formatting/commenting.
nick-next 3c2d565
Merge remote-tracking branch 'origin/feature/new-pages' into feature/…
nick-next 46ec299
Footer Styles
pablonoel 8b75252
Merge branch 'feature/new-pages' of https://github.com/Half-Integer/d…
pablonoel 52e74eb
The about page slider component (with some stand-in content for the s…
nick-next 90edca0
Responsive behaviour
pablonoel 96274fa
Nicer slider in about
pablonoel a8d9f68
Update slide_carousel.scss
pablonoel b015b8a
Initial push of the quote hero on the build page.
nick-next 4a9c58e
Fix the breakpoints for pages
pablonoel 594006d
Merge branch 'feature/new-pages' of https://github.com/Half-Integer/d…
pablonoel b368f27
fix some shadow biting
pablonoel aebdbdb
Fix menu position
pablonoel 6bbbb36
Visual improvements on Build page components
pablonoel 7690674
Update to header loader offsets.
nick-next 8932490
Added in template boolean for the ability to selectively show and hid…
nick-next a8ab0e7
Add extra padding to mobile menu to avoid cropping content
pablonoel dd6ba42
Merge branch 'feature/new-pages' of https://github.com/Half-Integer/d…
pablonoel 5dfa86c
Update Menu size
pablonoel e2f07f7
Flipping of about and build pages.
nick-next c65b305
Merge remote-tracking branch 'dc/new-homepage' into new-homepage
nick-next File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Scaffolding for the two new pages to be built: a revamp of the about …
…page, and the "Build your own Data Commmons" page.
commit c9b6dae0324225131930873b2a50a4c929a7468a
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
{# | ||
Copyright 2024 Google LLC | ||
|
||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
|
||
http://www.apache.org/licenses/LICENSE-2.0 | ||
|
||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
#} | ||
{%- extends BASE_HTML -%} | ||
|
||
{% set main_id = 'build' %} | ||
{% set page_id = 'page-build' %} | ||
{% set title = 'Build your own Data Commons' %} | ||
|
||
{% block head %} | ||
<link rel="stylesheet" href={{url_for('static', filename='css/build.min.css', t=config['VERSION'])}}> | ||
<script src={{url_for('static', filename='build.js', t=config['VERSION'])}} async></script> | ||
{% endblock %} | ||
|
||
{% block content %} | ||
|
||
<div id="app-container"> | ||
</div> | ||
|
||
{% endblock %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
/** | ||
* Copyright 2023 Google LLC | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
/* Styles for the about page */ | ||
@import "base"; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
/** | ||
* Copyright 2023 Google LLC | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nit: 2024 |
||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
/* Styles for the about page */ | ||
@import "base"; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
/** | ||
* Copyright 2024 Google LLC | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
/** | ||
* Main component for the about page | ||
*/ | ||
|
||
import React, { ReactElement } from "react"; | ||
|
||
import { Routes } from "../../shared/types/base"; | ||
import SplashQuote from "./components/splash_quote"; | ||
|
||
interface AppProps { | ||
//the routes dictionary - this is used to convert routes to resolved urls | ||
routes: Routes; | ||
} | ||
|
||
/** | ||
* Application container | ||
*/ | ||
export function App({ routes }: AppProps): ReactElement { | ||
return ( | ||
<> | ||
<SplashQuote /> | ||
</> | ||
); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
/** | ||
* Copyright 2024 Google LLC | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
import React, { ReactElement } from "react"; | ||
|
||
/** | ||
* A component to render the splash quote of the about page. | ||
*/ | ||
|
||
const SplashQuote = (): ReactElement => { | ||
return ( | ||
<div> | ||
<p> | ||
“Every moment around the world people and organizations are generating | ||
data that can be extraordinary useful and I think we have to find the | ||
way to harness that to solve problems. The challenge is that a lot of | ||
this data is very fragmented.” | ||
</p> | ||
<p className="byline"> | ||
James Manyika, Senior Vice President, Research, Technology & Society at | ||
</p> | ||
</div> | ||
); | ||
}; | ||
|
||
export default SplashQuote; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
/** | ||
* Copyright 2024 Google LLC | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
/** | ||
* Entry point for the about page. | ||
*/ | ||
|
||
import React from "react"; | ||
import ReactDOM from "react-dom"; | ||
|
||
import { loadLocaleData } from "../../i18n/i18n"; | ||
import { extractRoutes } from "../base/utilities/utilities"; | ||
import { App } from "./app"; | ||
|
||
window.addEventListener("load", (): void => { | ||
loadLocaleData("en", [import("../../i18n/compiled-lang/en/units.json")]).then( | ||
() => { | ||
renderPage(); | ||
} | ||
); | ||
}); | ||
|
||
function renderPage(): void { | ||
const routes = extractRoutes(); | ||
|
||
ReactDOM.render( | ||
React.createElement(App, { | ||
routes, | ||
}), | ||
document.getElementById("app-container") | ||
); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
/** | ||
* Copyright 2024 Google LLC | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
/** | ||
* Main component for the build your own Data Commons page | ||
*/ | ||
|
||
import React, { ReactElement } from "react"; | ||
|
||
import { Routes } from "../../shared/types/base"; | ||
import Hero from "./components/hero"; | ||
|
||
interface AppProps { | ||
//the routes dictionary - this is used to convert routes to resolved urls | ||
routes: Routes; | ||
} | ||
|
||
/** | ||
* Application container | ||
*/ | ||
export function App({ routes }: AppProps): ReactElement { | ||
return ( | ||
<> | ||
<Hero /> | ||
</> | ||
); | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit: 2024