diff --git a/web/app/views/clients/_home.html.erb b/web/app/views/clients/_home.html.erb deleted file mode 100644 index 345e8a9d9..000000000 --- a/web/app/views/clients/_home.html.erb +++ /dev/null @@ -1,107 +0,0 @@ -
- - <% if @nativeClient %> -
-
-

create session

- -
-
-
-

find session

- -
-
-
-

feed

- -
-
-
-

musicians

- -
-
-
-

bands

- -
-
-
-

jamtracks

- -
-
-
-

profile

- -
-
- -
- <% else %>
-
-

create session

- -
-
-
-

find session

- -
-
-
-

feed

- -
-
-
-

musicians

- -
-
-
-

bands

- -
-
-
-

jamtracks

- -
-
-
-

profile

- -
-
- -
- <% end %> - -
diff --git a/web/app/views/clients/_home.html.slim b/web/app/views/clients/_home.html.slim new file mode 100644 index 000000000..444b52bd9 --- /dev/null +++ b/web/app/views/clients/_home.html.slim @@ -0,0 +1,82 @@ +.screen layout="screen" layout-id="home" + / Layout is different if jam_tracks tile available: + -jamtracks=Rails.configuration.jam_tracks_available + -if (jamtracks) + -small_tile_size="2.4" + -column_positions=["0.0,1", "2.4,1", "4.8,1", "7.2,1", "9.6,1" + -else + -small_tile_size="3.0" + -column_positions=["0,1", "3,1", "0,1", "6,1", "9,1"] + / Grid is the count of the smallest spaces, then + / individual spells span those spaces + -if @nativeClient + .grid layout-grid="2x12" + .homecard.createsession layout-grid-columns="4" layout-grid-position="0,0" layout-grid-rows="1" layout-link="createSession" type="createSession" + h2 create session + .homebox-info + /! 4 friends online, 2 currently in sessions + .homecard.findsession layout-grid-columns="4" layout-grid-position="4,0" layout-grid-rows="1" layout-link="findSession" type="findSession" + h2 find session + .homebox-info + /! 1 session invitation, 19 public sessions active + .homecard.feed layout-grid-columns="4" layout-grid-position="8,0" layout-grid-rows="1" layout-link="feed" + h2 feed + .homebox-info + /! 4 friends online, 2 currently in sessions + .homecard.musicians layout-grid-columns=small_tile_size layout-grid-position=column_positions[0] layout-grid-rows="1" layout-link="musicians" + h2 musicians + .homebox-info + /! 5 followers, 3 following + .homecard.bands layout-grid-columns=small_tile_size layout-grid-position=column_positions[1] layout-grid-rows="1" layout-link="bands" + h2 bands + .homebox-info + /! 1 session invitation, 19 public sessions active + -if jamtracks + .homecard.jamtrack layout-grid-columns=small_tile_size layout-grid-position=column_positions[2] layout-grid-rows="1" layout-link="jamtrack" + h2 jamtracks + .homebox-info + /! 5 followers, 3 following + .homecard.profile layout-grid-columns=small_tile_size layout-grid-position=column_positions[3] layout-grid-rows="1" + h2 profile + .homebox-info + /! 5 followers, 3 following + .homecard.account layout-grid-columns=small_tile_size layout-grid-position=column_positions[4] layout-grid-rows="1" layout-link="account" + h2 account + .homebox-info + /! free service level + -else + .grid layout-grid="2x12" + .homecard.createsession layout-grid-columns="4" layout-grid-position="0,0" layout-grid-rows="1" layout-link="createSession" type="createSession" + h2 create session + .homebox-info + /! 4 friends online, 2 currently in sessions + .homecard.findsession layout-grid-columns="4" layout-grid-position="4,0" layout-grid-rows="1" layout-link="findSession" type="findSession" + h2 find session + .homebox-info + /! 1 session invitation, 19 public sessions active + .homecard.feed layout-grid-columns="4" layout-grid-position="8,0" layout-grid-rows="1" layout-link="feed" + h2 feed + .homebox-info + /! 4 friends online, 2 currently in sessions + .homecard.musicians layout-grid-columns=small_tile_size layout-grid-position=column_positions[0] layout-grid-rows="1" layout-link="musicians" + h2 musicians + .homebox-info + /! 5 followers, 3 following + .homecard.bands layout-grid-columns=small_tile_size layout-grid-position=column_positions[1] layout-grid-rows="1" layout-link="bands" + h2 bands + .homebox-info + -if jamtracks + /! 1 session invitation, 19 public sessions active + .homecard.jamtrack layout-grid-columns=small_tile_size layout-grid-position=column_positions[2] layout-grid-rows="1" layout-link="jamtrack" + h2 jamtracks + .homebox-info + /! 5 followers, 3 following + .homecard.profile layout-grid-columns=small_tile_size layout-grid-position=column_positions[3] layout-grid-rows="1" + h2 profile + .homebox-info + /! 5 followers, 3 following + .homecard.account layout-grid-columns=small_tile_size layout-grid-position=column_positions[4] layout-grid-rows="1" layout-link="account" + h2 account + .homebox-info + /! free service level + \ No newline at end of file diff --git a/web/config/environments/development.rb b/web/config/environments/development.rb index e7868bb34..3cc7be84b 100644 --- a/web/config/environments/development.rb +++ b/web/config/environments/development.rb @@ -89,5 +89,5 @@ SampleApp::Application.configure do config.youtube_developer_key = "AI39si5bPqiNc5GQHscWJh9Wl1WTAr9aZqr_YncUvaR7Kz0rgPdBVWVubHZ94xZ3KLIBqtE9mu3VZe-UpMU80QxXoC66kBNp7A" config.youtube_app_name = "JamKazamDev" - config.recurly_subdomain = 'jamkazam-development' + config.jam_tracks_available=false end diff --git a/web/config/environments/production.rb b/web/config/environments/production.rb index c1fdf81ec..1e1281996 100644 --- a/web/config/environments/production.rb +++ b/web/config/environments/production.rb @@ -94,4 +94,5 @@ SampleApp::Application.configure do config.twitter_app_secret = 'ZjLl7rtagTozYDuKKyZNtaTQ4aGFmZPVCO8EoUJmg' # staging config.recurly_subdomain = 'jamkazam' + config.jam_tracks_available=false end diff --git a/web/config/environments/test.rb b/web/config/environments/test.rb index f692a10c7..5f2faac49 100644 --- a/web/config/environments/test.rb +++ b/web/config/environments/test.rb @@ -98,5 +98,6 @@ SampleApp::Application.configure do # Use Public Keys to identify your site when using Recurly.js. See https://docs.recurly.com/js/#include to learn more. config.recurly_public_api_key = 'sc-s6G2OA80Rwyvsb1RmS3mAE' config.recurly_subdomain = 'jamkazam-test' + config.jam_tracks_available=true end