Skip to content

Commit

Permalink
Add a basic template and include registration urls
Browse files Browse the repository at this point in the history
Signed-off-by: Nir Izraeli <nirizr@gmail.com>
  • Loading branch information
nirizr authored and Nir Izraeli committed Nov 8, 2016
1 parent cc0e392 commit c01a480
Show file tree
Hide file tree
Showing 7 changed files with 2,893 additions and 4 deletions.
3 changes: 2 additions & 1 deletion server/accounts/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@

urlpatterns = [
url(r'^profile/$', views.profile, name='profile'),
url(r'', include('rest_auth.urls')),
url(r'/', include('rest_auth.urls')),
url('^/', include('django.contrib.auth.urls'))
]
2 changes: 1 addition & 1 deletion server/accounts/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ def profile(request):
"last_name": request.user.last_name,
"email": request.user.email,
})
return Response(user)
return Response(user, template_name='profile.html')
11 changes: 9 additions & 2 deletions server/rematch/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True


# As of django 1.10, allowed hosts are validated in debug as well,
# this disables that and makes sure all hosts are acceptible when
# running in debug mode. for more details see
Expand All @@ -41,12 +40,14 @@
# Application definition

INSTALLED_APPS = [
'allauth',
'accounts',
'collab',
'rest_framework',
'rest_framework.authtoken',
'rest_auth',
'djcelery',
'registration',
'django.contrib.admin',
'django.contrib.auth',
'django.contrib.contenttypes',
Expand All @@ -72,7 +73,9 @@
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [],
'DIRS': [
os.path.join(BASE_DIR, 'template')
],
'APP_DIRS': True,
'OPTIONS': {
'context_processors': [
Expand Down Expand Up @@ -158,10 +161,14 @@

STATIC_URL = '/static/'

STATICFILES_DIRS = [os.path.join(BASE_DIR, "template/static")]

# Celery configuration

CELERY_RESULT_BACKEND = 'djcelery.backends.database:DatabaseBackend'
CELERY_ACCEPT_CONTENT = ['json']
CELERY_TASK_SERIALIZER = 'json'
CELERY_RESULT_SERIALIZER = 'json'

# Django Registration Redux configuration
ACCOUNT_ACTIVATION_DAYS = 1
1 change: 1 addition & 0 deletions server/rematch/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
urlpatterns = [
url(r'^admin/', admin.site.urls),
url(r'^accounts/', include('accounts.urls')),
url(r'^accounts/', include('registration.backends.default.urls')),
url(r'^collab/', include('collab.urls')),
url(r'^api-auth/', include('rest_framework.urls')),
]
331 changes: 331 additions & 0 deletions server/template/base.html

Large diffs are not rendered by default.

295 changes: 295 additions & 0 deletions server/template/static/css/style-responsive.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,295 @@
@media (min-width: 980px) {
/*-----*/
.custom-bar-chart {
margin-bottom: 40px;
}

}

@media (min-width: 768px) and (max-width: 979px) {

/*-----*/
.custom-bar-chart {
margin-bottom: 40px;
}

/*chat room*/


}

@media (max-width: 768px) {

.header {
position: absolute;
}

/*sidebar*/

#sidebar {
height: auto;
overflow: hidden;
position: absolute;
width: 100%;
z-index: 1001;
}


/* body container */
#main-content {
margin: 0px!important;
position: none !important;
}

#sidebar > ul > li > a > span {
line-height: 35px;
}

#sidebar > ul > li {
margin: 0 10px 5px 10px;
}
#sidebar > ul > li > a {
height:35px;
line-height:35px;
padding: 0 10px;
text-align: left;
}
#sidebar > ul > li > a i{
/*display: none !important;*/
}

#sidebar ul > li > a .arrow, #sidebar > ul > li > a .arrow.open {
margin-right: 10px;
margin-top: 15px;
}

#sidebar ul > li.active > a .arrow, #sidebar ul > li > a:hover .arrow, #sidebar ul > li > a:focus .arrow,
#sidebar > ul > li.active > a .arrow.open, #sidebar > ul > li > a:hover .arrow.open, #sidebar > ul > li > a:focus .arrow.open{
margin-top: 15px;
}

#sidebar > ul > li > a, #sidebar > ul > li > ul.sub > li {
width: 100%;
}
#sidebar > ul > li > ul.sub > li > a {
background: transparent !important ;
}
#sidebar > ul > li > ul.sub > li > a:hover {

}


/* sidebar */
#sidebar {
margin: 0px !important;
}

/* sidebar collabler */
#sidebar .btn-navbar.collapsed .arrow {
display: none;
}

#sidebar .btn-navbar .arrow {
position: absolute;
right: 35px;
width: 0;
height: 0;
top:48px;
border-bottom: 15px solid #282e36;
border-left: 15px solid transparent;
border-right: 15px solid transparent;
}


/*---------*/

.modal-footer .btn {
margin-bottom: 0px !important;
}

.btn {
margin-bottom: 5px;
}


/* full calendar fix */
.fc-header-right {
left:25px;
position: absolute;
}

.fc-header-left .fc-button {
margin: 0px !important;
top: -10px !important;
}

.fc-header-right .fc-button {
margin: 0px !important;
top: -50px !important;
}

.fc-state-active, .fc-state-active .fc-button-inner, .fc-state-hover, .fc-state-hover .fc-button-inner {
background: none !important;
color: #FFFFFF !important;
}

.fc-state-default, .fc-state-default .fc-button-inner {
background: none !important;
}

.fc-button {
border: none !important;
margin-right: 2px;
}

.fc-view {
top: 0px !important;
}

.fc-button .fc-button-inner {
margin: 0px !important;
padding: 2px !important;
border: none !important;
margin-right: 2px !important;
background-color: #fafafa !important;
background-image: -moz-linear-gradient(top, #fafafa, #efefef) !important;
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fafafa), to(#efefef)) !important;
background-image: -webkit-linear-gradient(top, #fafafa, #efefef) !important;
background-image: -o-linear-gradient(top, #fafafa, #efefef) !important;
background-image: linear-gradient(to bottom, #fafafa, #efefef) !important;
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fafafa', endColorstr='#efefef', GradientType=0) !important;
-webkit-box-shadow: 0 1px 0px rgba(255, 255, 255, .8) !important;
-moz-box-shadow: 0 1px 0px rgba(255, 255, 255, .8) !important;
box-shadow: 0 1px 0px rgba(255, 255, 255, .8) !important;
-webkit-border-radius: 3px !important;
-moz-border-radius: 3px !important;
border-radius: 3px !important;
color: #646464 !important;
border: 1px solid #ddd !important;
text-shadow: 0 1px 0px rgba(255, 255, 255, .6) !important;
text-align: center;
}

.fc-button.fc-state-disabled .fc-button-inner {
color: #bcbbbb !important;
}

.fc-button.fc-state-active .fc-button-inner {
background-color: #e5e4e4 !important;
background-image: -moz-linear-gradient(top, #e5e4e4, #dddcdc) !important;
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#e5e4e4), to(#dddcdc)) !important;
background-image: -webkit-linear-gradient(top, #e5e4e4, #dddcdc) !important;
background-image: -o-linear-gradient(top, #e5e4e4, #dddcdc) !important;
background-image: linear-gradient(to bottom, #e5e4e4, #dddcdc) !important;
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#e5e4e4', endColorstr='#dddcdc', GradientType=0) !important;
}

.fc-content {
margin-top: 50px;
}

.fc-header-title h2 {
line-height: 40px !important;
font-size: 12px !important;
}

.fc-header {
margin-bottom:0px !important;
}

/*--*/

/*.chart-position {*/
/*margin-top: 0px;*/
/*}*/

.stepy-titles li {
margin: 10px 3px;
}

/*-----*/
.custom-bar-chart {
margin-bottom: 40px;
}

/*menu icon plus minus*/
.dcjq-icon {
top: 10px;
}
ul.sidebar-menu li ul.sub li a {
padding: 0;
}

/*---*/

.img-responsive {
width: 100%;
}

}



@media (max-width: 480px) {

.notify-row, .search, .dont-show , .inbox-head .sr-input, .inbox-head .sr-btn{
display: none;
}

#top_menu .nav > li, ul.top-menu > li {
float: right;
}
.hidden-phone {
display: none !important;
}

.chart-position {
margin-top: 0px;
}

.navbar-inverse .navbar-toggle:hover, .navbar-inverse .navbar-toggle:focus {
background-color: #ccc;
border-color:#ccc ;
}

}

@media (max-width:320px) {
.login-social-link a {
padding: 15px 17px !important;
}

.notify-row, .search, .dont-show, .inbox-head .sr-input, .inbox-head .sr-btn {
display: none;
}

#top_menu .nav > li, ul.top-menu > li {
float: right;
}

.hidden-phone {
display: none !important;
}

.chart-position {
margin-top: 0px;
}

.lock-wrapper {
margin: 10% auto;
max-width: 310px;
}
.lock-input {
width: 82%;
}

.cmt-form {
display: inline-block;
width: 75%;
}

}




Loading

0 comments on commit c01a480

Please sign in to comment.