Skip to content

Commit

Permalink
Prettier all the things
Browse files Browse the repository at this point in the history
  • Loading branch information
Ansimorph committed Dec 31, 2024
1 parent 54860ec commit 1bc92dd
Show file tree
Hide file tree
Showing 8 changed files with 95 additions and 97 deletions.
86 changes: 43 additions & 43 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,46 +1,46 @@
name: CI
on:
push:
branches:
- master
push:
branches:
- master
jobs:
build:
name: Build and Deploy
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: "actions/setup-python@v2"
with:
python-version: "3.x"
- uses: actions/setup-node@v3
with:
node-version: "22"
- name: "Install Python dependencies"
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
- name: Get npm cache directory
id: npm-cache-dir
shell: bash
run: echo "dir=$(npm config get cache)" >> ${GITHUB_OUTPUT}
- uses: actions/cache@v3
id: npm-cache
with:
path: ${{ steps.npm-cache-dir.outputs.dir }}
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-
- name: "Install NPM dependencies"
run: "npm install"
- name: "Build"
run: "npm run build"
env:
PASSWORD: ${{ secrets.PASSWORD }}
- name: "Deploy"
uses: SamKirkland/FTP-Deploy-Action@4.3.3
with:
server: ftp.ganslandt.xyz
username: gansland
server-dir: "public_html/"
local-dir: "./dist/"
password: ${{ secrets.FTP_PASSWORD }}
build:
name: Build and Deploy
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: "actions/setup-python@v2"
with:
python-version: "3.x"
- uses: actions/setup-node@v3
with:
node-version: "22"
- name: "Install Python dependencies"
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
- name: Get npm cache directory
id: npm-cache-dir
shell: bash
run: echo "dir=$(npm config get cache)" >> ${GITHUB_OUTPUT}
- uses: actions/cache@v3
id: npm-cache
with:
path: ${{ steps.npm-cache-dir.outputs.dir }}
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-
- name: "Install NPM dependencies"
run: "npm install"
- name: "Build"
run: "npm run build"
env:
PASSWORD: ${{ secrets.PASSWORD }}
- name: "Deploy"
uses: SamKirkland/FTP-Deploy-Action@4.3.3
with:
server: ftp.ganslandt.xyz
username: gansland
server-dir: "public_html/"
local-dir: "./dist/"
password: ${{ secrets.FTP_PASSWORD }}
6 changes: 3 additions & 3 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"trailingComma": "all",
"singleQuote": false,
"vueIndentScriptAndStyle": false
"trailingComma": "all",
"singleQuote": false,
"vueIndentScriptAndStyle": false
}
12 changes: 5 additions & 7 deletions .stylelintrc
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
{
"extends": ["stylelint-config-standard", "stylelint-config-prettier"],
"rules": {
"at-rule-no-unknown": null,
"unit-no-unknown": [
true,
ignoreUnits: [ "base" ]
]
}
"rules":
{
"at-rule-no-unknown": null,
"unit-no-unknown": [true, ignoreUnits: ["base"]],
},
}
2 changes: 1 addition & 1 deletion src/assets/google1e03e51ff2928a76.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
google-site-verification: google1e03e51ff2928a76.html
google-site-verification: google1e03e51ff2928a76.html
24 changes: 12 additions & 12 deletions src/assets/manifest.webmanifest
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"icons": [
{
"src": "/images/android-chrome-192x192.png",
"type": "image/png",
"sizes": "192x192"
},
{
"src": "/images/android-chrome-512x512.png",
"type": "image/png",
"sizes": "512x512"
}
]
"icons": [
{
"src": "/images/android-chrome-192x192.png",
"type": "image/png",
"sizes": "192x192"
},
{
"src": "/images/android-chrome-512x512.png",
"type": "image/png",
"sizes": "512x512"
}
]
}
14 changes: 7 additions & 7 deletions src/css/reset.css
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
html {
font-size: 62.5%; /* Rem Base */
font-size: 62.5%; /* Rem Base */
}

*,
*::before,
*::after {
box-sizing: border-box;
box-sizing: border-box;
}

*:not(input) {
margin: 0;
padding: 0;
font-weight: normal;
margin: 0;
padding: 0;
font-weight: normal;
}

ol,
ul {
list-style: none;
list-style: none;
}

img {
width: 100%;
width: 100%;
}
30 changes: 15 additions & 15 deletions src/css/utilities.css
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
.visually-hidden {
/* https://snook.ca/archives/html_and_css/hiding-content-for-accessibility */
position: absolute !important;
height: 1px;
width: 1px;
overflow: hidden;
clip: rect(1px, 1px, 1px, 1px);
/* https://snook.ca/archives/html_and_css/hiding-content-for-accessibility */
position: absolute !important;
height: 1px;
width: 1px;
overflow: hidden;
clip: rect(1px, 1px, 1px, 1px);
}

.space-6base {
margin-bottom: 6base;
margin-bottom: 6base;
}

.space-8base {
margin-bottom: 8base;
margin-bottom: 8base;
}

.space-10base {
margin-bottom: 10base;
margin-bottom: 10base;
}

.space-12base {
margin-bottom: 12base;
margin-bottom: 12base;
}

.container {
width: 100%;
max-width: 120rem;
padding-left: 8base;
padding-right: 8base;
margin: 0 auto;
width: 100%;
max-width: 120rem;
padding-left: 8base;
padding-right: 8base;
margin: 0 auto;
}
18 changes: 9 additions & 9 deletions src/utils/decryptfonts.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ const ENCRYPT_FILE_EXTENSION = "enc";
const password = process.env.PASSWORD;

glob(`dist/**/*.${ENCRYPT_FILE_EXTENSION}`, {}, (er, files) => {
files.forEach((file) => {
const instance = new Cryptify(file, password);
instance.decrypt().then((decryptedFile) => {
fs.rename(
file,
file.replace("." + ENCRYPT_FILE_EXTENSION, ""),
(err) => {},
);
});
files.forEach((file) => {
const instance = new Cryptify(file, password);
instance.decrypt().then((decryptedFile) => {
fs.rename(
file,
file.replace("." + ENCRYPT_FILE_EXTENSION, ""),
(err) => {},
);
});
});
});

0 comments on commit 1bc92dd

Please sign in to comment.