ilog 0.3.3 → 0.4.0

data/lib/ilog/config/routes.rb

@@ -5,9 +5,8 @@
 # get '/hello', to: ->(env) { [200, {}, ['Hello from Hanami!']] }
 
 get '/:domain/index', to: 'index#index'
+get '/:domain/(:id)/find', to: 'index#index'
 get '/:domain/(:id)', to: 'index#digital'
-
 get '/:domain/post', to: 'post#show'
 get '/:domain/index/vue', to: 'index#vue'
 get '/:domain/modules/tags', to: 'digital#tags'
-# get '/:id', to: 'digital#show'

data/lib/ilog/configuration.rb

@@ -1,10 +1,19 @@
 module Ilog
 	class Configuration
-		attr_accessor :namespaces, :host, :background_image
+		attr_accessor :namespaces, :host, :base, :background_image, :profile
 		def initialize
 			@namespaces = {}
 			@host = 'localhost'
+			@base = ''
 			@background_image = ''
+			@profile = {
+				'avatar' => '',
+				'author' => '',
+				'status' => '',
+				'website' => '',
+				'email' => '',
+				'location' => '',
+			}
 		end
 	end
-end
+end

data/lib/ilog/controllers/digital/show.rb

@@ -1,15 +1,17 @@
+require ('ilog/controllers/helpers')
+
 module Ilog
   module Controllers
     module Digital
       class Show
         include Ilog::Action
+        include Helpers
         def call(params)
-	        @database = Ilog.configuration.namespaces[params[:domain]]
-	        self.set_database @database
+	        set_database params[:domain]
 	        req = request.env['HTTP_ACCEPT']
 			if req.include? 'application/json'
 		   		post = ::Post.find(params[:id])
-		   		Post.namespace = params[:domain]
+		   		Post.namespace = get_namespace params[:domain]
 		   		self.format = :json
 		   		self.body = post.to_json(:include => ::Post::DIMENSIONS + ::Post::GROUPINGS, :methods => [:content])
 		   	else

data/lib/ilog/controllers/helpers.rb

@@ -0,0 +1,20 @@
+module Ilog
+    module Controllers
+        module Helpers
+            def set_database path
+                puts 'sbs ' + path
+    			tmp_config = ActiveRecord::Base.connection_config
+    			tmp_config[:database] = get_database path
+    			ActiveRecord::Base.establish_connection tmp_config
+    		end
+            def get_database path
+                puts 'dbs ' + path
+                puts 'result is = ' + Ilog.configuration.namespaces[get_namespace path]
+                Ilog.configuration.namespaces[get_namespace path]
+            end
+            def get_namespace path
+                path
+            end
+        end
+    end
+end

data/lib/ilog/controllers/index/digital.rb

@@ -1,21 +1,19 @@
+require ('ilog/controllers/helpers')
+
 module Ilog
   module Controllers
     module Index
       class Digital
         include Ilog::Action
-		expose :namespace, :host
-		def set_database database
-			tmp_config = ActiveRecord::Base.connection_config
-			tmp_config[:database] = database
-			ActiveRecord::Base.establish_connection tmp_config
-		end
+        include Helpers
+		expose :namespace, :vue_config
         def call(params)
-	        @database = Ilog.configuration.namespaces[params[:domain]]
-	        self.set_database @database
-	        @namespace = params[:domain]
-	        @host = Ilog.configuration.host
+            set_database params[:domain]
+	        @vue_config = Ilog.configuration
+            @namespace = get_namespace params[:domain]
 	        req = request.env['HTTP_ACCEPT']
-			if req.include? 'application/json'
+
+            if req.include? 'application/json'
 		   		post = ::Post.find(params[:id])
 		   		post.namespace = @namespace
 		   		self.format = :json
@@ -25,4 +23,4 @@ module Ilog
       end
     end
   end
-end
+end

data/lib/ilog/controllers/index/index.rb

@@ -3,62 +3,64 @@ module Ilog
     module Index
       class Index
         include Ilog::Action
-        
+        include Ilog::Controllers::Helpers
+
 		expose :books, :database
-		
+
 		GN = 7 # Golden Number
 		@count = {}
-		
+
 		@posts
 		@stuffs
 		@timestamps
 		@data
-		
+
 		def perform function, params, input = nil
-# 			@posts = ::Post.send(function, input)
-# 			@stuffs = ::Stuff.send(function, input)
-			@timestamps = ::Dimensions::Timestamp.where(timestampable_type: 'Post').or(::Dimensions::Timestamp.where(timestampable_type: 'Stuff')).order(publish: :desc)
-# 			@posts = ::Post.includes(['title', 'slug', 'timestamp', 'peoples', 'keywords']).all
-# 			@stuffs = ::Stuff.includes(['title', 'slug', 'timestamp', 'peoples', 'keywords']).all
-# 			puts 'here it is' + @posts.to_s
-# 			@items = @posts + @stuffs
-# 			puts 'here it is' + @posts.to_s
-# 			@items = @items.order('timestamps.publish DESC')
-			
-			@items = @timestamps
-			@items = self.paginate(@items, params)
-			
+			timestamps = ::Dimensions::Timestamp.where(timestampable_type: 'Post').or(::Dimensions::Timestamp.where(timestampable_type: 'Stuff')).order(publish: :desc)
+
+            data = {}
+            puts 'how params is doing? ' + params.get(:id).to_s
+            if params.get(:id).nil?
+                puts 'wee are getting better'
+                items_selected = timestamps.slice( GN * @page.to_i, GN )
+                items_selected.each_with_index do |item, index|
+                    piece = Object.const_get(item.timestampable_type.capitalize).find(item.timestampable_id)
+                    data[index] = JSON.parse(piece.to_json(:include => ['title', 'slug', 'timestamp', 'peoples', 'keywords'], :methods => [:kind, :uniq]))
+                end
+            else
+                timestamp = ::Dimensions::Timestamp.where(timestampable_type: 'Post', timestampable_id: params[:id]).first
+                retrive_index = timestamps.map(&:id).index(timestamp.id)
+                @page = (timestamps.map(&:id).index(timestamp.id).to_i / GN).to_i
+                items_selected = timestamps.slice( GN * @page.to_i, GN )
+                items_selected.each_with_index do |item, index|
+                    piece = Object.const_get(item.timestampable_type.capitalize).find(item.timestampable_id)
+                    data[index] = JSON.parse(piece.to_json(:include => ['title', 'slug', 'timestamp', 'peoples', 'keywords'], :methods => [:kind, :uniq]))
+                    if (item.id == timestamp.id)
+                        post = Object.const_get(timestamp.timestampable_type.capitalize).find(timestamp.timestampable_id)
+                        post.namespace = get_namespace params[:domain]
+                        data[index][:content] = post.content
+                        data[index][:view] = 'post_body'
+                    end
+                end
+            end
 			@count = {
 				'posts' => 0,
 				'stuffs' => 0
 			}
-			
 			self.format =  :json
-	        self.body = {:items => @items, :count => @count}.to_json
+	        self.body = {:items => paginate(timestamps.count, params, data), :count => @count}.to_json
 		end
-		
-		def set_database database
-			tmp_config = ActiveRecord::Base.connection_config
-			tmp_config[:database] = database
-			ActiveRecord::Base.establish_connection tmp_config
-		end
-		
+
 		def initialize
 # 			puts 'here we go' + Ilog.configuration.namespaces.class.to_s
-			
+
 			@posts = ::Post.all
 # 			p 'getting posts = ' + @posts.to_s
 	        @stuffs = ::Stuff.all
 		end
-		
-		def paginate items, params
-			unless params[:page].nil?
-				@page = params[:page]
-			else
-				@page = 0
-			end
-			@items_selected = items.slice( GN * @page.to_i, GN )
-			@last_page = [(items.count / GN).ceil, 1].max
+
+		def paginate count, params, data
+			@last_page = [(count / GN).ceil, 1].max
 			def next_page_url
 				if ( @last_page > @page.to_i)
 					return '/index?page=' + (@page.to_i + 1).to_s
@@ -71,17 +73,10 @@ module Ilog
 					return nil
 				end
 			end
-			
-			@data = {}
-			@items_selected.each_with_index do |item, index|
-				puts 'the index is equal to ' + index.to_s
-				piece = Object.const_get(item.timestampable_type.capitalize).find(item.timestampable_id)
-				@data[index] = JSON.parse(piece.to_json(:include => ['title', 'slug', 'timestamp', 'peoples', 'keywords'], :methods => [:kind, :uniq]))
-			end
-			
+
 			return {
 				'current_page' => @page,
-				'data' => @data,
+				'data' => data,
 				'first_page_url' => '', # $this->url(1),
 				'from' => '', # $this->firstItem(),
 				'last_page' => @last_page, #$this->lastPage(),
@@ -91,17 +86,20 @@ module Ilog
 				'per_page' => GN, #$this->perPage(),
 				'prev_page_url' => prev_page_url, #$this->previousPageUrl(),
 				'to' => '', #$this->lastItem(),
-				'total' => items.count,
+				'total' => count,
 			}
 		end
-		
-		
+
         def call(params)
-	        @database = Ilog.configuration.namespaces[params[:domain]]
-	        self.set_database @database
+            unless params[:page].nil?
+				@page = params[:page]
+			else
+				@page = 0
+			end
+	        set_database params[:domain]
 	        self.perform(:retrive_all, params)
         end
       end
     end
   end
-end
+end

data/lib/ilog/templates/index/digital.html.erb

@@ -10,9 +10,10 @@
 		<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.2/css/all.css" integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" crossorigin="anonymous">
 		<script>
 			Window.Config = {
-				"host": "<%= host %>",
+				"host": "<%= vue_config.host %>",
+				"base": "<%= vue_config.base %>",
 				"title": "My Blog",
-				"profile": { "avatar": "", "author": "", "status": "", "website": "", "email": "", "location": "" },
+				"profile": <%= vue_config.profile.to_json %>,
 				"digital": { "uri": "<%= namespace %>" },
 				"analog": { "uri": "weblog" }
 			};
@@ -27,25 +28,25 @@
 				-o-background-size: cover;
 				background-size: cover;
 			}
-		</style> 
+		</style>
 	</head>
-	
+
 	<body>
-		<noscript> 
-<!--	
+		<noscript>
+<!--
 			<header>
 				<h1>
 					<a href="{{ url(config('bp-log.digital.uri'), '') }}">{{ config('bp-log.title')}}</a>
 					<span><a class="inlink" style="font-size: .8rem;" href="{{ url(config('bp-log.analog.uri'), '') }}">static version</a></span>
 				</h1>
 			</header>
--->		
+-->
 		</noscript>
-		
-		
-		
+
+
+
 		<div id="bp-log">
 		</div>
 		<%= javascript 'vue-index' %>
 	</body>
-</html>
+</html>

data/lib/ilog/version.rb

@@ -1,3 +1,3 @@
 module Ilog
-  VERSION = "0.3.3"
+  VERSION = "0.4.0"
 end

data/lib/ilog/views/index/digital.rb

@@ -5,7 +5,7 @@ module Ilog
         include Ilog::View
         layout false
         def host
- 	       raw locals[:host]
+ 	       raw locals[:vue_config]
  	    end
       end
     end

data/src/sass/log/base.scss

@@ -2,7 +2,7 @@
 	color: black;
 	text-shadow: none;
 	overflow: visible;
-	
+
 	> header, > footer {
 		z-index: 2;
 		text-shadow: none;
@@ -36,8 +36,8 @@
 			border-radius: 0px .4rem .4rem 0px;
 		}
 	}
-	
-	
+
+
 	> header {
 		> p {
 			margin: 0px .4rem;
@@ -63,6 +63,7 @@
 				}
 			}
 			.avatar {
+				margin: 1rem;
 				padding: 0px;
 				display: inline-block;
 				background-position: center;
@@ -70,6 +71,8 @@
 				background-size: cover;
 				min-width: 2rem;
 				min-height: 2rem;
+				width: auto;
+				height: auto;
 				max-height: 30vh;
 				max-width: 100%;
 				@include breakpoint(lg) {
@@ -82,7 +85,7 @@
 				}
 			}
 		}
-		
+
 	}
 	> footer {
 		margin: 0px;
@@ -120,13 +123,13 @@
 				@include breakpoint(xl) {
 					display: block;
 					padding: .8rem !important;
-					
+
 					> span {
 						display: inline;
 					}
 				}
 			}
-			
+
 		}
 	}
-}
+}

data/src/sass/log/list.scss

@@ -13,9 +13,12 @@
 				background-color: $main-color !important;
 			}
 			img {
+				margin: 1rem;
 				max-width: 45vw;
 				max-height: 50vh;
 				padding: 0px;
+				min-width: 4rem;
+				min-height: 4rem;
 			}
 		}
 		> .tunekit {
@@ -65,8 +68,9 @@
 	> header, > footer {
 		nav {
 			text-align: center;
-			background-color: rgba($second-color, .9);
+			background-color: rgba($main-color, .9);
 			.button {
+				font-size: 1.2rem;
 				display: block;
 				cursor: hand;
 				color: $second-color-op;
@@ -74,6 +78,11 @@
 					background-color: #333;
 					color: white;
 				}
+				.loading::after {
+					border-color: $second-color-op;
+					border-right-color: transparent;
+    				border-top-color: transparent;
+				}
 			}
 		}
 	}
@@ -103,7 +112,7 @@
 			color: $main-color;
 		}
 		.title {
-			padding: 0px 1em .9em 1em;
+			padding: 0px 1em .4em 1em;
 			display: block;
 		}
 
@@ -114,7 +123,9 @@
 			max-height: 75vh;
 		}
 		.tag {
-			display: content;
+			display: inline-block !important;
+			margin: 0px;
+			padding: 0px;
 			> a {
 				font-size: .8rem;
 				margin: 0px .5rem;
@@ -138,7 +149,12 @@
 				}
 			}
 			> footer {
-				background-color: lighten($second-color, 20%);
+				padding: .4rem 1.4rem;
+				text-align: center;
+				color: lighten($second-color, 10%);
+			}
+			> footer.container {
+				padding: 0px;
 			}
 			background-color: #fff;
 			opacity: .9;
@@ -146,7 +162,7 @@
 		}
 		> .active { opacity: 1; }
 	}
-	> .Stuff {
+	> .stuff {
 		> * {
 			background-color: $second-color;
 		}
@@ -166,13 +182,6 @@
 }
 .log-list {
 	> .post {
-		animation: colorup .5s forwards;
-		background-color: rgba($main-color, .9);
-		color: white;
-		&:hover {
-			animation: fade .5s forwards;
-			background-color: rgba($main-color, 1);
-		}
 		.post-body {
 			background-color: white;
 			color: black;
@@ -181,19 +190,22 @@
 				padding: 0px;
 				width: 100%;
 			}
+			> .text {
+				padding-top: 1em !important;
+			}
 			.timestamps {
 				margin: 0px;
-				padding: 0px;
+				padding: 1rem;
 				font-size: .8rem;
 				color: white;
 				list-style: none !important;
 				p {
-					margin: .2rem;
+					// margin: .2rem;
 					padding: 0px .4rem;
-					border-radius: .2rem;
-					background-color: $second-color;
+					// border-radius: .2rem;
+					// background-color: $second-color;
 					display: inline-block;
-					color: $second-color-op;
+					color: $second-color;
 					.label {
 						color: #333;
 					}
@@ -201,39 +213,39 @@
 			}
 		}
 	}
-	> .stuff {
-		padding: 0px;
-
-		> a {
-			margin: 0px;
-			padding: 0px;
-			display: flex;
-			> header, > footer {
-				writing-mode: vertical-lr;
-				color: $second-color-op;
-				> * {
-					padding: 1rem 0px;
-					margin: auto;
-					width: fit-content;
-					height: fit-content;
-				}
-			}
-			background-color: rgba($second-color, .9);
-			color: #eee;
-			> header, > footer {
-				background-color: rgba($second-color, .4);
-			}
-			&:hover {
-				animation: stuffup2 .5s forwards;
-				background-color: rgba($second-color, 1);
-				color: black;
-				> header, > footer {
-					animation: stuffup .5s forwards;
-				}
-			}
-
-		}
-	}
+	// > .stuff {
+	// 	padding: 0px;
+	//
+	// 	> a {
+	// 		margin: 0px;
+	// 		padding: 0px;
+	// 		display: flex;
+	// 		> header, > footer {
+	// 			writing-mode: vertical-lr;
+	// 			color: $second-color-op;
+	// 			> * {
+	// 				padding: 1rem 0px;
+	// 				margin: auto;
+	// 				width: fit-content;
+	// 				height: fit-content;
+	// 			}
+	// 		}
+	// 		background-color: rgba($second-color, .9);
+	// 		color: #eee;
+	// 		> header, > footer {
+	// 			background-color: rgba($second-color, .4);
+	// 		}
+	// 		&:hover {
+	// 			animation: stuffup2 .5s forwards;
+	// 			background-color: rgba($second-color, 1);
+	// 			color: black;
+	// 			> header, > footer {
+	// 				animation: stuffup .5s forwards;
+	// 			}
+	// 		}
+	//
+	// 	}
+	// }
 }
 @keyframes stuffup2 {
 	from {color:#eee;

data/src/vue/Ilog.vue

@@ -15,7 +15,7 @@
 				<span v-if="title" v-html="title" class="title"></span>
 				<nav v-if="page.prev" class>
 					<span class="status" v-if="loading">{{ loading }}</span>
-					<span class="button" v-if="!loading" v-on:click="retriveNewer()">Newer</span>
+					<span class="button" v-if="!loading" v-on:click="retriveNewer()"><i class="icon icon-more-horiz"></i></span>
 				</nav>
 			</header>
 
@@ -27,8 +27,8 @@
 
 			<footer>
 				<nav v-if="page.next" class="footer">
-					<span class="button" v-if="!loading" v-on:click="retriveNextPage()">Older</span>
-					<span class="status" v-if="loading">{{ loading }}</span>
+					<span class="button" v-if="!loading" v-on:click="retriveNextPage()"><i class="icon icon-more-horiz"></i></span>
+					<span class="status button" v-if="loading"><div class="loading loading-lg"></div></span>
 				</nav>
 			</footer>
 		</main>
@@ -110,7 +110,7 @@ export default {
 		return {
 			title: this.head + ' by ' + this.author + ' (Digital Ilog)',
 			meta: [{ vmid: 'description', name: 'description', content: app.profile.status }],
-			host: Window.Config.host + '/' +  app.host
+			host: app.host
 		}
 	},
 	mounted () {

data/src/vue/components/Item.vue

@@ -1,5 +1,5 @@
 <template>
-	<div :class="'item ' + content.kind">
+	<div :class="'item ' + content.kind.toLowerCase()">
 		<component :is="content.kind" :content="content">
 		</component>
 	</div>
@@ -43,4 +43,4 @@ export default {
 </script>
 
 <style scoped>
-</style>
+</style>

data/src/vue/components/Post.vue

@@ -13,7 +13,7 @@
 			</div>
 			<footer>
 				<template v-if="typeof(content.keywords) !== 'undefined' && content.keywords.length != 0">
-						<div class="tags" >
+						<div class="tags">
 							<template v-for="keyword in content.keywords">
 								<span class="tag">
 									<!--<router-link :to="{ name: 'tag', params: { id: keyword.id }}">-->