@@ -98,13 +100,13 @@
- {% if Club.instructors %}
-
-
{{ Club.description }}
-
-
- {% endif %}
+{# {% if Club.instructors %}#}
+{# #}
+{#
{{ Club.description }} #}
+{# #}
+{##}
+{# {% endif %}#}
diff --git a/Clubs/templatetags/Clubs_tags.py b/Clubs/templatetags/Clubs_tags.py
index e508e39..a2379ff 100644
--- a/Clubs/templatetags/Clubs_tags.py
+++ b/Clubs/templatetags/Clubs_tags.py
@@ -1,12 +1,12 @@
-from django import template
-from Clubs.models import Schedule, userClub
-
-register = template.Library()
-
-
-@register.simple_tag
-def get_obj_attr(club, attr):
-
- obj = Schedule.objects.get(club_id=club.id)
- dayTable = getattr(obj, attr)
- return sorted(dayTable.items())
\ No newline at end of file
+# from django import template
+# from Clubs.models import Schedule
+#
+# register = template.Library()
+#
+#
+# @register.simple_tag
+# def get_obj_attr(club, attr):
+#
+# obj = Schedule.objects.get(club_id=club.id)
+# dayTable = getattr(obj, attr)
+# return sorted(dayTable.items())
\ No newline at end of file
diff --git a/Clubs/templatetags/__pycache__/Clubs_tags.cpython-310.pyc b/Clubs/templatetags/__pycache__/Clubs_tags.cpython-310.pyc
index 947dc97..2f24e91 100644
Binary files a/Clubs/templatetags/__pycache__/Clubs_tags.cpython-310.pyc and b/Clubs/templatetags/__pycache__/Clubs_tags.cpython-310.pyc differ
diff --git a/Clubs/views.py b/Clubs/views.py
index b839681..dec9ffb 100644
--- a/Clubs/views.py
+++ b/Clubs/views.py
@@ -6,9 +6,18 @@
from django.contrib.auth.decorators import login_required
from main.views import getBaseTemplate
from django.contrib import messages
-
+from django.core.cache import cache
# Create your views here.
+def userClub( userID):
+ return UserMembership.objects.get(user_id=userID).club
+
+def userHasClub(request):
+ try:
+ userClub(request.user.id)
+ return True
+ except:
+ return False
def checkRequests():
requests = Request.objects.filter(status = 'YES')
@@ -21,6 +30,7 @@ def checkRequests():
@login_required
def ClubsIndex(request):
+
authorized = True
try:
# find what club is the user in
@@ -39,7 +49,8 @@ def ClubsIndex(request):
'form': form,
'Club': yourClub,
'user': request.user,
- 'authorized': authorized
+ 'authorized': authorized,
+
}
if request.method == 'POST':
yourClub, created = Club.objects.get_or_create(id=membership.club_id)
@@ -111,6 +122,7 @@ def clubMembers(request):
'Club': yourClub,
'authorized': authorized,
'requestsDict': requestsDict,
+ 'userHasClub' : userHasClub(request),
'base_template' : getBaseTemplate(request, "Clubs")
}
@@ -172,7 +184,8 @@ def memberProfile(request, clubID, userID):
def clubTrainings(request):
context = {
- 'base_template': getBaseTemplate(request, "Clubs")
+ 'base_template': getBaseTemplate(request, "Clubs"),
+ 'userHasClub': userHasClub(request),
}
return render(request, "Clubs/clubsTrainings.html", context)
@@ -192,12 +205,11 @@ def singleClubView(request, id):
myClub = Club.objects.get(pk=id)
context = {
'Club': myClub,
- 'userHasClub': False
}
try:
userMembership = UserMembership.objects.get(user=request.user)
- context['userHasClub'] = True
+ # context['userHasClub'] = True
except:
userMembership = None
diff --git a/Clubs/views_schedule.py b/Clubs/views_schedule.py
index e90a68f..6461fe9 100644
--- a/Clubs/views_schedule.py
+++ b/Clubs/views_schedule.py
@@ -1,54 +1,56 @@
from django.shortcuts import render, HttpResponseRedirect, reverse
from datetime import datetime, date
-from .models import Schedule, UserMembership, userClub
+from .models import Schedule, UserMembership
from .utilis import Calendar
from django.contrib.auth.decorators import login_required
from main.views import getBaseTemplate
from .forms import ScheduleForm
from django.utils.safestring import mark_safe
-
+from .views import userHasClub, userClub
@login_required
def clubSchedule(request):
days = Schedule.days
- # userHasClub = False
- myClub = userClub(request.user.id)
+ authorized = False
+ hoursDict = {}
+
+
+ try:
+ myClub = userClub(request.user.id)
+ membership = UserMembership.objects.get(user_id=request.user.id)
+ if membership.authorized == 'FULL':
+ authorized = True
+ except:
+ myClub = False
+
try:
mySchedule = Schedule.objects.get(club_id=myClub.id)
fields = mySchedule._meta.get_fields()
except:
mySchedule = None
- hoursDict = {}
- for day in days:
- dayTable = getattr(mySchedule, day)
- if bool(dayTable):
- dayDict = sorted(dayTable.items())
- for time, info in dayDict:
- timeHours = int(time[:2])
- if timeHours not in hoursDict:
- hoursDict[timeHours] = []
-
- hoursDict[timeHours].append([day, time, info])
- hoursDict = sorted(hoursDict.items())
+ if mySchedule:
+ for day in days:
+ dayTable = getattr(mySchedule, day)
+ if bool(dayTable):
+ dayDict = sorted(dayTable.items())
+ for time, info in dayDict:
+ timeHours = int(time[:2])
+ if timeHours not in hoursDict:
+ hoursDict[timeHours] = []
+
+ hoursDict[timeHours].append([day, time, info])
+ hoursDict = sorted(hoursDict.items())
- authorized = False
- membership = UserMembership.objects.get(user_id=request.user.id)
- if membership.authorized == 'FULL':
- authorized = True
- # for timeHour, sessionsArray in hoursDict:
- # print(timeHour, sessionsArray)
context = {
- # 'userHasClub' : UserMembership.objects.get(user_id = request.user.id),
- # 'cal' : mark_safe(HTMLcal),
- # 'dayDict' : dayDict,
'authorized' : authorized,
- 'club' : userClub(request.user.id),
+ 'club' : myClub,
'days' : days,
'hoursDict' : hoursDict,
- 'base_template': getBaseTemplate(request, "Clubs")
+ 'base_template': getBaseTemplate(request, "Clubs"),
+ 'userHasClub': userHasClub(request)
}
diff --git a/Notifications/routing.py b/Notifications/routing.py
index c561339..84e4022 100644
--- a/Notifications/routing.py
+++ b/Notifications/routing.py
@@ -2,6 +2,6 @@
from . import consumers
-ws_urlpatterns = [
- path('ws/notify', consumers.WSConsumer.as_asgi())
-]
\ No newline at end of file
+# ws_urlpatterns = [
+# path('ws/notify', consumers.WSConsumer.as_asgi())
+# ]
\ No newline at end of file
diff --git a/Presentation/tests.py b/Presentation/tests.py
index 7ce503c..a79ca8b 100644
--- a/Presentation/tests.py
+++ b/Presentation/tests.py
@@ -1,3 +1,3 @@
-from django.test import TestCase
+# from django.test import TestCase
# Create your tests here.
diff --git a/WorkoutJournal/__pycache__/forms.cpython-310.pyc b/WorkoutJournal/__pycache__/forms.cpython-310.pyc
index f9a6b63..dadb56e 100644
Binary files a/WorkoutJournal/__pycache__/forms.cpython-310.pyc and b/WorkoutJournal/__pycache__/forms.cpython-310.pyc differ
diff --git a/WorkoutJournal/__pycache__/models.cpython-310.pyc b/WorkoutJournal/__pycache__/models.cpython-310.pyc
index 1d4efc2..0a13a05 100644
Binary files a/WorkoutJournal/__pycache__/models.cpython-310.pyc and b/WorkoutJournal/__pycache__/models.cpython-310.pyc differ
diff --git a/WorkoutJournal/__pycache__/views.cpython-310.pyc b/WorkoutJournal/__pycache__/views.cpython-310.pyc
index a8a4cfd..523153d 100644
Binary files a/WorkoutJournal/__pycache__/views.cpython-310.pyc and b/WorkoutJournal/__pycache__/views.cpython-310.pyc differ
diff --git a/WorkoutJournal/forms.py b/WorkoutJournal/forms.py
index 84a3c8a..1c02847 100644
--- a/WorkoutJournal/forms.py
+++ b/WorkoutJournal/forms.py
@@ -3,7 +3,7 @@
from django import forms
from django.forms import ModelForm
from django.utils.safestring import mark_safe
-
+from Clubs.views import userClub
from .models import *
@@ -13,11 +13,12 @@ class DatePickerInput(forms.DateInput):
class TrainingSessionForm(ModelForm):
- # def __init__(self, *args, **kwargs):
+ # def __init__(self, userID, *args, **kwargs):
# super().__init__(*args, **kwargs)
- # if user is not None:
- # self.fields['addedByUser'].initial = user
-
+ # if self.fields['club']:
+ # self.fields['club'] = userClub(userID)
+ # else:
+ # self.fields['club'] = None
class Meta:
model = TrainingSession
fields = '__all__'
@@ -72,6 +73,9 @@ class Meta:
widget=forms.CheckboxSelectMultiple(),
required=False)
+ # club = forms.ChoiceField(widget=forms.CheckboxInput(
+ # attrs={"class": "form-check-input", "id": "flexSwitchCheckDefault"}),
+ # required=False)
# widget=forms.CheckboxSelectMultiple(attrs={'class':'techniqueOption list-group-item p-2 d-flex '
# 'align-items-center cursor-pointer justify-content-between '
@@ -82,16 +86,6 @@ class Meta:
class addTechniqueForm(ModelForm):
type = forms.ChoiceField(choices=Technique.TechniqueTypes, widget=forms.RadioSelect())
- # def __init__(self, *args, **kwargs):
- # super().__init__(*args, **kwargs)
- # self.helper = FormHelper()
- # self.helper.layout = Layout(
- # # Field('type', css_class='sessionType', template="BJR_Techniques_types.html"),
- # Field('type', css_class='sessionType'),
- # Field('EnglishName', css_class='form-control'),
- # Field('otherName', css_class='form-control'),
- # # Field('description', css_class='form-control mb-3')
- # )
class Meta:
model = Technique
diff --git a/WorkoutJournal/migrations/0010_remove_trainingsession_user_trainingsession_club_and_more.py b/WorkoutJournal/migrations/0010_remove_trainingsession_user_trainingsession_club_and_more.py
new file mode 100644
index 0000000..f788295
--- /dev/null
+++ b/WorkoutJournal/migrations/0010_remove_trainingsession_user_trainingsession_club_and_more.py
@@ -0,0 +1,31 @@
+# Generated by Django 4.1.2 on 2023-03-18 20:23
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+ ('Clubs', '0027_delete_clubtrainingsession'),
+ ('WorkoutJournal', '0009_remove_trainingsession_addedbyuser_and_more'),
+ ]
+
+ operations = [
+ migrations.RemoveField(
+ model_name='trainingsession',
+ name='user',
+ ),
+ migrations.AddField(
+ model_name='trainingsession',
+ name='club',
+ field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='Clubs.club'),
+ ),
+ migrations.AddField(
+ model_name='trainingsession',
+ name='participants',
+ field=models.ManyToManyField(blank=True, to=settings.AUTH_USER_MODEL),
+ ),
+ ]
diff --git a/WorkoutJournal/migrations/0011_trainingsession_user.py b/WorkoutJournal/migrations/0011_trainingsession_user.py
new file mode 100644
index 0000000..27381d3
--- /dev/null
+++ b/WorkoutJournal/migrations/0011_trainingsession_user.py
@@ -0,0 +1,22 @@
+# Generated by Django 4.1.2 on 2023-03-18 20:24
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+ ('WorkoutJournal', '0010_remove_trainingsession_user_trainingsession_club_and_more'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='trainingsession',
+ name='user',
+ field=models.ForeignKey(blank=True, default=1, on_delete=django.db.models.deletion.CASCADE, related_name='userOwner', to=settings.AUTH_USER_MODEL),
+ preserve_default=False,
+ ),
+ ]
diff --git a/WorkoutJournal/migrations/0012_remove_trainingsession_club_and_more.py b/WorkoutJournal/migrations/0012_remove_trainingsession_club_and_more.py
new file mode 100644
index 0000000..7534027
--- /dev/null
+++ b/WorkoutJournal/migrations/0012_remove_trainingsession_club_and_more.py
@@ -0,0 +1,21 @@
+# Generated by Django 4.1.2 on 2023-03-18 21:02
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('WorkoutJournal', '0011_trainingsession_user'),
+ ]
+
+ operations = [
+ migrations.RemoveField(
+ model_name='trainingsession',
+ name='club',
+ ),
+ migrations.RemoveField(
+ model_name='trainingsession',
+ name='participants',
+ ),
+ ]
diff --git a/WorkoutJournal/migrations/__pycache__/0010_remove_trainingsession_user_trainingsession_club_and_more.cpython-310.pyc b/WorkoutJournal/migrations/__pycache__/0010_remove_trainingsession_user_trainingsession_club_and_more.cpython-310.pyc
new file mode 100644
index 0000000..9bac1b4
Binary files /dev/null and b/WorkoutJournal/migrations/__pycache__/0010_remove_trainingsession_user_trainingsession_club_and_more.cpython-310.pyc differ
diff --git a/WorkoutJournal/migrations/__pycache__/0011_trainingsession_user.cpython-310.pyc b/WorkoutJournal/migrations/__pycache__/0011_trainingsession_user.cpython-310.pyc
new file mode 100644
index 0000000..b603455
Binary files /dev/null and b/WorkoutJournal/migrations/__pycache__/0011_trainingsession_user.cpython-310.pyc differ
diff --git a/WorkoutJournal/migrations/__pycache__/0012_remove_trainingsession_club_and_more.cpython-310.pyc b/WorkoutJournal/migrations/__pycache__/0012_remove_trainingsession_club_and_more.cpython-310.pyc
new file mode 100644
index 0000000..7ca684d
Binary files /dev/null and b/WorkoutJournal/migrations/__pycache__/0012_remove_trainingsession_club_and_more.cpython-310.pyc differ
diff --git a/WorkoutJournal/models.py b/WorkoutJournal/models.py
index c76d4f4..b8df046 100644
--- a/WorkoutJournal/models.py
+++ b/WorkoutJournal/models.py
@@ -23,7 +23,6 @@ class Technique (models.Model):
def __str__(self):
return self.EnglishName
-
class TrainingSession(models.Model):
TStypes = (
('GI', 'GI'),
@@ -47,7 +46,11 @@ class TrainingSession(models.Model):
notes = models.TextField(max_length=2500,blank=True, null=True)
techniques = models.ManyToManyField(Technique, blank=True)
fightTime = models.IntegerField(blank=True, null=True)
- user = models.ForeignKey(User, blank=True, on_delete=models.CASCADE)
+ user = models.ForeignKey(User, related_name="userOwner", blank=True, on_delete=models.CASCADE)
+ # club = models.ForeignKey("Clubs.Club", blank=True, null=True, on_delete=models.CASCADE)
+ # participants = models.ManyToManyField(User, blank=True)
+
+
#change to foreign key???????? ^
def __str__(self):
return f'{self.type} {self.date}'
@@ -66,6 +69,8 @@ def save(self, *args, **kwargs):
self.totalLength = self.parseMinutes(self.hoursLength, self.minutesLength)
super(TrainingSession, self).save(*args, **kwargs)
+
+
class Suggestion(models.Model):
addedByUser = models.ManyToManyField(User, related_name="suggestedByUser", default=None)
technique = models.ForeignKey(Technique, on_delete=models.CASCADE, default=None, null=True, blank=True)
diff --git a/WorkoutJournal/templates/BJJournal/BJR_addSession/BJR_addSession.html b/WorkoutJournal/templates/BJJournal/BJR_addSession/BJR_addSession.html
index 9ea8445..77d6fc4 100644
--- a/WorkoutJournal/templates/BJJournal/BJR_addSession/BJR_addSession.html
+++ b/WorkoutJournal/templates/BJJournal/BJR_addSession/BJR_addSession.html
@@ -1,4 +1,4 @@
-{% extends base_template%}
+{% extends base_template %}
{% load static %}
{% load crispy_forms_filters %}
@@ -6,140 +6,150 @@
{% block content %}
-
- {% include 'common/messages.html' %}
+
+ {% include 'common/messages.html' %}
+
+ {#
-
-
+
-
-
+
-
-
Date
-
- {{ form.date }}
-
-
+
+
Date
+
+ {{ form.date }}
+
+
-
- Today
- Yesterday
-
+
+ Today
+ Yesterday
+
+
-
-
-
-
Time
-
- {{ form.timestamp }}
-
+
+
Time
+
+ {{ form.timestamp }}
+
-
- 6:00
- 9:00
- 12:00
- 18:00
- 20:00
-
+
+ 6:00
+ 9:00
+ 12:00
+ 18:00
+ 20:00
+
-
+
-
+
-
-
-
-
- min
-
-
- min
-
+
+
+
+
+ min
+
+
+ min
+
-
-
+
-
+
-
-
-
-
-
- {{ form.location }}
-
+
+
+ {{ form.location }}
+
+
-
-
+
-
+
-
+
- {% include 'BJJournal/BJR_addSession/BJR_addSession_sessionLength.html' %}
+ {% include 'BJJournal/BJR_addSession/BJR_addSession_sessionLength.html' %}
-
-
-
+
- Add Training Session
-
+ hx-post="{% url 'addSession' %}"
+ hx-target="#BJR_view">
+ Add Training Session
+
-
+
-
+
-
+
{% endblock %}
\ No newline at end of file
diff --git a/WorkoutJournal/templates/BJJournal/BJR_dashboard_count.html b/WorkoutJournal/templates/BJJournal/BJR_dashboard_count.html
index 07b4602..7638c75 100644
--- a/WorkoutJournal/templates/BJJournal/BJR_dashboard_count.html
+++ b/WorkoutJournal/templates/BJJournal/BJR_dashboard_count.html
@@ -2,7 +2,7 @@
-
Your Statistics
+
Your Statistics
diff --git a/WorkoutJournal/templates/BJJournal/BJR_index_reloadContent.html b/WorkoutJournal/templates/BJJournal/BJR_index_reloadContent.html
index c099656..a38ff85 100644
--- a/WorkoutJournal/templates/BJJournal/BJR_index_reloadContent.html
+++ b/WorkoutJournal/templates/BJJournal/BJR_index_reloadContent.html
@@ -1,11 +1,11 @@
+ BJRdashboard col-lg-10 col-12 row ">
-
+
Dashboard
diff --git a/WorkoutJournal/views.py b/WorkoutJournal/views.py
index fcc787e..8fb95f9 100644
--- a/WorkoutJournal/views.py
+++ b/WorkoutJournal/views.py
@@ -5,11 +5,9 @@
from django.core.paginator import Paginator
from django.contrib import messages
from datetime import datetime, timedelta
-import json
-from django.http import JsonResponse
-from django.template.loader import render_to_string
from django.contrib.auth.decorators import login_required
from main.views import getBaseTemplate
+
# Create your views here.
# def countAllHours (user):
@@ -63,15 +61,23 @@ def dashboard(request):
return render(request, "BJJournal/BJR_dashboard.html", context)
@login_required
-def addSession(request, ext=False):
+def addSession(request):
+ authorized = False
+ uid = request.user.id
try:
- membership = UserMembership.objects.get(user_id=request.user.id)
+ membership = UserMembership.objects.get(user_id=uid)
yourClub = Club.objects.get(id=membership.club_id)
+ authorized = membership.authorized
except:
membership, yourClub = None, None
+
+
+ if authorized == "FULL" or "TRAININGS":
+ authorized = True
+
if request.method == 'POST':
- form = TrainingSessionForm(request.POST, auto_id=True)
+ form = TrainingSessionForm( request.POST, auto_id=True)
if form.is_valid():
instance = form.save(commit=False)
@@ -96,7 +102,8 @@ def addSession(request, ext=False):
'form': form,
'Club': yourClub,
'techniquesList': Technique.objects.all(),
- 'base_template' : getBaseTemplate(request, "BJJournal")
+ 'base_template' : getBaseTemplate(request, "BJJournal"),
+ 'authorized' : authorized
}
diff --git a/account_register/templates/account/base.html b/account_register/templates/account/base.html
index c44adcc..e634e09 100644
--- a/account_register/templates/account/base.html
+++ b/account_register/templates/account/base.html
@@ -10,7 +10,7 @@
{% include "common/navbar.html" %}
-
+
diff --git a/account_register/templates/myaccount/account.html b/account_register/templates/myaccount/account.html
index 9f5e420..ac46921 100644
--- a/account_register/templates/myaccount/account.html
+++ b/account_register/templates/myaccount/account.html
@@ -3,10 +3,10 @@
{% load static %}
{% block content %}
-
+
{% load static %}
-
-
+
+
{#
#}
{##}
@@ -51,13 +51,13 @@
Are you sure?
-
+
+
{# {% include 'account/password_reset.html' %}#}
-
diff --git a/account_register/templates/myaccount/base.html b/account_register/templates/myaccount/base.html
index ddaf34f..531b0d6 100644
--- a/account_register/templates/myaccount/base.html
+++ b/account_register/templates/myaccount/base.html
@@ -12,7 +12,7 @@
{%include "common/navbar.html" %}
-
+
{# {% include "common/messages.html" %}#}
{% if user.is_authenticated %}
diff --git a/db.sqlite3 b/db.sqlite3
index 04ef7ae..0bf2807 100644
Binary files a/db.sqlite3 and b/db.sqlite3 differ
diff --git a/main/__pycache__/asgi.cpython-310.pyc b/main/__pycache__/asgi.cpython-310.pyc
index 1f23cc9..db91e13 100644
Binary files a/main/__pycache__/asgi.cpython-310.pyc and b/main/__pycache__/asgi.cpython-310.pyc differ
diff --git a/main/__pycache__/settings.cpython-310.pyc b/main/__pycache__/settings.cpython-310.pyc
index 32ea225..3eb5d90 100644
Binary files a/main/__pycache__/settings.cpython-310.pyc and b/main/__pycache__/settings.cpython-310.pyc differ
diff --git a/main/asgi.py b/main/asgi.py
index 4ba595d..0949f4d 100644
--- a/main/asgi.py
+++ b/main/asgi.py
@@ -12,13 +12,14 @@
from django.core.asgi import get_asgi_application
from channels.routing import ProtocolTypeRouter
from channels.routing import URLRouter
-from Notifications.routing import ws_urlpatterns
+# from Notifications.routing import ws_urlpatterns
from channels.auth import AuthMiddlewareStack
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'main.settings')
-# application = get_asgi_application()
-application = ProtocolTypeRouter({
- 'http' : get_asgi_application(),
- # 'websocket' : AuthMiddlewareStack(URLRouter(ws_urlpatterns))
-})
+application = get_asgi_application()
+
+# application = ProtocolTypeRouter({
+# 'http' : get_asgi_application(),
+# # 'websocket' : AuthMiddlewareStack(URLRouter(ws_urlpatterns))
+# })
diff --git a/main/settings.py b/main/settings.py
index b1e13d3..68da22b 100644
--- a/main/settings.py
+++ b/main/settings.py
@@ -105,7 +105,9 @@
]
WSGI_APPLICATION = 'main.wsgi.application'
-# ASGI_APPLICATION = 'main.asgi.application'
+ASGI_APPLICATION = 'main.asgi.application'
+# SESSIONS_ENGINE='django.contrib.sessions.backends.cache'
+#
# Database
@@ -131,7 +133,7 @@
},
]
-ASGI_APPLICATION = 'main.asgi.application'
+
# Internationalization
# https://docs.djangoproject.com/en/4.1/topics/i18n/
diff --git a/main/static/main/css/base.css b/main/static/main/css/base.css
index 4764b64..4dab5bf 100644
--- a/main/static/main/css/base.css
+++ b/main/static/main/css/base.css
@@ -9,6 +9,7 @@
--cyanBlueFooter : #00b4d8;
--paleBlack : #191919;
--white-color: #F7F6FB;
+ --active: #C8C8C8;
--normal-font-size: 1rem;
--darkPurple: #3A0CA3;
--SMgridHeight: 29.5vh !important;
@@ -652,9 +653,9 @@ h2, .h2 {
/*margin-bottom: -13% !important;*/
margin-top: 5%;
width: 50vw;
- margin-left: 44vw !important;
- margin-right: 20px;
- padding: 0 20px;
+ margin-left: 42vw !important;
+ padding: 0 15px !important;
+
}
.unauthorized {
@@ -690,15 +691,13 @@ h2, .h2 {
.profText {
/*margin-bottom: -13% !important;*/
-
-
margin-left: 23vw !important;
margin-right: 20px;
- padding: 0 20px;
+ padding: 0 20px !important;
}
.profileBackground {
- height: 25vh !important;
+ height: 19.5vh !important;
}
}
@@ -712,11 +711,11 @@ h2, .h2 {
.profText {
/*margin-bottom: -13% !important;*/
margin-top: 4vh;
- width: 60vw;
+ width: 50vw;
text-align: right !important;
margin-left: 42vw !important;
- margin-right: 10px;
- padding: 0 15px;
+ margin-right:15px;
+
}
}
@@ -758,6 +757,7 @@ h2, .h2 {
background-color: var(--paleBlack);
/*background-color:#4361ee;*/
color: white;
+ /*min-height:100vh !important;*/
}
/*.accountcontent > * > h2{*/
@@ -770,19 +770,32 @@ h2, .h2 {
/*background-color:#3f37c9;*/
color: black;
/*padding-bottom: 150px;*/
- display:flex;
height: 100%;
justify-content: center;
padding-bottom: 20vh;
}
-.accountRCol{
+
+.accountRCol {
/*height:100vh;*/
- min-height:65vh;
+ height: 100%;
+ display:flex;
+ min-height: 65vh;
}
.accountRCol img{
max-width: 29vh;
max-height:29vh;
}
+@media screen and (min-width: 768px) {
+
+ .accMain, .accountRCol{
+ height:100vh !important;
+}
+ .accountRCol img{
+ max-width: 40vh !important;
+ max-height:40vh !important;
+}
+}
+
.toggle {
display: inline-block;
cursor: pointer;
@@ -842,9 +855,7 @@ h2, .h2 {
}
@media (max-width: 992px) {
- /*.profile {*/
- /* width: 50%;*/
- /*}*/
+
.beltIMG {
max-width: 30vw;
}
@@ -855,12 +866,6 @@ h2, .h2 {
}
@media (min-width: 900px) {
- /*.profile{*/
- /* width:19%;*/
- /* }*/
- .TheContainer {
- height: 100vh !important;
- }
.beltIMG {
max-width: 11vw;
@@ -869,11 +874,6 @@ h2, .h2 {
}
-@media (min-width: 600px) {
- .TheContainer {
- height: auto;
- }
-}
.profileInfo {
@@ -1267,13 +1267,17 @@ a {
/* =======BJJR DASHBOARD =======*/
.BJRdashboard {
- background-color: #00a6ed;
- height: 35%;
+ /*background-color: var(--paleBlack);*/
+ /*background-color: #2284ee;*/
+
+ /*height: 40%;*/
}
.countSection {
- background-color: #2e2686;
+ background-color: #00b4d8;
+ /*background-color: #2e2686;*/
padding-right:15px !important;
+ color:black;
/*background-color: #3f37c9;*/
}
@@ -1318,9 +1322,9 @@ a {
color: white;
}
-.dashboardCount .count_item {
- box-shadow: rgba(50, 50, 93, 0.25) 0px 50px 100px -20px, rgba(0, 0, 0, 0.3) 0px 30px 60px -30px;
-}
+/*.dashboardCount .count_item {*/
+/* box-shadow: rgba(50, 50, 93, 0.25) 0px 50px 100px -20px, rgba(0, 0, 0, 0.3) 0px 30px 60px -30px;*/
+/*}*/
.count_icon img, .SessionDate img {
width: 100%;
@@ -1346,6 +1350,8 @@ a {
.countItems .count_item {
width: 90%;
+ /*background-color:#4361ee; */
+ /*background-color:var(--cyanBlueFooter)*/
}
.hours_count {
@@ -1363,8 +1369,14 @@ a {
outline: 2px solid black;
}
.count_item .count_icon{
- padding:25px;
+ padding:12px;
}
+@media (min-width: 1024px) {
+ .count_item .count_icon{
+ padding:22px;
+}
+}
+
.hours_count h1 {
font-weight: 800;
letter-spacing: 2px;
@@ -1541,7 +1553,15 @@ a {
}
-
+.addSessionHeader h1{
+ font-size:34px;
+}
+.clubTS{
+ font-size:20px;
+ position:absolute;
+ right:45px;
+ width:15%;
+}
.addSession {
padding: 0 4vw;
/*overflow:hidden;*/
@@ -1683,6 +1703,9 @@ a {
.activeType {
background-color: #3e54ef !important;
}
+.activeColor{
+ background-color:var(--active) !important;
+}
.smallCapt {
font-weight: 400;
@@ -1827,12 +1850,12 @@ rgba(255, 255, 255, 0.35) 0 px - 2 px 6 px 0 px inset;
.techniquesSearch i, .formIcon i {
position: absolute;
- left: 5%;
+ left: 15px;
color: black;
}
.techniquesSearch input {
- padding-left: 12%;
+ padding-left: 45px;
width: 100%;
border: 1px solid #b3b3b3;
border-radius: 5px;
@@ -2585,6 +2608,16 @@ rgba(255, 255, 255, 0.35) 0 px - 2 px 6 px 0 px inset;
}
/*=============== CLUBS MODULE ===============*/
+.bearsorry img{
+ width:45vw;
+ height:45vw;
+ background:white;
+ padding:3px;
+}
+.bearsorry a{
+ text-decoration: none !important;
+ font-weight: 800;
+}
.Clubscontent {
background-color: var(--paleBlack);
}
@@ -2670,8 +2703,10 @@ rgba(255, 255, 255, 0.35) 0 px - 2 px 6 px 0 px inset;
background-position: center;
background-size: contain;
}
-
-@media screen and (min-width: 765px) {
+.clubProfile{
+ /*min-height:100vh;*/
+}
+@media screen and (min-width: 749px) {
.clubProfile {
height: 100vh;
}
@@ -2693,6 +2728,7 @@ rgba(255, 255, 255, 0.35) 0 px - 2 px 6 px 0 px inset;
.clubsListWrap {
background-color: #187DFE;
color: ghostwhite;
+ height:100vh;
}
#leaveClub, #cantLeave {
@@ -2703,6 +2739,7 @@ rgba(255, 255, 255, 0.35) 0 px - 2 px 6 px 0 px inset;
/*background: black !important;*/
border: 5px solid white !important;
/*color: ghostwhite !important;*/
+ max-height:55vh;
}
#leaveClub .modal-dialog {
@@ -2734,9 +2771,7 @@ rgba(255, 255, 255, 0.35) 0 px - 2 px 6 px 0 px inset;
background: #3f37c9;
}
-.clubsList {
- overflow: auto;
-}
+
.clubsList li {
border-bottom: 2px solid #4ccaf0;
@@ -2774,7 +2809,8 @@ rgba(255, 255, 255, 0.35) 0 px - 2 px 6 px 0 px inset;
.clubProfileName {
font-size: 3rem;
font-weight: 700;
-
+ word-wrap:break-word;
+ margin-right:20px;
}
.singleClubView {
@@ -2784,6 +2820,7 @@ rgba(255, 255, 255, 0.35) 0 px - 2 px 6 px 0 px inset;
.estabilished {
font-weight: 400;
font-size: 1.25rem;
+ margin-right:20px;
}
.leftSingleClub {
@@ -2794,9 +2831,9 @@ rgba(255, 255, 255, 0.35) 0 px - 2 px 6 px 0 px inset;
letter-spacing: 0.07em;
}
-.adresSingleProfile {
- background-color: #0164e4;
-}
+/*.adresSingleProfile {*/
+/* background-color: #0164e4;*/
+/*}*/
.clubProfileInfo h4 {
@@ -2842,6 +2879,7 @@ rgba(255, 255, 255, 0.35) 0 px - 2 px 6 px 0 px inset;
.clubProfileDescription {
color: #e9ecef;
width: 100%;
+
/*background-color:#e9ecef;*/
}
@@ -2917,7 +2955,7 @@ rgba(255, 255, 255, 0.35) 0 px - 2 px 6 px 0 px inset;
}
@media screen and (min-width: 768px) {
- .clubsListWrapper {
+ .xclubsListWrapper {
padding: 0 3vw 8vh 3vw;
}
@@ -3214,7 +3252,7 @@ rgba(255, 255, 255, 0.35) 0 px - 2 px 6 px 0 px inset;
}
.tdWRAP h1 {
- font-size: 28px;
+ font-size: 22px;
font-weight: 800;
text-align: center;
}
- 
- 
- 
- 
+