Nikatlas 5 년 전
부모
커밋
dcaa845179

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/lib/Module.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/lib/systems/CoreSystem.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/lib/systems/ViewSystem.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/modules/BaseContainer/index.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/modules/BaseHolder/index.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/modules/BlogFeed/index.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/modules/BlogPost/index.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/modules/Button/index.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/modules/Col.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/modules/DatePicker.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/modules/Form/index.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/modules/Icon/index.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/modules/Image/index.js


+ 1 - 1
dist/modules/RootComp/index.js

@@ -1 +1 @@
-"use strict";var _interopRequireDefault=require("@babel/runtime/helpers/interopRequireDefault");Object.defineProperty(exports,"__esModule",{value:true});exports["default"]=void 0;var _classCallCheck2=_interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));var _createClass2=_interopRequireDefault(require("@babel/runtime/helpers/createClass"));var _possibleConstructorReturn2=_interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));var _getPrototypeOf2=_interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));var _inherits2=_interopRequireDefault(require("@babel/runtime/helpers/inherits"));var _react=_interopRequireDefault(require("react"));var _Types=_interopRequireDefault(require("../../lib/Types"));var _Module2=_interopRequireDefault(require("../../lib/Module"));var _reactNative=require("react-native");var _jsxFileName="C:\\Users\\Konstanitnos\\Development\\TrapiLib\\modules\\RootComp\\index.js";var RootComp=function(_Module){(0,_inherits2["default"])(RootComp,_Module);function RootComp(props){(0,_classCallCheck2["default"])(this,RootComp);return(0,_possibleConstructorReturn2["default"])(this,(0,_getPrototypeOf2["default"])(RootComp).call(this,props));}(0,_createClass2["default"])(RootComp,[{key:"display",value:function display(){return;_react["default"].createElement(_reactNative.Text,{__source:{fileName:_jsxFileName,lineNumber:14}},this.props.text||""," - ",this.props.second);}}]);return RootComp;}(_Module2["default"]);exports["default"]=RootComp;RootComp.Inputs={text:new _Types["default"].Text().require()["default"]("Sample Text"),second:new _Types["default"].Integer().require()["default"](5)};
+"use strict";var _interopRequireDefault=require("@babel/runtime/helpers/interopRequireDefault");Object.defineProperty(exports,"__esModule",{value:true});exports["default"]=void 0;var _classCallCheck2=_interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));var _createClass2=_interopRequireDefault(require("@babel/runtime/helpers/createClass"));var _possibleConstructorReturn2=_interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));var _getPrototypeOf2=_interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));var _inherits2=_interopRequireDefault(require("@babel/runtime/helpers/inherits"));var _react=_interopRequireDefault(require("react"));var _Types=_interopRequireDefault(require("../../lib/Types"));var _Module2=_interopRequireDefault(require("../../lib/Module"));var _reactNative=require("react-native");var _jsxFileName="C:\\Users\\Karteri\\Desktop\\Development\\TrapiLib\\modules\\RootComp\\index.js";var RootComp=function(_Module){(0,_inherits2["default"])(RootComp,_Module);function RootComp(props){(0,_classCallCheck2["default"])(this,RootComp);return(0,_possibleConstructorReturn2["default"])(this,(0,_getPrototypeOf2["default"])(RootComp).call(this,props));}(0,_createClass2["default"])(RootComp,[{key:"display",value:function display(){return;_react["default"].createElement(_reactNative.Text,{__source:{fileName:_jsxFileName,lineNumber:14}},this.props.text||""," - ",this.props.second);}}]);return RootComp;}(_Module2["default"]);exports["default"]=RootComp;RootComp.Inputs={text:new _Types["default"].Text().require()["default"]("Sample Text"),second:new _Types["default"].Integer().require()["default"](5)};

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/modules/Row.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/modules/Text/index.js


+ 1 - 1
dist/modules/View.js

@@ -1 +1 @@
-"use strict";var _interopRequireDefault=require("@babel/runtime/helpers/interopRequireDefault");Object.defineProperty(exports,"__esModule",{value:true});exports["default"]=void 0;var _classCallCheck2=_interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));var _createClass2=_interopRequireDefault(require("@babel/runtime/helpers/createClass"));var _possibleConstructorReturn2=_interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));var _getPrototypeOf2=_interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));var _inherits2=_interopRequireDefault(require("@babel/runtime/helpers/inherits"));var _react=_interopRequireDefault(require("react"));var _Module2=_interopRequireDefault(require("../lib/Module"));var _reactNative=require("react-native");var _jsxFileName="C:\\Users\\Konstanitnos\\Development\\TrapiLib\\modules\\View.js";var ViewComp=function(_Module){(0,_inherits2["default"])(ViewComp,_Module);function ViewComp(props){(0,_classCallCheck2["default"])(this,ViewComp);return(0,_possibleConstructorReturn2["default"])(this,(0,_getPrototypeOf2["default"])(ViewComp).call(this,props));}(0,_createClass2["default"])(ViewComp,[{key:"display",value:function display(){return _react["default"].createElement(_reactNative.View,{__source:{fileName:_jsxFileName,lineNumber:16}},this.props.children);}}]);return ViewComp;}(_Module2["default"]);exports["default"]=ViewComp;
+"use strict";var _interopRequireDefault=require("@babel/runtime/helpers/interopRequireDefault");Object.defineProperty(exports,"__esModule",{value:true});exports["default"]=void 0;var _classCallCheck2=_interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));var _createClass2=_interopRequireDefault(require("@babel/runtime/helpers/createClass"));var _possibleConstructorReturn2=_interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));var _getPrototypeOf2=_interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));var _inherits2=_interopRequireDefault(require("@babel/runtime/helpers/inherits"));var _react=_interopRequireDefault(require("react"));var _Module2=_interopRequireDefault(require("../lib/Module"));var _reactNative=require("react-native");var _jsxFileName="C:\\Users\\Karteri\\Desktop\\Development\\TrapiLib\\modules\\View.js";var ViewComp=function(_Module){(0,_inherits2["default"])(ViewComp,_Module);function ViewComp(props){(0,_classCallCheck2["default"])(this,ViewComp);return(0,_possibleConstructorReturn2["default"])(this,(0,_getPrototypeOf2["default"])(ViewComp).call(this,props));}(0,_createClass2["default"])(ViewComp,[{key:"display",value:function display(){return _react["default"].createElement(_reactNative.View,{__source:{fileName:_jsxFileName,lineNumber:16}},this.props.children);}}]);return ViewComp;}(_Module2["default"]);exports["default"]=ViewComp;

+ 1 - 1
dist/modules/ViewComp.js

@@ -1 +1 @@
-"use strict";var _interopRequireDefault=require("@babel/runtime/helpers/interopRequireDefault");Object.defineProperty(exports,"__esModule",{value:true});exports["default"]=void 0;var _classCallCheck2=_interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));var _createClass2=_interopRequireDefault(require("@babel/runtime/helpers/createClass"));var _possibleConstructorReturn2=_interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));var _getPrototypeOf2=_interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));var _inherits2=_interopRequireDefault(require("@babel/runtime/helpers/inherits"));var _react=_interopRequireDefault(require("react"));var _Module2=_interopRequireDefault(require("../lib/Module"));var _reactNative=require("react-native");var _jsxFileName="C:\\Users\\Konstanitnos\\Development\\TrapiLib\\modules\\ViewComp.js";var ViewComp=function(_Module){(0,_inherits2["default"])(ViewComp,_Module);function ViewComp(props){(0,_classCallCheck2["default"])(this,ViewComp);return(0,_possibleConstructorReturn2["default"])(this,(0,_getPrototypeOf2["default"])(ViewComp).call(this,props));}(0,_createClass2["default"])(ViewComp,[{key:"display",value:function display(){return _react["default"].createElement(_reactNative.View,{key:Math.random(),__source:{fileName:_jsxFileName,lineNumber:16}});}}]);return ViewComp;}(_Module2["default"]);exports["default"]=ViewComp;
+"use strict";var _interopRequireDefault=require("@babel/runtime/helpers/interopRequireDefault");Object.defineProperty(exports,"__esModule",{value:true});exports["default"]=void 0;var _classCallCheck2=_interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));var _createClass2=_interopRequireDefault(require("@babel/runtime/helpers/createClass"));var _possibleConstructorReturn2=_interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));var _getPrototypeOf2=_interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));var _inherits2=_interopRequireDefault(require("@babel/runtime/helpers/inherits"));var _react=_interopRequireDefault(require("react"));var _Module2=_interopRequireDefault(require("../lib/Module"));var _reactNative=require("react-native");var _jsxFileName="C:\\Users\\Karteri\\Desktop\\Development\\TrapiLib\\modules\\ViewComp.js";var ViewComp=function(_Module){(0,_inherits2["default"])(ViewComp,_Module);function ViewComp(props){(0,_classCallCheck2["default"])(this,ViewComp);return(0,_possibleConstructorReturn2["default"])(this,(0,_getPrototypeOf2["default"])(ViewComp).call(this,props));}(0,_createClass2["default"])(ViewComp,[{key:"display",value:function display(){return _react["default"].createElement(_reactNative.View,{key:Math.random(),__source:{fileName:_jsxFileName,lineNumber:16}});}}]);return ViewComp;}(_Module2["default"]);exports["default"]=ViewComp;

+ 1 - 1
dist/modules/index.js

@@ -1 +1 @@
-"use strict";var _interopRequireDefault=require("@babel/runtime/helpers/interopRequireDefault");Object.defineProperty(exports,"__esModule",{value:true});exports["default"]=void 0;var _BaseContainer=_interopRequireDefault(require("./BaseContainer"));var _BaseHolder=_interopRequireDefault(require("./BaseHolder"));var _Button=_interopRequireDefault(require("./Button"));var _Form=_interopRequireDefault(require("./Form"));var _Image=_interopRequireDefault(require("./Image"));var _RootComp=_interopRequireDefault(require("./RootComp"));var _Text=_interopRequireDefault(require("./Text"));var _BlogPost=_interopRequireDefault(require("./BlogPost"));var _BlogFeed=_interopRequireDefault(require("./BlogFeed"));var _Icon=_interopRequireDefault(require("./Icon"));var _default={BaseContainer:_BaseContainer["default"],BaseHolder:_BaseHolder["default"],Button:_Button["default"],Form:_Form["default"],Image:_Image["default"],RootComp:_RootComp["default"],Text:_Text["default"],BlogPost:_BlogPost["default"],BlogFeed:_BlogFeed["default"],Icon:_Icon["default"]};exports["default"]=_default;
+"use strict";var _interopRequireDefault=require("@babel/runtime/helpers/interopRequireDefault");Object.defineProperty(exports,"__esModule",{value:true});exports["default"]=void 0;var _BaseContainer=_interopRequireDefault(require("./BaseContainer"));var _BaseHolder=_interopRequireDefault(require("./BaseHolder"));var _Button=_interopRequireDefault(require("./Button"));var _Form=_interopRequireDefault(require("./Form"));var _Image=_interopRequireDefault(require("./Image"));var _RootComp=_interopRequireDefault(require("./RootComp"));var _Text=_interopRequireDefault(require("./Text"));var _BlogPost=_interopRequireDefault(require("./BlogPost"));var _BlogFeed=_interopRequireDefault(require("./BlogFeed"));var _Icon=_interopRequireDefault(require("./Icon"));var _default={Text:_Text["default"],Button:_Button["default"],Image:_Image["default"],Icon:_Icon["default"],BaseContainer:_BaseContainer["default"],BlogPost:_BlogPost["default"],BlogFeed:_BlogFeed["default"],BaseHolder:_BaseHolder["default"]};exports["default"]=_default;

+ 4 - 1
lib/systems/CoreSystem.js

@@ -67,7 +67,10 @@ export default class CoreSystem {
 		this.ViewSystem.addView(ViewID, View);
 		return this;
 	}
-
+	removePage(route) {
+		this.Routing.removeRoute(route);
+		return this;
+	}
 	goBack() {
 
 	}

+ 6 - 4
lib/systems/ViewSystem.js

@@ -112,7 +112,7 @@ export class View {
 
 	render(CS) {
 		let node = this.ViewTree.root;
-		return (<Renderer CoreSystem={CS} node={node} tree={this.ViewTree}/>);	
+		return (<Renderer CoreSystem={CS} node={node} tree={this.ViewTree} selfView={this}/>);	
 	}
 
 	addViewNode(node,parentNode = null){
@@ -250,14 +250,15 @@ export class View {
 
 
 let Renderer = (props) => {
-	let { node , tree, CoreSystem } = props;
+	let { node , tree, CoreSystem, selfView } = props;
 	let childrens = tree.getChildren(node);
 	let childrenReact = childrens.map(child => {
 		return(
 		<Renderer node = {child}
 				tree={tree}
 				key={child.id} 
-				CoreSystem={CoreSystem} />)
+				CoreSystem={CoreSystem}
+				selfView={selfView} />)
 	});
 	let ModuleSystem = CoreSystem.ModuleSystem;
 	let EventSystem = CoreSystem.EventSystem;
@@ -276,7 +277,8 @@ let Renderer = (props) => {
 				ModuleID: viewNode.id,
 				NodeID: node.id,
 				EventSystem: EventSystem,
-				CoreSystem: CoreSystem
+				CoreSystem: CoreSystem,
+				View: selfView
 			},
 			[], // children
 			viewNode.namespace,

+ 14 - 9
modules/BaseContainer/index.js

@@ -9,34 +9,39 @@ export default function BaseContainer(props) {
 		width,
 		height,
 		overflow,
-		marginBottom,
+		// margin, // cannot use margin no children
+		// padding, // cannot use margin no children
 		shadowColor,
 		shadowWidth,
 		shadowHeight,
+		shadowOpacity,
+		shadowRadius,
 		backgroundColor,
 		...restProps
 	} = props;
-	if(!width) width = BaseContainer.Inputs.width.default;
-	if(!height) height = BaseContainer.Inputs.height.default;
+	
 	if(!backgroundColor) backgroundColor = '';
-	if(!marginBottom) marginBottom = 0;
 	if(!shadowColor) shadowColor = '';
 	if(!shadowWidth) shadowWidth = 0;
 	if(!shadowHeight) shadowHeight = 0;
 	return (
-	    <View {...restProps} style={{width, height, overflow , backgroundColor , marginBottom , shadowColor,shadowOffset:{width:shadowWidth,height:shadowHeight}}}>
+	    <View {...restProps} style={{width, height, overflow , backgroundColor , shadowColor, shadowOffset:{width:shadowWidth,height:shadowHeight}, shadowOpacity: shadowOpacity, shadowRadius}}>
 	    </View>
 	);
 }
 
 
 BaseContainer.Inputs = {
-	width: new Types.Integer().require().default(50),
-	height: new Types.Integer().require().default(50),
+	width: new Types.Integer(),
+	height: new Types.Integer(),
 	overflow: new Types.Integer().require().default('hidden'),
 	backgroundColor: new Types.Text().require().color(),
-	marginBottom:new Types.Integer().require().default(0),
+	// margin: new Types.Text().default('0'),
+	// padding: new Types.Text().default('0'),
 	shadowColor: new Types.Text().require().color().default(""),
 	shadowWidth: new Types.Integer().require(),
-	shadowHeight: new Types.Integer().require()
+	shadowHeight: new Types.Integer().require(),
+	shadowOpacity: new Types.Real().default(0),
+	// shadowElevation: new Types.Integer().default(5),
+	shadowRadius: new Types.Integer().default(5)
 }

+ 1 - 1
modules/BlogFeed/index.js

@@ -18,7 +18,7 @@ export default class BlogFeed extends Module{
 
 	configure(){
 		if(this.props.CoreSystem){
-			let CurrentView = this.props.CoreSystem.getCurrentView();
+			let CurrentView = this.props.View; //this.props.CoreSystem.getCurrentView();
 		 	let node = CurrentView.getNode(this.props.NodeID)
 		 	
 

+ 62 - 22
modules/BlogPost/index.js

@@ -21,50 +21,85 @@ export default class BlogPost extends Module {
 		super(props)
 		this.isTemplate = true;
 		
-		this.configure();	
+		this.id = props.ModuleID;
+		this.nextNumber = (function* () {
+			let i = 0;
+			do{
+				i++;
+				yield i;
+			}while(true);
+		})();
+		this.NodeFactory = NodeFactory.bind(this);
 		
+		this.configure();	
 	}
 
 
 	configure(){
 		if(this.props.CoreSystem){
-			let CurrentView = this.props.CoreSystem.getCurrentView();
+			let CurrentView = this.props.View; // this.props.CoreSystem.getCurrentView();
 		 	let node = CurrentView.getNode(this.props.NodeID)
 		 	let children = CurrentView.getChildren(node);
-			let base1 = new Node("SS"+ Math.random(), {},new ViewNode("S"+Math.random(), "BaseContainer",  {width:375,height:209}))
-			let base2 = new Node("SS"+ Math.random(), {},new ViewNode("S"+Math.random(), "BaseContainer",  {width:375,height:209}))
-			let Image1 = new Node("SS"+ Math.random(), {},new ViewNode("S"+Math.random(), "Image"))
+
+		 	// let NavContainer = NodeFactory({flexDirection:"row",justifyContent:"space-between",alignItems:'center'},'BaseContainer',{height:64,width:375,backgroundColor:'rgba(0, 84, 230, 1)'});
+
+		 	//NavContainer Inputs
+		 	// let navIcon = NodeFactory({},'Icon',{name:"reorder",color:'rgba(255, 255, 255, 1)'})
+		 	// let navTitle = NodeFactory({},'Text',{text:"XDi",color:'rgba(255, 255, 255, 1)',fontSize:25})
+		 	// let navProfile =  NodeFactory({},'Icon',{name:"perm-identity",color:'rgba(255, 255, 255, 1)'})
+		 	/////////////////////////
+		 	let BackIcon = this.NodeFactory({},'Icon',{name:"keyboard-backspace",color:'rgba(255, 255, 255, 1)'});
+		 	let IconContainer = this.NodeFactory({justifyContent:'flex-end', height: 48, width: 58},'BaseContainer',{});
+
+
+			let base1 = new Node("SS"+ this.nextNumber.next().value, {},new ViewNode("S"+this.nextNumber.next().value, "BaseContainer",  {width:375,height:209}))
+			let base2 = new Node("SS"+ this.nextNumber.next().value, {flex: 1},new ViewNode("S"+this.nextNumber.next().value, "BaseContainer",  {width:375,height:209}))
+			let Image1 = new Node("SS"+ this.nextNumber.next().value, {alignItems:'flex-start'},new ViewNode("S"+this.nextNumber.next().value, "Image"))
 			
-			let wrapper = new Node("SS"+ Math.random(), {flexDirection:"row",justifyContent:"space-between",alignItems:"flex-end",height:40},new ViewNode("S"+Math.random(), "BaseContainer", {}))
-			let Title = new Node("SS"+ Math.random(), {},new ViewNode("S"+Math.random(), "Text", {text:"This is the post Title",color:"rgba(112, 112, 112, 1)",fontSize:17,fontFamily:"bold"}))
-		 	let BookMark = new Node("SS"+ Math.random(), {},new ViewNode("S"+Math.random(), "Icon", {}))
+			let wrapper = new Node("SS"+ this.nextNumber.next().value, {flexDirection:"row",justifyContent:"space-between",alignItems:"flex-end",height:40},new ViewNode("S"+this.nextNumber.next().value, "BaseContainer", {}))
+			let Title = new Node("SS"+ this.nextNumber.next().value, {},new ViewNode("S"+this.nextNumber.next().value, "Text", {text:"This is the post Title",color:"rgba(112, 112, 112, 1)",fontSize:17,fontFamily:"bold"}))
+		 	let BookMark = new Node("SS"+ this.nextNumber.next().value, {},new ViewNode("S"+this.nextNumber.next().value, "Icon", {}))
 
-		 	let subtitle = new Node("SS"+ Math.random(), {height:25},new ViewNode("S"+Math.random(), "Text", {text:"This is the subtitle",color:"rgba(112, 112, 112, 1)",fontSize:14,fontFamily:"thin"}))
-		 	let MainText = new Node("SS"+ Math.random(), {},new ViewNode("S"+Math.random(), "Text", {text:defaultText,color:"rgba(112, 112, 112, 1)",fontSize:14}))
+		 	let subtitle = new Node("SS"+ this.nextNumber.next().value, {height:25},new ViewNode("S"+this.nextNumber.next().value, "Text", {text:"This is the subtitle",color:"rgba(112, 112, 112, 1)",fontSize:14,fontFamily:"thin"}))
+		 	let MainText = new Node("SS"+ this.nextNumber.next().value, {},new ViewNode("S"+this.nextNumber.next().value, "Text", {text:defaultText,color:"rgba(112, 112, 112, 1)",fontSize:14}))
 		 	
 
 
-		 	let wrapperProfile = new Node("SS"+ Math.random(), {flexDirection:"row",height:40},new ViewNode("S"+Math.random(), "BaseContainer", {}))
+		 	let wrapperProfile = new Node("SS"+ this.nextNumber.next().value, {flexDirection:"row", height:40},new ViewNode("S"+this.nextNumber.next().value, "BaseContainer", {}))
 			
-		 	let ImageProfile = new Node("SS"+ Math.random(), {width:34,height:34},new ViewNode("S"+Math.random(), "Image",{source:require('../Image/assets/profile.png'),width:32,height:32}))
-		 	let ImageWrapper = new Node("SS"+ Math.random(), {flexDirection:"row",justifyContent:"center",alignItems:'center',height:40},new ViewNode("S"+Math.random(), "BaseContainer", {}))
+		 	let ImageWrapper = new Node("SS"+ this.nextNumber.next().value, {flexDirection:"row",justifyContent:"flex-end", width: 44,height:40},new ViewNode("S"+this.nextNumber.next().value, "BaseContainer", {}))
+		 	let ImageProfile = new Node("SS"+ this.nextNumber.next().value, {width:36,height:36},new ViewNode("S"+this.nextNumber.next().value, "Image",{source:require('../Image/assets/profile.png'),width:32,height:32}))
 			
-		 	let UserWrapper = new Node("SS"+ Math.random(), {flexDirection:"column",height:40,flexGrow:1},new ViewNode("S"+Math.random(), "BaseContainer", {}))
+		 	let UserWrapper = new Node("SS"+ this.nextNumber.next().value, {flexDirection:"column",height:40,flexGrow:1},new ViewNode("S"+this.nextNumber.next().value, "BaseContainer", {}))
 			
-		 	let user = new Node("SS"+ Math.random(), {height:20},new ViewNode("S"+Math.random(), "Text", {text:"Alexandra papadopoulou ",color:"rgba(112, 112, 112, 1)",fontSize:14,fontFamily:"thin"}))
-		 	let userjob = new Node("SS"+ Math.random(), {height:20},new ViewNode("S"+Math.random(), "Text", {text:"Market Analyst ",color:"rgba(112, 112, 112, 1)",fontSize:14,fontFamily:"thin"}))
+		 	let user = new Node("SS"+ this.nextNumber.next().value, {height:20},new ViewNode("S"+this.nextNumber.next().value, "Text", {text:"Alexandra papadopoulou ",color:"rgba(112, 112, 112, 1)",fontSize:14,fontFamily:"thin"}))
+		 	let userjob = new Node("SS"+ this.nextNumber.next().value, {height:20},new ViewNode("S"+this.nextNumber.next().value, "Text", {text:"Market Analyst ",color:"rgba(112, 112, 112, 1)",fontSize:14,fontFamily:"thin"}))
 		 	
 
-		 	if(!CurrentView.has(base1)) CurrentView.addViewNode(base1 , node );
+		 // 	if(!CurrentView.has(NavContainer)) CurrentView.addViewNode(NavContainer,node);
+			// //adding Children To NavContainer
+		
+		 // 	if(!CurrentView.has(navIcon))  CurrentView.addViewNode(navIcon,NavContainer)
+		 // 	if(!CurrentView.has(navTitle))  CurrentView.addViewNode(navTitle,NavContainer)
+		 // 	if(!CurrentView.has(navProfile))  CurrentView.addViewNode(navProfile,NavContainer)
+		 		
+
+		 	// --------------------- This is the end of Top Nav -------------
+
+		 	console.log("MATCHCHECK ", CurrentView.has(base1))
+		 	if(!CurrentView.has(base1)) CurrentView.addViewNode(base1, node);
 		 	
-		 	if(!CurrentView.has(base2.id)) CurrentView.addViewNode( base2 ,node);
-		 	if(!CurrentView.has(Image1.id)) CurrentView.addViewNode(Image1,base1)
+		 	if(!CurrentView.has(base2.id)) CurrentView.addViewNode(base2, node);
+		 	if(!CurrentView.has(Image1.id)) CurrentView.addViewNode(Image1, base1);
+
+		 	if(!CurrentView.has(IconContainer.id)) CurrentView.addViewNode(IconContainer, Image1)
+		 	if(!CurrentView.has(BackIcon.id)) CurrentView.addViewNode(BackIcon, IconContainer)
 			
 
-			if(!CurrentView.has(wrapper.id)) CurrentView.addViewNode(wrapper , base2);
+			if(!CurrentView.has(wrapper.id)) CurrentView.addViewNode(wrapper, base2);
 		 		
-		 	if(!CurrentView.has(Title.id)) CurrentView.addViewNode(Title , wrapper);
-		 	if(!CurrentView.has(BookMark.id)) CurrentView.addViewNode(BookMark , wrapper);
+		 	if(!CurrentView.has(Title.id)) CurrentView.addViewNode(Title, wrapper);
+		 	if(!CurrentView.has(BookMark.id)) CurrentView.addViewNode(BookMark, wrapper);
 
 
 
@@ -112,4 +147,9 @@ export default class BlogPost extends Module {
 
 BlogPost.Inputs = {
 
+}
+
+
+var NodeFactory = function(containerStyle = {}, component, componentStyle = {}){
+	return new Node("SS"+ this.nextNumber.next().value, containerStyle,new ViewNode("S"+this.nextNumber.next().value, component, componentStyle));
 }

+ 1 - 1
modules/Image/index.js

@@ -22,7 +22,7 @@ export default class ImageComp extends Module {
 		console.log(width);
 		if(!width) width = "100%";
 		return 	<Image
-			          style={{borderRadius,width, height, paddingTop: height ? '0' : '56.25%'}}
+			          style={{borderRadius, width, height, paddingTop: height ? '0' : '56.25%'}}
 			          resizeMode={resizeMode}
 			          source={source || image}
 			        />

+ 4 - 6
modules/index.js

@@ -10,14 +10,12 @@ import BlogFeed from './BlogFeed';
 
 import Icon from './Icon'
 export default {
-BaseContainer,
-BaseHolder,
+Text,
 Button,
-Form,
 Image,
-RootComp,
-Text,
+Icon,
+BaseContainer,
 BlogPost,
 BlogFeed,
-Icon
+BaseHolder
 }

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.