Skip to content

Commit 459e7eb

Browse files
updated header and routing
1 parent 867ff59 commit 459e7eb

File tree

2 files changed

+33
-26
lines changed

2 files changed

+33
-26
lines changed

JavaScriptWorld/src/App.vue

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,37 @@
11
<template>
2-
<div class="container">
3-
<Header />
4-
<div class="row">
5-
<div class="col">
2+
<header>
3+
<Header />
4+
</header>
5+
<main class="container flex flex-col-reverse md:flex-row items-center px-1 mx-auto mt-1 space-y-0 md:space-y-0">
6+
<aside class="flex flex-col mb-32 space-y-1 md:w-1/2">
67
<TreeView />
7-
</div>
8-
<div class="col">
9-
<Article />
10-
</div>
11-
</div>
12-
<Footer />
13-
</div>
8+
</aside>
9+
<article class="flex flex-col mb-32 space-y-12 md:w-1/2">
10+
<router-view></router-view>
11+
</article>
12+
</main>
13+
<footer>
14+
<Footer />
15+
</footer>
1416
</template>
1517

1618
<script>
17-
import TreeView from "./components/TreeView.vue";
18-
import Article from './components/Article.vue';
19-
import Footer from "./components/layouts/Footer.vue";
20-
import Header from "./components/layouts/Header.vue";
19+
import TreeView from './components/TreeView.vue';
20+
import Footer from './components/layouts/Footer.vue';
21+
import Header from './components/layouts/Header.vue';
2122
2223
export default {
2324
components: {
2425
TreeView,
25-
Article,
2626
Footer,
27-
Header,
28-
}
27+
Header
28+
}
2929
};
3030
</script>
3131

3232
<style>
3333
@import url("https://fonts.googleapis.com/css2?family=Acme&display=swap");
34+
@import url('https://fonts.googleapis.com/css2?family=Open+Sans&display=swap');
3435
3536
* {
3637
box-sizing: border-box;
@@ -39,11 +40,10 @@ export default {
3940
}
4041
4142
body {
42-
font-family: "Courier New", Courier, monospace;
43+
font-family: 'Open Sans', sans-serif;
4344
font-size: 16px;
4445
color: black;
45-
height: 100vh;
4646
background: white;
47-
padding: 10px;
47+
padding: 20px;
4848
}
4949
</style>

JavaScriptWorld/src/components/layouts/Header.vue

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,25 @@
1414
</div>
1515
<div class="hidden md:flex justify-between m-3 p-2 items-center bg-slate-100 md:justify-start md:space-x-10">
1616
<div class="hidden md:flex items-center space-x-10 justify-start lg:w-0 lg:flex-1">
17-
<a href="#" class="text-slate-700 font-semibold hover:text-blue-500">REFRESH</a>
17+
<a href="#" class="text-slate-700 font-semibold hover:text-blue-500"> REFRESH </a>
1818
<a href="#" class="text-slate-700 font-semibold hover:text-blue-500">
19-
<router-link to="/statistics">STATISTICS</router-link>
19+
<router-link to="/statistics"> STATISTICS </router-link>
20+
</a>
21+
<a href="#" class="text-slate-700 font-semibold hover:text-blue-500">
22+
<router-link to="/about"> ABOUT </router-link>
23+
</a>
24+
<a href="#" class="text-blue-500 font-semibold">
25+
<router-link to="/login"> LOG IN </router-link>
26+
</a>
27+
<a href="#" class="flex-row-reverse bg-blue-400 text-white font-semibold px-5 py-1 border-indigo-50 rounded-full shadow-xl hover:bg-blue-500">
28+
<router-link to="/register"> SIGN UP </router-link>
2029
</a>
21-
<a href="#" class="text-slate-700 font-semibold hover:text-blue-500">ABOUT</a>
22-
<a href="#" class="flex-row-reverse bg-blue-400 text-white font-semibold px-5 py-1 border-indigo-50 rounded-full shadow-xl hover:bg-blue-500">LOG IN</a>
2330
</div>
2431
<div class="hidden md:flex justify-end space-x-10 bg-slate-100 items-center md:flex-1 lg:w-0">
2532
<form>
2633
<input type="search" placeholder="Search in articles" aria-label="Search" class="bg-white text-slate-500 font-light px-5 py-1 border border-gray-100 rounded-l-full shadow-xl" />
2734
<button class="bg-white text-slate-500 font-light px-5 py-1 baseline border border-gray-100 rounded-r-full shadow-xl hover:bg-gray-100" type="submit">
28-
Search
35+
SEARCH
2936
</button>
3037
</form>
3138
</div>

0 commit comments

Comments
 (0)