Fix conflicts lol

.github/workflows/main.yml

@@ -0,0 +1,22 @@
+name: GitlabSync
+
+on:
+  - push
+  - delete
+
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+    name: Git Repo Sync
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+    - uses: wangchucheng/git-repo-sync@v0.1.0
+      with:
+        # Such as https://github.com/wangchucheng/git-repo-sync.git
+        target-url: https://gitlab.com/itzCozi/sudo-flix
+        # Such as wangchucheng
+        target-username: itzCozi
+          # You can store token in your project's 'Setting > Secrets' and reference the name here. Such as ${{ secrets.ACCESS\_TOKEN }}
+        target-token: glpat-y24SW9CqLWRtmkWGFAez

src/assets/locales/en.json

@@ -114,17 +114,17 @@
       "stopEditing": "Stop editing"
     },
     "search": {
-      "allResults": "That's all we have!",
+      "allResults": "That's all we have...",
       "failed": "Failed to find media, try again!",
       "loading": "Loading...",
-      "noResults": "We couldn't find anything!",
+      "noResults": "We couldn't find anything :(",
       "placeholder": {
         "default": "What do you want to watch?",
         "extra": [
-          "What do you want to explore?",
-          "What's on your watchlist?",
-          "What's your favorite movie?",
-          "What's your favorite series?"
+          "What do you want to stream?",
+          "Sudo-Flix is the best site ever!",
+          "What's on your watchlist today?",
+          "How was your day?"
         ]
       },
       "sectionTitle": "Search results"

src/components/utils/Lightbar.tsx

@@ -154,7 +154,7 @@ function ParticlesCanvas() {
     const day = date.getDate();
     if (
       (month === 11 && day >= 24 && day <= 26) ||
-      Math.random() < 0.091 // 9.1%
+      Math.random() < 0.051 // 5.1%
     ) {
       imageOverride = [
         {
@@ -174,7 +174,7 @@ function ParticlesCanvas() {
     const day2 = date.getDate();
     if (
       (month2 === 9 && day2 >= 29 && day2 <= 31) ||
-      Math.random() < 0.09 // 9%
+      Math.random() < 0.05 // 5%
     ) {
       imageOverride = [
         {
@@ -190,7 +190,7 @@ function ParticlesCanvas() {
     }
 
     // Fish easter egg
-    const shouldShowFishie = Math.random() < 0.4; // 40%
+    const shouldShowFishie = Math.random() < 0.1; // 10%
     if (shouldShowFishie) {
       imageOverride = [
         {
@@ -208,7 +208,7 @@ function ParticlesCanvas() {
     // Weed easter egg
     const month3 = date.getMonth() + 1;
     const day3 = date.getDate();
-    const shouldShowZa = (month3 === 4 && day3 === 20) || Math.random() < 0.35; // 35%
+    const shouldShowZa = (month3 === 4 && day3 === 20) || Math.random() < 0.25; // 25%
     if (shouldShowZa) {
       imageOverride = [
         {
@@ -220,7 +220,7 @@ function ParticlesCanvas() {
     }
 
     // Kitty easter egg
-    const shouldShowCat = Math.random() < 0.25; // 25%
+    const shouldShowCat = Math.random() < 0.2; // 20%
     if (shouldShowCat) {
       imageOverride = [
         {
@@ -232,7 +232,7 @@ function ParticlesCanvas() {
     }
 
     // Movie & popcorn easter egg
-    const shouldShowParaphernalia = Math.random() < 0.2; // 20%
+    const shouldShowParaphernalia = Math.random() < 0.3; // 30%
     if (shouldShowParaphernalia) {
       imageOverride = [
         {
@@ -248,7 +248,7 @@ function ParticlesCanvas() {
     }
 
     // Chicken easter egg
-    const shouldShow4thDecor = Math.random() < 0.1; // 10%
+    const shouldShow4thDecor = Math.random() < 0.06; // 6%
     if (shouldShow4thDecor) {
       imageOverride = [
         {
@@ -268,7 +268,7 @@ function ParticlesCanvas() {
     }
 
     // Dev easter egg
-    const shouldShowCode = Math.random() < 0.05; // 5%
+    const shouldShowCode = Math.random() < 0.03; // 3%
     if (shouldShowCode) {
       imageOverride = [
         {

src/setup/App.tsx

@@ -105,20 +105,20 @@ function App() {
   useHistoryListener();
   useOnlineListener();
   const { t } = useTranslation();
-  const [showDowntime, setShowDowntime] = useState(true);
+  const maintenance = false;
+  const [showDowntime, setShowDowntime] = useState(maintenance);
 
   const handleButtonClick = () => {
     setShowDowntime(false);
   };
 
   useEffect(() => {
-    const token = localStorage.getItem("downtimeToken");
-    if (token) {
+    const sessionToken = sessionStorage.getItem("downtimeToken");
+    if (!sessionToken) {
       setShowDowntime(true);
-    } else {
-      localStorage.setItem("downtimeToken", "true");
+      sessionStorage.setItem("downtimeToken", "true");
     }
-  }, []);
+  }, [setShowDowntime]);
 
   return (
     <Layout>