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

Migration to version 2 #10

Open
wants to merge 138 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
138 commits
Select commit Hold shift + click to select a range
20c4a76
wip
Jozwiaczek Oct 29, 2020
9616428
Display song from contentfu
Jozwiaczek Oct 31, 2020
b833c86
Fix linter and prettier
Jozwiaczek Oct 31, 2020
cae8f06
Fix linter and prettier
Jozwiaczek Nov 1, 2020
51c30de
wip
Jozwiaczek Nov 1, 2020
feb22de
wip
Jozwiaczek Nov 1, 2020
eee7d69
Fix sidebar
Jozwiaczek Nov 1, 2020
dbc3abe
chord integration
Mefjus Nov 1, 2020
e248dc8
resolve merge conflicts
Mefjus Nov 1, 2020
43f5b92
Integrate search with contentful
Jozwiaczek Nov 1, 2020
a121dc8
Fix getSlug import and title desc for song page
Jozwiaczek Nov 1, 2020
938e6e9
Add homepage
Jozwiaczek Nov 5, 2020
ac8fa23
Integrate with current cms state
Jozwiaczek Nov 6, 2020
d6678c9
Remove yarn package.json engine
Jozwiaczek Nov 6, 2020
681dd8f
Remove clean from build script
Jozwiaczek Nov 6, 2020
b0bf5e8
Add search highlighter
Jozwiaczek Nov 10, 2020
7648705
Add page template
werczyn Nov 10, 2020
6472c9f
Update gatsby-theme-guitar-book/src/components/allChordsPreview.js
Mefjus Nov 13, 2020
1cff437
Update gatsby-theme-guitar-book/src/components/template.js
Mefjus Nov 13, 2020
f112591
fix homepage-template component name
Jozwiaczek Nov 13, 2020
0172eab
Merge branch 'feature/contentful-integration' into chords-integration
Jozwiaczek Nov 13, 2020
9be8a46
cleanup
Mefjus Nov 13, 2020
2771752
fixed font
Mefjus Nov 13, 2020
83e2815
:lipstick: Cosmetic improvements
Jozwiaczek Nov 13, 2020
a572e9b
Merge pull request #7 from Jozwiaczek/chords-integration
Jozwiaczek Nov 13, 2020
4b57565
Merge branch 'feature/contentful-integration' into add-aboutUs-page
Jozwiaczek Nov 13, 2020
f4f61b2
wip
Mefjus Nov 13, 2020
c2d4a0a
wip
Mefjus Nov 13, 2020
e4d9ff6
:bug: Fix social-card rendering
Jozwiaczek Nov 14, 2020
32a05ac
Revert "wip"
Jozwiaczek Nov 14, 2020
e71e6d7
Revert "wip"
Jozwiaczek Nov 14, 2020
90490e7
Revert "wip"
Jozwiaczek Nov 14, 2020
8a77218
Revert "wip"
Jozwiaczek Nov 14, 2020
f4e9c13
Fix contentful secrets
Jozwiaczek Nov 14, 2020
e3753bf
Contentful integration with netlify wip
Jozwiaczek Nov 14, 2020
2b80c5d
Add custom social-bg
Jozwiaczek Nov 14, 2020
948eede
Merge pull request #8 from Jozwiaczek/add-aboutUs-page
Jozwiaczek Nov 14, 2020
439b459
Merge pull request #6 from Jozwiaczek/feature/contentful-integration
Jozwiaczek Nov 14, 2020
b199cc6
Merge branch 'master-v2' into author-page
Jozwiaczek Nov 14, 2020
a708884
:arrow_up: Upgrade Gatsby
Jozwiaczek Nov 14, 2020
ac5ed62
Remove imageAboutUs and unused dependencies
Jozwiaczek Nov 14, 2020
772197a
:fire: Remove old content
Jozwiaczek Nov 14, 2020
9622b9d
Change polish package name to example
Jozwiaczek Nov 14, 2020
8fd18b6
Create CODE_OF_CONDUCT.md
Jozwiaczek Nov 14, 2020
d37dd5f
Merge branch 'master-v2' into add-code-of-conduct-1
Jozwiaczek Nov 14, 2020
30eafbc
Merge pull request #11 from Jozwiaczek/add-code-of-conduct-1
Jozwiaczek Nov 14, 2020
9ca001d
Update issue templates
Jozwiaczek Nov 14, 2020
2fe7560
Merge branch 'master-v2' into Jozwiaczek-patch-1
Jozwiaczek Nov 14, 2020
c7cc9b7
Merge pull request #12 from Jozwiaczek/Jozwiaczek-patch-1
Jozwiaczek Nov 14, 2020
386543e
added author page
Mefjus Nov 14, 2020
9188cec
added see-more component
Mefjus Nov 15, 2020
155a59e
wip
Mefjus Nov 15, 2020
b8e5fab
Merge branch 'master-v2' into author-page
Jozwiaczek Nov 15, 2020
6e46d2e
Fix husky, and lint staged, remove unneeded content from root README
Jozwiaczek Nov 15, 2020
3dae486
Test deploy commit
Jozwiaczek Nov 15, 2020
fc40c83
Merge pull request #9 from Jozwiaczek/author-page
Jozwiaczek Nov 15, 2020
478535f
Remove unneeded files and content from README
Jozwiaczek Nov 15, 2020
ca0ab35
Display all songs and fix getSlug func
Jozwiaczek Nov 15, 2020
3184d66
added wiki-page extension
Mefjus Nov 15, 2020
19eaaa2
wip
Mefjus Nov 15, 2020
cd2c89b
Merge branch 'master-v2' into extension
Mefjus Nov 15, 2020
24f0571
wip
Mefjus Nov 15, 2020
2e397ff
wip
Mefjus Nov 15, 2020
de648a3
wip
Mefjus Nov 16, 2020
87705be
Fix social cards and section-nav
Jozwiaczek Nov 16, 2020
b1c5beb
Merge pull request #14 from Jozwiaczek/fix-social-card-and-side-nav
Jozwiaczek Nov 16, 2020
3b35625
Merge branch 'master-v2' into extension
Jozwiaczek Nov 16, 2020
7afdc74
Merge pull request #13 from Jozwiaczek/extension
Jozwiaczek Nov 16, 2020
af518c0
Update README.md
Jozwiaczek Nov 16, 2020
fa7b640
Update README.md
Jozwiaczek Nov 16, 2020
5eb84f1
Change extensions package name and fix aside nav displaying
Jozwiaczek Nov 16, 2020
d070f97
Merge pull request #15 from Jozwiaczek/change-package-name
Jozwiaczek Nov 16, 2020
87a5c88
Fix baseUrl
Jozwiaczek Nov 16, 2020
0dc3d69
Fix dependencies
Jozwiaczek Nov 16, 2020
49bba4a
Remove unneeded items from gatsby-config, add menu items, add social …
Jozwiaczek Nov 16, 2020
54a1a8c
Add favourites songs menu item, add random songs and authors menu ite…
Jozwiaczek Nov 17, 2020
9b6e298
Merge pull request #16 from Jozwiaczek/add-menu-items
Jozwiaczek Nov 17, 2020
d62e1be
wip
Mefjus Nov 17, 2020
8395db7
Move verse component to chords directory, remove one redundant getSlu…
Jozwiaczek Nov 17, 2020
0a40922
Merge pull request #17 from Jozwiaczek/refactor-and-list-style
Jozwiaczek Nov 17, 2020
bdf2b15
wip
Mefjus Nov 17, 2020
902275b
merge
Mefjus Nov 17, 2020
1c2ba58
fixed end of line format
Mefjus Nov 17, 2020
d168a7a
Fix soundcloud icon color, remove unused code in chordPreview, Change…
Jozwiaczek Nov 17, 2020
172b78b
Merge pull request #19 from Jozwiaczek/logos-and-author-link
Jozwiaczek Nov 17, 2020
b51f688
Merge branch 'master-v2' into pages
Jozwiaczek Nov 17, 2020
c17b390
added pages authors.js songs.js favourites.js
Mefjus Nov 17, 2020
2d6085b
Merge remote-tracking branch 'origin/pages' into pages
Mefjus Nov 17, 2020
f48128d
clean up
Mefjus Nov 17, 2020
0c0e1c9
Add scrollbar styles consistent with theme
Jozwiaczek Nov 17, 2020
0203472
Merge pull request #20 from Jozwiaczek/add-scrollbar-styles
Jozwiaczek Nov 17, 2020
d1743bc
Merge branch 'master-v2' into pages
Jozwiaczek Nov 17, 2020
e26cc42
new listView style
Mefjus Nov 17, 2020
f19ee21
Merge remote-tracking branch 'origin/pages' into pages
Mefjus Nov 17, 2020
b475603
Merge pull request #18 from Jozwiaczek/pages
Jozwiaczek Nov 17, 2020
b61ec50
Add styles for authors static page, add descriptions for static pages…
Jozwiaczek Nov 17, 2020
48b31db
Merge branch 'master-v2' into all-authors-page
Jozwiaczek Nov 17, 2020
e13e90a
styles
Mefjus Nov 17, 2020
4a9f11e
Merge remote-tracking branch 'origin/all-authors-page' into all-autho…
Mefjus Nov 17, 2020
f65f1db
Merge pull request #21 from Jozwiaczek/all-authors-page
Jozwiaczek Nov 17, 2020
8f47bd5
Display image in page template and show autoscroll in toolbox only fo…
Jozwiaczek Nov 18, 2020
3ab03ad
Merge pull request #22 from Jozwiaczek/add-image-for-page-template
Jozwiaczek Nov 18, 2020
d7fd97c
Fix toolbox height
Jozwiaczek Nov 18, 2020
53cd921
Add global settings from contentful
Jozwiaczek Nov 19, 2020
5eedae0
Merge pull request #25 from Jozwiaczek/add-global-settings
Jozwiaczek Nov 19, 2020
b4500de
Extract menu items into component, display menu on homepage
Jozwiaczek Nov 19, 2020
6d40a9c
Remove unused import
Jozwiaczek Nov 19, 2020
6658229
Merge pull request #26 from Jozwiaczek/add-menu-for-homepage
Jozwiaczek Nov 19, 2020
bfcecb7
Show menu as right sidebar menu item and fix styling for menu title o…
Jozwiaczek Nov 20, 2020
33bf9d7
wip
Mefjus Nov 20, 2020
fffb81e
Remove custom-link component, add base-template
Jozwiaczek Nov 20, 2020
afb0f35
wip
Mefjus Nov 21, 2020
77d9828
wip
Mefjus Nov 21, 2020
5ed6feb
wip
Mefjus Nov 21, 2020
4cffaad
Add page-base and template-base
Jozwiaczek Nov 21, 2020
7811a06
Change directory structure
Jozwiaczek Nov 21, 2020
e011656
Add new route
Jozwiaczek Nov 21, 2020
86872b1
Merge pull request #27 from Jozwiaczek/components-refactor
Jozwiaczek Nov 21, 2020
f457ef4
Merge branch 'master-v2' into chords-extension
Jozwiaczek Nov 21, 2020
2534ba2
Fix image logo path
Jozwiaczek Nov 21, 2020
d96d263
Merge branch 'master-v2' into chords-extension
Jozwiaczek Nov 21, 2020
944477f
Add react-player instead of iframe
Jozwiaczek Nov 21, 2020
e5abf19
Merge pull request #29 from Jozwiaczek/fix-video-box
Jozwiaczek Nov 21, 2020
8888e48
Merge branch 'master-v2' into chords-extension
Jozwiaczek Nov 21, 2020
02e96b6
search hot keys
Mefjus Nov 21, 2020
147e15e
search hot key options
Mefjus Nov 22, 2020
b004f12
new lyrics type
Mefjus Nov 22, 2020
9baeee4
Add docs for extensions, add missing white spaces styling for songs, …
Jozwiaczek Nov 23, 2020
f12dc83
Merge pull request #28 from Jozwiaczek/chords-extension
Jozwiaczek Nov 23, 2020
b55cf57
Merge branch 'master-v2' into search-hot-key
Jozwiaczek Nov 23, 2020
6856399
Adjust height and color of Hotkeys helper container
Jozwiaczek Nov 23, 2020
64a5fd3
Fix displaying description
Jozwiaczek Nov 23, 2020
9d94e64
Fix social-cards
Jozwiaczek Nov 23, 2020
45d8240
Fix social cards title for static pages (include their names based on…
Jozwiaczek Nov 23, 2020
343c0da
Merge pull request #30 from Jozwiaczek/search-hot-key
Jozwiaczek Nov 23, 2020
1647e9f
Fix displaying social cards for pages which are builds from file (not…
Jozwiaczek Nov 23, 2020
6d90fc5
Remove twitter meta tags from SEO components
Jozwiaczek Nov 23, 2020
fd31636
Fix displaying social-cards for static pages
Jozwiaczek Nov 23, 2020
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
10 changes: 5 additions & 5 deletions .dependabot/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ version: 1
update_configs:
# Keep package.json (& lockfiles) up to date as soon as
# new versions are published to the npm registry
- package_manager: "javascript"
directory: "/"
update_schedule: "monthly"
target_branch: "master"
- package_manager: 'javascript'
directory: '/'
update_schedule: 'monthly'
target_branch: 'master'
default_assignees:
- "Jozwiaczek"
- 'Jozwiaczek'
4 changes: 4 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/node_modules
.cache
build
public
78 changes: 78 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
{
"extends": ["airbnb", "prettier", "prettier/react"],
"env": {
"jest": true,
"mocha": true
},
"globals": {
"document": true,
"window": true,
"navigator": true,
"localStorage": true
},
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"ecmaVersion": 2020,
"sourceType": "module"
},
"rules": {
"import/order": [
"warn",
{
"groups": ["builtin", "external", ["parent", "sibling"], "index"],
"newlines-between": "always-and-inside-groups"
}
],
"react/jsx-sort-props": [
"warn",
{
"callbacksLast": true,
"shorthandFirst": true,
"noSortAlphabetically": true
}
],
"react/no-danger": 0,
"no-console": 0,
"no-shadow": 0,
"no-underscore-dangle": 0,
"no-nested-ternary": 0,
"react/no-unused-prop-types": "warn",
"no-return-assign": 0,
"func-names": 0,
"react/no-array-index-key": 0,
"react/require-default-props": 0,
"react/jsx-props-no-spreading": 0,
"default-case": 0,
"consistent-return": 0,
"react/forbid-prop-types": 0,
"react/prop-types": 0,
"array-callback-return": 0,
"import/prefer-default-export": 0,
"import/no-named-as-default": 0,
"sort-keys": 0,
"jsx-a11y/media-has-caption": 0,
"react/no-unescaped-entities": 0,
"no-unused-vars": 0,
"no-param-reassign": 0,
"import/no-extraneous-dependencies": 0,
"no-unused-expressions": 0,
"no-use-before-define": 0,
"no-restricted-syntax": 0,
"camelcase": 0,
"guard-for-in": 0,
"no-await-in-loop": 0,
"radix": 0,
"no-restricted-globals": 0,
"react/destructuring-assignment": 0,
"no-plusplus": 0,
"jsx-a11y/anchor-has-content": 0,
"react/jsx-filename-extension": [
1,
{
"extensions": [".js"]
}
]
}
}
40 changes: 40 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''
---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:

1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Desktop (please complete the following information):**

- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

**Smartphone (please complete the following information):**

- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]

**Additional context**
Add any other context about the problem here.
7 changes: 7 additions & 0 deletions .github/ISSUE_TEMPLATE/custom.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
name: Custom issue template
about: Describe this issue template's purpose here.
title: ''
labels: ''
assignees: ''
---
19 changes: 19 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''
---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
12 changes: 12 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,15 @@ node_modules
.idea
yarn-error.log
lerna-debug.log
.env.*
!.env.example
.contentfulrc.json

# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*

build
5 changes: 5 additions & 0 deletions .huskyrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module.exports = {
hooks: {
'pre-commit': 'lint-staged',
},
};
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
12
5 changes: 5 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Ignore artifacts:
node_modules
public
.cache
build/
11 changes: 11 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"printWidth": 100,
"singleQuote": true,
"trailingComma": "all",
"tabWidth": 2,
"semi": true,
"arrowParens": "always",
"bracketSpacing": true,
"jsxBracketSameLine": false,
"endOfLine": "lf"
}
76 changes: 76 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
# Contributor Covenant Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, sex characteristics, gender identity and expression,
level of experience, education, socio-economic status, nationality, personal
appearance, race, religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment
include:

- Using welcoming and inclusive language
- Being respectful of differing viewpoints and experiences
- Gracefully accepting constructive criticism
- Focusing on what is best for the community
- Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

- The use of sexualized language or imagery and unwelcome sexual attention or
advances
- Trolling, insulting/derogatory comments, and personal or political attacks
- Public or private harassment
- Publishing others' private information, such as a physical or electronic
address, without explicit permission
- Other conduct which could reasonably be considered inappropriate in a
professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in
response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or
reject comments, commits, code, wiki edits, issues, and other contributions
that are not aligned to this Code of Conduct, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community. Examples of
representing a project or community include using an official project e-mail
address, posting via an official social media account, or acting as an appointed
representative at an online or offline event. Representation of a project may be
further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at [email protected]. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good
faith may face temporary or permanent repercussions as determined by other
members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html

[homepage]: https://www.contributor-covenant.org

For answers to common questions about this code of conduct, see
https://www.contributor-covenant.org/faq
Loading