summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.DS_Storebin0 -> 8196 bytes
-rw-r--r--.idea/.name1
-rw-r--r--.idea/discord.xml7
-rw-r--r--.idea/misc.xml8
-rw-r--r--_frame/.DS_Storebin0 -> 6148 bytes
-rw-r--r--_frame/about/index.php4
-rw-r--r--_frame/copyright/index.php35
-rw-r--r--_frame/home/index.php10
-rw-r--r--_frame/library.internal/main.php2
-rw-r--r--_frame/library.internal/view.php2
-rw-r--r--_frame/lyrics/index.php2
-rw-r--r--_frame/settings/index.php2
-rw-r--r--css/frame-home.css8
-rw-r--r--data/.DS_Storebin0 -> 6148 bytes
-rw-r--r--favicon.icobin310725 -> 0 bytes
-rw-r--r--favicon.svg29
-rw-r--r--index.php6
-rw-r--r--version2
18 files changed, 101 insertions, 17 deletions
diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..75f1db5
--- /dev/null
+++ b/.DS_Store
Binary files differ
diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..fadca82
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+Argon \ No newline at end of file
diff --git a/.idea/discord.xml b/.idea/discord.xml
new file mode 100644
index 0000000..d8e9561
--- /dev/null
+++ b/.idea/discord.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="DiscordProjectSettings">
+ <option name="show" value="PROJECT_FILES" />
+ <option name="description" value="" />
+ </component>
+</project> \ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..283b9b4
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="SwUserDefinedSpecifications">
+ <option name="specTypeByUrl">
+ <map />
+ </option>
+ </component>
+</project> \ No newline at end of file
diff --git a/_frame/.DS_Store b/_frame/.DS_Store
new file mode 100644
index 0000000..65acc04
--- /dev/null
+++ b/_frame/.DS_Store
Binary files differ
diff --git a/_frame/about/index.php b/_frame/about/index.php
index b1166ad..7bdd290 100644
--- a/_frame/about/index.php
+++ b/_frame/about/index.php
@@ -4,7 +4,7 @@
<head>
<meta charset="UTF-8">
<title>Argon</title>
- <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
+ <link rel="shortcut icon" href="/favicon.svg" type="image/svg+xml">
<link rel="stylesheet" href="/css/fonts.css">
<link rel="stylesheet" href="/css/general.css">
<link rel="stylesheet" href="/css/loader.css">
@@ -23,7 +23,7 @@
<div id="frame-contents">
<div id="frame-about-general">
<div id="frame-about-general-icon">
- <img alt="<?= $_FAMILINE ? "Familine Musique" : "Argon" ?>" src="<?= $_FAMILINE ? "https://familine.minteck.org/icns/familine-music.svg" : "/logo/512.png" ?>" id="frame-about-general-icon">
+ <img alt="<?= $_FAMILINE ? "Familine Musique" : "Argon" ?>" src="<?= $_FAMILINE ? "https://familine.minteck.org/icns/familine-music.svg" : "/favicon.svg" ?>" id="frame-about-general-icon">
</div>
<div id="frame-about-general-text">
<div id="frame-about-general-text-inner">
diff --git a/_frame/copyright/index.php b/_frame/copyright/index.php
new file mode 100644
index 0000000..f36ce7d
--- /dev/null
+++ b/_frame/copyright/index.php
@@ -0,0 +1,35 @@
+<?php if (str_ends_with($_SERVER['HTTP_HOST'], ".familine.minteck.org")) { $_FAMILINE = true; } else { $_FAMILINE = false; } function l($en, $fr) { global $_FAMILINE; if ($_FAMILINE) { return $fr; } else { return $en; } } $root = $_SERVER['DOCUMENT_ROOT']; $root = $_SERVER['DOCUMENT_ROOT']; if ($_FAMILINE) { require_once "/mnt/familine/app/session.php"; } ?>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <title>Argon</title>
+ <link rel="shortcut icon" href="/favicon.svg" type="image/svg+xml">
+ <link rel="stylesheet" href="/css/fonts.css">
+ <link rel="stylesheet" href="/css/general.css">
+ <link rel="stylesheet" href="/css/loader.css">
+ <link rel="stylesheet" href="/css/header.css">
+ <link rel="stylesheet" href="/css/frame-about.css">
+ <link rel="stylesheet" href="/css/frame.css">
+ <link rel="stylesheet" href="/dark.css">
+ <meta name="HandheldFriendly" content="true" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
+</head>
+<body>
+<div id="argon-frame">
+ <div id="frame-header">
+ Report a copyright infringement
+ </div>
+ <div id="frame-contents">
+ <p>If you think a content hosted on Argon is infringing your copyright, you may want to send in a report to the Argon administrators, so they can remove the concerned content. Make sure you have a way to prove you own the copyrighted content before sending in a report.</p>
+ <p>Before sending a report, make sure you have the following information:</p>
+ <ul>
+ <li>the ID of the song containing the copyrighted content, or a link to the page on Argon;</li>
+ <li>a link pointing to the original content (if the link can't be publicly accessed by the time we view your report, it will be ignored);</li>
+ <li>a way to prove you own the content (for example: if it is a YouTube video, you can add the Argon song ID at the bottom of the video description)</li>
+ </ul>
+ <p>We will try to process your request within at most 4 non-business days, but it may be delayed in some cases; please be patient. To start reporting a copyright infringement, send an email to <a class="frame-about-link" href="mailto:contact@minteck.org">contact@minteck.org</a>.</p>
+ </div>
+</div>
+</body>
+</html> \ No newline at end of file
diff --git a/_frame/home/index.php b/_frame/home/index.php
index c0f0c69..0ea9691 100644
--- a/_frame/home/index.php
+++ b/_frame/home/index.php
@@ -4,7 +4,7 @@
<head>
<meta charset="UTF-8">
<title>Argon</title>
- <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
+ <link rel="shortcut icon" href="/favicon.svg" type="image/svg+xml">
<link rel="stylesheet" href="/css/fonts.css">
<link rel="stylesheet" href="/css/general.css">
<link rel="stylesheet" href="/css/header.css">
@@ -20,14 +20,18 @@
<?= l("Home", "Accueil") ?>
</div>
<div id="frame-contents">
- <div id="frame-home-intro" <?= $_FAMILINE ? "style=\"filter: hue-rotate(250deg);\"" : "" ?>>
- <img src="<?= str_contains($_SERVER['HTTP_USER_AGENT'], "+AutomateCloud/") ? ("/native.svg") : ($_FAMILINE ? "https://familine.minteck.org/icns/familine-music.svg" : "/logo/256.png") ?>" id="frame-home-logo" <?= $_FAMILINE ? "style=\"filter: hue-rotate(-250deg);\"" : "" ?>>
+ <div id="frame-home-intro" <?= $_FAMILINE ? "style=\"filter: hue-rotate(150deg);\"" : "" ?>>
+ <img src="<?= str_contains($_SERVER['HTTP_USER_AGENT'], "+AutomateCloud/") ? ("/native.svg") : ($_FAMILINE ? "https://familine.minteck.org/icns/familine-music.svg" : "/favicon.svg") ?>" id="frame-home-logo" <?= $_FAMILINE ? "style=\"filter: hue-rotate(-150deg);\"" : "" ?>>
<div id="frame-home-welcome"><?= l("Welcome to the Argon Media Platform!", "Bienvenue sur Familine Musique !") ?></div>
<div id="frame-home-tagline"><?= l("High quality ad-free music from Minteck", "Musique de haute qualité et sans publicités de la famille") ?></div>
<button onclick="location.href='/_frame/library';" id="frame-home-button"><?= l("Browse Library", "Explorer la bibliothèque") ?></button>
<div id="frame-home-links">
<a onclick="location.href='/_frame/about';" id="frame-home-link-about" class="frame-home-link"><?= l("About Argon", "À propos") ?></a>
·
+ <?php if (!$_FAMILINE): ?>
+ <a onclick="location.href='/_frame/copyright';" id="frame-home-link-about" class="frame-home-link"><?= l("Copyright", "Droits d'auteurs") ?></a>
+ ·
+ <?php endif; ?>
<a onclick="location.href='/_frame/settings';" id="frame-home-link-settings" class="frame-home-link"><?= l("Preferences", "Préférences") ?></a>
·
<a onclick="window.open('https://gitlab.minteck.org/explore/projects/topics/Argon');" id="frame-home-link-source" class="frame-home-link"><?= l("Source Code", "Code source") ?></a>
diff --git a/_frame/library.internal/main.php b/_frame/library.internal/main.php
index 7ce781e..5ffc26b 100644
--- a/_frame/library.internal/main.php
+++ b/_frame/library.internal/main.php
@@ -4,7 +4,7 @@
<head>
<meta charset="UTF-8">
<title>Argon</title>
- <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
+ <link rel="shortcut icon" href="/favicon.svg" type="image/svg+xml">
<link rel="stylesheet" href="/css/fonts.css">
<link rel="stylesheet" href="/css/general.css">
<link rel="stylesheet" href="/css/header.css">
diff --git a/_frame/library.internal/view.php b/_frame/library.internal/view.php
index b66a4ca..e2c9d2a 100644
--- a/_frame/library.internal/view.php
+++ b/_frame/library.internal/view.php
@@ -48,7 +48,7 @@ if ($selected === null) {
<head>
<meta charset="UTF-8">
<title>Argon</title>
- <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
+ <link rel="shortcut icon" href="/favicon.svg" type="image/svg+xml">
<link rel="stylesheet" href="/css/fonts.css">
<link rel="stylesheet" href="/css/general.css">
<link rel="stylesheet" href="/css/header.css">
diff --git a/_frame/lyrics/index.php b/_frame/lyrics/index.php
index 5b75d54..14a0cdd 100644
--- a/_frame/lyrics/index.php
+++ b/_frame/lyrics/index.php
@@ -4,7 +4,7 @@
<head>
<meta charset="UTF-8">
<title>Argon</title>
- <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
+ <link rel="shortcut icon" href="/favicon.svg" type="image/svg+xml">
<link rel="stylesheet" href="/css/fonts.css">
<link rel="stylesheet" href="/css/general.css">
<link rel="stylesheet" href="/css/loader.css">
diff --git a/_frame/settings/index.php b/_frame/settings/index.php
index b0ac0b7..2b3e840 100644
--- a/_frame/settings/index.php
+++ b/_frame/settings/index.php
@@ -4,7 +4,7 @@
<head>
<meta charset="UTF-8">
<title>Argon</title>
- <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
+ <link rel="shortcut icon" href="/favicon.svg" type="image/svg+xml">
<link rel="stylesheet" href="/css/fonts.css">
<link rel="stylesheet" href="/css/general.css">
<link rel="stylesheet" href="/css/loader.css">
diff --git a/css/frame-home.css b/css/frame-home.css
index 82f171a..cbd3dd6 100644
--- a/css/frame-home.css
+++ b/css/frame-home.css
@@ -18,7 +18,7 @@
#frame-home-button {
margin-top: 10px;
- background: #002e47;
+ background: #400047;
color: white;
border: 1px solid rgba(0, 0, 0, .25);
border-radius: 5px;
@@ -26,11 +26,11 @@
}
#frame-home-button:hover {
- background: #0e4665;
+ background: #5c0e65;
}
#frame-home-button:active, #frame-home-button:focus {
- background: #1f648b;
+ background: #811f8c;
}
#frame-home-links {
@@ -40,7 +40,7 @@
}
.frame-home-link {
- color: #0e4665;
+ color: #5d0e66;
cursor: pointer;
text-decoration: underline;
text-decoration-color: transparent;
diff --git a/data/.DS_Store b/data/.DS_Store
new file mode 100644
index 0000000..deb8513
--- /dev/null
+++ b/data/.DS_Store
Binary files differ
diff --git a/favicon.ico b/favicon.ico
deleted file mode 100644
index a037397..0000000
--- a/favicon.ico
+++ /dev/null
Binary files differ
diff --git a/favicon.svg b/favicon.svg
new file mode 100644
index 0000000..d55235e
--- /dev/null
+++ b/favicon.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ viewBox="0 0 48 48" style="enable-background:new 0 0 48 48;" xml:space="preserve">
+<style type="text/css">
+ .st0{fill:url(#SVGID_1_);}
+ .st1{fill:url(#SVGID_00000021088441130175115220000001900973498294205868_);}
+</style>
+ <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="24" y1="48" x2="24" y2="-9.094947e-13">
+ <stop offset="0" style="stop-color:#EF8BD5"/>
+ <stop offset="1" style="stop-color:#F5BBE5"/>
+</linearGradient>
+ <path class="st0" d="M38,48H10C4.5,48,0,43.5,0,38V10C0,4.5,4.5,0,10,0h28c5.5,0,10,4.5,10,10v28C48,43.5,43.5,48,38,48z"/>
+ <g>
+
+ <linearGradient id="SVGID_00000040556912232314180950000009598157297982551190_" gradientUnits="userSpaceOnUse" x1="24" y1="6.3257" x2="24" y2="41.6743">
+ <stop offset="0" style="stop-color:#820095"/>
+ <stop offset="1" style="stop-color:#A2009F"/>
+ </linearGradient>
+ <path style="fill:url(#SVGID_00000040556912232314180950000009598157297982551190_);" d="M9.3,41.7c-0.8,0-1.6-0.3-2.1-0.8
+ c-0.6-0.6-0.9-1.3-0.9-2.1V24c0-2.5,0.5-4.7,1.4-6.9c0.9-2.1,2.2-4,3.8-5.6c1.6-1.6,3.5-2.8,5.6-3.8c2.1-0.9,4.4-1.4,6.9-1.4
+ s4.7,0.5,6.9,1.4s4,2.2,5.6,3.8c1.6,1.6,2.8,3.5,3.8,5.6c0.9,2.1,1.4,4.4,1.4,6.9l0,14.7c0,0.6-0.2,1.2-0.5,1.7
+ c-0.6,0.8-1.4,1.3-2.3,1.3l-4,0c-0.8,0-1.6-0.3-2.1-0.8c-0.6-0.6-0.9-1.3-0.9-2.1l0-8.8c0-0.6,0.2-1.2,0.5-1.7
+ c0.6-0.8,1.4-1.3,2.3-1.3h4v-3.1c0-4.1-1.4-7.6-4.3-10.4c-2.9-2.9-6.3-4.3-10.4-4.3s-7.6,1.4-10.4,4.3s-4.3,6.3-4.3,10.4V27l3.9,0
+ c0.8,0,1.6,0.3,2.1,0.8c0.6,0.6,0.9,1.3,0.9,2.1l0,8.8c0,0.6-0.2,1.2-0.5,1.7c-0.6,0.8-1.4,1.3-2.3,1.3L9.3,41.7z M9.3,38.7h3.9
+ l0,0l0,0v-8.8l0,0l0,0H9.3V38.7L9.3,38.7L9.3,38.7z M34.8,38.7h3.9l0,0l0,0v-8.8h-3.9l0,0l0,0V38.7L34.8,38.7L34.8,38.7z M9,38.7
+ L9,38.7L9,38.7h4.3l0,0l0,0l0,0l0,0H9z M34.2,38.7L34.2,38.7L34.2,38.7L34.2,38.7L34.2,38.7h4.3l0,0l0,0H34.2z"/>
+</g>
+</svg>
diff --git a/index.php b/index.php
index f961cf2..1db7b51 100644
--- a/index.php
+++ b/index.php
@@ -4,7 +4,7 @@
<head>
<meta charset="UTF-8">
<title><?= $_FAMILINE ? "Familine Musique" : "Argon" ?></title>
- <link rel="shortcut icon" href="<?= l("/favicon.ico", "https://familine.minteck.org/icns/familine-music.svg") ?>" type="image/x-icon">
+ <link rel="shortcut icon" href="<?= l("/favicon.svg", "https://familine.minteck.org/icns/familine-music.svg") ?>" type="image/svg+xml">
<link rel="stylesheet" href="/css/loader.css">
<link rel="stylesheet" href="/css/fonts.css">
<link rel="stylesheet" href="/css/general.css">
@@ -134,7 +134,7 @@
<div id="argon-loader">
<div id="argon-loader-logo">
<div style="text-align: center;">
- <img src="<?= str_contains($_SERVER['HTTP_USER_AGENT'], "+AutomateCloud/") && !$_FAMILINE ? ("/native.svg") : ($_FAMILINE ? "https://familine.minteck.org/icns/familine-music.svg" : "/logo/256.png") ?>" style="width:128px;">
+ <img src="<?= str_contains($_SERVER['HTTP_USER_AGENT'], "+AutomateCloud/") && !$_FAMILINE ? ("/native.svg") : ($_FAMILINE ? "https://familine.minteck.org/icns/familine-music.svg" : "/favicon.svg") ?>" style="width:128px;">
<br><br>
<div style="width:48px;height:48px;text-align: center;margin-left: auto;margin-right: auto;">
<svg class="circular-loader" viewBox="25 25 50 50">
@@ -151,7 +151,7 @@
<aside id="navigation-outer">
<div id="navigation">
<a onclick="ArgonNavigation.about();" id="navigation-about" title="<?= $_FAMILINE ? "Familine Musique" : "Argon" ?> v<?= file_get_contents($root . "/version"); ?>">
- <img id="navigation-about-icon" src="<?= str_contains($_SERVER['HTTP_USER_AGENT'], "+AutomateCloud/") && !$_FAMILINE ? ("/native.svg") : ($_FAMILINE ? "https://familine.minteck.org/icns/familine-music.svg" : "/logo/256.png") ?>" alt="<?= $_FAMILINE ? "Familine Musique" : "Argon" ?>" id="navigation-logo">
+ <img id="navigation-about-icon" src="<?= str_contains($_SERVER['HTTP_USER_AGENT'], "+AutomateCloud/") && !$_FAMILINE ? ("/native.svg") : ($_FAMILINE ? "https://familine.minteck.org/icns/familine-music.svg" : "/favicon.svg") ?>" alt="<?= $_FAMILINE ? "Familine Musique" : "Argon" ?>" id="navigation-logo">
</a>
<a onclick="ArgonNavigation.home();" title="<?= l("Home", "Accueil") ?>" class="navigation-item" id="navigation-home">
<img src="/icons/home-off.svg" alt="<?= l("Home", "Accueil") ?>" class="navigation-item-icon"
diff --git a/version b/version
index dc2b74e..b1d7abc 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.5.7 \ No newline at end of file
+0.6.2 \ No newline at end of file
© Floofi Systems, Some rights reserved. Powered by cgit.