Refactoring

micronode · Jul 27, 2019 · dc6051b · dc6051b
1 parent c90f22d
commit dc6051b
Show file tree

Hide file tree

Showing 30 changed files with 137 additions and 281 deletions.
diff --git a/feedhabit-app/build.gradle b/feedhabit-app/build.gradle
diff --git a/feedhabit-config/build.gradle b/feedhabit-config/build.gradle
diff --git a/feedhabit-content/build.gradle b/feedhabit-content/build.gradle
diff --git a/gradle.properties b/gradle.properties
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/settings.gradle b/settings.gradle
diff --git a/...-INF/content/block/category-list/html.esp → src/app/block/category-list/html.esp b/...-INF/content/block/category-list/html.esp → src/app/block/category-list/html.esp
diff --git a/src/app/block/category-list/html.groovy b/src/app/block/category-list/html.groovy
@@ -0,0 +1,13 @@
+import groovy.json.JsonParser
+
+try {
+    def categoriesUrl = currentNode.getProperty('uri').string.toURL().text
+    def limit = request.requestPathInfo.suffix ? request.requestPathInfo.suffix.substring(1) as int : Integer.MAX_VALUE;
+
+    def categories = JsonParser.parseText(categoriesUrl)
+    categories.list().take(limit).each {
+        out.write("<li><a href=\"$it.link\" title=\"${it.description.text().replaceAll('"', '&quot;')}\"  data-html=\"true\" rel=\"tooltip\">$it.title</a></li>")
+    }
+} catch (ex) {
+    ex.printStackTrace()
+}
diff --git a/...SLING-INF/content/block/category/html.esp → src/app/block/category/html.esp b/...SLING-INF/content/block/category/html.esp → src/app/block/category/html.esp
diff --git a/...LING-INF/content/block/feed-list/html.esp → src/app/block/feed-list/html.esp b/...LING-INF/content/block/feed-list/html.esp → src/app/block/feed-list/html.esp
diff --git a/.../resources/SLING-INF/content/css/grid.css → src/app/css/grid.css b/.../resources/SLING-INF/content/css/grid.css → src/app/css/grid.css
diff --git a/...resources/SLING-INF/content/css/style.css → src/app/css/style.css b/...resources/SLING-INF/content/css/style.css → src/app/css/style.css
diff --git a/...n/resources/SLING-INF/content/favicon.ico → src/app/favicon.ico b/...n/resources/SLING-INF/content/favicon.ico → src/app/favicon.ico
diff --git a/...sources/SLING-INF/content/footer/html.esp → src/app/footer/html.esp b/...sources/SLING-INF/content/footer/html.esp → src/app/footer/html.esp
diff --git a/...sources/SLING-INF/content/header/html.esp → src/app/header/html.esp b/...sources/SLING-INF/content/header/html.esp → src/app/header/html.esp
diff --git a/.../SLING-INF/content/page/category/html.esp → src/app/page/category/html.esp b/.../SLING-INF/content/page/category/html.esp → src/app/page/category/html.esp
diff --git a/...ces/SLING-INF/content/page/index/html.esp → src/app/page/index/html.esp b/...ces/SLING-INF/content/page/index/html.esp → src/app/page/index/html.esp
diff --git a/...rces/SLING-INF/content/page/list/html.esp → src/app/page/list/html.esp b/...rces/SLING-INF/content/page/list/html.esp → src/app/page/list/html.esp
diff --git a/.../resources/SLING-INF/content/etc/map.json → src/config/map.json b/.../resources/SLING-INF/content/etc/map.json → src/config/map.json
diff --git a/...esources/SLING-INF/content/analytics.json → src/content/analytics.json b/...esources/SLING-INF/content/analytics.json → src/content/analytics.json
diff --git a/...sources/SLING-INF/content/categories.json → src/content/categories.json b/...sources/SLING-INF/content/categories.json → src/content/categories.json
diff --git a/src/content/feeds.json b/src/content/feeds.json
@@ -0,0 +1,18 @@
+{
+  "title": "Feeds - FeedHabit.com",
+  "sling:resourceType": "feedhabit/page/list",
+  "jcr:primaryType": "nt:unstructured",
+  "list": {
+    "sling:resourceType": "feedhabit/block/feed-list",
+    "abc-shepparton": {
+      "sling:resourceType":"/libs/wp-rss/block/list",
+      "feedUrl": "http://www.abc.net.au/local/topics/shepparton/community-and-society/rss.xml",
+      "htmlUrl": "http://www.abc.net.au/shepparton"
+    },
+    "slashdot-org": {
+      "sling:resourceType":"/libs/wp-rss/block/list",
+      "feedUrl": "http://rss.slashdot.org/Slashdot/slashdotMain",
+      "htmlUrl": "http://slashdot.org"
+    }
+  }
+}
diff --git a/...n/resources/SLING-INF/content/footer.json → src/content/footer.json b/...n/resources/SLING-INF/content/footer.json → src/content/footer.json
diff --git a/...n/resources/SLING-INF/content/header.json → src/content/header.json b/...n/resources/SLING-INF/content/header.json → src/content/header.json
diff --git a/...in/resources/SLING-INF/content/index.json → src/content/index.json b/...in/resources/SLING-INF/content/index.json → src/content/index.json