Browse Source

Implement base layout

ghorsington 5 years ago
parent
commit
f1ff5ced1e

+ 25 - 53
web/src/components/Nav.svelte

@@ -1,60 +1,32 @@
 <script>
-	export let segment;
+  import { stores } from "@sapper/app";
+  let { session } = stores();
+  export let segment;
 </script>
 
-<style>
-	nav {
-		border-bottom: 1px solid rgba(255,62,0,0.1);
-		font-weight: 300;
-		padding: 0 1em;
-	}
+<style lang="css">
+    .button {
+        @apply .bg-gray-800 .px-2 .py-1 .rounded-sm .font-medium;
 
-	ul {
-		margin: 0;
-		padding: 0;
-	}
+        &:hover {
+            @apply .bg-gray-700;
+        }
 
-	/* clearfix */
-	ul::after {
-		content: '';
-		display: block;
-		clear: both;
-	}
-
-	li {
-		display: block;
-		float: left;
-	}
-
-	.selected {
-		position: relative;
-		display: inline-block;
-	}
-
-	.selected::after {
-		position: absolute;
-		content: '';
-		width: calc(100% - 1em);
-		height: 2px;
-		background-color: rgb(255,62,0);
-		display: block;
-		bottom: -1px;
-	}
-
-	a {
-		text-decoration: none;
-		padding: 1em 0.5em;
-		display: block;
-	}
+        &[data-active="true"] {
+            @apply .bg-blue-800;
+        }
+    }
 </style>
 
-<nav>
-	<ul>
-		<li><a class='{segment === undefined ? "selected" : ""}' href='.'>home</a></li>
-		<li><a class='{segment === "about" ? "selected" : ""}' href='about'>about</a></li>
-
-		<!-- for the blog link, we're using rel=prefetch so that Sapper prefetches
-		     the blog data when we hover over the link or tap it on a touchscreen -->
-		<li><a rel=prefetch class='{segment === "blog" ? "selected" : ""}' href='blog'>blog</a></li>
-	</ul>
-</nav>
+<nav
+  class="w-2/12 bg-gray-800 p-2 rounded-l-sm overflow-y-auto flex flex-col"
+  role="navigation">
+  <div class="flex items-center">
+    <img alt="User Avatar" class="w-1/5 rounded-full" src="{$session.user.avatarURL}" />
+    <div class="m-2 font-bold text-gray-100">{$session.user.username}</div>
+  </div>
+  <div class="flex flex-col m-2">
+    <h2 class="text-md my-1 text-white font-bold uppercase mt-2">Features</h2>
+    <a data-active="{segment === 'contest'}" href="dashboard/contest" class="button">Contest</a>
+  </div>
+</nav>

+ 9 - 9
web/src/routes/_layout.svelte

@@ -1,16 +1,16 @@
 <script context="module">
-	export async function preload(page, session) {
-		const { user } = session;
-		if(!session.user && !page.path.startsWith("/login"))
-			return this.redirect(302, "login");
-		return { user };
-	}
+  export async function preload(page, session) {
+    const { user } = session;
+    if (!session.user && !page.path.startsWith("/login"))
+      return this.redirect(302, "login");
+    return { user };
+  }
 </script>
 
 <style global lang="css">
-	@import "../style/main.css";
+  @import "../style/main.css";
 </style>
 
 <main>
-	<slot></slot>
-</main>
+  <slot />
+</main>

+ 0 - 28
web/src/routes/blog/[slug].json.js

@@ -1,28 +0,0 @@
-import posts from './_posts.js';
-
-const lookup = new Map();
-posts.forEach(post => {
-	lookup.set(post.slug, JSON.stringify(post));
-});
-
-export function get(req, res, next) {
-	// the `slug` parameter is available because
-	// this file is called [slug].json.js
-	const { slug } = req.params;
-
-	if (lookup.has(slug)) {
-		res.writeHead(200, {
-			'Content-Type': 'application/json'
-		});
-
-		res.end(lookup.get(slug));
-	} else {
-		res.writeHead(404, {
-			'Content-Type': 'application/json'
-		});
-
-		res.end(JSON.stringify({
-			message: `Not found`
-		}));
-	}
-}

+ 0 - 64
web/src/routes/blog/[slug].svelte

@@ -1,64 +0,0 @@
-<script context="module">
-	export async function preload({ params, query }) {
-		// the `slug` parameter is available because
-		// this file is called [slug].svelte
-		const res = await this.fetch(`blog/${params.slug}.json`);
-		const data = await res.json();
-
-		if (res.status === 200) {
-			return { post: data };
-		} else {
-			this.error(res.status, data.message);
-		}
-	}
-</script>
-
-<script>
-	export let post;
-</script>
-
-<style>
-	/*
-		By default, CSS is locally scoped to the component,
-		and any unused styles are dead-code-eliminated.
-		In this page, Svelte can't know which elements are
-		going to appear inside the {{{post.html}}} block,
-		so we have to use the :global(...) modifier to target
-		all elements inside .content
-	*/
-	.content :global(h2) {
-		font-size: 1.4em;
-		font-weight: 500;
-	}
-
-	.content :global(pre) {
-		background-color: #f9f9f9;
-		box-shadow: inset 1px 1px 5px rgba(0,0,0,0.05);
-		padding: 0.5em;
-		border-radius: 2px;
-		overflow-x: auto;
-	}
-
-	.content :global(pre) :global(code) {
-		background-color: transparent;
-		padding: 0;
-	}
-
-	.content :global(ul) {
-		line-height: 1.5;
-	}
-
-	.content :global(li) {
-		margin: 0 0 0.5em 0;
-	}
-</style>
-
-<svelte:head>
-	<title>{post.title}</title>
-</svelte:head>
-
-<h1>{post.title}</h1>
-
-<div class='content'>
-	{@html post.html}
-</div>

+ 0 - 92
web/src/routes/blog/_posts.js

@@ -1,92 +0,0 @@
-// Ordinarily, you'd generate this data from markdown files in your
-// repo, or fetch them from a database of some kind. But in order to
-// avoid unnecessary dependencies in the starter template, and in the
-// service of obviousness, we're just going to leave it here.
-
-// This file is called `_posts.js` rather than `posts.js`, because
-// we don't want to create an `/blog/posts` route — the leading
-// underscore tells Sapper not to do that.
-
-const posts = [
-	{
-		title: 'What is Sapper?',
-		slug: 'what-is-sapper',
-		html: `
-			<p>First, you have to know what <a href='https://svelte.dev'>Svelte</a> is. Svelte is a UI framework with a bold new idea: rather than providing a library that you write code with (like React or Vue, for example), it's a compiler that turns your components into highly optimized vanilla JavaScript. If you haven't already read the <a href='https://svelte.dev/blog/frameworks-without-the-framework'>introductory blog post</a>, you should!</p>
-
-			<p>Sapper is a Next.js-style framework (<a href='blog/how-is-sapper-different-from-next'>more on that here</a>) built around Svelte. It makes it embarrassingly easy to create extremely high performance web apps. Out of the box, you get:</p>
-
-			<ul>
-				<li>Code-splitting, dynamic imports and hot module replacement, powered by webpack</li>
-				<li>Server-side rendering (SSR) with client-side hydration</li>
-				<li>Service worker for offline support, and all the PWA bells and whistles</li>
-				<li>The nicest development experience you've ever had, or your money back</li>
-			</ul>
-
-			<p>It's implemented as Express middleware. Everything is set up and waiting for you to get started, but you keep complete control over the server, service worker, webpack config and everything else, so it's as flexible as you need it to be.</p>
-		`
-	},
-
-	{
-		title: 'How to use Sapper',
-		slug: 'how-to-use-sapper',
-		html: `
-			<h2>Step one</h2>
-			<p>Create a new project, using <a href='https://github.com/Rich-Harris/degit'>degit</a>:</p>
-
-			<pre><code>npx degit "sveltejs/sapper-template#rollup" my-app
-			cd my-app
-			npm install # or yarn!
-			npm run dev
-			</code></pre>
-
-			<h2>Step two</h2>
-			<p>Go to <a href='http://localhost:3000'>localhost:3000</a>. Open <code>my-app</code> in your editor. Edit the files in the <code>src/routes</code> directory or add new ones.</p>
-
-			<h2>Step three</h2>
-			<p>...</p>
-
-			<h2>Step four</h2>
-			<p>Resist overdone joke formats.</p>
-		`
-	},
-
-	{
-		title: 'Why the name?',
-		slug: 'why-the-name',
-		html: `
-			<p>In war, the soldiers who build bridges, repair roads, clear minefields and conduct demolitions — all under combat conditions — are known as <em>sappers</em>.</p>
-
-			<p>For web developers, the stakes are generally lower than those for combat engineers. But we face our own hostile environment: underpowered devices, poor network connections, and the complexity inherent in front-end engineering. Sapper, which is short for <strong>S</strong>velte <strong>app</strong> mak<strong>er</strong>, is your courageous and dutiful ally.</p>
-		`
-	},
-
-	{
-		title: 'How is Sapper different from Next.js?',
-		slug: 'how-is-sapper-different-from-next',
-		html: `
-			<p><a href='https://github.com/zeit/next.js'>Next.js</a> is a React framework from <a href='https://zeit.co'>Zeit</a>, and is the inspiration for Sapper. There are a few notable differences, however:</p>
-
-			<ul>
-				<li>It's powered by <a href='https://svelte.dev'>Svelte</a> instead of React, so it's faster and your apps are smaller</li>
-				<li>Instead of route masking, we encode route parameters in filenames. For example, the page you're looking at right now is <code>src/routes/blog/[slug].html</code></li>
-				<li>As well as pages (Svelte components, which render on server or client), you can create <em>server routes</em> in your <code>routes</code> directory. These are just <code>.js</code> files that export functions corresponding to HTTP methods, and receive Express <code>request</code> and <code>response</code> objects as arguments. This makes it very easy to, for example, add a JSON API such as the one <a href='blog/how-is-sapper-different-from-next.json'>powering this very page</a></li>
-				<li>Links are just <code>&lt;a&gt;</code> elements, rather than framework-specific <code>&lt;Link&gt;</code> components. That means, for example, that <a href='blog/how-can-i-get-involved'>this link right here</a>, despite being inside a blob of HTML, works with the router as you'd expect.</li>
-			</ul>
-		`
-	},
-
-	{
-		title: 'How can I get involved?',
-		slug: 'how-can-i-get-involved',
-		html: `
-			<p>We're so glad you asked! Come on over to the <a href='https://github.com/sveltejs/svelte'>Svelte</a> and <a href='https://github.com/sveltejs/sapper'>Sapper</a> repos, and join us in the <a href='https://svelte.dev/chat'>Discord chatroom</a>. Everyone is welcome, especially you!</p>
-		`
-	}
-];
-
-posts.forEach(post => {
-	post.html = post.html.replace(/^\t{3}/gm, '');
-});
-
-export default posts;

+ 0 - 16
web/src/routes/blog/index.json.js

@@ -1,16 +0,0 @@
-import posts from './_posts.js';
-
-const contents = JSON.stringify(posts.map(post => {
-	return {
-		title: post.title,
-		slug: post.slug
-	};
-}));
-
-export function get(req, res) {
-	res.writeHead(200, {
-		'Content-Type': 'application/json'
-	});
-
-	res.end(contents);
-}

+ 0 - 34
web/src/routes/blog/index.svelte

@@ -1,34 +0,0 @@
-<script context="module">
-	export function preload({ params, query }) {
-		return this.fetch(`blog.json`).then(r => r.json()).then(posts => {
-			return { posts };
-		});
-	}
-</script>
-
-<script>
-	export let posts;
-</script>
-
-<style>
-	ul {
-		margin: 0 0 1em 0;
-		line-height: 1.5;
-	}
-</style>
-
-<svelte:head>
-	<title>Blog</title>
-</svelte:head>
-
-<h1>Recent posts</h1>
-
-<ul>
-	{#each posts as post}
-		<!-- we're using the non-standard `rel=prefetch` attribute to
-				tell Sapper to load the data for the page as soon as
-				the user hovers over the link or taps it, instead of
-				waiting for the 'click' event -->
-		<li><a rel='prefetch' href='blog/{post.slug}'>{post.title}</a></li>
-	{/each}
-</ul>

+ 35 - 23
web/src/routes/dashboard/_layout.svelte

@@ -1,28 +1,40 @@
 <script>
-    import Nav from "../../components/Nav.svelte";
-    export let segment;
+  import Nav from "../../components/Nav.svelte";
+  export let segment;
 </script>
 
+<style lang="css">
+  .frame {
+    @apply .flex w-screen h-screen .m-auto .items-center .justify-center;
 
-<section class="section">
-    <div class="container">
-        <div class="columns">
-            <div class="column is-2">
-                <nav>
-                    <div class="buttons are-small">
-                        <a class="button is-primary is-fullwidth">All</a>
-                        <a class="button is-primary is-fullwidth">Medium</a>
-                        <a class="button is-primary is-fullwidth">Size</a>
-                    </div>
-                </nav>
-            </div>
-            <div class="column">
-                Neigh
-            </div>
-        </div>
-    </div>
-</section>
+    & > div {
+      @apply .w-10/12;
+      height: calc(10 / 12 * 100%);
+    }
+  }
 
-<!-- <main>
-	<slot></slot>
-</main> -->
+  .button {
+    @apply .bg-gray-800 .px-2 .py-1 .rounded-sm .font-medium;
+
+    &:hover {
+      @apply .bg-gray-700;
+    }
+
+    &[data-active="true"] {
+      @apply .bg-blue-800;
+    }
+  }
+
+  .main-view {
+    @apply .bg-gray-700 .w-10/12 .overflow-y-auto .rounded-r-sm .p-2;
+  }
+</style>
+
+<div class="frame">
+  <div class="flex shadow-big">
+    <Nav {segment} />
+    <section class="main-view ">
+      <slot />
+    </section>
+  </div>
+</div>

+ 7 - 0
web/src/routes/dashboard/contest/index.svelte

@@ -0,0 +1,7 @@
+<svelte:head>
+  <title>Contest control</title>
+</svelte:head>
+
+<div class="content">
+  <h1>Contensts!</h1>
+</div>

+ 1 - 1
web/src/routes/dashboard/index.svelte

@@ -1,6 +1,6 @@
 
 <svelte:head>
-  <title>Loading</title>
+  <title>Dashboard</title>
 </svelte:head>
 
 <div class="content">

+ 1 - 5
web/src/routes/login/index.svelte

@@ -16,16 +16,12 @@
 </script>
 
 <style lang="css">
-  .shadow-big {
-    box-shadow: 3px 3px 10px -1px rgba(0, 0, 0, 0.75);
-  }
-
   .login-box {
     @apply .flex .flex-col .w-screen .h-screen .justify-center .items-center;
   }
 
   .box-item {
-    @apply .w-1/4 .p-2 .rounded .shadow-big;
+    @apply .w-1/4 .p-2 .rounded;
   }
 
   .login-button-list {

+ 4 - 0
web/src/style/main.css

@@ -4,4 +4,8 @@
 
 body {
     @apply .bg-gray-900 .text-white;
+}
+
+.shadow-big {
+    box-shadow: 3px 3px 10px -1px rgba(0, 0, 0, 0.75);
 }