Skip to content

Commit

Permalink
added cad assets
Browse files Browse the repository at this point in the history
  • Loading branch information
@ForrestFire0
ForrestFire0 committed Sep 13, 2024
1 parent 4c25e38 commit b913fba
Show file tree
Hide file tree
Showing 8 changed files with 62 additions and 62 deletions.
2 changes: 1 addition & 1 deletion src/lib/Header.svelte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
<a href="https://umd.edu">UNIVERSITY OF MARYLAND</a>
</div>
<nav>
<a href="/"><img id="logo" src="/static/img/keystone_logo.svg" alt="UMD_ENG_Ctr_Color_W.png"></a>
<a href="/"><img id="logo" src="/img/keystone_logo.svg" alt="UMD_ENG_Ctr_Color_W.png"></a>
<ul>
<li>
<div class="dropdown">
Expand Down
8 changes: 4 additions & 4 deletions src/lib/global.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@
font-family: 'Interstate';
font-weight: normal;
font-style: normal;
src: local('Interstate'), url("/static/img/Interstate-Regular.otf") format('opentype');
src: local('Interstate'), url("/img/Interstate-Regular.otf") format('opentype');
}

@font-face {
font-family: 'Interstate';
font-style: normal;
font-weight: bold;
src: local('Interstate'), url("/static/img/Interstate-Bold.otf") format('opentype');
src: local('Interstate'), url("/img/Interstate-Bold.otf") format('opentype');
}

body {
padding: 0;
margin: 0;
min-height: 100vh;
background-image: url("/static/img/home_3.jpg");
background-image: url("/img/home_3.jpg");
background-size: 100%;
background-repeat: no-repeat;
background-color: #121B21;
Expand All @@ -27,7 +27,7 @@ body {
}

.main_content {
background-image: url("/static/img/shell overlay repeating.svg");
background-image: url("/img/shell overlay repeating.svg");
background-size: 60%;
background-repeat: repeat;
background-color: #121B21;
Expand Down
12 changes: 6 additions & 6 deletions src/routes/+page.svelte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
.home_boxes {
display: flex;
flex-direction: column;
background-image: url("/static/img/home_bkg.jpg");
background-image: url("/img/home_bkg.jpg");
background-size: 150%;
background-repeat: no-repeat;
padding: 40px 120px;
Expand Down Expand Up @@ -98,7 +98,7 @@ p {
.home_content .lab_status {
background-color: rgba(18,27,33,1.00);
width: 60%;
background-image: url("/static/img/shell overlay repeating.svg");
background-image: url("/img/shell overlay repeating.svg");
background-size: 50%;
text-align: center;
}
Expand Down Expand Up @@ -280,14 +280,14 @@ p {
<div class="home_boxes">
<div class="row">
<div class="row_text"><p>"This course was very challenging and required a large amount of hard work, but it was a good way to see what engineering is and what is required of a student who wants to become an engineer."</p></div>
<div class="row_stack"><img src="/static/img/grid_1.jpg" alt="kitty cat"><img src="/static/img/grid_2.jpg" alt="kitty cat"></div>
<div class="row_stack"><img src="/img/grid_1.jpg" alt="kitty cat"><img src="/img/grid_2.jpg" alt="kitty cat"></div>
<div class="row_text"><p>"ENES100 was a great way to dip my toe into engineering and helped me figure out what I wanted to study. I love being an engineer, and this class was the start for me."</p></div>
</div>
<h2>"I learned a LOT from this course and my teammates and I formed extremely strong bonds."</h2>
<div class="row">
<div class="row_image"><img src="/static/img/grid_3.jpg" alt="kitty cat" height=100%></div>
<div class="row_image"><img src="/static/img/grid_5.jpg" alt="kitty cat" height=100%></div>
<div class="row_image"><img src="/static/img/grid_4.jpg" alt="kitty cat" height=100%></div>
<div class="row_image"><img src="/img/grid_3.jpg" alt="kitty cat" height=100%></div>
<div class="row_image"><img src="/img/grid_5.jpg" alt="kitty cat" height=100%></div>
<div class="row_image"><img src="/img/grid_4.jpg" alt="kitty cat" height=100%></div>
</div>
</div>

6 changes: 3 additions & 3 deletions src/routes/about/+page.svelte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@
<div class="box_split_left">
<p>This course provides the new engineering student with a roadmap to becoming a professional engineer. This is achieved through the planning, investigation, design, manufacturing, assembly, and evaluation of a product, conducted within the context of a team. In this course, you will be assigned to a team, which provides a framework for equitable logistical coordination and effective communication--by written, oral, and visual modalities. </p>
</div>
<img src="/static/img/about_1.jpg" alt="kitty cat" width="40%">
<img src="/img/about_1.jpg" alt="kitty cat" width="40%">
</div>
<h3>We believe that teamwork is the backbone of engineering design.</h3>
<div class="split_box">
<img src="/static/img/about_2.jpg" alt="kitty cat" width="40%">
<img src="/img/about_2.jpg" alt="kitty cat" width="40%">
<div class="box_split_right">
<p>You will define problems and apply modeling to develop and analyze an engineering design that applies basic math & science principles to predict behaviors of the system. You will use modeling to inform the improvement of a design through iteration. You will create a prototype of your design and develop testing protocols to gather and analyze data for the performance of the system using variables from the engineering model. </p>
</div>
Expand All @@ -74,6 +74,6 @@
<div class="box_split_left">
<p>Given any discrepancies between the model and reality, you will troubleshoot and assess the performance of the prototype, interpreting the behavior and relating the observations back to design decisions. Finally, you will gain project management skills such as separating a complex project into manageable parts, governing a diverse project team with equity, and using effective tools to ensure the project meets its deliverables and progresses within budget and on schedule.</p>
</div>
<img src="/static/img/about_3.jpg" alt="kitty cat" width="40%">
<img src="/img/about_3.jpg" alt="kitty cat" width="40%">
</div>
</div>
6 changes: 3 additions & 3 deletions src/routes/about/showcase/+page.svelte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
</div>
</div>
<div class="box_split">
<img src="/static/img/otv_materials.jpg" alt="elephant otv" height="100%" />
<img src="/img/otv_materials.jpg" alt="elephant otv" height="100%" />
</div>
</div>
<h3>All teams must complete their mission and navigate an obstacle course.</h3><div class="split_box">
<div class="box_split">
<img src="/static/img/otv_fire.jpg" alt="elephant otv" height="100%" />
<img src="/img/otv_fire.jpg" alt="elephant otv" height="100%" />
</div>
<div class="box_split">
<div class="textbox">
Expand All @@ -41,7 +41,7 @@
</div>
</div>
<div class="box_split">
<img src="/static/img/otv_elephant.jpg"
<img src="/img/otv_elephant.jpg"
alt="elephant otv"
height="100%"/>
</div>
Expand Down
78 changes: 39 additions & 39 deletions src/routes/about/team/+page.svelte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,167 +65,167 @@
<h3>Instructors</h3>
<div class="split_box">
<div class="person">
<img src="/static/img/testudo.jpg" alt=":(">
<img src="/img/testudo.jpg" alt=":(">
<div class="bio">Dr. Joseph Beaudoin<br>Section(s): 0502<br><a href="mailto:[email protected]">[email protected]</a></div>
</div>
<div class="person">
<img src="/static/img/testudo.jpg" alt=":(">
<img src="/img/testudo.jpg" alt=":(">
<div class="bio">Rick Blanton<br>Section(s): 0501<br><a href="mailto:[email protected]">[email protected]</a></div>
</div>
<div class="person">
<img src="/static/img/testudo.jpg" alt=":(">
<img src="/img/testudo.jpg" alt=":(">
<div class="bio">Ethan Burbridge<br>Section(s): FC02<br><a href="mailto:[email protected]">[email protected]</a></div>
</div>
<div class="person">
<img src="/static/img/testudo.jpg" alt=":(">
<img src="/img/testudo.jpg" alt=":(">
<div class="bio">Kevin Chiu<br>Section(s): 1002<br><a href="mailto:[email protected]">[email protected]</a></div>
</div>
<div class="person">
<img src="/static/img/testudo.jpg" alt=":(">
<img src="/img/testudo.jpg" alt=":(">
<div class="bio">Dr. Aris Cleanthous<br>Section(s): 0301<br><a href="mailto:[email protected]">[email protected]</a></div>
</div>
<div class="person">
<img src="/static/img/testudo.jpg" alt=":(">
<img src="/img/testudo.jpg" alt=":(">
<div class="bio">Joshua Cocker<br>Section(s): 0302, 0701, FC01<br><a href="mailto:[email protected]">[email protected]</a></div>
</div>
<div class="person">
<img src="/static/img/testudo.jpg" alt=":(">
<img src="/img/testudo.jpg" alt=":(">
<div class="bio">Michael Galczynski<br>Section(s): 0402, 0601, 0702<br><a href="mailto:[email protected]">[email protected]</a></div>
</div>
<div class="person">
<img src="/static/img/testudo.jpg" alt=":(">
<img src="/img/testudo.jpg" alt=":(">
<div class="bio">Catherine Hamel<br>Section(s): 0401<br><a href="mailto:[email protected]">[email protected]</a></div>
</div>
<div class="person">
<img src="/static/img/testudo.jpg" alt=":(">
<img src="/img/testudo.jpg" alt=":(">
<div class="bio">Dr. Amy Karlsson<br>Section(s): 0801<br><a href="mailto:[email protected]">[email protected]</a></div>
</div>
<div class="person">
<img src="/static/img/testudo.jpg" alt=":(">
<img src="/img/testudo.jpg" alt=":(">
<div class="bio">David Kriesberg<br>Section(s): 0802<br><a href="mailto:[email protected]">[email protected]</a></div>
</div>
<div class="person">
<img src="/static/img/testudo.jpg" alt=":(">
<img src="/img/testudo.jpg" alt=":(">
<div class="bio">Dr. Isabel Lloyd<br>Section(s): 0602<br><a href="mailto:[email protected]">[email protected]</a></div>
</div>
<div class="person">
<img src="/static/img/testudo.jpg" alt=":(">
<img src="/img/testudo.jpg" alt=":(">
<div class="bio">Dr. Daanish Maqbool<br>Section(s): 1201<br><a href="mailto:[email protected]">[email protected]</a></div>
</div>
<div class="person">
<img src="/static/img/testudo.jpg" alt=":(">
<img src="/img/testudo.jpg" alt=":(">
<div class="bio">Jarred Young<br>Section(s): 1001<br><a href="mailto:[email protected]">[email protected]</a></div>
</div>
</div>
<h3>Undergraduate Teaching Fellows</h3>
<h4>UTFs are the backbone of our classrooms. They each provide direct support to one instructor and their students for the entire duration of the course.</h4>
<div class="split_box">
<div class="person">
<img src="/static/img/testudsnow.jpg" alt=":(">
<img src="/img/testudsnow.jpg" alt=":(">
<div class="bio">Ayomide Allen<br>Major: Mechanical Engineering<br>Section: 0401</div>
</div>
<div class="person">
<img src="/static/img/testudsnow.jpg" alt=":(">
<img src="/img/testudsnow.jpg" alt=":(">
<div class="bio">Haroon Amanullah<br>Major: Civil Engineering<br>Section: 1002</div>
</div>
<div class="person">
<img src="/static/img/testudsnow.jpg" alt=":(">
<img src="/img/testudsnow.jpg" alt=":(">
<div class="bio">Samuel Bentz<br>Major: Mechanical Engineering<br>Section: 0601</div>
</div>
<div class="person">
<img src="/static/img/testudsnow.jpg" alt=":(">
<img src="/img/testudsnow.jpg" alt=":(">
<div class="bio">Rita Booth<br>Major: Civil Engineering<br>Section: 0801</div>
</div>
<div class="person">
<img src="/static/img/testudsnow.jpg" alt=":(">
<img src="/img/testudsnow.jpg" alt=":(">
<div class="bio">Sabine Buccheri<br>Major: Mechanical Engineering<br>Section: 1001</div>
</div>
<div class="person">
<img src="/static/img/testudsnow.jpg" alt=":(">
<img src="/img/testudsnow.jpg" alt=":(">
<div class="bio">Kevin Cheng<br>Major: Mechanical Engineering<br>Section: 0302</div>
</div>
<div class="person">
<img src="/static/img/testudsnow.jpg" alt=":(">
<img src="/img/testudsnow.jpg" alt=":(">
<div class="bio">Will Covington<br>Major: Aerospace Engineering<br>Section: 0702</div>
</div>
<div class="person">
<img src="/static/img/testudsnow.jpg" alt=":(">
<img src="/img/testudsnow.jpg" alt=":(">
<div class="bio">Zoe Edwards<br>Major: Mechanical Engineering<br>Section: 0602</div>
</div>
<div class="person">
<img src="/static/img/testudsnow.jpg" alt=":(">
<img src="/img/testudsnow.jpg" alt=":(">
<div class="bio">Natalie Finkelstein<br>Major: Mechanical Engineering<br>Section: 0701</div>
</div>
<div class="person">
<img src="/static/img/testudsnow.jpg" alt=":(">
<img src="/img/testudsnow.jpg" alt=":(">
<div class="bio">Anna Fulton<br>Major: Mechanical Engineering<br>Section: 0301</div>
</div>
<div class="person">
<img src="/static/img/testudsnow.jpg" alt=":(">
<img src="/img/testudsnow.jpg" alt=":(">
<div class="bio">Anushka Kakuskar<br>Major: Mechanical Engineering<br>Section: 0402</div>
</div>
<div class="person">
<img src="/static/img/testudsnow.jpg" alt=":(">
<img src="/img/testudsnow.jpg" alt=":(">
<div class="bio">Michael O'Neil<br>Major: Mechanical Engineering<br>Section: 0802</div>
</div>
<div class="person">
<img src="/static/img/testudsnow.jpg" alt=":(">
<img src="/img/testudsnow.jpg" alt=":(">
<div class="bio">Terrence Pierce<br>Major: Mechanical Engineering<br>Section: 0502</div>
</div>
<div class="person">
<img src="/static/img/testudsnow.jpg" alt=":(">
<img src="/img/testudsnow.jpg" alt=":(">
<div class="bio">Hannah Rasmussen<br>Major: Bioengineering<br>Section: 0501</div>
</div>
<div class="person">
<img src="/static/img/testudsnow.jpg" alt=":(">
<img src="/img/testudsnow.jpg" alt=":(">
<div class="bio">Tyler Rivenbark<br>Major: Aerospace Engineering<br>Section: 1201</div>
</div>
<div class="person">
<img src="/static/img/testudsnow.jpg" alt=":(">
<img src="/img/testudsnow.jpg" alt=":(">
<div class="bio">Stephen Snyder<br>Major: Mechanical Engineering<br>Section: FC01</div>
</div>
<div class="person">
<img src="/static/img/testudsnow.jpg" alt=":(">
<img src="/img/testudsnow.jpg" alt=":(">
<div class="bio">Adithya Sundar<br>Major: Aerospace Engineering<br>Section: FC02</div>
</div>
</div>
<h3>Laboratory Teaching Fellows</h3>
<h4>LTFs work behind the scenes to maintain our course technologies and develop new ones. They also offer technical support to students and instructors throughout the semester.</h4>
<div class="split_box">
<div class="person">
<img src="/static/img/testudbow.jpg" alt=":(">
<img src="/img/testudbow.jpg" alt=":(">
<div class="bio">Muallim Cekic<br>Major: Electrical Engineering</div>
</div>
<div class="person">
<img src="/static/img/testudbow.jpg" alt=":(">
<img src="/img/testudbow.jpg" alt=":(">
<div class="bio">Ann-Audrey Ezi<br>Major: Computer Engineering</div>
</div>
<div class="person">
<img src="/static/img/testudbow.jpg" alt=":(">
<img src="/img/testudbow.jpg" alt=":(">
<div class="bio">Nam Facchetti<br>Major: Mechanical Engineering</div>
</div>
<div class="person">
<img src="/static/img/testudbow.jpg" alt=":(">
<img src="/img/testudbow.jpg" alt=":(">
<div class="bio">Abi Guicheteau<br>Major: Electrical Engineering</div>
</div>
<div class="person">
<img src="/static/img/testudbow.jpg" alt=":(">
<img src="/img/testudbow.jpg" alt=":(">
<div class="bio">Anuraag Karunakaran<br>Major: Computer Engineering</div>
</div>
<div class="person">
<img src="/static/img/testudbow.jpg" alt=":(">
<img src="/img/testudbow.jpg" alt=":(">
<div class="bio">Forrest Milner<br>Major: Electrical Engineering</div>
</div>
<div class="person">
<img src="/static/img/testudbow.jpg" alt=":(">
<img src="/img/testudbow.jpg" alt=":(">
<div class="bio">Matthew Paul<br>Major: Mechanical Engineering</div>
</div>
<div class="person">
<img src="/static/img/testudbow.jpg" alt=":(">
<img src="/img/testudbow.jpg" alt=":(">
<div class="bio">Joshua Stone<br>Major: Computer Engineering</div>
</div>
<div class="person">
<img src="/static/img/testudbow.jpg" alt=":(">
<img src="/img/testudbow.jpg" alt=":(">
<div class="bio">Camille Wharff<br>Major: Computer Engineering</div>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/routes/documentation/tank_guide/+page.svelte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@

Navigational tanks created to supplement student coding curriculum in ENES100.

<img src="/static/img/tank.jpg" alt="tank" width=50%>
<img src="/img/tank.jpg" alt="tank" width=50%>

The tank has swappable propulsion modules, including a few seen here:

<img src="/static/img/tankswheels.jpg" alt="tank wheels" width=50%>
<img src="/img/tankswheels.jpg" alt="tank wheels" width=50%>

In order to remove the propulsion modules, remove the wheels by turning counter clockwise and then slide the module out.

Expand Down
8 changes: 4 additions & 4 deletions src/routes/tools/machinelearning/+page.svelte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ Detailed steps for this process can be found [here](https://docs.google.com/docu
## Model Upload
Click [here](https://enes100.umd.edu/uploadmodel) to upload a trained model.
## WIFI Cam CAD
<a href="/img/WiFiCam%20Case%20(with%20camera).f3z" download>Download Cam Case with camera model</a>, best for placing in CAD.
<a href="/img/WiFiCamCASE.step" download>Download Cam Case as STEP file</a>, best for editing/customizing in CAD.
<a href="../img/WiFiCamCASE.stl" download>Download Cam Case as STL file</a>, best for 3D printing.<br><br>
<a href="/cad/WiFiCam%20Case%20(with%20camera).f3z" download>Download Cam Case with camera model</a>, best for placing in CAD.
<a href="/cad/WiFiCamCASE.step" download>Download Cam Case as STEP file</a>, best for editing/customizing in CAD.
<a href="/cad/WiFiCamCASE.stl" download>Download Cam Case as STL file</a>, best for 3D printing.<br><br>
Below is an example of a possible mount to connect the camera. The hole is sized for an M4 screw.
<img src="/static/img/sample_mount.jpg" alt="no_pic" width=50%>
<img src="/img/sample_mount.jpg" alt="no_pic" width=50%>
</MarkdownContent>
</div>
</slot>
Expand Down

0 comments on commit b913fba

Please sign in to comment.