wcrisman/AVEF
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed Appreciation to Jr High Summer; Fixed sorting of internships such that changes get properly sorted; Added a proper date on news & notices on the home page using the page's update timestamp.

Browse Source
This commit is contained in:
Wynne Crisman
2019-01-07 16:53:54 -08:00
parent 0593c2421a
commit cac2ad9c41
21 changed files with 160 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
server/server.js
View File

@@ -4,7 +4,8 @@ import '/imports/startup/both';
import '/imports/api';
import '/imports/startup/server/postStartup/version.js'; //Run this right after the api - relies on the API to upgrade the app database & data to the current version.
import { Picker } from 'meteor/meteorhacks:picker';
import {SSR, Template} from "meteor/meteorhacks:ssr";
//import {SSR, Template} from "meteor/meteorhacks:ssr";
// let PropertiesReader = require('properties-reader');
// let props = PropertiesReader('release.properties');
@@ -14,6 +15,7 @@ import {SSR, Template} from "meteor/meteorhacks:ssr";
// // console.log("Loaded email settings from properties file.");
// }
//Note: This is set in a development environment, or at runtime via the Nginx config file for the app (if using phusion passenger, it would be: `passenger_env_var MAIL_URL smtp://no-reply%40my-domain.com:my_password@secure.emailsrvr.com`).
if (!process.env.MAIL_URL) {
process.env.MAIL_URL = Meteor.settings.MAIL_URL;
}
@@ -30,30 +32,30 @@ if(process.env.MONGO_URL) {
else console.log(msg);
}
const SeoRouter = Picker.filter((request, response) => {
let botAgents = [
/^facebookexternalhit/i, // Facebook
/^linkedinbot/i, // LinkedIn
/^twitterbot/i, // Twitter
/^slackbot-linkexpanding/i // Slack
];
return /_escaped_fragment_/.test(request.url) || botAgents.some(i => i.test(request.headers['user-agent']));
});
//const SeoRouter = Picker.filter((request, response) => {
// let botAgents = [
// /^facebookexternalhit/i, // Facebook
// /^linkedinbot/i, // LinkedIn
// /^twitterbot/i, // Twitter
// /^slackbot-linkexpanding/i // Slack
// ];
//
// return /_escaped_fragment_/.test(request.url) || botAgents.some(i => i.test(request.headers['user-agent']));
//});
const path = require('path');
const fs = require('fs');
//const path = require('path');
//const fs = require('fs');
let templateMap = JSON.parse(Assets.getText('template-index'));
let templateNames = Object.keys(templateMap);
//let templateMap = JSON.parse(Assets.getText('template-index'));
//let templateNames = Object.keys(templateMap);
templateNames.forEach(function(key) {
//console.log(key);
//console.log(templateMap[key]);
//console.log("------------------------------------------------------------------------------------------------");
SSR.compileTemplate(key, templateMap[key]);
});
//templateNames.forEach(function(key) {
// //console.log(key);
// //console.log(templateMap[key]);
// //console.log("------------------------------------------------------------------------------------------------");
// SSR.compileTemplate(key, templateMap[key]);
//});
//console.log(Meteor.rootPath);
@@ -91,25 +93,25 @@ templateNames.forEach(function(key) {
//SSR.compileTemplate('home', Assets.getText('/imports/ui/Home.html'));
//
//SSR.compileTemplate('currentBoard', Assets.getText('/imports/ui/CurrentBoard.html'));
Template.CurrentBoard.helpers({
currentBoardHTML: () => {
//Template.instance().data
let doc = Meteor.collections.Pages.findOne({name: 'Board'});
return doc === undefined ? "" : doc.html;
}
});
SeoRouter.route('/', (params, request, response) => {
let html = SSR.render('public', {content: 'home'});
response.setHeader('Content-Type', 'text/html;charset=utf-8');
response.end(html);
});
SeoRouter.route('/CurrentBoard', (params, request, response) => {
let html = SSR.render('public', {content: 'currentBoard'});
response.setHeader('Content-Type', 'text/html;charset=utf-8');
response.end(html);
});
//Template.CurrentBoard.helpers({
// currentBoardHTML: () => {
// //Template.instance().data
// let doc = Meteor.collections.Pages.findOne({name: 'Board'});
//
// return doc === undefined ? "" : doc.html;
// }
//});
//
//SeoRouter.route('/', (params, request, response) => {
// let html = SSR.render('public', {content: 'home'});
//
// response.setHeader('Content-Type', 'text/html;charset=utf-8');
// response.end(html);
//});
//
//SeoRouter.route('/CurrentBoard', (params, request, response) => {
// let html = SSR.render('public', {content: 'currentBoard'});
//
// response.setHeader('Content-Type', 'text/html;charset=utf-8');
// response.end(html);
//});