-
Notifications
You must be signed in to change notification settings - Fork 0
Steven software work #29
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
StevenFireRose777
wants to merge
16
commits into
main
Choose a base branch
from
steven-software-work
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
16 commits
Select commit
Hold shift + click to select a range
8728722
inital
StevenFireRose777 859b3fc
check #1
StevenFireRose777 d99ab57
inital
StevenFireRose777 b3c3936
check #1
StevenFireRose777 32cd81c
Merge branch 'steven-software-work' of github.com:include-davis/sss i…
StevenFireRose777 a0e794d
final #1
StevenFireRose777 8b7f90f
final #2
StevenFireRose777 96d2b06
final #3
StevenFireRose777 67cf2ac
Final #3
StevenFireRose777 07d1b81
final #4
StevenFireRose777 57db666
Final #5
StevenFireRose777 0e28864
Final #6
StevenFireRose777 89e2f37
changes #1
StevenFireRose777 fd42b06
changes #2
StevenFireRose777 14a26d6
changes #3
StevenFireRose777 db8cfb3
changes #4
StevenFireRose777 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
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 |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| "use client"; | ||
| // import { useState } from "react"; | ||
| import Link from "next/link"; | ||
| import Image from "next/image" | ||
| import styles from "./software-work.module.scss"; | ||
| // import styles from "./mixins.scss" | ||
|
|
||
| // import .scss file (use styles) | ||
|
|
||
| export default function SoftwareWork() { | ||
| // js code outside of return | ||
|
|
||
| return ( | ||
| // put html stuff inside div | ||
| <div className={styles.pageBody}> | ||
| <div className={styles.content}> | ||
| <div className={styles.LeftContainer}> | ||
| <h1 className={styles.softwareHeader}>Software Work</h1> | ||
| <p className={styles.softwareDescription}> | ||
| Our Software team focuses mainly on the embedded software and | ||
| writing our custom operating system on the orbital platform called | ||
| IntelliSat. IntelliSat is written fully in C, has bare metal | ||
| drivers, and uses FreeRTOS to schedule mission tasks. Work in | ||
| Software involves using STM32CubeIDE, looking at datasheets, | ||
| documentation, looking at schematics, and embedded C | ||
| </p> | ||
|
|
||
| <div className={styles.SSSButtonsContainer}> | ||
| <Link | ||
| href={ | ||
| "https://github.com/Space-and-Satellite-Systems-UC-Davis/IntelliSat" | ||
| } | ||
| className={styles.SSSButton} | ||
| target="_blank" | ||
| rel="noopener noreferrer" | ||
| > | ||
| IntelliSat - GitHub | ||
| </Link> | ||
|
|
||
| <Link | ||
| href={ | ||
| "https://github.com/Space-and-Satellite-Systems-UC-Davis/REALOP_Radio_Controller" | ||
| } | ||
| className={styles.SSSButton} | ||
| target="_blank" | ||
| rel="noopener noreferrer" | ||
| > | ||
| Radio Controller - GitHub | ||
| </Link> | ||
| <Link | ||
| href={ | ||
| "https://github.com/Space-and-Satellite-Systems-UC-Davis/REALOP_MGT_Controller" | ||
| } | ||
| className={styles.SSSButton} | ||
| target="_blank" | ||
| rel="noopener noreferrer" | ||
| > | ||
| MGT Controller - GitHub | ||
| </Link> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div className={styles.SVGContainer}> | ||
| <Image | ||
| src={"./Vector.svg"} | ||
| alt="Github Logo" | ||
| height={429} | ||
| width={418} | ||
| ></Image> | ||
| </div> | ||
| </div> | ||
| </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 |
|---|---|---|
| @@ -0,0 +1,128 @@ | ||
|
|
||
| .pageBody | ||
| { | ||
| // background: linear-gradient(180deg, #000138 0%, #172B54 100%); | ||
| background: var(--navy); | ||
| box-shadow: 0 5px 50px 0 rgba(0, 0, 0, 0.1); | ||
| margin: 0; | ||
| padding: 0; | ||
| } | ||
|
|
||
| .content | ||
| { | ||
| display: flex; | ||
| flex-direction: row; | ||
| justify-content: space-between; | ||
| align-items: center; | ||
| gap: 3rem; | ||
| padding: 4rem 6rem; | ||
| // makes the page flex items align with window size (let me know to remove this) | ||
| max-width: 90rem; | ||
| margin: 0 auto; | ||
| } | ||
|
|
||
| // puts the header, description, and buttons to the left | ||
| .LeftContainer | ||
| { | ||
| display: flex; | ||
| flex-direction: column; | ||
| gap: 1.5rem; | ||
| flex: 1; | ||
| } | ||
|
|
||
| .softwareHeader | ||
| { | ||
| color: #FFF; | ||
| font-size: 3rem; | ||
| font-style: normal; | ||
| font-weight: 500; | ||
| line-height: normal; | ||
| size: 3rem; | ||
| position: sticky; | ||
| } | ||
|
|
||
|
|
||
| .softwareDescription | ||
| { | ||
| height: 9.75rem; | ||
| font-size: 1.25rem; | ||
| font-style: normal; | ||
| line-height: normal; | ||
| font-family: "Space Grotesk"; | ||
| color: var(--white); | ||
| width: 39.375rem; | ||
| max-width: 45rem; | ||
| margin-top: 50%; | ||
| margin-top: 0; | ||
| } | ||
|
|
||
| .SSSButtonsContainer | ||
| { | ||
| display: flex; | ||
| flex-direction: column; | ||
| justify-content: center; | ||
| align-items: flex-start; | ||
| gap: 1.5rem; | ||
|
|
||
| } | ||
|
|
||
| .SSSButton | ||
| { | ||
| position: relative; | ||
| overflow: hidden; | ||
|
|
||
| display: flex; | ||
| align-items: center; | ||
| justify-content: center; | ||
| border-radius: 0.3125rem; | ||
| border: 0.5px solid var(--Off-White); | ||
| background: rgba(247, 247, 247, 0.90); | ||
| box-shadow: 0 5px 50px 0 rgba(0, 0, 0, 0.10); | ||
| color: var(--dark-gray); // change | ||
| font-family: "Space Grotesk"; | ||
| font-size: 1rem; | ||
| font-weight: 500; | ||
| padding: 0.8125rem 2rem; | ||
| min-width: 19.6875rem; // Allows the buttons to be even-sized horizontally no matter how long text is | ||
| cursor: pointer; | ||
| text-decoration: none; | ||
| } | ||
| .SSSButton::before | ||
| { | ||
| content: ""; | ||
| position: absolute; | ||
| inset: 0; | ||
| background: rgba(0, 0, 0, 0.17); | ||
| transform-origin: 0% 50%; | ||
| transform: scaleX(0); // slide is off | ||
| transition: transform 0.3s ease; | ||
| } | ||
| .SSSButton:hover::before{ | ||
| animation: slideOverlay 0.3s forwards; | ||
| } | ||
|
|
||
| @keyframes slideOverlay | ||
| { | ||
| from{ | ||
| transform: scaleX(0); | ||
| } | ||
| to{ | ||
| transform: scaleX(1); // slide is on | ||
| } | ||
| } | ||
| // ^^used to for translation smoothly | ||
|
|
||
|
|
||
| .SVGContainer | ||
| { | ||
| display: flex; | ||
| align-self: center; | ||
| padding-right: 4rem; | ||
| flex-shrink: 0; | ||
| } | ||
|
|
||
| // :root{ | ||
| // --Blue-Gradiant: linear-gradient(180deg, #000138 0%, #172B54 100%); | ||
| // --Off-White:#F7F7F7; | ||
| // --Grey: #575757; | ||
| // } | ||
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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.
you have a bunch of random styling here, id like you reformat this to have align-self: center along with padding-right: X to push it to the right like on the design