Skip to content

Commit

Permalink
initial commit
Browse files Browse the repository at this point in the history
  • Loading branch information
zaheenzkhan committed May 1, 2017
1 parent 4e6c9c8 commit f816d26
Show file tree
Hide file tree
Showing 63 changed files with 244 additions and 2,880 deletions.
7 changes: 0 additions & 7 deletions .travis.yml

This file was deleted.

2 changes: 2 additions & 0 deletions 0.1.0'
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Temporarily enhancing PATH to include DevKit...
Building native extensions. This could take a while...
4 changes: 3 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ gem 'sass-rails', '~> 5.0'
gem 'uglifier', '>= 1.3.0'
gem 'coffee-rails', '~> 4.2.1'
gem 'jquery-rails'

gem 'wdm', '~> 0.1.0'
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby

Expand All @@ -15,6 +15,8 @@ gem 'dynamic_form'
gem 'acts_as_tree'
gem 'paperclip'
gem 'jquery-fileupload-rails'
gem 'tzinfo-data'
gem 'coffee-script-source', '1.8.0'

group :development do
gem 'web-console', '~> 2.0'
Expand Down
15 changes: 14 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ GEM
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.12.2)
coffee-script-source (1.8.0)
concurrent-ruby (1.0.4)
debug_inspector (0.0.2)
dynamic_form (1.1.4)
Expand Down Expand Up @@ -86,6 +86,8 @@ GEM
minitest (5.10.1)
nokogiri (1.7.0.1)
mini_portile2 (~> 2.1.0)
nokogiri (1.7.0.1-x86-mingw32)
mini_portile2 (~> 2.1.0)
paperclip (5.1.0)
activemodel (>= 4.2.0)
activesupport (>= 4.2.0)
Expand Down Expand Up @@ -135,13 +137,17 @@ GEM
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sqlite3 (1.3.13)
sqlite3 (1.3.13-x86-mingw32)
thor (0.19.4)
thread_safe (0.3.5)
tilt (2.0.6)
tzinfo (1.2.2)
thread_safe (~> 0.1)
tzinfo-data (1.2017.2)
tzinfo (>= 1.0.0)
uglifier (3.0.4)
execjs (>= 0.3.0, < 3)
wdm (0.1.1)
web-console (2.3.0)
activemodel (>= 4.0)
binding_of_caller (>= 0.7.2)
Expand All @@ -150,10 +156,12 @@ GEM

PLATFORMS
ruby
x86-mingw32

DEPENDENCIES
acts_as_tree
coffee-rails (~> 4.2.1)
coffee-script-source (= 1.8.0)
dynamic_form
factory_girl_rails
jquery-fileupload-rails
Expand All @@ -162,5 +170,10 @@ DEPENDENCIES
rails (= 4.2.7.1)
sass-rails (~> 5.0)
sqlite3
tzinfo-data
uglifier (>= 1.3.0)
wdm (~> 0.1.0)
web-console (~> 2.0)

BUNDLED WITH
1.13.6
File renamed without changes
Binary file added app/assets/images/logo.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/logoo.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 5 additions & 3 deletions app/controllers/groups_controller.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
class GroupsController < ApplicationController
before_action :require_admin
# before_action :require_admin
before_action :require_existing_group, :only => [:edit, :update, :destroy]
before_action :require_group_isnt_admins_group, :only => [:edit, :update, :destroy]

Expand All @@ -21,11 +21,13 @@ def create
end
end

# Note: @group is set in require_existing_group
def edit
end

# Note: @group is set in require_existing_group
def show
@group= Group.find(params[:id])
end

def update
if @group.update_attributes(permitted_params.group)
redirect_to edit_group_url(@group), :notice => t(:your_changes_were_saved)
Expand Down
7 changes: 6 additions & 1 deletion app/controllers/users_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def create
@user = User.new(permitted_params.user)

if @user.save
UserMailer.signup_email(@user).deliver_now
UserMailer.signup_email(@user).deliver
redirect_to users_url
else
render :action => 'new'
Expand All @@ -25,6 +25,11 @@ def create

# Note: @user is set in require_existing_user
def edit
if params[:user] == '1'
@form_flag = 1
elsif params[:user] == 0
@form_flag = 0
end
end

# Note: @user is set in require_existing_user
Expand Down
2 changes: 0 additions & 2 deletions app/views/clipboard/_clipboard_empty.de.html.erb

This file was deleted.

2 changes: 0 additions & 2 deletions app/views/clipboard/_clipboard_empty.es.html.erb

This file was deleted.

2 changes: 0 additions & 2 deletions app/views/clipboard/_clipboard_empty.fr.html.erb

This file was deleted.

2 changes: 0 additions & 2 deletions app/views/clipboard/_clipboard_empty.it.html.erb

This file was deleted.

2 changes: 0 additions & 2 deletions app/views/clipboard/_clipboard_empty.nl.html.erb

This file was deleted.

2 changes: 0 additions & 2 deletions app/views/clipboard/_clipboard_empty.zh-CN.html.erb

This file was deleted.

8 changes: 5 additions & 3 deletions app/views/groups/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,21 @@
<th><%= t :name %></th>
<th></th>
</tr>
<% @groups.each do |group| -%>
<% current_user.groups.each do |group| -%>
<tr class="<%= cycle('even','odd') %>">
<% if group.admins_group? -%>
<td><%= image_tag('group_grey.png') %></td>
<td class="group_name disabled"><%= group.name %></td>
<td class="group_name"><%= link_to group.name, group %></td>
<td></td>
<% else -%>
<td><%= image_tag('group.png') %></td>
<td class="group_name"><%= group.name %></td>
<td class="group_name"><%= link_to group.name, group %></td>
<% if current_user.member_of_admins? -%>
<td>
<%= link_to image_tag('edit.png', :alt => t(:edit)), edit_group_path(group), :title => t(:edit) %>&nbsp;
<%= link_to image_tag('delete.png', :alt => t(:delete_item)), group_path(group), :method => :delete, :data => { :confirm => t(:are_you_sure) }, :title => t(:delete_item) %>
</td>
<% end -%>
<% end -%>
</tr>
<% end -%>
Expand Down
15 changes: 15 additions & 0 deletions app/views/groups/show.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<h1><%= @group.name %> </h1>
<table>
<tr>
<th></th>
<h4>USERS :</h4>
<th></th>
</tr>
<% @group.users.each do |user| -%>
<tr class="<%= cycle('even','odd') %>">
<td><%= image_tag('user.png') %></td>
<td class="user_name"><%= user.name %></td>
<td class="user_email"><%= user.email %></td>
</tr>
<% end -%>
</table>
6 changes: 3 additions & 3 deletions app/views/layouts/application.html.erb
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<!DOCTYPE html>
<html>
<head>
<% if content_for? :title -%>
<title>Boxroom | <%= content_for :title %></title>
<title> Putfile | <%= content_for :title %></title>
<% else -%>
<title>Boxroom</title>
<title>Putfile</title>
<% end -%>
<%= stylesheet_link_tag 'application' %>
<%= javascript_include_tag 'application' %>
Expand Down
2 changes: 0 additions & 2 deletions app/views/reset_password/_message.de.html.erb

This file was deleted.

2 changes: 0 additions & 2 deletions app/views/reset_password/_message.es.html.erb

This file was deleted.

2 changes: 0 additions & 2 deletions app/views/reset_password/_message.fr.html.erb

This file was deleted.

2 changes: 0 additions & 2 deletions app/views/reset_password/_message.it.html.erb

This file was deleted.

2 changes: 0 additions & 2 deletions app/views/reset_password/_message.nl.html.erb

This file was deleted.

2 changes: 0 additions & 2 deletions app/views/reset_password/_message.zh-CN.html.erb

This file was deleted.

1 change: 0 additions & 1 deletion app/views/shared/_footer.html.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<div id="footer">
<p class="footer">
<a href="http://boxroomapp.com/">Boxroom</a> is released under the <a href="http://boxroomapp.com/license">MIT license</a>
</p>
</div>
4 changes: 2 additions & 2 deletions app/views/shared/_header.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<div class="user_welcome">
<p>
<%= t :hello %>, <%= current_user.name %>!<br>
<%= link_to t(:settings), edit_user_path(current_user) %> | <%= link_to t(:sign_out), signout_path, :method => :delete %>
<%= link_to t(:settings), edit_user_path(current_user, user: '1', :method => :post)%> | <%= link_to t(:sign_out), signout_path, :method => :delete %>
</p>
</div>
<% end -%>
<%= link_to image_tag('logo.png', :alt => 'Boxroom'), root_path %>
<%= link_to image_tag('logoo.jpeg', :alt => 'Putfile'), root_path %>
</div>
2 changes: 1 addition & 1 deletion app/views/shared/_menu.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<p class="menu">
<% if signed_in? -%>
<%= link_to t(:folders), folders_path %> &nbsp; &nbsp;
<%= link_to t(:groups), groups_path %> &nbsp; &nbsp;
<% if current_user.member_of_admins? -%>
<%= link_to t(:users), users_path %> &nbsp; &nbsp;
<%= link_to t(:groups), groups_path %> &nbsp; &nbsp;
<%= link_to t(:shared_files), share_links_path %>
<% end -%>
<% end -%>
Expand Down
18 changes: 0 additions & 18 deletions app/views/user_mailer/reset_password_email.de.text.erb

This file was deleted.

5 changes: 1 addition & 4 deletions app/views/user_mailer/reset_password_email.en.text.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Dear user,

Please use the following URL to reset your Boxroom password:
Please use the following URL to reset your Putfile password:

<%= edit_reset_password_url(@user.reset_password_token) %>

Expand All @@ -12,6 +12,3 @@ Just as a reminder, your account info:
If you did not submit a request to reset your password, please ignore this email.
Your current password is still valid.

--
Boxroom
http://boxroomapp.com/
17 changes: 0 additions & 17 deletions app/views/user_mailer/reset_password_email.es.text.erb

This file was deleted.

17 changes: 0 additions & 17 deletions app/views/user_mailer/reset_password_email.fr.text.erb

This file was deleted.

17 changes: 0 additions & 17 deletions app/views/user_mailer/reset_password_email.it.text.erb

This file was deleted.

17 changes: 0 additions & 17 deletions app/views/user_mailer/reset_password_email.nl.text.erb

This file was deleted.

16 changes: 0 additions & 16 deletions app/views/user_mailer/reset_password_email.zh-CN.text.erb

This file was deleted.

20 changes: 0 additions & 20 deletions app/views/user_mailer/share_link_email.de.text.erb

This file was deleted.

Loading

0 comments on commit f816d26

Please sign in to comment.