Oh, I think the translating system works now?

window to test in prod)

.github/workflows/build_beta_docker_image.yml

@@ -0,0 +1,54 @@
+name: Build and Push Docker Image
+
+on:
+  push:
+    branches:
+      - beta
+  workflow_dispatch:
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=raw,value=beta
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=sha,prefix=
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/build_docker_image.yml

@@ -4,9 +4,6 @@ on:
   push:
     branches:
       - master
-  pull_request:
-    branches:
-      - master
   workflow_dispatch:
 
 env:
@@ -37,6 +34,7 @@ jobs:
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
+            type=raw,value=latest
             type=ref,event=branch
             type=ref,event=pr
             type=semver,pattern={{version}}

components/app/windows/newsView.vue

@@ -82,7 +82,9 @@ const aiSummary = async () => {
   activateAiSummary.value = true;
   isGenerating.value = true;
   try {
-    const req = await fetch(`/api/ai/summarize/${slug}?lang=${String(locale)}`);
+    const req = await fetch(
+      `/api/ai/summarize/${slug}?lang=${String(locale.value)}`,
+    );
     const reader = req.body?.getReader();
     const decoder = new TextDecoder();
     while (reader) {

components/app/windows/settings.vue

@@ -174,7 +174,42 @@ const submitUserPassword = async () => {
 };
 </script>
 <template>
-  <div class="justify-center align-center text-center">
+  <div
+    class="justify-center align-center text-center absloute inset-0 p-1"
+    v-if="!isLoggedIn"
+  >
+    <form
+      class="flex flex-col items-center justify-center h-full"
+      @submit.prevent="submitUserPassword"
+      v-if="!success"
+    >
+      <span class="text-2xl text-bold mb-0">{{ t("settings.login") }}</span>
+      <span class="mb-4 text-sm mt-0"> {{ t("settings.loginmessage") }}</span>
+      <div class="">
+        <Input
+          type="text"
+          :placeholder="t('settings.placeholder.user')"
+          class="mb-2 p-2 border rounded"
+          v-model="userAccount"
+          required
+        />
+        <Input
+          type="password"
+          :placeholder="t('settings.placeholder.password')"
+          class="p-2 border rounded mb-2"
+          v-model="userPassword"
+          required
+        />
+      </div>
+      <span v-if="error" class="text-red-600 text-xs m-2"
+        >Error: {{ errormsg }}</span
+      >
+      <button class="bg-black text-white p-2 rounded transition duration-200">
+        {{ t("settings.loginButton") }}
+      </button>
+    </form>
+  </div>
+  <div class="justify-center align-center text-center" v-if="isLoggedIn">
     <h1 class="text-3xl text-bold p-2">
       {{ t("settings.greet")
       }}{{ user || userData.userAccount || t("settings.defaultname") }}

components/app/windows/sources.vue

@@ -33,6 +33,13 @@ if (error === null) {
   errorMsg.value = error.value;
 }
 
+onMounted(() => {
+  if (data.length === 0) {
+    eerrrroorr.value = true;
+    errorMsg.value = "No data returned.";
+  }
+});
+
 async function getImageSource(image: string) {
   console.log(image);
   if (!image || image === "#") {

createDatabase.ts

@@ -51,6 +51,15 @@ const createSources = await sql`
   )
   `;
 
+const createArticlesArchive = await sql`
+  create table if not exists news_articles (
+  uuid text primary key,
+  article_id text primary key,
+  jsondata json not null,
+  archive_timestamp timestamp default CURRENT_TIMESTAMP,
+  )
+  `;
+
 console.log("Creation Complete");
 console.log(
   "If the script still does not quit after 2 seconds after the 'Creation Complete' message, please stop it by using Ctrl + C or on mac Control + C",

docker-compose-beta.yml

@@ -0,0 +1,33 @@
+services:
+  reverse-proxy:
+    image: traefik:v3.1
+    command:
+      - "--providers.docker"
+      - "--providers.docker.exposedbydefault=false"
+      - "--entrypoints.web.address=:80"
+    ports:
+      - 127.0.0.1:36694:80
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    networks:
+      - web
+
+  newsanalyze-service:
+    image: ghcr.io/hpware/news-analyze:beta
+    networks:
+      - web
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.newsanalyze.rule=Host(`news.yuanhau.com`)"
+      - "traefik.http.services.newsanalyze.loadbalancer.server.port=3000"
+      - "com.centurylinklabs.watchtower.enable=true"
+    restart: unless-stopped
+    env_file:
+      - path: ./.env
+        required: true
+    deploy:
+      mode: replicated
+      replicas: 2
+
+networks:
+  web:

docker-compose.yml

@@ -13,7 +13,7 @@ services:
       - web
 
   newsanalyze-service:
-    image: ghcr.io/hpware/news-analyze:master
+    image: ghcr.io/hpware/news-analyze:latest
     networks:
       - web
     labels:

i18n/locales/en.json

@@ -86,7 +86,14 @@
     "dangerzone": "DANGER ZONE",
     "submit": "Submit",
     "greet": "Greetings, ",
-    "defaultname": "User"
+    "defaultname": "User",
+    "login": "Login / Register",
+    "loginmessage": "We will create a account for you if you don't have one.",
+    "loginButton": "Log In",
+    "placeholder": {
+      "user": "Username",
+      "password": "Password"
+    }
   },
   "popuptext": {
     "logout": "Are you sure you want to logout?",

i18n/locales/zh-tw.json

@@ -86,7 +86,14 @@
     "dangerzone": "DANGER ZONE",
     "submit": "送出",
     "greet": "嗨, ",
-    "defaultname": "使用者"
+    "defaultname": "使用者",
+    "login": "登入 / 註冊",
+    "loginmessage": "如果妳沒有帳號的話，我們會幫你註冊一個。",
+    "loginButton": "登入按鈕",
+    "placeholder": {
+      "user": "使用者帳號",
+      "password": "密碼"
+    }
   },
   "popup": {
     "cancel": "取消",

server/api/news/get/lt/[slug].ts

@@ -1,5 +1,6 @@
 import lineToday from "~/server/scrape/line_today";
 import sql from "~/server/components/postgres";
+import { v4 as uuidv4 } from "uuid";
 
 interface CacheItems {
   title: string;
@@ -36,6 +37,23 @@ function cleanUpSlug(orgslug: string) {
   return slug;
 }
 
+// Archive articles. For future use?
+async function storeArticlesIfItDoesNotExists(data, RequestId) {
+  const checkDataIsInDatabase = await sql`
+    SELECT * FROM news_articles
+    WHERE jsondata = ${data}
+    `;
+  if (checkDataIsInDatabase.length === 0) {
+    return;
+  }
+  const storeData = await sql`
+    INSERT INTO news_articles (uuid, article_id, jsondata)
+    VALUES (${uuidv4()}, ${RequestId}, ${data})
+    `;
+  console.log(storeData);
+  return;
+}
+
 export default defineEventHandler(async (event) => {
   const translateQuery = getQuery(event).translate;
   const translate = translateQuery === "true" ? true : false;
@@ -54,6 +72,7 @@ export default defineEventHandler(async (event) => {
 
   try {
     const data = await lineToday(cleanSlug);
+    storeArticlesIfItDoesNotExists(data, cleanSlug);
     cache[cleanSlug] = {
       ...data,
       timestamp: Date.now(),

server/api/user/fav.ts

@@ -1,11 +1,17 @@
+import getUserTokenMinusSQLInjection from "~/server/components/getUserToken";
+import sql from "~/server/components/postgres";
 export default defineEventHandler(async (event) => {
+  const userToken = await getUserTokenMinusSQLInjection(event);
+  if (userToken.error.length !== 0) {
     return {
-    items: [
+      error: userToken.error,
-      {
+    };
-        name: "dfasdfa",
+  }
-        article_link: "49redjvicjwsd",
+  const getData = await sql`
-        favTime: "2024-12-12",
+    SELECT * FROM user_other_data
-      },
+    WHERE username = ${userToken.user}
-    ],
+    `;
+  return {
+    items: getData[0].starred_news,
   };
 });

server/api/user/sendUserChanges.delete.ts

@@ -19,7 +19,12 @@ export default defineEventHandler(async (event) => {
     DELETE FROM users
     WHERE username = ${userToken.user}
     `;
+    const deleteOtherUserMetaData = await sql`
+    DELETE FROM user_other_data
+    WHERE username = ${userToken.user}
+    `;
     console.log(deleteUserAccount);
+    console.log(deleteOtherUserMetaData);
     deleteCookie(event, "token");
     return {
       success: true,