From a82480fc3b6abd7f0b521e6eaa3702315b585908 Mon Sep 17 00:00:00 2001 From: user <user@x2.lan> Date: Tue, 20 Feb 2024 09:45:00 +0100 Subject: [PATCH] add flip cards to results page --- =5 | 12 ++++++++++++ env.example | 1 + .../{onboarding/card_box.html => flip_card_box.html} | 8 +++++--- .../{onboarding/card_box.yaml => flip_card_box.yaml} | 0 .../patterns/organisms/cards/flip_card_list.html | 5 +++++ .../card_list.yaml => flip_card_list.yaml} | 0 .../organisms/cards/onboarding/card_list.html | 5 ----- .../patterns/templates/main/results/results.html | 8 ++++++++ .../patterns/templates/onboarding/homepage.html | 2 +- package.json | 2 +- vite.config.js | 2 +- 11 files changed, 34 insertions(+), 11 deletions(-) create mode 100644 =5 create mode 100644 env.example rename majak_uistyleguide/templates/patterns/molecules/boxes/{onboarding/card_box.html => flip_card_box.html} (81%) rename majak_uistyleguide/templates/patterns/molecules/boxes/{onboarding/card_box.yaml => flip_card_box.yaml} (100%) create mode 100644 majak_uistyleguide/templates/patterns/organisms/cards/flip_card_list.html rename majak_uistyleguide/templates/patterns/organisms/cards/{onboarding/card_list.yaml => flip_card_list.yaml} (100%) delete mode 100644 majak_uistyleguide/templates/patterns/organisms/cards/onboarding/card_list.html create mode 100644 majak_uistyleguide/templates/patterns/templates/main/results/results.html diff --git a/=5 b/=5 new file mode 100644 index 0000000..e5a3d43 --- /dev/null +++ b/=5 @@ -0,0 +1,12 @@ + +up to date, audited 172 packages in 886ms + +39 packages are looking for funding + run `npm fund` for details + +2 high severity vulnerabilities + +To address all issues, run: + npm audit fix + +Run `npm audit` for details. diff --git a/env.example b/env.example new file mode 100644 index 0000000..f9adf67 --- /dev/null +++ b/env.example @@ -0,0 +1 @@ +DATABASE_URL=postgres://styleguide:styleguide@localhost:5432/styleguide diff --git a/majak_uistyleguide/templates/patterns/molecules/boxes/onboarding/card_box.html b/majak_uistyleguide/templates/patterns/molecules/boxes/flip_card_box.html similarity index 81% rename from majak_uistyleguide/templates/patterns/molecules/boxes/onboarding/card_box.html rename to majak_uistyleguide/templates/patterns/molecules/boxes/flip_card_box.html index 2a314e4..f418c47 100644 --- a/majak_uistyleguide/templates/patterns/molecules/boxes/onboarding/card_box.html +++ b/majak_uistyleguide/templates/patterns/molecules/boxes/flip_card_box.html @@ -31,9 +31,11 @@ {{ content|safe }} </div> - <div class="flex justify-center items-center my-5"> - {% include 'patterns/atoms/buttons/round_button.html' with button_text=button_text %} - </div> + {% if button_text %} + <div class="flex justify-center items-center my-5"> + {% include 'patterns/atoms/buttons/round_button.html' with button_text=button_text %} + </div> + {% endif %} </div> </div> </div> diff --git a/majak_uistyleguide/templates/patterns/molecules/boxes/onboarding/card_box.yaml b/majak_uistyleguide/templates/patterns/molecules/boxes/flip_card_box.yaml similarity index 100% rename from majak_uistyleguide/templates/patterns/molecules/boxes/onboarding/card_box.yaml rename to majak_uistyleguide/templates/patterns/molecules/boxes/flip_card_box.yaml diff --git a/majak_uistyleguide/templates/patterns/organisms/cards/flip_card_list.html b/majak_uistyleguide/templates/patterns/organisms/cards/flip_card_list.html new file mode 100644 index 0000000..162341f --- /dev/null +++ b/majak_uistyleguide/templates/patterns/organisms/cards/flip_card_list.html @@ -0,0 +1,5 @@ +<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 content-stretch gap-4"> + {% for card in cards %} + {% include 'patterns/molecules/boxes/flip_card_box.html' with title=card.title image_url=card.image_url content=card.content button_text=card.button_text %} + {% endfor %} +</div> diff --git a/majak_uistyleguide/templates/patterns/organisms/cards/onboarding/card_list.yaml b/majak_uistyleguide/templates/patterns/organisms/cards/flip_card_list.yaml similarity index 100% rename from majak_uistyleguide/templates/patterns/organisms/cards/onboarding/card_list.yaml rename to majak_uistyleguide/templates/patterns/organisms/cards/flip_card_list.yaml diff --git a/majak_uistyleguide/templates/patterns/organisms/cards/onboarding/card_list.html b/majak_uistyleguide/templates/patterns/organisms/cards/onboarding/card_list.html deleted file mode 100644 index a97fb4d..0000000 --- a/majak_uistyleguide/templates/patterns/organisms/cards/onboarding/card_list.html +++ /dev/null @@ -1,5 +0,0 @@ -<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 content-stretch gap-4"> - {% for card in cards %} - {% include 'patterns/molecules/boxes/onboarding/card_box.html' with title=card.title image_url=card.image_url content=card.content button_text=card.button_text %} - {% endfor %} -</div> diff --git a/majak_uistyleguide/templates/patterns/templates/main/results/results.html b/majak_uistyleguide/templates/patterns/templates/main/results/results.html new file mode 100644 index 0000000..c430a2c --- /dev/null +++ b/majak_uistyleguide/templates/patterns/templates/main/results/results.html @@ -0,0 +1,8 @@ +{% include 'patterns/organisms/layout/navbar.html' %} +{% include 'patterns/organisms/header/simple_header.html' with title="Výsledky" %} + +<main role="main" class="mb-10 xl:mb-32"> + <div class="container--wide my-20"> + {% include 'patterns/organisms/cards/flip_card_list.html' %} + </div> +</main> diff --git a/majak_uistyleguide/templates/patterns/templates/onboarding/homepage.html b/majak_uistyleguide/templates/patterns/templates/onboarding/homepage.html index 02cde07..5485194 100644 --- a/majak_uistyleguide/templates/patterns/templates/onboarding/homepage.html +++ b/majak_uistyleguide/templates/patterns/templates/onboarding/homepage.html @@ -8,7 +8,7 @@ {% include 'patterns/molecules/menus/onboarding/carousel.html' %} <div class="container--wide my-20"> - {% include 'patterns/organisms/cards/onboarding/card_list.html' %} + {% include 'patterns/organisms/cards/flip_card_list.html' %} </div> </main> diff --git a/package.json b/package.json index f21f60c..4ed0507 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,6 @@ "tailwind-css-variables": "^2.0.3", "tailwindcss": "^3.1.8", "tailwindcss-typography": "^3.1.0", - "vite": "^3.1.3" + "vite": "^5.1.3" } } diff --git a/vite.config.js b/vite.config.js index e3dbf55..1e9b097 100644 --- a/vite.config.js +++ b/vite.config.js @@ -8,7 +8,7 @@ export default defineConfig({ base: '/static/', server: { host: '0.0.0.0', - port: 3000, + port: 5173, open: true, watch: { usePolling: true, -- GitLab