Skip to content
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

Feature/7 basic results #22

Open
wants to merge 8 commits into
base: prototype-v0.1.0
Choose a base branch
from
Open

Feature/7 basic results #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6a8f39e
[#7] Minified resources, bootstrap, jquery, angular
eddiejaoude Jan 6, 2016
edbe648
[#7] Basic Angular controller to call list of Members API
eddiejaoude Jan 6, 2016
67517b9
[#7] Landing page, currently displays list of Members
eddiejaoude Jan 6, 2016
c326486
[#7] Styling tweaked - results nudged down, link icon colours
eddiejaoude Jan 6, 2016
c51501e
PHP redirect to JS for Dokku
eddiejaoude Jan 7, 2016
dfa8f5f
Updated URL to API - should be moved to config
eddiejaoude Jan 7, 2016
3a74ed9
Total number of results displayed in sub nav bar
eddiejaoude Jan 7, 2016
3dfd44e
Fixed invalid html
eddiejaoude Jan 7, 2016
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
11 changes: 11 additions & 0 deletions css/app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
div.results {
margin-top:1rem;
}

span.social a {
color: #5cb85c;
}

span.visibility {
color: #5cb85c;
}
6 changes: 6 additions & 0 deletions css/bootstrap.min.css
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions css/tether.min.css
View file
Open in desktop

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

107 changes: 107 additions & 0 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
<!doctype html>
<html lang="en" ng-app="memberApp">
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably better to use angular.bootstrap vs ng-app gives more flexibility when you get onto more complex coding

<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<title>Family:: EmpowerHack</title>

<link rel="stylesheet" href="css/bootstrap.min.css">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
<link rel="stylesheet" href="css/tether.min.css">
<link rel="stylesheet" href="css/app.css">

<script src="js/angular.min.js"></script>
<script src="js/jquery.min.js"></script>
<script src="js/tether.min.js"></script>
<script src="js/bootstrap.min.js"></script>
<script src="js/app.js"></script>
</head>
<body>

<nav class="navbar navbar-light bg-faded">
<button class="navbar-toggler hidden-sm-up" type="button" data-toggle="collapse" data-target="#navbar-header" aria-controls="navbar-header">
&#9776;
</button>
<div class="collapse navbar-toggleable-xs" id="navbar-header">
<a class="navbar-brand" href="/">Family</a>
<!--<ul class="nav navbar-nav">-->
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Commented out code in a pull request.... where is my ruler /slap

<!--<li class="nav-item active">-->
<!--<a class="nav-link" href="/">Members <span class="sr-only">(current)</span></a>-->
<!--</li>-->
<!--</ul>-->
<!--<form class="form-inline pull-xs-right">-->
<!--<input class="form-control" type="text" placeholder="Search">-->
<!--<button class="btn btn-success-outline" type="submit">Search</button>-->
<!--</form>-->
</div>
</nav> <!-- /navbar -->


<div class="container" ng-controller="MemberListController as memberList">
<h2>Members</h2>

<nav class="navbar navbar-light bg-faded">
<ul class="nav navbar-nav">
<li class="nav-item active">
<span class="nav-link">Total {{ memberList.members.length }} results</span>
</li>
</ul>
<form class="form-inline pull-xs-right">
<input class="form-control" disabled type="text" placeholder="Search">
<button class="btn btn-success-outline disabled" type="submit">Search</button>
</form>
</nav>

<div class="results">
<div class="card" ng-repeat="member in memberList.members">
<div class="card-header">
<span class="pull-right visibility">
<i class="fa fa-lock" ng-show="member.isPrivate" data-toggle="tooltip" data-placement="top" title="Tooltip on top"></i>
<i class="fa fa-unlock" ng-show="!member.isPrivate"></i>
</span>
<i class="fa fa-user fa-1x"></i>
{{ member.name }}
</div>
<div class="card-block">
<span class="pull-right social">
<a href="{{ member.urls.LinkedIn }}" class="btn btn-success-outline">
<i class="fa fa-linkedin"></i>
</a>
<a href="{{ member.urls.Twitter }}" class="btn btn-success-outline">
<i class="fa fa-twitter"></i>
</a>
<a href="{{ member.urls.Facebook }}" class="btn btn-success-outline">
<i class="fa fa-facebook"></i>
</a>
</span>
<h4 class="card-title">{{ member.email }}</h4>
</div>


<div class="row">
<div class="col-sm-6">
<ul class="list-group list-group-flush">
<li class="list-group-item active">SKILLS</li>
<li class="list-group-item" ng-repeat="skill in member.skills">{{ skill }}</li>
</ul>
</div>
<div class="col-sm-6">
<ul class="list-group list-group-flush">
<li class="list-group-item active">INTERESTS</li>
<li class="list-group-item" ng-repeat="interest in member.interests">{{ interest }}</li>
</ul>
</div>
</div>

<div class="card-footer text-muted">
Availability
<progress class="progress progress-success" value="{{ member.availability }}" max="100">{{ member.availability }}%</progress>
</div>
</div>
</div>

</div>

</body>
</html>
2 changes: 2 additions & 0 deletions index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?php
header('Location: index.html');
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Really... a php file? also no closing ?> tag (or am I out of date on making sure you always close tags is this some new standard?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I needed this for Dokku (private heroku) deployment ...sorry 😢

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Really? You cannot host a static site on Dokku I don't believe you 😛 just need nginx to do this I am sure 😛

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not as far as I know. Static files don't have a build pack - although, I could just put it on GitHub pages for now, might be easier 😁 .

Regarding PHP closing tags, yeah the standard now (well for a while) is not to include the closing PHP tag

Loading