diff --git a/server/api/index.js b/server/api/index.js index 8c3c346..3dbd4da 100644 --- a/server/api/index.js +++ b/server/api/index.js @@ -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 }, removeAvatar: async function (user) { diff --git a/src/style/admin.styl b/src/style/admin.styl index a2ef71a..79c30e8 100644 --- a/src/style/admin.styl +++ b/src/style/admin.styl @@ -1,5 +1,6 @@ body margin: 0 + font-family: sans-serif nav display: block diff --git a/src/style/main.styl b/src/style/main.styl index 4d0c033..b068b21 100644 --- a/src/style/main.styl +++ b/src/style/main.styl @@ -247,6 +247,7 @@ code width: 215px height: 50px cursor: pointer + margin-left: 5px &.twitter-login background-color: #fff @@ -289,13 +290,13 @@ code vertical-align: top margin-left: 12px -.accdisconnect - margin-top: 5px - padding: 10px - background-color: #ff6c6c - color: #fff - width: 215px - border-radius: 5px + &.disconnect + margin-top: 5px + padding: 10px + background-color: #ff6c6c + color: #fff + width: 215px + border-radius: 5px span.divider color: #ddd @@ -624,6 +625,39 @@ noscript 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) section padding: 10px diff --git a/static/image/Discord-Logo-White.svg b/static/image/discord.svg similarity index 100% rename from static/image/Discord-Logo-White.svg rename to static/image/discord.svg diff --git a/static/image/rocket-chat.svg b/static/image/rocket-chat.svg new file mode 100644 index 0000000..b3ab6a5 --- /dev/null +++ b/static/image/rocket-chat.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/views/admin/layout.pug b/views/admin/layout.pug index 5051dd7..8ce5bc3 100644 --- a/views/admin/layout.pug +++ b/views/admin/layout.pug @@ -3,7 +3,6 @@ html meta(charset="utf8") meta(name="csrf-token", content=csrf) 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="/style/main.css") link(rel="stylesheet", type="text/css", href="/style/admin.css") diff --git a/views/index.pug b/views/index.pug index 80f549e..d472c7b 100644 --- a/views/index.pug +++ b/views/index.pug @@ -14,7 +14,7 @@ block body .carousel-caption.text-left h1 Welcome to Icy Network 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 img.second-slide(src="data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==", alt="Second Slide") .container diff --git a/views/layout.pug b/views/layout.pug index faa481d..8dfeb4f 100644 --- a/views/layout.pug +++ b/views/layout.pug @@ -29,7 +29,6 @@ html 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="/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") script(src="/script/main.js") block cookieconsent @@ -91,19 +90,21 @@ html block body block footer //FOOTER - footer.container - 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 + footer.container.mb-4 p |© 2017-2018 Icy Network - | · - a(href="/docs/terms-of-service") Terms - | · - a(href="/docs/privacy-policy") Privacy - | · - a(href="/donate") Donate + span.float-sm-right.ml-4 + a(href="/docs/terms-of-service") Terms + | · + a(href="/docs/privacy-policy") Privacy + | · + 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 diff --git a/views/news/article.pug b/views/news/article.pug index 8b77a82..87d8ab3 100644 --- a/views/news/article.pug +++ b/views/news/article.pug @@ -30,9 +30,9 @@ block body else nav(aria-label="breadcrumb") ol.breadcrumb - li.breadcrumb-item + li.breadcrumb-item a(href="/") Home - li.breadcrumb-item + li.breadcrumb-item a(href="/news") News li.breadcrumb-item.active(aria-current="page")= article.title diff --git a/views/news/composer.pug b/views/news/composer.pug index d25a02b..ff89393 100644 --- a/views/news/composer.pug +++ b/views/news/composer.pug @@ -10,9 +10,9 @@ block body .container.mt-4.mb-4 nav(aria-label="breadcrumb") ol.breadcrumb - li.breadcrumb-item + li.breadcrumb-item a(href="/") Home - li.breadcrumb-item + li.breadcrumb-item a(href="/news") News li.breadcrumb-item.active(aria-current="page") Compose if message.text diff --git a/views/news/news.pug b/views/news/news.pug index a931c2a..95a73c5 100644 --- a/views/news/news.pug +++ b/views/news/news.pug @@ -10,7 +10,7 @@ block body .container.mt-4 nav(aria-label="breadcrumb") ol.breadcrumb - li.breadcrumb-item + li.breadcrumb-item a(href="/") Home li.breadcrumb-item.active(aria-current="page") News diff --git a/views/redirect.pug b/views/redirect.pug index 1972a2e..9732327 100644 --- a/views/redirect.pug +++ b/views/redirect.pug @@ -3,13 +3,11 @@ block title |Icy Network - Redirecting block body - .wrapper - .boxcont - .box#totpcheck - h1 Redirecting - p Please wait.. - script. - window.close() - setTimeout(function () { - window.location.href = '#{url}' - }, 1000) + .container + h1 Redirecting + p Please wait.. + script. + window.close() + setTimeout(function () { + window.location.href = '#{url}' + }, 1000) diff --git a/views/user/email_change.pug b/views/user/email_change.pug index d629f52..d7f72ab 100644 --- a/views/user/email_change.pug +++ b/views/user/email_change.pug @@ -6,9 +6,9 @@ block body .container.mt-4.mb-4 nav(aria-label="breadcrumb") ol.breadcrumb - li.breadcrumb-item + li.breadcrumb-item a(href="/") Home - li.breadcrumb-item + li.breadcrumb-item a(href="/user/manage") User Settings li.breadcrumb-item.active(aria-current="page") Change Email Address h1 Change Your Email Address diff --git a/views/user/password_new.pug b/views/user/password_new.pug index 0333b4b..89ce649 100644 --- a/views/user/password_new.pug +++ b/views/user/password_new.pug @@ -7,9 +7,9 @@ block body if user nav(aria-label="breadcrumb") ol.breadcrumb - li.breadcrumb-item + li.breadcrumb-item a(href="/") Home - li.breadcrumb-item + li.breadcrumb-item a(href="/user/manage") User Settings li.breadcrumb-item.active(aria-current="page") Change Password h1 Change Your Password diff --git a/views/user/reset_password.pug b/views/user/reset_password.pug index 854a1d5..2f8c698 100644 --- a/views/user/reset_password.pug +++ b/views/user/reset_password.pug @@ -3,21 +3,20 @@ block title |Icy Network - Reset Password block body - .wrapper - .boxcont - .box#totpcheck - h1 Reset your password - p Enter your email below in order to reset your password. - if message.text - if message.error - .message.error - span #{message.text} - else - .message - span #{message.text} - if !sent - form#loginForm(method="POST", action=post) - input(type="hidden", name="csrf", value=csrf) - label(for="email") Email Address - input(type="email", name="email", id="email") - input(type="submit", value="Continue") + .container.mt-4.mb-4 + h1 Reset your password + p Enter your email below in order to reset your password. + if message.text + if message.error + .alert.alert-danger + span #{message.text} + else + .alert.alert-info + span #{message.text} + if !sent + form#loginForm(method="POST", action=post) + input(type="hidden", name="csrf", value=csrf) + .form-group + label(for="email") Email Address + input.form-control#email(type="email", name="email") + button.btn.btn-primary(type="submit") Continue diff --git a/views/user/settings.pug b/views/user/settings.pug index 7447cb6..d23eba6 100644 --- a/views/user/settings.pug +++ b/views/user/settings.pug @@ -10,7 +10,7 @@ block body .container.mt-4.mb-4 nav(aria-label="breadcrumb") ol.breadcrumb - li.breadcrumb-item + li.breadcrumb-item a(href="/") Home li.breadcrumb-item.active(aria-current="page") User Settings h1 User Settings @@ -32,7 +32,7 @@ block body .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#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 .col-9 .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. include ../includes/external.pug 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 |Unlink Google 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 |Unlink Twitter 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 |Unlink Facebook 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 |Unlink Discord .tab-pane.fade#v-pills-oauth2(role="tabpanel", aria-labelledby="v-pills-oauth2") diff --git a/views/user/totp-check.pug b/views/user/totp-check.pug index da2477a..f73287f 100644 --- a/views/user/totp-check.pug +++ b/views/user/totp-check.pug @@ -3,7 +3,7 @@ block title |Icy Network - Log In - Verification Required block body - .container + .container.mt-4.mb-4 h1 Enter Code p This user has Two Factor Authentication enabled. Enter the code to log in. if message.text diff --git a/views/user/totp.pug b/views/user/totp.pug index 03a332a..1e34c50 100644 --- a/views/user/totp.pug +++ b/views/user/totp.pug @@ -3,12 +3,12 @@ block title |Icy Network - Activate Authenticator block body - .container.mt-5.mb-5 + .container.mt-4.mb-4 nav(aria-label="breadcrumb") ol.breadcrumb - li.breadcrumb-item + li.breadcrumb-item a(href="/") Home - li.breadcrumb-item + li.breadcrumb-item a(href="/user/manage") User Settings li.breadcrumb-item.active(aria-current="page") Enable Two Factor Authentication h1 Two Factor Authentication