Skip to content

Enhancement/token available #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Enhancement/token available #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16d8b61
token available in client
silvestrevivo May 11, 2020
419961b
links on navigation changing with session
silvestrevivo May 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
188 changes: 123 additions & 65 deletions src/components/Nav.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,80 +1,138 @@
<script>
import { goto, stores } from "@sapper/app";
import { post } from "auth.js";
import { goto, stores } from "@sapper/app";
import { post } from "auth.js";

export let segment;
export let segment;

const { session } = stores();
const { session } = stores();

async function logout() {
await post(`auth/logout`);
$session.user = null;
goto("/");
}

async function logout() {
await post(`auth/logout`);
$session.user = null;
goto("/");
}
</script>

<style>
nav, ul {
display: flex;
}
nav {
flex-direction: column;
align-self: center;
}
ul {
justify-content: center;
list-style-type: none;
padding: 0;
}
li {
margin: auto 1rem;
}
.logo {
display: none;
justify-content: center;
width: 120px;
margin: 1rem auto 0;
}

.primary-link {
font-family: 'Poppins', sans-serif;
nav,
ul {
display: flex;
}
nav {
flex-direction: column;
align-self: center;
}
ul {
justify-content: center;
list-style-type: none;
padding: 0;
}
li {
margin: auto 1rem;
}
.logo {
display: none;
justify-content: center;
width: 120px;
margin: 1rem auto 0;
}

.primary-link {
font-family: "Poppins", sans-serif;
font-weight: 500;
font-size: 14px;
color: #117BCC;
text-decoration: none;
color: #117bcc;
text-decoration: none;
}

.primary-link:hover {
color: #0c5e9c;
text-decoration: underline;
}
@media (min-width: 769px) {
nav {
flex-direction: row;
justify-content: space-between;
}
.logo {
margin-top: 0;
align-self: center;
margin-left: 2rem;
}
}
.primary-link:hover {
color: #0c5e9c;
text-decoration: underline;
}
@media (min-width: 769px) {
nav {
flex-direction: row;
justify-content: space-between;
}
.logo {
margin-top: 0;
align-self: center;
margin-left: 2rem;
}
}
</style>

<nav>
<img class="logo" src="https://picsum.photos/seed/picsum/100/50" alt="Project Login Logo" loading="lazy" width="120">
<ul>
<li><a class="primary-link" aria-current='{segment === undefined ? "page" : undefined}' href='.'>home</a></li>
{#if !$session.user}
<li><a class="primary-link" aria-current='{segment === "register" ? "page" : undefined}' href='register'>Register</a></li>
<li><a class="primary-link" aria-current='{segment === "login" ? "page" : undefined}' href='login'>Login</a></li>
<li><a class="primary-link" aria-current='{segment === "forgot" ? "page" : undefined}' href='forgot'>Forgot</a></li>
{/if}
{#if $session.user}
<li><a class="primary-link" aria-current='{segment === "dashboard" ? "page" : undefined}' href='dashboard'>Dashboard</a></li>
<li><a class="primary-link" aria-current='{segment === "projects" ? "page" : undefined}' href='projects'>Projects</a></li>
<li><a class="primary-link" aria-current='{segment === "logout" ? "page" : undefined}' href='.' on:click={logout}>Logout</a></li>
{/if}
</ul>
<img
class="logo"
src="https://picsum.photos/seed/picsum/100/50"
alt="Project Login Logo"
loading="lazy"
width="120" />
<ul>
<li>
<a
class="primary-link"
aria-current={segment === undefined ? 'page' : undefined}
href=".">
home
</a>
</li>
{#if !$session.user}
<li>
<a
class="primary-link"
aria-current={segment === 'register' ? 'page' : undefined}
href="register">
Register
</a>
</li>
<li>
<a
class="primary-link"
aria-current={segment === 'login' ? 'page' : undefined}
href="login">
Login
</a>
</li>
<li>
<a
class="primary-link"
aria-current={segment === 'forgot' ? 'page' : undefined}
href="forgot">
Forgot
</a>
</li>
{/if}
{#if $session.user}
<li>
<a
class="primary-link"
aria-current={segment === 'dashboard' ? 'page' : undefined}
href="dashboard">
Dashboard
</a>
</li>
<li>
<a
class="primary-link"
aria-current={segment === 'projects' ? 'page' : undefined}
href="projects"
rel="prefetch">
<!-- please, look at the rel="prefetch". This is responsible of the preload
when you hover on the link -->
Projects
</a>
</li>
<li>
<a
class="primary-link"
aria-current={segment === 'logout' ? 'page' : undefined}
href="."
on:click={logout}>
Logout
</a>
</li>
{/if}
</ul>
</nav>
4 changes: 2 additions & 2 deletions src/node_modules/api.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/routes/auth/login.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export function post(req, res) {
const user = req.body;

api.post('auth/login', user ).then(response => {
if (response.user) req.session.user = response.user;
if (response.user) req.session.user = response.user; req.session.token = response.token;
res.end(JSON.stringify(response));
});
}
Expand Down
Loading