Silver

+ CoDev is a company that focuses on recruiting highly skilled + professionals for tech companies in the US, and offering + supporting solutions that create highly integrated and + efficient teams. +

diff --git a/landing/templates/landing/team.html b/landing/templates/landing/team.html index 20eb484..d79df90 100644 --- a/landing/templates/landing/team.html +++ b/landing/templates/landing/team.html @@ -3,89 +3,28 @@

Our Team

Officers and Directors

+ {% for member in board_members %}

Micaela Reyes

- Director of Operations -

Matt Lebrun

- President -

Sony Valdez

- Director of Community Relations -

Angelica Lapastora

- Director of Marketing -

Alysson Alvaran

- Treasurer -

Vanessa Bermudez

- Committee Head - Meetups -

Ryan Ermita

- Director of Public Training -

Zorex Salvo

- Director of Engineering -

Jonathan Doydora

- Committee Head - Meetups +

+ {{ member.title }}

+ {% endfor %}

Core Volunteers

+ + {% for commitee in commitees %}

Meetup

Vanessa Bermudez

Jonathan Doydora

Khim Shae Delos Reyes

Von Louie Cruto

Jay Tero

Mark Anthony Yabis

Janine Bagares

Laurence Rebadulla

Rommel Philip Afurong

Ciara Bautista

Jay Mendez

First Val Babon

Rhea Baguion

Renz Jeremy Albandia

Ariel Conde

Crispin Sarmiento

Jessica Apostol

Freilla Mae Espinola

Lionel Amarado

Admin

Matt Lebrun

Micaela Reyes

Sony Valdez

Angelica Lapastora

Alysson Alvaran

Public Training

Ryan Ermita

Zorex Salvo

Dan Belza

Albert Yumol

+ {% for volunteer in commitee.volunteers.all %} +

+ {% endfor %} + {% endfor %}

diff --git a/landing/views.py b/landing/views.py index 2256407..ae41cde 100644 --- a/landing/views.py +++ b/landing/views.py @@ -1,12 +1,48 @@ from django.shortcuts import render from .models import Event, Section +from organisation.models import Volunteer, Commitee def index(request): - events = Event.objects.all() - sections = Section.objects.all() + events = Event.available_objects.all() + sections = Section.available_objects.all() + board_members = Volunteer.available_objects.filter(is_staff=True) + commitees = Commitee.available_objects.prefetch_related('volunteers') + python_hour = [ + { + "link": "#", + "tag": "Python Hour", + "title": "Let's create animated Memes using Python and MoviePy", + "date": "Thursday, October 13, 2022", + "time": "7PM-8PM PHT", + "location": "Via Zoom and Youtube Live", + "cover_image": "landing/assets/img/python_hour/python_hour_1.png" + }, + { + "link": "#", + "tag": "Python Hour", + "title": "API Development using Flask", + "date": "Thursday, October 20, 2022", + "time": "7PM-8PM PHT", + "location": "Via Zoom and Youtube Live", + "cover_image": "landing/assets/img/python_hour/python_hour_2.png" + }, + { + "link": "#", + "tag": "Python Hour", + "title": "Data Science using Python!", + "date": "Thursday, October 27, 2022", + "time": "7PM-8PM PHT", + "location": "Via Zoom and Youtube Live", + "cover_image": "landing/assets/img/python_hour/python_hour_3.png" + } + ] + return render(request, 'landing/index.html', { 'events': events, - 'sections': sections + 'sections': sections, + 'board_members': board_members, + 'commitees': commitees, + 'python_hour': python_hour, }) diff --git a/organisation/__init__.py b/organisation/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/organisation/admin.py b/organisation/admin.py new file mode 100644 index 0000000..0d7bb7d --- /dev/null +++ b/organisation/admin.py @@ -0,0 +1,13 @@ +from django.contrib import admin + +from .models import Commitee, Volunteer + + + +class VolunteerAdmin(admin.ModelAdmin): + list_display = ("display_name", "commitee", "first_name", "last_name",) + list_filter = ("commitee",) + + +admin.site.register(Commitee) +admin.site.register(Volunteer, VolunteerAdmin) diff --git a/organisation/apps.py b/organisation/apps.py new file mode 100644 index 0000000..ef39521 --- /dev/null +++ b/organisation/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class OrganisationConfig(AppConfig): + name = 'organisation' diff --git a/organisation/migrations/0001_initial.py b/organisation/migrations/0001_initial.py new file mode 100644 index 0000000..2b363a6 --- /dev/null +++ b/organisation/migrations/0001_initial.py @@ -0,0 +1,42 @@ +# Generated by Django 2.2.18 on 2022-08-04 06:09 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='Commitee', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('is_removed', models.BooleanField(default=False)), + ('name', models.CharField(max_length=255)), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='Volunteer', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('is_removed', models.BooleanField(default=False)), + ('display_name', models.CharField(max_length=255)), + ('first_name', models.CharField(max_length=128)), + ('last_name', models.CharField(max_length=128)), + ('title', models.CharField(blank=True, default='', max_length=255)), + ('is_staff', models.BooleanField(default=False)), + ('commitee', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='volunteers', to='organisation.Commitee')), + ], + options={ + 'abstract': False, + }, + ), + ] diff --git a/organisation/migrations/__init__.py b/organisation/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/organisation/models.py b/organisation/models.py new file mode 100644 index 0000000..7d7bac9 --- /dev/null +++ b/organisation/models.py @@ -0,0 +1,28 @@ +from model_utils.models import SoftDeletableModel + +from django.db import models + + +class Commitee(SoftDeletableModel): + name = models.CharField(max_length=255) + + def __str__(self): + return self.name + + +class Volunteer(SoftDeletableModel): + display_name = models.CharField(max_length=255) + first_name = models.CharField(max_length=128) + last_name = models.CharField(max_length=128) + title = models.CharField(max_length=255, blank=True, default='') + is_staff = models.BooleanField(default=False) + commitee = models.ForeignKey( + Commitee, + blank=True, + null=True, + on_delete=models.SET_NULL, + related_name='volunteers', + ) + + def __str__(self): + return self.display_name diff --git a/organisation/tests.py b/organisation/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/organisation/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/organisation/views.py b/organisation/views.py new file mode 100644 index 0000000..91ea44a --- /dev/null +++ b/organisation/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here. diff --git a/package.json b/package.json index fc499ee..09ac210 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ "browserify": "^10.1.0", "classnames": "^2.1.2", "marked": "^0.3.3", + "moment": "^2.29.4", "react": "^0.12.2", "superagent": "^0.21.0", "velocity-animate": "^1.2.1", diff --git a/pythonph/settings.py b/pythonph/settings.py index e009bb1..c52c269 100644 --- a/pythonph/settings.py +++ b/pythonph/settings.py @@ -30,6 +30,7 @@ 'jobs', 'slack', 'common', + 'organisation', ) MIDDLEWARE = ( 'django.middleware.security.SecurityMiddleware', diff --git a/requirements.txt b/requirements.txt index 7416b7c..0027c6b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Django==2.2.18 +Django==2.2.28 gunicorn==20.0.4 psycopg2-binary==2.8.5

Job

- Meetup -

- Admin + {{ commitee.name }}

- Public Training -

+ {{ event.title }} +

Silver

Our Team

Officers and Directors

Micaela Reyes

Matt Lebrun

Sony Valdez

Angelica Lapastora

Alysson Alvaran

Vanessa Bermudez

Ryan Ermita

Zorex Salvo

Jonathan Doydora

{{ member.display_name }}

Core Volunteers

Meetup

{{ commitee.name }}

Admin

Public Training

Job

+ Subscribe +

- Meetup -

- Admin + {{ commitee.name }}

- Public Training -

+ {{ event.title }} +

Silver

Our Team

Officers and Directors

Micaela Reyes

Matt Lebrun

Sony Valdez

Angelica Lapastora

Alysson Alvaran

Vanessa Bermudez

Ryan Ermita

Zorex Salvo

Jonathan Doydora

{{ member.display_name }}

Core Volunteers

Meetup

{{ commitee.name }}

Admin

Public Training