Merge branch 'master' into fix-thumbnail-cache

go-shiori · Jun 8, 2024 · a7ceb09 · a7ceb09
2 parents a15b7f2 + 650f192
commit a7ceb09
Show file tree

Hide file tree

Showing 22 changed files with 161 additions and 944 deletions.
diff --git a/.github/workflows/_test.yml b/.github/workflows/_test.yml
@@ -1,6 +1,10 @@
 name: "Unit Tests"
 
-on: workflow_call
+on:
+  workflow_call:
+    secrets:
+      CODECOV_TOKEN:
+        required: true
 
 env:
   CGO_ENABLED: 0

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -14,6 +14,8 @@ jobs:
     uses: ./.github/workflows/_golangci-lint.yml
   call-test:
     uses: ./.github/workflows/_test.yml
+    secrets:
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN}}
   call-swagger-check:
     uses: ./.github/workflows/_swagger-check.yml
   call-styles-check:

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -14,6 +14,8 @@ jobs:
     uses: ./.github/workflows/_golangci-lint.yml
   call-test:
     uses: ./.github/workflows/_test.yml
+    secrets:
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN}}
   call-gorelease:
     needs: [call-lint, call-test]
     uses: ./.github/workflows/_gorelease.yml

diff --git a/.gitignore b/.gitignore
@@ -12,7 +12,7 @@
 /dev-data*
 
 # Coverage data
-/coverage.out
+/coverage.*
 
 # Dist files
 dist/

diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -31,7 +31,7 @@ archives:
     name_template: >-
       {{ .ProjectName }}_
       {{- if eq .Os "darwin" }}Darwin{{- else if eq .Os "linux" }}Linux{{- else if eq .Os "windows" }}Windows{{- else }}{{ .Os }}{{ end }}_
-      {{- if eq .Arch "amd64" }}x86_64{{- else if eq .Arch "arm64" }}aarch64{{- else }}{{ .Arch }}{{ end }}
+      {{- if eq .Arch "amd64" }}x86_64{{- else if eq .Arch "arm64" }}aarch64{{- else }}{{ .Arch }}{{ end }}_{{ .Version }}
     format_overrides:
     - goos: windows
       format: zip

diff --git a/coverage.txt b/coverage.txt
diff --git a/docs/swagger/docs.go b/docs/swagger/docs.go
@@ -172,7 +172,7 @@ const docTemplate = `{
                     "200": {
                         "description": "OK",
                         "schema": {
-                            "$ref": "#/definitions/api_v1.contentResponseMessage"
+                            "$ref": "#/definitions/api_v1.readableResponseMessage"
                         }
                     },
                     "403": {
@@ -228,17 +228,6 @@ const docTemplate = `{
         }
     },
     "definitions": {
-        "api_v1.contentResponseMessage": {
-            "type": "object",
-            "properties": {
-                "content": {
-                    "type": "string"
-                },
-                "html": {
-                    "type": "string"
-                }
-            }
-        },
         "api_v1.loginRequestPayload": {
             "type": "object",
             "required": [
@@ -273,6 +262,17 @@ const docTemplate = `{
                 }
             }
         },
+        "api_v1.readableResponseMessage": {
+            "type": "object",
+            "properties": {
+                "content": {
+                    "type": "string"
+                },
+                "html": {
+                    "type": "string"
+                }
+            }
+        },
         "api_v1.settingRequestPayload": {
             "type": "object",
             "properties": {
@@ -417,12 +417,12 @@ const docTemplate = `{
                 "MakePublic": {
                     "type": "boolean"
                 },
-                "NightMode": {
-                    "type": "boolean"
-                },
                 "ShowId": {
                     "type": "boolean"
                 },
+                "Theme": {
+                    "type": "string"
+                },
                 "UseArchive": {
                     "type": "boolean"
                 }

diff --git a/docs/swagger/swagger.json b/docs/swagger/swagger.json
@@ -161,7 +161,7 @@
                     "200": {
                         "description": "OK",
                         "schema": {
-                            "$ref": "#/definitions/api_v1.contentResponseMessage"
+                            "$ref": "#/definitions/api_v1.readableResponseMessage"
                         }
                     },
                     "403": {
@@ -217,17 +217,6 @@
         }
     },
     "definitions": {
-        "api_v1.contentResponseMessage": {
-            "type": "object",
-            "properties": {
-                "content": {
-                    "type": "string"
-                },
-                "html": {
-                    "type": "string"
-                }
-            }
-        },
         "api_v1.loginRequestPayload": {
             "type": "object",
             "required": [
@@ -262,6 +251,17 @@
                 }
             }
         },
+        "api_v1.readableResponseMessage": {
+            "type": "object",
+            "properties": {
+                "content": {
+                    "type": "string"
+                },
+                "html": {
+                    "type": "string"
+                }
+            }
+        },
         "api_v1.settingRequestPayload": {
             "type": "object",
             "properties": {
@@ -406,12 +406,12 @@
                 "MakePublic": {
                     "type": "boolean"
                 },
-                "NightMode": {
-                    "type": "boolean"
-                },
                 "ShowId": {
                     "type": "boolean"
                 },
+                "Theme": {
+                    "type": "string"
+                },
                 "UseArchive": {
                     "type": "boolean"
                 }

diff --git a/docs/swagger/swagger.yaml b/docs/swagger/swagger.yaml
@@ -1,11 +1,4 @@
 definitions:
-  api_v1.contentResponseMessage:
-    properties:
-      content:
-        type: string
-      html:
-        type: string
-    type: object
   api_v1.loginRequestPayload:
     properties:
       password:
@@ -29,6 +22,13 @@ definitions:
       token:
         type: string
     type: object
+  api_v1.readableResponseMessage:
+    properties:
+      content:
+        type: string
+      html:
+        type: string
+    type: object
   api_v1.settingRequestPayload:
     properties:
       config:
@@ -124,10 +124,10 @@ definitions:
         type: boolean
       MakePublic:
         type: boolean
-      NightMode:
-        type: boolean
       ShowId:
         type: boolean
+      Theme:
+        type: string
       UseArchive:
         type: boolean
     type: object
@@ -233,7 +233,7 @@ paths:
         "200":
           description: OK
           schema:
-            $ref: '#/definitions/api_v1.contentResponseMessage'
+            $ref: '#/definitions/api_v1.readableResponseMessage'
         "403":
           description: Token not provided/invalid
       summary: Get readable version of bookmark.

diff --git a/internal/http/routes/api/v1/auth_test.go b/internal/http/routes/api/v1/auth_test.go
@@ -250,7 +250,7 @@ func TestSettingsHandler(t *testing.T) {
 				ListMode:      true,
 				HideThumbnail: true,
 				HideExcerpt:   true,
-				NightMode:     true,
+				Theme:         "follow",
 				KeepMetadata:  true,
 				UseArchive:    true,
 				CreateEbook:   true,
@@ -274,7 +274,7 @@ func TestSettingsHandler(t *testing.T) {
 			"ListMode": false,
 			"HideThumbnail": false,
 			"HideExcerpt": false,
-			"NightMode": false,
+			"Theme": "follow",
 			"KeepMetadata": false,
 			"UseArchive": false,
 			"CreateEbook": false,

diff --git a/internal/http/routes/api/v1/bookmarks.go b/internal/http/routes/api/v1/bookmarks.go
@@ -97,7 +97,7 @@ type readableResponseMessage struct {
 //	@Tags						Auth
 //	@securityDefinitions.apikey	ApiKeyAuth
 //	@Produce					json
-//	@Success					200	{object}    contentResponseMessage
+//	@Success					200	{object}    readableResponseMessage
 //	@Failure					403	{object}	nil	"Token not provided/invalid"
 //	@Router						/api/v1/bookmarks/id/readable [get]
 func (r *BookmarksAPIRoutes) bookmarkReadable(c *gin.Context) {

diff --git a/internal/model/account.go b/internal/model/account.go
@@ -16,15 +16,15 @@ type Account struct {
 }
 
 type UserConfig struct {
-	ShowId        bool `json:"ShowId"`
-	ListMode      bool `json:"ListMode"`
-	HideThumbnail bool `json:"HideThumbnail"`
-	HideExcerpt   bool `json:"HideExcerpt"`
-	NightMode     bool `json:"NightMode"`
-	KeepMetadata  bool `json:"KeepMetadata"`
-	UseArchive    bool `json:"UseArchive"`
-	CreateEbook   bool `json:"CreateEbook"`
-	MakePublic    bool `json:"MakePublic"`
+	ShowId        bool   `json:"ShowId"`
+	ListMode      bool   `json:"ListMode"`
+	HideThumbnail bool   `json:"HideThumbnail"`
+	HideExcerpt   bool   `json:"HideExcerpt"`
+	Theme         string `json:"Theme"`
+	KeepMetadata  bool   `json:"KeepMetadata"`
+	UseArchive    bool   `json:"UseArchive"`
+	CreateEbook   bool   `json:"CreateEbook"`
+	MakePublic    bool   `json:"MakePublic"`
 }
 
 func (c *UserConfig) Scan(value interface{}) error {

diff --git a/internal/view/archive.html b/internal/view/archive.html
@@ -12,7 +12,7 @@
     <div id="shiori-archive-header" class="header">
         <p id="shiori-logo"><span>栞</span>shiori</p>
         <div class="spacer"></div>
-        <a href="$$.URL$$" target="_blank">View Original</a>
+        <a href="$$.Book.URL$$" target="_blank">View Original</a>
         $$if .Book.HasContent$$
         <a href="/bookmark/$$.Book.ID$$/content">View Readable</a>
         $$end$$

diff --git a/internal/view/assets/css/style.css b/internal/view/assets/css/style.css
diff --git a/internal/view/assets/js/page/base.js b/internal/view/assets/js/page/base.js
@@ -16,7 +16,6 @@ export default {
 				return {
 					ShowId: false,
 					ListMode: false,
-					NightMode: false,
 					HideThumbnail: false,
 					HideExcerpt: false,
 					KeepMetadata: false,
@@ -95,6 +94,23 @@ export default {
 					return false;
 			}
 		},
+		themeSwitch(theme) {
+			switch (theme) {
+				case "light":
+					document.body.classList.remove("dark");
+					document.body.classList.add("light");
+					break;
+				case "dark":
+					document.body.classList.remove("light");
+					document.body.classList.add("dark");
+					break;
+				case "follow":
+					document.body.classList.remove("light", "dark");
+					break;
+				default:
+					console.error("Invalid theme selected");
+			}
+		},
 		showErrorDialog(msg) {
 			var sessionError = this.isSessionError(msg),
 				dialogContent = sessionError

diff --git a/internal/view/assets/js/page/setting.js b/internal/view/assets/js/page/setting.js
@@ -4,6 +4,14 @@ var template = `
     <div class="setting-container">
         <details open class="setting-group" id="setting-display">
             <summary>Display</summary>
+            <label>
+                Theme &nbsp;
+                <select v-model="appOptions.Theme" @change="saveSetting">
+                <option value="follow">Follow system</option>
+                <option value="light">Light theme</option>
+                <option value="dark">Dark theme</option>
+                </select>
+            </label>
             <label>
                 <input type="checkbox" v-model="appOptions.ShowId" @change="saveSetting">
                 Show bookmark's ID
@@ -20,10 +28,6 @@ var template = `
                 <input type="checkbox" v-model="appOptions.HideExcerpt" @change="saveSetting">
                 Hide bookmark's excerpt
             </label>
-            <label>
-                <input type="checkbox" v-model="appOptions.NightMode" @change="saveSetting">
-                Use dark theme
-            </label>
         </details>
         <details v-if="activeAccount.owner" open class="setting-group" id="setting-bookmarks">
             <summary>Bookmarks</summary>
@@ -92,7 +96,7 @@ export default {
 				ListMode: this.appOptions.ListMode,
 				HideThumbnail: this.appOptions.HideThumbnail,
 				HideExcerpt: this.appOptions.HideExcerpt,
-				NightMode: this.appOptions.NightMode,
+				Theme: this.appOptions.Theme,
 			};
 
 			if (this.activeAccount.owner) {

diff --git a/internal/view/assets/less/common.less b/internal/view/assets/less/common.less
@@ -1,36 +1,12 @@
-:root {
-	--bg: #eee;
-	--sidebarBg: #292929;
-	--sidebarHoverBg: #232323;
-	--headerBg: #fff;
-	--contentBg: #fff;
-	--border: #e5e5e5;
-	--color: #232323;
-	--colorLink: #999;
-	--colorSidebar: #fff;
-	--main: #f44336;
-	--errorColor: #f44336;
-	--selectedBg: #ffe7e5;
-
-	@media (prefers-color-scheme: dark) {
-		&:root {
-			--bg: #1f1f1f;
-			--headerBg: #292929;
-			--contentBg: #292929;
-			--border: #191919;
-			--color: #fff;
-			--selectedBg: #261918;
-		}
-	}
+select {
+	background: var(--contentBg);
+	border: 1px solid var(--border);
+	border-radius: 4px;
+	color: var(--color);
 }
 
-&.night {
-	--bg: #1f1f1f;
-	--headerBg: #292929;
-	--contentBg: #292929;
-	--border: #191919;
-	--color: #fff;
-	--selectedBg: #261918;
+footer {
+	color: var(--color);
 }
 
 * {

diff --git a/internal/view/assets/less/style.less b/internal/view/assets/less/style.less
@@ -3,6 +3,7 @@
 @import "./libs/fontawesome.min.css";
 
 // Less files
+@import "./theme.less";
 @import "./common.less";
 @import "./custom-dialog.less";
 @import "./bookmark-item.less";