Fin

IDK
Merge branch 'main' of https://cdm-project.com/tpd94/CDRM-Project
2025-04-28 18:42:00 -04:00 · 2025-04-28 18:40:17 -04:00 · 2025-04-28 18:36:28 -04:00 · 2025-04-28 18:36:07 -04:00 · 2025-04-28 22:26:39 +00:00 · 2025-04-28 18:26:06 -04:00
14 changed files with 261 additions and 78 deletions
--- a/README.md
+++ b/README.md
@ -30,5 +30,5 @@
 - Extract CDRM-Project 2.0 git contents into the newly created `CDRM-Project` folder  
 - Install python dependencies `pip install -r requirements.txt`  
 - (Optional) Create the folder structure `/configs/CDMs/WV` and place your .WVD file into `/configs/CDMs/WV`  
- - (Optional) Create the folder structur `/config/CDMs/PR` and place your .PRD file into `/configs/CDMs/PR`  
+ - (Optional) Create the folder structure `/config/CDMs/PR` and place your .PRD file into `/configs/CDMs/PR`  
 - Run the application with `python main.py`
--- a/cdrm-frontend/dist/assets/index-COb8XlA9.css
+++ b/cdrm-frontend/dist/assets/index-COb8XlA9.css
--- a/cdrm-frontend/dist/assets/index-DN7XJ__W.js
+++ b/cdrm-frontend/dist/assets/index-DN7XJ__W.js
--- a/cdrm-frontend/dist/favico.png
+++ b/cdrm-frontend/dist/favico.png
--- a/cdrm-frontend/dist/index.html
+++ b/cdrm-frontend/dist/index.html
@ -0,0 +1,21 @@
+<!doctype html>
+<html lang="en" class="w-full h-full">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/favico.png" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="description" content="{{ data.description }}"/>
+    <meta name="keywords" content="{{ data.keywords }}"/>
+    <meta property='og:title' content="{{ data.opengraph_title }}" />
+    <meta property='og:description' content="{{ data.opengraph_description }}" />
+    <meta property='og:image' content="{{ data.opengraph_image }}" />
+    <meta property='og:url' content="{{ data.opengraph_url }}" />
+    <meta property='og:locale' content='en_US' />
+    <title>{{ data.tab_title }}</title>
+    <script type="module" crossorigin src="/assets/index-DN7XJ__W.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-COb8XlA9.css">
+  </head>
+  <body class="w-full h-full">
+    <div id="root" class="w-full h-full"></div>
+  </body>
+</html>
--- a/cdrm-frontend/dist/og-api.jpg
+++ b/cdrm-frontend/dist/og-api.jpg
--- a/cdrm-frontend/dist/og-cache.jpg
+++ b/cdrm-frontend/dist/og-cache.jpg
--- a/cdrm-frontend/dist/og-home.jpg
+++ b/cdrm-frontend/dist/og-home.jpg
--- a/cdrm-frontend/dist/og-testplayer.jpg
+++ b/cdrm-frontend/dist/og-testplayer.jpg
--- a/cdrm-frontend/src/App.jsx
+++ b/cdrm-frontend/src/App.jsx
@ -16,7 +16,7 @@ function App() {
      {/* The SideMenu should be visible when isMenuOpen is true */}
      <SideMenu isMenuOpen={isMenuOpen} setIsMenuOpen={setIsMenuOpen} />

-      <div id="navbarcontainer" className="hidden lg:flex lg:w-2xs bg-gray-950/55 border-r border-white/5 0">
+      <div id="navbarcontainer" className="hidden lg:flex lg:w-2xs bg-gray-950/55 border-r border-white/5 shrink-0">
        <NavBar />
      </div>

--- a/cdrm-frontend/src/components/NavBar.jsx
+++ b/cdrm-frontend/src/components/NavBar.jsx
@ -1,3 +1,4 @@
+import { useEffect, useState } from 'react';
 import { NavLink } from 'react-router-dom';
 import homeIcon from '../assets/icons/home.svg';
 import cacheIcon from '../assets/icons/cache.svg';
@ -8,105 +9,96 @@ import telegramIcon from '../assets/icons/telegram.svg';
 import giteaIcon from '../assets/icons/gitea.svg';

 function NavBar() {
+    const [externalLinks, setExternalLinks] = useState({
+        discord: '#',
+        telegram: '#',
+        gitea: '#',
+    });
+
+    useEffect(() => {
+        fetch('/api/links')
+            .then(response => response.json())
+            .then(data => setExternalLinks(data))
+            .catch(error => console.error('Error fetching links:', error));
+    }, []);
+
    return (
        <div className="flex flex-col w-full h-full bg-white/1">
            <div>
                <p className='text-white text-2xl font-bold p-3 text-center mb-5'>
-                    <a href='/'>
-                        CDRM-Project
-                    </a>
+                    <a href='/'>CDRM-Project</a>
                </p>
            </div>
+
            <div className='overflow-y-auto grow'>
-                <NavLink
-                    to='/'
-                    className={({ isActive }) =>
-                        `flex flex-row p-3 border-l-3 ${isActive ? 'border-l-sky-500/50 bg-black/50' : 'hover:border-l-sky-500/50 hover:bg-white/5'}`
-                    }
-                >
-                    <button className='w-1/3 p-3 flex flex-col items-center justify-center cursor-pointer'>
-                        <img src={homeIcon} alt="Home" className='w-1/2 cursor-pointer' />
-                    </button>
-                    <p className='grow text-white md:text-2xl font-bold flex items-center justify-start'>
-                        Home
-                    </p>
-                </NavLink>
-                <NavLink
-                    to='/cache'
-                    className={({ isActive }) =>
-                        `flex flex-row p-3 border-l-3 ${isActive ? 'border-l-emerald-500/50 bg-black/50' : 'hover:border-l-emerald-500/50 hover:bg-white/5'}`
-                    }
-                >
-                    <button className='w-1/3 p-3 flex flex-col items-center justify-center cursor-pointer'>
-                        <img src={cacheIcon} alt="Cache" className='w-1/2 cursor-pointer' />
-                    </button>
-                    <p className='grow text-white md:text-2xl font-bold flex items-center justify-start'>
-                        Cache
-                    </p>
-                </NavLink>
-                <NavLink
-                    to='/api'
-                    className={({ isActive }) =>
-                        `flex flex-row p-3 border-l-3 ${isActive ? 'border-l-indigo-500/50 bg-black/50' : 'hover:border-l-indigo-500/50 hover:bg-white/5'}`
-                    }
-                >
-                    <button className='w-1/3 p-3 flex flex-col items-center justify-center cursor-pointer'>
-                        <img src={apiIcon} alt="API" className='w-1/2 cursor-pointer' />
-                    </button>
-                    <p className='grow text-white md:text-2xl font-bold flex items-center justify-start'>
-                        API
-                    </p>
-                </NavLink>
-                <NavLink
-                    to='/testplayer'
-                    className={({ isActive }) =>
-                        `flex flex-row p-3 border-l-3 ${isActive ? 'border-l-rose-700/50 bg-black/50' : 'hover:border-l-rose-700/50 hover:bg-white/5'}`
-                    }
-                >
-                    <button className='w-1/3 p-3 flex flex-col items-center justify-center cursor-pointer'>
-                        <img src={testPlayerIcon} alt="Test Player" className='w-1/2 cursor-pointer' />
-                    </button>
-                    <p className='grow text-white md:text-2xl font-bold flex items-center justify-start'>
-                        Test Player
-                    </p>
-                </NavLink>
+                {/* Static routes */}
+                {[{
+                    to: '/',
+                    label: 'Home',
+                    icon: homeIcon,
+                    color: 'sky'
+                }, {
+                    to: '/cache',
+                    label: 'Cache',
+                    icon: cacheIcon,
+                    color: 'emerald'
+                }, {
+                    to: '/api',
+                    label: 'API',
+                    icon: apiIcon,
+                    color: 'indigo'
+                }, {
+                    to: '/testplayer',
+                    label: 'Test Player',
+                    icon: testPlayerIcon,
+                    color: 'rose-700'
+                }].map(({ to, label, icon, color }) => (
+                    <NavLink
+                        key={label}
+                        to={to}
+                        className={({ isActive }) =>
+                            `flex flex-row p-3 border-l-3 ${
+                                isActive
+                                    ? `border-l-${color}-500/50 bg-black/50`
+                                    : `hover:border-l-${color}-500/50 hover:bg-white/5`
+                            }`
+                        }
+                    >
+                        <button className='w-1/3 p-3 flex flex-col items-center justify-center cursor-pointer'>
+                            <img src={icon} alt={label} className='w-1/2 cursor-pointer' />
+                        </button>
+                        <p className='grow text-white md:text-2xl font-bold flex items-center justify-start'>
+                            {label}
+                        </p>
+                    </NavLink>
+                ))}
            </div>
+
+            {/* External links */}
            <div className='flex flex-row w-full h-16 self-end bg-black/25'>
                <a
-                    href='https://discord.cdrm-project.com'
+                    href={externalLinks.discord}
                    target='_blank'
                    rel='noopener noreferrer'
                    className='w-1/3 p-3 flex flex-col items-center justify-center cursor-pointer hover:bg-blue-950 group'
                >
-                    <img
-                        src={discordIcon}
-                        alt="Discord"
-                        className='w-1/2 cursor-pointer group-hover:animate-bounce'
-                    />
+                    <img src={discordIcon} alt="Discord" className='w-1/2 group-hover:animate-bounce' />
                </a>
                <a
-                    href='https://telegram.cdrm-project.com'
+                    href={externalLinks.telegram}
                    target='_blank'
                    rel='noopener noreferrer'
                    className='w-1/3 p-3 flex flex-col items-center justify-center cursor-pointer hover:bg-blue-400 group'
                >
-                    <img
-                        src={telegramIcon}
-                        alt="Telegram"
-                        className='w-1/2 cursor-pointer group-hover:animate-bounce'
-                    />
+                    <img src={telegramIcon} alt="Telegram" className='w-1/2 group-hover:animate-bounce' />
                </a>
                <a
-                    href='https://cdm-project.com/tpd94/cdrm-project'
+                    href={externalLinks.gitea}
                    target='_blank'
                    rel='noopener noreferrer'
                    className='w-1/3 p-3 flex flex-col items-center justify-center cursor-pointer hover:bg-green-700 group'
                >
-                    <img
-                        src={giteaIcon}
-                        alt="Gitea"
-                        className='w-1/2 cursor-pointer group-hover:animate-bounce'
-                    />
+                    <img src={giteaIcon} alt="Gitea" className='w-1/2 group-hover:animate-bounce' />
                </a>
            </div>
        </div>
--- a/cdrm-frontend/src/components/Pages/API.jsx
+++ b/cdrm-frontend/src/components/Pages/API.jsx
@ -104,7 +104,7 @@ print(requests.post(
        </details>
        <details open className='w-full list-none mt-5'>
            <summary className='text-2xl'>PyWidevine RemoteCDM info</summary>
-            <div className='mt-5 border-2 border-indigo-500 p-5 rounded-lg overflow-x-auto'>
+            <div className='mt-5 border-2 border-indigo-500/50 p-5 rounded-lg overflow-x-auto'>
                <p>
                    <strong>Device Type:</strong> '{deviceInfo.device_type}'<br />
                    <strong>System ID:</strong> {deviceInfo.system_id}<br />
@ -117,7 +117,7 @@ print(requests.post(
        </details>
        <details open className='w-full list-none mt-5'>
            <summary className='text-2xl'>PyPlayready RemoteCDM info</summary>
-            <div className='mt-5 border-2 border-indigo-500 p-5 rounded-lg overflow-x-auto'>
+            <div className='mt-5 border-2 border-indigo-500/50 p-5 rounded-lg overflow-x-auto'>
                <p>
                    <strong>Security Level:</strong> {prDeviceInfo.security_level}<br />
                    <strong>Host:</strong> {fullHost}/remotecdm/playready<br />
--- a/configs/icon_links.py
+++ b/configs/icon_links.py
@ -0,0 +1,5 @@
+data = {
+    'discord': 'https://discord.cdrm-project.com/',
+    'telegram': 'https://telegram.cdrm-project.com/',
+    'gitea': 'https://cdm-project.com/tpd94/cdm-project'
+}
--- a/routes/api.py
+++ b/routes/api.py
@ -10,6 +10,7 @@ import mysql.connector
 from io import StringIO
 import tempfile
 import time
+from configs.icon_links import data as icon_data

 api_bp = Blueprint('api', __name__)
 with open(f'{os.getcwd()}/configs/config.yaml', 'r') as file:
@ -234,3 +235,11 @@ def decrypt_data():
            'status': 'fail',
            'message': result['message']
        })
+
+@api_bp.route('/api/links', methods=['GET'])
+def get_links():
+    return jsonify({
+        'discord': icon_data['discord'],
+        'telegram': icon_data['telegram'],
+        'gitea': icon_data['gitea'],
+    })
Author	SHA1	Message	Date
TPD94	4382ff2e5f	Fin	2025-04-28 18:42:00 -04:00
TPD94	84dd67afba	IDK	2025-04-28 18:40:17 -04:00
TPD94	5ab76ed088	Merge branch 'main' of https://cdm-project.com/tpd94/CDRM-Project	2025-04-28 18:36:28 -04:00
TPD94	afd55c4195	Rollback	2025-04-28 18:36:07 -04:00
tpd94	3d8ec7a998	Merge branch 'github' into main	2025-04-28 22:26:39 +00:00
TPD94	76bf6e9aca	Added dist	2025-04-28 18:26:06 -04:00
TPD94	92b7df673e	Remove opengraph links	2025-04-28 18:13:01 -04:00
TPD94	fa9353153c	Update upstream, remove links from icons	2025-04-28 18:11:08 -04:00
tpd94	1512cfbe88	Merge pull request 'Added `icon_links.py` to customize where the icons for discord/telegram/gitea take you' (#7 ) from main into github Reviewed-on: #7	2025-04-28 22:07:38 +00:00
TPD94	e068e2b827	Added `icon_links.py` to customize where the icons for discord/telegram/gitea take you	2025-04-28 18:06:52 -04:00
tpd94	65ea79b93b	Merge pull request 'Fix borders / navbar' (#6 ) from main into github Reviewed-on: #6	2025-04-28 21:50:36 +00:00
TPD94	51877cf56e	Fix borders / navbar	2025-04-28 17:49:37 -04:00
TPD94	c8e89bb2a2	Update README.md	2025-04-28 17:27:28 -04:00
TPD94	024ffc83f7	Removed automatic CDM download for github maximum compliance	2025-04-28 17:22:38 -04:00
TPD94	57413e8e08	Merge branch 'main' of https://cdm-project.com/tpd94/CDRM-Project	2025-04-28 15:03:40 -04:00
TPD94	84bdf566f0	Added dist	2025-04-28 15:02:21 -04:00