Compare commits

...

82 Commits

Author SHA1 Message Date
efim
0af0129054 feat(18): not really working docker images 2024-03-15 06:49:46 +00:00
efim
8ff2ec3766 feat(18): displaying + for positive month comparison
wrapping + into span inline, to make it behave like part of
surrounding text in a div, somewhat ok
2024-03-14 14:10:23 +00:00
efim
843c71946f feat(18): desktop styling close enough 2024-03-14 13:51:32 +00:00
efim
51e3629fa5 feat(18): resize without transform, hover states
using transform influences text size, and size of rounded corners

current way hardcodes 8rem for the columns,
maybe i'll pass it as parameter when start doing desktop, i don't know
feels like not a good choice overall, but yeah
2024-03-14 13:04:30 +00:00
efim
ddc003eb13 feat(18): random input data 2024-03-13 17:23:32 +00:00
efim
e81a22dd10 feat(18): adding dynamic data 2024-03-13 17:08:03 +00:00
efim
269cb2967c feat(18): total this month part styled 2024-03-13 16:42:03 +00:00
efim
6b764ae61b fix(18): prettifying styles 2024-03-13 16:07:32 +00:00
efim
44c89e6559 feat(18): google fonts fix
maybe they stopped working without tracking?
2024-03-13 15:57:42 +00:00
efim
a541a2dac2 feat(18): spending bars curDay color 2024-03-13 15:25:25 +00:00
efim
ff7baa0a24 feat(18): initial spending columns component
tailwind doesn't seem to allow scale-y-[var(--the-var)]
maybe that's just the scale thing

overall, still setting style variables, this time with css blocks,
i suppose that's ok
2024-03-13 15:15:10 +00:00
efim
623d05da91 feat(18): basic templates 2024-03-13 12:58:26 +00:00
efim
8601288230 feat(18): colors and fonts to tailwind 2024-03-12 09:00:57 +00:00
efim
fa11926642 init: exercise expenses chart resources 2024-03-12 07:44:13 +00:00
efim
9c8ec7fb0d Add '18-expenses-chart/' from commit '78c9bd1d614c8bdd25a3e1d23bd0a39bb01e65f1'
git-subtree-dir: 18-expenses-chart
git-subtree-mainline: e13fa186e1
git-subtree-split: 78c9bd1d61
2024-03-12 07:09:35 +00:00
efim
78c9bd1d61 refactor: moving templates into dir
routes probably can live in main.go for simpler exercises
2024-03-12 05:46:57 +00:00
efim
9c19bd7b6b feat: initialized tailwind
basic conig targetting templ
templ html page with import
Makefile job that generates for the run
2024-03-11 10:45:47 +00:00
efim
de2fd2bdc0 feat: Makefile for local development
would be even more useful when i'll get tailwind and stuff
2024-03-11 07:32:28 +00:00
efim
81235e3ce6 feat: enabling templ 2024-03-11 04:44:55 +00:00
efim
4f7b2fcd17 init 2024-03-10 19:24:30 +00:00
efim
e13fa186e1 feat: preserving name \ region on active search
by using post - all inputs of same form are sent
so in active search scenario changing region also sends current name,
or changing name also sends current region

had to make additional post endpoint,
but with cask i can directly use form-value as function argument
and can reuse the code, yay
2023-10-11 03:22:31 +00:00
efim
f238940622 docs: readme for first Go exercise 2023-10-04 11:52:18 +00:00
efim
7f4b8cab8a feat: generating tailwind out.css in nix build 2023-10-04 11:28:28 +00:00
efim
b0dd8cded1 feat: docker image for results component 2023-10-04 10:39:33 +00:00
efim
f48d958a2c feat: passing of the port as arg 2023-10-04 09:25:13 +00:00
efim
2cb3cc7c35 feat: split results into insertable component
still not fully sure how this all operates, but allright.
2023-10-04 09:13:12 +00:00
efim
f4ab1ac7ec feat: other fields taken from template data 2023-10-04 08:38:31 +00:00
efim
2769f5e8dc feat: desktop styling 2023-10-04 08:28:02 +00:00
efim
d7dce88751 feat: icons added via <img> by static path 2023-10-04 06:23:34 +00:00
efim
b036002ca8 feat: repeating category in template 2023-10-04 06:03:04 +00:00
efim
70ab1e59c4 feat: button styled 2023-10-04 05:20:55 +00:00
efim
133fa0df2b feat: colors for items via css variable 2023-10-04 05:16:52 +00:00
efim
58ca4ecafa feat: upper part styled 2023-10-03 18:13:16 +00:00
efim
843e55841b fix: fontFamily override name 2023-10-03 17:56:40 +00:00
efim
cfe3994bc9 feat: style guilde fonts enabled 2023-10-03 16:48:45 +00:00
efim
8b95d963fe feat: enabled tailwindcss
and have single watcher command to rebuild out.css and restart the
server:
wgo -verbose -file .go -file .gohtml echo reloading :: bash -c 'tailwindcss -i ./input.css -o public/out.css' :: go run main.go
2023-10-03 15:06:18 +00:00
efim
83d8cd07d2 init: adding frontendmentor task resources 2023-10-03 14:27:38 +00:00
efim
6b323ba746 feat: embedding templates as well
maybe it's possible to somehow limit file server to a directory
2023-10-03 14:12:20 +00:00
efim
e834ff06ab feat: responding with a basic template 2023-10-03 13:52:01 +00:00
efim
f30d9dad94 init: 17 - simple page with go ssr 2023-10-03 10:15:07 +00:00
efim
ee914c8014 feat: active search on main page
over english and native nave, nice
also putting url into history, and also setting up the load anchor
2023-09-28 04:33:41 +00:00
efim
b8d0dc96fd docs: readme for exercise 16 2023-09-27 06:59:43 +00:00
efim
faedb21808 fix: flake naming for countries page 2023-09-27 06:14:20 +00:00
efim
9bdf180f97 feat: loading data from api on start 2023-09-27 05:41:38 +00:00
efim
f383085910 feat: changing to new rest countries api
as returned by https://restcountries.com/v3.1/all
2023-09-27 05:29:15 +00:00
efim
2070bbebb0 feat: adding nix docker image recipe 2023-09-27 04:49:48 +00:00
efim
9edf7f0196 fix: sorting borders put big buttons to end
and most of the buttons look prettier
2023-09-27 04:16:58 +00:00
efim
d7d5ac63ac feat: saving dark mode on page reload
main script is in index, country page template inserts it with
fragment by markup selector syntax:
https://www.thymeleaf.org/doc/tutorials/3.1/usingthymeleaf.html#appendix-c-markup-selector-syntax

and still has some code to work in standalone
2023-09-27 04:15:11 +00:00
efim
841543e984 fix: input clipping on small desktop size 2023-09-27 03:46:43 +00:00
efim
b1c128738f feat: enabling jar build with nix 2023-09-26 16:03:51 +00:00
efim
51319b036b feat: dark theme, font icons
courtesy of https://github.com/tailwindlabs/heroicons
2023-09-26 16:01:37 +00:00
efim
0f30e1fc41 feat: desktop styling of country page 2023-09-25 06:46:39 +00:00
efim
11d5d6254a fix: swap beforeend to prevent nesting main
and url push from the server, because requesting cards now done on a
separate endpoint
2023-09-24 20:22:15 +00:00
efim
ae33d7e72a feat: index page for desktop 2023-09-24 19:58:05 +00:00
efim
aca8599d6e feat: infinite scroll 2023-09-24 14:36:26 +00:00
efim
43daef0455 fix: size errors in img and select 2023-09-24 14:03:50 +00:00
efim
ff296f84eb feat: adding icons
courtesy https://www.svgrepo.com/
2023-09-24 13:58:54 +00:00
efim
ae2b3d1327 feat: single country page, borders 2023-09-24 13:37:39 +00:00
efim
433ff827b7 feat: dummy country page and redirects
from search and cards.
card content wrapped in an anchor doesn't look good,
and search only working with htmx (without graceful degradatino) also
doesn't look too good

but with 'hx-boost="true"' ordinary anchor in card also preserves
header, that's nice
2023-09-23 19:17:09 +00:00
efim
b776000cf0 feat: selection filtering table update 2023-09-23 18:22:09 +00:00
efim
c260d348d7 feat: filtering countries on GET index 2023-09-23 16:28:14 +00:00
efim
153f5ef9ce feat: displaying country previews dynamically 2023-09-23 10:32:27 +00:00
efim
256df8d2aa feat: dynamic region input 2023-09-23 10:06:32 +00:00
efim
d300d5c16b feat: loading country data from resourse json 2023-09-23 09:31:04 +00:00
efim
73804a0ed4 feat: static mobile main page template 2023-09-23 08:31:40 +00:00
efim
4b2c6e4f62 feat: some header and control mockups 2023-09-23 06:54:48 +00:00
efim
7382680fc5 init: style guide for light theme 2023-09-23 05:55:07 +00:00
efim
cee8159c69 init: adding resource files 2023-09-23 04:17:48 +00:00
efim
6d5077159b init: added mainargs for port and host 2023-09-23 04:09:58 +00:00
efim
d74df846f2 init: added tailwindcss 2023-09-23 03:53:08 +00:00
efim
7a8dba19ee init: simple cask, initial template 2023-09-22 17:01:43 +00:00
efim
fe8b54346a docs: adding license to deployable projects 2023-07-22 06:04:42 +00:00
efim
fbeced6eb2 doc(15): link and more gratitute 2023-07-16 15:54:57 +00:00
efim
e17b45d2ec fix(15): sbt-derivation need new hach for new deps 2023-07-16 15:41:53 +00:00
efim
d7bcb418d4 docs(15): lessons learned 2023-07-16 15:34:33 +00:00
efim
77bcf87cd1 feat(15): phone validation htmx inline
making phone input as a fragment that accepts value and error
initial value from overall state, initial error empty string

some contitional classes and hidden error message
wowy,
endpoint that takes POST request, extracts value and resends the
rendered fragment. cool
2023-07-16 15:07:46 +00:00
efim
8c0318c4e2 fix(15): mobile 'months free' alignment 2023-07-16 07:03:56 +00:00
efim
080b47a9a6 feat(15): nix installation & image 2023-07-16 06:45:04 +00:00
efim
01ec722ea0 fix(15): selected plan was reset on mo\yr toggle
hx-put sends all form data, so full page state can be used to render the fragment
2023-07-16 05:10:37 +00:00
efim
e6f36dc0bd feat(15): styling sidebar font 2023-07-16 05:10:25 +00:00
efim
27e19d4494 feat(15): styling step 5 2023-07-16 04:55:10 +00:00
efim
5d0f58edc1 feat(15): step 4 desktop styling 2023-07-16 04:21:04 +00:00
124 changed files with 4771 additions and 429 deletions

0
.go/pkg/mod/cache/lock vendored Normal file
View File

View File

@@ -128,8 +128,8 @@ object Page {
target := "_blank",
"Frontend Mentor. "
),
"Coded by ",
a(href := "#", "Your Name Here")
"Source code at",
a(href := "https://github.com/efim/Learning-HTMX", "Your Name Here")
)
)
}

View File

@@ -43,7 +43,7 @@
Challenge by
<a href="https://www.frontendmentor.io?ref=challenge" target="_blank"
>Frontend Mentor</a
>. Coded by <a href="#">Your Name Here</a>.
>. Source code at <a href="https://github.com/efim/Learning-HTMX">Your Name Here</a>.
</div>
</body>
</html>

View File

@@ -189,7 +189,7 @@
Challenge by
<a href="https://www.frontendmentor.io?ref=challenge" target="_blank"
>Frontend Mentor</a
>. Coded by <a href="#">Your Name Here</a>.
>. Source code at <a href="https://github.com/efim/Learning-HTMX">Your Name Here</a>.
</div>
</body>
</html>

View File

@@ -228,7 +228,7 @@
Challenge by
<a href="https://www.frontendmentor.io?ref=challenge" target="_blank"
>Frontend Mentor</a
>. Coded by <a href="#">Your Name Here</a>.
>. Source code at <a href="https://github.com/efim/Learning-HTMX">Your Name Here</a>.
</footer>
</body>
</html>

View File

@@ -0,0 +1 @@
use flake

View File

@@ -0,0 +1,161 @@
* Frontend Mentor - Multi-step form solution
:PROPERTIES:
:CUSTOM_ID: frontend-mentor---multi-step-form-solution
:END:
This is a solution to the
[[https://www.frontendmentor.io/challenges/multistep-form-YVAnSdqQBJ][Multi-step
form challenge on Frontend Mentor]]. Frontend Mentor challenges help you
improve your coding skills by building realistic projects.
** Overview
:PROPERTIES:
:CUSTOM_ID: overview
:END:
*** The challenge
:PROPERTIES:
:CUSTOM_ID: the-challenge
:END:
Users should be able to:
- Complete each step of the sequence
- Go back to a previous step to update their selections
- See a summary of their selections on the final step and confirm their
order
- View the optimal layout for the interface depending on their device's
screen size
- See hover and focus states for all interactive elements on the page
- Receive form validation messages if:
- A field has been missed
- The email address is not formatted correctly
- A step is submitted, but no selection has been made
*** Screenshot
:PROPERTIES:
:CUSTOM_ID: screenshot
:END:
[[screenshot-desktop.png]]
[[screenshot-mobile.png]]
*** Links
:PROPERTIES:
:CUSTOM_ID: links
:END:
- [[https://www.frontendmentor.io/solutions/responsive-ssr-on-scala-interactivity-by-htmx-thymeleaf-templates-QIGkOSgRa4][Solution URL]]
- [[https://efim-frontentmentor-multi-step-form.onrender.com][Live Site URL]]
** My process
:PROPERTIES:
:CUSTOM_ID: my-process
:END:
*** Built with
:PROPERTIES:
:CUSTOM_ID: built-with
:END:
- Semantic HTML5 markup
well, i tried, but yeah
- TailwinCSS
- Mobile-first workflow
- Server-side rendering, in Scala and Cask
- htmx
- Thymeleaf html templates
*** What I learned
:PROPERTIES:
:CUSTOM_ID: what-i-learned
:END:
**** hx-get and hx-post
***** How i show correct form stage for each user on same URL
on 'index.html' i use "initial loading" element
#+begin_src html
<section hx-get="/get-form" hx-trigger="load" hx-swap="outerHTML">
<!-- here be immediate hx-get for the form. to subscitute the body -->
<img class="w-14 text-green-500 fill-current" src="../public/images/tail-spin.svg" alt="loading..." />
</section>
#+end_src
This element will do single GET request to server to /get-form
And user already has cookie with sessionId set from visiting the root enpoint, which returned 'index.html'
So request to /get-form already includes 'sessionId' cookie, and server can find \ initialize Answers data for this particular session,
and 'currentStep' is part of the Answers
so reloading 'index.html' would trigger /get-form, which would render correct step.
***** hx-post
This will make POST request.
If we do GET request from <input> only current input value is included, as query para.
POST request from <input> or from <form> would include all filelds of the form.
So form submittion on "Next" and "Back" done via htmx POST requests, which parse and save passed attributes, but also server selects required next form step, renders it and returns for the 'hx-swap="outerHTML"'
hx-post on <input> allows for 'inline validation' (see useful resources)
this allows for validating field value - in isolation or together with all other form field values.
**** Learned format in which browser sends POST attributes to the server
Request payload as text:
name=e&email=emails%40la.la&phone=%2B7%20(911)%2084-35644%20ext%20155
I chose this exercise also because i wanted more experience in working with forms.
Single form would still be much nicer, even with htmx, but yeah.
Current exercise felt like full-fledged application.
**** Styling of the checkbox and radiobuttons as big selectable areas
This was first time I attempted something like this.
Insight was to use <label> as overall container for the input and other data - descriptions and icons.
Because user clicking on label automatically translates into toggling of the input, no js needed.
Either hide (for radio button part on step 2) or keep (for checkboxes on step 3) the input, and put descriptions and icons as next element.
So that =peer-= styling can be used.
**** htmx inline validation of the phone number field
Almost exactly as in example.
Separate rest endpoint for the input field, which returns new rendered state.
hx-post is triggered on input field default trigger = "changed",
and i guess only on focus leaving field. So this seems quite efficient.
This way validation can be done with very heavy libraries and access to DB and such. Over single field, or over all of them at once.
Seems unusual, but cool
*** Continued development
:PROPERTIES:
:CUSTOM_ID: continued-development
:END:
I want to learn more about Thymeleaf - how to use files for efficient fragment
storage. Currently it feels that i have separate files, and it's nice, but some
files have several fragments, and maybe need more documentation or markings.
Look for other templating solutions for java \ scala, maybe there are others
with 'fragment' functionality
Would be nice to refactor the code, to have smaller and more directed files.
I am also getting better at doing flex \ grid layouts without specific
paddings\margins on the lements, but feel that i'm still abusing that, and that
future tinkering with layouts could be painful due to free space being
constructed from manual paddings\margings
For htmx - would be nice to learn transition animations, and try to use it in a bigger exercise already.
*** Useful resources
:PROPERTIES:
:CUSTOM_ID: useful-resources
:END:
- htmx inline validation
https://htmx.org/examples/inline-validation/
- htmx control of parameters sent with response
https://htmx.org/docs/#parameters
** Acknowledgments
:PROPERTIES:
:CUSTOM_ID: acknowledgments
:END:
- svg animated spinner - from SamHerbert
https://github.com/SamHerbert/SVG-Loaders/tree/master
http://samherbert.net/svg-loaders/
- tailwind elements - for their example of 'switch styled' checkbox
which I used as inspiration for my styling
https://tailwind-elements.com/docs/standard/forms/switch/
- to render.com for allowing DockerImage deployments on a free tier
they get shut down after 15 minutes of inactivity, and image has to be < 10Gb
but this is great! no credit card needed

View File

@@ -11,6 +11,7 @@ lazy val multiStepForm = (project in file("."))
libraryDependencies ++= Seq(
"com.lihaoyi" %% "cask" % "0.9.1",
"com.lihaoyi" %% "mainargs" % "0.5.0",
"org.thymeleaf" % "thymeleaf" % "3.1.1.RELEASE"
"org.thymeleaf" % "thymeleaf" % "3.1.1.RELEASE",
"com.googlecode.libphonenumber" % "libphonenumber" % "8.13.16"
)
)

View File

@@ -0,0 +1,101 @@
{ pkgs, lib, sbt-derivation }:
let
pname = "multi-step-form";
package = sbt-derivation.lib.mkSbtDerivation {
inherit pkgs pname;
# ...and the rest of the arguments
version = "0.0.1";
src = pkgs.nix-gitignore.gitignoreSource [ ] ./.;
nativeBuildInputs = [ pkgs.nodePackages.tailwindcss ];
buildPhase = ''
tailwindcss -i ./src/input.css -o ./src/main/resources/public/output.css
sbt assembly
'';
installPhase = ''
mkdir -p $out/bin
cp target/scala-*/${pname}-assembly-*.jar $out/bin/${pname}.jar
'';
depsSha256 = "sha256-zG4e7ERdi/WxzACymaYUQ0x8v4/peGARuqPAK8xvBmE=";
};
module = { config, pkgs, ... }:
let cfg = config.services.${pname};
in {
options.services.${pname} = {
enable = lib.mkEnableOption "My frontendmentor exercise ${pname}";
port = lib.mkOption {
type = lib.types.int;
default = 8080;
description = "Port to listen on.";
};
host = lib.mkOption {
type = lib.types.str;
default = "localhost";
description = "Host to bind to.";
};
useNginx = lib.mkOption {
type = lib.types.bool;
default = true;
description = "Whether to use Nginx to proxy requests.";
};
};
config = lib.mkIf cfg.enable {
users.groups."${pname}-group" = { };
users.users."${pname}-user" = {
isSystemUser = true;
group = "${pname}-group";
};
systemd.services.${pname} =
let serverHost = if cfg.useNginx then "localhost" else cfg.host;
in {
description = "Exercise app ${pname}";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
startLimitIntervalSec = 30;
startLimitBurst = 10;
serviceConfig = {
ExecStart =
"${pkgs.jdk}/bin/java -jar ${package}/bin/${pname}.jar -p ${
toString cfg.port
} --host ${serverHost}";
WorkingDirectory = "${package}/bin";
Restart = "on-failure";
User = "${pname}-user";
Group = "${pname}-group";
};
};
services.nginx = lib.mkIf cfg.useNginx {
virtualHosts.${cfg.host} = {
locations."/".proxyPass = "http://127.0.0.1:${toString cfg.port}";
};
};
};
};
image = pkgs.dockerTools.buildLayeredImage {
name = pname;
tag = "latest";
created = "now";
config = {
Cmd = [ "${pkgs.jdk}/bin/java" "-jar" "${package}/bin/${pname}.jar" "--host" "0.0.0.0" ];
ExposedPorts = {
"8080/tcp" = {};
};
};
};
# image = pkgs.dockerTools.buildLayeredImage { # so, wow, this works
# name = "hello2";
# tag = "latest";
# config.Cmd = [ "${pkgs.hello}/bin/hello" ];
# };
in {
package = package;
module = module;
image = image;
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 112 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 45 KiB

View File

@@ -576,40 +576,21 @@ video {
grid-row-start: 1;
}
.m-3 {
margin: 0.75rem;
}
.my-7 {
margin-top: 1.75rem;
margin-bottom: 1.75rem;
}
.my-3 {
margin-top: 0.75rem;
margin-bottom: 0.75rem;
}
.mx-3 {
margin-left: 0.75rem;
margin-right: 0.75rem;
}
.mx-9 {
margin-left: 2.25rem;
margin-right: 2.25rem;
}
.my-4 {
margin-top: 1rem;
margin-bottom: 1rem;
}
.my-5 {
margin-top: 1.25rem;
margin-bottom: 1.25rem;
}
.my-7 {
margin-top: 1.75rem;
margin-bottom: 1.75rem;
}
.-mt-20 {
margin-top: -5rem;
}
@@ -618,6 +599,14 @@ video {
margin-bottom: 0.5rem;
}
.mb-4 {
margin-bottom: 1rem;
}
.ml-16 {
margin-left: 4rem;
}
.ml-2 {
margin-left: 0.5rem;
}
@@ -638,42 +627,18 @@ video {
margin-right: 0.75rem;
}
.mt-\[0\.3rem\] {
margin-top: 0.3rem;
}
.mt-3 {
margin-top: 0.75rem;
}
.mb-4 {
margin-bottom: 1rem;
}
.mt-2 {
margin-top: 0.5rem;
}
.ml-16 {
margin-left: 4rem;
}
.mb-10 {
margin-bottom: 2.5rem;
}
.mb-3 {
margin-bottom: 0.75rem;
}
.mt-4 {
margin-top: 1rem;
}
.mt-5 {
margin-top: 1.25rem;
}
.mt-\[0\.3rem\] {
margin-top: 0.3rem;
}
.flex {
display: flex;
}
@@ -686,6 +651,10 @@ video {
display: inline-grid;
}
.contents {
display: contents;
}
.hidden {
display: none;
}
@@ -702,6 +671,10 @@ video {
height: 3.5rem;
}
.h-16 {
height: 4rem;
}
.h-20 {
height: 5rem;
}
@@ -734,10 +707,6 @@ video {
height: 100vh;
}
.h-16 {
height: 4rem;
}
.w-11\/12 {
width: 91.666667%;
}
@@ -792,24 +761,20 @@ video {
grid-template-columns: 1fr 100px;
}
.grid-cols-\[auto_1fr\] {
grid-template-columns: auto 1fr;
}
.grid-cols-\[repeat\(4\2c _auto\)\] {
grid-template-columns: repeat(4, auto);
.grid-cols-\[1fr_70px\] {
grid-template-columns: 1fr 70px;
}
.grid-cols-\[1fr_auto\] {
grid-template-columns: 1fr auto;
}
.grid-cols-\[1fr_50px\] {
grid-template-columns: 1fr 50px;
.grid-cols-\[auto_1fr\] {
grid-template-columns: auto 1fr;
}
.grid-cols-\[1fr_70px\] {
grid-template-columns: 1fr 70px;
.grid-cols-\[repeat\(4\2c _auto\)\] {
grid-template-columns: repeat(4, auto);
}
.flex-row {
@@ -832,12 +797,12 @@ video {
align-content: center;
}
.items-center {
align-items: center;
.items-start {
align-items: flex-start;
}
.justify-items-center {
justify-items: center;
.items-center {
align-items: center;
}
.gap-x-5 {
@@ -845,14 +810,14 @@ video {
column-gap: 1.25rem;
}
.gap-y-4 {
row-gap: 1rem;
}
.gap-y-3 {
row-gap: 0.75rem;
}
.gap-y-4 {
row-gap: 1rem;
}
.divide-y > :not([hidden]) ~ :not([hidden]) {
--tw-divide-y-reverse: 0;
border-top-width: calc(1px * calc(1 - var(--tw-divide-y-reverse)));
@@ -896,14 +861,24 @@ video {
border-color: hsl(231 11% 63% / var(--tw-border-opacity));
}
.border-light-gray {
--tw-border-opacity: 1;
border-color: hsl(229 24% 87% / var(--tw-border-opacity));
}
.border-white {
--tw-border-opacity: 1;
border-color: rgb(255 255 255 / var(--tw-border-opacity));
}
.border-light-gray {
.border-strawberry-red {
--tw-border-opacity: 1;
border-color: hsl(229 24% 87% / var(--tw-border-opacity));
border-color: hsl(354 84% 57% / var(--tw-border-opacity));
}
.\!bg-light-blue {
--tw-bg-opacity: 1 !important;
background-color: hsl(206 94% 87% / var(--tw-bg-opacity)) !important;
}
.bg-green-200 {
@@ -911,11 +886,19 @@ video {
background-color: rgb(187 247 208 / var(--tw-bg-opacity));
}
.bg-light-gray\/25 {
background-color: hsl(229 24% 87% / 0.25);
}
.bg-magnolia {
--tw-bg-opacity: 1;
background-color: hsl(217 100% 97% / var(--tw-bg-opacity));
}
.bg-magnolia\/75 {
background-color: hsl(217 100% 97% / 0.75);
}
.bg-marine-blue {
--tw-bg-opacity: 1;
background-color: hsl(213 96% 18% / var(--tw-bg-opacity));
@@ -931,46 +914,10 @@ video {
background-color: rgb(255 255 255 / var(--tw-bg-opacity));
}
.\!bg-red-500 {
--tw-bg-opacity: 1 !important;
background-color: rgb(239 68 68 / var(--tw-bg-opacity)) !important;
}
.\!bg-white {
--tw-bg-opacity: 1 !important;
background-color: rgb(255 255 255 / var(--tw-bg-opacity)) !important;
}
.\!bg-light-blue {
--tw-bg-opacity: 1 !important;
background-color: hsl(206 94% 87% / var(--tw-bg-opacity)) !important;
}
.bg-light-gray {
--tw-bg-opacity: 1;
background-color: hsl(229 24% 87% / var(--tw-bg-opacity));
}
.bg-light-gray\/50 {
background-color: hsl(229 24% 87% / 0.5);
}
.bg-light-gray\/25 {
background-color: hsl(229 24% 87% / 0.25);
}
.bg-magnolia\/75 {
background-color: hsl(217 100% 97% / 0.75);
}
.bg-sidebar-mobile {
background-image: url("images/bg-sidebar-mobile.svg");
}
.bg-auto {
background-size: auto;
}
.bg-cover {
background-size: cover;
}
@@ -1001,6 +948,11 @@ video {
padding-right: 1.5rem;
}
.px-8 {
padding-left: 2rem;
padding-right: 2rem;
}
.py-20 {
padding-top: 5rem;
padding-bottom: 5rem;
@@ -1021,9 +973,12 @@ video {
padding-bottom: 2rem;
}
.px-3 {
padding-left: 0.75rem;
padding-right: 0.75rem;
.pb-5 {
padding-bottom: 1.25rem;
}
.pl-5 {
padding-left: 1.25rem;
}
.pl-6 {
@@ -1034,18 +989,6 @@ video {
padding-top: 0.75rem;
}
.pl-4 {
padding-left: 1rem;
}
.pl-5 {
padding-left: 1.25rem;
}
.pb-5 {
padding-bottom: 1.25rem;
}
.text-center {
text-align: center;
}
@@ -1082,6 +1025,11 @@ video {
text-transform: uppercase;
}
.\!text-marine-blue {
--tw-text-opacity: 1 !important;
color: hsl(213 96% 18% / var(--tw-text-opacity)) !important;
}
.text-cool-gray {
--tw-text-opacity: 1;
color: hsl(231 11% 63% / var(--tw-text-opacity));
@@ -1102,51 +1050,25 @@ video {
color: hsl(213 96% 18% / var(--tw-text-opacity));
}
.text-white {
--tw-text-opacity: 1;
color: rgb(255 255 255 / var(--tw-text-opacity));
}
.\!text-marine-blue {
--tw-text-opacity: 1 !important;
color: hsl(213 96% 18% / var(--tw-text-opacity)) !important;
}
.text-purplish-blue {
--tw-text-opacity: 1;
color: hsl(243 100% 62% / var(--tw-text-opacity));
}
.text-magnolia {
.text-white {
--tw-text-opacity: 1;
color: hsl(217 100% 97% / var(--tw-text-opacity));
color: rgb(255 255 255 / var(--tw-text-opacity));
}
.text-alabaster {
.text-strawberry-red {
--tw-text-opacity: 1;
color: hsl(231 100% 99% / var(--tw-text-opacity));
color: hsl(354 84% 57% / var(--tw-text-opacity));
}
.underline {
text-decoration-line: underline;
}
.accent-green-500 {
accent-color: #22c55e;
}
.accent-marine-blue {
accent-color: hsl(213, 96%, 18%);
}
.accent-pastel-blue {
accent-color: hsl(228, 100%, 84%);
}
.accent-light-blue {
accent-color: hsl(206, 94%, 87%);
}
.accent-purplish-blue {
accent-color: hsl(243, 100%, 62%);
}
@@ -1270,16 +1192,6 @@ html {
transition-duration: 150ms;
}
.checked\:bg-marine-blue:checked {
--tw-bg-opacity: 1;
background-color: hsl(213 96% 18% / var(--tw-bg-opacity));
}
.checked\:bg-blue-500:checked {
--tw-bg-opacity: 1;
background-color: rgb(59 130 246 / var(--tw-bg-opacity));
}
.checked\:after\:ml-\[1\.2rem\]:checked::after {
content: var(--tw-content);
margin-left: 1.2rem;
@@ -1290,16 +1202,6 @@ html {
border-color: hsl(354 84% 57% / var(--tw-border-opacity));
}
.invalid\:border-red-500:invalid {
--tw-border-opacity: 1;
border-color: rgb(239 68 68 / var(--tw-border-opacity));
}
.invalid\:border-green-500:invalid {
--tw-border-opacity: 1;
border-color: rgb(34 197 94 / var(--tw-border-opacity));
}
.hover\:cursor-pointer:hover {
cursor: pointer;
}
@@ -1309,38 +1211,10 @@ html {
border-color: hsl(243 100% 62% / var(--tw-border-opacity));
}
.hover\:border-green-700:hover {
--tw-border-opacity: 1;
border-color: rgb(21 128 61 / var(--tw-border-opacity));
}
.hover\:border-red-700:hover {
--tw-border-opacity: 1;
border-color: rgb(185 28 28 / var(--tw-border-opacity));
}
.hover\:bg-magnolia\/25:hover {
background-color: hsl(217 100% 97% / 0.25);
}
.hover\:bg-magnolia\/\[10\]:hover {
background-color: hsl(217 100% 97% / 10);
}
.hover\:bg-magnolia\/\[\.1\]:hover {
background-color: hsl(217 100% 97% / .1);
}
.hover\:bg-red-700:hover {
--tw-bg-opacity: 1;
background-color: rgb(185 28 28 / var(--tw-bg-opacity));
}
.focus\:border-green-500:focus {
--tw-border-opacity: 1;
border-color: rgb(34 197 94 / var(--tw-border-opacity));
}
.focus\:border-marine-blue:focus {
--tw-border-opacity: 1;
border-color: hsl(213 96% 18% / var(--tw-border-opacity));
@@ -1351,24 +1225,6 @@ html {
outline-offset: 2px;
}
.focus\:outline-marine-blue:focus {
outline-color: hsl(213, 96%, 18%);
}
.focus\:outline-green-500:focus {
outline-color: #22c55e;
}
.active\:border-red-500:active {
--tw-border-opacity: 1;
border-color: rgb(239 68 68 / var(--tw-border-opacity));
}
.active\:bg-red-500:active {
--tw-bg-opacity: 1;
background-color: rgb(239 68 68 / var(--tw-bg-opacity));
}
.peer:checked ~ .peer-checked\:border-purplish-blue {
--tw-border-opacity: 1;
border-color: hsl(243 100% 62% / var(--tw-border-opacity));
@@ -1387,14 +1243,6 @@ html {
background-color: hsl(217 100% 97% / 0.75);
}
.peer:checked ~ .peer-checked\:bg-magnolia\/25 {
background-color: hsl(217 100% 97% / 0.25);
}
.peer:checked ~ .peer-checked\:bg-magnolia\/\[\.1\] {
background-color: hsl(217 100% 97% / .1);
}
.peer:checked ~ .peer-checked\:text-cool-gray {
--tw-text-opacity: 1;
color: hsl(231 11% 63% / var(--tw-text-opacity));
@@ -1406,17 +1254,12 @@ html {
}
@media (min-width: 768px) {
.md\:row-span-2 {
grid-row: span 2 / span 2;
}
.md\:row-span-1 {
grid-row: span 1 / span 1;
}
.md\:mx-10 {
margin-left: 2.5rem;
margin-right: 2.5rem;
.md\:row-span-2 {
grid-row: span 2 / span 2;
}
.md\:mx-4 {
@@ -1424,18 +1267,13 @@ html {
margin-right: 1rem;
}
.md\:my-10 {
margin-top: 2.5rem;
margin-bottom: 2.5rem;
}
.md\:my-7 {
margin-top: 1.75rem;
margin-bottom: 1.75rem;
}
.md\:ml-20 {
margin-left: 5rem;
.md\:ml-24 {
margin-left: 6rem;
}
.md\:mr-24 {
@@ -1446,16 +1284,8 @@ html {
margin-top: 0px;
}
.md\:ml-8 {
margin-left: 2rem;
}
.md\:ml-10 {
margin-left: 2.5rem;
}
.md\:ml-24 {
margin-left: 6rem;
.md\:mt-2 {
margin-top: 0.5rem;
}
.md\:mt-5 {
@@ -1478,6 +1308,14 @@ html {
height: 3rem;
}
.md\:h-20 {
height: 5rem;
}
.md\:h-40 {
height: 10rem;
}
.md\:h-\[568px\] {
height: 568px;
}
@@ -1490,28 +1328,8 @@ html {
height: 100%;
}
.md\:h-32 {
height: 8rem;
}
.md\:h-40 {
height: 10rem;
}
.md\:h-10 {
height: 2.5rem;
}
.md\:h-16 {
height: 4rem;
}
.md\:h-20 {
height: 5rem;
}
.md\:h-24 {
height: 6rem;
.md\:w-20 {
width: 5rem;
}
.md\:w-32 {
@@ -1542,14 +1360,14 @@ html {
grid-template-columns: auto 1fr;
}
.md\:grid-rows-\[repeat\(4\2c _auto\)\] {
grid-template-rows: repeat(4, auto);
}
.md\:grid-rows-\[1fr_auto_auto\] {
grid-template-rows: 1fr auto auto;
}
.md\:grid-rows-\[repeat\(4\2c _auto\)\] {
grid-template-rows: repeat(4, auto);
}
.md\:flex-row {
flex-direction: row;
}
@@ -1570,8 +1388,8 @@ html {
align-items: flex-end;
}
.md\:justify-between {
justify-content: space-between;
.md\:justify-center {
justify-content: center;
}
.md\:gap-x-4 {
@@ -1583,10 +1401,6 @@ html {
row-gap: 1.75rem;
}
.md\:gap-y-4 {
row-gap: 1rem;
}
.md\:place-self-start {
place-self: start;
}
@@ -1612,6 +1426,10 @@ html {
padding: 2.5rem;
}
.md\:p-4 {
padding: 1rem;
}
.md\:p-5 {
padding: 1.25rem;
}
@@ -1620,8 +1438,9 @@ html {
padding: 1.5rem;
}
.md\:p-4 {
padding: 1rem;
.md\:px-0 {
padding-left: 0px;
padding-right: 0px;
}
.md\:px-24 {
@@ -1634,14 +1453,13 @@ html {
padding-right: 1rem;
}
.md\:py-4 {
padding-top: 1rem;
padding-bottom: 1rem;
.md\:px-6 {
padding-left: 1.5rem;
padding-right: 1.5rem;
}
.md\:px-0 {
padding-left: 0px;
padding-right: 0px;
.md\:pb-10 {
padding-bottom: 2.5rem;
}
.md\:pb-2 {
@@ -1652,12 +1470,12 @@ html {
padding-bottom: 0.75rem;
}
.md\:pt-5 {
padding-top: 1.25rem;
.md\:pb-8 {
padding-bottom: 2rem;
}
.md\:pb-10 {
padding-bottom: 2.5rem;
.md\:pt-5 {
padding-top: 1.25rem;
}
.md\:text-4xl {
@@ -1670,19 +1488,13 @@ html {
line-height: 1.5rem;
}
.md\:text-2xl {
font-size: 1.5rem;
line-height: 2rem;
.md\:text-lg {
font-size: 1.125rem;
line-height: 1.75rem;
}
.md\:text-6xl {
font-size: 3.75rem;
line-height: 1;
}
.md\:text-3xl {
font-size: 1.875rem;
line-height: 2.25rem;
.md\:tracking-widest {
letter-spacing: 0.1em;
}
.md\:drop-shadow-2xl {

View File

@@ -33,13 +33,14 @@
</head>
<body>
<main class="grid place-content-center w-screen h-screen bg-magnolia">
<section
hx-get="/get-form"
hx-trigger="load"
hx-swap="outerHTML"
>
<section hx-get="/get-form" hx-trigger="load" hx-swap="outerHTML">
<!-- here be immediate hx-get for the form. to subscitute the body -->
<img class="w-14 text-green-500 fill-current" th:src="'public/images/tail-spin.svg'" src="../public/images/tail-spin.svg" alt="loading..." />
<img
class="w-14 text-green-500 fill-current"
th:src="'public/images/tail-spin.svg'"
src="../public/images/tail-spin.svg"
alt="loading..."
/>
</section>
<section class="absolute top-0 end-0" id="new-session-control">
@@ -49,7 +50,8 @@
Challenge by
<a href="https://www.frontendmentor.io?ref=challenge" target="_blank"
>Frontend Mentor</a
>. Coded by <a href="#">Your Name Here</a>.
>. Source code at
<a href="https://github.com/efim/Learning-HTMX">Your Name Here</a>.
</div>
</main>
</body>

View File

@@ -45,7 +45,7 @@
method="post"
>
<summary
class="w-full h-44 bg-no-repeat bg-cover md:row-span-2 bg-sidebar-mobile marker:text-white md:bg-sidebar-desktop md:h-[568px] md:w-[274px]"
class="w-full h-44 bg-no-repeat bg-cover md:row-span-2 md:tracking-widest bg-sidebar-mobile marker:text-white md:bg-sidebar-desktop md:h-[568px] md:w-[274px]"
id="sidebar"
th:fragment="stepsSummary(formData)"
>
@@ -126,42 +126,81 @@
<p class="py-3 text-cool-gray">
Please provide your name, email address, and phone number.
</p>
<label for="name" class="pt-3 text-sm md:pt-5 md:pb-2 text-marine-blue"
>Name</label
<div class="contents">
<label
for="name"
class="pt-3 text-sm md:pt-5 md:pb-2 text-marine-blue"
>Name</label
>
<input
id="name"
th:value="${formData.userAnswers.step1.name}"
name="name"
type="text"
required
placeholder="e.g. Stephen King"
class="p-1 px-4 h-10 text-sm font-semibold rounded border md:p-6 md:px-4 md:text-base md:rounded-lg focus:outline-none placeholder:text-cool-gray invalid:border-strawberry-red focus:border-marine-blue"
/>
</div>
<div class="contents">
<label
for="email"
class="pt-3 text-sm md:pt-5 md:pb-2 text-marine-blue"
>Email Address</label
>
<input
id="email"
th:value="${formData.userAnswers.step1.email}"
name="email"
type="email"
required
placeholder="e.g. stephenking@lorem.com"
class="p-1 px-4 h-10 text-sm font-semibold rounded border md:p-6 md:px-4 md:text-base md:rounded-lg focus:outline-none placeholder:text-cool-gray invalid:border-strawberry-red focus:border-marine-blue"
/>
</div>
<!-- Following is email input field
it has outer div that sets separate 'value' variable
and innder div which denotes fragment, parametrized by this only variable
now i should be able to render only this input field as fragment -->
<div
th:with="value=${formData.userAnswers.step1.phone},error=''"
class="contents relative"
>
<input
id="name"
th:value="${formData.userAnswers.step1.name}"
name="name"
type="text"
required
placeholder="e.g. Stephen King"
class="p-1 px-4 h-10 text-sm font-semibold rounded border md:p-6 md:px-4 md:text-base md:rounded-lg focus:outline-none placeholder:text-cool-gray invalid:border-strawberry-red focus:border-marine-blue"
/>
<label for="email" class="pt-3 text-sm md:pt-5 md:pb-2 text-marine-blue"
>Email Address</label
>
<input
id="email"
th:value="${formData.userAnswers.step1.email}"
name="email"
type="email"
required
placeholder="e.g. stephenking@lorem.com"
class="p-1 px-4 h-10 text-sm font-semibold rounded border md:p-6 md:px-4 md:text-base md:rounded-lg focus:outline-none placeholder:text-cool-gray invalid:border-strawberry-red focus:border-marine-blue"
/>
<label for="phone" class="pt-3 text-sm md:pt-5 md:pb-2 text-marine-blue"
>Phone Number</label
>
<input
id="phone"
th:value="${formData.userAnswers.step1.phone}"
name="phone"
type="tel"
required
placeholder="e.g. +1 234 567 890"
class="p-1 px-4 h-10 text-sm font-semibold rounded border md:p-6 md:px-4 md:text-base md:rounded-lg focus:outline-none placeholder:text-cool-gray invalid:border-strawberry-red focus:border-marine-blue"
/>
<div
class="contents"
hx-target="this"
hx-swap="outerHTML"
th:fragment="email-input (value,error)"
>
<label
for="phone"
class="pt-3 text-sm md:pt-5 md:pb-2 text-marine-blue"
>Phone Number</label
>
<input
id="phone"
th:value="${value}"
name="phone"
type="tel"
required
placeholder="e.g. +1 234 567 890"
class="p-1 px-4 h-10 text-sm font-semibold rounded border md:p-6 md:px-4 md:text-base md:rounded-lg focus:outline-none placeholder:text-cool-gray invalid:border-strawberry-red focus:border-marine-blue"
th:classappend="${!error.isEmpty} ? 'border-strawberry-red' : ''"
hx-post="/step1/phonenumber"
hx-indicator="#ind"
/>
<div
th:if="${error} != null"
th:text="${error}"
class="text-sm text-strawberry-red">Please enter valid phone number</div>
<img
id="ind"
src="../public/images/tail-spin.svg"
th:src="'public/images/tail-spin.svg'"
class="absolute w-14 h-14 htmx-indicator"
/>
</div>
</div>
<!-- Step 1 end -->
</section>

View File

@@ -136,18 +136,20 @@
class="grid absolute inset-y-0 inset-x-0 place-content-center h-full rounded-lg border md:grid-cols-1 md:p-4 grid-cols-[auto_1fr] border-light-gray peer-checked:border-purplish-blue peer-checked:bg-magnolia/50 md:grid-rows-[1fr_auto_auto] hover:bg-magnolia/[.1] hover:border-purplish-blue"
>
<img
class="row-span-2 place-self-center px-4 md:row-span-1 md:place-self-start md:px-0"
class="place-self-center px-4 md:row-span-1 md:place-self-start md:px-0"
th:src="${planType.iconPath}" src="../public/images/icon-arcade.svg" alt="" />
<h2 th:text="${planType}" class="font-semibold text-marine-blue">Arcade</h2>
<p
th:text="|$${formData.planCost(planType)}/${formData.periodCostLabel}|"
class="text-sm text-cool-gray"
>
$90/yr
</p>
<p th:if="${formData.userAnswers.step2.isYearly}" class="text-xs text-marine-blue">
2 months free
</p>
<div class="flex flex-col items-start">
<h2 th:text="${planType}" class="font-semibold text-marine-blue">Arcade</h2>
<p
th:text="|$${formData.planCost(planType)}/${formData.periodCostLabel}|"
class="text-sm text-cool-gray"
>
$9/mo
</p>
<p th:if="${formData.userAnswers.step2.isYearly}" class="text-xs text-marine-blue">
2 months free
</p>
</div>
</div>
</label>
@@ -207,7 +209,7 @@
role="switch"
id="packageDuration"
th:checked="${formData.userAnswers.step2.isYearly}"
hx-get="/step2/planTypeInputs"
hx-post="/step2/planTypeInputs"
hx-target="#plan-type-inputs"
hx-swap="outerHTML"
/>

View File

@@ -107,14 +107,14 @@
<h1 class="text-2xl font-bold md:text-4xl text-marine-blue">
Finishing up
</h1>
<p class="pt-3 pb-5 text-cool-gray">
<p class="pt-3 pb-5 md:pb-8 text-cool-gray">
Double-check everything looks OK before confirming.
</p>
<div
class="flex flex-col px-3 w-full text-sm rounded-lg divide-y md:text-base bg-magnolia/75"
class="flex flex-col w-full text-sm rounded-lg divide-y md:text-base bg-magnolia/75"
id="selection-overview"
>
<div id="selected-plan" class="grid py-3 grid-cols-[1fr_auto]">
<div id="selected-plan" class="grid p-3 md:p-6 grid-cols-[1fr_auto]">
<h2 th:text="${formData.fullPlanName}"
class="font-bold text-marine-blue"
>Arcade (Monthly)</h2>
@@ -134,7 +134,7 @@
>Change</a
>
</div>
<div id="selected-addons" class="flex flex-col gap-y-4 py-3 mp-10"
<div id="selected-addons" class="flex flex-col gap-y-4 p-3 md:p-6 mp-10"
th:if="not ${formData.userAnswers.step3.addonsAsJava.isEmpty}"
>
<div
@@ -152,7 +152,7 @@
</div>
</div>
<section class="flex flex-row p-3 mt-5">
<section class="flex flex-row p-3 mt-5 md:px-6">
<p class="grow text-cool-gray">
Total (per
<span
@@ -162,7 +162,7 @@
</p>
<p
th:text="|+$${formData.fullOrderPrice}/${formData.periodCostLabel}|"
class="font-bold text-purplish-blue"
class="font-bold md:text-lg text-purplish-blue"
>
$120
</p>
@@ -180,7 +180,7 @@
hx-swap="outerHTML"
hx-target="#form-step"
href="step3.html"
class="ml-6 text-sm font-semibold md:pb-3 md:ml-20 md:text-base text-cool-gray"
class="ml-6 text-sm font-semibold md:pb-3 md:ml-24 md:text-base text-cool-gray"
hx-params="not form-confirmed"
>Go Back</a
>

View File

@@ -97,12 +97,12 @@
</summary>
<section
id="multipage-form-container"
class="flex flex-col gap-y-4 items-center py-8 py-20 px-6 -mt-20 w-11/12 bg-white rounded-xl md:px-24 md:mt-0 md:w-full drop-shadow-xl md:drop-shadow-none"
class="flex flex-col gap-y-4 items-center py-20 px-8 -mt-20 w-11/12 bg-white rounded-xl md:row-span-2 md:justify-center md:px-24 md:mt-0 md:w-full md:h-full drop-shadow-xl md:drop-shadow-none"
>
<!-- Step 5 start -->
<img src="../public/images/icon-thank-you.svg" alt="" class="mb-2 w-14 h-14" />
<h2 class="text-2xl font-bold">Thank you!</h2>
<img src="../public/images/icon-thank-you.svg" alt="" class="mb-2 w-14 h-14 md:w-20 md:h-20" />
<h2 class="text-2xl font-bold md:mt-2 md:text-4xl text-marine-blue">Thank you!</h2>
<p class="text-center text-cool-gray">
Thanks for confirming your subscription! We hope you have fun
using our platform. If you ever need support, please feel free

View File

@@ -49,12 +49,10 @@ object Models {
final case class Answers(
sessionId: String = "",
currentStep: Int = 4,
currentStep: Int = 1,
step1: StepAnswers.Step1 = StepAnswers.Step1(),
step2: StepAnswers.Step2 = StepAnswers.Step2(),
step3: StepAnswers.Step3 = StepAnswers.Step3(
addons = Addons.values.toSet
),
step3: StepAnswers.Step3 = StepAnswers.Step3(),
step4: StepAnswers.Step4 = StepAnswers.Step4()
) {
// this is not enforced by compiler, sad, maintain by hand in html template files

View File

@@ -8,7 +8,11 @@ import java.util.UUID
import scala.jdk.CollectionConverters._
import multistepform.Models.Answers
import scala.annotation.internal.requiresCapability
import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber.CountryCodeSource
import com.google.i18n.phonenumbers.PhoneNumberUtil
import java.net.URLDecoder
import scala.util.Try
case class Routes()(implicit cc: castor.Context, log: cask.Logger)
extends cask.Routes {
@@ -103,9 +107,10 @@ case class Routes()(implicit cc: castor.Context, log: cask.Logger)
// and that is not nice
val userAnswers = Sessions.sessionReplies.getOrElse(id, Answers(id))
val submittedData = URLDecoder.decode(request.text() , "UTF-8")
val submittedData = URLDecoder.decode(request.text(), "UTF-8")
val updatedAnswers = userAnswers.updateStep(stepNum, submittedData, nextStep)
val updatedAnswers =
userAnswers.updateStep(stepNum, submittedData, nextStep)
Sessions.sessionReplies.update(id, updatedAnswers)
@@ -124,24 +129,76 @@ case class Routes()(implicit cc: castor.Context, log: cask.Logger)
)
}
/**
* This endpoint re-renders 'plan type inputs'
* so that togglng monthly\yearly could redraw their html
*/
@cask.get("/step2/planTypeInputs")
def getPlanTypeInputs(sessionId: cask.Cookie, isPackageYearly: Option[String] = None) = {
@cask.post("/step1/phonenumber")
def validateStep1PhoneNumber(request: cask.Request) = {
val submittedData = URLDecoder.decode(request.text(), "UTF-8")
println(
s"getting data ${request.data} or ${request.text()} or $submittedData"
)
val fieldValues = submittedData
.split("&")
.filterNot(_.isEmpty())
.map { field =>
println(s"looking at field $field")
val (name, value) = field.split("=").toList match {
case List(name, value) => name -> value
case name :: tail => name -> tail.headOption.getOrElse("")
case Nil => ???
}
name -> value
}
.toMap
val name = fieldValues.getOrElse("name", "")
val email = fieldValues.getOrElse("email", "")
val phone = fieldValues.getOrElse("phone", "")
println(s"after parsing name=$name | email=$email | phone=$phone")
val phoneUtils = PhoneNumberUtil.getInstance()
val phoneNum = Try(
phoneUtils.parse(phone, CountryCodeSource.UNSPECIFIED.name())
).toOption
val isPhoneValid = phoneNum.map(phoneUtils.isValidNumber(_)).getOrElse(false)
val error = if (isPhoneValid) "" else "Please input valid phone number"
val context = new Context()
context.setVariable("value", phone)
context.setVariable("error", error)
val inputDiv =
templateEngine.process("step1", Set("email-input").asJava, context)
cask.Response(
inputDiv,
headers = Seq("Content-Type" -> "text/html;charset=UTF-8")
)
}
/** This endpoint re-renders 'plan type inputs' so that togglng monthly\yearly
* could redraw their html
*/
@cask.post("/step2/planTypeInputs")
def getPlanTypeInputs(sessionId: cask.Cookie, request: cask.Request) = {
val id = sessionId.value
val isPackageYearlyBool = isPackageYearly.contains("on")
println(s"requesting plan type inputs for $id and $isPackageYearlyBool")
val submittedData = URLDecoder.decode(request.text(), "UTF-8")
println(s"requesting plan type inputs for $id and $request")
Sessions.sessionReplies.get(id) match {
case None =>
cask.Response("Can't find answers for your session, please reload the page", 404)
cask.Response(
"Can't find answers for your session, please reload the page",
404
)
case Some(answers) => {
// here changing yearly/monthly part of state based on passed checkbox value
// and selected plan
// only for purposes of rendering the fragment
// not persisting, unless next or previous buttons are pressed
val withYearlyParamSet = answers.copy(step2 = answers.step2.copy(isYearly = isPackageYearlyBool))
val formData = Models.FormData(withYearlyParamSet)
val withYearlyParamSetAndSelectedPlan =
answers.step2.fromFormData(submittedData)
val updatedState =
answers.copy(step2 = withYearlyParamSetAndSelectedPlan)
val formData = Models.FormData(updatedState)
val context = new Context()
context.setVariable(formDataContextVarName, formData)
val planTypesInputsHtml = templateEngine.process(

16
16-countries-page-from-api/.gitignore vendored Normal file
View File

@@ -0,0 +1,16 @@
.bsp/
.scala-build/
.metals/
.direnv
*/dist/
/11-single-price-grid-component/.bloop/
**/.bloop
**/project/project/
**/project/metals.sbt
**/project/.bloop
**/project/target/
**/target/
*/result
result

View File

View File

@@ -0,0 +1,2 @@
version = "3.7.10"
runner.dialect = scala3

View File

@@ -0,0 +1,136 @@
* Frontend Mentor - REST Countries API with color theme switcher solution
:PROPERTIES:
:CUSTOM_ID: frontend-mentor---rest-countries-api-with-color-theme-switcher-solution
:END:
This is a solution to the
[[https://www.frontendmentor.io/challenges/rest-countries-api-with-color-theme-switcher-5cacc469fec04111f7b848ca][REST
Countries API with color theme switcher challenge on Frontend Mentor]].
Frontend Mentor challenges help you improve your coding skills by
building realistic projects.
** Overview
:PROPERTIES:
:CUSTOM_ID: overview
:END:
*** The challenge
:PROPERTIES:
:CUSTOM_ID: the-challenge
:END:
Users should be able to:
- See all countries from the API on the homepage
- Search for a country using an =input= field
- Filter countries by region
- Click on a country to see more detailed information on a separate page
- Click through to the border countries on the detail page
- Toggle the color scheme between light and dark mode /(optional)/
*** Screenshot
:PROPERTIES:
:CUSTOM_ID: screenshot
:END:
[[mobile-main.png]]
[[mobile-single.png]]
[[desktop-main.png]]
[[desktop-single.png]]
*** Links
:PROPERTIES:
:CUSTOM_ID: links
:END:
- Solution URL: https://github.com/efim/Learning-HTMX/tree/master/16-countries-page-from-api
- Live Site URL: https://efim-frontentmentor-countries-page.onrender.com/
** My process
:PROPERTIES:
:CUSTOM_ID: my-process
:END:
*** Built with
:PROPERTIES:
:CUSTOM_ID: built-with
:END:
- Scala Server Side Rendering
- Htmx
- TailwindCSS
- Flexbox
- CSS Grid
- Mobile-first workflow
*** What I learned
:PROPERTIES:
:CUSTOM_ID: what-i-learned
:END:
**** polling download for 'infinite scroll'
https://htmx.org/examples/infinite-scroll/
I've done almost same thing as example,
but i'm appending additional empty div, that inserts responses instead of itself
this way i have one template fragment with repeater,
and don't have to add hx attributes to the last one,
i just have separate fragment that i append to response which will trigger new
load on enter view.
**** having html 5 native autocomplete with <datalist> tag
just server side rendering it with all country names is yay
**** inserting thymeleaf templates by css selector
https://www.thymeleaf.org/doc/tutorials/3.1/usingthymeleaf.html#appendix-c-markup-selector-syntax
this way i can insert <script> tag from index page, without declaring it as a fragment,
because i'll want is static anyway.
and can share 'dark mode' js code between pages
**** building docker image
First off: using nix docker tools, and sbt assembly to create 'uber jar'
now 'nix build .#countries-page-image' builds an image and symlinks it to ./result
$ docker load < result
loads the image
and it can be started
$ docker image list
$ docker run -d -p 9090:8080 <image-id>
**** deploying to render.com
need to auth the docker cli, then tag an image with my repository name
$ docker login
$ docker tag 141 efim1234/rock-paper-scissors:latest
$ podman push localhost/efim1234/countries-page:latest docker.io/efim1234/countries-page:latest
and now render.com, when creating "new service"
can find "efim1234/countries-page:latest" as public image and use it
**** using browser history
with either server side
HX-Push -> "some-url"
or
hx-push-url="true" in the html side
so that url is put into address bar,
and browser save the body into history
and now my website has forward and backward navigation
only bug - the 'filter by region' for some reason doesn't maintain the selected value
*** Continued development
:PROPERTIES:
:CUSTOM_ID: continued-development
:END:
In future project i'll probably want to lean and use go.
For smaller binaries of the server, using PocketBase as embedded backend functions,
and maybe having a better chances of just doing some real world small projects.
*** Useful resources
:PROPERTIES:
:CUSTOM_ID: useful-resources
:END:
- htmx documentation and examples
https://htmx.org/docs/#introduction
- thymeleaf documentation
https://www.thymeleaf.org/doc/tutorials/3.1/usingthymeleaf.html#introducing-thymeleaf
- TailwindCSS documentation
https://tailwindcss.com/docs/installation
- heroicons: MIT licensed svg icons
https://github.com/tailwindlabs/heroicons
- render.com for providing free hosting for services from docker images

View File

@@ -0,0 +1,17 @@
name := "countries-page"
val toolkitV = "0.1.7"
val toolkit = "org.scala-lang" %% "toolkit" % toolkitV
val toolkitTest = "org.scala-lang" %% "toolkit-test" % toolkitV
val cask = "com.lihaoyi" %% "cask" % "0.9.1"
val mainargs = "com.lihaoyi" %% "mainargs" % "0.5.4"
val requests = "com.lihaoyi" %% "requests" % "0.8.0"
ThisBuild / scalaVersion := "3.2.2"
libraryDependencies ++= Seq(cask, mainargs, requests)
libraryDependencies += toolkit
libraryDependencies += (toolkitTest % Test)
// https://mvnrepository.com/artifact/org.thymeleaf/thymeleaf
libraryDependencies += "org.thymeleaf" % "thymeleaf" % "3.1.2.RELEASE"

View File

@@ -0,0 +1,37 @@
{ pkgs, lib, sbt-derivation }:
let pname = "countries-page";
in rec {
package = sbt-derivation.lib.mkSbtDerivation {
inherit pkgs pname;
# ...and the rest of the arguments
version = "0.0.1";
src = pkgs.nix-gitignore.gitignoreSource [ ] ./.;
nativeBuildInputs = [ pkgs.nodePackages.tailwindcss ];
buildPhase = ''
tailwindcss -i ./src/input.css -o ./src/main/resources/public/output.css
sbt assembly
'';
installPhase = ''
mkdir -p $out/bin
cp target/scala-*/${pname}-assembly-*.jar $out/bin/${pname}.jar
'';
depsSha256 = "sha256-PZYt1xvT8BKkFedA8nQvjvuE6JtmxNh0aSManAe4DpY=";
};
image = pkgs.dockerTools.buildLayeredImage {
name = pname;
tag = "latest";
created = "now";
config = {
Cmd = [
"${pkgs.jdk}/bin/java"
"-jar"
"${package}/bin/${pname}.jar"
"--host"
"0.0.0.0"
];
ExposedPorts = { "8080/tcp" = { }; };
};
};
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 82 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 96 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 47 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 203 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 216 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 194 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 83 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 41 KiB

View File

@@ -0,0 +1 @@
sbt.version=1.9.0

View File

@@ -0,0 +1,3 @@
addSbtPlugin("io.spray" % "sbt-revolver" % "0.10.0")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.1")

View File

@@ -0,0 +1,28 @@
@tailwind base;
@tailwind components;
@tailwind utilities;
html {
font-size: 14px;
}
@font-face {
font-family: 'NunitoSans';
src: url('/public/fonts/nunito-sans/NunitoSans-Regular.ttf') format('truetype');
font-weight: 400; /* Regular */
font-style: normal;
}
@font-face {
font-family: 'NunitoSans';
src: url('/public/fonts/nunito-sans/NunitoSans-Bold.ttf') format('truetype');
font-weight: 700; /* Bold */
font-style: normal;
}
@font-face {
font-family: 'NunitoSans';
src: url('/public/fonts/nunito-sans/NunitoSans-ExtraBold.ttf') format('truetype');
font-weight: 800; /* ExtraBold */
font-style: normal;
}

View File

@@ -0,0 +1,44 @@
Copyright 2016 The Nunito Project Authors (contact@sansoxygen.com),
This Font Software is licensed under the SIL Open Font License, Version 1.1.
This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL
-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------
PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide development of collaborative font projects, to support the font creation efforts of academic and linguistic communities, and to provide a free and open framework in which fonts may be shared and improved in partnership with others.
The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The requirement for fonts to remain under this license does not apply to any document created using the fonts or their derivatives.
DEFINITIONS
"Font Software" refers to the set of files released by the Copyright Holder(s) under this license and clearly marked as such. This may include source files, build scripts and documentation.
"Reserved Font Name" refers to any names specified as such after the copyright statement(s).
"Original Version" refers to the collection of Font Software components as distributed by the Copyright Holder(s).
"Modified Version" refers to any derivative made by adding to, deleting, or substituting -- in part or in whole -- any of the components of the Original Version, by changing formats or by porting the Font Software to a new environment.
"Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software.
PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions:
1) Neither the Font Software nor any of its individual components, in Original or Modified Versions, may be sold by itself.
2) Original or Modified Versions of the Font Software may be bundled, redistributed and/or sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user.
3) No Modified Version of the Font Software may use the Reserved Font Name(s) unless explicit written permission is granted by the corresponding Copyright Holder. This restriction only applies to the primary font name as presented to the users.
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s) or with their explicit written permission.
5) The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. The requirement for fonts to remain under this license does not apply to any document created using the Font Software.
TERMINATION
This license becomes null and void if any of the above conditions are not met.
DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.

View File

@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
<svg fill="#000000" height="800px" width="800px" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
viewBox="0 0 386.242 386.242" xml:space="preserve">
<g>
<path id="Arrow_Back" d="M374.212,182.3H39.432l100.152-99.767c4.704-4.704,4.704-12.319,0-17.011
c-4.704-4.704-12.319-4.704-17.011,0L3.474,184.61c-4.632,4.632-4.632,12.379,0,17.011l119.1,119.1
c4.704,4.704,12.319,4.704,17.011,0c4.704-4.704,4.704-12.319,0-17.011L39.432,206.36h334.779c6.641,0,12.03-5.39,12.03-12.03
S380.852,182.3,374.212,182.3z"/>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 790 B

View File

@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg fill="#000000" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
width="800px" height="800px" viewBox="0 0 81.289 81.289"
xml:space="preserve">
<g>
<path d="M79.248,38.668c-1.246-0.464-2.669-0.088-3.518,0.95c-4.791,5.84-11.858,9.192-19.403,9.192
c-13.833,0-25.083-11.255-25.083-25.083c0-6.963,2.808-13.441,7.908-18.242c0.977-0.918,1.26-2.357,0.705-3.579
c-0.552-1.222-1.818-1.959-3.157-1.826C15.778,2.112,0,19.511,0,40.555c0,22.424,18.245,40.669,40.672,40.669
c22.16,0,40.002-17.363,40.616-39.528C81.324,40.355,80.508,39.136,79.248,38.668z M40.671,74.953
c-18.971,0-34.402-15.43-34.402-34.4c0-14.93,9.389-27.69,22.859-32.43c-2.714,4.689-4.156,10.022-4.156,15.605
c0,17.292,14.065,31.355,31.357,31.355c6.317,0,12.373-1.882,17.479-5.322C69.82,64.399,56.557,74.953,40.671,74.953z"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
<svg width="800px" height="800px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M15.7955 15.8111L21 21M18 10.5C18 14.6421 14.6421 18 10.5 18C6.35786 18 3 14.6421 3 10.5C3 6.35786 6.35786 3 10.5 3C14.6421 3 18 6.35786 18 10.5Z" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
</svg>

After

Width:  |  Height:  |  Size: 469 B

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,194 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta http-equiv="x-ua-compatible" content="ie=edge" />
<title>Exploring countries</title>
<meta name="description" content="" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link href="../public/output.css" th:href=@{~/public/output.css}
rel="stylesheet" />
<script src="https://unpkg.com/htmx.org@1.9.6"></script>
<link rel="apple-touch-icon" href="/apple-touch-icon.png" />
<!-- Place favicon.ico in the root directory -->
</head>
<body
class="bg-very-light-gray h-screen flex flex-col dark:bg-very-dark-blue dark:text-white"
hx-boost="true"
>
<!--[if lt IE 8]>
<p class="browserupgrade">
You are using an <strong>outdated</strong> browser. Please
<a href="http://browsehappy.com/">upgrade your browser</a> to improve
your experience.
</p>
<![endif]-->
<header th:replace="~{index :: header}">
<div
class="flex-1 max-w-screen-xl h-20 flex flex-row justify-between items-center px-4"
>
<a th:href="@{~/}" href="index.html"
><h1 class="grow font-bold md:text-2xl">Where in the world?</h1>
</a>
<button id="toggleDarkMode" class="flex flex-row gap-x-2">
<svg
class="text-black dark:text-white h-6"
viewBox="0 0 24 24"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M21.7519 15.0019C20.597 15.4839 19.3296 15.75 18 15.75C12.6152 15.75 8.25 11.3848 8.25 5.99999C8.25 4.67039 8.51614 3.40296 8.99806 2.24805C5.47566 3.71785 3 7.19481 3 11.25C3 16.6348 7.36522 21 12.75 21C16.8052 21 20.2821 18.5243 21.7519 15.0019Z"
stroke="currentColor"
stroke-width="1.5"
stroke-linecap="round"
stroke-linejoin="round"
/>
</svg>
<p>Dark Mode</p>
</button>
</div>
</header>
<nav
class="flex flex-none h-32 px-8 py-10 max-w-screen-xl place-self-center w-full md:h-48 items-center"
>
<a href="index.html" th:href="@{~/}" class="h-fit">
<div
class="h-9 w-28 bg-white drop-shadow-[0_0_3px_rgba(0,0,0,0.5)] text-md rounded px-5 py-2 flex flex-row gap-x-3 place-content-center dark:bg-dark-blue"
>
<!-- Back icon -->
<svg
class="text-black dark:text-white h-full"
width="24"
height="24"
viewBox="0 0 24 24"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M10.5 19.5L3 12M3 12L10.5 4.5M3 12H21"
stroke="currentColor"
stroke-width="1.5"
stroke-linecap="round"
stroke-linejoin="round"
/>
</svg>
<!-- <img
src="../public/icons/back-svgrepo-com.svg"
class="w-4 h-5"
alt=""
/> -->
<p>Back</p>
</div>
</a>
</nav>
<main
class="px-8 pb-10 flex flex-col gap-y-10 md:grid md:grid-cols-2 md:h-max md:place-self-center w-full max-w-screen-xl"
>
<img
src="https://flagcdn.com/de.svg"
th:src="${country.flag}"
th:alt="|flag of ${country.nameView}|"
class="w-full md:w-10/12"
/>
<section
id="stat-block"
class="contents md:grid md:grid-cols-2 md:gap-y-10 md:py-10"
>
<h1
class="text-2xl font-bold pt-2 -mb-4 md:col-span-full md:text-3xl"
th:text="${country.nameView}"
>
Germany
</h1>
<dl class="space-y-2" id="main-stats">
<div class="flex">
<dt class="font-bold mr-2">Native name:</dt>
<dd th:text="${country.nativeName}">Belgie</dd>
</div>
<div class="flex">
<dt class="font-bold mr-2">Population:</dt>
<dd
th:text="${#numbers.formatInteger(country.population, 3, 'COMMA')}"
>
81,771,900
</dd>
</div>
<div class="flex">
<dt class="font-bold mr-2">Region:</dt>
<dd th:text="${country.region}">Europe</dd>
</div>
<div class="flex">
<dt class="font-bold mr-2">Sub Region:</dt>
<dd th:text="${country.subregion}">Western Europe</dd>
</div>
<div class="flex">
<dt class="font-bold mr-2">Capital:</dt>
<dd th:text="${country.capitalView}">Berlin</dd>
</div>
</dl>
<dl class="space-y-2" id="additional-stats">
<div th:if="${country.topLevelDomain.nonEmpty()}" class="flex">
<dt class="font-bold mr-2">Top Level Domain:</dt>
<dd th:text="${country.topLevelDomain.get()}">.be</dd>
</div>
<div class="flex">
<dt class="font-bold mr-2">Currencies:</dt>
<!-- <dd th:text="${#strings.listJoin(country.currencies.map(_.name),',')}">Euro</dd> -->
<dd th:text="${#strings.listJoin(country.currenciesView, ',')}">
Euro
</dd>
</div>
<div class="flex">
<dt class="font-bold mr-2">Languages:</dt>
<dd th:text="${#strings.listJoin(country.languagesView, ', ')}">
Dutch, French, German
</dd>
</div>
</dl>
<section
id="neighboring-countries"
class="md:col-span-full md:flex md:flex-row md:items-center md:gap-x-2"
>
<h2 class="font-bold text-lg md:pr-2">Border Countries:</h2>
<div class="grid grid-cols-3 gap-2">
<a
href="/"
class="text-center min-h-9 bg-white drop-shadow text-md rounded px-5 py-2 md:w-32 md:py-1 dark:bg-dark-blue"
th:each="border : ${borderCountries}"
th:text="${border}"
th:href="@{~/country(countryName=${border})}"
>France</a
>
</div>
</section>
</section>
</main>
<script
th:replace="~{index :: script#dark-mode-scripts}"
type="text/javascript"
>
document.addEventListener("DOMContentLoaded", function () {
const darkMode = localStorage.getItem("darkMode");
console.log("yoyo");
if (darkMode === "true") {
document.documentElement.classList.add("dark");
} else {
document.documentElement.classList.remove("dark");
}
});
document
.getElementById("toggleDarkMode")
.addEventListener("click", function () {
document.documentElement.classList.toggle("dark");
localStorage.setItem(
"darkMode",
document.documentElement.classList.contains("dark")
);
});
</script>
</body>
</html>

View File

@@ -0,0 +1,266 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta http-equiv="x-ua-compatible" content="ie=edge" />
<title>Exploring countries</title>
<meta name="description" content="" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link href="../public/output.css" th:href=@{~/public/output.css}
rel="stylesheet" />
<script src="https://unpkg.com/htmx.org@1.9.6"></script>
<link rel="apple-touch-icon" href="/apple-touch-icon.png" />
<!-- Place favicon.ico in the root directory -->
</head>
<body
class="bg-very-light-gray h-screen flex flex-col dark:bg-very-dark-blue dark:text-white"
hx-boost="true"
>
<!--[if lt IE 8]>
<p class="browserupgrade">
You are using an <strong>outdated</strong> browser. Please
<a href="http://browsehappy.com/">upgrade your browser</a> to improve
your experience.
</p>
<![endif]-->
<header
class="w-screen bg-white h-20 flex flex-row shadow-md place-content-center flex-none dark:bg-dark-blue"
>
<div
class="flex-1 max-w-screen-xl h-20 flex flex-row justify-between items-center px-4"
>
<a th:href="@{~/}" href="index.html"
><h1 class="grow font-bold md:text-2xl">Where in the world?</h1>
</a>
<button id="toggleDarkMode" class="flex flex-row gap-x-2">
<svg
class="text-black dark:text-white h-6"
viewBox="0 0 24 24"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M21.7519 15.0019C20.597 15.4839 19.3296 15.75 18 15.75C12.6152 15.75 8.25 11.3848 8.25 5.99999C8.25 4.67039 8.51614 3.40296 8.99806 2.24805C5.47566 3.71785 3 7.19481 3 11.25C3 16.6348 7.36522 21 12.75 21C16.8052 21 20.2821 18.5243 21.7519 15.0019Z"
stroke="currentColor"
stroke-width="1.5"
stroke-linecap="round"
stroke-linejoin="round"
/>
</svg>
<p>Dark Mode</p>
</button>
</div>
</header>
<nav
class="flex flex-col flex-none md:flex-row px-6 my-4 justify-around h-48 md:h-32 md:items-center"
>
<form
method="get"
id="search-country"
action=""
hx-get="/country"
hx-target="body"
hx-push-url="true"
class="contents"
>
<div
class="md:w-1/4 md:min-w-max flex flex-row items-center bg-white shadow-md h-14 md:h-16 rounded-lg dark:bg-dark-blue"
>
<!-- <p class="w-16 grid place-content-center">IC</p> -->
<svg
class="text-black dark:text-white h-6 px-7"
viewBox="0 0 20 20"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
fill-rule="evenodd"
clip-rule="evenodd"
d="M9 3.5C5.96243 3.5 3.5 5.96243 3.5 9C3.5 12.0376 5.96243 14.5 9 14.5C10.519 14.5 11.893 13.8852 12.8891 12.8891C13.8852 11.893 14.5 10.519 14.5 9C14.5 5.96243 12.0376 3.5 9 3.5ZM2 9C2 5.13401 5.13401 2 9 2C12.866 2 16 5.13401 16 9C16 10.6625 15.4197 12.1906 14.4517 13.3911L17.7803 16.7197C18.0732 17.0126 18.0732 17.4874 17.7803 17.7803C17.4874 18.0732 17.0126 18.0732 16.7197 17.7803L13.3911 14.4517C12.1906 15.4197 10.6625 16 9 16C5.13401 16 2 12.866 2 9Z"
fill="currentColor"
/>
</svg>
<input
class="appearance-none flex-grow focus:outline-none mr-2 dark:bg-dark-blue dark:placeholder:text-white"
type="text"
id="country.nameView-input"
name="countryName"
list="country.nameViews-list"
placeholder="Search for a country..."
hx-post="/countries-cards"
hx-target="#countries-main-list"
hx-trigger="keyup changed delay:500ms"
/>
</div>
<datalist id="country.nameViews-list">
<option
th:each="country : ${allCountriesList}"
th:value="${country.nameView}"
value=""
></option>
</datalist>
<select
name="region"
class="block w-62 mt-1 h-14 md:h-16 w-64 bg-white shadow-lg rounded-md shadow-sm focus:outline-none px-7 dark:bg-dark-blue"
hx-post="/countries-cards"
hx-target="#countries-main-list"
>
<option
value=""
selected
disabled
th:selected="${#strings.isEmpty(selectedRegion)}"
>
Filter by Region
</option>
<option
th:each="region: ${regionsSet}"
th:value="${region}"
th:text="${region}"
th:selected="${selectedRegion == region}"
value="Africa"
>
Africa
</option>
<option th:remove="all" value="Americas">Americas</option>
<option th:remove="all" value="Asia">Asia</option>
<option th:remove="all" value="Europe">Europe</option>
<option th:remove="all" value="Oceania">Oceania</option>
</select>
</form>
</nav>
<main
class="flex flex-col items-center gap-10 pb-8 md:grid md:grid-cols-[repeat(auto-fill,_275px)] md:px-20 md:justify-around"
id="countries-main-list"
>
<article
th:fragment="cards-of-countries (countriesList)"
th:each="country : ${countriesList}"
id="germany"
th:id="${country.alpha3Code}"
class="bg-white min-h-[350px] w-[275px] flex flex-col rounded-lg shadow-lg dark:bg-dark-blue"
>
<a
href="country.html"
th:href="@{~/country(countryName=${country.nameView})}"
>
<img
src="https://flagcdn.com/de.svg"
th:src="${country.flag}"
alt="flag of Germany"
th:alt="|flag of ${country.nameView}|"
class="rounded-t-lg max-h-56 w-full"
/>
<section class="p-8 space-y-3 min-h-fit">
<h2 class="text-2xl font-bold" th:text="${country.nameView}">
Germany
</h2>
<dl class="space-y-1">
<div class="flex">
<dt class="font-bold mr-2">Population:</dt>
<dd
th:text="${#numbers.formatInteger(country.population, 3, 'COMMA')}"
>
81,771,900
</dd>
</div>
<div class="flex">
<dt class="font-bold mr-2">Region:</dt>
<dd th:text="${country.region}">Europe</dd>
</div>
<div class="flex">
<dt class="font-bold mr-2">Capital:</dt>
<dd th:text="${country.capitalView}">Berlin</dd>
</div>
</dl>
</section>
</a>
</article>
<div
th:fragment="infiniteScrollAnchor (nextPage, selectedRegion)"
th:if="${nextPage != -1}"
id="next-page-anchor"
hx-trigger="revealed"
th:hx-get="@{~/countries-cards(region=${selectedRegion},page=${nextPage},countryName=${countryName})}"
hx-swap="outerHTML"
></div>
<article
id="usa"
class="bg-white h-[350px] w-[275px] flex flex-col rounded-lg shadow-lg dark:bg-dark-blue"
th:remove="all"
>
<img
src="https://flagcdn.com/us.svg"
alt="flag of the USA"
class="rounded-t-lg"
/>
<section class="p-8 space-y-3">
<h2 class="text-2xl font-bold">United States of America</h2>
<dl class="space-y-1">
<div class="flex">
<dt class="font-bold mr-2">Population:</dt>
<dd>329,484,123</dd>
</div>
<div class="flex">
<dt class="font-bold mr-2">Region:</dt>
<dd>Americas</dd>
</div>
<div class="flex">
<dt class="font-bold mr-2">Capital:</dt>
<dd>Washington, D.C.</dd>
</div>
</dl>
</section>
</article>
<article
id="Brazil"
class="bg-white h-[350px] w-[275px] flex flex-col rounded-lg shadow-lg dark:bg-dark-blue"
th:remove="all"
>
<img
src="https://flagcdn.com/br.svg"
alt="flag of Germany"
class="rounded-t-lg"
/>
<section class="p-8 space-y-3">
<h2 class="text-2xl font-bold">Brazil</h2>
<dl class="space-y-1">
<div class="flex">
<dt class="font-bold mr-2">Population:</dt>
<dd>212,559,409</dd>
</div>
<div class="flex">
<dt class="font-bold mr-2">Region:</dt>
<dd>Americas</dd>
</div>
<div class="flex">
<dt class="font-bold mr-2">Capital:</dt>
<dd>Brasília</dd>
</div>
</dl>
</section>
</article>
</main>
<script id="dark-mode-scripts" type="text/javascript">
document.addEventListener("DOMContentLoaded", function () {
const darkMode = localStorage.getItem("darkMode");
if (darkMode === "true") {
document.documentElement.classList.add("dark");
} else {
document.documentElement.classList.remove("dark");
}
});
document
.getElementById("toggleDarkMode")
.addEventListener("click", function () {
document.documentElement.classList.toggle("dark");
localStorage.setItem(
"darkMode",
document.documentElement.classList.contains("dark")
);
});
</script>
</body>
</html>

File diff suppressed because one or more lines are too long

View File

@@ -0,0 +1,48 @@
package example
import upickle.default._
import scala.jdk.CollectionConverters._
final case class Country(
name: Name,
cca3: String,
population: Int,
region: String,
subregion: String = "",
flags: Flags,
capital: List[String] = List.empty,
tld: Option[String] = None, // maybe optional?
currencies: Map[String, Currency] = Map.empty,
languages: Map[String, String] = Map.empty,
borders: List[String] = List.empty
) derives ReadWriter {
def currenciesView = currencies.values.map(_.name).toList.asJava
def languagesView = languages.values.toList.asJava
def nameView = name.common
def capitalView = capital.headOption.getOrElse("")
def nativeName = name.nativeName.headOption.map(_._2.common).getOrElse("")
def topLevelDomain = tld
def alpha3Code = cca3
def flag = flags.svg
}
final case class Name(
common: String,
nativeName: Map[String, Name.Native] = Map.empty
) derives ReadWriter
object Name {
final case class Native(
common: String
) derives ReadWriter
}
final case class Currency(
name: String,
symbol: String = ""
) derives ReadWriter
final case class Flags(
png: String,
svg: String,
alt: String = ""
) derives ReadWriter

View File

@@ -0,0 +1,55 @@
package example
import org.thymeleaf.templatemode.TemplateMode
import org.thymeleaf.TemplateEngine
import org.thymeleaf.context.Context
import cask.model.Response
import mainargs.{main, arg, ParserForMethods, Flag}
import scala.util.Try
object MinimalApplication extends cask.Routes {
@main
def run(
@arg(
name = "port",
short = 'p',
doc = "Port on which server will start service"
)
portArg: Int = 8080,
@arg(name = "host", doc = "Host on which server will start serving")
hostArg: String = "localhost"
) = {
println(s"Will start server on ${hostArg}:${portArg}")
val countriesDb = loadCountries()
val server = new cask.Main {
override def allRoutes: Seq[cask.main.Routes] = Seq(
Routes(countries = countriesDb)
)
override def port: Int = portArg
override def host: String = hostArg
}
server.main(Array.empty)
}
def loadCountries() = {
val defaultCountriesData: List[Country] =
upickle.default.read[List[Country]](
scala.io.Source.fromResource("temporary/all.json").getLines().mkString,
true
)
val apiDataRequest = requests.get("https://restcountries.com/v3.1/all")
val apiData = Try(
upickle.default.read[List[Country]](apiDataRequest.text(), true)
)
if (apiData.isFailure)
println(s"> data load failed ${apiData}")
else
println(s"> api data load is successful")
apiData.toOption.getOrElse(defaultCountriesData)
}
def main(args: Array[String]): Unit = ParserForMethods(this).runOrExit(args)
}

View File

@@ -0,0 +1,184 @@
package example
import cask.model.Response
import org.thymeleaf.templateresolver.ClassLoaderTemplateResolver
import org.thymeleaf.TemplateEngine
import org.thymeleaf.context.Context
import org.thymeleaf.templatemode.TemplateMode
import scala.jdk.CollectionConverters._
import cask.model.Request
case class Routes(countries: List[Country])(implicit
cc: castor.Context,
log: cask.Logger
) extends cask.Routes {
/** initializing thymeleaf template engine which finds and renders html
* templates by name
*/
def buildTemplateEngine(): TemplateEngine = {
val templateResolver = new ClassLoaderTemplateResolver()
templateResolver.setTemplateMode(TemplateMode.HTML)
templateResolver.setPrefix("/templates/")
templateResolver.setSuffix(".html")
templateResolver.setCacheTTLMs(3600000L);
val templateEngine = new TemplateEngine()
templateEngine.setTemplateResolver(templateResolver)
templateEngine
}
val engine: TemplateEngine = buildTemplateEngine()
private val pageSize = 12
@cask.get("/")
def indexPage(
region: Option[String] = None,
page: Int = 0,
countryName: Option[String] = None
) = {
val context = new Context()
val regions = countries.map(_.region).distinct.sorted.asJava
val selectedCountries = getSelectedCountries(region, countryName)
val startIndex = page * pageSize
val countriesPage =
selectedCountries.slice(startIndex, startIndex + pageSize)
// if current page is not full - there will be no next page
val nextPage = if (countriesPage.length == pageSize) page + 1 else -1
context.setVariable("nextPage", nextPage)
context.setVariable("regionsSet", regions)
context.setVariable("countriesList", countriesPage.asJava)
context.setVariable("allCountriesList", countries.asJava)
// for anchor to request next pages from same countries
context.setVariable("selectedRegion", region.getOrElse(""))
context.setVariable("countryName", countryName.getOrElse(""))
val indexPage = engine.process("index", context)
Response(
indexPage,
headers = Seq("Content-Type" -> "text/html; charset=utf-8")
)
}
@cask.postForm("/countries-cards")
def postPageOfCountriesCards(
region: cask.FormValue,
countryName: cask.FormValue
) = {
println(s"in get for countries cards with $region and $countryName")
getPageOfCountriesCards(Some(region.value), 0, Some(countryName.value))
}
/** this method returns directly set of cards and new anchor for loading next
* page of cards
*
* intended to be called from "next-page-anchor" with htmx
*/
@cask.get("/countries-cards")
def getPageOfCountriesCards(
region: Option[String] = None,
page: Int = 0,
countryName: Option[String] = None
) = {
val context = new Context()
val selectedCountries = getSelectedCountries(region, countryName)
val startIndex = page * pageSize
val countriesPage =
selectedCountries.slice(startIndex, startIndex + pageSize)
context.setVariable("countriesList", countriesPage.asJava)
// for anchor to request next pages from same countries
context.setVariable("selectedRegion", region.getOrElse(""))
context.setVariable("countryName", countryName.getOrElse(""))
// if current page is not full - there will be no next page
val nextPage = if (countriesPage.length == pageSize) page + 1 else -1
context.setVariable("nextPage", nextPage)
val cards = engine.process(
"index",
Set("cards-of-countries", "infiniteScrollAnchor").asJava,
context
)
// this is to store switch to another region in the history
val newUrl = s"/?region=${region.getOrElse("")}&countryName=${countryName.getOrElse("")}"
// only save url when new region is requested, not on addtional card loads
val urlHeaderOpt = if (page == 0) Seq("HX-Push" -> newUrl) else Seq.empty
Response(
cards,
headers = Seq(
"Content-Type" -> "text/html; charset=utf-8"
) ++ urlHeaderOpt
)
}
private def getSelectedCountries(
region: Option[String] = None,
countryName: Option[String] = None
) = {
val countriesFromSelectedRegion = region match {
case None => countries
case Some("") => countries
case Some(selectedRegion) => countries.filter(_.region == selectedRegion)
}
// applying country name filtering, can be partial name
val selectedCountries = countryName match {
case None => countriesFromSelectedRegion
case Some("") => countriesFromSelectedRegion
case Some(partialSearchString) =>
val lowerSearch = partialSearchString.toLowerCase()
countriesFromSelectedRegion
.filter(country => {
val nameContainsPartialMatch =
country.name.common.toLowerCase().contains(lowerSearch) ||
country.name.nativeName.values.foldLeft(false) {
(acc, nativeName) =>
acc || nativeName.common.toLowerCase().contains(lowerSearch)
}
nameContainsPartialMatch
})
}
selectedCountries
}
@cask.get("/country")
def getCountryPage(countryName: String, region: Option[String] = None) = {
val context = new Context()
countries.find(_.name.common == countryName) match {
case Some(selectedCountry) =>
context.setVariable("country", selectedCountry)
val borderCountries = countries
.filter(c => selectedCountry.borders.contains(c.alpha3Code))
.map(_.name.common)
.sortBy(_.length())
.asJava
context.setVariable("borderCountries", borderCountries)
val countryPage = engine.process("country", context)
Response(
countryPage,
headers = Seq("Content-Type" -> "text/html; charset=utf-8")
)
case None => Response("", 400)
}
}
@cask.post("/do-thing")
def doThing(request: cask.Request) = {
request.text().reverse
}
@cask.staticResources("public")
def giveStaticResources() = "public"
initialize()
}

View File

@@ -0,0 +1,8 @@
package example
class ExampleSuite extends munit.FunSuite:
test("addition") {
assert(1 + 1 == 2)
}
end ExampleSuite

View File

@@ -0,0 +1,41 @@
# Front-end Style Guide
## Layout
The designs were created to the following widths:
- Mobile: 375px
- Desktop: 1440px
## Colors
### Neutral
- Dark Blue (Dark Mode Elements): hsl(209, 23%, 22%)
- Very Dark Blue (Dark Mode Background): hsl(207, 26%, 17%)
- Very Dark Blue (Light Mode Text): hsl(200, 15%, 8%)
- Dark Gray (Light Mode Input): hsl(0, 0%, 52%)
- Very Light Gray (Light Mode Background): hsl(0, 0%, 98%)
- White (Dark Mode Text & Light Mode Elements): hsl(0, 0%, 100%)
## Typography
### Body Copy
- Homepage Items: 14px
- Detail Page: 16px
### Fonts
- Family: [Nunito Sans](https://fonts.google.com/specimen/Nunito+Sans)
- Weights: 300, 600, 800
## Icons
For the icons, you can use a font icon library. Don't worry if the icons that you choose don't look exactly like they do on the design.
Some suggestions can be found below:
- [Font Awesome](https://fontawesome.com)
- [IcoMoon](https://icomoon.io)
- [Ionicons](https://ionicons.com)

View File

@@ -0,0 +1,20 @@
/** @type {import('tailwindcss').Config} */
module.exports = {
content: ["./src/main/resources/**/*.html"],
darkMode: 'class',
theme: {
extend: {
colors: {
'dark-gray': 'hsl(0, 0%, 52%)', // light mode input
'very-light-gray': 'hsl(0, 0%, 98%)', // light mode bg
'dark-blue': 'hsl(209, 23%, 22%)', // dark mode elements
'very-dark-blue': 'hsl(207, 26%, 17%)', // dark mode bg
},
fontFamily: {
'sans': ['NunitoSans', 'sans-serif'],
},
},
},
plugins: [],
}

View File

@@ -0,0 +1,18 @@
# Avoid accidental upload of the Sketch and Figma design files
#####################################################
## Please do not remove lines 5 and 6 - thanks! 🙂 ##
#####################################################
*.sketch
*.fig
# Avoid accidental XD upload if you convert the design file
###############################################
## Please do not remove line 12 - thanks! 🙂 ##
###############################################
*.xd
# Avoid your project being littered with annoying .DS_Store files!
.DS_Store
.prettierignore
public/out.css

View File

View File

@@ -0,0 +1,96 @@
* Frontend Mentor - Results summary component solution
:PROPERTIES:
:CUSTOM_ID: frontend-mentor---results-summary-component-solution
:END:
This is a solution to the
[[https://www.frontendmentor.io/challenges/results-summary-component-CE_K6s0maV][Results
summary component challenge on Frontend Mentor]]. Frontend Mentor
challenges help you improve your coding skills by building realistic
projects.
** Overview
:PROPERTIES:
:CUSTOM_ID: overview
:END:
*** The challenge
:PROPERTIES:
:CUSTOM_ID: the-challenge
:END:
Users should be able to:
- View the optimal layout for the interface depending on their device's
screen size
- See hover and focus states for all interactive elements on the page
- *Bonus*: Use the local JSON data to dynamically populate the content
*** Screenshot
:PROPERTIES:
:CUSTOM_ID: screenshot
:END:
[[screenshot-mobile.png]]
[[screenshot-desktop.png]]
*** Links
:PROPERTIES:
:CUSTOM_ID: links
:END:
- Solution URL: https://github.com/efim/Learning-HTMX/tree/master/17-results-summary-component-go
- Live Site URL: https://efim-frontentmentor-results-summary-go.onrender.com/
** My process
:PROPERTIES:
:CUSTOM_ID: my-process
:END:
*** Built with
:PROPERTIES:
:CUSTOM_ID: built-with
:END:
- Semantic HTML5 markup
- TailwindCSS
- Flexbox
- CSS Grid
- Mobile-first workflow
- Go Server Side Rendering
- Nix for building and docker image creation
*** What I learned
:PROPERTIES:
:CUSTOM_ID: what-i-learned
:END:
**** restarting server of file watch
:PROPERTIES:
:CUSTOM_ID: restarting-server-of-file-watch
:END:
go doesn't have built in restart on file watch, and there are separate programs that do that
#+begin_src bash
wgo -verbose -file .go -file .gohtml -file tailwind.config.js tailwindcss -i ./input.css -o public/out.css :: go run main.go -p 1234
#+end_src
and doing tailwind first, because server embeds the output css file, so
it's needed for the build step
**** setting up static routes with default go web server
**** generating template and returning it as response of go route
**** embedding files into the binary for portability
**** using css variables to set custom colors in TailwindCSS
**** getting cli arguments in the go program
*** Continued development
:PROPERTIES:
:CUSTOM_ID: continued-development
:END:
Further things to learn: getting data from forms, general go things - coroutines, utilizing sqlite, embedding PocketBase
*** Useful resources
:PROPERTIES:
:CUSTOM_ID: useful-resources
:END:
- https://pkg.go.dev/text/template#example-Template-Block
main go templating documentation
- https://pkg.go.dev/net/http
main default server documentation
- https://nixos.wiki/wiki/Go - packaging Go
- https://golangdocs.com/command-line-arguments-in-golang
command line arguments

View File

@@ -0,0 +1,22 @@
[
{
"category": "Reaction",
"score": 80,
"icon": "./assets/images/icon-reaction.svg"
},
{
"category": "Memory",
"score": 92,
"icon": "./assets/images/icon-memory.svg"
},
{
"category": "Verbal",
"score": 61,
"icon": "./assets/images/icon-verbal.svg"
},
{
"category": "Visual",
"score": 72,
"icon": "./assets/images/icon-visual.svg"
}
]

View File

@@ -0,0 +1,32 @@
{ lib, pkgs, ... }:
let
pname = "results-summary-component";
version = "0.0.1";
in rec {
package = pkgs.buildGoModule {
inherit pname version;
src = pkgs.nix-gitignore.gitignoreSource [ ] ./.;
vendorHash = null; # set to "" when get dependencies in go.mod
# Adding the Tailwind build step to preBuild
preBuild = ''
${pkgs.nodePackages.tailwindcss}/bin/tailwindcss -i ./input.css -o public/out.css
'';
};
image = pkgs.dockerTools.buildLayeredImage {
name = pname;
tag = "latest";
created = "now";
config = {
Cmd = [
"${package}/bin/results-summary-component-go"
"-p"
"8080"
"-h"
"0.0.0.0"
];
ExposedPorts = { "8080/tcp" = { }; };
};
};
# nixos module
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

View File

@@ -0,0 +1,3 @@
module sunshine.industries/results-summary-component-go
go 1.20

View File

@@ -0,0 +1,34 @@
@tailwind base;
@tailwind components;
@tailwind utilities;
@layer base {
:root {
--summary-item-color-var: 0deg 100% 67%
}
}
html {
font-size: 18px;
}
@font-face {
font-family: 'HankenGrotesk';
src: url('/static/public/fonts/static/HankenGrotesk-Medium.ttf') format('truetype');
font-weight: 400; /* Regular */
font-style: normal;
}
@font-face {
font-family: 'HankenGrotesk';
src: url('/static/public/fonts/static/HankenGrotesk-Bold.ttf') format('truetype');
font-weight: 700; /* Bold */
font-style: normal;
}
@font-face {
font-family: 'HankenGrotesk';
src: url('/static/public/fonts/static/HankenGrotesk-ExtraBold.ttf') format('truetype');
font-weight: 800; /* ExtraBold */
font-style: normal;
}

View File

@@ -0,0 +1,79 @@
package main
import (
"embed"
"flag"
"fmt"
"html/template"
"io"
"log"
"net/http"
)
//go:embed public
var publicContent embed.FS
//go:embed templates
var templates embed.FS
type Category struct {
Name string
ColorHsl string
Score int
IconPath string
}
func iconPath(categoryName string) string {
return fmt.Sprintf("/static/public/images/icon-%s.svg", categoryName)
}
type ResultsSummaryData struct {
Categories []Category
TotalScore int
UpperPercent int
}
// starts webserver that serves html page for exercise
func main() {
// serves public static resources: bundled images, fonts, css
// visible on http://localhost:8080/static/public/some-text.txt
http.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.FS(publicContent))))
http.HandleFunc("/hello", func(w http.ResponseWriter, req *http.Request) {
io.WriteString(w, "This is temporary here, hello")
})
resultsData := ResultsSummaryData{
Categories: []Category{
{Name: "Reaction", ColorHsl: "0deg 100% 67%",
Score: 80, IconPath: iconPath("reaction")},
{Name: "Memory", ColorHsl: "39deg 100% 56%",
Score: 92, IconPath: iconPath("memory")},
{Name: "Verbal", ColorHsl: "166deg 100% 37%",
Score: 61, IconPath: iconPath("verbal")},
{Name: "Visual", ColorHsl: "234deg 85% 45%",
Score: 72, IconPath: iconPath("visual")},
},
TotalScore: 76,
UpperPercent: 65,
}
// main page with results summary
http.HandleFunc("/", func(w http.ResponseWriter, req *http.Request) {
templateName := "templates/summary-component.gohtml"
tmpl := template.Must(template.ParseFS(templates, "templates/index.gohtml", templateName))
if err := tmpl.Execute(w, resultsData); err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
}
})
var port int
var host string
flag.IntVar(&port, "p", 8080, "Specify port for server to start on")
flag.StringVar(&host, "h", "localhost", "Specify host for server to start on")
flag.Parse()
address := fmt.Sprintf("%s:%d", host, port)
log.Printf("starting server on %s", address)
log.Fatal(http.ListenAndServe(address, nil))
}

View File

@@ -0,0 +1,54 @@
Hanken Grotesk Variable Font
============================
This download contains Hanken Grotesk as both variable fonts and static fonts.
Hanken Grotesk is a variable font with this axis:
wght
This means all the styles are contained in these files:
HankenGrotesk-VariableFont_wght.ttf
If your app fully supports variable fonts, you can now pick intermediate styles
that arent available as static fonts. Not all apps support variable fonts, and
in those cases you can use the static font files for Hanken Grotesk:
static/HankenGrotesk-Medium.ttf
static/HankenGrotesk-Bold.ttf
static/HankenGrotesk-ExtraBold.ttf
Get started
-----------
1. Install the font files you want to use
2. Use your app's font picker to view the font family and all the
available styles
Learn more about variable fonts
-------------------------------
https://developers.google.com/web/fundamentals/design-and-ux/typography/variable-fonts
https://variablefonts.typenetwork.com
https://medium.com/variable-fonts
In desktop apps
https://theblog.adobe.com/can-variable-fonts-illustrator-cc
https://helpx.adobe.com/nz/photoshop/using/fonts.html#variable_fonts
Online
https://developers.google.com/fonts/docs/getting_started
https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Fonts/Variable_Fonts_Guide
https://developer.microsoft.com/en-us/microsoft-edge/testdrive/demos/variable-fonts
Installing fonts
MacOS: https://support.apple.com/en-us/HT201749
Linux: https://www.google.com/search?q=how+to+install+a+font+on+gnu%2Blinux
Windows: https://support.microsoft.com/en-us/help/314960/how-to-install-or-remove-a-font-in-windows
Android Apps
https://developers.google.com/fonts/docs/android
https://developer.android.com/guide/topics/ui/look-and-feel/downloadable-fonts

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="none" viewBox="0 0 20 20"><path stroke="#FFB21E" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.25" d="M5.833 11.667a2.5 2.5 0 1 0 .834 4.858"/><path stroke="#FFB21E" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.25" d="M3.553 13.004a3.333 3.333 0 0 1-.728-5.53m.025-.067a2.083 2.083 0 0 1 2.983-2.824m.199.054A2.083 2.083 0 1 1 10 3.75v12.917a1.667 1.667 0 0 1-3.333 0M10 5.833a2.5 2.5 0 0 0 2.5 2.5m1.667 3.334a2.5 2.5 0 1 1-.834 4.858"/><path stroke="#FFB21E" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.25" d="M16.447 13.004a3.334 3.334 0 0 0 .728-5.53m-.025-.067a2.083 2.083 0 0 0-2.983-2.824M10 3.75a2.085 2.085 0 0 1 2.538-2.033 2.084 2.084 0 0 1 1.43 2.92m-.635 12.03a1.667 1.667 0 0 1-3.333 0"/></svg>

After

Width:  |  Height:  |  Size: 831 B

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="none" viewBox="0 0 20 20"><path stroke="#F55" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.25" d="M10.833 8.333V2.5l-6.666 9.167h5V17.5l6.666-9.167h-5Z"/></svg>

After

Width:  |  Height:  |  Size: 247 B

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="none" viewBox="0 0 20 20"><path stroke="#00BB8F" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.25" d="M7.5 10h5M10 18.333A8.333 8.333 0 1 0 1.667 10c0 1.518.406 2.942 1.115 4.167l-.699 3.75 3.75-.699A8.295 8.295 0 0 0 10 18.333Z"/></svg>

After

Width:  |  Height:  |  Size: 323 B

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="none" viewBox="0 0 20 20"><path stroke="#1125D6" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.25" d="M10 11.667a1.667 1.667 0 1 0 0-3.334 1.667 1.667 0 0 0 0 3.334Z"/><path stroke="#1125D6" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.25" d="M17.5 10c-1.574 2.492-4.402 5-7.5 5s-5.926-2.508-7.5-5C4.416 7.632 6.66 5 10 5s5.584 2.632 7.5 5Z"/></svg>

After

Width:  |  Height:  |  Size: 453 B

View File

@@ -0,0 +1,2 @@
hello!
yoyo

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 99 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 47 KiB

View File

@@ -0,0 +1,49 @@
# Front-end Style Guide
## Layout
The designs were created to the following widths:
- Mobile: 375px
- Desktop: 1440px
## Colors
### Primary
- Light red: hsl(0, 100%, 67%)
- Orangey yellow: hsl(39, 100%, 56%)
- Green teal: hsl(166, 100%, 37%)
- Cobalt blue: hsl(234, 85%, 45%)
## Gradients
- Light slate blue (background): hsl(252, 100%, 67%)
- Light royal blue (background): hsl(241, 81%, 54%)
- Violet blue (circle): hsla(256, 72%, 46%, 1)
- Persian blue (circle): hsla(241, 72%, 46%, 0)
### Neutral
- White: hsl(0, 0%, 100%)
- Pale blue: hsl(221, 100%, 96%)
- Light lavender: hsl(241, 100%, 89%)
- Dark gray blue: hsl(224, 30%, 27%)
### Notes
Use transparency to get the colour variations necessary to match the design. Hint: look into using `hsla()`.
## Typography
### Body Copy
- Font size (paragraphs): 18px
### Font
- Family: [Hanken Grotesk](https://fonts.google.com/specimen/Hanken+Grotesk)
- Weights: 500, 700, 800

View File

@@ -0,0 +1,24 @@
/** @type {import('tailwindcss').Config} */
module.exports = {
content: ["./**/*.gohtml"],
theme: {
extend: {
colors: {
'light-slate-blue': 'hsl(252, 100%, 67%)',
'light-royal-blue': 'hsl(241, 81%, 54%)',
'violet-blue': 'hsla(256, 72%, 46%)',
'persian-blue': 'hsla(241, 72%, 46%)',
'pale-blue': 'hsl(221, 100%, 96%)',
'light-lavender': 'hsl(241, 100%, 89%)',
'dark-gray-blue': 'hsl(224, 30%, 27%)',
'summary-item-color': 'hsl(var(--summary-item-color-var) / <alpha-value>)',
},
'fontFamily': {
'sans': ['HankenGrotesk', 'sans-serif'],
'added': ['HankenGrotesk', 'sans-serif'],
},
},
},
plugins: [],
}

View File

@@ -0,0 +1,45 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<!-- displays site properly based on user's device -->
<link
rel="stylesheet"
href="static/public/out.css"
type="text/css"
media="screen"
/>
<link
rel="icon"
type="image/png"
sizes="32x32"
href="static/public/images/favicon-32x32.png"
/>
<title>Frontend Mentor | Results summary component</title>
<!-- Feel free to remove these styles or customise in your own stylesheet 👍 -->
<style>
.attribution {
font-size: 11px;
text-align: center;
}
.attribution a {
color: hsl(228, 45%, 44%);
}
</style>
</head>
<body>
<main class="grid place-items-center w-screen h-screen">
{{ template "results-summary-component" . }}
</main>
<footer class="fixed inset-x-0 bottom-1 attribution">
Challenge by
<a href="https://www.frontendmentor.io?ref=challenge" target="_blank"
>Frontend Mentor</a
>. Coded by <a href="#">Your Name Here</a>.
</footer>
</body>
</html>

View File

@@ -0,0 +1,104 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<!-- displays site properly based on user's device -->
<link
rel="stylesheet"
href="static/public/out.css"
type="text/css"
media="screen"
/>
<link
rel="icon"
type="image/png"
sizes="32x32"
href="static/public/images/favicon-32x32.png"
/>
<title>THIS IS FILE FOR THE COMPONENT</title>
<!-- Feel free to remove these styles or customise in your own stylesheet 👍 -->
<style>
.attribution {
font-size: 11px;
text-align: center;
}
.attribution a {
color: hsl(228, 45%, 44%);
}
</style>
</head>
<body>
<main class="grid place-items-center w-screen h-screen">
{{/* only things inside of block component are used, yay */}}
{{ block "results-summary-component" . }}
<article
class="flex flex-col w-full h-full md:flex-row md:bg-white md:rounded-3xl md:shadow-2xl md:shadow-light-lavender/50 md:w-[715px] md:h-[500px]"
>
<section
id="results-pane"
class="flex flex-col gap-y-4 items-center px-10 pt-4 pb-8 text-white bg-gradient-to-t from-50% rounded-b-3xl md:justify-around md:w-1/2 md:rounded-3xl from-light-royal-blue to-light-slate-blue"
>
<h1 class="font-bold md:pt-2 md:text-xl text-pale-blue">
Your Result
</h1>
<div
class="flex flex-col justify-center items-center w-32 h-32 bg-gradient-to-t rounded-full md:w-44 md:h-44 from-violet-blue/60 to-persian-blue/75"
>
<span class="text-5xl font-extrabold md:text-6xl"
>{{ .TotalScore }}</span
>
<span class="text-pale-blue"> of 100 </span>
</div>
<div class="flex flex-col gap-y-3 items-center">
<h2 class="text-xl font-bold md:text-2xl">Great</h2>
<p class="text-sm text-center md:text-base text-pale-blue">
You scored higher than {{ .UpperPercent }}% of the people who have
taken these tests.
</p>
</div>
</section>
<section
id="summary-pane"
class="flex flex-col gap-y-4 p-7 md:justify-around md:px-8 md:w-1/2"
>
<h2 class="font-bold md:text-xl">Summary</h2>
<dl class="flex flex-col gap-y-4">
{{ range .Categories }}
<div
class="flex flex-row items-center px-5 h-12 text-sm rounded-lg bg-summary-item-color/5"
style="--summary-item-color-var: {{ .ColorHsl }}"
>
<img src="{{ .IconPath }}" alt="" class="pr-2" />
<dt class="flex-1 text-summary-item-color">{{ .Name }}</dt>
<dd class="flex flex-row">
<strong class="pr-2">{{ .Score }}</strong>
<span class="text-dark-gray-blue">/ 100</span>
</dd>
</div>
{{ end }}
</dl>
<a
href="/"
flex
flex-row
class="grid place-items-center w-full h-12 text-white rounded-full bg-dark-gray-blue"
>
Continue
</a>
</section>
</article>
{{ end }}
</main>
<footer class="fixed inset-x-0 bottom-1 attribution">
Challenge by
<a href="https://www.frontendmentor.io?ref=challenge" target="_blank"
>Frontend Mentor</a
>. Coded by <a href="#">Your Name Here</a>.
</footer>
</body>
</html>

1
18-expenses-chart/.envrc Normal file
View File

@@ -0,0 +1 @@
use flake

Some files were not shown because too many files have changed in this diff Show More