Home Explore Help
Sign In
Apq
/
logseq
mirror of https://github.com/logseq/logseq.git
1
0
Fork 0
Files Issues 0 Wiki
Browse Source

enhance(capacitor): add ionic ui

charlie 9 months ago
parent
ee38f092bf
commit
a8dce99003
8 changed files with 49 additions and 11 deletions
Unified View Show Diff Stats
  1. 4 2
      package.json
  2. 5 1
      resources/capacitor/index.html
  3. 0 0
      resources/capacitor/ionic.bundle.css
  4. 3 0
      resources/capacitor/js/ionic.esm.js
  5. 14 0
      resources/capacitor/js/ionic.js
  6. 11 3
      src/main/capacitor/app.cljs
  7. 8 0
      src/main/capacitor/ionic.cljs
  8. 4 5
      tailwind.capacitor.css

+ 4 - 2
package.json
View File 

@@ -17,10 +17,9 @@
 
         "del": "^6.0.0",
 
         "del": "^6.0.0",
 
         "glob": "9.0.0",
 
         "glob": "9.0.0",
 
         "gulp": "^4.0.2",
 
         "gulp": "^4.0.2",
 
-        "gulp-replace": "^1.1.4",
 
         "gulp-postcss": "^10.0.0",
 
         "gulp-postcss": "^10.0.0",
 
+        "gulp-replace": "^1.1.4",
 
         "ip": "1.1.9",
 
         "ip": "1.1.9",
 
-        "semver": "7.5.2",
 
         "karma": "^6.4.4",
 
         "karma": "^6.4.4",
 
         "karma-chrome-launcher": "^3.2.0",
 
         "karma-chrome-launcher": "^3.2.0",
 
         "karma-cljs-test": "^0.1.0",
 
         "karma-cljs-test": "^0.1.0",
 
@@ -33,6 +32,7 @@
 
         "postcss-import-ext-glob": "2.0.1",
 
         "postcss-import-ext-glob": "2.0.1",
 
         "postcss-nested": "6.0.0",
 
         "postcss-nested": "6.0.0",
 
         "purgecss": "4.0.2",
 
         "purgecss": "4.0.2",
 
+        "semver": "7.5.2",
 
         "shadow-cljs": "2.26.0",
 
         "shadow-cljs": "2.26.0",
 
         "stylelint": "^13.8.0",
 
         "stylelint": "^13.8.0",
 
         "stylelint-config-standard": "^20.0.0",
 
         "stylelint-config-standard": "^20.0.0",
 
@@ -109,6 +109,8 @@
 
         "@excalidraw/excalidraw": "0.16.1",
 
         "@excalidraw/excalidraw": "0.16.1",
 
         "@glidejs/glide": "^3.6.0",
 
         "@glidejs/glide": "^3.6.0",
 
         "@highlightjs/cdn-assets": "10.4.1",
 
         "@highlightjs/cdn-assets": "10.4.1",
 
+        "@ionic/core": "^8.5.4",
 
+        "@ionic/react": "^8.5.4",
 
         "@isomorphic-git/lightning-fs": "^4.6.0",
 
         "@isomorphic-git/lightning-fs": "^4.6.0",
 
         "@js-joda/core": "3.2.0",
 
         "@js-joda/core": "3.2.0",
 
         "@js-joda/locale_en-us": "3.1.1",
 
         "@js-joda/locale_en-us": "3.1.1",

+ 5 - 1
resources/capacitor/index.html
View File 

@@ -2,7 +2,11 @@
 
 <html lang="en">
 
 <html lang="en">
 
 <head>
 
 <head>
 
     <meta charset="UTF-8">
 
     <meta charset="UTF-8">
 
-    <meta content="minimum-scale=1, initial-scale=1, maximum-scale=1, width=device-width, shrink-to-fit=no" name="viewport">
 
+    <meta content="minimum-scale=1, initial-scale=1, maximum-scale=1, width=device-width, shrink-to-fit=no"
 
+          name="viewport">
 
+    <link href="./ionic.bundle.css" rel="stylesheet">
 
+    <script type="module" src="./js/ionic.esm.js"></script>
 
+    <script nomodule src="./js/ionic.js"></script>
 
     <link href="./style.css" rel="stylesheet" type="text/css">
 
     <link href="./style.css" rel="stylesheet" type="text/css">
 
     <title>Logseq: A privacy-first platform for knowledge management and collaboration</title>
 
     <title>Logseq: A privacy-first platform for knowledge management and collaboration</title>
 
 </head>
 
 </head>

File diff suppressed because it is too large
+ 0 - 0
resources/capacitor/ionic.bundle.css


File diff suppressed because it is too large
+ 3 - 0
resources/capacitor/js/ionic.esm.js


File diff suppressed because it is too large
+ 14 - 0
resources/capacitor/js/ionic.js


+ 11 - 3
src/main/capacitor/app.cljs
View File 

@@ -1,7 +1,15 @@
 
 (ns capacitor.app
 
 (ns capacitor.app
 
-  (:require [rum.core :as rum]))
 
+  (:require [rum.core :as rum]
 
+            [capacitor.ionic :as ionic]))
 
 
 
 (rum/defc main
 
 (rum/defc main
 
   []
 
   []
 
-  [:h1.text-6xl.text-center.py-20.border.p-8
 
-   "Hello World, capacitor!"])
 
+  [:> (.-IonApp ionic/ionic-react)
 
+   [:div
 
+    [:h1.text-6xl.text-center.py-20.border.p-8.m-2.rounded-xl
 
+     "Hello World, capacitor!"]
 
+    [:p.flex.p-4.justify-center.bg-gray-03.flex-col
 
+     (ionic/ion-button {:on-click #(js/alert "hello click me!")} "Default primary")
 
+     (ionic/ion-button {:color "secondary"} "Primary Button")
 
+     (ionic/ion-button {:color "danger"} "Danger button")]]
 
+   ])

+ 8 - 0
src/main/capacitor/ionic.cljs
View File 

@@ -0,0 +1,8 @@
 
+(ns capacitor.ionic
 
+  (:require ["@ionic/react" :as ionicReact]
 
+            [logseq.shui.util :as shui-util]))
 
+
 
+;(def define-custom-component ionicLoader/defineCustomElements)
 
+(def ^js ionic-react ionicReact)
 
+
 
+(defonce ion-button (shui-util/react->rum (.-IonButton ionic-react) true))

+ 4 - 5
tailwind.capacitor.css
View File 

@@ -1,8 +1,7 @@
 
 @charset "utf-8";
 
 @charset "utf-8";
 
 
 
-@import "packages/ui/src/radix.css";
 
-@import "packages/ui/src/radix-hsl.css";
 
-@import "packages/ui/src/vars-classic.css";
 
-@import "packages/ui/src/colors.css";
 
-@import "packages/ui/src/index.css";  /* Tailwind base imported here */
 
+@tailwind base;
 
+@tailwind components;
 
+@tailwind utilities;
 
+
 
 @import-glob "src/main/capacitor/**/[!_]*.css";
 
 @import-glob "src/main/capacitor/**/[!_]*.css";

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