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

merge main to dev #758

Merged
merged 2 commits into from
Oct 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .cz.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"commitizen": {
"name": "cz_customize",
"version": "3.0.0",
"version": "3.0.1",
"tag_format": "$major.$minor.$patch$prerelease",
"version_type": "semver",
"bump_message": "release $current_version \u2192 $new_version",
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/bd-fe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,9 @@ jobs:
id: vars
env:
name: "${{ env.BRANCH_NAME }}"
environment: ${{ github.ref_name == 'main' && 'prd' || 'stg' }}
run: |
echo "RELEASE_NAME=stg-${name/\//-}" >> $GITHUB_ENV
echo "RELEASE_NAME=${environment}-${name/\//-}" >> $GITHUB_ENV
echo "DIST=$(date +%y%m%d-%H%M%S)" >> $GITHUB_ENV

- name: 𐂷 Checkout
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

All notable changes to this project will be documented in this file.

## [3.0.1] - 2023-10-04

### 🐛 Bug Fixes

- ***(front)*** Content padding/margin adjustments (#732/#721)

## [3.0.0] - 2023-10-01

### 💡 Features
Expand Down
8 changes: 5 additions & 3 deletions PRIVACY.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@ By accessing or using this website, you're happily agreeing to the terms laid ou

1. **Personal Information**: Rest assured, we don't collect personal details apart from browser and system information. We've gone to great lengths to remove any personally identifiable information from our Analytics and Error Logging tools (more on those below). This includes visitors' IP addresses and even the fancy-sounding `server_name`, which refers to your computer's network name.

1. **[Plausible Analytics](https://plausible.io)** is our trusty sidekick for keeping track of pageviews and counting visitors. You might enjoy checking out the company's [delightful post about privacy policies](https://plausible.io/blog/privacy-policy-page#privacy-policy-examples), which inspired most of this document. For more specific details about Plausible's privacy practices, please see the [Third-Party Services](#third-party-services) section below.
1. **[Plausible Analytics](https://plausible.io)** is our trusty sidekick for keeping track of pageviews and counting visitors. You might enjoy checking out the company's [delightful post about privacy policies](https://plausible.io/blog/privacy-policy-page#privacy-policy-examples), which inspired most of this document. We [publicly share analytics data](https://p.dgrebb.com/) for all to view :)

For more specific details about Plausible's privacy practices, please see the [Third-Party Services](#third-party-services) section below.

2. **[Sentry.io](https://www.sentry.io)** comes to our rescue when it comes to capturing errors on both the client (browser) and server (500s, 400s, and 300s). Sentry helps diagnose problems with this site by capturing browser and system information. It even allows us to "playback" user interactions on the site, which is quite handy for figuring out broken code or user experience blunders.

Now, here's the thing: Sentry, by default, logs IP addresses. But fear not! We scrub this data before it reaches the sentry.io services and servers. The JavaScript responsible for this scrubbing is cleverly hidden away from evident view on main dgrebb.com pages. However, you can [view the source](https://www.wikihow.com/View-Source-Code) of our static [404 page](/404.html). In in the `<head>` (look for the `<script>` tag with `id="four-ohhhhh-four"`). Go ahead, take a peek:
Now, here's the thing: Sentry, by default, logs IP addresses. But fear not! We scrub this data before it reaches the sentry.io services and servers. The JavaScript responsible for this scrubbing is cleverly hidden away from evident view on main dgrebb.com pages. However, you can [view the source](https://www.wikihow.com/View-Source-Code) of our static, unminified [404 page](/404.html). In in the `<head>` (look for the `<script>` tag with `id="four-ohhhhh-four"`). Go ahead, take a peek:

```javascript
beforeSend(event) {
Expand Down Expand Up @@ -69,4 +71,4 @@ We reserve the right to update or modify this Privacy Policy at any time. The mo

If you have any questions, concerns, or requests regarding this Privacy Policy, don't hesitate to reach out to us at privacy [at] dgrebb.com. We're here to listen, assist, and make you smile.

By using this website, you acknowledge that you've read and understood this Privacy Policy, and you wholeheartedly consent to the collection, use, and disclosure of your information as described herein. Now go forth and explore the wonders of dgrebb.com!
By using this website, you acknowledge that you've read and understood this Privacy Policy, and you wholeheartedly consent to the collection, use, and disclosure of your information as described herein. Now go forth and explore the wonders of [dgrebb.com](https://www.dgrebb.com)!
72 changes: 36 additions & 36 deletions _ci/spell/dict.txt
Original file line number Diff line number Diff line change
@@ -1,47 +1,47 @@
dgrebb
subdir
strapi
cmsdomain
FARGATE
jsonencode
awsvpc
awslogs
regexall
fqdns
awsvpc
basedomain
reportsdomain
cdndomain
etag
filemd
wonka
notfound
navbrand
beareth
blistre
psxl
psbl
Csvg
cdndomain
cmsdomain
Commeth
Crect
subactive
pubdate
extralight
hljs
Csvg
developeth
dgrebb
doctag
themeset
pinboard
Grebb
beareth
Ensureth
etag
extralight
FARGATE
filemd
fqdns
fullname
Grebb
hljs
jsonencode
navbrand
navigateth
notfound
obtaineth
pageviews
ohhhhh
ongoingly
Strapi
Commeth
developeth
pageviews
pinboard
provideth
psbl
psxl
pubdate
regexall
replacestate
reportsdomain
runneth
shineth
Speaketh
runneth
navigateth
provideth
Ensureth
replacestate
Strapi
subactive
subdir
themeset
unminified
wonka
2 changes: 1 addition & 1 deletion back/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "cms.dgrebb.com",
"private": true,
"version": "3.0.0",
"version": "3.0.1",
"description": "cms.dgrebb.com",
"scripts": {
"develop": "strapi develop",
Expand Down
2 changes: 1 addition & 1 deletion front/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dgrebb.com",
"version": "3.0.0",
"version": "3.0.1",
"private": true,
"type": "module",
"scripts": {
Expand Down
9 changes: 9 additions & 0 deletions front/src/lib/styles/pages/post.css
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,15 @@
h2.footnotes-title {
margin-top: 3rem;
}
ul {
li {
margin-left: 1rem;
list-style-type: disc;
li {
margin-left: 0.5rem;
}
}
}
blockquote {
@apply dg--font-lb;
position: relative;
Expand Down
2 changes: 1 addition & 1 deletion front/src/lib/styles/pages/privacy.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
font-size: 1rem;
@media screen and (min-width: 640px) {
margin-top: 1rem;
padding-top: 7.77rem;
padding: 7.77rem 3.75rem 1rem 3.75rem;
}
@media screen and (min-width: 768px) {
margin-top: 2.75rem;
Expand Down
Loading