Upgraded to Meteor 1.6.0.1 and NodeJS 8.9.3. Added weekly/daily property to venues to support graphing and tracking of actual income from farmers markets (they don't usually match with expected income). Added workers objects to help illustrate who did what work (who was at the market on a specific week for example, or who prep'd and who canned a batch of jam). Fixed some bugs in the venue page. Re-design of the menu to allow for more menu options.
This commit is contained in:
@@ -1,65 +1,58 @@
|
||||
<template name="Auth_page">
|
||||
<div class="page auth">
|
||||
<nav>
|
||||
<div class="nav-group">
|
||||
<a href="#" class="js-menu nav-item">
|
||||
<span class="icon-list-unordered"></span>
|
||||
</a>
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
<div class="content-scrollable">
|
||||
<div class="wrapper-auth">
|
||||
{{> atForm}}
|
||||
</div>
|
||||
<template name="OverrideAtForm">
|
||||
{{#unless hide}}
|
||||
<div class="at-form">
|
||||
<!--{{#if showTitle}}-->
|
||||
<!--{{> atTitle}}-->
|
||||
<!--{{/if}}-->
|
||||
{{#if showOauthServices}}
|
||||
{{> atOauth}}
|
||||
{{/if}}
|
||||
{{#if showServicesSeparator}}
|
||||
{{> atSep}}
|
||||
{{/if}}
|
||||
{{#if showError}}
|
||||
{{> atError}}
|
||||
{{/if}}
|
||||
{{#if showResult}}
|
||||
{{> atResult}}
|
||||
{{/if}}
|
||||
{{#if showMessage}}
|
||||
{{> atMessage}}
|
||||
{{/if}}
|
||||
{{#if showPwdForm}}
|
||||
{{> OverrideAtPwdForm}}
|
||||
{{/if}}
|
||||
{{#if showTermsLink}}
|
||||
{{> atTermsLink}}
|
||||
{{/if}}
|
||||
{{#if showSignInLink}}
|
||||
{{> atSigninLink}}
|
||||
{{/if}}
|
||||
{{#if showSignUpLink}}
|
||||
{{> atSignupLink}}
|
||||
{{/if}}
|
||||
{{#if showResendVerificationEmailLink}}
|
||||
{{> atResendVerificationEmailLink}}
|
||||
{{/if}}
|
||||
</div>
|
||||
</div>
|
||||
{{/unless}}
|
||||
</template>
|
||||
|
||||
<template name="override-atPwdFormBtn">
|
||||
<button type="submit" class="btn-primary">
|
||||
{{buttonText}}
|
||||
</button>
|
||||
</template>
|
||||
|
||||
<template name="override-atTextInput">
|
||||
<div class="input {{#if isValidating}}validating{{/if}} {{#if hasError}}error{{/if}} {{#if hasSuccess}}has-success{{/if}} {{#if feedback}}has-feedback{{/if}}">
|
||||
<input type="{{type}}" id="at-field-{{_id}}" name="at-field-{{_id}}" placeholder="{{placeholder}}" autocapitalize="none" autocorrect="off">
|
||||
{{#if hasIcon}}
|
||||
<span class="{{iconClass}}"></span>
|
||||
{{/if}}
|
||||
{{#if hasError}}
|
||||
<span>{{errorText}}</span>
|
||||
{{/if}}
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<template name="override-atTitle">
|
||||
<h1 class="title-auth">{{title}}</h1>
|
||||
<p class="subtitle-auth">Signing in allows you to have private lists</p>
|
||||
</template>
|
||||
|
||||
<template name="override-atError">
|
||||
<div class="list-errors">
|
||||
{{#each error}}
|
||||
<div class="list-item">{{errorText}}</div>
|
||||
{{/each}}
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<template name="override-atPwdForm">
|
||||
<template name="OverrideAtPwdForm">
|
||||
<div class="at-pwd-form">
|
||||
<form role="form" id="at-pwd-form" class="{{disabled}}" novalidate action="#" method="POST">
|
||||
{{#each fields}}
|
||||
{{> atInput}}
|
||||
{{/each}}
|
||||
{{#if showReCaptcha}}
|
||||
{{> atReCaptcha}}
|
||||
{{/if}}
|
||||
{{> atPwdFormBtn}}
|
||||
{{#if showForgotPasswordLink}}
|
||||
{{> atPwdLink}}
|
||||
{{/if}}
|
||||
<form role="form" id="at-pwd-form" novalidate action="#" method="POST">
|
||||
<fieldset {{disabled}}>
|
||||
{{#each fields}}
|
||||
{{> atInput}}
|
||||
{{/each}}
|
||||
{{#if showReCaptcha}}
|
||||
{{> atReCaptcha}}
|
||||
{{/if}}
|
||||
{{> atPwdFormBtn}}
|
||||
{{#if showForgotPasswordLink}}
|
||||
{{> atPwdLink}}
|
||||
{{/if}}
|
||||
</fieldset>
|
||||
</form>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -2,6 +2,13 @@ import { Template } from 'meteor/templating';
|
||||
|
||||
import './accounts.html';
|
||||
|
||||
// Simply 'inherits' helpers from AccountsTemplates
|
||||
Template.OverrideAtForm.helpers(AccountsTemplates.atFormHelpers);
|
||||
|
||||
// Simply 'inherits' helpers and events from AccountsTemplates
|
||||
Template.OverrideAtPwdForm.helpers(AccountsTemplates.atPwdFormHelpers);
|
||||
Template.OverrideAtPwdForm.events(AccountsTemplates.atPwdFormEvents);
|
||||
|
||||
// We identified the templates that need to be overridden by looking at the available templates
|
||||
// here: https://github.com/meteor-useraccounts/unstyled/tree/master/lib
|
||||
// Template['override-atPwdFormBtn'].replaces('atPwdFormBtn');
|
||||
|
||||
Reference in New Issue
Block a user