-
Notifications
You must be signed in to change notification settings - Fork 70
Chai ee Project 1 PTBC5 #12
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
Open
Flashrob
wants to merge
21
commits into
rocketacademy:main
Choose a base branch
from
LoyChaiEe:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
b2aecb7
initial commit
LoyChaiEe 0d17e65
MVP of Hero component done, need to do css
LoyChaiEe 8065413
nil
LoyChaiEe a1e6220
navbar done but transition not smooth, likeheaders are covering up(n…
LoyChaiEe 223be36
initiate about component
LoyChaiEe a9bd90e
initialise education
LoyChaiEe 5ea46ac
finsihed base
LoyChaiEe c7298e2
mvp done: project, skills, contact, about
LoyChaiEe 7fd9d66
mvp for all components done, left styling for all
LoyChaiEe 96dc9a4
added hero for mobile
LoyChaiEe bab30fe
debugged hero component
LoyChaiEe be01421
integrated AOS
LoyChaiEe 0c334c0
minor styling to fonts and tabs
LoyChaiEe f6009e7
finishedd styling for about navbar contact hero andd skill comp. styl…
LoyChaiEe 4470571
styling for work and education done, content done too.
LoyChaiEe 0a9c3cb
PC version website done. Left work andd education for mobile
LoyChaiEe f32f75d
Project done. Minor tweaks incoming
LoyChaiEe 1d567c0
flicker navbar bug fixedd
LoyChaiEe fa23b71
minor styling tweakedd
LoyChaiEe bf3a22b
minor tweaks
LoyChaiEe e13f05e
test file for testing git push --force
LoyChaiEe 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
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -24,9 +24,42 @@ | |
| work correctly both with client-side routing and a non-root public URL. | ||
| Learn how to configure a non-root public URL by running `npm run build`. | ||
| --> | ||
| <link rel="preconnect" href="https://fonts.googleapis.com" /> | ||
| <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin /> | ||
| <link | ||
| href="https://fonts.googleapis.com/css2?family=Share+Tech+Mono&display=swap" | ||
| rel="stylesheet" | ||
| /> | ||
| <link rel="preconnect" href="https://fonts.googleapis.com" /> | ||
| <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin /> | ||
| <link | ||
| href="https://fonts.googleapis.com/css2?family=Rubik+Mono+One&family=Share+Tech+Mono&display=swap" | ||
| rel="stylesheet" | ||
| /> | ||
| <link rel="preconnect" href="https://fonts.googleapis.com"> | ||
| <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin> | ||
| <link href="https://fonts.googleapis.com/css2?family=Monoton&family=Rubik+Mono+One&family=Share+Tech+Mono&display=swap" rel="stylesheet"> | ||
| <title>Rocket Bootcamp Project</title> | ||
| </head> | ||
| <body> | ||
| <script | ||
| src="https://unpkg.com/react/umd/react.production.min.js" | ||
| crossorigin | ||
| ></script> | ||
|
|
||
| <script | ||
| src="https://unpkg.com/react-dom/umd/react-dom.production.min.js" | ||
| crossorigin | ||
| ></script> | ||
|
Comment on lines
+45
to
+53
Author
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. I don't think you need to load react via a CDN script, if you are running this app on react already :)! |
||
|
|
||
| <script | ||
| src="https://unpkg.com/react-bootstrap@next/dist/react-bootstrap.min.js" | ||
| crossorigin | ||
| ></script> | ||
|
|
||
| <script> | ||
| var Alert = ReactBootstrap.Alert; | ||
| </script> | ||
| <noscript>You need to enable JavaScript to run this app.</noscript> | ||
| <div id="root"></div> | ||
| <!-- | ||
|
|
||
This file contains hidden or 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 |
|---|---|---|
| @@ -1,19 +1,289 @@ | ||
| .App { | ||
| text-align: center; | ||
| * { | ||
| box-sizing: border-box; | ||
| } | ||
|
|
||
| body { | ||
| margin: 0px; | ||
| } | ||
|
|
||
| .App-logo { | ||
| height: 40vmin; | ||
| pointer-events: none; | ||
| .App { | ||
| background-color: #112240; | ||
| } | ||
|
|
||
| .App-header { | ||
| background-color: #282c34; | ||
| min-height: 100vh; | ||
| display: flex; | ||
| flex-direction: column; | ||
| align-items: center; | ||
| justify-content: center; | ||
| font-size: calc(10px + 2vmin); | ||
| color: white; | ||
| gap: 5vh; | ||
| } | ||
|
|
||
| a { | ||
| text-decoration: none !important; | ||
| } | ||
|
|
||
| @media only screen and (min-width: 1150px) { | ||
| body #home { | ||
| background-size: cover; | ||
| background-image: url(../src/assets/images/hero1.jpg); | ||
| background-repeat: no-repeat; | ||
| align-items: flex-start; | ||
| } | ||
| body #skillswrap { | ||
| gap: 2vw; | ||
| flex-direction: row; | ||
| } | ||
|
|
||
| body .contact-text-align { | ||
| text-align: center; | ||
| } | ||
| } | ||
|
|
||
| @media only screen and (min-width: 720px) and (max-width: 1150px) { | ||
| body #home { | ||
| background-image: url(../src/assets/images/hero1.jpg); | ||
| background-repeat: no-repeat; | ||
| background-size: contain; | ||
| align-items: flex-start; | ||
| height: clamp(30vh, 100vw, 50vh); | ||
| } | ||
| body #skillswrap { | ||
| gap: 5vw; | ||
| flex-direction: row; | ||
| } | ||
| body .HeroLeft { | ||
| position: absolute; | ||
| top: 50%; | ||
| transform: translate(15%, -65%); | ||
| } | ||
| body .contact-text-align { | ||
| text-align: center; | ||
| } | ||
| } | ||
| /* NavBar CSS */ | ||
|
|
||
| .fixed-top { | ||
| position: sticky; | ||
| top: 0; | ||
| background-color: black !important; | ||
| } | ||
|
|
||
| /*Hero CSS */ | ||
|
|
||
| #home { | ||
| flex-direction: column; | ||
| background-color: black; | ||
| width: 100vw; | ||
| height: 100vh; | ||
| position: relative; | ||
| padding-top: 10vh; | ||
| padding-left: 0px; | ||
| padding-right: 0px; | ||
| margin: 0px 0px; | ||
| } | ||
|
|
||
| .hero-button { | ||
| font-size: 1.8vw; | ||
| padding-left: 16px; | ||
| background-color: transparent; | ||
| border-color: #20c20e; | ||
| font-weight: bolder; | ||
| color: #20c20e; | ||
| } | ||
|
|
||
| .HeroLeft { | ||
| position: absolute; | ||
| top: 50%; | ||
| transform: translate(15%, -65%); | ||
| } | ||
|
|
||
| /* About Me CSS */ | ||
|
|
||
| #about { | ||
| width: 80vw; | ||
| display: flex; | ||
| flex-direction: column; | ||
| align-items: center; | ||
| justify-content: center; | ||
| padding-top: 15vh; | ||
| } | ||
|
|
||
| .logo { | ||
| width: 5vh; | ||
| height: 5vh; | ||
| object-fit: cover; | ||
| } | ||
|
|
||
| .logo-small { | ||
| width: max(16px, 1.5vw); | ||
| height: max(16px, 1.5vw); | ||
| } | ||
|
|
||
| /* Skills CSS */ | ||
|
|
||
| #skills { | ||
| width: 100vw; | ||
| flex-direction: column; | ||
| padding-top: 15vh | ||
| } | ||
|
|
||
| #skillswrap { | ||
| gap: 0vh; | ||
| flex-direction: column; | ||
| } | ||
|
|
||
| .expert { | ||
| background-color: #900603 !important; | ||
| } | ||
|
|
||
| .intermediate { | ||
| background-color: aqua !important; | ||
| } | ||
|
|
||
| .advanced { | ||
| background-color: #51087e !important; | ||
| } | ||
|
|
||
| .basics { | ||
| background-color: #028a0f !important; | ||
| } | ||
|
|
||
| /* Project CSS*/ | ||
|
|
||
| #project { | ||
| width: 100vw; | ||
| padding-top: 15vh; | ||
| flex-direction: column; | ||
| max-width: 700px; | ||
| } | ||
|
|
||
| .cardSize { | ||
| width: max(240px, 20vw); | ||
| border-radius: 1vw !important; | ||
| } | ||
|
|
||
| .link-button { | ||
| background-color: transparent !important; | ||
| color: #028a0f !important; | ||
| border-width: 3px !important; | ||
| border-color: #028a0f !important; | ||
| } | ||
|
|
||
| .link-button:hover { | ||
| background-color: #028a0f !important; | ||
| color: black !important; | ||
| } | ||
|
|
||
| /* Education Tab CSS */ | ||
|
|
||
| #education { | ||
| flex-direction: column; | ||
| padding-top: 15vh; | ||
| } | ||
|
|
||
| /* Work Tab CSS */ | ||
|
|
||
| #work { | ||
| flex-direction: column; | ||
| padding-top: 15vh; | ||
| } | ||
|
|
||
| /* Contact CSS */ | ||
| #contact { | ||
| display: flex; | ||
| align-items: center; | ||
| justify-content: center; | ||
| flex-direction: column; | ||
| padding-top: 0vh; | ||
| max-width: 800px; | ||
| } | ||
|
|
||
| #contact-form { | ||
| display: flex; | ||
| align-items: center; | ||
| justify-content: center; | ||
| flex-direction: column; | ||
| gap: 1vh; | ||
| } | ||
|
|
||
| #form-email { | ||
| width: 70vw; | ||
| max-width: 500px; | ||
| background-color: transparent; | ||
| border: solid; | ||
| border-color: #028a0f; | ||
| color: #028a0f; | ||
| border-radius: 1vh; | ||
| padding-left: 0.5vw; | ||
| } | ||
|
|
||
| #form-message { | ||
| width: 70vw; | ||
| max-width: 500px; | ||
| height: 30vh; | ||
| max-height: 200px; | ||
| background-color: transparent; | ||
| border: solid; | ||
| border-color: #028a0f; | ||
| color: #028a0f; | ||
| border-radius: 1vh; | ||
| padding-left: 0.5vw; | ||
| } | ||
|
|
||
| .contact-text-align { | ||
| text-align: left; | ||
| font-size: max(1.2vw, 20px); | ||
| } | ||
|
|
||
| .submit-button { | ||
| width: 100px; | ||
| height: 40px; | ||
| margin-bottom: 5vh; | ||
| border: solid; | ||
| border-color: #028a0f; | ||
| border-radius: 1vw; | ||
| background-color: transparent; | ||
| color: #028a0f; | ||
| font-size: clamp(16px, 1.5vh, 32px); | ||
| font-weight: bold; | ||
| } | ||
|
|
||
| .submit-button:hover { | ||
| color: black; | ||
| background-color: #028a0f; | ||
| } | ||
|
|
||
| /* Misc CSS */ | ||
|
|
||
| .centerDiv { | ||
| display: flex; | ||
| align-items: center; | ||
| justify-content: center; | ||
| } | ||
|
|
||
| .col label { | ||
| padding: 1vh; | ||
| } | ||
|
|
||
| .nav-pills .nav-link.active { | ||
| background-color: aqua !important; | ||
| color: navy !important; | ||
| } | ||
|
|
||
| .carousel-indicators button { | ||
| width: min(5vw, 2rem) !important; | ||
| height: min(5vw, 2rem) !important; | ||
| border-radius: 50%; | ||
| } | ||
|
|
||
| .carousel-indicators button:not(:first-child) { | ||
| margin-left: 1rem !important; | ||
| } | ||
|
|
||
| .carousel-indicators .active { | ||
| background-color: #028a0f !important; | ||
| } | ||
|
|
||
| .navbar-collapse { | ||
| height: auto !important; | ||
| } |
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.
Duplicate link tags