Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolved Timeline, Navbar error and video bg #35

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Resolved Timeline, Navbar error and video bg #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c660d88
added data in timeline
kushal-sarda Mar 2, 2022
40e593b
Merge branch 'master' of https://github.com/kushal-sarda/festcms2.0
kushal-sarda Mar 2, 2022
7a01a7d
Revert "Merge branch 'master' of https://github.com/kushal-sarda/fest…
kushal-sarda Mar 2, 2022
f9e70e7
Merge branch 'master' of https://github.com/kushal-sarda/festcms2.0
kushal-sarda Mar 2, 2022
2c1b6d8
made timeline page
kushal-sarda Mar 2, 2022
8034b3b
resolved timeline error and video bg
Mar 2, 2022
98f04f2
Merge pull request #1 from Techno-Simpola/arhn-simpola
kushal-sarda Mar 2, 2022
b9d0d65
Merge branch 'AarohanNITD:master' into master
kushal-sarda Mar 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed festcms2.0 - Shortcut.lnk
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion festcms2/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
except:
SECRET_KEY = '434324'
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = False #config('DEBUG',cast=bool)
DEBUG = True #config('DEBUG',cast=bool)

ALLOWED_HOSTS = ['*'] #config('ALLOWED_HOSTS',cast=Csv())

Expand Down
109 changes: 43 additions & 66 deletions flow/migrations/0001_initial.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by Django 2.1.11 on 2022-03-02 08:12
# Generated by Django 3.1.7 on 2022-02-26 07:22

from django.conf import settings
import django.core.validators
Expand Down Expand Up @@ -34,20 +34,6 @@ class Migration(migrations.Migration):
('url', models.CharField(blank=True, help_text='URL of Arena item', max_length=100)),
],
),
migrations.CreateModel(
name='Events',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('eventName', models.CharField(help_text='Enter the name of the event', max_length=50, unique=True)),
('eventId', models.CharField(help_text='Enter the ID of the event', max_length=50)),
('logo', models.ImageField(blank=True, upload_to='event_images/')),
('description', models.TextField(help_text='Enter short description of the event')),
('date_time', models.DateTimeField()),
('venue', models.CharField(blank=True, max_length=50)),
('registration_link', models.CharField(blank=True, help_text='Enter the registration link here', max_length=1024)),
('event_link', models.CharField(blank=True, help_text='If there is no registration, then website link', max_length=1024)),
],
),
migrations.CreateModel(
name='FAQ',
fields=[
Expand All @@ -66,18 +52,8 @@ class Migration(migrations.Migration):
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=250, unique=True)),
('subheading', models.TextField(blank=True, null=True)),
('image', models.ImageField(blank=True, null=True, upload_to='industrial_images/')),
('video_link', models.CharField(blank=True, max_length=1024, null=True)),
('date_time', models.DateTimeField(null=True)),
],
),
migrations.CreateModel(
name='IndustrialVisitsPhotos',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('image', models.ImageField(blank=True, null=True, upload_to='industrial_images/')),
('industrial_name', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='industrialImages', to='flow.IndustrialVisits')),
],
),
migrations.CreateModel(
Expand All @@ -91,15 +67,6 @@ class Migration(migrations.Migration):
('url', models.CharField(blank=True, help_text='URL of major attractions', max_length=1024)),
],
),
migrations.CreateModel(
name='Review',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('mark', models.PositiveIntegerField(default=0, validators=[django.core.validators.MaxValueValidator(10), django.core.validators.MinValueValidator(0)])),
('feas', models.PositiveIntegerField(default=0, validators=[django.core.validators.MaxValueValidator(10), django.core.validators.MinValueValidator(0)])),
('tech', models.PositiveIntegerField(default=0, validators=[django.core.validators.MaxValueValidator(10), django.core.validators.MinValueValidator(0)])),
],
),
migrations.CreateModel(
name='SocialInitiatives',
fields=[
Expand All @@ -110,15 +77,6 @@ class Migration(migrations.Migration):
('webinar_link', models.CharField(blank=True, max_length=1024, null=True)),
('app_link', models.CharField(blank=True, max_length=1024, null=True)),
('poster', models.ImageField(blank=True, null=True, upload_to='social_images/')),
('video_link', models.CharField(blank=True, max_length=1024, null=True)),
],
),
migrations.CreateModel(
name='SocialInitiativesPhotos',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('image', models.ImageField(blank=True, null=True, upload_to='social_images/')),
('social_name', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='socialImages', to='flow.SocialInitiatives')),
],
),
migrations.CreateModel(
Expand All @@ -139,17 +97,6 @@ class Migration(migrations.Migration):
('team_image', models.ImageField(blank=True, upload_to='team_images/')),
],
),
migrations.CreateModel(
name='TeamMember',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(help_text='Enter the name of the member here', max_length=50)),
('position', models.CharField(blank=True, help_text='Enter the position of the person', max_length=50)),
('profile_img', models.ImageField(blank=True, upload_to='members/')),
('choice', models.CharField(choices=[('GLUG', "GNU/Linux Users' Group"), ('CCA', 'Centre for Cognitive Activities'), ('SAE', 'SAE'), ('MNTC', 'Maths n Tech Club'), ('REC', 'RECursion')], default='GLUG', max_length=5)),
('team', models.ManyToManyField(to='flow.TeamCategory')),
],
),
migrations.CreateModel(
name='TechmelaProject',
fields=[
Expand Down Expand Up @@ -187,19 +134,49 @@ class Migration(migrations.Migration):
('registration_link', models.CharField(blank=True, help_text='Enter the registration link here', max_length=1024)),
],
),
migrations.AddField(
model_name='review',
name='project',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='flow.TechmelaProject'),
migrations.CreateModel(
name='TeamMember',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(help_text='Enter the name of the member here', max_length=50)),
('position', models.CharField(blank=True, help_text='Enter the position of the person', max_length=50)),
('profile_img', models.ImageField(blank=True, upload_to='members/')),
('choice', models.CharField(choices=[('GLUG', "GNU/Linux Users' Group"), ('CCA', 'Centre for Cognitive Activities'), ('SAE', 'SAE'), ('MNTC', 'Maths n Tech Club'), ('REC', 'RECursion')], default='GLUG', max_length=5)),
('team', models.ManyToManyField(to='flow.TeamCategory')),
],
),
migrations.AddField(
model_name='review',
name='user',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
migrations.CreateModel(
name='SocialInitiativesPhotos',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('image', models.ImageField(blank=True, null=True, upload_to='social_images/')),
('social_name', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='socialImages', to='flow.socialinitiatives')),
],
),
migrations.AddField(
model_name='events',
name='eventDay',
field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.DO_NOTHING, to='flow.Timeline'),
migrations.CreateModel(
name='Review',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('mark', models.PositiveIntegerField(default=0, validators=[django.core.validators.MaxValueValidator(10), django.core.validators.MinValueValidator(0)])),
('feas', models.PositiveIntegerField(default=0, validators=[django.core.validators.MaxValueValidator(10), django.core.validators.MinValueValidator(0)])),
('tech', models.PositiveIntegerField(default=0, validators=[django.core.validators.MaxValueValidator(10), django.core.validators.MinValueValidator(0)])),
('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='flow.techmelaproject')),
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
],
),
migrations.CreateModel(
name='Events',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('eventName', models.CharField(help_text='Enter the name of the event', max_length=50, unique=True)),
('eventId', models.CharField(help_text='Enter the ID of the event', max_length=50)),
('logo', models.ImageField(blank=True, upload_to='event_images/')),
('description', models.TextField(help_text='Enter short description of the event')),
('date_time', models.DateTimeField()),
('venue', models.CharField(blank=True, max_length=50)),
('registration_link', models.CharField(blank=True, help_text='Enter the registration link here', max_length=1024)),
('event_link', models.CharField(blank=True, help_text='If there is no registration, then website link', max_length=1024)),
('eventDay', models.ForeignKey(default=1, on_delete=django.db.models.deletion.DO_NOTHING, to='flow.timeline')),
],
),
]
12 changes: 2 additions & 10 deletions flow/static/css/contactus.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,16 +111,9 @@ body {
letter-spacing: 5px;
color: rgb(237, 218, 255);
text-transform: uppercase;
margin-block-start: 2.5rem;
margin-block-end: 1rem;
}
.contact-mail h4 {
font-family: 'Monument', display !important;
font-size: 1.2rem;
letter-spacing: 2px;
color: rgb(237, 218, 255);
margin-top: -1rem;
margin-block: 2.5rem;
}

.social-links-container {
display: flex;
gap: 2.5rem;
Expand Down Expand Up @@ -148,7 +141,6 @@ body {

.contact-info h2 {
font-size: 24px;
margin-bottom: 0;
}

@media screen and (max-width: 650px) {
Expand Down
0 flow/static/events_day.css → flow/static/css/events_day.css
View file
Open in desktop
File renamed without changes.
Loading