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.

Sign up for GitHub

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

Jump to bottom

Replace lottie parkfuchs logo with svg and CSS cleanup #17

Merged
merged 4 commits into from
Oct 10, 2023
Merged

Replace lottie parkfuchs logo with svg and CSS cleanup #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8aa6e7d
update pocketbase to 18.1
Oct 5, 2023
c26ed28
list css cleanup
Oct 5, 2023
ea224e5
update dialog animation
Oct 5, 2023
d5d01fb
replace lottie parkfuchs logo with svg
Oct 10, 2023
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
18 changes: 10 additions & 8 deletions components/CityList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,10 @@ export default function CityList({
}, [items]);

return (
<div className={`accordion ${className}`} id="accordionList">
<div
className={`accordion ${className} divide-y-2 divide-gray-200`}
id="accordionList"
>
{isEmpty && (
<div className="text-center px-4 text-lg my-6">
Es wurde keine Stadt gefunden. Vielleicht möchtest du eine
Expand All @@ -106,15 +109,14 @@ export default function CityList({
return (
<div
key={item.id}
className="accordion-item-wrapper bg-cardBg border border-gray-200 w-full"
className="accordion-item-wrapper bg-white w-full"
>
<h2 className="accordion-header mb-0">
<header
<header className="accordion-header mb-0">
<h2
className={`accordion-button
relative block items-center w-full py-4 px-5
text-base text-black text-left
bg-white border-0 rounded-none
transition focus:outline-none ${
bg-white transition focus:outline-none ${
isSelected(item.id) ? "accordion-button-open" : ""
}`}
role="button"
Expand Down Expand Up @@ -158,8 +160,8 @@ export default function CityList({
</button>
)}
</div>
</header>
</h2>
</h2>
</header>
<div
className={`accordion-content ${
isSelected(item.id)
Expand Down
2 changes: 1 addition & 1 deletion components/Dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ export default function Dialog({
open={isOpen}
id="dialog"
aria-label="Formular zum hinzufügen eines neuen Ortes"
className="mx-auto animate-slideIn overflow-y-hidden backdrop:bg-red-300 relative top-16 bg-transparent max-w-2xl w-full px-4 md:px-0"
className="mx-auto animate-show overflow-y-hidden backdrop:bg-red-300 relative top-16 bg-transparent max-w-2xl w-full px-4 md:px-0"
>
<div className="rounded-lg shadow mt-1 bg-white mx-auto">
<header className="flex bg-green rounded-t-lg items-start justify-between border-b align-start h-14">
Expand Down
19 changes: 12 additions & 7 deletions components/Logo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
"use client";
import parkfuchsLogo from "../public/parkfuchs-lottie.json";
import Lottie from "lottie-react";
import Image from "next/image";
import parkfuchsLogo from "../public/parkfuchs.svg";

export default function Logo() {
return (
<Lottie
animationData={parkfuchsLogo}
loop={true}
// <Lottie
// animationData={parkfuchsLogo}
// loop={true}
// width={64}
// draggable={false}
// alt="Parkfuchs Logo"
// className="w-16 mt-[-8px]"
// />
<Image
src={parkfuchsLogo}
width={64}
draggable={false}
alt="Parkfuchs Logo"
className="w-16 mt-[-8px]"
/>
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"@fortawesome/react-fontawesome": "^0.2.0",
"@tailwindcss/forms": "^0.5.6",
"@types/node": "20.8.2",
"@types/react": "18.2.24",
"@types/react-dom": "18.2.8",
"@types/react": "18.2.25",
"@types/react-dom": "18.2.10",
"axios": "^1.5.1",
"eslint": "8.50.0",
"eslint-config-next": "13.5.4",
Expand All @@ -27,7 +27,7 @@
"lottie-react": "^2.4.0",
"next": "13.5.4",
"next-pwa": "^5.6.0",
"pocketbase": "^0.18.0",
"pocketbase": "^0.18.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-hook-form": "^7.47.0",
Expand Down
9 changes: 4 additions & 5 deletions tailwind.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ module.exports = {
extend: {
colors: {
backgroundPrimary: "#ece9e1",
cardBg: "#f9f8f6",
green: "#D1D9C0",
lightGreen: "#E9ECE0",
red: "#D53D25",
Expand All @@ -18,17 +17,17 @@ module.exports = {
visibility: ["group-hover"],
animation: {
fade: "fadeIn 200ms ease-in-out",
slideIn: "slideIn 275ms ease-in",
show: "show 380ms ease normal",
bounceX: "bounceX 1.8s infinite",
},
keyframes: {
fadeIn: {
"0%": { opacity: 0 },
"100%": { opacity: 1 },
},
slideIn: {
"0%": { top: "-50px", opacity: 0 },
"100%": { top: "0", opacity: 1 },
show: {
from: { transform: "translateY(-110%)" },
to: { transform: "translateY(0%)" },
},
bounceX: {
"0%, 100%": {
Expand Down
30 changes: 15 additions & 15 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1868,12 +1868,12 @@ __metadata:
languageName: node
linkType: hard

"@types/react-dom@npm:18.2.8":
version: 18.2.8
resolution: "@types/react-dom@npm:18.2.8"
"@types/react-dom@npm:18.2.10":
version: 18.2.10
resolution: "@types/react-dom@npm:18.2.10"
dependencies:
"@types/react": "*"
checksum: d36264631028d021b73cd9e015f10b95c4959ae1ce8f7a7419f318d1f05b1d063e6afffcd2a349a6bccd64ccc9ee9d2d976e1f0437643f0e7db621fa035bca65
checksum: ced70643d82dd9d165cd6d1a98ec7556daf77d8fdec1ed19badb744a2a2370a84cc109248667536d7f850409e85432c300ec9f8c87d46e066ad295ddf9b6ab03
languageName: node
linkType: hard

Expand All @@ -1897,14 +1897,14 @@ __metadata:
languageName: node
linkType: hard

"@types/react@npm:18.2.24":
version: 18.2.24
resolution: "@types/react@npm:18.2.24"
"@types/react@npm:18.2.25":
version: 18.2.25
resolution: "@types/react@npm:18.2.25"
dependencies:
"@types/prop-types": "*"
"@types/scheduler": "*"
csstype: ^3.0.2
checksum: ea5d8204e71b1c9c6631f429a93f8e7be0614cdbdb464e92b3181bdccd8a7c45e30ded8b13da726684b6393f651317c36d54832e3d3cdea0da480a3f26268909
checksum: 177515cd44135d56191ec6c5c10edd490c96c175d37624d9c37bc2007c3abcf6cc2d2137d2a073d692cdc5129d5d5785bd60a6ddd315f695da5d8b989fa2afc5
languageName: node
linkType: hard

Expand Down Expand Up @@ -6383,8 +6383,8 @@ __metadata:
"@fortawesome/react-fontawesome": ^0.2.0
"@tailwindcss/forms": ^0.5.6
"@types/node": 20.8.2
"@types/react": 18.2.24
"@types/react-dom": 18.2.8
"@types/react": 18.2.25
"@types/react-dom": 18.2.10
"@types/react-list": ^0.8.8
autoprefixer: ^10.4.16
axios: ^1.5.1
Expand All @@ -6398,7 +6398,7 @@ __metadata:
lottie-react: ^2.4.0
next: 13.5.4
next-pwa: ^5.6.0
pocketbase: ^0.18.0
pocketbase: ^0.18.1
postcss: ^8.4.31
react: ^18.2.0
react-dom: ^18.2.0
Expand Down Expand Up @@ -6552,10 +6552,10 @@ __metadata:
languageName: node
linkType: hard

"pocketbase@npm:^0.18.0":
version: 0.18.0
resolution: "pocketbase@npm:0.18.0"
checksum: 3bd7f66a42aef1f6aaa7573ebc4f2b26b8ca10ee54c8d74c7527e160ba471622e37cb38a59244dd22d41d904772fb96c0d124a6b8035c0dc0e2e4645d04fd790
"pocketbase@npm:^0.18.1":
version: 0.18.1
resolution: "pocketbase@npm:0.18.1"
checksum: aa5bf328e4e0f68b661093d219a5bb20adfc9b5d5ea79c23168c718e8c53c35e65e72875a60adb4712cd34e78510099d47931143f6e265f7a5f8e1c73d37deed
languageName: node
linkType: hard

Expand Down