Skip to content

Commit

Permalink
Merge pull request #16 from falsepopsky/patch-update
Browse files Browse the repository at this point in the history
patch update
  • Loading branch information
falsepopsky authored Jul 20, 2024
2 parents 0474431 + 0052182 commit 190709f
Show file tree
Hide file tree
Showing 10 changed files with 374 additions and 385 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"features": {
"ghcr.io/devcontainers/features/node:1": {
"nodeGypDependencies": true,
"version": "20.15.0",
"version": "20.15.1",
"nvmVersion": "latest"
}
},
Expand Down
1 change: 1 addition & 0 deletions .github/labeler.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@
- ".prettierrc"
- next.config.js
- ".eslintrc.json"
- ".devcontainer/**"
16 changes: 4 additions & 12 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ on:
branches:
- main

env:
PNPM_VERSION: 9.4.0

jobs:
lint:
name: ⬣ Lint
Expand All @@ -18,11 +15,9 @@ jobs:
- name: Checkout repo
uses: actions/[email protected]
- name: Setup pnpm
uses: pnpm/[email protected]
with:
version: ${{ env.PNPM_VERSION }}
uses: pnpm/action-setup@v4
- name: Setup Node
uses: actions/setup-node@v4.0.2
uses: actions/setup-node@v4
with:
node-version-file: ".nvmrc"
cache: pnpm
Expand All @@ -38,15 +33,12 @@ jobs:
- name: Checkout repo
uses: actions/[email protected]
- name: Setup pnpm
uses: pnpm/[email protected]
with:
version: ${{ env.PNPM_VERSION }}
uses: pnpm/action-setup@v4
- name: Setup Node
uses: actions/setup-node@v4.0.2
uses: actions/setup-node@v4
with:
node-version-file: ".nvmrc"
cache: pnpm

- name: Install dependencies
run: pnpm install
- name: Run build
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/labeler.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ jobs:
steps:
- uses: actions/labeler@v5
with:
repo-token: ${{ secrets.LABELER_TOKEN }}
configuration-path: .github/labeler.yaml
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v20.15.0
v20.15.1
7 changes: 2 additions & 5 deletions app/Shared.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,8 @@ export function getSvgMapElement(key: SVGKEYS) {
),
'no-longer-on-list': (
<>
<svg viewBox='0 0 43.09 38.46' width={24}>
<path
d='M21.64,12.46l-11,1v15l1,.17v7.92l11,1.92h1l9-1V14.46l-10-2h-1Zm1,24.91l-10-1.83v-6.75l10,1.67v6.91Zm9-.91l-8,.89V16.46l8-.89v20.89ZM22.64,15.46v13.83l-11-1.83V14.46l10.31-.94,6.47,1.29-5.79,.64ZM0,9.12l7.77,4.53,.5-.86L.5,8.26l-.5,.86ZM5.2,4.3l3.1,3.93,.79-.62-3.1-3.93-.79,.62Zm37.39,3.96l-7.77,4.53,.5,.86,7.77-4.53-.5-.86Zm-5.48-4.57l-3.1,3.93,.79,.62,3.1-3.93-.79-.62ZM21.53,0l-4.06,5.49-7.28-2.81s-.04,.1,3.42,6.93c5.2-.75,10.62-.75,15.82,0,3.47-6.88,3.43-6.92,3.43-6.92l-7.29,2.81L21.53,0Z'
fill='#ffce00'
/>
<svg viewBox='0 0 43.09 38.46' width={24} className='fill-violet-900 dark:fill-[#ffce00]'>
<path d='M21.64,12.46l-11,1v15l1,.17v7.92l11,1.92h1l9-1V14.46l-10-2h-1Zm1,24.91l-10-1.83v-6.75l10,1.67v6.91Zm9-.91l-8,.89V16.46l8-.89v20.89ZM22.64,15.46v13.83l-11-1.83V14.46l10.31-.94,6.47,1.29-5.79,.64ZM0,9.12l7.77,4.53,.5-.86L.5,8.26l-.5,.86ZM5.2,4.3l3.1,3.93,.79-.62-3.1-3.93-.79,.62Zm37.39,3.96l-7.77,4.53,.5,.86,7.77-4.53-.5-.86Zm-5.48-4.57l-3.1,3.93,.79,.62,3.1-3.93-.79-.62ZM21.53,0l-4.06,5.49-7.28-2.81s-.04,.1,3.42,6.93c5.2-.75,10.62-.75,15.82,0,3.47-6.88,3.43-6.92,3.43-6.92l-7.29,2.81L21.53,0Z' />
</svg>
<span className='hidden lg:block'>No Longer on List</span>
</>
Expand Down
4 changes: 2 additions & 2 deletions app/rush/[slug]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export default async function Post({ params }: ParamsProps) {
return (
<a
href={`#${type.toLowerCase().replaceAll(' ', '-')}`}
className='flex h-11 items-center gap-1 rounded-sm border border-[#256860] bg-[#f3fbf9] px-2 hover:border-[#2b7d74] dark:bg-[#101b19]'
className='flex h-11 items-center gap-1 rounded-sm border border-[#256860] bg-teal-100/70 px-2 hover:border-[#2b7d74] dark:bg-[#101b19]'
key={type}>
{getSvgMapElement(type.toLowerCase().replaceAll(' ', '-') as SVGKEYS)}
</a>
Expand All @@ -58,7 +58,7 @@ export default async function Post({ params }: ParamsProps) {
<div key={type} className='mb-3 mt-6 px-2 xl:px-0'>
<h2
id={type.toLowerCase().replaceAll(' ', '-')}
className='rounded-t-md border border-[#256860] border-b-transparent bg-[#f3fbf9] pl-1 pt-1 text-lg/snug dark:bg-[#101b19]'>
className='rounded-t-md border border-[#256860] border-b-transparent bg-teal-100/70 pl-1 pt-1 text-lg/snug dark:bg-[#101b19]'>
{type}
</h2>

Expand Down
4 changes: 2 additions & 2 deletions app/speed/[slug]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export default async function Post({ params }: ParamsProps) {
return (
<a
href={`#${type.toLowerCase().replaceAll(' ', '-')}`}
className='flex h-11 items-center gap-1 rounded-sm border border-[#256860] bg-[#f3fbf9] px-2 hover:border-[#2b7d74] dark:bg-[#101b19]'
className='flex h-11 items-center gap-1 rounded-sm border border-[#256860] bg-teal-100/70 px-2 hover:border-[#2b7d74] dark:bg-[#101b19]'
key={type}>
{getSvgMapElement(type.toLowerCase().replaceAll(' ', '-') as SVGKEYS)}
</a>
Expand All @@ -57,7 +57,7 @@ export default async function Post({ params }: ParamsProps) {
<div key={type} className='mb-3 mt-6 px-2 xl:px-0'>
<h2
id={type.toLowerCase().replaceAll(' ', '-')}
className='rounded-t-md border border-[#256860] border-b-transparent bg-[#f3fbf9] pl-1 pt-1 dark:bg-[#101b19] md:text-lg/snug'>
className='rounded-t-md border border-[#256860] border-b-transparent bg-teal-100/70 pl-1 pt-1 dark:bg-[#101b19] md:text-lg/snug'>
{type}
</h2>

Expand Down
26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,32 +14,32 @@
"postinstall": "prisma generate"
},
"dependencies": {
"@prisma/client": "^5.15.1",
"next": "^14.2.4",
"@prisma/client": "^5.17.0",
"next": "^14.2.5",
"next-themes": "^0.3.0",
"react": "^18.3.1",
"react-dom": "^18.3.1"
},
"devDependencies": {
"@radix-ui/react-dropdown-menu": "^2.1.0",
"@types/node": "^20.14.7",
"@radix-ui/react-dropdown-menu": "^2.1.1",
"@types/node": "^20.14.11",
"@types/react": "^18.3.3",
"@typescript-eslint/eslint-plugin": "^7.13.1",
"@typescript-eslint/parser": "^7.13.1",
"@typescript-eslint/eslint-plugin": "^7.16.1",
"@typescript-eslint/parser": "^7.16.1",
"autoprefixer": "^10.4.19",
"eslint": "^8.57.0",
"eslint-config-next": "^14.2.4",
"eslint-config-next": "^14.2.5",
"eslint-config-prettier": "^9.1.0",
"postcss": "^8.4.38",
"prettier": "^3.3.2",
"postcss": "^8.4.39",
"prettier": "^3.3.3",
"prettier-plugin-tailwindcss": "^0.6.5",
"prisma": "^5.15.1",
"tailwindcss": "^3.4.4",
"typescript": "^5.4.5"
"prisma": "^5.17.0",
"tailwindcss": "^3.4.6",
"typescript": "^5.5.3"
},
"engines": {
"node": "^20.0.0",
"pnpm": ">=9"
},
"packageManager": "pnpm@9.4.0+sha256.b6fd0bfda555e7e584ad7e56b30c68b01d5a04f9ee93989f4b93ca8473c49c74"
"packageManager": "pnpm@9.5.0+sha512.140036830124618d624a2187b50d04289d5a087f326c9edfc0ccd733d76c4f52c3a313d4fc148794a2a9d81553016004e6742e8cf850670268a7387fc220c903"
}
Loading

0 comments on commit 190709f

Please sign in to comment.