pwb 1.2.0 → 1.3.0

data/config/locales/tr.yml

@@ -5,9 +5,9 @@ tr:
   back: Geri
   changePassword: Şifre değiştir
   contact:
-    emailSubject: Web sitenizdeki iletişim
+    emailSubject: Web sitenizdeki iletişim formu
     error: Maalesef bir hata oldu.
-    success: Mesajın için teşekkürler. Yakında sizinle iletişim kuracağız!
+    success: Mesajınınz için teşekkürler. Yakında sizinle iletişim kuracağız!
   contactUs: İletişim
   contactUsPrompt: Bizimle iletişime geçmek için aşağıdaki formu doldurun
   devise:
@@ -16,19 +16,19 @@ tr:
   editarPropiedad: Mülkü düzenle
   email: E-posta
   'false': Yok hayır
-  findAProperty: Emlak bul
+  findAProperty: Mülk bul
   findByReference: Referansa göre bulun
   forRent: Kiralık
   forSale: Satılık
-  go: Gitmek
+  go: Git
   labels:
-    create: yaratmak
-    edit: Düzenleme
-    latestProperties: Latest properties
+    create: Oluştur
+    edit: Düzenle
+    latestProperties: Yeni mülkler
     new: Yeni
-    ourServices: Our services
-    save: Kayıt etmek
-  leaveBlank: Değiştirmek istemiyorsan boş bırak
+    ourServices: Servislerimiz
+    save: Kaydet
+  leaveBlank: Değiştirmek istemiyorsanız boş bırakın
   legalAdvice: Yasal Uyarı
   listadoPropiedades: Mülklerin listesi
   mailers:
@@ -50,15 +50,15 @@ tr:
   message: Mesaj
   name: isim
   navbar:
-    aboutUs: Hakkımızda
-    admin: yönetim
-    buy: satın almak
-    contactUs: Temas
-    home: Ev
-    legalAdvice: Yasal Uyarı
-    privacyPolicy: Gizlilik Politikası
-    rent: Kira
-    sell: Satmak
+    about-us: Hakkımızda
+    admin: Panel
+    buy: Satın Al
+    contact-us: İletişim
+    home: Anasayfa
+    legal: Yasal Uyarı
+    privacy: Gizlilik Politikası
+    rent: Kirala
+    sell: Sat
   needCurrentPwd: Değişikliklerinizi onaylamak için mevcut şifrenize ihtiyacımız var
   newPassword: Yeni Şifre
   noResultsForSearch: Üzgünüz, sonuç bulunamadı
@@ -68,21 +68,21 @@ tr:
     priceDescending: "↑ Fiyat (azalan)"
   pages:
     aboutUs: Hakkımızda
-    sell: Satmak
+    sell: Satış
   placeHolders:
     email: E-posta adresiniz
     message: Mesajınızı buraya yazın
     name: Adınız
     subject: konu
-    tel: Sabit veya mobil
-  privacyPolicy: Gizlilik Politikası
+    tel: Sabit veya cep telefonunuz
+  # privacyPolicy: Gizlilik Politikası
   property:
     description: Açıklama
-    details: ayrıntılar
+    details: Ayrıntılar
     extras: Özellikler
     furniture: Mobilya
     goToProperty: Mülkü Görüntüle
-    highlightedProperty: Olağanüstü Mülk
+    highlightedProperty: Öne Çıkarılan Mülk
     locality: mekân
     map: Harita
     monthlyRentalPriceHighSeason: Aylık Ücret (Yüksek Sezon)
@@ -106,12 +106,12 @@ tr:
       çabuk yakalayamaz.
   requestPropertyInfo: Bilgi talep et
   search: Arama
-  searchForProperties: Mülk ara ara
+  searchForProperties: Mülk ara
   selectpicker:
     countSelectedText: "{1} 'den seçilen {0}"
     noneResultsText: Sonuç bulunamadı {0}
     noneSelectedText: Seçilmiş bir şey yok
-  send: göndermek
+  send: Gönder
   setup:
     claimSubdomain: Bu URL'yi isteyin
     createdSuccessfully: Site başarıyla oluşturuldu
@@ -119,12 +119,12 @@ tr:
     loggedInAs: olarak giriş yaptı
     logout: Çıkış Yap
     selectUrl: Bir URL seçin
-    selectUrlMessage: Başarıyla bir hesap oluşturdunuz - şimdi yeni siteniz için url
+    selectUrlMessage: Başarıyla bir hesap oluşturdunuz - şimdi yeni siteniz için URL adresi
       seçin
     subdomain: Alt alan
     subdomainMissing: Lütfen alt alan adı için bir ad girin
     thankYouForTrusting: "%{company_name}'e güven verdiğiniz için teşekkür ederiz"
-    urlNotAvailable: Maalesef bu url kullanılamıyor
+    urlNotAvailable: Maalesef bu URL kullanılamıyor
     weAreCreatingSite: Sitenizi oluşturuyoruz
   signOut: Oturumu Kapat
   simple_form:
@@ -134,16 +134,16 @@ tr:
       search:
         count_bathrooms: Banyo (dk)
         count_bedrooms: Yatak odası (dk)
-        for_rent_price_from: Kiralık (Aylık)
-        for_rent_price_till: Kiralık Kiralık (Aylık)
-        for_sale_price_from: Dan başlayan fiyatlar
-        for_sale_price_till: Fiyat till
+        for_rent_price_from: En düşük
+        for_rent_price_till: En yüksek
+        for_sale_price_from: En düşük
+        for_sale_price_till: En yüksek
         in_locality: mekân
         in_zone: bölge
         locality: mekân
         property_state: Mülkiyet Durumu
         property_type: Emlak Tipi
-    'no': Yok hayır
+    'no': Hayır
     required:
       mark: "*"
       text: gereklidir
@@ -155,6 +155,6 @@ tr:
   webContentSections:
     aboutUs: Hakkımızda
     contactInformation: İletişim bilgileri
-    home: Ev
-    sell: Satmak
-    tagLine: Etiket Hattı
+    home: Anasayfa
+    sell: Satış
+    tagLine: Slogan

data/config/locales/vi.yml

@@ -51,13 +51,13 @@ vi:
   message: Tin nhắn
   name: Tên
   navbar:
-    aboutUs: Về chúng tôi
+    about-us: Về chúng tôi
     admin: quản trị
     buy: Mua
-    contactUs: Liên hệ với chúng tôi
+    contact-us: Liên hệ với chúng tôi
     home: Nhà
-    legalAdvice: Thông báo pháp lý
-    privacyPolicy: Chính sách bảo mật
+    legal: Thông báo pháp lý
+    privacy: Chính sách bảo mật
     rent: Thuê
     sell: Bán
   needCurrentPwd: Chúng tôi cần mật khẩu hiện tại của bạn để xác nhận thay đổi của
@@ -77,7 +77,7 @@ vi:
     name: Tên của bạn
     subject: Tiêu đề
     tel: Điện thoại cố định hoặc di động
-  privacyPolicy: Chính sách bảo mật
+  # privacyPolicy: Chính sách bảo mật
   property:
     description: Sự miêu tả
     details: Chi tiết

data/config/preset_styles/green_amber.json

@@ -0,0 +1,23 @@
+[
+{
+  "name": "green_amber",
+  "id": "green_amber",
+  "variables":
+  {
+    "primary-color-dark": "#388E3C",
+    "primary-background-dark": "#388E3C",
+    "primary-color": "#4CAF50",
+    "primary-color-light": "#C8E6C9",
+    "primary-color-text": "#FFFFFF",
+    "accent-color": "#FFC107",
+    "primary-text-color": "#212121",
+    "secondary-text-color": "#757575",
+    "divider-color": "#BDBDBD"
+  },
+  "associations":
+  {
+    "breadcrumb_color": "primary-background-light",
+    "page_top_strip_background": "primary-background-dark",
+    "page_top_strip_color": "primary-color-text"
+  }
+}]

data/config/preset_styles/purple_teal.json

@@ -0,0 +1,23 @@
+[
+{
+  "name": "purple_teal",
+  "id": "purple_teal",
+  "variables":
+  {
+    "primary-color-dark": "#7B1FA2",
+    "primary-background-dark": "#7B1FA2",
+    "primary-color": "#9C27B0",
+    "primary-color-light": "#E1BEE7",
+    "primary-color-text": "#FFFFFF",
+    "accent-color": "#009688",
+    "primary-text-color": "#212121",
+    "secondary-text-color": "#757575",
+    "divider-color": "#BDBDBD"
+  },
+  "associations":
+  {
+    "breadcrumb_color": "primary-background-light",
+    "page_top_strip_background": "primary-background-dark",
+    "page_top_strip_color": "primary-color-text"
+  }
+}]

data/config/preset_styles/red_light.json

@@ -0,0 +1,18 @@
+[
+{
+  "name": "red_light",
+  "id": "red_light",
+  "variables":
+  {
+    "primary_color": "#e91b23",
+    "secondary_color": "#3498db",
+    "action_color": "green",
+    "body_style": "siteLayout.wide",
+    "theme": "light"
+  },
+  "associations":
+  {
+    "breadcrumb_color": "yellow",
+    "page_top_strip_color": "secondary_color"
+  }
+}]

data/config/routes.rb

@@ -13,18 +13,26 @@ Pwb::Engine.routes.draw do
   # end
 
   authenticate :user do
+    get '/propertysquares' => 'squares#vue'
+    get '/propertysquares/*path' => 'squares#vue'
+    get '/squares/:client_id' => 'squares#show_client'
+    get '/squares/:client_id/:prop_id' => 'squares#show_prop'
     get "/admin" => "admin_panel#show"
     get "/admin/*path" => "admin_panel#show"
-    scope "(:locale)", locale: /en|nl|es|fr|de|ru/ do
+    get "/admin-1" => "admin_panel#show_legacy_1"
+    get "/admin-1/*path" => "admin_panel#show_legacy_1"
+    scope "(:locale)", locale: /#{I18n.available_locales.join("|")}/ do
       get "/admin" => "admin_panel#show", as: "admin_with_locale"
       get "/admin/*path" => "admin_panel#show"
+      get "/admin-1" => "admin_panel#show_legacy_1", as: "admin_with_locale_legacy"
+      get "/admin-1/*path" => "admin_panel#show_legacy_1"
     end
+
   end
 
-  get "/custom_css" => "css#custom_css", as: "custom_css"
+  get "/custom_css/:theme_name" => "css#custom_css", as: "custom_css"
 
-  # TODO - get locales dynamically
-  scope "(:locale)", locale: /en|nl|es|fr|de|pt|it|vi|tr|ru/ do
+  scope "(:locale)", locale: /#{I18n.available_locales.join("|")}/ do
 
     devise_scope :user do
       get "/users/edit_success" => "devise/registrations#edit_success", as: "user_edit_success"
@@ -37,23 +45,19 @@ Pwb::Engine.routes.draw do
 
 
     get "/" => "welcome#index", as: "home"
-    get "/p/:page_slug" => "sections#generic_page", as: "generic_page"
-    get "/c/:page_slug" => "comfy#show"
+    get "/p/:page_slug" => "pages#show_page", as: "show_page"
+    # get "/c/:page_slug" => "comfy#show"
 
     get "/properties/for-rent/:id/:url_friendly_title" => "props#show_for_rent", as: "prop_show_for_rent"
     get "/properties/for-sale/:id/:url_friendly_title" => "props#show_for_sale", as: "prop_show_for_sale"
 
-    get "/about-us" => "sections#about_us"
-    # get "/sell" => "sections#sell"
-    # get "/sell" => "comfy#show"
+    get "/about-us" => "pages#show_page", page_slug: "about-us"
+    get "/contact-us" => "contact_us#index", as: "contact_us" #
+    post "/contact_us" => "contact_us#contact_us_ajax"
+
     get "/buy" => "search#buy"
     get "/rent" => "search#rent"
 
-    get "/contact-us" => "sections#contact_us", as: "contact_us" #
-    get "/privacy-policy" => "sections#privacy_policy"
-    get "/legal" => "sections#legal"
-
-    post "/contact_us" => "sections#contact_us_ajax"
     post "/search_ajax_for_sale" => "search#search_ajax_for_sale"
     post "/search_ajax_for_rent" => "search#search_ajax_for_rent"
     # post "/ajax_find_by_ref" => "search#ajax_find_by_ref"
@@ -107,27 +111,35 @@ Pwb::Engine.routes.draw do
         put "/translations/:id/update_for_locale" => "translations#update_for_locale"
         delete "/translations/:id" => "translations#delete_translation_values"
 
+        # put "tenant" => "agency#update_legacy"
+        put "/master_address" => "agency#update_master_address"
 
         get "/agency" => "agency#show"
         put "/agency" => "agency#update"
         put "/website" => "website#update"
         get "/infos" => "agency#infos"
 
-        # put "tenant" => "agency#update_legacy"
-        put "/master_address" => "agency#update_master_address"
+        put "/pages" => "page#update"
+        put "/pages/page_part_visibility" => "page#update_page_part_visibility"
+        put "/pages/page_fragment" => "page#save_page_fragment"
+        get "/pages/:page_name" => "page#get"
+
+        # post '/page_fragments/photos/:page_id/:block_label' => 'page_fragments#set_photo'
+
+        post '/pages/photos/:page_slug/:page_part_key/:block_label' => 'page#set_photo'
+        # post '/cms-pages/photos/:page_id/:block_label' => 'cms_pages#set_photo'
+        # jsonapi_resources :cms_pages
 
-        post '/cms-pages/photos/:page_id/:block_label' => 'cms_pages#set_photo'
-        get "/cms-pages/meta/:page_name" => "cms_pages#meta"
-        jsonapi_resources :cms_pages
 
-        # get "/web-contents" => "agency#infos"
+        get "/web-contents" => "agency#infos"
         jsonapi_resources :lite_properties
         jsonapi_resources :properties
-        # jsonapi_resources :sections
+        jsonapi_resources :clients
         jsonapi_resources :web_contents
+        resources :contacts
 
-        get "/sections" => "sections#index"
-        put "/sections" => "sections#bulk_update"
+        get "/links" => "links#index"
+        put "/links" => "links#bulk_update"
 
         get "/themes" => "themes#index"
         get "/mls" => "mls#index"

data/db/migrate/20161120103546_create_pwb_props.rb

@@ -31,13 +31,13 @@ class CreatePwbProps < ActiveRecord::Migration[5.0]
 
       t.boolean :for_rent_short_term, default: false
       t.boolean :for_rent_long_term, default: false
+      # if I used flag shih tzu for above, I couldn't make queries like:
+      # Property.where('for_rent_short_term OR for_rent_long_term')
+
       t.boolean :for_sale, default: false
       t.boolean :hide_map, default: false
       t.boolean :obscure_map, default: false
       t.boolean :portals_enabled, default: false
-      # if I used flag shih tzu for above, I couldn't make queries like:
-      # Property.where('for_rent_short_term OR for_rent_long_term')
-
 
       t.datetime :deleted_at
       t.datetime :active_from

data/db/migrate/20161122174847_create_pwb_sections.rb

@@ -1,13 +1,14 @@
+# oct 2017 - no longer in use - to_delete
 class CreatePwbSections < ActiveRecord::Migration[5.0]
   def change
-    create_table :pwb_sections do |t|
-      t.string :link_key
-      t.string :link_path
-      t.integer :sort_order
-      t.boolean :visible
-      t.timestamps null: false
-    end
+    # create_table :pwb_sections do |t|
+    #   t.string :link_key
+    #   t.string :link_path
+    #   t.integer :sort_order
+    #   t.boolean :visible
+    #   t.timestamps null: false
+    # end
 
-    add_index :pwb_sections, :link_key, :unique => true
+    # add_index :pwb_sections, :link_key, :unique => true
   end
 end

data/db/migrate/20161128221919_create_pwb_clients.rb

@@ -1,3 +1,4 @@
+# spt 2017 - superseeded by contacts
 class CreatePwbClients < ActiveRecord::Migration[5.0]
   def change
     create_table :pwb_clients do |t|

data/db/migrate/20170315195413_add_extra_cols_to_pwb_sections.rb

@@ -1,10 +1,11 @@
+# oct 2017 - no longer in use - to_delete
 class AddExtraColsToPwbSections < ActiveRecord::Migration[5.0]
   def change
-    add_column :pwb_sections, :flags, :integer, default: 0, index: true, null: false
-    add_column :pwb_sections, :details, :json, default: {}
-    add_column :pwb_sections, :is_page, :boolean, default: false, index: true
-    add_column :pwb_sections, :show_in_top_nav, :boolean, default: false, index: true
-    add_column :pwb_sections, :show_in_footer, :boolean, default: false, index: true
-    add_column :pwb_sections, :key, :string, index: true
+    # add_column :pwb_sections, :flags, :integer, default: 0, index: true, null: false
+    # add_column :pwb_sections, :details, :json, default: {}
+    # add_column :pwb_sections, :is_page, :boolean, default: false, index: true
+    # add_column :pwb_sections, :show_in_top_nav, :boolean, default: false, index: true
+    # add_column :pwb_sections, :show_in_footer, :boolean, default: false, index: true
+    # add_column :pwb_sections, :key, :string, index: true
   end
 end

data/db/migrate/20170716075456_create_pwb_pages.rb

@@ -0,0 +1,23 @@
+class CreatePwbPages < ActiveRecord::Migration[5.0]
+  def change
+    create_table :pwb_pages do |t|
+      t.string :slug
+      t.string :setup_id
+      # t.string :link_key
+      # t.string :link_path
+      t.boolean :visible, default: false
+      t.integer :last_updated_by_user_id
+      t.integer :flags, default: 0, index: true, null: false
+      t.json :details, default: {}
+      t.integer :sort_order_top_nav, default: 0
+      t.integer :sort_order_footer, default: 0
+      t.boolean :show_in_top_nav, default: false, index: true
+      t.boolean :show_in_footer, default: false, index: true
+      # t.boolean :key, :string, index: true
+      t.timestamps null: false
+    end
+
+    # add_index :pwb_pages, :link_key, :unique => true
+    add_index :pwb_pages, :slug, :unique => true
+  end
+end