Commit b8b733b9 authored by Andreas Heimann's avatar Andreas Heimann

changed report song url, added report user button

parent d6b72a64
...@@ -304,6 +304,9 @@ ...@@ -304,6 +304,9 @@
</div> </div>
</div> </div>
</div> </div>
<div class="user-detail-actions">
<button class="button-report button" onclick="UserDetailReport()" locale>userdetail.actions.reportButton</button>
</div>
<div class="song-row song-row-user"> <div class="song-row song-row-user">
<div class="song-header"> <div class="song-header">
<div class="row-title row-title-noactions" locale>userdetail.uploaded.header</div> <div class="row-title row-title-noactions" locale>userdetail.uploaded.header</div>
......
...@@ -27,6 +27,38 @@ ...@@ -27,6 +27,38 @@
.section-user-detail .user-detail-background .user-detail-dim .user-detail.active { .section-user-detail .user-detail-background .user-detail-dim .user-detail.active {
display: grid; display: grid;
} }
.section-user-detail .user-detail-actions {
padding: 50px;
padding-top: 0px;
display: none;
grid-template-columns: 1fr 1fr 1fr 1fr;
grid-gap: 25px;
}
.section-user-detail .user-detail-actions .button {
padding: 15px 0px;
font-size: 16px;
transition: 0.2s ease-in-out all, 0.1s ease-in-out transform;
}
.section-user-detail .user-detail-actions .button.button-primary {
background: #fff;
color: #222;
}
.section-user-detail .user-detail-actions .button.button-primary:hover {
background: #fff;
color: #222;
}
.section-user-detail .user-detail-actions .button:hover {
background: rgba(255, 255, 255, 0.2);
color: #fff;
opacity: 0.6;
transform: translateY(-4px);
}
.section-user-detail .user-detail-actions .button:active {
transform: translateY(-2px);
}
.section-user-detail .user-detail-actions.active {
display: grid;
}
.section-user-detail .song-row-user { .section-user-detail .song-row-user {
padding: 0px 50px; padding: 0px 50px;
margin-bottom: 50px; margin-bottom: 50px;
......
...@@ -34,6 +34,43 @@ ...@@ -34,6 +34,43 @@
} }
} }
} }
& .user-detail-actions {
padding: 50px;
padding-top: 0px;
display: none;
grid-template-columns: 1fr 1fr 1fr 1fr;
grid-gap: 25px;
& .button {
padding: 15px 0px;
font-size: 16px;
transition: 0.2s ease-in-out all, 0.1s ease-in-out transform;
&.button-primary {
background: #fff;
color: #222;
&:hover {
background: #fff;
color: #222;
}
}
&:hover {
background: rgba(255,255,255,0.2);
color: #fff;
opacity: 0.6;
transform: translateY(-4px);
}
&:active {
transform: translateY(-2px);
}
}
&.active {
display: grid;
}
}
& .song-row-user { & .song-row-user {
padding: 0px 50px; padding: 0px 50px;
......
...@@ -111,5 +111,5 @@ function SongDetailCopyLink() { ...@@ -111,5 +111,5 @@ function SongDetailCopyLink() {
} }
function SongDetailReport() { function SongDetailReport() {
shell.openExternal("https://spinsha.re/report/" + currentSongId); shell.openExternal("https://spinsha.re/report/song/" + currentSongId);
} }
\ No newline at end of file
const DOMUserDetailBackground = document.querySelector(".user-detail-background"); const DOMUserDetailBackground = document.querySelector(".user-detail-background");
const DOMUserDetailActions = document.querySelector(".user-detail-actions");
const DOMUserDetail = document.querySelector(".section-user-detail .user-detail"); const DOMUserDetail = document.querySelector(".section-user-detail .user-detail");
const DOMUserDetailAvatar = document.querySelector(".section-user-detail .user-avatar"); const DOMUserDetailAvatar = document.querySelector(".section-user-detail .user-avatar");
const DOMUserSongRow = document.querySelector(".song-row-user"); const DOMUserSongRow = document.querySelector(".song-row-user");
let currentUserId = 0;
const DOMUserName = DOMUserDetail.querySelector(".user-name"); const DOMUserName = DOMUserDetail.querySelector(".user-name");
const DOMUserSongsList = document.querySelector(".song-row-user .song-list"); const DOMUserSongsList = document.querySelector(".song-row-user .song-list");
const DOMUserSongsNoResults = document.querySelector(".song-row-user .song-list-noresults"); const DOMUserSongsNoResults = document.querySelector(".song-row-user .song-list-noresults");
function UserDetailLoad(userId) { function UserDetailLoad(userId) {
DOMUserDetail.classList.remove("active"); DOMUserDetail.classList.remove("active");
DOMUserDetailActions.classList.remove("active");
DOMUserSongRow.classList.remove("active"); DOMUserSongRow.classList.remove("active");
DOMUserSongsNoResults.classList.remove("active"); DOMUserSongsNoResults.classList.remove("active");
...@@ -17,11 +21,14 @@ function UserDetailLoad(userId) { ...@@ -17,11 +21,14 @@ function UserDetailLoad(userId) {
api.getUserDetail(userId).then(function(apiResponse) { api.getUserDetail(userId).then(function(apiResponse) {
let userData = apiResponse.data; let userData = apiResponse.data;
currentUserId = userData.id;
if(apiResponse.status == 404) { if(apiResponse.status == 404) {
NavigateToSection(7); NavigateToSection(7);
} else { } else {
DOMUserDetail.classList.add("active"); DOMUserDetail.classList.add("active");
DOMUserSongRow.classList.add("active"); DOMUserSongRow.classList.add("active");
DOMUserDetailActions.classList.add("active");
DOMUserDetailBackground.style.backgroundImage = "url('" + userData.avatar + "')"; DOMUserDetailBackground.style.backgroundImage = "url('" + userData.avatar + "')";
DOMUserDetailAvatar.style.backgroundImage = "url('" + userData.avatar + "')"; DOMUserDetailAvatar.style.backgroundImage = "url('" + userData.avatar + "')";
...@@ -39,4 +46,8 @@ function UserDetailLoad(userId) { ...@@ -39,4 +46,8 @@ function UserDetailLoad(userId) {
console.error(error); console.error(error);
NavigateToSection(6); NavigateToSection(6);
}); });
}
function UserDetailReport() {
shell.openExternal("https://spinsha.re/report/user/" + currentUserId);
} }
\ No newline at end of file
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
"userdetail.uploaded.header": "Hochgeladene Songs", "userdetail.uploaded.header": "Hochgeladene Songs",
"userdetail.uploaded.noresults": "Dieser Nutzer hat noch keine Songs hochgeladen.", "userdetail.uploaded.noresults": "Dieser Nutzer hat noch keine Songs hochgeladen.",
"userdetail.actions.reportButton": "Melden",
"settings.general.header": "SpinShare", "settings.general.header": "SpinShare",
"settings.general.version.label": "Version", "settings.general.version.label": "Version",
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
"userdetail.uploaded.header": "Uploaded Songs", "userdetail.uploaded.header": "Uploaded Songs",
"userdetail.uploaded.noresults": "This user did not upload any songs yet.", "userdetail.uploaded.noresults": "This user did not upload any songs yet.",
"userdetail.actions.reportButton": "Report",
"settings.general.header": "SpinShare", "settings.general.header": "SpinShare",
"settings.general.version.label": "Version", "settings.general.version.label": "Version",
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
"userdetail.uploaded.header": "Canciones Subidas", "userdetail.uploaded.header": "Canciones Subidas",
"userdetail.uploaded.noresults": "Este usuario aún no ha subido canciones.", "userdetail.uploaded.noresults": "Este usuario aún no ha subido canciones.",
"userdetail.actions.reportButton": "Reportar",
"settings.general.header": "SpinShare", "settings.general.header": "SpinShare",
"settings.general.version.label": "Versión", "settings.general.version.label": "Versión",
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
"userdetail.uploaded.header": "Afficher Chansons", "userdetail.uploaded.header": "Afficher Chansons",
"userdetail.uploaded.noresults": "Usager n'a pas encore affiché un chanson.", "userdetail.uploaded.noresults": "Usager n'a pas encore affiché un chanson.",
"userdetail.actions.reportButton": "Signaler",
"settings.general.header": "SpinShare", "settings.general.header": "SpinShare",
"settings.general.version.label": "Version", "settings.general.version.label": "Version",
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
"userdetail.uploaded.header": "Geüploade nummers", "userdetail.uploaded.header": "Geüploade nummers",
"userdetail.uploaded.noresults": "Deze gebruiker heeft nog geen nummers geüpload.", "userdetail.uploaded.noresults": "Deze gebruiker heeft nog geen nummers geüpload.",
"userdetail.actions.reportButton": "Rapporteren",
"settings.general.header": "SpinShare", "settings.general.header": "SpinShare",
"settings.general.version.label": "Versie", "settings.general.version.label": "Versie",
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
"userdetail.uploaded.header": "Músicas Postadas", "userdetail.uploaded.header": "Músicas Postadas",
"userdetail.uploaded.noresults": "Este usuário ainda não postou nenhuma música.", "userdetail.uploaded.noresults": "Este usuário ainda não postou nenhuma música.",
"userdetail.actions.reportButton": "Reportar",
"settings.general.header": "SpinShare", "settings.general.header": "SpinShare",
"settings.general.version.label": "Versão", "settings.general.version.label": "Versão",
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
"userdetail.uploaded.header": "Загруженные песни", "userdetail.uploaded.header": "Загруженные песни",
"userdetail.uploaded.noresults": "Этот пользователь ещё не загрузил ни одной песни.", "userdetail.uploaded.noresults": "Этот пользователь ещё не загрузил ни одной песни.",
"userdetail.actions.reportButton": "Пожаловаться",
"settings.general.header": "SpinShare", "settings.general.header": "SpinShare",
"settings.general.version.label": "Версия", "settings.general.version.label": "Версия",
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
"userdetail.uploaded.header": "SPEEN", "userdetail.uploaded.header": "SPEEN",
"userdetail.uploaded.noresults": "SPEEN", "userdetail.uploaded.noresults": "SPEEN",
"userdetail.actions.reportButton": "SPEEN",
"settings.general.header": "SPEENSHARE", "settings.general.header": "SPEENSHARE",
"settings.general.version.label": "SPEEN", "settings.general.version.label": "SPEEN",
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
"userdetail.uploaded.header": "以上传的音乐", "userdetail.uploaded.header": "以上传的音乐",
"userdetail.uploaded.noresults": "这用户还没有上传任何音乐。", "userdetail.uploaded.noresults": "这用户还没有上传任何音乐。",
"userdetail.actions.reportButton": "提交报告",
"settings.general.header": "SpinShare", "settings.general.header": "SpinShare",
"settings.general.version.label": "版本", "settings.general.version.label": "版本",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment