Skip to content

Commit 1344b9d

Browse files
lidorcglidorcg
committed
- move editing back to tag page
- add bootstrap flatly - minor refactoring
1 parent d15473d commit 1344b9d

37 files changed

+10543
-1380
lines changed

‎.meteor/packages

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,6 @@ [email protected] # Leaner CSS language
2424

2525
practicalmeteor:mocha # A package for writing and running your meteor app and package tests with mocha
2626
johanbrook:publication-collector # Test a Meteor publication by collecting its output
27-
twbs:bootstrap
2827
jagi:astronomy
28+
zimme:active-route
29+
session

‎.meteor/versions

+2-1
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ [email protected]
6666
[email protected]
6767
[email protected]
6868
[email protected]
69+
[email protected]
6970
[email protected]
7071
[email protected]
7172
[email protected]
@@ -76,9 +77,9 @@ [email protected]
7677
[email protected]
7778
tmeasday:[email protected]
7879
[email protected]
79-
twbs:[email protected]
8080
[email protected]
8181
[email protected]
8282
[email protected]
8383
[email protected]
8484
[email protected]
85+
zimme:[email protected]

‎client/head.html

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
<head>
2-
<title>tags</title>
2+
<title>Nodes</title>
3+
<link href="/css/bootstrap.css" rel="stylesheet">
4+
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
5+
<script src="/js/bootstrap.min.js"></script>
36
</head>

‎client/main.less

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
@import "{}/imports/ui/stylesheets/variables.less";
2-
@import "{}/imports/ui/stylesheets/bootswatch.less";
31
@import "{}/imports/ui/stylesheets/not-found.less";
2+
// TODO: why bootstrap less doesn't work

‎imports/api/links/links.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ const Link = Class.create({
4040
},
4141
description: {
4242
type: String,
43-
default: '',
43+
default: "No description",
4444
},
4545
url: {
4646
type: String

‎imports/api/tags/tags.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const Tag = Class.create({
1515
},
1616
description: {
1717
type: String,
18-
default: ''
18+
default: "No description"
1919
},
2020
links: {
2121
type: [Mongo.ObjectID],

‎imports/startup/client/routes.js

+6-14
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,26 @@ import { BlazeLayout } from 'meteor/kadira:blaze-layout';
44
// Import needed templates
55
import '../../ui/layouts/body/body.js';
66
import '../../ui/pages/home/home.js';
7-
import '../../ui/pages/tag-page/tag-page.js';
8-
import '../../ui/pages/edit-tag-page/edit-tag-page.js';
7+
import '../../ui/pages/tag/tag.js';
98
import '../../ui/pages/not-found/not-found.js';
109

1110
// Set up all routes in the app
12-
FlowRouter.route('/tags/:_id/edit', {
13-
name: 'Edit.tag.page',
14-
action() {
15-
BlazeLayout.render('App_body', { main: 'Edit_tag_page' });
16-
},
17-
});
18-
1911
FlowRouter.route('/tags/:_id', {
20-
name: 'Tag.page',
12+
name: 'Tag',
2113
action() {
22-
BlazeLayout.render('App_body', { main: 'Tag_page' });
14+
BlazeLayout.render('Body', { main: 'Tag' });
2315
},
2416
});
2517

2618
FlowRouter.route('/', {
27-
name: 'App.home',
19+
name: 'Home',
2820
action() {
29-
BlazeLayout.render('App_body', { main: 'App_home' });
21+
BlazeLayout.render('Body', { main: 'Home' });
3022
},
3123
});
3224

3325
FlowRouter.notFound = {
3426
action() {
35-
BlazeLayout.render('App_body', { main: 'App_notFound' });
27+
BlazeLayout.render('Body', { main: 'NotFound' });
3628
},
3729
};

‎imports/ui/layouts/body/body.html

+9-22
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,10 @@
1-
<template name="App_body">
2-
<nav class="navbar navbar-inverse navbar-fixed-top">
3-
<div class="container">
4-
<div class="navbar-header">
5-
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
6-
<span class="sr-only">Toggle navigation</span>
7-
<span class="icon-bar"></span>
8-
<span class="icon-bar"></span>
9-
<span class="icon-bar"></span>
10-
</button>
11-
<a class="navbar-brand" href="#">Project name</a>
12-
</div>
13-
<div id="navbar" class="collapse navbar-collapse">
14-
<ul class="nav navbar-nav">
15-
<li class="active"><a href="#">Home</a></li>
16-
<li><a href="#about">About</a></li>
17-
<li><a href="#contact">Contact</a></li>
18-
</ul>
19-
</div><!--/.nav-collapse -->
20-
</div>
21-
</nav>
22-
{{> Template.dynamic template=main}}
1+
<template name="Body">
2+
{{> Nav}}
3+
4+
<br/>
5+
<br/>
6+
7+
<div class="container">
8+
{{> Template.dynamic template=main}}
9+
</div>
2310
</template>

‎imports/ui/layouts/body/body.js

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
import '../nav/nav.js';
12
import './body.html';

‎imports/ui/layouts/nav/nav.html

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<template name="Nav">
2+
<nav class="navbar navbar-default navbar-fixed-top">
3+
<div class="container-fluid">
4+
<div class="navbar-header">
5+
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
6+
<span class="sr-only">Toggle navigation</span>
7+
<span class="icon-bar"></span>
8+
<span class="icon-bar"></span>
9+
<span class="icon-bar"></span>
10+
</button>
11+
<a class="navbar-brand" href="/">Home</a>
12+
</div>
13+
14+
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
15+
<ul class="nav navbar-nav">
16+
<li class="active"><a href="#">Link <span class="sr-only">(current)</span></a></li>
17+
<li><a href="#">Link</a></li>
18+
<li class="dropdown">
19+
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Dropdown <span class="caret"></span></a>
20+
<ul class="dropdown-menu" role="menu">
21+
<li><a href="#">Action</a></li>
22+
<li><a href="#">Another action</a></li>
23+
<li><a href="#">Something else here</a></li>
24+
<li class="divider"></li>
25+
<li><a href="#">Separated link</a></li>
26+
<li class="divider"></li>
27+
<li><a href="#">One more separated link</a></li>
28+
</ul>
29+
</li>
30+
</ul>
31+
<form class="navbar-form navbar-left" role="search">
32+
<div class="form-group">
33+
<input class="form-control" placeholder="Search" type="text">
34+
</div>
35+
<button type="submit" class="btn btn-default">Submit</button>
36+
</form>
37+
<ul class="nav navbar-nav navbar-right">
38+
<li><a href="#">Link</a></li>
39+
</ul>
40+
</div>
41+
</div>
42+
</nav>
43+
</template>

‎imports/ui/layouts/nav/nav.js

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
import './nav.html';

‎imports/ui/pages/edit-tag-page/edit-tag-page.html

-33
This file was deleted.

‎imports/ui/pages/edit-tag-page/edit-tag-page.js

-51
This file was deleted.

‎imports/ui/pages/home/home.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
<template name="App_home">
1+
<template name="Home">
22
{{> info}}
33
</template>

‎imports/ui/pages/not-found/not-found.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<template name="App_notFound">
1+
<template name="NotFound">
22
<div id="not-found">
33
<div class="not-found-image">
44
<img src="/img/404.svg" alt="" />

‎imports/ui/pages/tag-page/tag-page.html

-23
This file was deleted.

‎imports/ui/pages/tag-page/tag-page.js

-20
This file was deleted.

‎imports/ui/pages/tag/tag.html

+61
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
<template name="Tag">
2+
<div class="page-header">
3+
<div class="row">
4+
<div class="col-lg-12">
5+
{{#if editingTitle}}
6+
<form class="title-form">
7+
<input class="title-input form-control input-lg" name="title" placeholder="Title" value="{{tag.title}}">
8+
</form>
9+
{{else}}
10+
<h1 class="title">{{tag.title}}</h1>
11+
{{/if}}
12+
</div>
13+
</div>
14+
</div>
15+
16+
<div class="row">
17+
<div class="col-lg-12">
18+
<h4 class="description">Description</h4>
19+
{{#if editingDescription}}
20+
<form class="description-form">
21+
<input class="description-input form-control" name="description" placeholder="Description" value="{{tag.description}}">
22+
</form>
23+
{{else}}
24+
<p class="description">{{tag.description}}</p>
25+
{{/if}}
26+
</div>
27+
</div>
28+
29+
<div class="row">
30+
<div class="col-lg-12">
31+
<h4>Tags</h4>
32+
<ul class="pager">
33+
{{#each t in tag.getTags}}
34+
<li class=""><a href="/tags/{{t._id}}">{{t.title}}</a></li>
35+
{{/each}}
36+
</ul>
37+
<form class="add-tag">
38+
<input class="form-control input-sm" name="title" placeholder="Add new tag.." list="tags" autocomplete="off">
39+
<datalist id="tags">
40+
{{#each t in allTags}}
41+
<option value="{{t.title}}"></option>
42+
{{/each}}
43+
</datalist>
44+
</form>
45+
</div>
46+
</div>
47+
48+
<div class="row">
49+
<div class="col-lg-12">
50+
<h4>Links</h4>
51+
<div class="links">
52+
{{#each tag.getLinks}}
53+
{{> link}}
54+
{{/each}}
55+
</div>
56+
</div>
57+
</div>
58+
59+
<a class="btn btn-default" href="/tags/{{tag._id}}/edit" role="button">Edit</a>
60+
<h6>{{tag.createdAt}}</h6>
61+
</template>

0 commit comments

Comments
 (0)