diff --git a/app/main/assets/css/app.css.scss b/app/main/assets/css/app.css.scss index f64375c..bb92067 100644 --- a/app/main/assets/css/app.css.scss +++ b/app/main/assets/css/app.css.scss @@ -1 +1,41 @@ -// Place your apps css here \ No newline at end of file +// Place your apps css here +@import "susy"; + +$susy: ( + columns: 24 , + gutter-position: split , +); + +.debugger-view { @include container(90%); } + +.classes { @include span(3); } + +.file-view { + @include span(4); + margin: span(1); +} + +.source-view { @include span(6); } + +.block-view { + @include span(4); + margin-right: span(3); + height: 200px; +} + +.status-view { + @include span(2 at 22); +} + +.registers-view { + @include span(20 at 3); +} + +.register-view { + @include gallery(3); + margin-top: 10px; +} + +.bright { + background-color: orange ; +} diff --git a/app/main/config/routes.rb b/app/main/config/routes.rb index 6cfa548..9ba1cf2 100644 --- a/app/main/config/routes.rb +++ b/app/main/config/routes.rb @@ -2,12 +2,6 @@ client '/about', action: 'about' -# Routes for login and signup, provided by user_templates component gem -client '/signup', component: 'user_templates', controller: 'signup' -client '/login', component: 'user_templates', controller: 'login', action: 'index' -client '/password_reset', component: 'user_templates', controller: 'password_reset', action: 'index' -client '/forgot', component: 'user_templates', controller: 'login', action: 'forgot' -client '/account', component: 'user_templates', controller: 'account', action: 'index' # The main route, this should be last. It will match any params not # previously matched. diff --git a/app/main/controllers/main_controller.rb b/app/main/controllers/main_controller.rb index 4da613f..547c80a 100644 --- a/app/main/controllers/main_controller.rb +++ b/app/main/controllers/main_controller.rb @@ -2,10 +2,10 @@ module Main class MainController < Volt::ModelController def index - code = Ast::ExpressionList.new( [Ast::CallSiteExpression.new(:putstring, [] ,Ast::StringExpression.new("Hello again"))]) - Virtual::Compiler.compile( code , machine.space.get_main ) - machine.run_before "Register::CallImplementation" - interpreter.start machine.init +# code = Ast::ExpressionList.new( [Ast::CallSiteExpression.new(:putstring, [] ,Ast::StringExpression.new("Hello again"))]) +# Virtual::Compiler.compile( code , machine.space.get_main ) +# machine.run_before "Register::CallImplementation" +# interpreter.start machine.init end def about diff --git a/app/main/views/main/index.html b/app/main/views/main/index.html index 7683644..7805be8 100644 --- a/app/main/views/main/index.html +++ b/app/main/views/main/index.html @@ -3,20 +3,19 @@ <:Body> -
ClassView classes: machine.space.classes -
+
"Future Source code view"
-
+

Virtual Machine Instruction

page.sources.each do |s|
s
end
-
+

method_name

Block: #{block_name}

@@ -26,7 +25,7 @@ end
-
+
button.bright { "next" }.on(:click) { interpreter.tick } " ".br @@ -43,10 +42,8 @@
-
+
registers.each do |r , oid| RegisterView interpreter: interpreter , register: r end
- -
diff --git a/app/main/views/main/main.html b/app/main/views/main/main.html index 0e02644..a4d4ea1 100644 --- a/app/main/views/main/main.html +++ b/app/main/views/main/main.html @@ -2,28 +2,11 @@ {{ view main_path, "title", {controller_group: 'main'} }} <:Body> -
-
- -

salama-debugger

-
+
<:volt:notices /> {{ view main_path, 'body', {controller_group: 'main'} }} -
- -<:Nav> -
  • - {{ yield }} -
  • - diff --git a/assets/css/app.css.scss b/assets/css/app.css.scss index aaa7394..6752aac 100644 --- a/assets/css/app.css.scss +++ b/assets/css/app.css.scss @@ -1,4 +1,4 @@ -@import "susy"; +@import "susy" ; $susy: ( columns: 24 , diff --git a/config/dependencies.rb b/config/dependencies.rb index 0c33e83..8b5aeb3 100644 --- a/config/dependencies.rb +++ b/config/dependencies.rb @@ -2,7 +2,6 @@ # the "home" component loads. # bootstrap css framework -component 'bootstrap' Opal.use_gem("salama-reader") Opal.use_gem("salama-object-file")