Skip to content

Commit

Permalink
Version 1.0.8.
Browse files Browse the repository at this point in the history
* Most URLs changed from http to https.
* Replace captchagen with svg-captcha.
* Removed references to Google Plus.
* Replaced Internet Explorer with Edge as a recommended browser.
  • Loading branch information
roncli committed Jul 14, 2019
1 parent d0cb8e1 commit ab3fbd4
Show file tree
Hide file tree
Showing 56 changed files with 217 additions and 322 deletions.
39 changes: 21 additions & 18 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
roncli.com
==========

This is the source repository for the [roncli.com](http://www.roncli.com) website. This website is written in [node.js](http://nodejs.org) using the [rendr](https://github.com/rendrjs/rendr) library.
This is the source repository for the [roncli.com](https://roncli.com) website. This website is written in [node.js](https://nodejs.org) using the [rendr](https://github.com/rendrjs/rendr) library.

Projects
========
Expand All @@ -15,7 +15,7 @@ The second is the Node project itself, which is developed via PhpStorm. I do ha
Requirements
============

Be sure to have [Visual Studio 2013](http://www.visualstudio.com) with [Node.js Tools for Visual Studio](http://nodejstools.codeplex.com). and node.js 0.10.36 or later installed with npm.
Be sure to have [Visual Studio 2013](https://www.visualstudio.com) with [Node.js Tools for Visual Studio](https://nodejstools.codeplex.com). and node.js 0.10.36 or later installed with npm.

Database Setup
==============
Expand All @@ -34,27 +34,21 @@ Windows Installation
To run the website on Windows, make sure you perform the following steps.

1. Install [Python 2.7.x](https://www.python.org/downloads/).
2. Download the all-in-one bundle for [GTK+ 2.x x86](http://ftp.acc.umu.se/pub/gnome/binaries/win32/gtk+/2.24/gtk+-bundle_2.24.10-20120208_win32.zip) or [GTK+ 2.x x64](http://ftp.acc.umu.se/pub/gnome/binaries/win64/gtk+/2.22/gtk+-bundle_2.22.1-20101229_win64.zip).
3. Unzip the GTK+ 2.x directory to c:\GTK. It is important that the files are in this directory, as that is where the canvas npm package will be looking for it.
4. Add the c:\GTK\bin\ directory to your system PATH. (This may require a restart.)
5. From an admin command prompt, install node-gyp and grunt-cli globally:
2. Add the c:\GTK\bin\ directory to your system PATH. (This may require a restart.)
3. From an admin command prompt, install grunt-cli globally:

npm install -g node-gyp grunt-cli

6. Install the windows build tools globally:

npm install -g --production windows-build-tools
npm install -g grunt-cli

7. Install the node modules from the /roncli.com directory:
4. Install the node modules from the /roncli.com directory:

npm install

8. Add /roncli.com/assets/js/publicConfig.js and /roncli.com/server/privateConfig.js. See below for file contents.
9. Install the node modules from the /ronc.li directory:
5. Add /roncli.com/assets/js/publicConfig.js and /roncli.com/server/privateConfig.js. See below for file contents.
6. Install the node modules from the /ronc.li directory:

npm install

10. If using [iisnode](https://github.com/tjanczuk/iisnode):
7. If using [iisnode](https://github.com/tjanczuk/iisnode):
- Point an IIS application to the inner /roncli.com directory
- Point another IIS application to the /ronc.li directory
- Run ```grunt``` from the same directory when installing and after every time you change code.
Expand Down Expand Up @@ -170,6 +164,16 @@ The following should be the contents of privateConfig.js:
Version History
===============

1.0.8 - 7/13/2019
-----------------

This release sets up the website to work over SSL, removes references to Google Plus, and replaces the captcha system with one that requires less of a setup on Windows.

* Most URLs changed from http to https.
* Replace captchagen with svg-captcha.
* Removed references to Google Plus.
* Replaced Internet Explorer with Edge as a recommended browser.

1.0.7 - 1/8/2019
----------------

Expand Down Expand Up @@ -309,6 +313,7 @@ Planned Versions
1.1
---

* Remove Visual Studio projects.
* Allow for a directory structure in the files section.
* Add résumé page.

Expand All @@ -317,6 +322,4 @@ License Details

All original code is released without license. This means that you may not distribute the code without the express written consent of the author.

Because the code resides on GitHub, you are permitted via GitHub's [Terms of Service](http://help.github.com/articles/github-terms-of-service) to view and fork this repository.

©2014-2015 Ronald M. Clifford
Because the code resides on GitHub, you are permitted via GitHub's [Terms of Service](https://help.github.com/articles/github-terms-of-service) to view and fork this repository.
5 changes: 4 additions & 1 deletion ronc.li/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ app.use(function(req, res, next) {
// Initialize middleware stack.
app.use(morgan(":colorstatus \x1b[30m\x1b[1m:method\x1b[0m :url\x1b[30m\x1b[1m:newline Date :date[iso] IP :req[ip] Time :colorresponse ms"));

// Web server routes.
app.use(express.static("public"));

// Redirect.
app.get("*", function(req, res) {
var url = req.url;
Expand All @@ -32,7 +35,7 @@ app.get("*", function(req, res) {
}

if (err || !data || !data.recordsets || !data.recordsets[0] || !data.recordsets[0][0] || !data.recordsets[0][0].ToURL) {
res.redirect(301, "http://www.roncli.com" + url);
res.redirect(301, req.protocol + "://roncli.com" + url);
} else {
db.query(
"INSERT INTO tblRedirectHit (RedirectID, IP, Referrer, UserAgent) values (@redirectId, @ip, @referrer, @userAgent)",
Expand Down
4 changes: 2 additions & 2 deletions ronc.li/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ronc.li",
"version": "1.0.7",
"version": "1.0.8",
"description": "Redirect service for roncli.com.",
"homepage": "https://github.com/roncli/roncli.com",
"bugs": {
Expand All @@ -11,7 +11,7 @@
"author": {
"name": "Ronald M. Clifford",
"email": "roncli@roncli.com",
"url": "http://www.roncli.com"
"url": "https://roncli.com"
},
"repository": {
"type": "git",
Expand Down
7 changes: 7 additions & 0 deletions ronc.li/web.config
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@
<iisnode logDirectory="logs" devErrorsEnabled="false" debuggingEnabled="false" enableXFF="true"/>
<rewrite>
<rules>
<rule name="HTTP/S to HTTPS Redirect" enabled="true" stopProcessing="true">
<match url="(.*)" />
<conditions logicalGrouping="MatchAny">
<add input="{SERVER_PORT_SECURE}" pattern="^0$" />
</conditions>
<action type="Redirect" url="https://{HTTP_HOST}/{R:1}" redirectType="Permanent" />
</rule>
<rule name="DynamicContent">
<conditions>
<add input="{{REQUEST_FILENAME}}" matchType="IsFile" negate="True"/>
Expand Down
4 changes: 2 additions & 2 deletions roncli.com/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Notes
=====

* Color palette is from [paletton.com](http://paletton.com/#uid=43+1m0kka9zdKffgRcglUdjnGge).
* Bootstrap theme is custom made via [Bootstrap Customizer](http://getbootstrap.com/customize/?id=c209005f2b4bc66654b5).
* Color palette is from [paletton.com](https://paletton.com/#uid=43+1m0kka9zdKffgRcglUdjnGge).
* Bootstrap theme is custom made via [Bootstrap Customizer](https://getbootstrap.com/customize/?id=c209005f2b4bc66654b5).
2 changes: 1 addition & 1 deletion roncli.com/admin/templates/admin/coding.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
</div>
<div class="input-group">
<span class="input-group-addon">Project URL:</span>
<input id="project-project-url" type="text" maxlength="1024" class="form-control" placeholder="http://url.to/project"/>
<input id="project-project-url" type="text" maxlength="1024" class="form-control" placeholder="https://url.to/project"/>
</div>
<div class="input-group">
<span class="input-group-addon">GitHub URL:</span>
Expand Down
2 changes: 1 addition & 1 deletion roncli.com/admin/templates/admin/project.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</div>
<div class="input-group">
<span class="input-group-addon">Project URL:</span>
<input id="project-project-url" type="text" maxlength="1024" class="form-control" placeholder="http://url.to/project" value="{{project.attributes.projectUrl}}"/>
<input id="project-project-url" type="text" maxlength="1024" class="form-control" placeholder="https://url.to/project" value="{{project.attributes.projectUrl}}"/>
</div>
<div class="input-group">
<span class="input-group-addon">GitHub URL:</span>
Expand Down
2 changes: 1 addition & 1 deletion roncli.com/app/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -1029,7 +1029,7 @@ module.exports = BaseApp.extend({

$.ajax({
dataType: "json",
url: "http://" + window.location.host + "/api/-/youtube/get-video-info?videoId=" + media.videoId,
url: window.location.protocol + "//" + window.location.host + "/api/-/youtube/get-video-info?videoId=" + media.videoId,
success: function(data) {
media.title = data.channelTitle + " - " + data.title;
deferred.resolve();
Expand Down
28 changes: 14 additions & 14 deletions roncli.com/app/controllers/blog_controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,17 @@ module.exports = {
if (app.req) {
result.meta = {
"og:description": "This is the roncli.com Blog.",
"og:image": "http://" + app.req.headers.host + "/images/favicon.png",
"og:image": app.req.protocol + "://" + app.req.headers.host + "/images/favicon.png",
"og:site_name": "roncli.com",
"og:title": "The roncli.com Blog",
"og:type": "website",
"og:url": "http://" + app.req.headers.host + "/blog",
"og:url": app.req.protocol + "://" + app.req.headers.host + "/blog",
"twitter:card": "summary",
"twitter:description": "This is the roncli.com Blog.",
"twitter:image": "http://" + app.req.headers.host + "/images/favicon.png",
"twitter:image": app.req.protocol + "://" + app.req.headers.host + "/images/favicon.png",
"twitter:site": "@roncli",
"twitter:title": "The roncli.com Blog",
"twitter:url": "http://" + app.req.headers.host + "/blog"
"twitter:url": app.req.protocol + "://" + app.req.headers.host + "/blog"
};
}
callback(err, result);
Expand Down Expand Up @@ -79,17 +79,17 @@ module.exports = {
if (app.req) {
result.meta = {
"og:description": "This is the " + decodeURIComponent(params[0]) + " category of the roncli.com Blog.",
"og:image": "http://" + app.req.headers.host + "/images/favicon.png",
"og:image": app.req.protocol + "://" + app.req.headers.host + "/images/favicon.png",
"og:site_name": "roncli.com",
"og:title": "The roncli.com Blog - " + decodeURIComponent(params[0]),
"og:type": "website",
"og:url": "http://" + app.req.headers.host + "/blog/category/" + params[0],
"og:url": app.req.protocol + "://" + app.req.headers.host + "/blog/category/" + params[0],
"twitter:card": "summary",
"twitter:description": "This is the " + decodeURIComponent(params[0]) + " category of the roncli.com Blog.",
"twitter:image": "http://" + app.req.headers.host + "/images/favicon.png",
"twitter:image": app.req.protocol + "://" + app.req.headers.host + "/images/favicon.png",
"twitter:site": "@roncli",
"twitter:title": "The roncli.com Blog - " + decodeURIComponent(params[0]),
"twitter:url": "http://" + app.req.headers.host + "/blog/category/" + params[0]
"twitter:url": app.req.protocol + "://" + app.req.headers.host + "/blog/category/" + params[0]
};
}
callback(err, result);
Expand Down Expand Up @@ -162,23 +162,23 @@ module.exports = {
content = content.substr(0, 197).trim() + "...";
}
result.meta = {
"article:author": "http://www.facebook.com/roncli",
"article:author": "https://www.facebook.com/roncli",
"article:published_time": moment(post.published * 1000).format(),
"article:publisher": "http://www.facebook.com/roncli",
"article:publisher": "https://www.facebook.com/roncli",
"article:section": "Blog",
"article:tag": post.categories,
"og:description": content,
"og:image": "http://" + app.req.headers.host + "/images/favicon.png",
"og:image": app.req.protocol + "://" + app.req.headers.host + "/images/favicon.png",
"og:site_name": "roncli.com",
"og:title": post.blogTitle || "The roncli.com Blog",
"og:type": "article",
"og:url": "http://" + app.req.headers.host + "/" + params[0],
"og:url": app.req.protocol + "://" + app.req.headers.host + "/" + params[0],
"twitter:card": "summary",
"twitter:description": content,
"twitter:image": "http://" + app.req.headers.host + "/images/favicon.png",
"twitter:image": app.req.protocol + "://" + app.req.headers.host + "/images/favicon.png",
"twitter:site": "@roncli",
"twitter:title": post.blogTitle || "The roncli.com Blog",
"twitter:url": "http://" + app.req.headers.host + "/" + params[0]
"twitter:url": app.req.protocol + "://" + app.req.headers.host + "/" + params[0]
};
}
callback(err, result);
Expand Down
16 changes: 8 additions & 8 deletions roncli.com/app/controllers/coding_controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,17 @@ module.exports = {
if (app.req) {
result.meta = {
"og:description": "Discover roncli's many coding projects. See recent code commits, project releases, and more.",
"og:image": "http://" + app.req.headers.host + "/images/favicon.png",
"og:image": app.req.protocol + "://" + app.req.headers.host + "/images/favicon.png",
"og:site_name": "roncli.com",
"og:title": "roncli.com Coding Projects",
"og:type": "website",
"og:url": "http://" + app.req.headers.host + "/coding",
"og:url": app.req.protocol + "://" + app.req.headers.host + "/coding",
"twitter:card": "summary",
"twitter:description": "Discover roncli's many coding projects. See recent code commits, project releases, and more.",
"twitter:image": "http://" + app.req.headers.host + "/images/favicon.png",
"twitter:image": app.req.protocol + "://" + app.req.headers.host + "/images/favicon.png",
"twitter:site": "@roncli",
"twitter:title": "roncli.com Coding Projects",
"twitter:url": "http://" + app.req.headers.host + "/coding"
"twitter:url": app.req.protocol + "://" + app.req.headers.host + "/coding"
};
}
callback(err, result);
Expand Down Expand Up @@ -90,17 +90,17 @@ module.exports = {

result.meta = {
"og:description": content,
"og:image": "http://" + app.req.headers.host + "/images/favicon.png",
"og:image": app.req.protocol + "://" + app.req.headers.host + "/images/favicon.png",
"og:site_name": "roncli.com",
"og:title": result.project.attributes.title,
"og:type": "website",
"og:url": "http://" + app.req.headers.host + "/" + params[0],
"og:url": app.req.protocol + "://" + app.req.headers.host + "/" + params[0],
"twitter:card": "summary",
"twitter:description": content,
"twitter:image": "http://" + app.req.headers.host + "/images/favicon.png",
"twitter:image": app.req.protocol + "://" + app.req.headers.host + "/images/favicon.png",
"twitter:site": "@roncli",
"twitter:title": result.project.attributes.title,
"twitter:url": "http://" + app.req.headers.host + "/" + params[0]
"twitter:url": app.req.protocol + "://" + app.req.headers.host + "/" + params[0]
};
}
callback(err, result);
Expand Down
12 changes: 6 additions & 6 deletions roncli.com/app/controllers/default_controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,20 +34,20 @@ module.exports = {
}

result.meta = {
"article:author": "http://www.facebook.com/roncli",
"article:publisher": "http://www.facebook.com/roncli",
"article:author": "https://www.facebook.com/roncli",
"article:publisher": "https://www.facebook.com/roncli",
"og:description": content,
"og:image": "http://" + app.req.headers.host + "/images/favicon.png",
"og:image": app.req.protocol + "://" + app.req.headers.host + "/images/favicon.png",
"og:site_name": "roncli.com",
"og:title": page.title,
"og:type": "article",
"og:url": "http://" + app.req.headers.host + "/" + params[0],
"og:url": app.req.protocol + "://" + app.req.headers.host + "/" + params[0],
"twitter:card": "summary",
"twitter:description": content,
"twitter:image": "http://" + app.req.headers.host + "/images/favicon.png",
"twitter:image": app.req.protocol + "://" + app.req.headers.host + "/images/favicon.png",
"twitter:site": "@roncli",
"twitter:title": page.title,
"twitter:url": "http://" + app.req.headers.host + "/" + params[0]
"twitter:url": app.req.protocol + "://" + app.req.headers.host + "/" + params[0]
};
}

Expand Down
8 changes: 4 additions & 4 deletions roncli.com/app/controllers/files_controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@ module.exports = {
if (app.req) {
result.meta = {
"og:description": "Files on roncli.com.",
"og:image": "http://" + app.req.headers.host + "/images/favicon.png",
"og:image": app.req.protocol + "://" + app.req.headers.host + "/images/favicon.png",
"og:site_name": "roncli.com",
"og:title": "roncli.com Files",
"og:type": "website",
"og:url": "http://" + app.req.headers.host + "/files",
"og:url": app.req.protocol + "://" + app.req.headers.host + "/files",
"twitter:card": "summary",
"twitter:description": "Files on roncli.com.",
"twitter:image": "http://" + app.req.headers.host + "/images/favicon.png",
"twitter:image": app.req.protocol + "://" + app.req.headers.host + "/images/favicon.png",
"twitter:site": "@roncli",
"twitter:title": "roncli.com Files",
"twitter:url": "http://" + app.req.headers.host + "/files"
"twitter:url": app.req.protocol + "://" + app.req.headers.host + "/files"
};
}
callback(err, result);
Expand Down
Loading

0 comments on commit ab3fbd4

Please sign in to comment.