vapid 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 504471e3bef72a241996ded672149874d00f0eaf
-  data.tar.gz: 109650d32dbb7d98efb77346628f72168ad6ca4f
+  metadata.gz: 556c2464ab664d12716b9aa0e667dd11d663edc5
+  data.tar.gz: a56555d344f0277090d06c52d8a7efd0809fc464
 SHA512:
-  metadata.gz: ed753ed4e16155ce5562d4059a09c61ad3f5fe9a3dc7658569e4b7e46c21b9e7809c2583d4dba9a14fb9aec1dc0b59465ea2dcbdc265a9e8da8ed15d91e6de0a
-  data.tar.gz: 7b177df1ded95804960165af8578b4213a17dbf63dfd5519b5c0ef62c881c109343efedf3f981dadde1063024ff457809d3d26aad1d6475e59dff2518861ace6
+  metadata.gz: 92a59742ea2b378905fa5d59d329ce49cf278d52515fce565ca1019a734c6bb8894d292293f7c4482f5e860da14699c290b1c98be835fb33a8f9c53548021f7e
+  data.tar.gz: 2d259c98b3ad956e51c11ea98cda9714236188a0c503d4976a7722c141dc44ebea479a2af47018ea9ca9544d6e7aa636e5c5c33145a10a3bed56a5752ec0c8b5

data/CHANGELOG.md

@@ -0,0 +1,16 @@
+# Changelog
+
+## 0.1.2
+* Changed dashboard route from `/admin` to `/dashboard`
+* Updated styles to match new design
+* Users can now edit login email and password
+* `--reset-login` option for `vapid build`
+* Let user specify which DB in their own Gemfile
+* New design for generator example
+
+## 0.1.1
+* Fix SIGTERM bug (UPDATE: definitely did not fix it)
+* Changes to get hosting prototype up and running
+
+## 0.1.0
+* Initial release

data/lib/vapid/assets/stylesheets/vapid/dashboard.scss

@@ -0,0 +1,25 @@
+//= require semantic-ui/components/reset
+//= require semantic-ui/components/button
+//= require semantic-ui/components/divider
+//= require semantic-ui/components/form
+//= require semantic-ui/components/grid
+//= require semantic-ui/components/header
+//= require semantic-ui/components/icon
+//= require semantic-ui/components/image
+//= require semantic-ui/components/message
+//= require semantic-ui/components/menu
+//= require semantic-ui/components/segment
+//= require semantic-ui/components/sidebar
+//= require semantic-ui/components/site
+//= require semantic-ui/components/table
+//= require trix/dist/trix
+//= require_self
+
+// Pre-semantic
+@import "./dashboard/variables";
+
+// Dashboard
+@import "./dashboard/base";
+@import "./dashboard/fonts";
+@import "./dashboard/modal";
+@import "./dashboard/sidebar";

data/lib/vapid/assets/stylesheets/vapid/dashboard/_base.scss

@@ -0,0 +1,36 @@
+html, body {
+  font-size: 16px;
+}
+
+.hidden {
+  display: none !important;
+}
+
+.header-group {
+  padding-top: 0 !important;
+}
+
+#flash {
+  margin-top: 0.5em;
+
+  & + h1, {
+    margin-top: 0.5em;
+  }
+
+  & + .header-group, {
+    margin-top: 1.5em;
+  }
+}
+
+form[data-delete=true] {
+  input[type=submit] {
+    background: none;
+    border: none;
+    padding: 0;
+    color: $blue;
+
+    &:hover {
+      color: $darkBlue;
+    }
+  }
+}

data/lib/vapid/assets/stylesheets/vapid/dashboard/_fonts.scss

@@ -0,0 +1,14 @@
+@font-face {
+  font-family: 'Icons';
+  src: url("../../semantic-ui/themes/default/assets/fonts/icons.eot");
+  src: url("../../semantic-ui/themes/default/assets/fonts/icons.eot?#iefix") format('embedded-opentype'), 
+       url("../../semantic-ui/themes/default/assets/fonts/icons.woff2") format('woff2'), 
+       url("../../semantic-ui/themes/default/assets/fonts/icons.woff") format('woff'), 
+       url("../../semantic-ui/themes/default/assets/fonts/icons.ttf") format('truetype'), 
+       url("../../semantic-ui/themes/default/assets/fonts/icons.svg#icons") format('svg');
+  font-style: normal;
+  font-weight: normal;
+  font-variant: normal;
+  text-decoration: inherit;
+  text-transform: none;
+}

data/lib/vapid/assets/stylesheets/vapid/dashboard/_modal.scss

@@ -0,0 +1,53 @@
+body.modal {
+  background: white;
+  color: $grey;
+
+  a {
+    color: $grey;
+    text-decoration: underline;
+  }
+
+  .ui.form {
+    input[type=text],
+    input[type=email],
+    input[type=password] {
+      padding: 0 0 0.5em;
+      margin-bottom: 0.5em;    
+      font-weight: bold;
+      color: $grey;
+      background: none;
+      border-color: $grey;
+      border-width: 0 0 1px;
+      border-radius: 0;
+    }
+
+    label {
+      color: $grey;
+    }
+  }
+
+  .ui.header {
+    color: white;
+
+    .sub.header {
+      color: #9e9e9e;
+    }
+  }
+
+  .logo {
+    max-width: 10em;
+  }
+
+  & > .grid {
+    margin-top: 0em;
+    height: 100%;
+  }
+
+  #flash {
+    margin-bottom: 1.5em;
+  }
+
+  .column {
+    max-width: 27rem;
+  }
+}

data/lib/vapid/assets/stylesheets/vapid/dashboard/_sidebar.scss

@@ -0,0 +1,22 @@
+.sidebar {
+  $sidebar-nav-width: 20em;
+  width: $sidebar-nav-width;
+
+  .logo {
+    max-width: 7em;
+    margin: 0.5em 0 0.25em;
+  }
+
+  > .item:last-of-type:before {
+    display: none;
+  }
+
+  &.left.visible {
+     ~ .fixed,
+     ~ .pusher {
+        padding: 0em 1em 1em;
+        width: calc(100vw - #{$sidebar-nav-width});
+        transform: translate3d($sidebar-nav-width, 0, 0);
+     }
+  }
+}

data/lib/vapid/assets/stylesheets/vapid/dashboard/_variables.scss

@@ -0,0 +1,6 @@
+$import-google-fonts: false !default;
+$font-family: "Helvetica Neue", Helvetica, sans-serif;
+
+$grey: #1b1c1d;
+$blue: #4183C4;
+$darkBlue: #1e70bf;

data/lib/vapid/cli.rb

@@ -33,28 +33,31 @@ module Vapid
 
     desc "server", "Start the server"
     map %w(s -s --server) => :server
-    method_option :port, aliases: %w(-p), type: :numeric
-    method_option :bind, aliases: %w(-b), type: :string
+    method_option :port, aliases: %w(-p), type: :numeric, default: 4567
+    method_option :bind, aliases: %w(-b), type: :string, default: "localhost"
     def server(target = ".")
       say "== The Vapid server is loading"
       inside_target(target) do
-        Thread.new { Server.run! options }
-        Guard.start guardfile_contents: GUARDFILE, watchdir: target, no_interactions: true
+        fork do
+          Guard.start guardfile_contents: GUARDFILE, watchdir: target, no_interactions: true
+        end
+        Server.run! options.merge directory: target
       end
       say "== The Vapid server is now shut down"
     end
 
     desc "build", "Updates the data model as described in your templates"
     map %w(b -b --build) => :build
+    method_option :reset_login, aliases: %w(-r), type: :boolean, default: false
     def build(target = ".")
       inside_target(target) do
         Models.migrate!
-        ensure_user_exists
+        ensure_user_exists(options.reset_login)
 
         say "== Parsing templates for fields"
         template_files = Dir[File.join(target, "templates", "**/*")].reject { |f| File.directory? f }
         Builder.build!(template_files) do |filepath|
-          say "  * #{filepath}"
+          say_status :parse, filepath
         end
         say "== Build complete"
       end
@@ -70,7 +73,7 @@ module Vapid
 
       def inside_target(target, &block)
         if !File.exist? File.join(target, "config.ru")
-          say "== Could not find a Vapid project in #{expanded_target(target)}"
+          say_status :error, "Could not find a Vapid project in #{expanded_target(target)}", :red
         else
           FileUtils.mkdir_p File.join(target, ".cache")
           inside(target, &block)
@@ -81,12 +84,41 @@ module Vapid
         File.expand_path(target)
       end
 
-      def ensure_user_exists
-        return if Models::User.any?
-        say "== Creating an admin login"
-        email = ask "What is your email address?", default: "admin@example.com"
-        password = ask "Enter a password:", default: "password", echo: false
-        Models::User.create email: email, password: password
+      def ensure_user_exists(force)
+        return if !force && Models::User.any?
+
+        action = force ? "Resetting your" : "Create an"
+        say "== #{action} admin login"
+        
+        user = Models::User.first || Models::User.new
+        email = user.email
+        install_code = Settings.install_code
+
+        loop do
+          user.email = ask "What is your email address?", default: email
+          user.valid?
+          break unless user.errors[:email].any?
+          say_status :error, "Email #{user.errors[:email].to_sentence}", :red
+        end
+
+        loop do
+          user.password = ask("Enter a password:", echo: false)
+          user.valid?
+          say ""
+          break unless user.errors[:password].any?
+          say_status :error, "Password #{user.errors[:password].to_sentence}", :red
+        end
+
+        loop do
+          code = ask "Enter the install code (found in config/settings.yml):", default: code
+          break if code.casecmp(install_code) == 0
+          say_status :error, "Invalid install code", :red
+        end if install_code
+
+        unless user.save
+          say_status :error, "#{user.errors.full_messages.to_sentence}\n", :red
+          raise
+        end
       end
   end
 end

data/lib/vapid/controllers/{admin_controller.rb → dashboard_controller.rb}

@@ -1,8 +1,8 @@
 # rubocop:disable Metrics/BlockLength
 module Vapid
   module Controllers
-    # Admin routes
-    module AdminController
+    # Dashboard routes
+    module DashboardController
       extend Sinatra::Extension
 
       # Custom form builder for records
@@ -12,7 +12,7 @@ module Vapid
           @name = name
           @value = @directive.new(name).send :deserialize_input, value
 
-          label(name) +
+          label(name, caption: "#{name.to_s.humanize}") +
             template.content_tag(:div) do
               form_field + preview + destroy
             end
@@ -47,37 +47,37 @@ module Vapid
         app.helpers do
           def installed!
             if ActiveRecord::Migrator.current_version.zero? || !Models::User.any?
-              redirect "/admin/install" unless admin_action == "install"
+              redirect "/dashboard/install" unless dashboard_action == "install"
               false
             else
-              redirect "/admin" if admin_action == "install"
+              redirect "/dashboard" if dashboard_action == "install"
               true
             end
           end
 
           def authenticated!
             if !current_user
-              redirect "/admin/login" unless %w(login logout).include?(admin_action)
+              redirect "/dashboard/login" unless %w(login logout).include?(dashboard_action)
               false
             else
               true
             end
           end
 
-          def admin_action
+          def dashboard_action
             request.path_info.split("/")[2]
           end
 
-          def render_admin_template(template)
-            render_view template, layout: :admin
+          def render_dashboard_template(template)
+            render_view template, layout: :dashboard
           end
 
           def render_auth_template(template)
-            render_view template, layout: :admin_form
+            render_view template, layout: :modal
           end
 
-          def admin_partial(template, options = {}, &block)
-            partial "admin/#{template}", options, &block
+          def dashboard_partial(template, options = {}, &block)
+            partial "dashboard/#{template}", options, &block
           end
 
           def record_form_for(name, *args, &block)
@@ -95,7 +95,7 @@ module Vapid
               "/#{group.records.first.id}/edit"
             end
 
-            "/admin/groups/#{group.id}/records#{path}"
+            "/dashboard/groups/#{group.id}/records#{path}"
           end
 
           def flash_class(level)
@@ -132,11 +132,11 @@ module Vapid
         end
         # rubocop:enable Lint/NestedMethodDefinition
 
-        app.before("/admin/?*") do
+        app.before("/dashboard/?*") do
           @groups = all_groups if installed! && authenticated!
         end
 
-        app.namespace "/admin/?" do
+        app.namespace "/dashboard/?" do
           # TODO: Namespace before filters are currently broken on Sinatra 2.0
           # before do
           #   @groups = all_groups if installed! && authenticated!
@@ -145,12 +145,12 @@ module Vapid
           # end
 
           get do
-            render_admin_template "admin/overview/index"
+            render_dashboard_template "dashboard/overview/index"
           end
 
           get "/login/?" do
             @user = Models::User.new
-            render_auth_template "admin/login"
+            render_auth_template "dashboard/login"
           end
 
           post "/login/?" do
@@ -158,22 +158,22 @@ module Vapid
 
             if user
               session[:user_id] = user.id
-              redirect "/admin"
+              redirect "/dashboard"
             else
-              flash[:error] = "Could not log in"
-              redirect back
+              @user = Models::User.new email: params[:vapid_models_user][:email]
+              flash.now[:error] = "Invalid Email or password."
+              render_auth_template "dashboard/login"
             end
           end
 
           get "/logout/?" do
             session.delete(:user_id)
-            flash[:success] = "Successfully logged out"
-            redirect "/admin/login"
+            redirect "/dashboard/login"
           end
 
           get "/install/?" do
             @code = Settings.install_code
-            render_auth_template "/admin/install"
+            render_auth_template "/dashboard/install"
           end
 
           post "/install/?" do
@@ -186,42 +186,56 @@ module Vapid
             if (@code.nil? || @code.casecmp(params[:code]) == 0) && user.save
               run_builder
               session[:user_id] = user.id
-              flash[:success] = "Successfully created admin account"
-              redirect "/admin"
+              flash[:success] = "Successfully created admin account."
+              redirect "/dashboard"
             else
-              flash.now[:error] = "Could not create admin account"
-              render_auth_template "/admin/install"
+              flash.now[:error] = "Could not create admin account."
+              render_auth_template "/dashboard/install"
             end
           end
 
           get "/build/?" do
             run_builder
-            flash[:success] = "Site build complete"
-            redirect "/admin"
+            flash[:success] = "Site build complete."
+            redirect "/dashboard"
+          end
+
+          get "/settings/?" do
+            render_dashboard_template "dashboard/settings/edit"
+          end
+
+          post "/settings/?" do
+            attrs = if params[:password].blank?
+                params.slice(:email)
+              else
+                params.slice(:email, :password, :password_confirmation)
+              end
+
+            if current_user.update_attributes attrs
+              flash[:success] = "Settings updated."
+              redirect "/dashboard/settings"
+            else
+              flash.now[:error] = current_user.errors.full_messages.to_sentence
+              render_dashboard_template "dashboard/settings/edit"
+            end
           end
 
           get "/groups/:group_id/records/?" do
             @group = current_group
             @user = Vapid::Models::User.new
 
-            render_admin_template "admin/records/index"
+            render_dashboard_template "dashboard/records/index"
           end
 
           post "/groups/:group_id/records/?" do
             @group = current_group
             @record = @group.records.build(params[:record])
 
-            # TODO: Externalize this into a function (see update method below)
-            params[:record]["content"].each do |key, val|
-              content_type = current_group.fields[key]
-              @record.content[key] = Directives[content_type].serialize_input(val)
-            end
-
-            if @record.save
-              flash[:success] = "Record created"
+            if @record.update_content params[:record]["content"]
+              flash[:success] = "Record created."
               livereload
             else
-              flash[:error] = "Problem creating record"
+              flash[:error] = "Problem creating record."
             end
             redirect group_or_records_path(@group)
           end
@@ -230,36 +244,18 @@ module Vapid
             @group = current_group
             @record = @group.records.build
 
-            render_admin_template "admin/records/new"
+            render_dashboard_template "dashboard/records/new"
           end
 
           post "/groups/:group_id/records/:id/?" do
             @group = current_group
             @record = current_record
 
-            # TODO: Externalize this into a function (see create method above)
-            params[:record]["content"].each do |key, val|
-              # if val.is_a?(Hash) && val[:tempfile]
-              #   FileUtils.mkdir_p(settings.project_uploads)
-              #   File.open File.join(settings.project_uploads, val[:filename]), "wb" do |file|
-              #     file.write val[:tempfile].read
-              #   end
-              #   val = "/uploads/#{val[:filename]}"
-              # end
-
-              content_type = current_group.fields[key]
-              @record.content[key] = Directives[content_type].serialize_input(val)
-            end
-
-            params[:_destroy] && params[:_destroy].each do |key, _val|
-              @record.content[key] = nil
-            end
-
-            if @record.save
-              flash[:success] = "Record updated"
+            if @record.update_content params[:record]["content"], params[:_destroy]
+              flash[:success] = "Record updated."
               livereload
             else
-              flash.now[:error] = "Problem updating record"
+              flash.now[:error] = "Problem updating record."
             end
             redirect group_or_records_path(@group)
           end
@@ -269,10 +265,10 @@ module Vapid
             @record = current_record
 
             if @record.destroy
-              flash[:success] = "Record deleted"
+              flash[:success] = "Record deleted."
               livereload
             else
-              flash[:error] = "Problem deleting record"
+              flash[:error] = "Problem deleting record."
             end
             redirect group_or_records_path(@group)
           end
@@ -281,7 +277,7 @@ module Vapid
             @group = current_group
             @record = current_record
 
-            render_admin_template "admin/records/edit"
+            render_dashboard_template "dashboard/records/edit"
           end
         end
       end