Skip to content

fixing issues from copying #5

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

Merged
merged 1 commit into from
Jun 14, 2020
Merged

fixing issues from copying #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
81 changes: 0 additions & 81 deletions src/components/Nav.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<script>
<<<<<<< HEAD
import { onMount } from 'svelte';
import { goto, stores } from "@sapper/app";
import { post } from "auth.js";
Expand Down Expand Up @@ -76,85 +75,5 @@
</div>
{/if}
</div>
=======
import { goto, stores } from "@sapper/app";
import { post } from "auth.js";

export let segment;

const { session } = stores();

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;
font-weight: 500;
font-size: 14px;
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;
}
}
</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>
>>>>>>> dev
</nav>
<Sidebar bind:toggle={active} />
110 changes: 0 additions & 110 deletions src/components/UI/Button.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<script>
<<<<<<< HEAD
export let type = "button";
export let mode = null;
export let href = null;
Expand Down Expand Up @@ -36,112 +35,3 @@ button:focus {
outline: none;
}
</style>
=======
export let type = "button";
export let href = null;
export let mode = null;
export let color = null;
export let disabled = false;
</script>

<style>

button {
font-family: 'Poppins', sans-serif;
font-weight: 400;
font-size: 14px;
border-radius: 4px;
border: none;
padding: 8px 16px;
text-transform: uppercase;
cursor: pointer;
}

.primary {
background-color: #117BCC;
color: #FFFFFF;
}

.primary:hover,
.primary:focus {
background: #2B95E6;
box-shadow: 0px 1px 3px rgba(43, 149, 230, 0.45);
outline: 0;
}

.primary:active {
background: #0062B3;
}

.primary:disabled,
.primary:disabled:hover,
.primary:disabled:active {
background: #E0E0E0;
color: #BDBDBD;
box-shadow: none;
cursor: not-allowed;
}

.primary-outline {
border: 1px solid #2B95E6;
background-color: #FFF;
color: #2B95E6;
}

.primary-outline:hover,
.primary-outline:focus {
border: 1px solid #0062B3;
color: #0062B3;
}

.primary-outline:active {
border: 1px solid #2B95E6;
background: #C5E0F4;
}

.primary-outline:disabled,
.primary-outline:disabled:hover,
.primary-outline:disabled:active {
background: #E0E0E0;
color: #BDBDBD;
box-shadow: none;
cursor: not-allowed;
}

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

.primary-link:hover {
color: #0c5e9c;
}

.secondary-link {
font-family: 'Poppins', sans-serif;
font-weight: 500;
font-size: 11px;
color: #9e9e9e;
text-decoration: none;
margin: 0 8px;
}

.secondary-link:hover {
color: #757575;
}

</style>

{#if href}
<a class="{color}" {href}>
<slot />
</a>
{:else}
<button class="{mode} {color}" type="{type}" on:click {disabled} >
<slot />
</button>
{/if}
>>>>>>> dev
9 changes: 0 additions & 9 deletions src/components/UI/TextInput.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,7 @@
.banned {
position: absolute;
right: 19px;
<<<<<<< HEAD
top: 29px;
=======
top: 28px;
>>>>>>> dev
height: 15px;
width: 0px;
border-bottom: 3px solid rgba(0, 0, 0, 0.38);
Expand All @@ -94,13 +90,8 @@
}

.invert {
<<<<<<< HEAD
right: 16px;
top: 30px;
=======
right: 19px;
top: 25px;
>>>>>>> dev
height: 15px;
width: 0px;
border-bottom: 6px solid #FFF;
Expand Down
25 changes: 1 addition & 24 deletions src/routes/_layout.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,7 @@
const { path } = page;

// Protected Routes
<<<<<<< HEAD
const loginRoutes = ["/dashboard", "/settings","/projects", "/accounts" , "/account"];
=======
const loginRoutes = ["/dashboard", "/settings","/projects"];
>>>>>>> dev
const loginRoutes = ["/dashboard", "/settings", "/accounts" , "/account"];
// Public Routes
const logoutRoutes = ["/login", "/register", "/forgot"];

Expand All @@ -27,27 +23,8 @@
export let segment;
</script>

<<<<<<< HEAD
<Nav {segment}/>

<main class="h-nav-mobile w-screen md:h-nav-desktop">
=======
<style>
main {
position: relative;
background: #F6F6F6;
height: calc(100vh - 49px);
width: 100%;
}

@media (min-width: 600px) {

}
</style>

<Nav {segment}/>

<main>
>>>>>>> dev
<slot></slot>
</main>
102 changes: 0 additions & 102 deletions src/routes/dashboard/index.svelte
View file
Open in desktop

This file was deleted.

Loading