chore(deps): update dependency prettier to v3.6.2

Signed-off-by: ngn <ngn@ngn.tf>

.env

@@ -2,5 +2,4 @@ SAFETWITCH_BACKEND_DOMAIN=localhost:7000
 SAFETWITCH_INSTANCE_DOMAIN=localhost:5173
 SAFETWITCH_HTTPS=false
 SAFETWITCH_DEFAULT_LOCALE=en-US
-SAFETWITCH_DEFAULT_THEME=dark
-SAFETWITCH_FALLBACK_LOCALE=en-US
+SAFETWITCH_FALLBACK_LOCALE=en-US

.gitea/workflows/docker.yml

@@ -1,28 +1,36 @@
-name: Build and publish the docker image
+name: docker
 
 on:
   push:
-    branches: ["custom"]
+    branches:
+      - 'main'
+    paths-ignore:
+      - 'README.md'
+      - 'LICENSE.txt'
+      - 'docker-compose.example.yml'
+      - 'ups.json'
 
 env:
   REGISTRY: git.ngn.tf
   IMAGE: ${{gitea.repository}}
 
 jobs:
-  build:
+  docker:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: "https://github.com/actions/checkout@v4"
+        uses: actions/checkout@v4
+        with:
+          submodules: true
 
       - name: Login to container repo
-        uses: "https://github.com/docker/login-action@v1"
+        uses: docker/login-action@v1
         with:
           registry: ${{env.REGISTRY}}
           username: ${{gitea.actor}}
           password: ${{secrets.PACKAGES_TOKEN}}
 
-      - name: Build image
+      - name: Build docker image
         run: |
           docker build . --tag ${{env.REGISTRY}}/${{env.IMAGE}}:latest
           docker push ${{env.REGISTRY}}/${{env.IMAGE}}:latest

.gitea/workflows/ups.yml

@@ -0,0 +1,25 @@
+name: ups
+
+on:
+  schedule:
+    - cron: "@weekly"
+
+jobs:
+  ups:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install dependencies
+        run: |
+          sudo apt update -y
+          sudo apt install -y python3 python3-build python3-requests make
+
+      - name: Install ups
+        run: |
+          git clone https://git.ngn.tf/ngn/ups && cd ups
+          make && make install
+
+      - name: Run ups
+        run: PATH=~/.local/bin:$PATH ups-check

Dockerfile

@@ -5,7 +5,6 @@ ENV SAFETWITCH_INSTANCE_DOMAIN SAFETWITCH_INSTANCE_DOMAIN_PLACEHOLDER
 ENV SAFETWITCH_HTTPS SAFETWITCH_HTTPS_PLACEHOLDER
 ENV SAFETWITCH_DEFAULT_LOCALE SAFETWITCH_DEFAULT_LOCALE_PLACEHOLDER
 ENV SAFETWITCH_FALLBACK_LOCALE SAFETWITCH_FALLBACK_LOCALE_PLACEHOLDER
-ENV SAFETWITCH_DEFAULT_THEME SAFETWITCH_DEFAULT_THEME_PLACEHOLDER
 
 WORKDIR /app
 

README.md

@@ -1,5 +1,7 @@
-# [ngn.tf] | safetwitch
+# safetwitch - frontend for twitch.tv
 
-![](https://git.ngn.tf/ngn/safetwitch/actions/workflows/build.yml/badge.svg)
+![](https://git.ngn.tf/ngn/safetwitch/actions/workflows/docker.yml/badge.svg)
+![](https://git.ngn.tf/ngn/safetwitch/actions/workflows/ups.yml/badge.svg)
 
-A fork of the [safetwitch](https://codeberg.org/safetwitch/safetwitch) project, with my personal changes.
+A fork of the [safetwitch](https://codeberg.org/safetwitch/safetwitch) project,
+with my personal changes.

docker/docker-compose.yml

@@ -2,10 +2,6 @@ services:
   st_frontend:
     container_name: safetwitch_frontend
     image: git.ngn.tf/ngn/safetwitch
-    security_opt:
-    - no-new-privileges:true
-    cap_drop:
-    - ALL
     ports:
     - 8080:8280
     environment:

docker/init.sh

@@ -10,7 +10,6 @@ else
   export SAFETWITCH_BACKEND_DOMAIN_PLACEHOLDER=SAFETWITCH_BACKEND_DOMAIN_PLACEHOLDER
   export SAFETWITCH_INSTANCE_DOMAIN_PLACEHOLDER=SAFETWITCH_INSTANCE_DOMAIN_PLACEHOLDER
   export SAFETWITCH_HTTPS_PLACEHOLDER=SAFETWITCH_HTTPS_PLACEHOLDER
-  export SAFETWITCH_DEFAULT_THEME_PLACEHOLDER=SAFETWITCH_DEFAULT_THEME_PLACEHOLDER
   export SAFETWITCH_DEFAULT_LOCALE_PLACEHOLDER=SAFETWITCH_DEFAULT_LOCALE_PLACEHOLDER
   export SAFETWITCH_FALLBACK_LOCALE_PLACEHOLDER=SAFETWITCH_FALLBACK_LOCALE_PLACEHOLDER
 fi
@@ -21,7 +20,6 @@ do
   sed -i 's|'${SAFETWITCH_BACKEND_DOMAIN_PLACEHOLDER}'|'${SAFETWITCH_BACKEND_DOMAIN}'|g' $file
   sed -i 's|'${SAFETWITCH_INSTANCE_DOMAIN_PLACEHOLDER}'|'${SAFETWITCH_INSTANCE_DOMAIN}'|g' $file
   sed -i 's|'${SAFETWITCH_HTTPS_PLACEHOLDER}'|'${SAFETWITCH_HTTPS}'|g' $file
-  sed -i 's|'${SAFETWITCH_DEFAULT_THEME_PLACEHOLDER}'|'${SAFETWITCH_DEFAULT_THEME}'|g' $file
   sed -i 's|'${SAFETWITCH_DEFAULT_LOCALE_PLACEHOLDER}'|'${SAFETWITCH_DEFAULT_LOCALE}'|g' $file
   sed -i 's|'${SAFETWITCH_FALLBACK_LOCALE_PLACEHOLDER}'|'${SAFETWITCH_FALLBACK_LOCALE}'|g' $file
   # Your other variables here...
@@ -31,9 +29,8 @@ done
 echo -e "SAFETWITCH_BACKEND_DOMAIN_PLACEHOLDER=${SAFETWITCH_BACKEND_DOMAIN}" > .env.old
 echo -e "SAFETWITCH_INSTANCE_DOMAIN_PLACEHOLDER=${SAFETWITCH_INSTANCE_DOMAIN}" >> .env.old
 echo -e "SAFETWITCH_HTTPS_PLACEHOLDER=${SAFETWITCH_HTTPS}" >> .env.old
-echo -e "SAFETWITCH_DEFAULT_THEME_PLACEHOLDER=${SAFETWITCH_DEFAULT_THEME}" >> .env.old
 echo -e "SAFETWITCH_DEFAULT_LOCALE_PLACEHOLDER=${SAFETWITCH_DEFAULT_LOCALE}" >> .env.old
 echo -e "SAFETWITCH_FALLBACK_LOCALE_PLACEHOLDER=${SAFETWITCH_FALLBACK_LOCALE}" >> .env.old
 
 # Starting NGINX
-nginx -g 'daemon off;'
+nginx -g 'daemon off;'

env.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="vite/client" />
 
 // https://github.com/intlify/vue-i18n-next/issues/1403
-/// <reference types="vite/client" /> 
+/// <reference types="vite/client" />
 /// <reference path="node_modules/vue-i18n/dist/vue-i18n.d.ts" />
 declare module 'vue-i18n'
 
@@ -13,10 +13,9 @@ interface ImportMetaEnv {
     readonly SAFETWITCH_FALLBACK_LOCALE: string
     readonly SAFETWITCH_COMMIT_HASH: string
     readonly SAFETWITCH_TAG: string
-    readonly SAFETWITCH_DEFAULT_THEME: string
     // more env variables...
   }
-  
+
   interface ImportMeta {
     readonly env: ImportMetaEnv
-  }
+  }

renovate.json

@@ -0,0 +1,5 @@
+{
+  "extends": ["config:recommended"],
+  "timezone": "Europe/Istanbul",
+  "prHourlyLimit": 20
+}

src/App.vue

@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import { RouterView } from 'vue-router'
 import NavbarItem from './components/NavbarView.vue'
-import FooterItem from './components/FooterView.vue'
 import DevWarning from './components/DevWarning.vue'
 
 import { getTheme } from '@/settingsManager'
@@ -11,13 +10,10 @@ const dev = import.meta.env.DEV
 
 <template>
   <dev-warning v-if="dev"></dev-warning>
-  <div :class="getTheme()" class="flex flex-col justify-between min-h-[100vh] bg-primary">
+  <div :class="getTheme()" class="flex flex-col min-h-[100vh] bg-black">
     <navbar-item></navbar-item>
-
     <Suspense>
       <RouterView :key="$route.fullPath" />
     </Suspense>
-
-    <footer-item></footer-item>
   </div>
 </template>

src/components/FooterView.vue

@@ -1,23 +0,0 @@
-<script lang="ts">
-const dev = import.meta.env.DEV
-
-export default {
-  setup() {
-    let version = `${import.meta.env.SAFETWITCH_TAG}-${import.meta.env.SAFETWITCH_COMMIT_HASH}`
-
-    if (dev) {
-      version = version + '-dev'
-    }
-
-    return {
-      version
-    }
-  }
-}
-</script>
-
-<template>
-  <div class="m-2 mt-5 flex justify-center">
-    <p class="text-contrast font-bold">SafeTwitch {{ version }}</p>
-  </div>
-</template>

src/components/NavbarView.vue

@@ -70,7 +70,11 @@ export default {
 </template>
 
 <style>
-a:hover, router-link:hover {
+nav {
+  color:
+}
+
+ul a:hover, ul router-link:hover {
   text-decoration: underline;
 }
 

src/components/SearchBar.vue

@@ -15,9 +15,8 @@ export default {
 </script>
 
 <template>
-  <div class="relative md:block">
+  <div class="relative md:block outline-none">
     <label for="searchBar" class="hidden">{{ $t('main.search') }}</label>
-    <v-icon name="io-search-outline" class="absolute my-auto inset-y-0 left-2"></v-icon>
     <input
       type="text"
       id="searchBar"
@@ -25,7 +24,7 @@ export default {
       :placeholder="$t('main.search')"
       v-model="searchInput"
       @keyup.enter="redirectToSearch"
-      class="rounded-md p-1 pl-8 w-56 text-white bg-black border-white outline-none placeholder:text-white w-full"
+      class="rounded-md text-white bg-black placeholder:text-white w-full outline-none"
     />
   </div>
 </template>

src/router/index.ts

@@ -1,7 +1,6 @@
 import { createRouter, createWebHistory } from 'vue-router'
 const UserView = () => import('../views/UserView.vue')
 const PageNotFound = () => import('../views/PageNotFound.vue')
-const PrivacyPageView = () => import('../views/PrivacyPageView.vue')
 const HomepageView = () => import('../views/HomepageView.vue')
 const CategoryView = () => import('../views/CategoryView.vue')
 const SearchPageView = () => import('../views/SearchPageView.vue')
@@ -34,11 +33,6 @@ const router = createRouter({
       path: '/directory/category/:game',
       component: CategoryView
     },
-    {
-      path: '/privacy',
-      name: 'about',
-      component: PrivacyPageView
-    },
     {
       path: '/following',
       component: FollowingView

src/settingsManager.ts

@@ -215,7 +215,7 @@ export function getFollows(): string[] {
  * @default string light
  */
 export function getTheme(): string {
-  const selectedTheme = localStorage.getItem('theme') || import.meta.env.SAFETWITCH_DEFAULT_THEME
+  const selectedTheme = localStorage.getItem('theme') || "dark"
 
   if (selectedTheme === '') {
     return 'light'
@@ -226,7 +226,7 @@ export function getTheme(): string {
   if (t.length === 0) {
     console.error(`Theme ${selectedTheme} does not exist... Perhaps improperly setup instance defaults or improper config?
     Stored Theme: ${localStorage.getItem('theme')}
-    Default Theme: ${import.meta.env.SAFETWITCH_DEFAULT_THEME}
+    Default Theme: black
     `)
     return 'light'
   }
@@ -244,7 +244,7 @@ export const themeList = [
     // just as if you were to extend tailwind's theme like normal https://tailwindcss.com/docs/theme#extending-the-default-theme
     extend: {
       colors: {
-        primary: '#000',
+        primary: '#141515',
         secondary: '#1e1f1f',
         overlay0: '#282a2a',
         overlay1: '#323434',

src/views/HomepageView.vue

@@ -83,7 +83,7 @@ export default {
     <error-message ></error-message>
   </div>
 
-  <div v-show="data" class="max-w-5xl w-[100vw] mx-auto">
+  <div v-show="data" class="p-5">
     <vue-title title="Discover"></vue-title>
     <div v-if="following && following.length > 0" class="p-2 text-contrast">
       <h1 class="font-bold text-5xl">{{ $t('home.following') }}</h1>

src/views/PrivacyPageView.vue

@@ -1,33 +0,0 @@
-<script lang="ts">
-export default {}
-</script>
-
-<template>
-  <article class="prose prose-invert bg-crust rounded-lg mx-auto p-8 pt-10 text-contrast">
-    <h1>Privacy Policy</h1>
-    <p>
-      It's.... kind of empty here.
-
-      <br /><br />
-
-      No logs are kept by SafeTwitch, however instances may log requests with their reverse-proxy.
-      The following data is stored in your browser from using the site, however never goes outside your browser:
-      <ul>
-        <li>Selected settings</li>
-        <li>Followed streamers</li>
-      </ul>
-
-      The following data is sent outside of your browser to SafeTwitch's backend:
-      <ul>
-        <li>Language locale</li>
-      </ul>
-      The language locale is sent to SafeTwitch's backend per request, and is used to fetch the data from Twitch in the correct language
-
-
-      <br /><br />
-
-      Non-official instances are under their own privacy policy, as they may host SafeTwitch with
-      different practices that may log requests
-    </p>
-  </article>
-</template>

src/views/SettingsView.vue

@@ -115,12 +115,10 @@ export default {
       </li>
     </ul>
 
+    <!---
     <h1 class="font-bold text-3xl mt-2">{{ $t('main.themes') }}</h1>
     <hr class="my-2" />
     <ul class="flex space-x-2">
-      <!-- 
-        Use theme colors for preview
-       -->
       <li
         v-for="theme in themeList"
         :key="theme.name"
@@ -150,5 +148,7 @@ export default {
         class="bg-surface0 p-4 py-2 rounded-md"
       />
     </div>
+
+    -->
   </div>
 </template>

tailwind.config.js

@@ -56,6 +56,6 @@ module.exports = {
       ]
     }),
     require('@tailwindcss/typography'),
-    require("@tailwindcss/forms") 
+    require("@tailwindcss/forms")
   ],
-}
+}

ups.json

@@ -0,0 +1,5 @@
+{
+  "upstream": "https://codeberg.org/safetwitch/safetwitch",
+  "provider": "gitea",
+  "commit": "f274ba527dd9ad9017ce4c97dc62622582ab82c3"
+}