From 424633631c5b2b9f98b2d94fc8bf71bb95184bf8 Mon Sep 17 00:00:00 2001 From: kipukun Date: Wed, 24 May 2017 20:20:30 -0400 Subject: [PATCH] More frontend shit (#731) * Torrent Mass Edit Api (WIP) * Torrents can be deleted in mass from frontend with api post request * Torrents status can be edited from frontend with api post request -- Look to function doc for more info on how to use it It is a WIP so it might not work =D * Finished Mass mod Api As per suggestion of @yiiTT in #720, I added: * Changing torrents category * Deletion of reports with deletion of a torrent * Changing owner of multiple torrents Commit also add some new translation strings. * Make some changes * Reports can now be cleared for the torrents selected without having to delete them * Users with no admin rights can't delete reports * Fix moveto to status moveto deprecated in api * Tested and works! Changes: * Updates only the colomns of torrent table * Moved categories config in config/torrents.go * Make sort arrows look a lot nicer * Add search icon into search input * Work on navbar, fix it on mobile view * Hide mascot on mobile views * Make torrent view work on mobile + minor improvements * Add status and various things to view * ACTUALLY FINISH VIEW PAGE * Forgot this file in last commit * wow user profile was easy * Work on profile page * remove language option * SEO improvement * forgot the fucking bracket * make description more weeb * add irony * add better irony * Update README.md * Make sort arrows look a lot nicer * Add search icon into search input * Work on navbar, fix it on mobile view * Hide mascot on mobile views * Make torrent view work on mobile + minor improvements * Add status and various things to view * ACTUALLY FINISH VIEW PAGE * wow user profile was easy * Work on profile page * remove language option * SEO improvement * forgot the fucking bracket * make description more weeb * add irony * add better irony --- public/css/g.css | 6 +-- public/css/main.css | 59 ++++++++++++++++------ public/css/tomorrow.css | 6 +-- public/img/logo_s.png | Bin 0 -> 19303 bytes public/js/main.js | 2 +- templates/_search.html | 3 +- templates/_user_list_torrents.html | 25 +++++---- templates/_user_notifications.html | 2 +- templates/home.html | 12 ++--- templates/index.html | 10 ++-- templates/user/profile_notifications.html | 6 +-- templates/view.html | 42 +++++++++++---- 12 files changed, 112 insertions(+), 61 deletions(-) create mode 100644 public/img/logo_s.png diff --git a/public/css/g.css b/public/css/g.css index cabf0240..c5893b8b 100644 --- a/public/css/g.css +++ b/public/css/g.css @@ -47,9 +47,9 @@ tr:nth-child(even) { background: hsla(198, 5%, 90%, 0.2); } td.tr-se { color: #22A243; } td.tr-le { color: #E84C4C; } -.torrent-info.aplus { background: hsla(200, 100%, 50%, 0.2) !important; } -.torrent-info.trusted { background: hsla(100, 100%, 50%, 0.2) !important; } -.torrent-info.remake { background: hsla(30, 100%, 50%, 0.2) !important; } +.aplus { background: hsla(200, 100%, 50%, 0.2) !important; } +.trusted { background: hsla(100, 100%, 50%, 0.2) !important; } +.remake { background: hsla(30, 100%, 50%, 0.2) !important; } .pagination .active { background: #cbbdd7; color: #444; } diff --git a/public/css/main.css b/public/css/main.css index 252a902d..d4e9c6a2 100644 --- a/public/css/main.css +++ b/public/css/main.css @@ -114,6 +114,11 @@ select.form-input + .select-icon { .form-input.search-box + .search-icon { margin-left: -2rem; padding: 5px 10px; + background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAsAAAALCAQAAAADpb+tAAAAjUlEQVQIHQXBoU1DYQCAwXviUQw4LHlYJAnBYQmqW3wdpkk3wLAEAxCSCkLSFSowBIFCIH7uQCfd9dgCALrvr9Fo9NopoItG21ZNLR17A/TcHqCl0RXopw1AU6MH0KEdQKtGN6B1o0ugbb/NoKmXRrs27Rt9dw5oat2hr5667r3PzgAANPfREQAAzd3yD3GyOPKUaUBTAAAAAElFTkSuQmCC") + no-repeat + center center; + border: none; + vertical-align: middle; } .header .h-user { @@ -240,7 +245,7 @@ th { border-bottom-width: 2px; } .tr-date { width: 90px; } .sort-arrows { margin-left: 0.2rem; } -.sort-arrows a { +.sort-arrows span { font-size: 100%; letter-spacing: -0.3rem; opacity: 0.4; @@ -308,6 +313,25 @@ html, body { } +@media (max-width: 810px) { + .torrent-info-row > td { + display: block; + } + .torrent-info-td { + width: 100% !important; + } + td.torrent-view-td.torrent-info-data { + padding-left: 5px; + } + .profile-main { + display: inline-grid !important; + } + .profile-panel, .profile-content { + width: 100% !important; + margin-bottom: 20px; + } +} + /* Default Theme */ @@ -369,9 +393,9 @@ tr:nth-child(even) { background: rgba(200,200,200,0.15); } td.tr-se { color: #22A243; } td.tr-le { color: #E84C4C; } -.torrent-info.aplus { background: hsla(200, 100%, 70%, 0.2); } -.torrent-info.trusted { background: hsla(100, 100%, 70%, 0.2); } -.torrent-info.remake { background: hsla(30, 100%, 70%, 0.2); } +.aplus { background: hsla(200, 100%, 70%, 0.2); } +.trusted { background: hsla(100, 100%, 70%, 0.2); } +.remake { background: hsla(30, 100%, 70%, 0.2); } .pagination .active { background: #d5d5d5; color: #222; } .pagination .disabled { color: #d5d5d5; cursor: unset; } @@ -420,6 +444,7 @@ td.tr-le { color: #E84C4C; } .torrent-hr { font-size: large; + font-weight: bold; } .torrent-info-label { @@ -454,8 +479,6 @@ td.tr-le { color: #E84C4C; } margin-left: 10px; margin-top: 10px; padding-bottom: 5px; - display: flex; - justify-content: space-between; } .comment-index { margin-right: 5px; @@ -465,15 +488,9 @@ td.tr-le { color: #E84C4C; } .torrent-buttons { display: inline-block; float: right; - margin-top: 5px; -} -.torrent-magnet-button { - background: green; - color: white; - font-size: larger; - vertical-align: bottom; - margin-right: 5px; - margin-top: 5px; + margin-top: 20px; + margin-right: 10px; + font-size: large; } .profile-panel { @@ -536,6 +553,11 @@ td.tr-le { color: #E84C4C; } .tr-filelist { --nest-level: 0; } +.caret-down-icon { + background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAsAAAALBAMAAABbgmoVAAAAIVBMVEUAAABmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmYs5FxxAAAACnRSTlMAByUqK1VzuvH9L+rg5gAAACtJREFUCFtjYEABVatWrVohwGAJpJYxMLDMWrUqASjqCeKAuAlgRaoMOAAAIO0LHGODAFsAAAAASUVORK5CYII=') + no-repeat center center; + vertical-align: middle; +} .tr-filelist td { padding: 4px 4px; white-space: nowrap; @@ -570,3 +592,10 @@ td.tr-le { color: #E84C4C; } height: 16px; display: inline-block; } + +#torrent-name { + height: 100%; + display: flex; + flex-direction: column; + font-weight: bold; +} \ No newline at end of file diff --git a/public/css/tomorrow.css b/public/css/tomorrow.css index 9fcb7dcc..ec6fda91 100644 --- a/public/css/tomorrow.css +++ b/public/css/tomorrow.css @@ -41,9 +41,9 @@ tr:nth-child(even) { background: rgba(0,0,0,0.2); } td.tr-se { color: #b5bd68; } td.tr-le { color: #cc6666; } -.torrent-info.aplus { background: hsla(180, 50%, 50%, 0.2) !important; } -.torrent-info.trusted { background: hsla(90, 50%, 50%, 0.2) !important; } -.torrent-info.remake { background: hsla(40, 50%, 50%, 0.2) !important; } +.aplus { background: hsla(180, 50%, 50%, 0.2) !important; } +.trusted { background: hsla(90, 50%, 50%, 0.2) !important; } +.remake { background: hsla(40, 50%, 50%, 0.2) !important; } .pagination .active { background: #141517; color: #c5c8c6; } .pagination .disabled { color: #141517; cursor: unset; } diff --git a/public/img/logo_s.png b/public/img/logo_s.png new file mode 100644 index 0000000000000000000000000000000000000000..e185a455c27cc6d1b85ad13408bec2c66254e958 GIT binary patch literal 19303 zcmeI4c~leU`p1LT4HPYiwhI1YR1`F1GFc~*a3MiK4IqMoie)mHfk-xz00Au4rC6=F zAh=dssECTYbpfqbucFsh6zT=HA|fi+1yPH;{w4&5fY45t^ETu&2>zy#fPdq4>AE<*$2J{NH?W?JoSQhdvtQ4gHPIDlj7lqJ)D<0P&{aw?V+v0W z$n{b*Ruzz9KqsXHg&`?%2&82ANbJ4MB3wX&nqazFqt+TlW-+5tSA^S^W)_3q=wgZ! zGkh%_(j(*{bg9mO(s^EdCc@?j=>o`$&4Yv>cN852*nAcMvDjQDz!m|J2w>BjJ`9OH zZh0G&m?%^>rl~vpe_}?g$)p#tSV>7qUP&A;ogs$Bh9HOqfGiMX;vP(6vepEfnOfrz zt4Ons3^gJKmENS%Y3UYSSfNWWi5Uz_N5rS;zBGEGBdxKC9Zr#DhV?AA7r<&SNFS>+ z>5Q?u4nm2`9SSHBqEmf>LEU(7N`!@~Q4Oj!8SyxFyB*^>k;{qDcE_vHv>RzO`6uEC znvk{|X$(u&qpVQWs7o*)sDC0pk|FKgz0nkkwq%Ed6z<-xkV%DgpkukxAw1Nq>LAQ= z#TwQ)r>v>=#-WL%1{5~w3}HH*T4J59A5v4=wDr{@s1b*3w1JPOpmAmU z!7;5{n=hzU5{}T9BL!t_HY5evQfLe)g#3N|xxNq|Ja3j|4dae2y*FjHsolCU zDRqcSDQX$D00Fotz!fkB94^3Qvjs2{LLr2S!9pIFjgtoz%0DR$aX2u9ve`@lhzP9G zLIE3OqFgQ;;DZX72XX(Tv_gPkkP@Fx0**jom4=lln+YK>if{xN2SJ5@QW_I-AXFi+ z0O9kRq!k#SiJ}|~P%0DOvzO8co36|A@~q64u>gZ^I<;B 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 h-}J2Lb@06-ZO^p<7r;l4EWd{{call $.T $name_cat }} {{ end }} + - + {{end}} diff --git a/templates/_user_list_torrents.html b/templates/_user_list_torrents.html index d5cf5737..6b1dd157 100644 --- a/templates/_user_list_torrents.html +++ b/templates/_user_list_torrents.html @@ -1,14 +1,13 @@ {{define "profile_content"}} {{with .UserProfile}} {{ if gt (len .Torrents) 0 }} -
- - - - - - - +
{{call $.T "category"}}{{call $.T "name"}}{{call $.T "date"}}{{call $.T "size"}}{{call $.T "links"}}
+ + + + + + {{ range $i, $t := .Torrents }} {{ if lt $i 16 }} @@ -18,7 +17,7 @@ {{if eq .Status 3}}trusted{{end}} {{if eq .Status 4}}aplus{{end}}"> - - - + diff --git a/templates/_user_notifications.html b/templates/_user_notifications.html index 254404c8..4b91d1c1 100644 --- a/templates/_user_notifications.html +++ b/templates/_user_notifications.html @@ -1,6 +1,6 @@ {{define "profile_notifications_content"}} {{with .User}} -
+ diff --git a/templates/home.html b/templates/home.html index 287ec571..4274324f 100644 --- a/templates/home.html +++ b/templates/home.html @@ -18,22 +18,22 @@ Your browser does not support the audio element.
- + - + {{ range .ListTorrents}} + + {{if Sukebei}}Sukebei{{else}}Nyaa{{end}} Pantsu - {{block "title" .}}{{ call $.T "error_404" }}{{end}} @@ -43,12 +45,12 @@ -
+
{{call $.T "category"}}{{call $.T "name"}}{{call $.T "date"}}{{call $.T "size"}}{{call $.T "links"}}
+ {{ if Sukebei }} @@ -32,17 +31,17 @@ {{.Name}} {{.Date}} + {{.Date}} {{ fileSize .Filesize $.T }} - +
{{if ne .TorrentLink ""}} - +
{{end}}
{{call $.T "category"}} - {{call $.T "name"}}{{ genSortArrows .URL "1" }} + {{call $.T "name"}}{{ genSortArrows .URL "1" }} {{call $.T "size"}}{{ genSortArrows .URL "4" }}{{call $.T "size"}}{{ genSortArrows .URL "4" }} - {{call $.T "S"}}{{ genSortArrows .URL "5" }} / + {{call $.T "S"}}{{ genSortArrows .URL "5" }} - {{call $.T "L"}}{{ genSortArrows .URL "6" }} / + {{call $.T "L"}}{{ genSortArrows .URL "6" }} - {{call $.T "D"}}{{ genSortArrows .URL "7" }} + {{call $.T "D"}}{{ genSortArrows .URL "7" }} {{call $.T "date"}}{{ genSortArrows .URL "2" }}{{call $.T "date"}}{{ genSortArrows .URL "2" }}
- + @@ -25,7 +29,7 @@ - + @@ -33,13 +37,33 @@
Name:{{.Name}}Category:{{ if Sukebei}}{{ call $.T (CategoryName .Category .SubCategory) }}{{else}}{{ call $.T (CategoryName .Category .SubCategory) }}{{end}}
Date:{{.Date}}
{{call $.T "leechers"}}:{{if .LastScrape.IsZero}}{{call $.T "unknown"}}{{else}}{{.Leechers}}{{end}}
{{call $.T "hash"}}:{{.Hash}}{{call $.T "hash"}}:{{.Hash}} {{call $.T "completed"}}:{{if .LastScrape.IsZero}}{{call $.T "unknown"}}{{else}}{{.Completed}}{{end}}
{{call $.T "last_scraped"}}{{if not .LastScrape.IsZero}}{{formatDateRFC .LastScrape}}{{else}}{{call $.T "unknown"}}{{end}}
-
- Magnet! - Torrent! +
+ Magnet + Torrent + {{ if gt $.User.ID 0}} + + {{ call $.T "report_btn" }} + {{end}}

{{call $.T "description"}}

{{ if ne .Description ""}} -
{{.Description}}
+
{{.Description}}
{{else}}

No description provided!

{{end}} @@ -99,8 +123,8 @@

- -
+ +

{{block "captcha" (makeCaptchaData .CaptchaID $.T)}}{{end}}