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

Hartner branch #429

Open
wants to merge 140 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
140 commits
Select commit Hold shift + click to select a range
7490c33
Added H1 Tag with group name
JPHart98 Oct 18, 2022
29b563b
Create Hello
singh51 Nov 15, 2022
1170200
Update index.html
JPHart98 Nov 15, 2022
f84f1a1
Changed HTML Document and added CSS rules
JPHart98 Nov 21, 2022
217a4aa
Added JS and started API code
JPHart98 Nov 21, 2022
8ff3f1f
Added async function and code to js file
JPHart98 Nov 23, 2022
d2c6fcc
Changed HTML and minor CSS/JS
JPHart98 Nov 25, 2022
02d2bd3
Merge pull request #2 from JPHart98/Hartner-Branch
singh51 Nov 28, 2022
a05d0ae
Merge pull request #3 from JPHart98/main
JPHart98 Nov 28, 2022
979dfef
fixed issues on funcations api data
singh51 Nov 28, 2022
5ecbe04
Merge pull request #4 from JPHart98/Sumeet-test-branch
JPHart98 Nov 28, 2022
0d92db7
Merge pull request #5 from JPHart98/main
JPHart98 Nov 29, 2022
00ff482
Revert "Sumeet test branch"
JPHart98 Nov 29, 2022
a091dea
Merge pull request #6 from JPHart98/Hartner-Branch
JPHart98 Nov 29, 2022
ceb817c
Merge pull request #7 from JPHart98/revert-4-Sumeet-test-branch
JPHart98 Nov 29, 2022
d99207b
Revert "Merge Request #3"
JPHart98 Nov 29, 2022
a05eeb4
Merge pull request #8 from JPHart98/revert-5-main
JPHart98 Nov 29, 2022
2f9b836
Merge pull request #9 from JPHart98/Hartner-Branch
JPHart98 Nov 29, 2022
3721afc
Revert "Hartner branch"
JPHart98 Nov 29, 2022
fcea667
Merge pull request #10 from JPHart98/revert-9-Hartner-Branch
JPHart98 Nov 29, 2022
7bfa489
Merge pull request #11 from JPHart98/Sumeet-test-branch
JPHart98 Nov 29, 2022
35b662d
Merge pull request #12 from JPHart98/Sumeet-test-branch
singh51 Nov 29, 2022
11cfe27
Merge pull request #13 from JPHart98/main
JPHart98 Nov 29, 2022
059e978
Merge pull request #14 from JPHart98/Hartner-Branch
JPHart98 Nov 29, 2022
d8fd407
Revert "Hartner branch"
JPHart98 Nov 29, 2022
8fd61fc
Merge pull request #15 from JPHart98/revert-14-Hartner-Branch
JPHart98 Nov 29, 2022
2daf226
Merge pull request #16 from JPHart98/main
JPHart98 Nov 29, 2022
c3eace1
Revert "Pull code"
JPHart98 Nov 29, 2022
8ecfd42
Merge pull request #17 from JPHart98/revert-16-main
JPHart98 Nov 29, 2022
b7c705b
Merge pull request #20 from JPHart98/Sumeet-test-branch
JPHart98 Nov 29, 2022
b24b3c6
Added descriptions
JPHart98 Nov 29, 2022
f77925b
Create CNAME
JPHart98 Nov 29, 2022
84e5693
Delete CNAME
JPHart98 Nov 29, 2022
dcac50e
Removed client folders
JPHart98 Nov 29, 2022
b702923
Merge pull request #21 from JPHart98/Hartner-Branch
singh51 Nov 30, 2022
1e56f47
Testing CSS rules in githubpages
JPHart98 Nov 30, 2022
12ed607
Testing CSS in github pages
JPHart98 Nov 30, 2022
f3fc701
Testing js in github pages
JPHart98 Nov 30, 2022
c38ee6d
Added CSS rules and new HTML document
JPHart98 Nov 30, 2022
b1bb214
Added new HTML pages and links in orignal html link
JPHart98 Nov 30, 2022
6914e0f
Changed CSS reference and added home button
JPHart98 Nov 30, 2022
8bd985b
Merge pull request #22 from JPHart98/Hartner-Branch
singh51 Dec 1, 2022
c05e735
Merge pull request #23 from JPHart98/main
JPHart98 Dec 1, 2022
144b160
Update 1h1.html
singh51 Dec 1, 2022
4297b62
Update 1h1.html
singh51 Dec 1, 2022
12c6c96
descriptions added
singh51 Dec 1, 2022
fd5dd6a
Merge pull request #24 from JPHart98/Sumeet-test-branch
JPHart98 Dec 2, 2022
e9d1cf5
Merge pull request #25 from JPHart98/main
JPHart98 Dec 2, 2022
7acf89a
Clean up and testing of function
JPHart98 Dec 2, 2022
d1b570f
Update to HTML page for testing
JPHart98 Dec 2, 2022
38512a1
Testing marker placement fucntion
JPHart98 Dec 2, 2022
e47ac74
Update to code
JPHart98 Dec 2, 2022
63971a0
Testing
JPHart98 Dec 2, 2022
4616fb3
Testing
JPHart98 Dec 2, 2022
e18f041
Testing
JPHart98 Dec 2, 2022
850f610
Testing Code
JPHart98 Dec 2, 2022
ff1fffd
Testing code
JPHart98 Dec 2, 2022
229d94a
More testing
JPHart98 Dec 2, 2022
6a33843
Retesting
JPHart98 Dec 2, 2022
aba0053
Testing
JPHart98 Dec 2, 2022
2676ea5
Testing
JPHart98 Dec 2, 2022
0c95e89
Testing data collection
JPHart98 Dec 2, 2022
9ad20b8
Testing code
JPHart98 Dec 2, 2022
c2543e9
TEsting Code
JPHart98 Dec 2, 2022
8a4a47a
Merge pull request #26 from JPHart98/Hartner-Branch
JPHart98 Dec 2, 2022
90445a1
Merge pull request #27 from JPHart98/main
singh51 Dec 2, 2022
b506d1f
Added image requirement for final project
JPHart98 Dec 5, 2022
4aec47e
Testing a filter function
JPHart98 Dec 5, 2022
08ef6a3
Testing Filter function
JPHart98 Dec 5, 2022
c40101e
Added image for final project
JPHart98 Dec 5, 2022
0e3e104
Corrected error with filter function
JPHart98 Dec 5, 2022
43a0c0d
Testing filter function
JPHart98 Dec 5, 2022
73aa7e5
Testing filter API path
JPHart98 Dec 5, 2022
13f51b9
Changed id of button for testing
JPHart98 Dec 5, 2022
f394116
Added '#' to script to call html page
JPHart98 Dec 5, 2022
89558d9
Changed style display block
JPHart98 Dec 5, 2022
945243b
Testing
JPHart98 Dec 5, 2022
2c9752f
Testing filter JSON
JPHart98 Dec 5, 2022
ce91b66
Tetsing and cleaning of JS file
JPHart98 Dec 5, 2022
afbdc20
Testing
JPHart98 Dec 5, 2022
9edb24d
Testing
JPHart98 Dec 5, 2022
316efe9
Testing
JPHart98 Dec 5, 2022
575f7e8
Testing
JPHart98 Dec 5, 2022
a0cedb2
TEsting
JPHart98 Dec 5, 2022
3ce4e6f
Testing
JPHart98 Dec 5, 2022
2db4a6f
Fixing Mistake
JPHart98 Dec 5, 2022
6936b5c
Added a new JS file and cleaned up code
JPHart98 Dec 5, 2022
ef16d1e
Merge pull request #29 from JPHart98/Hartner-Branch
singh51 Dec 5, 2022
6746c20
Merge pull request #30 from JPHart98/main
singh51 Dec 5, 2022
1523cd4
1h1 js done
singh51 Dec 5, 2022
8186385
1h2 filter
singh51 Dec 6, 2022
5c03ab7
1h4
singh51 Dec 6, 2022
2e273f1
1h9 js update
singh51 Dec 6, 2022
5f20836
7 owl
singh51 Dec 6, 2022
d4f2962
h9 7
singh51 Dec 6, 2022
589496a
h4 7
singh51 Dec 6, 2022
a50eea7
h2 7
singh51 Dec 6, 2022
9bdff7a
h1 7
singh51 Dec 6, 2022
8895870
error fixed h1
singh51 Dec 6, 2022
a4b3377
updated h2
singh51 Dec 6, 2022
5c23320
h4 wind
singh51 Dec 6, 2022
56348d2
eslint done h4
singh51 Dec 6, 2022
8d5bb83
update
singh51 Dec 6, 2022
c9f1943
update
singh51 Dec 6, 2022
5f69a91
error h4
singh51 Dec 6, 2022
e0d7ea5
full error h4 done
singh51 Dec 6, 2022
5db4186
H7 fixed
singh51 Dec 6, 2022
6b3156f
eslint h9 fixed
singh51 Dec 6, 2022
26490eb
all fixed h9
singh51 Dec 6, 2022
196fbc7
owl eslint fixed
singh51 Dec 6, 2022
0be752b
owl fixed
singh51 Dec 6, 2022
49d6a47
H1 final
singh51 Dec 6, 2022
e30af58
final h2 fixed
singh51 Dec 6, 2022
47dd5d1
updated h1
singh51 Dec 6, 2022
f67a7ee
H4 fixed
singh51 Dec 6, 2022
403ac39
h7 final
singh51 Dec 6, 2022
cbde99e
updated h9
singh51 Dec 6, 2022
7001698
owl fixed
singh51 Dec 6, 2022
be21077
updated h1
singh51 Dec 6, 2022
10fcd56
fixed h2
singh51 Dec 6, 2022
1700302
fixed h4
singh51 Dec 6, 2022
ec4d88d
testing
JPHart98 Dec 6, 2022
35a40f2
Testing filter function
JPHart98 Dec 6, 2022
f2b48b6
Testing
JPHart98 Dec 6, 2022
d56f8f3
Added new cosole logs to test code
JPHart98 Dec 6, 2022
1ce75b0
TEsting
JPHart98 Dec 6, 2022
64baff5
Testing fiter of lat and long
JPHart98 Dec 6, 2022
279a725
Testing filter
JPHart98 Dec 6, 2022
e279daa
Adding consoel log
JPHart98 Dec 6, 2022
8dfc14c
Testing filter lat/long request
JPHart98 Dec 7, 2022
2ed8a33
Testing typing filter function
JPHart98 Dec 7, 2022
5ba5bdf
Merge pull request #31 from JPHart98/Sumeet-test-branch
singh51 Dec 7, 2022
c40690c
Merge pull request #32 from JPHart98/main
JPHart98 Dec 7, 2022
f41ea00
TEsting filter function and filtering of API request
JPHart98 Dec 7, 2022
86b89df
Filter functions worked, adding to other JS files for testing
JPHart98 Dec 7, 2022
34bbf73
Fixxed errors missed in push
JPHart98 Dec 7, 2022
a968d64
Fixxed Errors
JPHart98 Dec 7, 2022
e05df69
Changing error in request url
JPHart98 Dec 7, 2022
58d1c89
Changing error
JPHart98 Dec 7, 2022
a8740ce
Changed order and updated filter function
JPHart98 Dec 8, 2022
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
12 changes: 0 additions & 12 deletions client/index.html

This file was deleted.

Empty file removed client/script.js
Empty file.
Empty file removed client/styles.css
Empty file.
374 changes: 374 additions & 0 deletions css/style.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,374 @@
/*
New code bonus: pure CSS data loading icon
This comes from loading.io/css - it's nice to show that something is happening!
*/

* {
box-sizing: border-box;
}
footer h4 {
text-align: center;
width: auto;

}
img {
height: 100px;
width: auto;
}
p {
align-self: center;
}
li {
align-self: center;
}
/*
These rules apply to actual HTML elements with no labelling!
So: they style the tags directly
*/

html {
background-color: #fff;
font-size: 16px;
min-width: 300px;
overflow-x: hidden;
overflow-y: scroll;

/* these are specific to different browsers */
-moz-osx-font-smoothing: grayscale;
-webkit-font-smoothing: antialiased;
text-rendering: optimizeLegibility;
-webkit-text-size-adjust: 100%;
-moz-text-size-adjust: 100%;
text-size-adjust: 100%;
}

body {
margin: 0;
padding: 0;

font-family: ‘Segoe UI’, Candara, ‘Bitstream Vera Sans’, ‘DejaVu Sans’, ‘Bitsream Vera Sans’, ‘Trebuchet MS’, Verdana, ‘Verdana Ref’, sans-serif;
font-weight: 400;
line-height: 1.5;
background-color: rgb(239, 239, 239);
}


a {
display: inline-block;
text-decoration: none;
}

h2 {
margin:0;
padding:0;
padding-bottom:1.5rem;
}

form {
accent-color: hsla(120, 100%, 50%, 0.482);
}

/*
- These styles use 'class names'
- You can apply them by using the 'class' attribute on your HTML
- like this: <div class="wrapper">
- note that the period vanishes there!
*/


.wrapper {
min-height: 100vh;
display: flex;
flex-direction: column;
margin: 0;
flex: 1;
}

.container {
margin: 0 20px;
display: flex;
justify-content: space-evenly;
align-items: start;
flex:1;
}

.header {
padding-top: 1rem;
padding-left: 1rem;
padding-right: 1rem;
padding-bottom: 1.5rem;
}

.box{

border: 2px dashed;
border-radius: 4px;
width: fit-content;
height:fit-content;
padding: 1.5rem;
margin: 0 auto;
}
.thickBox {
border: 3px dashed;
border-radius: 4px;
padding: 1.5rem;
margin:0;
}

.left_section {
/* background-color: rgba(0, 139, 139, 0.8); */
flex: 0 1 auto;
margin: 1rem;
padding: 1.5rem;
}

.right_section {
/* background-color: rgba(255, 224, 138, 0.7); */
flex: 1 2 auto;
margin: 1rem;
align-items: center;
display: flex;
flex-flow: column;
}
.green {
background-color: limegreen;
}
.orange {
background-color: orange;
}
/*
This block is actually dependent on the "container" block having a flex set on it
and the "wrapper" block displaying as a flex column with a "vertical height" (vh) of 100.
That serves to cram the footer to the bottom of the page.
*/

.footer {
flex-shrink: 0;
padding: 1rem;
font-size: 1.2rem;
font-weight: 600;
}

.footer a {
color:darkgreen;
text-decoration: underline;
}

/*
This is an example of a 'pseudoclass'
In this instance, it says what to do if a mouse hovers over a link
This is pretty desktop-specific, since there's no hover function on touchscreens
*/
.footer a:hover {
/* Hue, saturation, luminosity, alpha */
background-color: hsla(0, 0%, 90%, 0.15);
/* red, green, blue, alpha */
color: lightgreen;
text-decoration: none;
}

.subtitle {
color: rgba(0, 0, 0, 0.8);
margin: 0px;
margin-bottom: 5px;
}


/* Deploy this with images as direct "children" and the images should pop into shape */
.grid {
display: flex;
justify-content: space-evenly;
flex-flow: wrap;
width: 350px;
height: 350px;
margin: 0 auto;
}

.grid img {
width: 150px;
height: 150px;
}


/* Carousel */
div.carousel {
max-width: 300px;
overflow: hidden;
text-align: center;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
margin: 0 auto;
margin-bottom: 1rem;
}

.carousel .slides {
display: flex;
overflow-x: auto;
scroll-snap-type: x mandatory;
scroll-behavior: smooth;
-webkit-overflow-scrolling: touch;
}

/* .carousel_item, */
.hidden {
display: none;
}

.visible {
display: block;
}

.carousel_item img {
/*
Setting width, rather than max-width or min-width,
means annoying pop-ins won't happen
but it also means you need to format your images to be compatible
or they will stretch weird

- try a tall one and see what happens
- change the height on a fixed image size and see what happens
- now make sure that images are _always_ square
- ... there's a reason crop tools are popular in image editors
*/
width: 150px;
height: 100px;
}

.prev,
.next {
border: none;
margin: 2px;
text-align: center;
border-radius: 5px;
font-weight: bold;
height: 45px;
padding: 10px;
line-height: 0; /* This centers a button's text! */
border: 2px solid rgb(99,99,99); /* shorthand for how to do a border */
}

.prev:focus,
.next:focus {
margin: 0;
/* Pick a good border colour and check out how it works with your buttons */
}

.prev:hover,
.next:hover {
background-color: rgb(246, 169, 93);
/* Pick a good background colour for your hover pseudoclass */
}

/* MAP STYLES */

#map {
display: block;
width: 400px;
height: 300px;
border: 2px dashed rgb(99,99,99);
margin-bottom: 1rem;
}

/*
Form Styles
*/


form input {
/* This is a hack to make sure our boxes line up with one another nicely */
width: 100%;
width: -moz-available; /* WebKit-based browsers will ignore this. */
width: -webkit-fill-available; /* Mozilla-based browsers will ignore this. */
width: fill-available;

/* here we are setting white space correctly */
margin-bottom: 1rem;
height: 2rem;
border-radius: 4px;
}

form label {
width: 100%;
width: -moz-available; /* WebKit-based browsers will ignore this. */
width: -webkit-fill-available; /* Mozilla-based browsers will ignore this. */
width: fill-available;
align-items: flex-start;

display: block; /* this turns the label text into a box we can set margins on */
margin-bottom: 0.5rem;
}
.lds-ellipsis {
display: inline-block;
position: relative;
width: 80px;
height: 80px;
}
.lds-ellipsis_hidden {
display: hidden;
}
.lds-ellipsis div {
position: absolute;
top: 33px;
width: 13px;
height: 13px;
border-radius: 50%;
background: #fff;
animation-timing-function: cubic-bezier(0, 1, 1, 0);
}
.lds-ellipsis div:nth-child(1) {
left: 8px;
animation: lds-ellipsis1 0.6s infinite;
}
.lds-ellipsis div:nth-child(2) {
left: 8px;
animation: lds-ellipsis2 0.6s infinite;
}
.lds-ellipsis div:nth-child(3) {
left: 32px;
animation: lds-ellipsis2 0.6s infinite;
}
.lds-ellipsis div:nth-child(4) {
left: 56px;
animation: lds-ellipsis3 0.6s infinite;
}
@keyframes lds-ellipsis1 {
0% {
transform: scale(0);
}
100% {
transform: scale(1);
}
}
@keyframes lds-ellipsis3 {
0% {
transform: scale(1);
}
100% {
transform: scale(0);
}
}
@keyframes lds-ellipsis2 {
0% {
transform: translate(0, 0);
}
100% {
transform: translate(24px, 0);
}
}

/* How To Write A Media Query For Small Screens */

@media only screen and (max-width: 736px){
/* Rules in here will only apply when a screen is the correct size */
/* check it out by using your developer tools to shrink your screen-size */
.container {
background-color: rgba(204, 8, 162, 0.65);
flex-direction: column;
justify-content: center;
align-items: center;
}
}


Binary file added images/UMD-logo.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading