Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: studio1902/statamic-peak
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: Employbl/statamic-peak
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.

Commits on Aug 2, 2020

  1. Update README.md

    Rob de Kort authored Aug 2, 2020
    Copy the full SHA
    fdd6c2f View commit details
  2. Update README.md

    Rob de Kort authored Aug 2, 2020
    Copy the full SHA
    4122f3b View commit details
  3. Update README.md

    Rob de Kort authored Aug 2, 2020
    Copy the full SHA
    0464d8e View commit details
  4. Update README.md

    robdekort authored Aug 2, 2020
    Copy the full SHA
    4d23bc0 View commit details
  5. Update README.md

    robdekort authored Aug 2, 2020
    Copy the full SHA
    296cc10 View commit details
  6. Update README.md

    robdekort authored Aug 2, 2020
    Copy the full SHA
    ddb2a81 View commit details
  7. Copy the full SHA
    5d067b0 View commit details
  8. Copy the full SHA
    15348fa View commit details
  9. Copy the full SHA
    4031953 View commit details
  10. Copy the full SHA
    c1a080a View commit details
  11. Update readme

    robdekort committed Aug 2, 2020
    Copy the full SHA
    34bc8ca View commit details
  12. Update readme

    robdekort committed Aug 2, 2020
    Copy the full SHA
    65a6d19 View commit details
  13. Copy the full SHA
    2e57465 View commit details
  14. Copy the full SHA
    bb09c55 View commit details
  15. Copy the full SHA
    afa3c48 View commit details
  16. Copy the full SHA
    d6a61ae View commit details
  17. Update readme

    robdekort committed Aug 2, 2020
    Copy the full SHA
    fa5fe22 View commit details
  18. Update readme, add license

    robdekort committed Aug 2, 2020
    Copy the full SHA
    319b942 View commit details
  19. Update readme

    robdekort committed Aug 2, 2020
    Copy the full SHA
    529f6ae View commit details
  20. Update readme

    robdekort committed Aug 2, 2020
    Copy the full SHA
    15d09be View commit details
  21. Update readme

    robdekort committed Aug 2, 2020
    Copy the full SHA
    f00444f View commit details
  22. Update readme

    robdekort committed Aug 2, 2020
    Copy the full SHA
    9587a50 View commit details

Commits on Aug 3, 2020

  1. Copy the full SHA
    7a497ed View commit details
  2. Update tailwind config

    Sizing utilities go into utilities now
    robdekort committed Aug 3, 2020
    Copy the full SHA
    8e2079b View commit details
  3. Copy the full SHA
    a3f0733 View commit details
  4. Fix typo's in readme

    robdekort committed Aug 3, 2020
    Copy the full SHA
    551e3cf View commit details
  5. Fix typo's in readme

    robdekort committed Aug 3, 2020
    Copy the full SHA
    32cd1b4 View commit details
  6. Fix typo's in readme

    robdekort committed Aug 3, 2020
    Copy the full SHA
    a623050 View commit details
  7. Fix even more tpyo's

    robdekort committed Aug 3, 2020
    Copy the full SHA
    8cb4da0 View commit details
  8. Copy the full SHA
    ed611c2 View commit details
  9. Update readme

    robdekort committed Aug 3, 2020
    Copy the full SHA
    af1b7c8 View commit details
  10. Copy the full SHA
    01f930f View commit details
  11. Update README.md

    robdekort authored Aug 3, 2020
    Copy the full SHA
    3fdf652 View commit details
  12. 1
    Copy the full SHA
    66a442c View commit details
  13. Update README.md

    robdekort authored Aug 3, 2020
    Copy the full SHA
    6a01378 View commit details

Commits on Aug 4, 2020

  1. Added missing 'viewport-fit=cover'

    So env(safe-area-inset) is actually working. Thanks Paul for pointing out it's missing.
    robdekort committed Aug 4, 2020
    Copy the full SHA
    e542c66 View commit details
  2. Removing user-scalable=yes

    It's on by default and you should never turn it off.
    robdekort committed Aug 4, 2020
    Copy the full SHA
    a9473b5 View commit details
  3. Update readme

    robdekort committed Aug 4, 2020
    Copy the full SHA
    5386fae View commit details
  4. update figure fieldset

    vladdu committed Aug 4, 2020
    Copy the full SHA
    b20ee60 View commit details
  5. Copy the full SHA
    f4230d1 View commit details
  6. Update README.md

    robdekort authored Aug 4, 2020
    Copy the full SHA
    1e78221 View commit details
  7. Copy the full SHA
    2e376e0 View commit details
  8. Copy the full SHA
    1db4bc6 View commit details
  9. explicit alpine var

    philipboomy committed Aug 4, 2020
    Copy the full SHA
    6711fdb View commit details
  10. Merge pull request #9 from vladdu/fix

    update figure fieldset
    robdekort authored Aug 4, 2020
    Copy the full SHA
    e14b7c5 View commit details
  11. Merge pull request #10 from philipboomy/main

    explicit alpine var
    robdekort authored Aug 4, 2020
    Copy the full SHA
    74a78ed View commit details

Commits on Aug 5, 2020

  1. Copy the full SHA
    cb2f570 View commit details

Commits on Aug 6, 2020

  1. Update dependencies

    robdekort committed Aug 6, 2020
    Copy the full SHA
    b5f730b View commit details
  2. Restyle screen breakpoint notice

    * Postion top left
    * Smaller padding and font size
    * No more box shadow
    * Add border
    robdekort committed Aug 6, 2020
    Copy the full SHA
    7a879f3 View commit details
  3. Update readme

    robdekort committed Aug 6, 2020
    Copy the full SHA
    e0619a6 View commit details
Showing with 32,545 additions and 19,837 deletions.
  1. +24 −12 .env.example
  2. +76 −0 .github/CODE_OF_CONDUCT.md
  3. +1 −0 .github/FUNDING.yml
  4. +38 −0 .github/ISSUE_TEMPLATE/bug_report.md
  5. +20 −0 .github/ISSUE_TEMPLATE/feature_request.md
  6. +1 −1 .gitignore
  7. +523 −0 CHANGELOG.md
  8. +21 −0 LICENSE.md
  9. +94 −0 README.example.md
  10. +46 −66 README.md
  11. +34 −0 app/Console/Commands/WarmCommand.php
  12. +6 −2 app/Console/Kernel.php
  13. +26 −0 app/Http/Controllers/DynamicToken.php
  14. +1 −1 app/Http/Middleware/VerifyCsrfToken.php
  15. +88 −0 app/Listeners/GenerateFavicons.php
  16. +5 −0 app/Providers/EventServiceProvider.php
  17. +24 −0 app/Tags/MountUrl.php
  18. +15 −13 composer.json
  19. +0 −8,901 composer.lock
  20. +1 −1 config/app.php
  21. +3 −3 config/filesystems.php
  22. +15 −2 config/statamic/assets.php
  23. +36 −7 config/statamic/cp.php
  24. +16 −1 config/statamic/git.php
  25. +11 −0 config/statamic/graphql.php
  26. +4 −4 config/statamic/live_preview.php
  27. +1 −1 config/statamic/protect.php
  28. +11 −0 config/statamic/routes.php
  29. +3 −3 config/statamic/search.php
  30. +1 −1 config/statamic/sites.php
  31. +1 −1 config/statamic/stache.php
  32. +8 −16 config/statamic/system.php
  33. +1 −1 config/statamic/users.php
  34. +4 −0 content/assets/favicons.yaml
  35. +0 −5 content/collections/pages.yaml
  36. +0 −13 content/collections/pages/diensten.md
  37. +7 −27 content/collections/pages/home.md
  38. +11 −0 content/collections/pages/second-page.md
  39. +11 −0 content/collections/pages/sub-page-1.md
  40. +11 −0 content/collections/pages/sub-page-2.md
  41. +0 −14 content/collections/services.yaml
  42. +0 −6 content/collections/services/service-1.md
  43. +0 −6 content/collections/services/service-2.md
  44. +4 −0 content/globals/configuration.yaml
  45. +0 −6 content/globals/error_messages.yaml
  46. +6 −0 content/globals/favicons.yaml
  47. +1 −0 content/globals/redirects.yaml
  48. +14 −0 content/globals/seo.yaml
  49. 0 content/navigation/.gitkeep
  50. +3 −12 content/navigation/main.yaml
  51. +10 −0 content/trees/collections/pages.yaml
  52. +10 −0 content/trees/navigation/main.yaml
  53. +0 −5 modernizr.config.js
  54. +27,936 −9,947 package-lock.json
  55. +23 −20 package.json
  56. +0 −5 public/assets/.meta/half-tone.svg.yaml
  57. +0 −5 public/assets/.meta/logo.svg.yaml
  58. 0 public/favicons/.gitkeep
  59. BIN public/favicons/android-chrome-192x192.png
  60. BIN public/favicons/android-chrome-512x512.png
  61. BIN public/favicons/apple-touch-icon.png
  62. +0 −9 public/favicons/browserconfig.xml
  63. BIN public/favicons/favicon-16x16.png
  64. BIN public/favicons/favicon-32x32.png
  65. BIN public/favicons/favicon.ico
  66. BIN public/favicons/mstile-150x150.png
  67. +0 −18 public/favicons/safari-pinned-tab.svg
  68. +0 −19 public/favicons/site.webmanifest
  69. +0 −16 public/vendor/app/css/cp.css
  70. 0 public/visuals/.gitkeep
  71. +0 −5 resources/blueprints/assets/icons.yaml
  72. +32 −16 resources/blueprints/collections/pages/page.yaml
  73. +0 −37 resources/blueprints/collections/services/service.yaml
  74. +36 −0 resources/blueprints/forms/contact.yaml
  75. +31 −0 resources/blueprints/globals/configuration.yaml
  76. +0 −14 resources/blueprints/globals/error_messages.yaml
  77. +147 −0 resources/blueprints/globals/favicons.yaml
  78. +58 −0 resources/blueprints/globals/redirects.yaml
  79. +415 −0 resources/blueprints/globals/seo.yaml
  80. +111 −17 resources/blueprints/globals/social_media.yaml
  81. +1 −0 resources/blueprints/user.yaml
  82. +13 −0 resources/css/custom.css
  83. +1 −2 resources/css/site.css
  84. +14 −5 resources/fieldsets/article.yaml
  85. +130 −8 resources/fieldsets/button.yaml
  86. +3 −2 resources/fieldsets/buttons.yaml
  87. +22 −0 resources/fieldsets/call_to_action.yaml
  88. +23 −0 resources/fieldsets/collection.yaml
  89. +31 −23 resources/fieldsets/common.yaml
  90. +1 −1 resources/fieldsets/{error_messages.yaml → error_message.yaml}
  91. +5 −14 resources/fieldsets/figure.yaml
  92. +30 −0 resources/fieldsets/form.yaml
  93. +0 −31 resources/fieldsets/introduction.yaml
  94. +38 −0 resources/fieldsets/link_blocks.yaml
  95. +25 −6 resources/fieldsets/page_builder.yaml
  96. +0 −14 resources/fieldsets/projects.yaml
  97. +5 −1 resources/fieldsets/pull_quote.yaml
  98. +177 −0 resources/fieldsets/seo.yaml
  99. +0 −14 resources/fieldsets/services.yaml
  100. +0 −12 resources/fieldsets/social_media.yaml
  101. +43 −0 resources/fieldsets/table.yaml
  102. +3 −3 resources/fieldsets/video.yaml
  103. +17 −0 resources/forms/contact.yaml
  104. +35 −2 resources/js/site.js
  105. +8 −0 resources/lang/en.json
  106. +44 −0 resources/lang/en/strings.php
  107. +1 −0 resources/svg/breakpoint.svg
  108. +1 −0 resources/svg/edit.svg
  109. +1 −0 resources/svg/error.svg
  110. +1 −0 resources/svg/invisible.svg
  111. +1 −0 resources/svg/moon.svg
  112. +1 −0 resources/svg/notice.svg
  113. +1 −0 resources/svg/search.svg
  114. +1 −0 resources/svg/success.svg
  115. +1 −0 resources/svg/sun.svg
  116. +1 −0 resources/svg/visible.svg
  117. +12 −16 resources/users/roles.yaml
  118. +19 −11 resources/views/components/_button.antlers.html
  119. +21 −0 resources/views/components/_button_attributes.antlers.html
  120. +6 −4 resources/views/components/_buttons.antlers.html
  121. +39 −0 resources/views/components/_cookie_banner.antlers.html
  122. +49 −0 resources/views/components/_dark_mode_toggle.antlers.html
  123. +21 −0 resources/views/components/_figure.antlers.html
  124. +4 −0 resources/views/components/_logo.antlers.html
  125. +41 −0 resources/views/components/_notification.antlers.html
  126. +30 −0 resources/views/components/_pagination.antlers.html
  127. +50 −0 resources/views/components/_picture.antlers.html
  128. +11 −0 resources/views/components/_pull_quote.antlers.html
  129. +48 −0 resources/views/components/_search_form.antlers.html
  130. +39 −0 resources/views/components/_table.antlers.html
  131. +2 −1 resources/views/components/_text.antlers.html
  132. +34 −0 resources/views/components/_toolbar.antlers.html
  133. +8 −0 resources/views/components/_video.antlers.html
  134. +2 −2 resources/views/default.antlers.html
  135. +90 −0 resources/views/email/form_owner.antlers.html
  136. +19 −0 resources/views/email/form_owner_text.antlers.html
  137. +102 −0 resources/views/email/form_sender.antlers.html
  138. +24 −0 resources/views/email/form_sender_text.antlers.html
  139. +20 −2 resources/views/errors/404.antlers.html
  140. +13 −5 resources/views/layout.antlers.html
  141. +9 −2 resources/views/layout/_footer.antlers.html
  142. +6 −3 resources/views/layout/_header.antlers.html
  143. +14 −0 resources/views/manifest/manifest.antlers.html
  144. +9 −0 resources/views/navigation/_breadcrumbs.antlers.html
  145. +116 −6 resources/views/navigation/_main.antlers.html
  146. +2 −1 resources/views/page_builder/_article.antlers.html
  147. +10 −0 resources/views/page_builder/_call_to_action.antlers.html
  148. +15 −0 resources/views/page_builder/_collection.antlers.html
  149. +105 −0 resources/views/page_builder/_form.antlers.html
  150. +35 −0 resources/views/page_builder/_link_blocks.antlers.html
  151. +0 −11 resources/views/page_builder/_services.antlers.html
  152. +52 −0 resources/views/search.antlers.html
  153. +16 −0 resources/views/sitemap/sitemap.antlers.html
  154. +39 −0 resources/views/snippets/_background_image.antlers.html
  155. +16 −0 resources/views/snippets/_favicons.antlers.html
  156. +175 −0 resources/views/snippets/_seo.antlers.html
  157. +5 −0 resources/views/typography/_caption.antlers.html
  158. +2 −1 resources/views/typography/_h1.antlers.html
  159. +2 −1 resources/views/typography/_h2.antlers.html
  160. +2 −1 resources/views/typography/_h3.antlers.html
  161. +2 −1 resources/views/typography/_paragraph.antlers.html
  162. +0 −1 resources/views/typography/_section_title.antlers.html
  163. +0 −68 resources/views/vendor/statamic/auth/login.blade.php
  164. +5 −0 resources/views/vendor/statamic/forms/fields/assets.antlers.html
  165. +8 −0 resources/views/vendor/statamic/forms/fields/checkboxes.antlers.html
  166. +9 −0 resources/views/vendor/statamic/forms/fields/default.antlers.html
  167. +9 −0 resources/views/vendor/statamic/forms/fields/integer.antlers.html
  168. +8 −0 resources/views/vendor/statamic/forms/fields/radio.antlers.html
  169. +9 −0 resources/views/vendor/statamic/forms/fields/select.antlers.html
  170. +9 −0 resources/views/vendor/statamic/forms/fields/text.antlers.html
  171. +8 −0 resources/views/vendor/statamic/forms/fields/textarea.antlers.html
  172. +1 −1 routes/console.php
  173. +20 −3 routes/web.php
  174. +23 −289 tailwind.config.js
  175. +199 −0 tailwind.config.peak.js
  176. +107 −0 tailwind.config.site.js
  177. +63 −0 tailwind.config.typography.js
  178. +16 −10 webpack.mix.js
36 changes: 24 additions & 12 deletions .env.example
Original file line number Diff line number Diff line change
@@ -6,16 +6,10 @@ APP_URL=http://localhost

LOG_CHANNEL=stack

DB_CONNECTION=mysql
DB_HOST=127.0.0.1
DB_PORT=3306
DB_DATABASE=laravel
DB_USERNAME=root
DB_PASSWORD=

BROADCAST_DRIVER=log
CACHE_DRIVER=file
QUEUE_CONNECTION=sync
REDIS_DATABASE=
SESSION_DRIVER=file
SESSION_LIFETIME=120

@@ -24,10 +18,10 @@ REDIS_PASSWORD=null
REDIS_PORT=6379

MAIL_MAILER=smtp
MAIL_HOST=smtp.mailtrap.io
MAIL_PORT=2525
MAIL_USERNAME=null
MAIL_PASSWORD=null
MAIL_HOST=0.0.0.0
MAIL_PORT=1025
MAIL_USERNAME=testuser
MAIL_PASSWORD=testpwd
MAIL_ENCRYPTION=null
MAIL_FROM_ADDRESS=null
MAIL_FROM_NAME="${APP_NAME}"
@@ -45,5 +39,23 @@ AWS_BUCKET=
MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

DEBUGBAR_ENABLED=false
DEBUGBAR_ENABLED=true
STATAMIC_REVISIONS_ENABLED=false
SAVE_CACHED_IMAGES=true
CACHING_STRATEGY=null
#IMAGE_MANIPULATION_DRIVER=imagick
STATAMIC_API_ENABLED=false
STATAMIC_CACHE_TAGS_ENABLED=false
STATAMIC_GIT_ENABLED=false
STATAMIC_GIT_PUSH=false
STATAMIC_GIT_DISPATCH_DELAY=5
STATAMIC_REVISIONS_ENABLED=false
STATAMIC_STACHE_WATCHER=true
STATAMIC_THEME=business
#STATAMIC_CUSTOM_CMS_NAME=
#STATAMIC_CUSTOM_LOGO_OUTSIDE_URL=
#STATAMIC_CUSTOM_LOGO_NAV_URL=
#STATAMIC_CUSTOM_FAVICON_URL=
#STATAMIC_CUSTOM_CSS_URL=

STATAMIC_LICENSE_KEY=
76 changes: 76 additions & 0 deletions .github/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 info@studio1902.nl. 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
1 change: 1 addition & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
github: studio1902
38 changes: 38 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
---
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.
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
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.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -18,4 +18,4 @@ yarn-error.log
/public/js/site.js
/public/js/site.js.map
/public/js/site.js.LICENSE.txt
/public/mix-manifest.json
/public/mix-manifest.json
Loading