diff --git a/README.md b/README.md index 81e0167..6001484 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,7 @@ App Design: [Freeform](https://www.icloud.com/freeform/026AxB798cViZ9jJ2DkNsXUCQ 你會看到許多觀點,但不知道這些新聞為什麼會寫比較偏見的文章。 ## Inspired by + - puter.com - Perplexity - Ground.news @@ -86,4 +87,5 @@ App Design: [Freeform](https://www.icloud.com/freeform/026AxB798cViZ9jJ2DkNsXUCQ 7. Open `http://localhost:3000` in your browser. ### For scaping -First, Run `ps1 clone-env.ps1` or `bash clone-env.sh` to clone the `.env` file to the `scraping` folder, then cd into the `scraping` folder. Run `python main.py` to start scraping in Google News. \ No newline at end of file + +First, Run `ps1 clone-env.ps1` or `bash clone-env.sh` to clone the `.env` file to the `scraping` folder, then cd into the `scraping` folder. Run `python main.py` to start scraping in Google News. diff --git a/components/DraggableWindow.vue b/components/DraggableWindow.vue index 18a10ff..8ec7e3a 100644 --- a/components/DraggableWindow.vue +++ b/components/DraggableWindow.vue @@ -1,53 +1,53 @@ \ No newline at end of file + diff --git a/components/app/windows/hotnews.vue b/components/app/windows/hotnews.vue index 32886a2..ed05909 100644 --- a/components/app/windows/hotnews.vue +++ b/components/app/windows/hotnews.vue @@ -62,4 +62,4 @@ const title = ref("Hot News"); - \ No newline at end of file + diff --git a/components/app/windows/login.vue b/components/app/windows/login.vue index d800f28..3f0cbc5 100644 --- a/components/app/windows/login.vue +++ b/components/app/windows/login.vue @@ -1,14 +1,50 @@ + \ No newline at end of file + + + + + + diff --git a/components/navigation.vue b/components/navigation.vue index d44bcf8..0d72832 100644 --- a/components/navigation.vue +++ b/components/navigation.vue @@ -77,4 +77,4 @@ const toggleDropdown = () => { - \ No newline at end of file + diff --git a/docker-compose.yml b/docker-compose.yml index 15df6e2..41c4a4e 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ -version: '3.8' +version: "3.8" services: - newsanalyze-service: + newsanalyze-service: build: . ports: - "127.0.0.1:36694:3000" @@ -12,4 +12,4 @@ services: test: ["CMD", "curl", "-f", "http://localhost:3000"] interval: 30s timeout: 10s - retries: 3 \ No newline at end of file + retries: 3 diff --git a/error.vue b/error.vue index 6c970a8..058ba40 100644 --- a/error.vue +++ b/error.vue @@ -1,13 +1,20 @@ + \ No newline at end of file + +
+ {{ error.statusCode }} + {{ + error.statusMessage + }} +
+
+
+ diff --git a/layouts/macui.vue b/layouts/macui.vue index 0cbd549..3ef43a9 100644 --- a/layouts/macui.vue +++ b/layouts/macui.vue @@ -1,4 +1,3 @@ - diff --git a/nuxt.config.ts b/nuxt.config.ts index ae183ea..e5bca0c 100644 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -9,9 +9,15 @@ export default defineNuxtConfig({ "/go/**": { ssr: true }, "/find/**": { ssr: true }, // Send ZIP bombs to troll bots - "/wp-admin/**": { redirect: "https://s3.yhw.tw/data/def-zip-bomb/wp-admin.php.zip" }, - "/xmlrpc.php": { redirect: "https://s3.yhw.tw/data/def-zip-bomb/xmlrpc.php.zip" }, - "/wp-login.php": { redirect: "https://s3.yhw.tw/data/def-zip-bomb/wp-login.php.zip" }, + "/wp-admin/**": { + redirect: "https://s3.yhw.tw/data/def-zip-bomb/wp-admin.php.zip", + }, + "/xmlrpc.php": { + redirect: "https://s3.yhw.tw/data/def-zip-bomb/xmlrpc.php.zip", + }, + "/wp-login.php": { + redirect: "https://s3.yhw.tw/data/def-zip-bomb/wp-login.php.zip", + }, }, css: ["~/styles/main.css"], diff --git a/pages/app/desktop/index.vue b/pages/app/desktop/index.vue index bf3de0b..4f6b358 100644 --- a/pages/app/desktop/index.vue +++ b/pages/app/desktop/index.vue @@ -1,4 +1,3 @@ - @@ -169,27 +187,40 @@ const closeWindow = (windowId: string) => {
- +
- | - -
- +
+
-
{{ currentDate }}
+
+ {{ currentDate }} +
@@ -197,23 +228,28 @@ const closeWindow = (windowId: string) => { enter-active-class="animate__animated animate__fadeInDown animate_fast03" leave-active-class="animate__animated animate__fadeOutUp animate_fast03" > -
-
- +
+
+ +
-
-
+ >
- { :width="window.width" :height="window.height" > - +
- +
Lang: - {{ t("localeflag") }}  -
@@ -245,9 +288,14 @@ const closeWindow = (windowId: string) => { {{ new Date().getFullYear() }} © yh
- +
diff --git a/pages/app/mobile/index.vue b/pages/app/mobile/index.vue index 99abe0a..539539d 100644 --- a/pages/app/mobile/index.vue +++ b/pages/app/mobile/index.vue @@ -1,3 +1 @@ - \ No newline at end of file + diff --git a/scraping/findText/README.md b/scraping/findText/README.md index 4dc6a2e..f98239f 100644 --- a/scraping/findText/README.md +++ b/scraping/findText/README.md @@ -1,25 +1,31 @@ # Status -## setn.py +## setn.py + Working ## tvbs.py + Working ## taisounds.py + Working ## cna.py + Broken Error: `Error: 'utf-8' codec can't decode byte 0x83 in position 0: invalid start byte` ## chinatimes.py + Broken Error: `Error: 'utf-8' codec can't decode byte 0xa3 in position 0: invalid start byte` ## twreporter.py + Broken -Error: `Error: 'utf-8' codec can't decode byte 0xc0 in position 2: invalid start byte` \ No newline at end of file +Error: `Error: 'utf-8' codec can't decode byte 0xc0 in position 2: invalid start byte`