feat: UI & source code structure updates (#278)

novalagung · Nov 14, 2024 · cbb609d · cbb609d
1 parent 9d9d357
commit cbb609d
Show file tree

Hide file tree

Showing 13 changed files with 39 additions and 193 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -21,18 +21,13 @@ jobs:
       run: |
         rm -f README.md
         mv content/* .
-        mv etc/cover_small.jpg .
-        mv etc/cover_square.png .
-        mv etc/cover.jpg .
-        mv etc/custom.css .
+        mv book.json book.json.tmp
         mv etc/main.go .
-        mv etc/robots.txt .
-        mv etc/gitbook-plugin-disqus.js .
         npm install -g gitbook-cli
         gitbook install
         cd ~/.gitbook/versions/3.2.3 && npm i npm@5
         cd ${{ github.workspace }}
-        mv etc/book.json .
+        mv book.json.tmp book.json
         gitbook install
         go run main.go -mode=webbook -adjustment=pre
         gitbook build
@@ -73,9 +68,7 @@ jobs:
       run: |
         rm -f README.md
         mv content/* .
-        mv etc/cover_small.jpg .
-        mv etc/cover_square.png .
-        mv etc/cover.jpg .
+        rm -rf book.json
         mv etc/main.go .
         go run main.go -mode=ebook -adjustment=pre
         gitbook install

diff --git a/content/CHANGELOG.md b/content/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Version Changelogs & Updates
 
+## 📝 Release v4.0.20241115 (2024-11-15)
+
+#### ◉ General update
+
+- Code structure updates
+- UI updates
+
 ## 📝 Release v4.0.20240830 (2024-08-30)
 
 #### ◉ Chapter update

diff --git a/content/README.md b/content/README.md
@@ -21,15 +21,15 @@ Ada total sekitar <b>120 chapter</b> yang dibahas dalam website/ebook ini. Kumpu
 	</li>
 </ol>
 
-Versi e-book: **v4.0.20240830**, dan versi Go **1.22**.
+Versi e-book: **v4.0.20241115**, dan versi Go **1.22**.
 
 ## Download File E-book (pdf, epub, mobi)
 
 Versi ebook bisa di-download dalam bentuk file via link berikut:
 
-- [PDF](https://github.com/novalagung/dasarpemrogramangolang/raw/ebooks/dasarpemrogramangolang.pdf?v=v4.0.20240830)
-- [Epub](https://github.com/novalagung/dasarpemrogramangolang/raw/ebooks/dasarpemrogramangolang.epub?v=v4.0.20240830)
-- [Mobi](https://github.com/novalagung/dasarpemrogramangolang/raw/ebooks/dasarpemrogramangolang.mobi?v=v4.0.20240830)
+- [PDF](https://github.com/novalagung/dasarpemrogramangolang/raw/ebooks/dasarpemrogramangolang.pdf?v=v4.0.20241115)
+- [Epub](https://github.com/novalagung/dasarpemrogramangolang/raw/ebooks/dasarpemrogramangolang.epub?v=v4.0.20241115)
+- [Mobi](https://github.com/novalagung/dasarpemrogramangolang/raw/ebooks/dasarpemrogramangolang.mobi?v=v4.0.20241115)
 
 Untuk mendapatkan konten buku yang paling update, silakan baca langsung versi web secara online atau download ulang e-book versi terbaru.
 

diff --git a/content/SUMMARY.md b/content/SUMMARY.md
diff --git a/etc/book.json → content/book.json b/etc/book.json → content/book.json
@@ -7,6 +7,9 @@
         "meta",
         "sitemap"
     ],
+    "styles": {
+        "website": "style-custom.css"
+    },
     "pluginsConfig": {
         "disqus": {
             "shortName": "dasarpemrogramangolang"

diff --git a/etc/cover.jpg → content/cover.jpg b/etc/cover.jpg → content/cover.jpg
diff --git a/etc/cover_small.jpg → content/cover_small.jpg b/etc/cover_small.jpg → content/cover_small.jpg
diff --git a/etc/cover_square.png → content/cover_square.png b/etc/cover_square.png → content/cover_square.png
diff --git a/content/download-ebook.md b/content/download-ebook.md
@@ -2,6 +2,6 @@
 
 Ebook Dasar Pemrograman Golang bisa di-download dalam bentuk file, silakan gunakan link berikut:
 
-- [PDF](https://github.com/novalagung/dasarpemrogramangolang/raw/ebooks/dasarpemrogramangolang.pdf?v=v4.0.20240830)
-- [Epub](https://github.com/novalagung/dasarpemrogramangolang/raw/ebooks/dasarpemrogramangolang.epub?v=v4.0.20240830)
-- [Mobi](https://github.com/novalagung/dasarpemrogramangolang/raw/ebooks/dasarpemrogramangolang.mobi?v=v4.0.20240830)
+- [PDF](https://github.com/novalagung/dasarpemrogramangolang/raw/ebooks/dasarpemrogramangolang.pdf?v=v4.0.20241115)
+- [Epub](https://github.com/novalagung/dasarpemrogramangolang/raw/ebooks/dasarpemrogramangolang.epub?v=v4.0.20241115)
+- [Mobi](https://github.com/novalagung/dasarpemrogramangolang/raw/ebooks/dasarpemrogramangolang.mobi?v=v4.0.20241115)
diff --git a/etc/robots.txt → content/robots.txt b/etc/robots.txt → content/robots.txt
diff --git a/etc/gitbook-plugin-disqus.js → content/script-gitbook-plugin-disqus.js b/etc/gitbook-plugin-disqus.js → content/script-gitbook-plugin-disqus.js
diff --git a/etc/custom.css → content/style-custom.css b/etc/custom.css → content/style-custom.css
@@ -1,8 +1,9 @@
 @import url('https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,700&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Inter:ital,opsz,wght@0,14..32,100..900;1,14..32,100..900&display=swap');
 
 /* base font */
-body {
-    font-family: Source Sans Pro, Helvetica Neue, Arial, sans-serif;
+body .book.font-family-1, .book-summary {
+    font-family: Inter, Source Sans Pro, Helvetica Neue, Arial, sans-serif;
 }
 
 /* unmark to disable search bar, replace it with the book title instead */
@@ -26,6 +27,15 @@ body {
     position: absolute;
 } */
 
+.dropdown.font-settings {
+    display: none;
+}
+
+.page-inner {
+    max-width: fit-content;
+    padding: 20px 100px 40px 100px;
+}
+
 /* disable word wrap at left sidebar */
 .book-summary ul.summary li a, .book-summary ul.summary li span {
     text-overflow: initial;
@@ -87,12 +97,12 @@ body {
 
 /* make the sidebar wider, and adjust the content to match it */
 .book-summary {
-    left: -500px;
-    width: 500px;
+    left: -470px;
+    width: 470px;
 }
 @media (min-width: 600px) {
     .book.with-summary .book-body {
-        left: 500px;
+        left: 470px;
     }
 }
 
@@ -128,7 +138,8 @@ ins.adsbygoogle {
 
 /* disquss block */
 #disqus_thread {
-    margin-top: 40px;
+    margin: 40px auto 5px;
+    max-width: 800px;
 }
 #disqus_thread + #disqus_thread {
     display: none;
@@ -161,7 +172,7 @@ ins.adsbygoogle {
     position: fixed;
     bottom: 0;
     right: 17px;
-    left: 500px;
+    left: 470px;
     z-index: 1000;
 }
 

diff --git a/etc/main.go b/etc/main.go
@@ -147,7 +147,7 @@ func webbookPostAdjustment() {
 		htmlString = strings.ReplaceAll(htmlString, imagesAltToFind, imagesAltReplacement)
 
 		// ==== disqus lazy load
-		disqusJSBuf, err := os.ReadFile("./gitbook-plugin-disqus.js")
+		disqusJSBuf, err := os.ReadFile("./script-gitbook-plugin-disqus.js")
 		if err != nil {
 			fmt.Println("error", err)
 		}
@@ -163,7 +163,6 @@ func webbookPostAdjustment() {
 			"gitbook/gitbook-plugin-highlight/website.css",
 			"gitbook/gitbook-plugin-search/search.css",
 			"gitbook/gitbook-plugin-fontsettings/website.css",
-			// `/custom.css?v=` + getVersion() + `"`,
 		}
 		for _, cssFileNameToFind := range cssToLoad {
 			cssFileNameReplacement := fmt.Sprintf(`%s" media="print" onload="this.media='all'`, cssFileNameToFind)
@@ -180,13 +179,6 @@ func webbookPostAdjustment() {
 		</div>` + buttonToFind
 		htmlString = strings.ReplaceAll(htmlString, buttonToFind, buttonReplacement)
 
-		// ==== inject adjustment css
-		adjustmentCSSBuf, _ := os.ReadFile("./custom.css")
-		os.WriteFile("./_book/gitbook/custom.css", adjustmentCSSBuf, 0644)
-		adjustmentCSSToFind := `</head>`
-		adjustmentCSSReplacement := `<link rel="stylesheet" href="gitbook/custom.css?v=` + getVersion() + `">` + adjustmentCSSToFind
-		htmlString = strings.ReplaceAll(htmlString, adjustmentCSSToFind, adjustmentCSSReplacement)
-
 		// ==== inject github stars js script
 		buttonScriptToFind := `</head>`
 		buttonScriptReplacement := `<script async defer src="https://buttons.github.io/buttons.js"></script>` + buttonScriptToFind