Skip to content
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.

Sign up for GitHub

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

Engineers/Technical Professionals Component #26

Merged
merged 11 commits into from
Jan 28, 2025
Merged

Engineers/Technical Professionals Component #26

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2739100
Tried fixing format issue
Raiden-Griff Jan 21, 2025
ce11736
Fixed format issue
Raiden-Griff Jan 21, 2025
6784c91
Merge branch 'armaniegonzalez/Engineers-technical-professionals-compo…
Raiden-Griff Jan 22, 2025
cd80f3f
Create Engineers: Technical Professionals Component.html
Raiden-Griff Jan 22, 2025
9ab61fe
Trying to correct the formatting issue
Raiden-Griff Jan 22, 2025
d279885
Fixed code from css to tailwind css
Raiden-Griff Jan 26, 2025
18b2f7b
Fixed formatting issue with prettier
Raiden-Griff Jan 26, 2025
4ac04ba
Delete Engineers: Technical Professionals Component.html
Raiden-Griff Jan 26, 2025
371ad95
Delete src/components/projects/research 2.tsx
Raiden-Griff Jan 26, 2025
3637458
Delete src/components/projects/professionals 2.tsx
Raiden-Griff Jan 26, 2025
85dbf4a
Delete src/components/projects/business 2.tsx
Raiden-Griff Jan 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 47 additions & 0 deletions Engineers: Technical Professionals Component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<!doctype html>
<html>
<head>
<title>Engineers/ Technical Professionals Component</title>
</head>
<body>
<style>
h1 {
font-family: "Arial", sans-serif;
font-size: 25px;
font-weight: normal;
padding-left: 15px;
display: inline-block;
}
.yellow-line {
display: inline-block;
width: 115px;
height: 2px;
background-color: #ffb81c;
margin-left: 5px;
vertical-align: text-top;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use tailwind css. we are keeping the code consistent so css is not allowed

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just changed it to tailwind css. I also deleted unnecessary files, as a few I attached the branch were not needed.

margin-top: 5px;
}

p {
font-family: "Arial", sans-serif;
font-size: 10.5px;
line-height: 1.4;
width: 33%;
margin-left: left;
margin-right: left;
padding: 2px;
padding-left: 18px;
text-align: left;
word-wrap: break-word;
}
</style>
</body>
<h1>Engineers/Technical Professionals</h1>
<div class="yellow-line"></div>
<p>
Lorem ipsum dolor sit amet, consectetur adispiscing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
quis nostrud exceritation ullamco laboris nisi ut alliquip ex ea commodo
consequat.
</p>
</html>
106 changes: 57 additions & 49 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
},
"devDependencies": {
"@eslint/js": "~9.8.0",
"@tanstack/eslint-plugin-query": "~5.53.0",
"@types/node": "~22.1.0",
"@types/react": "~18.3.3",
"@types/react-dom": "~18.3.0",
"@typescript-eslint/eslint-plugin": "~8.0.0",
"@typescript-eslint/parser": "~8.0.0",
"@tanstack/eslint-plugin-query": "~5.53.0",
"autoprefixer": "~10.4.19",
"eslint": "~9.8.0",
"eslint-config-prettier": "~9.1.0",
Expand Down
2 changes: 2 additions & 0 deletions src/app/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import Education from "@/components/home/education";
import Landing from "@/components/home/landing";
import News from "@/components/home/news";
import Welcome from "@/components/home/welcome";
import Professional from "@/components/projects/professionals";

const Home = () => {
return (
Expand All @@ -12,6 +13,7 @@ const Home = () => {
<About />
<Education />
<News />
<Professional />
</div>
);
};
Expand Down
53 changes: 53 additions & 0 deletions src/components/projects/professionals.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
import React from "react";

const Professionals = () => {
return (
<div>
<h1>Engineers/Technical Professionals</h1>
<div className="yellow-line"></div>
<p>
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim
veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
commodo consequat.
</p>

<style>
{`
h1 {
font-family: "Arial", sans-serif;
font-size: 25px;
font-weight: normal;
padding-left: 15px;
display: inline-block;
}

.yellow-line {
display: inline-block;
width: 115px;
height: 2px;
background-color: #ffb81c;
margin-left: 5px;
vertical-align: text-top;
margin-top: 5px;
}

p {
font-family: "Arial", sans-serif;
font-size: 10.5px;
line-height: 1.4;
width: 33%;
margin-left: left;
margin-right: left;
padding: 2px;
padding-left: 18px;
text-align: left;
word-wrap: break-word;
}
`}
</style>
</div>
);
};

export default Professionals;
Loading