iatelier 0.3.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59902da7760bd3d7aae916886d0a3a6cd0a4f37eb19bbfabaf471aa8a4b423df
-  data.tar.gz: 5d143a4e9c9fcd20807ce1bfc8b1513390569a2e5608b21cf1a8183772288edd
+  metadata.gz: 76590b778f4a1751dd45b71b66454fd09cd4ccef1d618877104640f4b081ada5
+  data.tar.gz: 19ee2dac571df2899673d08636fedcbeef8f77a29a5280d7c7e4c8711251ec23
 SHA512:
-  metadata.gz: 04271bdfc01be667d2c67e6b6499bbcebc596bcac65c9008a9ddd97896daae2cee429dc493043c0f643098cad4cac0ab1753e45725b768550c670c9a22569251
-  data.tar.gz: 54bcd88b6f7c87125f5ea158aa7cfd5848e6a3824d57818d440df8b179439548a10f8adf08f4cb062abfc5cf7b8e1314a57224689e7954a528a7365ec2596c92
+  metadata.gz: 85efe36bba980cf2d6ae02dad61d6d2d8df5f88cf4d65223d0bac66be8512ed167d804ba9b791348245a94c4c2bccb6487fa49e0495e3a7c765a952735fb2677
+  data.tar.gz: 2bad2720e84c46ba353a4226768a76a1384a6f2d4a6ccf95dbf5eb5f7ff3520d861de25a721eefd0b38a490e385537b22a8f5138d2aa7338d567c1d98f642add

data/lib/iatelier.rb

@@ -114,7 +114,7 @@ module Iatelier
       #
       # middleware.use Rack::Protection
       middleware.use Rack::Auth::Basic, 'Welcome' do |username, password|
-	    username == self.configuration.admin_username && password == self.configuration.admin_password
+	    username == Iatelier.configuration.admin_username && password == Iatelier.configuration.admin_password
 	  end
 
       # Default format for the requests that don't specify an HTTP_ACCEPT header

data/lib/iatelier/assets/stylesheets/iatelier.css

@@ -521,6 +521,516 @@ a:hover {
   background-color: rgba(255, 255, 255, 0.2);
 }
 
+.selectable-text {
+  cursor: text;
+  -webkit-user-select: text;
+}
+
+.text-center {
+  text-align: center;
+}
+
+.text-right {
+  text-align: right;
+}
+
+.text-left {
+  text-align: left;
+}
+
+.pull-left {
+  float: left;
+}
+
+.pull-right {
+  float: right;
+}
+
+.padded {
+  padding: 10px;
+}
+
+.padded-less {
+  padding: 5px;
+}
+
+.padded-more {
+  padding: 20px;
+}
+
+.padded-vertically {
+  padding-top: 10px;
+  padding-bottom: 10px;
+}
+
+.padded-vertically-less {
+  padding-top: 5px;
+  padding-bottom: 5px;
+}
+
+.padded-vertically-more {
+  padding-top: 20px;
+  padding-bottom: 20px;
+}
+
+.padded-horizontally {
+  padding-right: 10px;
+  padding-left: 10px;
+}
+
+.padded-horizontally-less {
+  padding-right: 5px;
+  padding-left: 5px;
+}
+
+.padded-horizontally-more {
+  padding-right: 20px;
+  padding-left: 20px;
+}
+
+.padded-top {
+  padding-top: 10px;
+}
+
+.padded-top-less {
+  padding-top: 5px;
+}
+
+.padded-top-more {
+  padding-top: 20px;
+}
+
+.padded-bottom {
+  padding-bottom: 10px;
+}
+
+.padded-bottom-less {
+  padding-bottom: 5px;
+}
+
+.padded-bottom-more {
+  padding-bottom: 20px;
+}
+
+.sidebar {
+  background-color: #f5f5f4;
+}
+
+.draggable {
+  -webkit-app-region: drag;
+}
+
+.clearfix:before,
+.clearfix:after {
+  display: table;
+  content: " ";
+}
+
+.clearfix:after {
+  clear: both;
+}
+
+* {
+  cursor: default;
+  box-sizing: border-box;
+}
+
+html {
+  height: 100%;
+  width: 100%;
+  overflow: hidden;
+}
+
+body {
+  height: 100%;
+  padding: 0;
+  margin: 0;
+  font-family: system, -apple-system, ".SFNSDisplay-Regular", "Helvetica Neue", Helvetica, "Segoe UI", sans-serif;
+  font-size: 13px;
+  line-height: 1.6;
+  color: #333;
+  background-color: transparent;
+}
+
+hr {
+  margin: 15px 0;
+  overflow: hidden;
+  background: transparent;
+  border: 0;
+  border-bottom: 1px solid #ddd;
+}
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  margin-top: 20px;
+  margin-bottom: 10px;
+  font-weight: 500;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+h1 {
+  font-size: 36px;
+}
+
+h2 {
+  font-size: 30px;
+}
+
+h3 {
+  font-size: 24px;
+}
+
+h4 {
+  font-size: 18px;
+}
+
+h5 {
+  font-size: 14px;
+}
+
+h6 {
+  font-size: 12px;
+}
+
+/*
+.window {
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+	display: flex;
+  flex-direction: column;
+  background-color: $chrome-color;
+}
+*/
+
+.window-content {
+  position: relative;
+  overflow-y: auto;
+  display: -webkit-box;
+  display: flex;
+  -webkit-box-flex: 1;
+          flex: 1;
+}
+
+.toolbar {
+  min-height: 22px;
+  box-shadow: inset 0 1px 0 #f5f4f5;
+  background-color: #e8e6e8;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e6e8), to(#d1cfd1));
+  background-image: linear-gradient(to bottom, #e8e6e8 0%, #d1cfd1 100%);
+}
+
+.toolbar:before,
+.toolbar:after {
+  display: table;
+  content: " ";
+}
+
+.toolbar:after {
+  clear: both;
+}
+
+.toolbar-header {
+  border-bottom: 1px solid #b3b2b3;
+}
+
+.toolbar-header .title {
+  margin-top: 1px;
+}
+
+.toolbar-footer {
+  border-top: 1px solid #b3b2b3;
+  -webkit-app-region: drag;
+}
+
+.title {
+  margin: 0;
+  font-size: 12px;
+  font-weight: 400;
+  text-align: center;
+  color: #555;
+  cursor: default;
+}
+
+.toolbar-borderless {
+  border-top: 0;
+  border-bottom: 0;
+}
+
+.toolbar-actions {
+  margin-top: 4px;
+  margin-bottom: 3px;
+  padding-right: 3px;
+  padding-left: 3px;
+  padding-bottom: 3px;
+  -webkit-app-region: drag;
+}
+
+.toolbar-actions:before,
+.toolbar-actions:after {
+  display: table;
+  content: " ";
+}
+
+.toolbar-actions:after {
+  clear: both;
+}
+
+.toolbar-actions > .btn,
+.toolbar-actions > .btn-group {
+  margin-left: 4px;
+  margin-right: 4px;
+}
+
+.menu-bar {
+  margin: 0px;
+  padding: 0px;
+  font-size: 12px;
+  background-color: #d3d3d3;
+  border-bottom: 1px solid black;
+}
+
+.menu-bar a {
+  display: inline-block;
+  margin: 0px 0px;
+  padding: 1px 8px;
+  border: none;
+  background-color: transparent;
+}
+
+.menu-bar a:hover {
+  color: white;
+  background-color: #345EF2;
+  border: none;
+}
+
+.window .bar {
+  box-shadow: inset 0 1px 0 #f5f4f5;
+  background-color: #e8e6e8;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e6e8), to(#d1cfd1));
+  background-image: linear-gradient(to bottom, #e8e6e8 0%, #d1cfd1 100%);
+}
+
+.window .bar > .menu {
+  height: 22px;
+}
+
+.window .bar > .buttons {
+  height: 44px;
+}
+
+.window .bar > .tabs {
+  border-top: 1px solid gray;
+}
+
+.window .bar > .tabs > a {
+  display: inline-block;
+  font-size: 12px;
+  margin: 4px 1px;
+  padding: 0px 8px;
+  border-radius: 4px;
+  border: none;
+  background-color: transparent;
+}
+
+.window .bar > .tabs > a:hover {
+  background-color: rgba(0, 0, 0, 0.2);
+  color: white;
+}
+
+.window .bar > .tabs > a:active {
+  background-color: rgba(0, 0, 0, 0.4);
+  color: white;
+}
+
+#os {
+  display: -ms-grid;
+  display: grid;
+  -ms-grid-rows: 20px auto;
+  grid-template-rows: 20px auto;
+  height: 100vh;
+  width: 100vw;
+}
+
+#os .menu-bar {
+  margin: 0px;
+  padding: 0px;
+  font-size: 12px;
+  background-color: #d3d3d3;
+  border-bottom: 1px solid black;
+}
+
+#os .menu-bar a {
+  display: inline-block;
+  margin: 0px 0px;
+  padding: 1px 8px;
+  border: none;
+  background-color: transparent;
+}
+
+#os .menu-bar a:hover {
+  color: white;
+  background-color: #345EF2;
+  border: none;
+}
+
+#os .desk {
+  min-height: 0;
+}
+
+.window {
+  height: 100%;
+  max-height: 100%;
+  max-width: 100%;
+  display: -ms-grid;
+  display: grid;
+  -ms-grid-rows: min-content 1fr min-content;
+  grid-template-rows: -webkit-min-content 1fr -webkit-min-content;
+  grid-template-rows: min-content 1fr min-content;
+}
+
+.window .bar {
+  box-shadow: inset 0 1px 0 #f5f4f5;
+  background-color: #e8e6e8;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e6e8), to(#d1cfd1));
+  background-image: linear-gradient(to bottom, #e8e6e8 0%, #d1cfd1 100%);
+}
+
+.window .bar > .menu {
+  height: 22px;
+  text-align: center;
+}
+
+.window .bar > .buttons {
+  height: 44px;
+}
+
+.window .bar > .tabs {
+  border-top: 1px solid gray;
+}
+
+.window .bar > .tabs > a {
+  display: inline-block;
+  font-size: 12px;
+  margin: 4px 1px;
+  padding: 0px 8px;
+  border-radius: 4px;
+  border: none;
+  background-color: transparent;
+}
+
+.window .bar > .tabs > a:hover {
+  background-color: rgba(0, 0, 0, 0.2);
+  color: white;
+}
+
+.window .bar > .tabs > a:active {
+  background-color: rgba(0, 0, 0, 0.4);
+  color: white;
+}
+
+.window .content {
+  min-height: 0;
+}
+
+.window-drawer-top {
+  margin: 0.5rem auto;
+  padding: 0.4rem;
+  max-width: 40rem;
+  text-align: left;
+  background-color: #e8e6e8;
+}
+
+.window > .content {
+  display: -ms-grid;
+  display: grid;
+  -ms-grid-columns: 1fr;
+  grid-template-columns: 1fr;
+}
+
+@media screen and (min-width: 35.5em) {
+  .window > .content {
+    -ms-grid-columns: 14.4rem 1fr;
+    grid-template-columns: 14.4rem 1fr;
+  }
+}
+
+.window > .content > .sidebar {
+  display: none;
+  overflow-y: scroll;
+}
+
+@media screen and (min-width: 35.5em) {
+  .window > .content > .sidebar {
+    display: block;
+  }
+}
+
+.window > .content > .panel {
+  overflow: scroll;
+  min-width: 0px;
+}
+
+.text-editor {
+  min-height: 80vh;
+}
+
+.panel-edit > .form-box {
+  padding: 0.8rem;
+  background-color: #cdcdcd;
+  border-radius: 0.4rem;
+  box-shadow: inset 0px 0px 1px grey;
+}
+
+.os-form-group {
+  margin: 0.4rem 0.4rem;
+  white-space: nowrap;
+}
+
+.os-form-group > label {
+  display: inline-block;
+  width: 5em;
+  vertical-align: middle;
+  text-align: end;
+  white-space: normal;
+  word-wrap: break-word;
+}
+
+.os-form-group > .form-control {
+  display: inline-block;
+  width: calc(100% - 5em);
+  box-sizing: border-box;
+  vertical-align: middle;
+  white-space: normal;
+}
+
+/*
+@import '~purecss/build/pure-min.css';
+@import '~purecss/build/grids-responsive-min.css';
+@import '/pure/grids/xx';
+
+// BlazeCSS
+// @import '~blaze';
+
+// font
+@import '/fonts';
+
+// variables & basics
+@import '/shadow';
+@import '/colors/style';
+
+@import '/components/link-button';
+@import '/components/insection';
+*/
+
 .text-editor {
   min-height: 80vh;
 }

data/lib/iatelier/controllers/books/edit.rb

@@ -9,6 +9,7 @@ module Iatelier
 	        @database = params[:database]
 	        self.set_database database
 	        @book = Object.const_get(params[:book_type].capitalize).find(params[:id])
+            @book.namespace = Ilog.configuration.namespaces.key(@database)
         end
       end
     end

data/lib/iatelier/controllers/books/new.rb

@@ -10,6 +10,7 @@ module Iatelier
 	        self.set_database database
 	        @book_type = params[:book_type].capitalize;
 	        @book = Object.const_get(@book_type).new
+	        @book.namespace = @database
         end
       end
     end

data/lib/iatelier/controllers/books/update.rb

@@ -5,8 +5,10 @@ module Iatelier
         include Iatelier::Action
 		include Iatelier::Controllers::Books::DbConnector
         def call(params)
-	        self.set_database params[:database]
+            @database = params[:database]
+	        self.set_database @database
 	        @book = Object.const_get(params[:book_type].capitalize).find(params[:id])
+            @book.namespace = Ilog.configuration.namespaces.key(@database)
 			@book.revise(params)
 			@book.save
 			self.body = @book.save.to_json

data/lib/iatelier/models/book.rb

@@ -2,14 +2,11 @@ require 'redcarpet'
 
 class Book < ActiveRecord::Base
 	self.abstract_class = true
+	DIMENSIONS = []
+	GROUPINGS = []
+	ROLES = []
 
-	@@dimensions = []
-	@@groupings = []
-	@@roles = []
-	
 	@content_raw = ''
-	
-	@namespace = nil
 
 	has_one :title, as: :titleable, class_name: 'Dimensions::Title'
 	has_one :slug, as: :slugable, class_name: 'Dimensions::Slug'
@@ -23,49 +20,38 @@ class Book < ActiveRecord::Base
 
 	has_many :peopleables, as: :peopleable, dependent: :destroy
 	has_many :peoples, through: :peopleables
-	
+
 	has_many :bundleables, as: :bundleable, dependent: :destroy
 	has_many :bundles, through: :bundleables
-	
+
 	accepts_nested_attributes_for :title, :slug, :subtitle, :description, :thumbnail, :timestamp
 	validates_associated :slug
-	
+
 	attr_accessor :namespace
 
-	
+
 	def kind
 		self.class.to_s
 	end
 	def uniq
 		self.class.to_s + self.id.to_s
 	end
-	
-	def dimensions
-		@@dimensions
-	end
-	def self.dimensions
-    	@@dimensions
-  	end
 
-  	def roles
-	  	@@roles
+	def dimensions
+		self.class::DIMENSIONS
 	end
-	def self.roles
-    	@@roles
-  	end
-  	
-  	def groupings
-	  	@@groupings
+	def groupings
+	  	self.class::GROUPINGS
 	end
-  	def self.groupings
-	  	@@groupings
+  	def roles
+  		self.class::ROLES
 	end
 
 	def individuals requested_role
 		@query = '`peopleables`.`role` = "' + requested_role.to_s + '"'
 		self.peoples.includes(:peopleables).where(@query)
 	end
-	
+
 	def content_raw
 		puts 'trying to open content'
 		unless self.id.nil?
@@ -82,11 +68,7 @@ class Book < ActiveRecord::Base
 			@content = nil
 		end
 	end
-	
-	def self.with_all
-		self.includes(self.dimensions + self.groupings)
-	end
-	
+
 	def content
 		markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML, autolink: true, tables: true)
 		markdown.render(self.content_raw)
@@ -95,16 +77,16 @@ class Book < ActiveRecord::Base
 # 	def initialized
 # 		super()
 # 		puts "content of the dimension: \n"
-# 		puts @dimensions.inspect
-# 		@dimensions.each do |dimension|
+# 		puts dimensions.inspect
+# 		dimensions.each do |dimension|
 # 			reference = dimension + able
 # 			hasone dimension.to_sym as: reference.to_sym
 # 		end
 # 	end
 
 	def create params
-		puts 'these are the stuff were going to add:' + @@dimensions.to_s
-		@@dimensions.each do |dimension|
+		puts 'these are the stuff were going to add:' + dimensions.to_s
+		dimensions.each do |dimension|
 			method_name = 'setup_' + dimension
 			self.public_send(method_name.to_sym, params)
 		end
@@ -115,7 +97,7 @@ class Book < ActiveRecord::Base
 	end
 
 	def revise params
-		@@dimensions.each do |dimension|
+		dimensions.each do |dimension|
 			if self.public_send(dimension.to_sym)
 				method_name = 'revise_' + dimension
 			else
@@ -123,7 +105,7 @@ class Book < ActiveRecord::Base
 			end
 			self.public_send(method_name.to_sym, params)
 		end
-		@@dimensions.each do |dimension|
+		dimensions.each do |dimension|
 			self.public_send(dimension.to_sym).save
 		end
 		sync_keywords params
@@ -193,11 +175,11 @@ class Book < ActiveRecord::Base
 	def revise_title params
 		self.title.update(value: params[:title])
 	end
-	
+
 	def setup_subtitle params
 		self.build_subtitle({value: params[:subtitle]})
 	end
-	def revise_title params
+	def revise_subtitle params
 		self.subtitle.update(value: params[:subtitle])
 	end
 
@@ -207,12 +189,12 @@ class Book < ActiveRecord::Base
 	def revise_slug params
 		self.slug.update(value: params[:slug])
 	end
-	
+
 	def setup_thumbnail params
 	end
 	def revise_thumbnail params
 	end
-	
+
 	def setup_timestamp params
 		puts 'setting up timestamp'
 		self.build_timestamp({
@@ -235,10 +217,9 @@ class Book < ActiveRecord::Base
 			self.setup_timestamp params
 		end
 	end
-	
+
 	def sync_content params
-		puts 'we are trying to sync the content = ' + params[:content]
-		path = Iatelier.configuration.storage_dir + params[:database].to_s + self.class.name.downcase + '/' + self.id.to_s
+		path = Iatelier.configuration.storage_dir + @namespace.to_s + self.class.name.downcase + '/' + self.id.to_s
 		Dir.mkdir(path) unless File.exists?(path)
 		File.open(path + '/main.md', 'w+') do |file|
 			file.puts params[:content]
@@ -248,4 +229,4 @@ class Book < ActiveRecord::Base
 		self.save
 		puts self.loc.to_s
 	end
-end
+end

data/lib/iatelier/templates/books/_engine.html.haml

@@ -16,10 +16,10 @@
 			-if book.dimensions.include? 'description'
 				%label.label Description
 				%input{:class => "form-control pure-input-1", :name => "description", :type => "text", :placeholder => "Description", :value => book.description.try(:value)}
-				
 	.form-box
 		%label Text
-		%textarea{:name => "content", :class => "text-editor pure-input-1 form-control", :type => "text", :placeholder => "Content of the book ..."}
+		%br
+		%textarea{:name => "content", :class => "text-editor pure-input-1 form-control", :type => "text", :placeholder => "Content of the book ...", :style => "width: 100%"}
 			-unless book.content_raw.nil?
 				= book.content_raw
 %div{:class => "grid-large panel-edit"}

data/lib/iatelier/templates/books/grouping/_keywords.html.haml

@@ -1,5 +1,5 @@
 %div{:class => "c-card__item c-card__item--divider"}
-	.span Keyword
 	%div{:class => "c-card__item"}
+		%label Keywords
 		%input{:id => "keywords", :name => "keywords", :value => book.keywords.pluck(:word).join(", ")}
 		%div{:id => "keywords-field", :name => "keywords", :type => "text", :style => "width: 100%; display: block;"}

data/lib/iatelier/templates/books/new.html.haml

@@ -3,5 +3,4 @@
 	%form{:class => "atelier-main-form pure-form pure-form-aligned", :action => "/iatelier/#{database}/#{book.class.name.downcase}/#{book.id}", :method => "POST",  :enctype => "multipart/form-data"}
 		.form-actions
 			<button type="submit" class="btn btn-default">Create</button>
-			%div
-				= render :partial => 'engine'
+		= render :partial => 'engine'

data/lib/iatelier/version.rb

@@ -1,3 +1,3 @@
 module Iatelier
-  VERSION = "0.3.1"
+  VERSION = "0.4.3"
 end

data/package.json

@@ -20,7 +20,7 @@
 		"sass-loader": "^7.3.1"
 	},
 	"dependencies": {
-		"@piratesatelier/os-ui-oldschool": "0.0.3",
+		"@piratesatelier/os-ui-oldschool": "*",
 		"contents": "^4.0.2",
 		"flatpickr": "^4.3.2",
 		"imagesloaded": "4.1.4",

data/src/sass/iatelier.scss

@@ -14,7 +14,7 @@
 }
 */
 
-@import "@piratesatelier/os-ui-oldschool/src/custom";
+@import "@piratesatelier/os-ui-oldschool/src/style";
 
 @import "~flatpickr/dist/flatpickr.min.css";
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iatelier
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.3
 platform: ruby
 authors:
 - Captain Husayn Pinguin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-23 00:00:00.000000000 Z
+date: 2020-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler