Added mysql file. Removed more old code. Made a few small tweaks for …

…the general app template.
russjohnson · Dec 30, 2009 · 2511d3a · 2511d3a
1 parent 60f8725
commit 2511d3a
Show file tree

Hide file tree

Showing 8 changed files with 88 additions and 102 deletions.
diff --git a/INSTALL/cfwheels_app_template_2009-12-30.sql b/INSTALL/cfwheels_app_template_2009-12-30.sql
@@ -0,0 +1,66 @@
+# Sequel Pro dump
+# Version 1630
+# http://code.google.com/p/sequel-pro
+#
+# Host: localhost (MySQL 5.1.38)
+# Database: listy_development
+# Generation Time: 2009-12-30 03:06:40 -0500
+# ************************************************************
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+
+# Dump of table passwordResets
+# ------------------------------------------------------------
+
+DROP TABLE IF EXISTS `passwordResets`;
+
+CREATE TABLE `passwordResets` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `email` varchar(255) DEFAULT NULL,
+  `userid` int(11) DEFAULT NULL,
+  `remoteip` varchar(255) DEFAULT NULL,
+  `token` varchar(255) DEFAULT NULL,
+  `reset` tinyint(1) DEFAULT '0',
+  `createdAt` datetime DEFAULT NULL,
+  `updatedAt` datetime DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+
+
+# Dump of table users
+# ------------------------------------------------------------
+
+DROP TABLE IF EXISTS `users`;
+
+CREATE TABLE `users` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `username` varchar(25) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
+  `password` varchar(255) CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL DEFAULT '',
+  `email` varchar(100) CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL DEFAULT '',
+  `firstName` varchar(50) CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL DEFAULT '',
+  `lastName` varchar(50) CHARACTER SET latin1 COLLATE latin1_general_ci DEFAULT NULL,
+  `admin` tinyint(1) DEFAULT '0',
+  `lastLogin` datetime DEFAULT NULL,
+  `activationCode` varchar(35) CHARACTER SET latin1 DEFAULT NULL,
+  `activatedAt` datetime DEFAULT NULL,
+  `createdAt` datetime DEFAULT NULL,
+  `updatedAt` datetime DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
diff --git a/controllers/Controller.cfc b/controllers/Controller.cfc
@@ -1,7 +1,14 @@
-<!---
-	This is the parent controller file that all your controllers should extend.
+//  Public 
+// @@Created By: Russ Johnson on 2009-12-29. 
+// @@Copyright: Copyright (c) 2009 Mad Piranha, Inc.. All rights reserved. 
+// @@License:
+
+/*
+    This is the parent controller file that all your controllers should extend.
 	You can add functions to this file to make them globally available in all your controllers.
 	Do not delete this file.
---->
-<cfcomponent extends="Wheels">
-</cfcomponent>
+*/
+
+component extends="Wheels" output="false" {
+
+}
diff --git a/models/Account.cfc b/models/Account.cfc
diff --git a/views/accounts/index.cfm b/views/accounts/index.cfm
diff --git a/views/layout.cfm b/views/layout.cfm
@@ -3,7 +3,7 @@
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<cfoutput>
-	    <title>Listy</title>
+	    <title>CFWheels App Template</title>
 
 	    #styleSheetLinkTag(sources="base.css,themes/drastic-dark/style.css, jqueryui/themes/drastic-dark/jquery-ui.css")#
 	    #javaScriptIncludeTag(sources="jquery-1.3.2.min.js, jquery-ui-1.7.2.custom.min.js", type="text/javascript")#
@@ -12,7 +12,7 @@
 <body>
   <div id="container">
     <div id="header">
-        <h1><a href="index.html">Listy</a></h1>
+        <h1><a href="/">CFWheels App Template</a></h1>
         <cfoutput>
             #includePartial('/shared/user_navigation')#
 

diff --git a/views/public/format_layout.cfm b/views/public/format_layout.cfm
@@ -3,7 +3,7 @@
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<cfoutput>
-	    <title>Listy</title>
+	    <title>CFWheels App Template</title>
 
 	    #styleSheetLinkTag(sources="base.css,themes/drastic-dark/style.css, jqueryui/themes/drastic-dark/jquery-ui.css")#
 	    #javaScriptIncludeTag(sources="jquery-1.3.2.min.js, jquery-ui-1.7.2.custom.min.js", type="text/javascript")#
@@ -12,7 +12,7 @@
 <body>
   <div id="container">
     <div id="header">
-        <h1><a href="index.html">Listy</a></h1>
+        <h1><a href="index.html">CFWheels App Template</a></h1>
         <cfoutput>
             #includePartial('/shared/user_navigation')#
 

diff --git a/views/sessions/new.cfm b/views/sessions/new.cfm
@@ -1,6 +1,7 @@
 <cfoutput>
 
-<!--- <div class="clearfix">
+<!--- TODO: THIS CODE NEEDS TO BE MOVED TO ITS OWN VIEWS 
+<div class="clearfix">
                 
     <div class="two-col-b left">
       
@@ -29,7 +30,7 @@
 <div id="box">
     <h1> Please sign in or #linkTo(text="create an account", route="signup")#</h1>
     <div class="block" id="block-login">
-        <h2>Listy</h2>
+        <h2>CFWheels App Template</h2>
         <div class="content login">
             #includePartial('/shared/render_flash')#
             <!--- <div class="flash">

diff --git a/views/users/new.cfm b/views/users/new.cfm
@@ -2,14 +2,10 @@
     <div id="box">
     <h1> Please complete the form to create your account</h1>
     <div class="block" id="block-login">
-        <h2>Listy</h2>
+        <h2>CFWheels App Template</h2>
         <div class="content login">
             #errorMessagesFor("user")#
-            <!--- <div class="flash">
-                            <div class="message notice">
-                                <p>Logged in successfully</p>
-                            </div>
-                        </div> --->
+
             #startFormTag(action="create", class="form login")#
                 <div class="group">
                     <div class="right">
@@ -54,63 +50,4 @@
         </div>
     </div>
 </div>
-</cfoutput>
-
-<!--- <h2>Sign up</h2>
-
-<div class="clearfix">
-    <div class="two-col-a left">
-
-<cfoutput>
-    #errorMessagesFor("user")#
-
-    #startFormTag(action="create", class="contactForm")#
-    
-      <p>
-        <label>Username</label>
-          #textField(objectName='user', property='username', class="textbox")#
-          <span class="hint">4 - 25 characters</span>
-        </p>
-        
-        <p>
-          <label>First Name</label>
-            #textField(objectName='user', property='firstName', class="textbox")#
-            <span class="hint">required</span>
-        </p>
-        
-        <p>
-          <label>Last Name</label>
-            #textField(objectName='user', property='lastName', class="textbox")#
-            <span class="hint">required</span>
-        </p>
-                    
-        <p>
-          <label>Email</label>
-            #textField(objectName='user', property='email', class="textbox")#
-            <span class="hint">required</span>
-        </p>
-            
-        <p>
-          <label>Password</label>
-          #passwordField(objectName='user', property='password', class="textbox")#
-          <span class="hint">required</span>
-        </p>
-        
-        <p>
-          <label>Confirm Password</label>
-            #passwordField(objectName='user', property='passwordConfirmation', class="textbox")#
-            <span class="hint">required</span>
-        </p>
-
-    #submitTag(value="Create Account", class="submit")#
-        
-    #endFormTag()#
-    </div>
-    <div class="two-col-b left">
-            
-    <h4>Resend Activation Email</h4>
-      <p>Have you already created an account but didnt receive your activation email for some reason? Click <a href="/activations/resend">here to resend</a> it.</p>
-      
-    </div>
-</div>
-</cfoutput> --->
+</cfoutput>