Merge pull request #5 from scrain/Issue_4_User_Page_404

Issue 4 user page 404
grails-samples · Aug 23, 2015 · e033c03 · e033c03
2 parents 02c450e + 3a6450b
commit e033c03
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 13 deletions.
diff --git a/build.gradle b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
 }
 
 plugins {
-    id "io.spring.dependency-management" version "0.4.0.RELEASE"
+    id "io.spring.dependency-management" version "0.5.2.RELEASE"
 }
 
 version "0.1"

diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,2 @@
-grailsVersion=3.0.0.RC3
+grailsVersion=3.0.4
 gradleWrapperVersion=2.3
diff --git a/grails-app/controllers/UrlMappings.groovy b/grails-app/controllers/UrlMappings.groovy
@@ -4,7 +4,8 @@ class UrlMappings {
         "/login"(controller: 'auth', action: 'index')
         "/status"(controller: 'status', action: 'index')
         "/updateStatus"(controller: 'status', action: 'updateStatus')
-        "/users"(controller: 'person', action: 'index')
+        "/person/index"(controller: 'person', action: 'index')
+        "/person/show/${id}"(controller: 'person', action: 'show')
         "/unfollow/$userToUnfollow"(controller: 'person', action: 'unfollow')
         "/follow/$userToFollow"(controller: 'person', action: 'follow')
         "/"(view:"/index")

diff --git a/grails-app/controllers/org/grails/twitter/PersonController.groovy b/grails-app/controllers/org/grails/twitter/PersonController.groovy
@@ -20,4 +20,8 @@ class PersonController {
         statusService.follow userToFollow
         redirect action: 'index'
     }
+
+    def show(Person person) {
+        [person: person, messages: Status.findAllByAuthor(person, [max: 10, sort: "dateCreated", order: "desc" ] )]
+    }
 }
diff --git a/grails-app/init/twitter/Application.groovy b/grails-app/init/twitter/Application.groovy
@@ -5,6 +5,6 @@ import grails.boot.config.GrailsAutoConfiguration
 
 class Application extends GrailsAutoConfiguration {
     static void main(String[] args) {
-        GrailsApp.run(Application)
+        GrailsApp.run(Application, args)
     }
 }
diff --git a/grails-app/views/person/index.gsp b/grails-app/views/person/index.gsp
@@ -12,6 +12,8 @@
 		<div class="nav" role="navigation">
 			<ul>
 				<li><a class="home" href="${createLink(uri: '/status')}"><g:message code="default.home.label"/></a></li>
+                <li><g:link controller="person">Users</g:link></li>
+                <li><a href="/logout">Logout</a></li>
 			</ul>
 		</div>
 		<div id="list-person" class="content scaffold-list" role="main">

diff --git a/grails-app/views/person/show.gsp b/grails-app/views/person/show.gsp
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta name="layout" content="main" />
+        <g:set var="entityName" value="${message(code: 'person.label', default: 'Person')}" />
+        <title><g:message code="default.show.label" args="[entityName]" /></title>
+    </head>
+    <body>
+        <a href="#show-person" class="skip" tabindex="-1"><g:message code="default.link.skip.label" default="Skip to content&hellip;"/></a>
+        <div class="nav" role="navigation">
+            <ul>
+                <li><a class="home" href="${createLink(uri: '/status')}"><g:message code="default.home.label"/></a></li>
+                <li><g:link controller="person">Users</g:link></li>
+                <li><a href="/logout">Logout</a></li>
+            </ul>
+        </div>
+
+        <div class="pageBody">
+            <h1>${person.displayName}</h1>
+            <g:if test="${flash.message}">
+            <div class="message" role="status">${flash.message}</div>
+            </g:if>
+            <span class="property-label">User Name: </span>
+            <span class="property-value">${person.userName}</span>
+
+            <h1>Following</h1>
+            <g:if test="${!person.followed}">none</g:if>
+            <f:table collection="${person.followed}" properties="['displayName', 'userName']"/>
+
+            <h1>Latest Messages by ${person.displayName}</h1>
+            <g:if test="${!messages}">none</g:if>
+            <twitter:renderMessages messages="${messages}"/>
+        </div>
+    </body>
+</html>
diff --git a/grails-app/views/status/index.gsp b/grails-app/views/status/index.gsp
@@ -5,15 +5,14 @@
     <g:javascript library="jquery" plugin="jquery" />
 </head>
 <body>
+    <div class="nav" role="navigation">
+        <ul>
+            <li><a class="home" href="${createLink(uri: '/status')}"><g:message code="default.home.label"/></a></li>
+            <li><g:link controller="person">Users</g:link></li>
+            <li><a href="/logout">Logout</a></li>
+        </ul>
+    </div>
     <div class="pageBody">
-        <p>
-            <div class="nav" role="navigation">
-                <ul>
-                    <li><g:link controller="person">Users</g:link></li>
-                    <li><a href="/logout">Logout</a></li>
-                </ul>
-            </div>
-        </p>
         <h1>Hello <twitter:renderCurrentUserName/>. What Are You Doing?</h1>
         <div class="updatStatusForm">
             <g:formRemote url="[action: 'updateStatus']" update="messages" name="updateStatusForm"

diff --git a/src/integration-test/groovy/functionaltests/auth/LoginFunctionalSpec.groovy b/src/integration-test/groovy/functionaltests/auth/LoginFunctionalSpec.groovy
@@ -52,7 +52,7 @@ class LoginFunctionalSpec extends GebSpec{
         at StatusPage
 
         when:
-        go '/users'
+        go '/person/index'
 
         then:
         at UserPage