Merge branch 'main' into airbnb-experiences-clone

reactplay · Jan 17, 2024 · 6d2c867 · 6d2c867
2 parents 5b65e4d + 0db387d
commit 6d2c867
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 18 deletions.
diff --git a/package.json b/package.json
@@ -37,8 +37,8 @@
  "lodash": "^4.17.21",
  "lodash.memoize": "^4.1.2",
  "mathjs": "^11.11.2",
- "node-sass": "^8.0.0",
  "p5": "^1.7.0",
+ "plays": "^0.7.0",
  "react": "^18.2.0",
  "react-codemirror2": "^7.3.0",
  "react-color": "^2.19.3",
@@ -70,6 +70,7 @@
  "redux-persist": "^6.0.0",
  "remarkable": "^2.0.1",
  "reselect": "^4.1.8",
+ "sass": "^1.69.6",
  "styled-components": "^6.1.0",
  "swiper": "^9.4.1",
  "url": "^0.11.3",

diff --git a/src/App.css b/src/App.css
@@ -106,7 +106,7 @@ textarea {
 
 html,
 body {
- height: 100%;
+ height: auto;
  padding: 0;
  margin: 0;
  font-family: var(--ff-default);
@@ -356,6 +356,10 @@ small {
  }
 }
 
+.app-footer-text {
+ color: var(--color-neutral-80);
+}
+
 /* Buttons */
 .btn-default {
  border: solid 1px var(--color-neutral-60);

diff --git a/src/common/defaultBanner/DefaultBanner.jsx b/src/common/defaultBanner/DefaultBanner.jsx
@@ -43,9 +43,9 @@ const DefaultBanner = () => {
  </a>
  </div>
  <div className="body-desc">
- Check out our bouquet of events{' '}
+ Check out our bouquet of{' '}
  <Link className="home-anchor" target="_blank" to="https://hustles.reactplay.io/">
- <span className="text text-secondary">here</span>
+ <span className="text text-secondary">events</span>
  </Link>
  </div>
  </div>

diff --git a/src/common/footer/Footer.jsx b/src/common/footer/Footer.jsx
@@ -5,7 +5,7 @@ const Footer = () => {
  <footer className="app-footer text-center">
  <hr className="separater" />
  <div className="flex justify-center items-center py-2">
- <p>
+ <p className="app-footer-text">
  ReactPlay - The MIT License (MIT) Copyright &copy;
  {new Date().getFullYear()} . Powered by{' '}
  <Link className="text-link-default" to="/tech-stacks">

diff --git a/src/common/header/Header.jsx b/src/common/header/Header.jsx
@@ -96,6 +96,9 @@ const Header = () => {
 
  return (
  <>
+ {process.env.REACT_APP_ACTIVITIES_ON === 'true' && showHideBits.showActivityTimer && (
+ <Countdown date={new Date(1675209600000)} renderer={activityTimerRenderer} />
+ )}
  <header
  className={`app-header ${
  showHideBits.setHeaderStyle
@@ -116,11 +119,9 @@ const Header = () => {
  <div className="app-header-search">
  {showHideBits.showSearch && <SearchBox reset={reset} />}
  </div>
+
  <HeaderNav showBrowse={showHideBits.showBrowse} />
  </header>
- {process.env.REACT_APP_ACTIVITIES_ON === 'true' && showHideBits.showActivityTimer && (
- <Countdown date={new Date(1675209600000)} renderer={activityTimerRenderer} />
- )}
  </>
  );
 };

diff --git a/src/common/header/header.css b/src/common/header/header.css
@@ -21,7 +21,7 @@
 }
 
 .app-header-home {
- position: fixed;
+ position: sticky;
 }
 
 .app-header-home.app-header-home--promo {
@@ -503,7 +503,8 @@
  justify-content: center;
  background-color: #fad900;
  min-height: 32px;
- position: fixed;
+ position: sticky;
+ top: 0;
  font-size: var(--fs-sm);
  line-height: var(--fs-sm);
  z-index: 9;

diff --git a/src/common/home/HomeIdeas.jsx b/src/common/home/HomeIdeas.jsx
@@ -7,7 +7,12 @@ const HomeIdeas = () => {
  <div className="home-ideas">
  <FaLightbulb className="icon" color="var(--color-brand-primary)" size="48px" />
  <p className="ideas-lead">Not sure how to get started?</p>
- <p className="ideas-title">We have got lot of ideas</p>
+ <p className="title-primary">
+ We have got lot of{' '}
+ <strong>
+ <span>ideas</span>
+ </strong>
+ </p>
  <Link className="home-anchor" to="/ideas">
  <span className="text">Get started with some ideas</span>
  </Link>

diff --git a/src/common/home/Sponsors.jsx b/src/common/home/Sponsors.jsx
@@ -123,6 +123,7 @@ const Sponsors = () => {
  </a>
  ))} */}
  <a
+ aria-label="Sponsor"
  className="backers-cta"
  href="https://github.com/sponsors/reactplay"
  rel="noreferrer"

diff --git a/src/common/home/home.css b/src/common/home/home.css
@@ -10,7 +10,6 @@
  background: -webkit-linear-gradient(180deg, rgba(1, 4, 38, 1) 0%, rgba(76, 91, 94, 1) 100%);
  background: linear-gradient(180deg, rgba(1, 4, 38, 1) 0%, rgba(76, 91, 94, 1) 100%);
  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#010426", endColorstr="#4c5b5e", GradientType=1);
- padding: 6rem 0 2rem 0;
  width: 100%;
  overflow-x: hidden;
  min-height: 100vh;
@@ -24,7 +23,7 @@
 .app-home-body .body-title {
  margin-top: 3.2rem;
  margin-bottom: 1rem;
- font-family: var(--ff-accent);
+ font-family: var(--ff-accent); 
  font-size: var(--fs-xxl);
  color: var(--color-neutral-10);
  text-align: center;

diff --git a/src/plays/schulte-tables/styles.css b/src/plays/schulte-tables/styles.css
@@ -9,10 +9,6 @@
  flex-direction: column;
 }
 
-h1 {
- text-align: center;
-}
-
 .game-title {
  text-align: center;
  font-size: 4rem;
@@ -66,4 +62,4 @@ h1 {
  max-width: 500px;
  text-align: center;
  margin: 2rem auto;
-}
+}