[refactor] happyx

24ik · Jan 3, 2024 · f46f1c1 · f46f1c1
1 parent 0ffcb6a
commit f46f1c1
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 28 deletions.
diff --git a/.gitignore b/.gitignore
@@ -27,6 +27,6 @@
 !/benchmark/*.nim*
 
 # HappyX
-/src/assets/
-/src/pon2.js
-/www-happyx/
+/happyx/assets/
+/happyx/build/
+/happyx/main.js
diff --git a/happyx.cfg b/happyx.cfg
@@ -1,8 +1,8 @@
 [Main]
 projectName = pon2
 projectType = SPA
-mainFile = pon2
-srcDir = src
-buildDir = www-happyx
+mainFile = main
+srcDir = happyx
+buildDir = happyx/build
 assetsDir = assets
 language = nim
diff --git a/...kg/private/simulator/components/hello.nim → happyx/components/hello.nim b/...kg/private/simulator/components/hello.nim → happyx/components/hello.nim
@@ -1,3 +1,7 @@
+{.experimental: "strictDefs".}
+{.experimental: "strictFuncs".}
+{.experimental: "views".}
+
 import happyx
 
 component Hello:

diff --git a/happyx/config.nims b/happyx/config.nims
@@ -0,0 +1,2 @@
+--define: ssl
+--define: useMalloc # only needed at Nim-v2.0.2
diff --git a/src/index.html → happyx/index.html b/src/index.html → happyx/index.html
@@ -10,15 +10,15 @@
       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='./assets/fontawesome/css/fontawesome.min.css' rel='stylesheet'>
+  <link href='./assets/fontawesome/css/brands.min.css' rel='stylesheet'>
+  <link href='./assets/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='./main.js'></script>
   <script src='https://html2canvas.hertzen.com/dist/html2canvas.min.js'></script>
 </body>
 

diff --git a/happyx/main.nim b/happyx/main.nim
@@ -0,0 +1,10 @@
+{.experimental: "strictDefs".}
+{.experimental: "strictFuncs".}
+{.experimental: "views".}
+
+import happyx
+import ./components/[hello]
+
+appRoutes "pon2":
+  "/":
+    component Hello
diff --git a/pon2.nimble b/pon2.nimble
@@ -68,11 +68,5 @@ task web, "Make Web Page":
   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"
+  cpDir "assets", "happyx/assets"
+  exec "hpx build"
diff --git a/src/config.nims b/src/config.nims
@@ -1 +1,2 @@
---define:ssl
+--define: ssl
+--define: useMalloc # only needed at Nim-v2.0.2
diff --git a/src/pon2.nim b/src/pon2.nim
@@ -10,15 +10,6 @@
 
 {.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]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		--define: ssl
		--define: useMalloc # only needed at Nim-v2.0.2