Skip to content

Commit 1798f95

Browse files
committed
Merge branch 'feature/delete-pod' of github.com:solid/node-solid-server into feature/delete-pod
2 parents 690173d + b9fb76a commit 1798f95

File tree

2 files changed

+31
-30
lines changed

2 files changed

+31
-30
lines changed

common/css/server.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
.hidden {
2+
display: none;
3+
}
4+
15
.panel-login-tls,
26
.panel-already-registered{
37
text-align: center;

default-templates/new-account/index.html

Lines changed: 27 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
</div>
2121
</nav>
2222

23-
2423
<p class="lead">
2524
<span>
2625
This is a public homepage of {{#if name}}{{name}}, whose WebID is{{else}}a user with WebID{{/if}}
@@ -54,46 +53,44 @@ <h1>Apps</h1>
5453
</a>
5554
</div>
5655
</section>
57-
<section class="row">
58-
<div class="col-md-12">
59-
<h1>Settings</h1>
60-
<div class="list-group">
61-
<a href="/account/delete/" class="list-group-item">
62-
<span class="lead">Delete account</span>
63-
</a>
64-
</div>
65-
</div>
66-
</section>
67-
<section class="row">
68-
<div class="col-md-12">
69-
<h1>Settings</h1>
70-
<div class="list-group">
71-
<a href="/account/delete/" class="list-group-item">
72-
<span class="lead">Delete account</span>
73-
</a>
74-
</div>
56+
57+
<section class="hidden" id="account-settings">
58+
<h1>Account settings</h1>
59+
<div class="list-group">
60+
<a href="/account/delete/" class="list-group-item">
61+
<span class="lead">Delete account</span>
62+
</a>
7563
</div>
7664
</section>
7765
</div>
7866

7967
<script src="/common/js/solid-auth-client.bundle.js"></script>
8068
<script type="text/javascript">
8169
(function () {
82-
'use strict'
83-
var button = document.getElementById('session-action')
84-
var loggedIn = false
70+
'use strict';
71+
var button = document.getElementById('session-action');
72+
var loggedIn = false;
73+
var accountSettings = document.getElementById('account-settings');
8574

86-
solid.auth.trackSession(session => {
87-
loggedIn = !!session
88-
button.innerText = loggedIn ? 'Log out' : 'Log in'
75+
solid.auth.trackSession(function(session) {
76+
loggedIn = !!session;
77+
button.innerText = loggedIn ? 'Log out' : 'Log in';
8978
button.classList.remove('btn-default');
90-
button.classList.add(loggedIn ? 'btn-danger' : 'btn-primary')
91-
})
79+
button.classList.add(loggedIn ? 'btn-danger' : 'btn-primary');
80+
var sessionOrigin = getOriginFromWebId(session.webId);
81+
var isOwner = sessionOrigin === location.origin;
82+
accountSettings.classList.toggle('hidden', !isOwner);
83+
});
9284

9385
button.addEventListener('click', function () {
94-
loggedIn ? solid.auth.logout() : solid.auth.popupLogin()
95-
})
96-
})()
86+
loggedIn ? solid.auth.logout() : solid.auth.popupLogin();
87+
});
88+
89+
function getOriginFromWebId(webId) {
90+
var uriParts = webId.split('/');
91+
return uriParts[0] + '//' + uriParts[2];
92+
}
93+
})();
9794
</script>
9895
</body>
9996
</html>

0 commit comments

Comments
 (0)