Skip to content

Commit f861530

Browse files
Minor UI improvements (#64)
1 parent 904fbd7 commit f861530

File tree

9 files changed

+83
-25
lines changed

9 files changed

+83
-25
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.mp4 filter=lfs diff=lfs merge=lfs -text

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
"react": "18.2.0",
2424
"react-dom": "18.2.0",
2525
"react-router-dom": "6.3.0",
26-
"react-scripts": "5.0.1",
26+
"react-player": "2.16.0",
27+
"react-scripts": "^5.0.1",
2728
"react-scroll": "1.8.7",
2829
"typescript": "4.8.3",
2930
"web-vitals": "2.1.4"
@@ -34,7 +35,6 @@
3435
"test": "react-scripts test",
3536
"eject": "react-scripts eject"
3637
},
37-
3838
"browserslist": {
3939
"production": [
4040
">0.2%",
@@ -69,5 +69,6 @@
6969
"src/**/*.+(js|jsx|ts|tsx|css|sass|less|json)": [
7070
"prettier --write"
7171
]
72-
}
72+
},
73+
"packageManager": "[email protected]+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
7374
}

public/videos/IMG_3290.mp4

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:13b1043a59764e613bb60283ffe3ca16e53a86cdcd5e64f4d052561234d1981c
3+
size 60170098

src/components/Career/About.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,11 @@ const About: React.FC<Props> = () => {
2929
</figure>
3030
</div>
3131
<div className="column is-three-quarters">
32-
<p className="job-desc"></p>
3332
<p className="job-desc">
3433
Aside from programming, my passions include powerlifting,
35-
running, hiking, watching MMA, and eating the best burrito
36-
that a town has to offer. Catch me around the California bay
37-
area!
34+
cooking, hiking, martial arts, and eating the best burrito
35+
that a town has to offer. Catch me around the California Bay
36+
Area!
3837
</p>
3938

4039
<div className="container has-text-centered">

src/components/Coach/ContactForm.tsx

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
import { faInstagram } from "@fortawesome/free-brands-svg-icons";
22
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
3+
import selfPortrait from "assets/me.jpg";
34
import { CSSinJS } from "common/types";
45

56
import kwesforms from "kwesforms";
67
import { useEffect } from "react";
78

89
const ContactForm: React.FC = () => {
9-
const styles: CSSinJS = { socialMedia: { marginTop: "10px" } };
10+
const styles: CSSinJS = {
11+
socialMedia: { marginTop: "10px" },
12+
selfie: { justifyContent: "center", width: "55%" },
13+
};
1014

1115
useEffect(() => {
1216
kwesforms.init();
@@ -16,14 +20,19 @@ const ContactForm: React.FC = () => {
1620
<div className="has-text-centered">
1721
<div className="columns is-8 is-centered">
1822
<div
19-
className="column is-4 has-text-centered is-vcentered"
23+
className="column is-4 is-vcentered"
2024
data-aos="fade-in"
2125
data-aos-delay="100"
2226
>
27+
<figure style={styles["selfie"]} className="image is-inline-block">
28+
<img src={selfPortrait} alt="me" />
29+
</figure>
2330
<h1 className="title is-1">Let's Connect</h1>
31+
2432
<p className="is-size-5 ">
25-
I would love to learn about your exercise aspirations. Shoot me a
26-
message and I'll get back to you soon!
33+
I would love to learn about your exercise aspirations. Message me on
34+
Instagram or fill out the message form here and I'll get back to you
35+
soon!
2736
</p>
2837
<div style={styles["socialMedia"]}>
2938
<p className="bd-notification is-primary">

src/components/Coach/CoreValues.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const CoreValues: React.FC = () => {
77
const styles: CSSinJS = {
88
figure: { marginLeft: "auto", marginRight: "auto" },
99
valueCaption: { fontSize: "18px", fontWeight: 600, marginTop: "5%" },
10-
valueSubCaption: { fontSize: "16px", marginTop: "1%", fontStyle: "italic" },
10+
valueSubCaption: { fontSize: "16px", marginTop: "1%" },
1111
};
1212
return (
1313
<section id="core-values">

src/components/Coach/Hero.tsx

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { faInstagram } from "@fortawesome/free-brands-svg-icons";
22
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
3-
import selfPortrait from "assets/me.jpg";
43
import { CSSinJS } from "common/types";
54
import "components/Career/Hero.css";
5+
import ReactPlayer from "react-player";
66

77
function Hero() {
88
const styles: CSSinJS = { selfie: { justifyContent: "center" } };
@@ -18,7 +18,17 @@ function Hero() {
1818
data-aos-delay="100"
1919
>
2020
<figure style={styles["selfie"]} className="image">
21-
<img src={selfPortrait} alt="me" />
21+
<div className="player-wrapper">
22+
<ReactPlayer
23+
className="react-player fixed-bottom"
24+
url="videos/IMG_3290.mp4"
25+
width="100%"
26+
height="100%"
27+
playing={true}
28+
loop={true}
29+
muted={true}
30+
/>
31+
</div>
2232
</figure>
2333
</div>
2434

@@ -34,17 +44,21 @@ function Hero() {
3444
a NASM Certified Personal Trainer and Powerlifting Coach with
3545
over a decade of lifting experience.
3646
</strong>{" "}
37-
I have coached numerous powerlifting athletes who placed in the
38-
top 3 of their division, with some winning best overall lifter.
39-
I have also helped clients reached their weight-loss goals
40-
through habit-based nutrition and exercise programs.
47+
I've coached numerous powerlifting athletes over the years,
48+
including those who placed top three in their division, with
49+
some winning best overall lifter. I've also helped clients
50+
reached their weight-loss goals through habit-based nutrition
51+
and exercise programs.
4152
</p>
4253
<p id="hero-description">
43-
My coaching philosophy focuses on deeply understanding each of
44-
my client's goals and life circumstances to provide
45-
individualized services. As a continuous learner, I love to
46-
share my passion in exercise with everyone. Enough said, let's
47-
link up and make some gains together! 💪🙌
54+
<strong>
55+
My coaching philosophy focuses on deeply understanding
56+
each of my client's goals and life circumstances to provide
57+
individualized services.
58+
</strong>{" "}
59+
I'm a life-long continuous learner who loves to share my passion
60+
in health and fitness with everyone. Enough said, let's link up
61+
and make some gains together! 💪🙌
4862
</p>
4963
<div className="hero-icon">
5064
<a

src/components/Coach/Services/System.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const System: React.FC = () => {
1818
iconSrc: barbell,
1919
name: "Powerlifting Training and Meet Prep",
2020
bullets: [
21-
"Off-season programming based on ideal volume, frequency, and periodization scheme for each athlete",
21+
"Off-season programming based on athlete-specific volume, frequency, and periodization scheme",
2222
"Meet prep includes a 4-6 week peaking program, weekly calls, and attempt strategizing",
2323
],
2424
},

yarn.lock

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3635,6 +3635,11 @@ deep-is@^0.1.3, deep-is@~0.1.3:
36353635
resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
36363636
integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
36373637

3638+
deepmerge@^4.0.0:
3639+
version "4.3.1"
3640+
resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
3641+
integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==
3642+
36383643
deepmerge@^4.2.2:
36393644
version "4.2.2"
36403645
resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
@@ -6183,6 +6188,11 @@ listr2@^4.0.5:
61836188
through "^2.3.8"
61846189
wrap-ansi "^7.0.0"
61856190

6191+
load-script@^1.0.0:
6192+
version "1.0.0"
6193+
resolved "https://registry.yarnpkg.com/load-script/-/load-script-1.0.0.tgz#0491939e0bee5643ee494a7e3da3d2bac70c6ca4"
6194+
integrity sha512-kPEjMFtZvwL9TaZo0uZ2ml+Ye9HUMmPwbYRJ324qF9tqMejwykJ5ggTyvzmrbBeapCAbk98BSbTeovHEEP1uCA==
6195+
61866196
loader-runner@^4.2.0:
61876197
version "4.3.0"
61886198
resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1"
@@ -6338,6 +6348,11 @@ memfs@^3.1.2, memfs@^3.4.3:
63386348
dependencies:
63396349
fs-monkey "^1.0.3"
63406350

6351+
memoize-one@^5.1.1:
6352+
version "5.2.1"
6353+
resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.2.1.tgz#8337aa3c4335581839ec01c3d594090cebe8f00e"
6354+
integrity sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==
6355+
63416356
63426357
version "1.0.1"
63436358
resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
@@ -7649,6 +7664,11 @@ react-error-overlay@^6.0.11:
76497664
resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.11.tgz#92835de5841c5cf08ba00ddd2d677b6d17ff9adb"
76507665
integrity sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg==
76517666

7667+
react-fast-compare@^3.0.1:
7668+
version "3.2.2"
7669+
resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.2.tgz#929a97a532304ce9fee4bcae44234f1ce2c21d49"
7670+
integrity sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ==
7671+
76527672
react-is@^16.13.1:
76537673
version "16.13.1"
76547674
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
@@ -7664,6 +7684,17 @@ react-is@^18.0.0:
76647684
resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
76657685
integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==
76667686

7687+
7688+
version "2.16.0"
7689+
resolved "https://registry.yarnpkg.com/react-player/-/react-player-2.16.0.tgz#89070700b03f5a5ded9f0b3165d4717390796481"
7690+
integrity sha512-mAIPHfioD7yxO0GNYVFD1303QFtI3lyyQZLY229UEAp/a10cSW+hPcakg0Keq8uWJxT2OiT/4Gt+Lc9bD6bJmQ==
7691+
dependencies:
7692+
deepmerge "^4.0.0"
7693+
load-script "^1.0.0"
7694+
memoize-one "^5.1.1"
7695+
prop-types "^15.7.2"
7696+
react-fast-compare "^3.0.1"
7697+
76677698
react-refresh@^0.11.0:
76687699
version "0.11.0"
76697700
resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.11.0.tgz#77198b944733f0f1f1a90e791de4541f9f074046"
@@ -7684,7 +7715,7 @@ [email protected]:
76847715
dependencies:
76857716
history "^5.2.0"
76867717

7687-
7718+
react-scripts@^5.0.1:
76887719
version "5.0.1"
76897720
resolved "https://registry.yarnpkg.com/react-scripts/-/react-scripts-5.0.1.tgz#6285dbd65a8ba6e49ca8d651ce30645a6d980003"
76907721
integrity sha512-8VAmEm/ZAwQzJ+GOMLbBsTdDKOpuZh7RPs0UymvBR2vRk4iZWCskjbFnxqjrzoIvlNNRZ3QJFx6/qDSi6zSnaQ==

0 commit comments

Comments
 (0)