[enhancement] happyx hello world

24ik · Dec 11, 2023 · 473486e · 473486e
1 parent dc94d03
commit 473486e
Show file tree

Hide file tree

Showing 6 changed files with 87 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+# Nim
 /nimcache/
 /testresults/
 /outputGotten.txt
@@ -7,16 +8,25 @@
 /tests/*/*
 !/tests/*/main.nim
 
+# Documentation
 /src/htmldocs/
 
+# Karax
 /www/assets/
 /www/index.js
 /www/index.min.js
 /www/worker.js
 /www/worker.min.js
 
+# Binary
 /pon2
 /pon2.exe
 
+# Benchmark
 /benchmark/*
-!/benchmark/*.nim*
+!/benchmark/*.nim*
+
+# HappyX
+/src/assets/
+/src/pon2.js
+/www-happyx/
diff --git a/happyx.cfg b/happyx.cfg
@@ -0,0 +1,8 @@
+[Main]
+projectName = pon2
+projectType = SPA
+mainFile = pon2
+srcDir = src
+buildDir = www-happyx
+assetsDir = assets
+language = nim
diff --git a/pon2.nimble b/pon2.nimble
@@ -1,20 +1,21 @@
 # Package
 
-version       = "0.7.0"
-author        = "Keisuke Izumiya"
-description   = "Puyo Puyo Library"
-license       = "Apache-2.0 OR MPL-2.0"
+version = "0.7.0"
+author = "Keisuke Izumiya"
+description = "Puyo Puyo Library"
+license = "Apache-2.0"
 
-srcDir        = "src"
-installExt    = @["nim"]
-bin           = @["pon2"]
+srcDir = "src"
+installExt = @["nim"]
+bin = @["pon2"]
 
 
 # Dependencies
 
 requires "nim ^= 2.0.0"
 
 requires "docopt ^= 0.7.1"
+requires "happyx ^= 3.5.2"
 requires "karax ^= 1.3.3"
 requires "nigui ^= 0.2.7"
 requires "nimsimd ^= 1.2.6"
@@ -40,10 +41,10 @@ task benchmark, "Benchmarking":
   exec &"nim c -r -d:avx2={avx2} -d:bmi2={bmi2} benchmark/main.nim"
 
 task documentation, "Make Documentation":
-  exec &"nim doc --project -d:avx2=true src/pon2.nim" 
+  exec &"nim doc --project -d:avx2=true src/pon2.nim"
   mvDir "src/htmldocs", "src/htmldocs2"
 
-  exec &"nim doc --project -d:avx2=false src/pon2.nim" 
+  exec &"nim doc --project -d:avx2=false src/pon2.nim"
   exec "cp -r src/htmldocs2 src/htmldocs"
   rmDir "src/htmldocs2"
 
@@ -64,4 +65,14 @@ task web, "Make Web Page":
       "cp www/index.js www/index.min.js"
   exec cmd
 
-  exec "cp -r assets www"
+  exec "cp -r assets www"
+
+task happyx, "HappyX":
+  cpDir "assets", "src/assets"
+  try:
+    exec "hpx build"
+  except OSError:
+    cpFile "src/index.html", "www-happyx/index.html"
+    cpFile "src/pon2.js", "www-happyx/pon2.js"
+    cpDir "src/assets", "www-happyx/public"
+    rmDir "www-happyx/assets"
diff --git a/src/index.html b/src/index.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang='ja'>
+
+<head>
+  <meta charset='UTF-8'>
+  <meta name='viewport' content='width=device-width, initial-scale=1'>
+  <title>Pon!通</title>
+  <style>
+    html {
+      touch-action: manipulation;
+    }
+  </style>
+  <link href='./public/fontawesome/css/fontawesome.min.css' rel='stylesheet'>
+  <link href='./public/fontawesome/css/brands.min.css' rel='stylesheet'>
+  <link href='./public/fontawesome/css/solid.min.css' rel='stylesheet'>
+  <link href='https://cdn.jsdelivr.net/npm/bulma@0.9.4/css/bulma.min.css' rel='stylesheet'>
+</head>
+
+<body>
+  <div id='pon2'></div>
+  <script src='./pon2.js'></script>
+  <script src='https://html2canvas.hertzen.com/dist/html2canvas.min.js'></script>
+</body>
+
+</html>
diff --git a/src/pon2.nim b/src/pon2.nim
@@ -10,6 +10,15 @@
 
 {.experimental: "strictDefs".}
 
+#[
+import happyx
+import ./pon2pkg/private/simulator/components/[hello]
+
+appRoutes "pon2":
+  "/":
+    component Hello
+]#
+
 when defined(js):
   import std/[options, sequtils, uri]
   import karax/[karax, karaxdsl, vdom]
@@ -132,7 +141,7 @@ else:
       return none GenerateRequirementColor
     {.pop.}
 
-    if idx.get notin GenerateRequirementColor.low.ord..
+    if idx.get notin GenerateRequirementColor.low.ord ..
         GenerateRequirementColor.high.ord:
       raise newException(ValueError, "クリア条件の色を表す整数が不適切な値です．")
 
@@ -206,12 +215,10 @@ else:
       kind = args["--rk"].parseRequirementKind.get
       req = GenerateRequirement(
         kind: kind,
-        color: (
-          if kind in ColorKinds: args["--rc"].parseGenerateRequirementColor
-          else: none GenerateRequirementColor),
-        number: (
-          if kind in NumberKinds: args["--rn"].parseRequirementNumber
-          else: none RequirementNumber))
+        color: (if kind in ColorKinds: args[
+            "--rc"].parseGenerateRequirementColor else: none GenerateRequirementColor),
+        number: (if kind in NumberKinds: args[
+            "--rn"].parseRequirementNumber else: none RequirementNumber))
     {.pop.}
 
     # heights

diff --git a/src/pon2pkg/private/simulator/components/hello.nim b/src/pon2pkg/private/simulator/components/hello.nim
@@ -0,0 +1,8 @@
+import happyx
+
+component Hello:
+  `template`:
+    tDiv(class = "someClass"):
+      "hello"
+  `script`:
+    echo "echo script"