Skip to content

Update branch #48

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.

Sign up for GitHub

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

Jump to bottom
Merged
20jasper merged 69 commits into from
Jun 14, 2022
Merged

Update branch #48

20jasper merged 69 commits into from
Jun 14, 2022

Conversation

@20jasper
Copy link
Member

@20jasper 20jasper commented Jun 14, 2022

Update branch with most recent changes

20jasper and others added 30 commits June 9, 2022 22:28
@20jasper
Merge pull request #18 from Ethodeus/feature
2635578 
added search bar to test api and a result space to display the fetched information
@schneedotdev
replaced html with ejs, rendered through server-side code
5658a34
@alexisintech
Merge pull request #19 from the-api-administration/ejs
4606025 
replaced html with ejs, rendered through server-side code
@schneedotdev
added matches.ejs, started keyword fetch from client-side code
b2d0f54
@20jasper
fixed styling of code blocks
7194f22
@20jasper
changed button type to button
ac8544c
@20jasper
formatted strings in code block
67449fd
@Ethodeus
chnaged scroll bar styling of the result div, and changed some color …
1a541aa 
…tones
@20jasper
Merge branch 'ejs' of https://github.com/the-api-administration/codin…
0d5b840 
…g-resources-api into ejs
@20jasper
formatted code blocks with map function
2d78225
@schneedotdev
fixed object render to DOM
f9d0399
@schneedotdev
fully functional api search
e8e9fae
@schneedotdev
separated main.js into separate functions, need event listener for en…
8edbd9f 
…ter keypress
@Ethodeus
Merge pull request #20 from the-api-administration/ejs
1508a9a 
added matches.ejs, started keyword fetch from client-side code
@Ethodeus
Merge pull request #22 from the-api-administration/resources
3a88998 
Resources
@20jasper
made input lower case and trimmed
ba53c24
@20jasper
Merge pull request #23 from the-api-administration/search-keywords
1ea0265
@Ethodeus
Merge pull request #24 from the-api-administration/test
9d8c3d9 
Test
@20jasper
Added comments to getMatches function
13e45aa
@schneedotdev
added comments main.js and index.ejs
dee2778
@Ethodeus
Merge pull request #25 from the-api-administration/test
c18cde0 
added comments main.js and index.ejs
@Ethodeus
Merge pull request #26 from the-api-administration/main
f8fa978 
Comments
@Ethodeus
changed object result styling and impkemented links for URL properties
156101c
@20jasper
lowered spacing between code blocks and increased height between lines
3af0644
@20jasper
move line break inside code block
a599d29
@20jasper
moved line break inside of div
e1e7a15
@20jasper
increased line height, removed bottom margin, and decreased margin top
fccdda2
@Ethodeus
changed styling of <a> tags
f8de28b
@Ethodeus
changed decription font size, removed dash from h1 and adjusted resul…
663be53 
…t div width
@Ethodeus
added table with object properties and their value description
4525ee9
Ethodeus and others added 29 commits June 13, 2022 00:41
@Ethodeus
added some media queries for the contributors cards
6557c29
@schneedotdev
fixed contributors card size and fixed alexis' picture
8f53eec
@schneedotdev
updated my contributor card
05989af
@schneedotdev
changed footer links
6359b83
@schneedotdev
changed a tag links
002c6a7
@20jasper
Added links for Jacob Asper
a796933
@schneedotdev
Merge pull request #36 from the-api-administration/docs
b784c2a 
Documentation and cards
@schneedotdev
Merge pull request #37 from the-api-administration/footer
3716061 
added footer information
@Ethodeus
increased the width of the cards and centered the container section o…
0536a5e 
…f the cards
@Ethodeus
Merge branch 'contributor-links' of https://github.com/the-api-admini…
12b88be 
…stration/coding-resources-api into contributor-links
@schneedotdev
Merge pull request #38 from the-api-administration/contributor-links
9fb30bd 
Contributor links
@erikateal
Update index.ejs
b63ea46 
edited input placeholder
@erikateal
Update index.ejs
f0378d0 
edited input placeholder
@erikateal
added social links contributor card
b090034
@alexisintech
Merge pull request #39 from the-api-administration/test
6ad9b0d 
adding contributor links to contributor-links branch
@alexisintech
added contributor links for social media card
57fec30
@alexisintech
fixed a tags to include target='_blank'
afb0428
@Ethodeus
Merge pull request #40 from the-api-administration/contributor-links
8ec61c8 
Contributor links
@alexisintech
added contributor links for alondra and jacob good
0d63f1c
@erikateal
added social links to contributor card for Dana, Bianca, and Alyssha
cba61d9
@erikateal
Merge branch 'contributor-links' of https://github.com/the-api-admini…
7fd27a2 
…stration/coding-resources-api into contributor-links
@erikateal
Merge pull request #41 from the-api-administration/contributor-links
939f994 
added contributor links to all cards
@schneedotdev
Merge pull request #42 from the-api-administration/test
b0cbc41 
Test
@erikateal
Create CONTRIBUTING.md
041fdb8 
added contributing file
@Ethodeus
added js functionality to scroll to a target element
f686621
@schneedotdev
handled case where keyword doesnt exist
faf3b38
@schneedotdev
Merge pull request #43 from the-api-administration/scroll-fix
44c92ca 
added js functionality to scroll to a target element
@Ethodeus
Merge pull request #47 from the-api-administration/keyword-not-found
a400a35 
Keyword not found, Issue #45
@20jasper
Merge pull request #46 from the-api-administration/resources
d1d5401 
Resources
@20jasper 20jasper merged commit c06b669 into resources Jun 14, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@20jasper @schneedotdev @alexisintech @Ethodeus @erikateal