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.

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

Homepage #75

Open
wants to merge 84 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
f474247
Merge pull request #2 from SHPE-UTDallas/dev
gabriel-flynn Nov 7, 2020
9a30f04
initial branch commit
rigrergl Nov 10, 2020
18c70c9
made some of the initial navbar, still needs some work
rigrergl Nov 10, 2020
296655c
added some color variables and used them for the navBar
rigrergl Nov 10, 2020
60f4441
added top bar with some info
rigrergl Nov 10, 2020
c5c1d5b
changed the theme colors, added the SHPE logo
rigrergl Dec 11, 2020
b43b8fd
drop-down navbar items also hover a different color now
rigrergl Dec 11, 2020
016d012
fixed a typo on the _variables.css
rigrergl Dec 13, 2020
8425495
Update components/Layout.tsx
rigrergl Dec 17, 2020
9a88232
Update components/Layout.tsx
rigrergl Dec 17, 2020
6e03eeb
Update pages/index.tsx
rigrergl Dec 17, 2020
567a27b
Update theming/_variables.scss
rigrergl Dec 17, 2020
6596eb4
Merge branch 'dev' into navBar
rigrergl Dec 17, 2020
5501500
fixed some of the merging
rigrergl Dec 17, 2020
b15f2ab
removed the users navbar tabs
rigrergl Dec 17, 2020
6771270
removed some unused variables (this was my bad i forgot to delete the…
rigrergl Dec 17, 2020
ea63232
fixed some of the centering issues that resulted from the merge betwe…
rigrergl Dec 17, 2020
1bb372e
Created a newsletter sign up page
ev168400 Dec 18, 2020
67c2c68
Ran prettier on layout.tsx
gabriel-flynn Dec 18, 2020
e8beb9e
Merge remote-tracking branch 'origin/dev' into footer
gabriel-flynn Dec 18, 2020
5fa5dd6
Made the footer stick to the bottom of the page
gabriel-flynn Dec 18, 2020
1bc3143
Remove unused import
gabriel-flynn Dec 18, 2020
bb7637a
Fix spacing
gabriel-flynn Dec 18, 2020
361054e
Remove test/duplicate component
gabriel-flynn Dec 18, 2020
85b60be
Fixed page styling
ev168400 Dec 18, 2020
e58b54e
updated newsletter for navbar
ev168400 Dec 19, 2020
4af4134
Merge remote-tracking branch 'origin/dev' into navBar
rigrergl Dec 19, 2020
49eab40
Merge branch 'navBar' of https://github.com/SHPE-UTDallas/Website-Red…
rigrergl Dec 19, 2020
b9519ca
Merge remote-tracking branch 'origin/footer' into navBar
rigrergl Dec 19, 2020
054a5cf
Fix styling on login page
gabriel-flynn Dec 20, 2020
1cdce5e
Fix login page formatting
gabriel-flynn Dec 20, 2020
7fa6002
Merge branch 'footer' into navBar
rigrergl Dec 21, 2020
86b5f9d
added gradient background and level element
rigrergl Dec 21, 2020
7d3237b
added newsletter and sponsor buttons, as well as some layout progress
rigrergl Dec 21, 2020
6826cfc
added the intro welcome lorem ipsum paragraph
rigrergl Dec 21, 2020
546cf6e
added the card (will be used for either the instagram iframe or the n…
rigrergl Dec 22, 2020
bf45ed3
added increased shadow on card hover
rigrergl Dec 22, 2020
42acf3a
nothing to see here
rigrergl Dec 22, 2020
d5fe53e
fixed some alignment issues on smaller resolutions
rigrergl Dec 22, 2020
03b7867
added the section divider line and the little temoc icon
rigrergl Dec 23, 2020
85c8809
added a little hover shadow effect on the temoc icon
rigrergl Dec 23, 2020
4eea0ec
added a margin below the homepage-tile for smaller resolution (so it …
rigrergl Dec 23, 2020
747cdf0
removed the hover shadow from temoc
rigrergl Dec 23, 2020
b84b56d
added the three benefits text below temoc
rigrergl Dec 23, 2020
9402322
added the bottom line to the benefits section
rigrergl Dec 23, 2020
0bdcf25
made the intro paragraph text a bit more gray
rigrergl Dec 23, 2020
11a5f21
started working on the footer (wrong branch I know working on fixing …
rigrergl Dec 25, 2020
980ba3c
added the three centered columns of the footer
rigrergl Dec 25, 2020
379f48d
added the navigation links
rigrergl Dec 25, 2020
368539a
added some of the footer text formatting (still working on it)
rigrergl Dec 25, 2020
69c0e61
added some responsiveness to the footer (still working on it)
rigrergl Dec 25, 2020
258444d
centered stuff inside the footer columns
rigrergl Dec 25, 2020
8735d39
added the google calendar into the homepage
rigrergl Dec 25, 2020
825c049
removed some leftover debugging code
rigrergl Dec 25, 2020
97409e4
centered the calendar in the homepage
rigrergl Dec 25, 2020
e774127
added the social media icons with links
rigrergl Dec 25, 2020
9044b03
ran prettier on Layout.tsx
rigrergl Dec 25, 2020
9b5d428
added a hover effect on the social media icons, fixed their responsiv…
rigrergl Dec 25, 2020
d916ed1
cleaned up some of the social media icons code
rigrergl Dec 26, 2020
3c0097f
Merge branch 'footer' into homepage
rigrergl Dec 26, 2020
f1c26f2
got rid of the extra division on the homepage-tile
rigrergl Dec 26, 2020
57aa36b
refactored the footer link css so that it does not affect the global …
rigrergl Dec 26, 2020
1be7815
now the Bylaws link in the footer opens in a new tab. (shouldve done …
rigrergl Dec 26, 2020
40e6a46
added embedded instagram post
Leonardo-Duenes Jan 2, 2021
3e01e24
Merge branch 'newsletter' into homepage
rigrergl Jan 6, 2021
978aa55
turned newsletter into component in homepage
techmin Jan 6, 2021
f479ecb
removed absolute dimenssion on newsletter tile
techmin Jan 6, 2021
aed3339
fixed some of the text wrapping in the newsletter form component that…
rigrergl Jan 14, 2021
f5411be
fixed the responsiveness of the homepage newsletter form
rigrergl Jan 14, 2021
ccbc688
fixed calendar width and height. Refactored code so that calendar is …
rigrergl Jan 14, 2021
3469199
Merge branch 'dev' into homepage
rigrergl Jan 14, 2021
cdf5046
deleted the pages/login.tsx (login page is now located at pages/auth/…
rigrergl Jan 23, 2021
a88ce54
refactored the media queries to be inside the selectors (except for t…
rigrergl Jan 23, 2021
cf95935
added the changes suggested in this comment: https://github.com/SHPE-…
rigrergl Jan 23, 2021
e075233
put all the footer stuff together in theming/_variables.scss
rigrergl Jan 23, 2021
5b3e530
delete package-lock.json
rigrergl Jan 23, 2021
3ba2a4c
deleted package-lock.json
rigrergl Jan 23, 2021
fa52eba
Merge branch 'instagram-feed' into homepage
rigrergl Jan 23, 2021
899643e
replaced the Newsletter component in the homepage with the InstagramF…
rigrergl Jan 23, 2021
63883a7
removed the Newsletter component that had been created for the homepage
rigrergl Jan 23, 2021
c001d08
fixed some of the spacing with the new Instagram component
rigrergl Jan 24, 2021
9cdd4e4
changed the Subscribe to our Newsletter button into Become a member (…
rigrergl Jan 24, 2021
2960f01
Merge branch 'dev' into homepage
rigrergl Jan 24, 2021
8d34241
Removed pig latin
ev168400 Jun 20, 2021
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
22 changes: 7 additions & 15 deletions pages/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,9 @@ const IndexPage = () => (
color: "rgba(0, 0, 0, 0.61)",
}}
>
Value proposition 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. Duis aute irure dolor in reprehenderit in voluptate
velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint
occaecat cupidatat non proident, sunt in culpa qui officia
deserunt mollit anim id est laborum
Welcome to SHPE at UTD's brand new website! We are a chapter built to empower our members to pursue their passions
Whether you are a student looking to get involved or a company representative seeing how you may support us, we invite you
to take a look around at all the exciting things we do.
</p>

<div className="columns" style={{ marginTop: "100px" }}>
Expand Down Expand Up @@ -125,13 +120,10 @@ const IndexPage = () => (
</div>

<p className="is-size-4 benefits-p">
Benefits 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. Duis aute irure dolor in reprehenderit in
voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur
sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt
mollit anim id est laborum
The Society of Hispanic Professional Engineers (SHPE) is the largest association in the nation for Hispanics
in the STEM community. This organization offers both students and professionals mentorship, training, and programming.
SHPE's mission is to change lives by empowering the Hispanic community to realize its fullest potential and to impact the world
through STEM awareness, access, support, and development.
</p>

<div className="temoc-level">
Expand Down
25 changes: 24 additions & 1 deletion theming/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,28 @@ $column-gap: 5px;
line-height: 56px;
text-align: left;
}
.intro {
margin-right: 25% !important;

/* For mobile phones: */
@media only screen and (max-width: 768px) {
margin-right: 0 !important;
}
}

.homepage-tile {
width: 100%;
min-width: 300px;
overflow-x: hidden;

/* For mobile phones: */
@media only screen and (max-width: 768px) {
margin-bottom: 150px !important;
}
}

.benefits-text {
color: #0070c0;

.social-media-component {
}
Expand Down Expand Up @@ -255,4 +277,5 @@ div .officer:hover span .email {
z-index: 1;
}

/////////////////////////////////////////////
}
////////////////////////////////////////////