mirror of
https://github.com/hpware/news-analyze.git
synced 2025-07-16 15:39:06 +00:00
Merge branch 'beta' of https://github.com/hpware/news-analyze into beta
This commit is contained in:
commit
dad911f029
20 changed files with 62 additions and 601 deletions
22
.env.example
22
.env.example
|
|
@ -1,28 +1,12 @@
|
|||
# Please use .env.exmaple as an starting point. Rename it to .env and fill in the values, the application requrires it.
|
||||
|
||||
# This is the default .env file.
|
||||
|
||||
# S3 INFO
|
||||
S3_ACCESS_KEY=""
|
||||
S3_SECRET_KEY=""
|
||||
S3_BUCKETNAME=""
|
||||
S3_ENDPOINT=""
|
||||
|
||||
# GITHUB OAUTH (NOT WORKING 4n)
|
||||
NUXT_GITHUB_CLIENT_ID=""
|
||||
NUXT_GITHUB_CLIENT_SECRET=""
|
||||
|
||||
# GLOBAL DATABASE
|
||||
POSTGRES_URL=""
|
||||
|
||||
# THE BELOW TWO IS NOW IN THE DB, PLEASE FOLOW THIS GUIDE: https://github.com/hpware/news-analyze?tab=readme-ov-file#notes
|
||||
# GROQ API KEY
|
||||
GROQ_API_KEY=""
|
||||
#GROQ_API_KEY=""
|
||||
|
||||
# PASSWORD SALT
|
||||
PASSWORD_HASH_SALT=""
|
||||
|
||||
# CF TURNSTILE
|
||||
NUXT_CF_TURNSTILE_SITE_KEY=""
|
||||
NUXT_CF_TURNSTILE_SECRET_KEY=""
|
||||
|
||||
NUXT_DEV_ENV=false
|
||||
#PASSWORD_HASH_SALT=""
|
||||
|
|
|
|||
19
README.md
19
README.md
|
|
@ -27,6 +27,20 @@ Beta (Beta Docker Image): https://newsbeta.20090526.xyz
|
|||
|
||||
https://github.com/user-attachments/assets/29414c5d-3b2f-420d-93c0-95c14a15bbb7
|
||||
|
||||
## Notes:
|
||||
The enviroment vars are stored in the database, which is cursed, I know, but this is the only way to let the system access new envs sent by the user, so if you are trying to spin up a instence of this app you MUST put the postgres url in the .env & create a table using beekeeper studio (my choice for SQL editing, you can choose whatever you like), and after that you can create the entire database by using this api call, https://<<your_domain>>/api/create_database in your browser.
|
||||
```sql
|
||||
CREATE TABLE IF NOT EXISTS global_vars (
|
||||
NAME TEXT PRIMARY KEY NOT NULL,
|
||||
VAR TEXT NOT NULL
|
||||
);
|
||||
INSERT INTO global_vars(name, var)
|
||||
VALUES ('groq_api_key', '<<YOUR_API_KEY_HERE>>');
|
||||
INSERT INTO global_vars(name, var)
|
||||
VALUES ('password_hash_salt', '<<YOUR_PASSWORD_SALT_HERE>>');
|
||||
```
|
||||
Replace `<<YOUR_API_KEY_HERE>>` with your actual api key, and also replace `<<YOUR_PASSWORD_SALT_HERE>>` with a random salt you get by running this command on your Mac/Linux device (Windows idk) `openssl rand -base64 48`.
|
||||
|
||||
## Issues:
|
||||
### Onboarding:
|
||||
Onboarding is a must for most people that are using the app for the first time, but I want to do to via a non-video like system, however implementing the function in a already large repo is kinda hard. So later this week, I will just add a basic video onboarding system.
|
||||
|
|
@ -61,13 +75,10 @@ This code is absolutly NOT designed to be spinned up at Vercel or Netlify, it ha
|
|||
### The API returning outdated data from more than 5+ years:
|
||||
Here is the GitHub Issue: https://github.com/hpware/news-analyze/issues/2
|
||||
|
||||
### Groq API not loading to .env for some reasons.
|
||||
If the user did not load a GROQ api, the summerizing system will just fail outright. Fixing this rn.
|
||||
|
||||
### When using the desktop in the dev env it pops up an error
|
||||
|
||||
|
||||
For some reasons, Nuxt's dev env prev does not display this error, but with the newer ones, it started displaying this error, please run `./wipedev.sh` or `./wipedev.bat` and restart the dev server. (And this is only a temp fix, I have no idea how can I fix this, if you have a fix, please submit a PR thx.)
|
||||
For some reasons, Nuxt's dev env prev does not display this error, but with the newer ones, it started displaying this error, please run `./wipedev.sh` or `./wipedev.bat` and restart the dev server. (And this is only a temp fix, I have no idea how can I fix this, if you have a fix, please submit a PR, thx.)
|
||||
|
||||
## Why?
|
||||
|
||||
|
|
|
|||
|
|
@ -1,224 +0,0 @@
|
|||
<script setup lang="ts">
|
||||
import {
|
||||
History,
|
||||
Plus,
|
||||
Send,
|
||||
Square,
|
||||
User,
|
||||
BotMessageSquare,
|
||||
} from "lucide-vue-next";
|
||||
import { Input } from "~/components/ui/input";
|
||||
import blurPageBeforeLogin from "~/components/blurPageBeforeLogin.vue";
|
||||
import { v4 as uuidv4 } from "uuid";
|
||||
const { t } = useI18n();
|
||||
const cookie = useCookie("lastChatId");
|
||||
const cookieChatId = cookie.value;
|
||||
const chatId = ref();
|
||||
const inputMessage = ref();
|
||||
const messageIndex = ref();
|
||||
const aiGenerating = ref(false);
|
||||
const messages = ref<any[]>([]);
|
||||
const newsId = ref("");
|
||||
const isStreaming = ref(false);
|
||||
const streamingMessage = ref("");
|
||||
const messagesContainer = ref(null);
|
||||
|
||||
// Great, there are now no errors ig
|
||||
const emit = defineEmits(["windowopener", "error", "loadValue"]);
|
||||
const props = defineProps<{
|
||||
values?: string;
|
||||
}>();
|
||||
|
||||
const sendChatData = async (event?: KeyboardEvent) => {
|
||||
if (event?.shiftKey) return;
|
||||
if (inputMessage.value === "") return;
|
||||
const userMessage = inputMessage.value;
|
||||
inputMessage.value = "";
|
||||
aiGenerating.value = true;
|
||||
await sendMessage(userMessage);
|
||||
};
|
||||
|
||||
const stopChatGenerate = () => {
|
||||
aiGenerating.value = false;
|
||||
};
|
||||
|
||||
const chatUuid = ref("");
|
||||
|
||||
onMounted(() => {
|
||||
chatUuid.value = uuidv4();
|
||||
});
|
||||
|
||||
onMounted(async () => {
|
||||
/*const {
|
||||
data: getData,
|
||||
pending,
|
||||
error,
|
||||
} = useFetch(`/api/ai/chat/${chatId.value}`);*/
|
||||
});
|
||||
|
||||
const sendMessage = async (newMessage: any) => {
|
||||
if (!newMessage.trim() || !newsId.value.trim() || isStreaming.value) {
|
||||
return;
|
||||
}
|
||||
messages.value.push({
|
||||
index: messageIndex.value,
|
||||
id: uuidv4(),
|
||||
message: newMessage,
|
||||
user: true,
|
||||
timestamp: new Date(),
|
||||
});
|
||||
messageIndex.value += 1;
|
||||
|
||||
try {
|
||||
isStreaming.value = true;
|
||||
streamingMessage.value = "";
|
||||
|
||||
const response = await fetch(`/api/ai/chat/${chatUuid.value}`, {
|
||||
method: "POST",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
body: JSON.stringify({
|
||||
message: newMessage,
|
||||
newsid: newsId.value,
|
||||
}),
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error(`HTTP error! status: ${response.status}`);
|
||||
}
|
||||
|
||||
const reader = response.body?.getReader();
|
||||
const decoder = new TextDecoder();
|
||||
|
||||
if (reader) {
|
||||
while (true) {
|
||||
const { done, value } = await reader.read();
|
||||
|
||||
if (done) break;
|
||||
|
||||
const chunk = decoder.decode(value, { stream: true });
|
||||
streamingMessage.value += chunk;
|
||||
await scrollToBottom();
|
||||
}
|
||||
}
|
||||
|
||||
// Add the complete assistant message
|
||||
if (streamingMessage.value) {
|
||||
messages.value.push({
|
||||
role: "assistant",
|
||||
content: streamingMessage.value,
|
||||
timestamp: new Date(),
|
||||
});
|
||||
}
|
||||
} catch (error) {
|
||||
console.error("Error sending message:", error);
|
||||
messages.value.push({
|
||||
role: "assistant",
|
||||
content: "Sorry, there was an error processing your message.",
|
||||
timestamp: new Date(),
|
||||
});
|
||||
} finally {
|
||||
isStreaming.value = false;
|
||||
streamingMessage.value = "";
|
||||
await scrollToBottom();
|
||||
}
|
||||
};
|
||||
|
||||
const formatMessage = (content: any) => {
|
||||
// Simple markdown-like formatting
|
||||
return content
|
||||
.replace(/\*\*(.*?)\*\*/g, "<strong>$1</strong>")
|
||||
.replace(/\*(.*?)\*/g, "<em>$1</em>")
|
||||
.replace(/\n/g, "<br>");
|
||||
};
|
||||
const formatTime = (timestamp: any) => {
|
||||
return new Intl.DateTimeFormat("zh-TW", {
|
||||
hour: "2-digit",
|
||||
minute: "2-digit",
|
||||
}).format(timestamp);
|
||||
};
|
||||
const scrollToBottom = () => {};
|
||||
</script>
|
||||
<template>
|
||||
<blurPageBeforeLogin>
|
||||
<div class="flex flex-col h-[100%] w-full">
|
||||
<div>
|
||||
<div
|
||||
class="justify-center align-center text-center flex flex-col sticky top-0 pt-2 min-h-0 border rounded-2xl gray-500/80 backdrop-blur-sm"
|
||||
>
|
||||
<div class="flex flex-row justify-between p-2">
|
||||
<h2 class="text-xl ml-4 text-bold">Chat Name</h2>
|
||||
<div class="flex flex-row justify-center align-center text-center">
|
||||
<div
|
||||
class="flex flex-row justify-center align-center text-center gap-2"
|
||||
>
|
||||
<button
|
||||
class="p-2 rounded-xl hover:bg-gray-300 transition-all duration-400"
|
||||
>
|
||||
<History class="h-4 w-4" />
|
||||
</button>
|
||||
<button
|
||||
class="p-2 rounded-xl hover:bg-gray-300 transition-all duration-400"
|
||||
>
|
||||
<Plus class="h-4 w-4" />
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
ref="chatContainerRef"
|
||||
class="flex-1 overflow-y-auto p-4 space-y-4"
|
||||
>
|
||||
<div
|
||||
v-for="message in messages"
|
||||
class="max-w-[80%] p-3 bg-gray-300/70 rounded-xl"
|
||||
>
|
||||
<div v-if="message.user" class="flex flex-row gap-2">
|
||||
<User class="w-5 h-5" />{{ message.message }}
|
||||
</div>
|
||||
<div v-else class="flex flex-row gap-2">
|
||||
<BotMessageSquare class="w-5 h-5" />{{ message.message }}
|
||||
</div>
|
||||
</div>
|
||||
<div v-if="isStreaming" class="">
|
||||
<div></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="h-[75px]"></div>
|
||||
<div
|
||||
class="space-x-2 absolute bottom-2 inset-x-4 border-t p-2 min-h-0 border rounded-xl gray-500/80 backdrop-blur-sm"
|
||||
>
|
||||
<div class="text-black w-full flex flex-row">
|
||||
<Input
|
||||
class="flex-1 rounded-xl"
|
||||
placeholder="Type a message..."
|
||||
v-model="inputMessage"
|
||||
@keyup.enter="sendChatData($event)"
|
||||
:disabled="aiGenerating"
|
||||
/>
|
||||
<button
|
||||
class="pl-2 pr-2 mr-1 ml-1 bg-black text-white rounded-full hover:bg-gray-700 hover:translate-y-[-4px] transition-all duration-300 disabled:cursor-not-allowed disabled:hover:translate-y-0 disabled:bg-color-500"
|
||||
:disabled="!inputMessage?.trim()"
|
||||
@click="sendChatData()"
|
||||
v-if="!aiGenerating"
|
||||
>
|
||||
<Send class="w-5 h-5" />
|
||||
</button>
|
||||
<button
|
||||
class="pl-2 pr-2 mr-1 ml-1 bg-black text-white rounded-full hover:bg-gray-700 hover:translate-y-[-4px] transition-all duration-300 disabled:cursor-not-allowed disabled:hover:translate-y-0 disabled:bg-color-500"
|
||||
@click="stopChatGenerate"
|
||||
v-else
|
||||
>
|
||||
<Square class="w-5 h-5" />
|
||||
</button>
|
||||
</div>
|
||||
<span class="text-xs text-center justify-center align-center w-full"
|
||||
>Note: AI might create imbalanced views.</span
|
||||
>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</blurPageBeforeLogin>
|
||||
</template>
|
||||
|
|
@ -53,7 +53,7 @@ const contentArray = ref([]);
|
|||
const errorr = ref(false);
|
||||
const switchTabs = ref(false);
|
||||
const tabs = ref([]);
|
||||
const primary = ref<string>("domestic"); // Hard code default value as top is just pure garbage.
|
||||
const primary = ref<string>("top"); // This will be later overwritten, so values set here will be useless.
|
||||
const canNotLoadTabUI = ref(false);
|
||||
const isDataCached = ref(false);
|
||||
const pullTabsData = async () => {
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@ const starArticle = async () => {
|
|||
};
|
||||
|
||||
onMounted(async () => {
|
||||
const req = await fetch(`/user/${slug}/star`);
|
||||
const req = await fetch(`/api/user/${slug}/star`);
|
||||
const res = await req.json();
|
||||
staredStatus.value = res;
|
||||
});
|
||||
|
|
@ -164,7 +164,7 @@ onMounted(async () => {
|
|||
class="justify-center align-center text-center flex flex-col md:flex-row flex-wrap"
|
||||
>
|
||||
<div class="flex flex-col">
|
||||
<div class="group">
|
||||
<div class="group translate-y-12">
|
||||
<h2 class="text-3xl text-bold">
|
||||
{{
|
||||
displayTranslatedText
|
||||
|
|
@ -212,16 +212,6 @@ onMounted(async () => {
|
|||
<div v-else>{{ summaryText }}</div>
|
||||
</div>
|
||||
</div>
|
||||
<!--<div class="flex flex-col bg-gray-500">
|
||||
<!--Similar articles-->
|
||||
<!--<div class="flex flex-row" v-for="item in likeart">
|
||||
<img /><!--Image-->
|
||||
<!--<div class="flex flex-col">
|
||||
<h2>title</h2>
|
||||
<span>description</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>-->
|
||||
<button
|
||||
@click="starArticle"
|
||||
:class="[
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
<script setup lang="ts">
|
||||
const { t } = useI18n();
|
||||
</script>
|
||||
<template>
|
||||
<div class="justify-center align-center text-center">
|
||||
<h1 class="text-2xl text-bold">{{ t("pages.privacypolicy.title") }}</h1>
|
||||
<p>{{ t("pages.privacypolicy.content") }}</p>
|
||||
</div>
|
||||
</template>
|
||||
|
|
@ -380,23 +380,6 @@ const submitUserPassword = async () => {
|
|||
</div>
|
||||
</div>
|
||||
<hr />
|
||||
<div
|
||||
class="flex flex-row gap-2 m-1 p-2 justify-center align-center text-center"
|
||||
>
|
||||
<button
|
||||
class="bg-sky-400 p-1 rounded hover:bg-sky-600 transition-all duration-200 w-32"
|
||||
@click="() => emit('windowopener', 'privacypolicy')"
|
||||
>
|
||||
Privacy Policy
|
||||
</button>
|
||||
<button
|
||||
class="bg-sky-400 p-1 rounded hover:bg-sky-600 transition-all duration-200 w-32"
|
||||
@click="() => emit('windowopener', 'tos')"
|
||||
>
|
||||
TOS
|
||||
</button>
|
||||
</div>
|
||||
<hr />
|
||||
<div class="justiy-center align-center text-center">
|
||||
{{ t("app.settings") }} v0.0.3 || Version: {{ getVersionTag() }}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
<script setup lang="ts">
|
||||
const { t } = useI18n();
|
||||
</script>
|
||||
<template>
|
||||
<div class="justify-center align-center text-center">
|
||||
<h1 class="text-2xl text-bold">{{ t("pages.tos.title") }}</h1>
|
||||
<p>{{ t("pages.tos.content") }}</p>
|
||||
</div>
|
||||
</template>
|
||||
|
|
@ -1,78 +0,0 @@
|
|||
<script setup lamng="ts">
|
||||
// Great, there are now no errors ig
|
||||
const emit = defineEmits(["windowopener", "error", "loadValue"]);
|
||||
import sha512 from "crypto-js/sha512";
|
||||
import Input from "~/components/ui/input/Input.vue";
|
||||
const userAccount = ref("");
|
||||
const userPassword = ref("");
|
||||
const error = ref(false);
|
||||
const errormsg = ref("");
|
||||
const success = ref(false);
|
||||
const submitUserPassword = async () => {
|
||||
error.value = false;
|
||||
errormsg.value = "";
|
||||
// Encrypt password during transit
|
||||
const password = sha512(userPassword.value).toString();
|
||||
|
||||
// Send data.
|
||||
const sendData = await fetch("/api/user/login", {
|
||||
method: "POST",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
body: JSON.stringify({
|
||||
username: userAccount.value,
|
||||
password: password,
|
||||
}),
|
||||
});
|
||||
const res = await sendData.json();
|
||||
|
||||
if (!res.error) {
|
||||
error.value = false;
|
||||
success.value = true;
|
||||
console.log(res);
|
||||
userAccount.value = "";
|
||||
} else {
|
||||
error.value = true;
|
||||
errormsg.value = res.error;
|
||||
}
|
||||
userPassword.value = "";
|
||||
};
|
||||
</script>
|
||||
<template>
|
||||
<div class="">
|
||||
<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">Login / Register</span>
|
||||
<span class="mb-4 text-sm mt-0"
|
||||
>We will create a account for you if you don't have one.</span
|
||||
>
|
||||
<div class="">
|
||||
<Input
|
||||
type="text"
|
||||
placeholder="Username"
|
||||
class="mb-2 p-2 border rounded"
|
||||
v-model="userAccount"
|
||||
required
|
||||
/>
|
||||
<Input
|
||||
type="password"
|
||||
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">
|
||||
Log In
|
||||
</button>
|
||||
</form>
|
||||
<div v-else>Hi! ${user}</div>
|
||||
</div>
|
||||
</template>
|
||||
|
|
@ -45,11 +45,11 @@
|
|||
"apis": "APIs"
|
||||
},
|
||||
"description": {
|
||||
"find": "You can easily find the same topic from different news sources.",
|
||||
"interface": "Use a desktop like interface, the one that you already got used to.",
|
||||
"documentation": "We provide a documentation for you to learn how to use the app.",
|
||||
"opensource": "This platform is open source! minus the database part, but I'm going to try!",
|
||||
"apis": "We use api's that are made via reverse engineering."
|
||||
"find": "You can find the same topic from different news sources.",
|
||||
"interface": "This platform uses a desktop like interface, the one that you already got used to.",
|
||||
"documentation": "We provide a video for you to learn how to use the basics of the application.",
|
||||
"opensource": "This platform is open source!",
|
||||
"apis": "We use api's that are made via reverse engineering, here https://github.com/hpware/reverse_engineering"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -116,16 +116,6 @@
|
|||
"noadlinetoday": "Provides free, no ads Line today."
|
||||
}
|
||||
},
|
||||
"pages": {
|
||||
"privacypolicy": {
|
||||
"title": "Privacy Policy",
|
||||
"content": "Ummmm"
|
||||
},
|
||||
"tos": {
|
||||
"title": "Terms of service",
|
||||
"content": "N/A"
|
||||
}
|
||||
},
|
||||
"about": {
|
||||
"why": "Why make this website?",
|
||||
"bulletpoints": {
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@
|
|||
"find": "你可以輕鬆地從不同的新聞來源找到相同的主題。",
|
||||
"interface": "這個網站使用類似 Xfce / MacOS / DSM 的介面，讓你可以簡單使用這個網站。",
|
||||
"documentation": "我做了一組教學，讓你可以學會如何使用這個網站 UI。",
|
||||
"opensource": "這個平台的所有程式碼都放在Github上，沒有開源的資料庫，我會想辦法把它用其他方式開源！",
|
||||
"opensource": "這個平台的所有程式碼都放在Github上！",
|
||||
"apis": "我們使用LINE Today 的資訊來做出一個 API。"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -51,18 +51,14 @@ import translate from "translate";
|
|||
import checkAppVersion from "~/components/checkAppVersion";
|
||||
|
||||
// Import Windows
|
||||
import UserWindow from "~/components/app/windows/user.vue";
|
||||
import SourcesWindow from "~/components/app/windows/sources.vue";
|
||||
import AboutWindow from "~/components/app/windows/about.vue";
|
||||
import ChatbotWindow from "~/components/app/windows/chatbot.vue";
|
||||
import AboutNewsOrgWindow from "~/components/app/windows/aboutNewsOrg.vue";
|
||||
import TTYWindow from "~/components/app/windows/tty.vue";
|
||||
import FavStaredWindow from "~/components/app/windows/fav.vue";
|
||||
import NewsWindow from "~/components/app/windows/news.vue";
|
||||
import NewsViewWindow from "~/components/app/windows/newsView.vue";
|
||||
import SettingsWindow from "~/components/app/windows/settings.vue";
|
||||
import PrivacyPolicyWindow from "~/components/app/windows/privacypolicy.vue";
|
||||
import TOSWindow from "~/components/app/windows/tos.vue";
|
||||
import onBoardingWindow from "~/components/app/windows/onBoarding.vue";
|
||||
|
||||
// Import Icons
|
||||
|
|
@ -83,14 +79,12 @@ const route = useRoute();
|
|||
// values
|
||||
const popMessage = ref(null);
|
||||
const menuOpen = ref(false);
|
||||
2;
|
||||
const currentNavBar = ref<currentNavBarInterface[]>([]);
|
||||
const bootingAnimation = ref(true);
|
||||
const activeWindows = ref<associAppWindowInterface[]>([]);
|
||||
const hiddenWindows = ref<minAppWindowInterface[]>([]);
|
||||
const openApp = ref();
|
||||
const openAppId = ref();
|
||||
const openAppNameQuery = ref();
|
||||
const currentOpenAppId = ref(0);
|
||||
const progress = ref(0);
|
||||
const titleAppName = ref("Desktop");
|
||||
|
|
@ -101,7 +95,6 @@ const changeLangAnimation = ref(false);
|
|||
const applyForTranslation = ref(false);
|
||||
const langPrefDifferent = ref(false);
|
||||
const notLoggedInState = ref(false);
|
||||
const translateProvider = ref("");
|
||||
const newUpdate = ref(false);
|
||||
|
||||
// Key Data
|
||||
|
|
@ -109,7 +102,6 @@ const menuItems = [
|
|||
{ name: t("app.news"), windowName: "news" },
|
||||
{ name: t("app.sources"), windowName: "sources" },
|
||||
{ name: t("app.starred"), windowName: "starred" },
|
||||
{ name: t("app.chatbot"), windowName: "chatbot" },
|
||||
{ name: t("app.about"), windowName: "about" },
|
||||
{ name: t("app.terminal"), windowName: "tty" },
|
||||
{ name: t("app.settings"), windowName: "settings" },
|
||||
|
|
@ -117,13 +109,6 @@ const menuItems = [
|
|||
];
|
||||
|
||||
const associAppWindow = [
|
||||
{
|
||||
name: "login",
|
||||
id: "2",
|
||||
title: t("app.login"),
|
||||
component: UserWindow,
|
||||
translatable: false,
|
||||
},
|
||||
{
|
||||
name: "sources",
|
||||
id: "3",
|
||||
|
|
@ -163,15 +148,6 @@ const associAppWindow = [
|
|||
component: FavStaredWindow,
|
||||
translatable: true,
|
||||
},
|
||||
{
|
||||
name: "chatbot",
|
||||
id: "8",
|
||||
title: t("app.chatbot"),
|
||||
component: ChatbotWindow,
|
||||
width: "400px",
|
||||
height: "600px",
|
||||
translatable: false,
|
||||
},
|
||||
{
|
||||
name: "aboutNewsOrg",
|
||||
id: "9",
|
||||
|
|
@ -194,20 +170,6 @@ const associAppWindow = [
|
|||
component: NewsViewWindow,
|
||||
translatable: true,
|
||||
},
|
||||
{
|
||||
name: "privacypolicy",
|
||||
id: "12",
|
||||
title: t("app.privacypolicy"),
|
||||
component: PrivacyPolicyWindow,
|
||||
translatable: false,
|
||||
},
|
||||
{
|
||||
name: "tos",
|
||||
id: "13",
|
||||
title: t("app.tos"),
|
||||
component: TOSWindow,
|
||||
translatable: false,
|
||||
},
|
||||
{
|
||||
name: "onboard",
|
||||
id: "14",
|
||||
|
|
@ -751,7 +713,10 @@ setInterval(async () => {
|
|||
>
|
||||
{{ t("popup.stay") }}
|
||||
</Button>
|
||||
<Button @click="() => switchLocalePath()" variant="outline">
|
||||
<Button
|
||||
@click="() => switchLocalePath(`${locale !== 'en' ? 'en' : 'zh_tw'}`)"
|
||||
variant="outline"
|
||||
>
|
||||
{{ t("popup.change") }}
|
||||
</Button>
|
||||
</DialogFooter>
|
||||
|
|
@ -822,7 +787,8 @@ setInterval(async () => {
|
|||
</DraggableWindow>
|
||||
</div>
|
||||
</Transition>
|
||||
<div v-if="confetiActive">
|
||||
<!--TODO: ADD CONFETI-->
|
||||
<!-- <div v-if="confetiActive">
|
||||
<div v-ref="successcanvas"></div>
|
||||
</div>
|
||||
</div>-->
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -1,95 +0,0 @@
|
|||
import { Groq } from "groq-sdk";
|
||||
import sql from "~/server/components/postgres";
|
||||
|
||||
const groq = new Groq();
|
||||
|
||||
export default defineEventHandler(async (event) => {
|
||||
const host = getRequestHost(event);
|
||||
const protocol = getRequestProtocol(event);
|
||||
const hears = getRequestHeaders(event);
|
||||
const slug = getRouterParam(event, "slug");
|
||||
const body = await readBody(event);
|
||||
if (!slug) {
|
||||
throw createError({
|
||||
statusCode: 400,
|
||||
message: "A UUID is required for this action.",
|
||||
});
|
||||
}
|
||||
|
||||
const getChatHistory = await sql`
|
||||
select * from chat_history
|
||||
where uuid = ${slug}
|
||||
order by created_at asc
|
||||
`;
|
||||
|
||||
const buildURL = protocol + "://" + host + "/api/news/get/lt/" + "LX30VwG";
|
||||
const data = await fetch(buildURL);
|
||||
const fetchNewsArticle = await data.json();
|
||||
|
||||
// Set headers for Server-Sent Events
|
||||
setHeader(event, "Content-Type", "text/plain; charset=utf-8");
|
||||
setHeader(event, "Cache-Control", "no-cache");
|
||||
setHeader(event, "Connection", "keep-alive");
|
||||
setHeader(event, "Access-Control-Allow-Origin", "*");
|
||||
|
||||
const chatCompletion = await groq.chat.completions.create({
|
||||
messages: [
|
||||
{
|
||||
role: "system",
|
||||
content: `You are a news chat, the following content will be used to chat with the user title: ${fetchNewsArticle.title} article: ${fetchNewsArticle.paragraph} origin: ${fetchNewsArticle.origin} author: ${fetchNewsArticle.author}`,
|
||||
},
|
||||
...getChatHistory.map((chat) => ({
|
||||
role: chat.role,
|
||||
content: chat.content,
|
||||
})),
|
||||
{
|
||||
role: "user",
|
||||
content: body.message,
|
||||
},
|
||||
],
|
||||
model: "gemma2-9b-it",
|
||||
temperature: 0.71,
|
||||
max_completion_tokens: 1024,
|
||||
top_p: 1,
|
||||
stream: true,
|
||||
stop: null,
|
||||
});
|
||||
|
||||
/*
|
||||
await sql`
|
||||
INSERT INTO chat_history (uuid, role, content)
|
||||
VALUES (${slug}, 'user', ${body.message})
|
||||
`; */
|
||||
|
||||
let assistantResponse = "";
|
||||
|
||||
// Create a readable stream
|
||||
const stream = new ReadableStream({
|
||||
async start(controller) {
|
||||
try {
|
||||
for await (const chunk of chatCompletion) {
|
||||
const content = chunk.choices[0]?.delta?.content || "";
|
||||
if (content) {
|
||||
assistantResponse += content;
|
||||
// Send chunk to client
|
||||
controller.enqueue(new TextEncoder().encode(content));
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
if (assistantResponse) {
|
||||
await sql`
|
||||
INSERT INTO chat_history (uuid, role, content)
|
||||
VALUES (${slug}, 'assistant', ${assistantResponse})
|
||||
`;
|
||||
} */
|
||||
|
||||
controller.close();
|
||||
} catch (error) {
|
||||
controller.error(error);
|
||||
}
|
||||
},
|
||||
});
|
||||
|
||||
return sendStream(event, stream);
|
||||
});
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
export default defineEventHandler(async (event) => {
|
||||
return {
|
||||
hello: "hello",
|
||||
};
|
||||
});
|
||||
|
|
@ -1,6 +1,7 @@
|
|||
import { Groq } from "groq-sdk";
|
||||
import sql from "~/server/components/postgres";
|
||||
import { checkIfUserHasCustomGroqKey } from "~/server/components/customgroqsystem";
|
||||
import getEnvFromDB from "~/server/components/getEnvFromDB";
|
||||
|
||||
export default defineEventHandler(async (event) => {
|
||||
const host = getRequestHost(event);
|
||||
|
|
@ -16,8 +17,9 @@ export default defineEventHandler(async (event) => {
|
|||
apiKey: doesTheUserHasACustomGroqApiAndWhatIsIt.customApi,
|
||||
});
|
||||
} else {
|
||||
const groq_api_key = await getEnvFromDB("groq_api_key");
|
||||
groqClient = new Groq({
|
||||
apiKey: process.env.GROQ_API_KEY,
|
||||
apiKey: groq_api_key,
|
||||
});
|
||||
}
|
||||
const query = getQuery(event);
|
||||
|
|
|
|||
|
|
@ -60,6 +60,12 @@ export default defineEventHandler(async (event) => {
|
|||
)
|
||||
`;
|
||||
|
||||
const createGlobalVars = await sql`
|
||||
CREATE TABLE IF NOT EXISTS global_vars (
|
||||
NAME TEXT PRIMARY KEY NOT NULL,
|
||||
VAR TEXT NOT NULL
|
||||
)
|
||||
`;
|
||||
return {
|
||||
createUsers: createUsers,
|
||||
usersList: usersList,
|
||||
|
|
@ -67,5 +73,6 @@ export default defineEventHandler(async (event) => {
|
|||
createSources: createSources,
|
||||
createUserOtherData: createUserOtherData,
|
||||
createArticlesArchive: createArticlesArchive,
|
||||
createGlobalVars: createGlobalVars,
|
||||
};
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,16 +1,11 @@
|
|||
import sql from "~/server/components/postgres";
|
||||
import { v4 as uuidv4 } from "uuid";
|
||||
import argon2 from "argon2";
|
||||
import getEnvFromDB from "~/server/components/getEnvFromDB";
|
||||
|
||||
const defaultAvatarUrl = "https://s3.yhw.tw/news-analyze/avatar/default.png";
|
||||
|
||||
export default defineEventHandler(async (event) => {
|
||||
const salt = process.env.PASSWORD_HASH_SALT;
|
||||
if (!salt) {
|
||||
return {
|
||||
error: "SALT_NOT_FOUND",
|
||||
};
|
||||
}
|
||||
const body = await readBody(event);
|
||||
const { username, password } = body;
|
||||
console.log(password);
|
||||
|
|
@ -33,6 +28,7 @@ export default defineEventHandler(async (event) => {
|
|||
where username = ${username}`;
|
||||
console.log(fetchUserInfo[0]);
|
||||
if (fetchUserInfo.length === 0) {
|
||||
const salt = await getEnvFromDB("password_hash_salt");
|
||||
const hashedPassword = await argon2.hash(salt + password);
|
||||
const userUUID = uuidv4();
|
||||
const createNewUser = await sql`
|
||||
|
|
|
|||
16
server/components/getEnvFromDB.ts
Normal file
16
server/components/getEnvFromDB.ts
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
import sql from "~/server/components/postgres";
|
||||
interface variReturn {
|
||||
name: string;
|
||||
var: string;
|
||||
}
|
||||
export default async function (vari: string) {
|
||||
const fetchVar = await sql<variReturn[]>`
|
||||
SELECT * FROM global_vars
|
||||
WHERE NAME = ${vari}`;
|
||||
if (fetchVar.length === 0) {
|
||||
throw new Error(
|
||||
"Cannot find var in the database. Have you followed this? https://github.com/hpware/news-analyze?tab=readme-ov-file#notes",
|
||||
);
|
||||
}
|
||||
return fetchVar[0].var;
|
||||
}
|
||||
|
|
@ -1,64 +0,0 @@
|
|||
# Server Fixed
|
||||
(This file is NOT related to neighbourhood, but it is some stuff I learned during the down time of the server)
|
||||
|
||||
## Timeline
|
||||
Aprox. 10 PM UTC+8 - I found out that the server is running an outdated version of the app and tried using `docker compose pull`, but saw 192.168.1.1:53 is not a Server, and tried to fix it, and broke off the connection to the internet.
|
||||
|
||||
11:40-ish PM UTC+8 Server is back online.
|
||||
|
||||
## So what is the issue?
|
||||
Well, My issue is one of my config files included a "on", which is why the PPPoE conenction does not work anymore.
|
||||
|
||||
Image:
|
||||
|
||||
|
||||
And also I wrote a super stupid cron fix, which is below.
|
||||
|
||||
## My stupid cron fix:
|
||||
Cron Job:
|
||||
```
|
||||
0 * * * * "bun run /hardpushrevolvconf.ts" > /dev/null
|
||||
```
|
||||
|
||||
Here is the script I used to force the change of my resolv.conf file:
|
||||
```typescript
|
||||
import { file, $ } from "bun";
|
||||
|
||||
function sendDataToSlack(text: string) {
|
||||
fetch("{slack_web_hook_to_one_of_my_channels_in_hackclub}", {
|
||||
method: "POST",
|
||||
headers: {
|
||||
"Content-Type": "application-json"
|
||||
},
|
||||
body: JSON.stringify({ text: text })
|
||||
})
|
||||
return;
|
||||
}
|
||||
|
||||
const resolvConfPath = "/etc/resolv.conf";
|
||||
const resolvConf = file(resolvConfPath);
|
||||
const resolvConfText = await resolvConf.text();
|
||||
|
||||
if (resolvConfText.includes("192.168.1.1")) {
|
||||
// Auto git config
|
||||
await $`git add .`
|
||||
await $`git commit -a -m "Auto Commit by the server ${Date().now}, before doing stuff into resolvConf"`
|
||||
try {
|
||||
await resolvConf.write("nameserver 8.8.8.8\n");
|
||||
sendDataToSlack(`${resolvConfPath} updated successfully.`);
|
||||
} catch (error) {
|
||||
sendDataToSlack(`Failed to write to ${resolvConfPath}:`, error);
|
||||
sendDataToSlack(
|
||||
"This likely happened because you didn't run the script with root privileges (e.g., 'sudo bun run script.ts')."
|
||||
);
|
||||
}
|
||||
await $`git add .`
|
||||
await $`git commit -a -m "Auto Commit by the server ${Date().now}, after doing stuff into resolvConf"`
|
||||
await $`git push`
|
||||
} else {
|
||||
sendDataToSlack(
|
||||
"Did not find '192.168.1.1'. No changes have been made."
|
||||
);
|
||||
}
|
||||
|
||||
```
|
||||
Loading…
Add table
Add a link
Reference in a new issue