Skip to content
Permalink
Browse files

Weekly commit 3

  • Loading branch information...
lklancir committed Aug 9, 2015
1 parent 567ef28 commit 07d3f803180216e35b184ced6de924d1fef3ac37
Showing with 1,765 additions and 137 deletions.
  1. BIN .DS_Store
  2. +2 −0 .meteor/packages
  3. +1 −1 .meteor/release
  4. +3 −0 .meteor/versions
  5. +124 −30 client/app/home/sezonci.html
  6. +21 −0 client/app/layouts/myJobsLayout.html
  7. +1 −1 client/app/navigation/createAccountNav.html
  8. +3 −3 client/app/navigation/employerNav.html
  9. +59 −16 client/app/navigation/mainNav.html
  10. 0 client/app/{views → publicViews}/howItWorks.html
  11. 0 client/app/{views → publicViews}/login.html
  12. +3 −0 client/app/publicViews/publicJobs.html
  13. 0 client/app/{views → publicViews}/signup.html
  14. 0 client/app/{views → publicViews}/verification.html
  15. +30 −18 client/app/users/employee/jobs.html
  16. +39 −12 client/app/users/employee/jobsDetailed.html
  17. +22 −0 client/app/users/employee/jobsDetailed.js
  18. +26 −0 client/app/users/employer/activeJobs.html
  19. +89 −7 client/app/users/employer/addJob.html
  20. +25 −8 client/app/users/employer/employer.js
  21. +3 −0 client/app/users/employer/expiredJobs.html
  22. +0 −24 client/app/users/employer/myJobs.html
  23. +29 −0 client/app/users/employer/myJobsHelpers.js
  24. +26 −0 client/app/users/employer/unactiveJobs.html
  25. +11 −0 client/styles/bootstrap.css
  26. +893 −11 client/styles/sezonci.css
  27. +21 −2 lib/collections/jobsCol.js
  28. +16 −0 lib/collections/zupanijeCol.js
  29. BIN lib/img/header-bg.jpg
  30. BIN lib/img/portfolio/dreams-preview.png
  31. BIN lib/img/portfolio/dreams.png
  32. BIN lib/img/portfolio/escape-preview.png
  33. BIN lib/img/portfolio/escape.png
  34. BIN lib/img/portfolio/golden-preview.png
  35. BIN lib/img/portfolio/golden.png
  36. BIN lib/img/portfolio/roundicons-free.png
  37. BIN lib/img/portfolio/roundicons.png
  38. BIN lib/img/portfolio/startup-framework-preview.png
  39. BIN lib/img/portfolio/startup-framework.png
  40. BIN lib/img/portfolio/treehouse-preview.png
  41. BIN lib/img/portfolio/treehouse.png
  42. BIN lib/img/roundicons-free.png
  43. BIN lib/img/roundicons.png
  44. +28 −4 lib/routing/router.js
  45. BIN public/.DS_Store
  46. BIN public/fonts/glyphicons-halflings-regular.eot
  47. +288 −0 public/fonts/glyphicons-halflings-regular.svg
  48. BIN public/fonts/glyphicons-halflings-regular.ttf
  49. BIN public/fonts/glyphicons-halflings-regular.woff
  50. BIN public/fonts/glyphicons-halflings-regular.woff2
  51. BIN public/img/.DS_Store
  52. BIN public/img/header-bg.jpg
  53. BIN public/img/landing-hero-bg.jpg
  54. BIN public/img/monaco.jpeg
  55. BIN public/img/portfolio/cook.jpg
  56. BIN public/img/portfolio/waiter.jpg
  57. +2 −0 server/publications.js
BIN +0 Bytes (100%) .DS_Store
Binary file not shown.
@@ -16,3 +16,5 @@ accounts-ui-unstyled
matb33:collection-hooks
houston:admin
sacha:spin
fortawesome:fontawesome
mizzao:jquery-ui
@@ -1 +1 @@
METEOR@1.1.0.2
METEOR@1.1.0.3
@@ -17,6 +17,7 @@ deps@1.0.7
ejson@1.0.6
email@1.0.6
fastclick@1.0.3
fortawesome:fontawesome@4.3.0
geojson-utils@1.0.3
houston:admin@2.0.3
html-tools@1.0.4
@@ -42,6 +43,8 @@ meteor@1.1.6
meteor-platform@1.2.2
minifiers@1.1.5
minimongo@1.0.8
mizzao:build-fetcher@0.2.0
mizzao:jquery-ui@1.11.4
mobile-status-bar@1.0.3
mongo@1.1.0
mrt:bootstrap-3@0.3.8
@@ -1,43 +1,137 @@
<head>
<title>Sezonci</title>
</head>

<body>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="">
<meta name="author" content="">

<div class="container">

<!-- kontrola izbornika za različite sesije
ili je sesija prazna i daj public stvari
ili je poslodavac ili radnik
-->
<title>Sezonci</title>

</div>
<!-- Bootstrap Core CSS -->
<link href="css/bootstrap.min.css" rel="stylesheet">

</body>
<!-- Custom CSS -->
<link href="css/agency.css" rel="stylesheet">

<!-- Custom Fonts -->
<link href="font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css">
<link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
<link href='https://fonts.googleapis.com/css?family=Kaushan+Script' rel='stylesheet' type='text/css'>
<link href='https://fonts.googleapis.com/css?family=Droid+Serif:400,700,400italic,700italic' rel='stylesheet' type='text/css'>
<link href='https://fonts.googleapis.com/css?family=Roboto+Slab:400,100,300,700' rel='stylesheet' type='text/css'>

</head>

<template name="home">
<header>
<div class="container">
<div class="intro-text">
<div class="intro-lead-in">Welcome To Sezonci.hr!</div>
<div class="intro-heading">SEZONSKI POSLOVI</div>
<a href="{{pathFor 'signup'}}" class="page-scroll btn btn-xl">Tell Me More</a>
</div>
</div>
</header>


<template name="home">
{{>jobs}}
{{#if isInRole 'view-projects'}}
<div class="col-md-4">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Everyone can see this.</h3>
</div>
<div class="panel-body">
Its not secure
</div>
<div class="panel-footer">

</div>
</div>
</div>
{{/if}}
</template>
<!-- Portfolio Grid Section -->
<section id="portfolio" class="bg-light-gray">
<div class="container">
<div class="row">
<div class="col-lg-12 text-center">
<h2 class="section-heading">Izbor poslova</h2>
<h3 class="section-subheading text-muted"></h3>
</div>
</div>
<div class="row">
<div class="col-md-4 col-sm-6 portfolio-item">
<a href="{{pathFor 'publicJobs'}}" class="portfolio-link" data-toggle="modal">
<div class="portfolio-hover">
<div class="portfolio-hover-content">
<i class="fa fa-plus fa-3x"></i>
</div>
</div>
<img src="img/portfolio/waiter.jpg" class="img-responsive" alt="">
</a>
<div class="portfolio-caption">
<h4>Konobar</h4>
<p class="text-muted"></p>
</div>
</div>
<div class="col-md-4 col-sm-6 portfolio-item">
<a href="#portfolioModal2" class="portfolio-link" data-toggle="modal">
<div class="portfolio-hover">
<div class="portfolio-hover-content">
<i class="fa fa-plus fa-3x"></i>
</div>
</div>
<img src="img/portfolio/cook.jpg" class="img-responsive" alt="">
</a>
<div class="portfolio-caption">
<h4>Kuhar</h4>
<p class="text-muted"></p>
</div>
</div>
<div class="col-md-4 col-sm-6 portfolio-item">
<a href="#portfolioModal3" class="portfolio-link" data-toggle="modal">
<div class="portfolio-hover">
<div class="portfolio-hover-content">
<i class="fa fa-plus fa-3x"></i>
</div>
</div>
<img src="img/portfolio/waiter.jpg" class="img-responsive" alt="">
</a>
<div class="portfolio-caption">
<h4>Spremač</h4>
<p class="text-muted"></p>
</div>
</div>
<!-- <div class="col-md-4 col-sm-6 portfolio-item">
<a href="#portfolioModal4" class="portfolio-link" data-toggle="modal">
<div class="portfolio-hover">
<div class="portfolio-hover-content">
<i class="fa fa-plus fa-3x"></i>
</div>
</div>
<img src="img/portfolio/golden.png" class="img-responsive" alt="">
</a>
<div class="portfolio-caption">
<h4>Golden</h4>
<p class="text-muted">Website Design</p>
</div>
</div>
<div class="col-md-4 col-sm-6 portfolio-item">
<a href="#portfolioModal5" class="portfolio-link" data-toggle="modal">
<div class="portfolio-hover">
<div class="portfolio-hover-content">
<i class="fa fa-plus fa-3x"></i>
</div>
</div>
<img src="img/portfolio/escape.png" class="img-responsive" alt="">
</a>
<div class="portfolio-caption">
<h4>Escape</h4>
<p class="text-muted">Website Design</p>
</div>
</div>
<div class="col-md-4 col-sm-6 portfolio-item">
<a href="#portfolioModal6" class="portfolio-link" data-toggle="modal">
<div class="portfolio-hover">
<div class="portfolio-hover-content">
<i class="fa fa-plus fa-3x"></i>
</div>
</div>
<img src="img/portfolio/dreams.png" class="img-responsive" alt="">
</a>
<div class="portfolio-caption">
<h4>Dreams</h4>
<p class="text-muted">Website Design</p>
</div>
</div> -->
</div>
</div>
</section>

<template name="job">

</template>
@@ -0,0 +1,21 @@
<template name="myJobs">
{{>employerNav}}
<nav class="navbar-myJobs" role="navigation">
<div class="container-fluid">

<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="navbar">
<!-- <ul class="nav navbar-nav">
<li class="active"><a href="{{ pathFor 'home' }}">Sezonci</a></li>
</ul> -->
<ul class="nav navbar-nav navbar-myJobs">
<li><a href="{{pathFor 'activeJobs'}}">AKTIVNI OGLASI</a></li>
<li><a href="{{pathFor 'unactiveJobs'}}">NEAKTIVNI OGLASI</a></li>
<li><a href="{{pathFor 'expiredJobs'}}">ISTEKLI OGLASI</a></li>
</ul>
</div><!-- /.navbar-collapse -->
</div><!-- /.container-fluid -->
</nav>
{{>yield}}

</template>
@@ -1,5 +1,5 @@
<template name="createAccountNav">
<nav class="navbar navbar-default" role="navigation">
<nav class="navbar navbar-default navbar-fixed-top navbar-shrink" role="navigation">
<div class="container-fluid">
<div class="navbar-header nav-">
<a class="navbar-brand" href="/">Sezonci</a>
@@ -1,5 +1,5 @@
<template name="employerNav">
<nav class="navbar navbar-default" role="navigation">
<nav class="navbar navbar-default navbar-employer" role="navigation">
<div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar">
@@ -13,10 +13,10 @@

<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="navbar">
<ul class="nav navbar-nav">
<ul class="nav navbar-nav navbar-employer">
<li class="active"><a href="{{pathFor 'employerProfile'}}">PROFIL</a></li>
<li><a href="{{pathFor 'addJob'}}">DODAJ POSAO</a></li>
<li><a href="{{pathFor 'myJobs'}}">MOJI POSLOVI</a></li>
<li><a href="{{pathFor 'activeJobs'}}">MOJI POSLOVI</a></li>

</ul>

@@ -1,21 +1,71 @@
<template name="mainNav">

<!-- Navigation -->
<nav class="navbar navbar-default navbar-fixed-top">
<div class="container-fluid">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header page-scroll">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand page-scroll" href="#page-top">Sezonci</a>
</div>

<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
<li class="hidden">
<a href="#page-top"></a>
</li>
<li><a href="{{pathFor route='howItWorks'}}">Kako radi</a></li>
{{#if isInRole 'employer'}}
<li><a href="{{pathFor route='employerProfile'}}">EMPLOYER LINK</a></li>
{{/if}}
{{#if isInRole 'employee'}}
<li><a href="{{pathFor route='employeeProfile'}}">EMPLOYEE LINK</a></li>
{{/if}}
</ul>
<ul class="nav navbar-nav navbar-right">
<li class="hidden">
<a href="#page-top"></a>
</li>
<li>
<a class="page-scrol" href="{{pathFor 'signup'}}">Registriraj se</a>
</li>
<li>
<a class="page-scroll" href="#">{{>loginButtons}}</a>
</li>
<li>
<a class="page-scroll" href="{{pathFor 'employeeRegistration'}}">Zaposli se</a>
</li>
</ul>
</div>
<!-- /.navbar-collapse -->
</div>
<!-- /.container-fluid -->
</nav>



<!-- TU TREBA čekirati dal je session up and running i puknuti drugačiju navigaciju?
tj. orijentirati se prema session, kad nije logiran ima to, kad je logiran nekaj drugi etc...
-->


<nav class="navbar navbar-default" role="navigation">
<!-- <nav class="navbar navbar-default" role="navigation">
<div class="container-fluid">
<div class="navbar-header nav-">
<a class="navbar-brand" href="/">Sezonci</a>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="navbar">
<!-- controlled by navigation.js "change navigation_search event!" -->
<form class="navbar-form navbar-left ns_submit_form" role="search">
<div class="input-group">
<div class="input-group-btn">
@@ -24,22 +74,15 @@
<li class="navigation_search ns_selected" code="employer"> <a href="#"> Poslodavci </a> </li>
<li class="navigation_search" code="employee"> <a href="#"> Posloprimci </a> </li>
</ul>
</div><!-- /btn-group -->
</div>
<input type="text" class="form-control ns_text" aria-label="..." placeholder="Traži poslodavce">
</div><!-- /input-group -->
</div>
<button type="submit" class="btn btn-default ns_submit_button">TRAŽI</button>
</form>
<!-- controlled by navigation.js "change navigation_search event!" -->


<!-- open/non logged session menu -->
<ul class="nav navbar-nav">
<!-- kontrola izbornika za različite sesije
ili je sesija prazna i daj public stvari
ili je poslodavac ili radnik
-->
{{#if isInRole 'unknown'}}
{{/if}}
@@ -79,8 +122,8 @@
<li><a href="{{pathFor 'employeeRegistration'}}" class="btn btn-default">Zaposli se!</a></li>
</ul>
</div><!-- /.navbar-collapse -->
</div><!-- /.container-fluid -->
</nav>
</div>
</div>
</nav> -->

</template>
File renamed without changes.
File renamed without changes.
@@ -0,0 +1,3 @@
<template name="publicJobs">
{{>jobs}}
</template>
File renamed without changes.
File renamed without changes.
Oops, something went wrong.

1 comment on commit 07d3f80

@lklancir

This comment has been minimized.

Copy link
Owner Author

commented on 07d3f80 Aug 9, 2015

Added features and functionalities:

· Set up the bootstrap template “Creative agency” from which I have taken design elements and structures

· Home page has a layout structure that will probably stay like that with minor additions to the content

· The header CTA button will lead to registration

· Job Categories placeholders are set up and they will lead to the chosen category with filtered jobs in that category

       o   For now we do not have the filtering functionality implemented

· Job listings page has all the jobs listed while clicking on the specific one leads to a detailed preview of the chosen job

          o   An employee is able to apply to a specific job

          o   A guest user will be prompted to register before he can use this feature

· Employer section was updated in the following:

        o   Layouts

        o   Add a Job Page – most of the necessary information added via inputs but still some are missing (have to check other job sites).

        o   My Jobs Page – User can shift between active, unactive and expired jobs. User can activate and deactivate a job
Please sign in to comment.
You can’t perform that action at this time.