all repos — caroster @ 9399a8cd66551ef4a7de57dff2798c37428a3981

[Octree] Group carpool to your event https://caroster.io

🐛 Set topbar and banner as sticky

#305
Tim Izzo tim@octree.ch
Mon, 22 Aug 2022 11:41:48 +0200
commit

9399a8cd66551ef4a7de57dff2798c37428a3981

parent

0d2ea7429f2b931b7cd6232d93efa930db9223d1

M backend/.gitignorebackend/.gitignore

@@ -115,4 +115,5 @@ build

.env .env.bckp .strapi-updater.json -restart.test+restart.test +dist/
M backend/yarn.lockbackend/yarn.lock

@@ -6758,6 +6758,16 @@ integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==

dependencies: parse-passwd "^1.0.0" +hpack.js@^2.1.6: + version "2.1.6" + resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2" + integrity sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ== + dependencies: + inherits "^2.0.1" + obuf "^1.0.0" + readable-stream "^2.0.1" + wbuf "^1.1.0" + html-encoding-sniffer@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3"

@@ -9822,6 +9832,11 @@ version "1.0.0"

resolved "https://registry.yarnpkg.com/oblivious-set/-/oblivious-set-1.0.0.tgz#c8316f2c2fb6ff7b11b6158db3234c49f733c566" integrity sha512-z+pI07qxo4c2CulUHCDf9lcqDlMSo72N/4rLUpRXf6fu+q8vjt8y0xS+Tlf8NTJDdTXHbdeO1n3MlbctwEoXZw== +obuf@^1.0.0, obuf@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" + integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== + on-finished@2.4.1, on-finished@^2.3.0: version "2.4.1" resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"

@@ -11239,7 +11254,7 @@ safe-buffer "~5.1.1"

string_decoder "~1.1.1" util-deprecate "~1.0.1" -readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: +readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==

@@ -13998,6 +14013,13 @@ neo-async "^2.5.0"

optionalDependencies: chokidar "^3.4.1" watchpack-chokidar2 "^2.0.1" + +wbuf@^1.1.0, wbuf@^1.7.3: + version "1.7.3" + resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df" + integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA== + dependencies: + minimalistic-assert "^1.0.0" wcwidth@^1.0.1: version "1.0.1"
M frontend/layouts/Default.tsxfrontend/layouts/Default.tsx

@@ -50,21 +50,22 @@ <Helmet>

<title>{pageTitle || menuTitle}</title> </Helmet> <Box display="flex" flexDirection="column" height="100vh" width="100%"> - <Headroom> + <Box position="sticky" top={0} zIndex={1100}> <Banner message={announcement} open={showBanner} onClear={onBannerClear} /> - {displayMenu && (menuTitle || menuActions) && ( - <GenericToolbar - title={menuTitle} - actions={menuActions} - goBack={goBack} - /> - )} {Topbar && <Topbar />} - </Headroom> + </Box> + {displayMenu && (menuTitle || menuActions) && ( + <GenericToolbar + title={menuTitle} + actions={menuActions} + goBack={goBack} + /> + )} + {children} </Box> </div>
M frontend/package.jsonfrontend/package.json

@@ -25,7 +25,6 @@ "next": "^11.0.0",

"next-pwa": "^5.2.21", "react": "^17.0.2", "react-dom": "^17.0.2", - "react-headroom": "^3.2.0", "react-helmet": "^6.1.0", "react-i18next": "^11.11.0", "react-joyride": "^2.3.2",
M frontend/yarn.lockfrontend/yarn.lock

@@ -6106,11 +6106,6 @@ ripemd160 "^2.0.1"

safe-buffer "^5.0.1" sha.js "^2.4.8" -performance-now@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" - integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow== - picocolors@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"

@@ -6218,7 +6213,7 @@ integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==

dependencies: asap "~2.0.3" -prop-types@^15.5.8, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1: +prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1: version "15.8.1" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==

@@ -6289,13 +6284,6 @@ integrity sha512-iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA==

dependencies: inherits "~2.0.3" -raf@^3.3.0: - version "3.4.1" - resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.1.tgz#0742e99a4a6552f445d73e3ee0328af0ff1ede39" - integrity sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA== - dependencies: - performance-now "^2.1.0" - randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"

@@ -6356,15 +6344,6 @@ is-lite "^0.8.1"

popper.js "^1.16.0" react-proptype-conditional-require "^1.0.4" tree-changes "^0.5.1" - -react-headroom@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/react-headroom/-/react-headroom-3.2.0.tgz#ff14d01343b850d02bf30624bfa2c7ed60c75558" - integrity sha512-8rbXBKN187DnPg8lyJa5IKZx9rA1DbkvO4X0F6A6lSGr54fr7CHphF84fxwlPbX93Uqs9daFt9q0j3fhC7RTEg== - dependencies: - prop-types "^15.5.8" - raf "^3.3.0" - shallowequal "^1.1.0" react-helmet@^6.1.0: version "6.1.0"

@@ -6859,11 +6838,6 @@ integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==

dependencies: inherits "^2.0.1" safe-buffer "^5.0.1" - -shallowequal@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8" - integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ== shebang-command@^2.0.0: version "2.0.0"