IcyNetwork/IcyNet.eu
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More changes, footer alignment

Browse Source
This commit is contained in:
Evert Prants 2018-02-07 19:03:57 +02:00
parent 9036d057e6
commit da43cd59aa
Signed by: evert
GPG Key ID: 1688DA83D222D0B5
18 changed files with 127 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/api/index.js
View File

@ -201,7 +201,7 @@ const API = {
} }
} }
let u = await API.User.update(user, {avatar_file: fileName}) await API.User.update(user, {avatar_file: fileName})
return fileName return fileName
}, },
removeAvatar: async function (user) { removeAvatar: async function (user) {

1
src/style/admin.styl
View File

@ -1,5 +1,6 @@
body body
margin: 0 margin: 0
font-family: sans-serif
nav nav
display: block display: block

48
src/style/main.styl
View File

@ -247,6 +247,7 @@ code
width: 215px width: 215px
height: 50px height: 50px
cursor: pointer cursor: pointer
margin-left: 5px
&.twitter-login &.twitter-login
background-color: #fff background-color: #fff
@ -289,13 +290,13 @@ code
vertical-align: top vertical-align: top
margin-left: 12px margin-left: 12px
.accdisconnect &.disconnect
margin-top: 5px margin-top: 5px
padding: 10px padding: 10px
background-color: #ff6c6c background-color: #ff6c6c
color: #fff color: #fff
width: 215px width: 215px
border-radius: 5px border-radius: 5px
span.divider span.divider
color: #ddd color: #ddd
@ -624,6 +625,39 @@ noscript
width: 100vw !important width: 100vw !important
min-width: 100vw !important min-width: 100vw !important
.btn-social
width: 28px
height: 28px
display: block
line-height: 28px
color: #fff
font-size: 120%
border-radius: 100px
padding: 0 2px
margin: 5px
&#github
background-color: #000
&#twitter
background-color: #03a9f4
&#discord
background-color: #2C2F33
padding: 3px
span
background: url("/static/image/discord.svg")
background-size: contain
width: 22px
height: 22px
display: block
&#rocket-chat
background-color: #eee
padding: 3px
span
background: url("/static/image/rocket-chat.svg")
background-size: contain
width: 22px
height: 22px
display: block
@media all and (max-width: 500px) @media all and (max-width: 500px)
section section
padding: 10px padding: 10px

0
static/image/Discord-Logo-White.svg → static/image/discord.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

23
static/image/rocket-chat.svg Normal file
View File

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_5" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
<path fill="#CC3333" d="M491.3,255.3c0-24.1-7.2-47.2-21.4-68.7c-12.8-19.3-30.7-36.4-53.2-50.7c-43.5-27.8-100.6-43.1-160.9-43.1 c-20.1,0-40,1.7-59.2,5.1c-11.9-11.2-25.9-21.2-40.7-29.2c-79-38.3-144.6-0.9-144.6-0.9s60.9,50.1,51,93.9c-27.3,27-42,59.6-42,93.6 c0,0.1,0,0.2,0,0.3c0,0.1,0,0.2,0,0.3c0,33.9,14.8,66.6,42,93.6c9.9,43.9-51,93.9-51,93.9s65.5,37.4,144.6-0.9 c14.8-8,28.8-18,40.7-29.2c19.2,3.4,39.1,5.1,59.2,5.1c60.3,0,117.4-15.3,160.9-43.1c22.5-14.4,40.4-31.5,53.2-50.7 c14.2-21.5,21.4-44.6,21.4-68.7c0-0.1,0-0.2,0-0.3C491.3,255.6,491.3,255.4,491.3,255.3z"/>
<path fill="#FFFFFF" d="M255.9,124.2c113.9,0,206.3,59,206.3,131.8c0,72.8-92.4,131.8-206.3,131.8c-25.4,0-49.7-2.9-72.1-8.3 c-22.8,27.4-73,65.6-121.7,53.3c15.9-17,39.4-45.8,34.3-93.2c-29.2-22.7-46.8-51.8-46.8-83.5C49.6,183.2,142,124.2,255.9,124.2"/>
<g>
<g>
<circle fill="#CC3333" cx="255.9" cy="256" r="27.4"/>
</g>
<g>
<circle fill="#CC3333" cx="351.2" cy="256" r="27.4"/>
</g>
<g>
<circle fill="#CC3333" cx="160.6" cy="256" r="27.4"/>
</g>
</g>
<g>
<path fill="#CCCCCC" d="M255.8,372.8c-25.4,0-56.2-4.9-78.7-9.5c-20.1,21-53.7,52.7-99.6,50.3c-5.7,8.6-10.2,13.5-15.5,19.2 c48.7,12.3,98.9-25.8,121.7-53.3c22.4,5.4,46.7,8.3,72.1,8.3c113,0,204.8-58.1,206.3-130C460.7,320.1,368.8,372.8,255.8,372.8z"/>
<path fill="none" stroke="#000000" stroke-miterlimit="10" d="M172,350.9"/>
<path fill="none" stroke="#000000" stroke-miterlimit="10" d="M200.4,422.9"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

1
views/admin/layout.pug
View File

@ -3,7 +3,6 @@ html
meta(charset="utf8") meta(charset="utf8")
meta(name="csrf-token", content=csrf) meta(name="csrf-token", content=csrf)
block links block links
link(rel="stylesheet", type="text/css", href="https://fonts.googleapis.com/css?family=Open+Sans")
link(rel="stylesheet", type="text/css", href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css") link(rel="stylesheet", type="text/css", href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css")
link(rel="stylesheet", type="text/css", href="/style/main.css") link(rel="stylesheet", type="text/css", href="/style/main.css")
link(rel="stylesheet", type="text/css", href="/style/admin.css") link(rel="stylesheet", type="text/css", href="/style/admin.css")

2
views/index.pug
View File

@ -14,7 +14,7 @@ block body
.carousel-caption.text-left .carousel-caption.text-left
h1 Welcome to Icy Network h1 Welcome to Icy Network
p Icy Network is a Global Network of Communities and Websites, United by a Single Login p Icy Network is a Global Network of Communities and Websites, United by a Single Login
a.btn.btn-lg.btn-primary(href="#" role="button") Learn More //a.btn.btn-lg.btn-primary(href="#" role="button") Learn More
.carousel-item .carousel-item
img.second-slide(src="data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==", alt="Second Slide") img.second-slide(src="data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==", alt="Second Slide")
.container .container

31
views/layout.pug
View File

@ -29,7 +29,6 @@ html
block links block links
link(rel="stylesheet", type="text/css", href="//maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css") link(rel="stylesheet", type="text/css", href="//maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css")
link(rel="stylesheet", type="text/css", href="/style/main.css") link(rel="stylesheet", type="text/css", href="/style/main.css")
link(rel="stylesheet", type="text/css", href="//fonts.googleapis.com/css?family=Open+Sans")
link(rel="stylesheet", type="text/css", href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css") link(rel="stylesheet", type="text/css", href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css")
script(src="/script/main.js") script(src="/script/main.js")
block cookieconsent block cookieconsent
@ -91,19 +90,21 @@ html
block body block body
block footer block footer
//FOOTER //FOOTER
footer.container footer.container.mb-4
p.float-right
a.socialbtn#github(href="https://github.com/IcyNet/" target="_blank")
i.fa.fa-fw.fa-github
a.socialbtn#twitter(href="https://twitter.com/IcyNet" target="_blank")
i.fa.fa-fw.fa-twitter
a.socialbtn#discord(href="https://discord.gg/Xe7MKSx" target="_blank")
span.discordlogo
p p
|&copy; 2017-2018 Icy Network |&copy; 2017-2018 Icy Network
| · span.float-sm-right.ml-4
a(href="/docs/terms-of-service") Terms a(href="/docs/terms-of-service") Terms
| · | ·
a(href="/docs/privacy-policy") Privacy a(href="/docs/privacy-policy") Privacy
| · | ·
a(href="/donate") Donate a(href="/donate") Donate
.d-flex.justify-content-center
a.btn-social#github(href="https://github.com/IcyNet/" target="_blank")
i.fa.fa-fw.fa-github
a.btn-social#twitter(href="https://twitter.com/IcyNet" target="_blank")
i.fa.fa-fw.fa-twitter
a.btn-social#discord(href="https://discord.gg/Xe7MKSx" target="_blank")
span
a.btn-social#rocket-chat(href="https://chat.icynet.eu" target="_blank")
span

18
views/redirect.pug
View File

@ -3,13 +3,11 @@ block title
|Icy Network - Redirecting |Icy Network - Redirecting
block body block body
.wrapper .container
.boxcont h1 Redirecting
.box#totpcheck p Please wait..
h1 Redirecting script.
p Please wait.. window.close()
script. setTimeout(function () {
window.close() window.location.href = '#{url}'
setTimeout(function () { }, 1000)
window.location.href = '#{url}'
}, 1000)

35
views/user/reset_password.pug
View File

@ -3,21 +3,20 @@ block title
|Icy Network - Reset Password |Icy Network - Reset Password
block body block body
.wrapper .container.mt-4.mb-4
.boxcont h1 Reset your password
.box#totpcheck p Enter your email below in order to reset your password.
h1 Reset your password if message.text
p Enter your email below in order to reset your password. if message.error
if message.text .alert.alert-danger
if message.error span #{message.text}
.message.error else
span #{message.text} .alert.alert-info
else span #{message.text}
.message if !sent
span #{message.text} form#loginForm(method="POST", action=post)
if !sent input(type="hidden", name="csrf", value=csrf)
form#loginForm(method="POST", action=post) .form-group
input(type="hidden", name="csrf", value=csrf) label(for="email") Email Address
label(for="email") Email Address input.form-control#email(type="email", name="email")
input(type="email", name="email", id="email") button.btn.btn-primary(type="submit") Continue
input(type="submit", value="Continue")

10
views/user/settings.pug
View File

@ -32,7 +32,7 @@ block body
.nav.flex-column.nav-pills#v-pills-tab(role="tablist", aria-orientation="vertical") .nav.flex-column.nav-pills#v-pills-tab(role="tablist", aria-orientation="vertical")
a.nav-link.active#v-pills-main-tab(data-toggle="tab", href="#v-pills-main", role="tab", aria-control="v-pills-main", aria-selected="true") General Settings a.nav-link.active#v-pills-main-tab(data-toggle="tab", href="#v-pills-main", role="tab", aria-control="v-pills-main", aria-selected="true") General Settings
a.nav-link#v-pills-social-tab(data-toggle="tab", href="#v-pills-social", role="tab", aria-control="v-pills-social", aria-selected="false") Social Accounts a.nav-link#v-pills-social-tab(data-toggle="tab", href="#v-pills-social", role="tab", aria-control="v-pills-social", aria-selected="false") Social Accounts
a.nav-link#v-pills-oauth2-tab(data-toggle="tab", href="#v-pills-oauth2", role="tab", aria-control="v-pills-oauth2", aria-selected="false") OAuth2 Authorizations a.nav-link#v-pills-oauth2-tab(data-toggle="tab", href="#v-pills-oauth2", role="tab", aria-control="v-pills-oauth2", aria-selected="false") Authorizations
a.nav-link#v-pills-actions-tab(data-toggle="tab", href="#v-pills-actions", role="tab", aria-control="v-pills-actions", aria-selected="false") Account Actions a.nav-link#v-pills-actions-tab(data-toggle="tab", href="#v-pills-actions", role="tab", aria-control="v-pills-actions", aria-selected="false") Account Actions
.col-9 .col-9
.tab-content#v-pills-tabContent .tab-content#v-pills-tabContent
@ -66,19 +66,19 @@ block body
p You can add social media accounts to your account for ease of login. Once added, logging in from linked sources logs you into this account automatically. p You can add social media accounts to your account for ease of login. Once added, logging in from linked sources logs you into this account automatically.
include ../includes/external.pug include ../includes/external.pug
if google_auth == false if google_auth == false
a.option.accdisconnect(href="/api/external/google/remove") a.option.disconnect.login-btn.float-lg-right(href="/api/external/google/remove")
i.fa.fa-fw.fa-times i.fa.fa-fw.fa-times
|Unlink Google |Unlink Google
if twitter_auth == false if twitter_auth == false
a.option.accdisconnect(href="/api/external/twitter/remove") a.option.disconnect.login-btn.float-lg-right(href="/api/external/twitter/remove")
i.fa.fa-fw.fa-times i.fa.fa-fw.fa-times
|Unlink Twitter |Unlink Twitter
if facebook_auth == false if facebook_auth == false
a.option.accdisconnect(href="/api/external/facebook/remove") a.option.disconnect.login-btn.float-lg-right(href="/api/external/facebook/remove")
i.fa.fa-fw.fa-times i.fa.fa-fw.fa-times
|Unlink Facebook |Unlink Facebook
if discord_auth == false if discord_auth == false
a.option.accdisconnect(href="/api/external/discord/remove") a.option.disconnect.login-btn.float-lg-right(href="/api/external/discord/remove")
i.fa.fa-fw.fa-times i.fa.fa-fw.fa-times
|Unlink Discord |Unlink Discord
.tab-pane.fade#v-pills-oauth2(role="tabpanel", aria-labelledby="v-pills-oauth2") .tab-pane.fade#v-pills-oauth2(role="tabpanel", aria-labelledby="v-pills-oauth2")

2
views/user/totp-check.pug
View File

@ -3,7 +3,7 @@ block title
|Icy Network - Log In - Verification Required |Icy Network - Log In - Verification Required
block body block body
.container .container.mt-4.mb-4
h1 Enter Code h1 Enter Code
p This user has Two Factor Authentication enabled. Enter the code to log in. p This user has Two Factor Authentication enabled. Enter the code to log in.
if message.text if message.text

2
views/user/totp.pug
View File

@ -3,7 +3,7 @@ block title
|Icy Network - Activate Authenticator |Icy Network - Activate Authenticator
block body block body
.container.mt-5.mb-5 .container.mt-4.mb-4
nav(aria-label="breadcrumb") nav(aria-label="breadcrumb")
ol.breadcrumb ol.breadcrumb
li.breadcrumb-item li.breadcrumb-item