Skip to content

Commit

Permalink
moved src
Browse files Browse the repository at this point in the history
  • Loading branch information
ForrestFire0 committed Sep 13, 2024
1 parent 18a1a28 commit 4c25e38
Show file tree
Hide file tree
Showing 49 changed files with 87 additions and 88 deletions.
2 changes: 1 addition & 1 deletion src/app.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<!--suppress HtmlUnknownTarget -->
<link rel="icon" href="%sveltekit.assets%/favicon.png" />
<!-- <link rel="icon" href="%sveltekit.assets%/favicon.png" />-->
<meta name="viewport" content="width=device-width" />
<title>ENES 100</title>
%sveltekit.head%
Expand Down
2 changes: 1 addition & 1 deletion src/lib/Header.svelte
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="/src/img/keystone_logo.svg" alt="UMD_ENG_Ctr_Color_W.png"></a>
<a href="/"><img id="logo" src="/static/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
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("/src/img/Interstate-Regular.otf") format('opentype');
src: local('Interstate'), url("/static/img/Interstate-Regular.otf") format('opentype');
}

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

body {
padding: 0;
margin: 0;
min-height: 100vh;
background-image: url("/src/img/home_3.jpg");
background-image: url("/static/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("/src/img/shell overlay repeating.svg");
background-image: url("/static/img/shell overlay repeating.svg");
background-size: 60%;
background-repeat: repeat;
background-color: #121B21;
Expand Down
56 changes: 28 additions & 28 deletions src/routes/+page.svelte
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("/src/img/home_bkg.jpg");
background-image: url("/static/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("/src/img/shell overlay repeating.svg");
background-image: url("/static/img/shell overlay repeating.svg");
background-size: 50%;
text-align: center;
}
Expand Down Expand Up @@ -176,12 +176,12 @@ p {
</div>
</div>
<script>
var d = new Date();
let d = new Date();
function lab_1116() {
var c = document.getElementById("current_1116");
var n = document.getElementById("next_1116");
var w = d.getDay();
var weekdays = [//1 2 3 4 5 6 7 8 9 10 11 N 1 2 3 4 5 6 7 8 9 10 11
let c = document.getElementById("current_1116");
let n = document.getElementById("next_1116");
let w = d.getDay();
let weekdays = [//1 2 3 4 5 6 7 8 9 10 11 N 1 2 3 4 5 6 7 8 9 10 11
["Sunday", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
["Monday", 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 0, 0],
["Tuesday", 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 2, 2, 2, 0, 0],
Expand All @@ -190,30 +190,30 @@ p {
["Friday", 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0],
["Saturday", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
];
var day = weekdays[w];
var time = d.getHours();
let day = weekdays[w];
let time = d.getHours();
if (day[time] == 2) {
if (day[time] === 2) {
c.innerHTML = "open";
} else if (day[time] == 1) {
} else if (day[time] === 1) {
c.innerHTML = "class";
} else {
c.innerHTML = "closed";
}
if (day[time + 1] == 2) {
if (day[time + 1] === 2) {
n.innerHTML = "open";
} else if (day[time + 1] == 1) {
} else if (day[time + 1] === 1) {
n.innerHTML = "class";
} else {
n.innerHTML = "closed";
}
}
function lab_1120() {
var c = document.getElementById("current_1120");
var n = document.getElementById("next_1120");
var w = d.getDay();
var weekdays = [//1 2 3 4 5 6 7 8 9 10 11 N 1 2 3 4 5 6 7 8 9 10 11
let c = document.getElementById("current_1120");
let n = document.getElementById("next_1120");
let w = d.getDay();
let weekdays = [//1 2 3 4 5 6 7 8 9 10 11 N 1 2 3 4 5 6 7 8 9 10 11
["Sunday", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
["Monday", 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0],
["Tuesday", 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0],
Expand All @@ -222,27 +222,27 @@ p {
["Friday", 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0],
["Saturday", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
];
var day = weekdays[w];
var time = d.getHours();
let day = weekdays[w];
let time = d.getHours();
if (day[time] == 2) {
if (day[time] === 2) {
c.innerHTML = "open";
} else if (day[time] == 1) {
} else if (day[time] === 1) {
c.innerHTML = "class";
} else {
c.innerHTML = "closed";
}
if (day[time + 1] == 2) {
if (day[time + 1] === 2) {
n.innerHTML = "open";
} else if (day[time + 1] == 1) {
} else if (day[time + 1] === 1) {
n.innerHTML = "class";
} else {
n.innerHTML = "closed";
}
}
window.onload = function() {
var t = document.getElementById("time");
let t = document.getElementById("time");
t.innerHTML = d.toLocaleString();
lab_1116();
lab_1120();
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="/src/img/grid_1.jpg" alt="kitty cat"><img src="/src/img/grid_2.jpg" alt="kitty cat"></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_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="/src/img/grid_3.jpg" alt="kitty cat" height=100%></div>
<div class="row_image"><img src="/src/img/grid_5.jpg" alt="kitty cat" height=100%></div>
<div class="row_image"><img src="/src/img/grid_4.jpg" alt="kitty cat" height=100%></div>
<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>
</div>

8 changes: 4 additions & 4 deletions src/routes/about/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
img {
outline: 2px solid white;
outline-offset: 20px;
margin: 0px 20px;
margin: 0 20px;
}
</style>

Expand All @@ -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="/src/img/about_1.jpg" alt="kitty cat" width="40%">
<img src="/static/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="/src/img/about_2.jpg" alt="kitty cat" width="40%">
<img src="/static/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="/src/img/about_3.jpg" alt="kitty cat" width="40%">
<img src="/static/img/about_3.jpg" alt="kitty cat" width="40%">
</div>
</div>
8 changes: 4 additions & 4 deletions src/routes/about/showcase/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
</div>
</div>
<div class="box_split">
<img src="/src/img/otv_materials.jpg" alt="elephant otv" height="100%" />
<img src="/static/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="/src/img/otv_fire.jpg" alt="elephant otv" height="100%" />
<img src="/static/img/otv_fire.jpg" alt="elephant otv" height="100%" />
</div>
<div class="box_split">
<div class="textbox">
Expand All @@ -30,7 +30,7 @@
</div>
</div>
</div>

<h3>We encourage our students to get creative when approaching mission challenges.</h3>
<div class="split_box">
<div class="box_split">
Expand All @@ -41,7 +41,7 @@
</div>
</div>
<div class="box_split">
<img src="/src/img/otv_elephant.jpg"
<img src="/static/img/otv_elephant.jpg"
alt="elephant otv"
height="100%"/>
</div>
Expand Down
Loading

0 comments on commit 4c25e38

Please sign in to comment.