Skip to content

Merge test into main #56

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

Merged
bytesbybianca merged 14 commits into from
Jun 14, 2022
Merged

Merge test into main #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
c06b669
Merge pull request #48 from the-api-administration/test
20jasper Jun 14, 2022
49c9c5d
Merge pull request #50 from the-api-administration/test
Ethodeus Jun 14, 2022
d43c916
added res: Thumbnails for Social Media "Metatags"
BrettCrafton Jun 14, 2022
13c4c44
add res: Learn CSS Layouts
BrettCrafton Jun 14, 2022
67b6a43
added function removing default for enter press
20jasper Jun 14, 2022
59e9f23
add res: 4 cheat sheets
BrettCrafton Jun 14, 2022
dcfad27
got rid of unnecessary function
20jasper Jun 14, 2022
473c3bf
scrolled back to the top on search
20jasper Jun 14, 2022
6b78502
moved scroll to the top into getMatches function so it works for butt…
20jasper Jun 14, 2022
dbf9847
Merge pull request #54 from the-api-administration/search-on-enter
Ethodeus Jun 14, 2022
09b8876
Merge pull request #53 from BrettCrafton/main
Ethodeus Jun 14, 2022
3e5e4fe
Merge branch 'test' into resources
Ethodeus Jun 14, 2022
ec17536
Merge pull request #55 from the-api-administration/resources
Ethodeus Jun 14, 2022
c3b64ca
Merge branch 'main' into test
bytesbybianca Jun 14, 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
16 changes: 16 additions & 0 deletions public/js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,18 @@ scrollBtn.addEventListener("click", function () {
});
});

const input = document.querySelector('input')
const scrollContainer = document.querySelector('.scroll-container')
//add event listener for when input is focused
input.addEventListener('keydown', (e) => {
if (e.key === 'Enter') {
//stop browser from refreshing
e.preventDefault()
getMatches()
}
});


const btn = document.getElementById('keyword-btn');
btn.addEventListener('click', getMatches);

Expand All @@ -28,6 +40,10 @@ async function getMatches() {
} catch (err) {
console.error(err);
}
//reset search bar to empty
document.querySelector('input').value = ''
//scroll back to the top
scrollContainer.scrollTop = 0
}

/**
Expand Down
26 changes: 26 additions & 0 deletions resources.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,32 @@ const resources = [
url: 'https://cloudconvert.com/jpg-to-webp',
keywords: ['jpg', 'webp', 'converter', 'heic', 'formats', 'high-quality', 'api']
},

{
name: 'Thumbnails for Social Media "Metatags',
url: 'https://nickcarmont8.medium.com/how-to-add-a-website-thumbnail-for-sharing-your-html-site-on-social-media-facebook-linkedin-12813f8d2618',
keywords: ['metadata', 'metatags', 'thumbnails', 'social media']
},
{
name: 'HTML Cheat Sheet',
url: 'https://htmlcheatsheet.com/',
keywords: ['HTML', 'cheat sheet', 'tags']
},
{
name: 'CSS Cheat Sheet',
url: 'https://htmlcheatsheet.com/css/',
keywords: ['CSS', 'cheat sheet', 'box model', 'selectors', 'color picker']
},
{
name: 'JS "JavaScript" Cheat Sheet',
url: 'https://htmlcheatsheet.com/js/',
keywords: ['JS', 'Javascript', 'cheat sheet', 'conditionals', 'loops', 'variables', 'dates', 'events', 'functions', 'regex', 'json', 'promises', 'arrays']
},
{
name: 'SEO Cheat Sheet',
url: 'https://htmlcheatsheet.com/seo/',
keywords: ['SEO', 'cheat sheet']
},
// Resource Format - please follow the styling below.
// {
// name: '',
Expand Down