Skip to content

Commit

Permalink
Merge branch 'development' into switch-to-poetry
Browse files Browse the repository at this point in the history
  • Loading branch information
jandd committed Oct 26, 2022
2 parents 7d2e21a + 4f1bb92 commit 2ceccea
Show file tree
Hide file tree
Showing 36 changed files with 33,637 additions and 14,679 deletions.
25,341 changes: 17,291 additions & 8,050 deletions devday/devday/static/css/style.css

Large diffs are not rendered by default.

Binary file modified devday/devday/static/fonts/fa-brands-400.ttf
Binary file not shown.
Binary file modified devday/devday/static/fonts/fa-brands-400.woff2
Binary file not shown.
Binary file modified devday/devday/static/fonts/fa-regular-400.ttf
Binary file not shown.
Binary file modified devday/devday/static/fonts/fa-regular-400.woff2
Binary file not shown.
Binary file modified devday/devday/static/fonts/fa-solid-900.ttf
Binary file not shown.
Binary file modified devday/devday/static/fonts/fa-solid-900.woff2
Binary file not shown.
Binary file added devday/devday/static/fonts/fa-v4compatibility.ttf
Binary file not shown.
Binary file not shown.
10,881 changes: 10,881 additions & 0 deletions devday/devday/static/js/jquery.js

Large diffs are not rendered by default.

5,656 changes: 3,283 additions & 2,373 deletions devday/devday/static/js/main.js

Large diffs are not rendered by default.

14 changes: 13 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,19 @@ services:
- "15432:5432"
env_file:
dev-env-db
read_only: true
volumes:
- "pg_data:/var/lib/postgresql/data"
- "./docker/db/dev/init-user-db.sql:/docker-entrypoint-initdb.d/init-user-db.sql"
- "/var/run/postgresql"
- "./docker/db/dev/init-user-db.sql:/docker-entrypoint-initdb.d/init-user-db.sql:ro"
cap_drop:
- ALL
cap_add:
- CAP_CHOWN
- CAP_DAC_READ_SEARCH
- CAP_FOWNER
- CAP_SETGID
- CAP_SETUID
app:
image: devdaydresden/devday_website_app:latest_dev
build:
Expand All @@ -35,6 +45,8 @@ services:
- "devday_static:/app/static"
tmpfs:
- /tmp
cap_drop:
- ALL
depends_on:
- db

Expand Down
11 changes: 11 additions & 0 deletions docs/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
SVG_DIAGRAMS := $(patsubst %.puml,%.svg,$(wildcard *.puml))

all: $(SVG_DIAGRAMS)

$(SVG_DIAGRAMS): %.svg: %.puml
plantuml -tsvg $<

clean:
rm -f $(SVG_DIAGRAMS)

.PHONY: all clean
88 changes: 88 additions & 0 deletions docs/meetup-slides-2022-10-12.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
---
author: Jan Dittberner
date: 12.10.2022
paging: Seite %d von %d
---

```
making of
____ ____
| _ \ _____ __ | _ \ __ _ _ _
| | | |/ _ \ \ / / | | | |/ _` | | | |
| |_| | __/\ V / | |_| | (_| | |_| |
|____/ \___| \_/ |____/ \__,_|\__, |
|___/
website
```

**SECO-Meetup** https://seco.rocks/

---

# Agenda

## Architekturüberblick

## Technologiestack

## Entwicklung + Hands-On/Demo

## Mögliche neue Architektur

## Q&A + Mitmachmöglichkeiten

---

# Architekturüberblick

[Diagramme](https://github.com/jandd/devday_website/tree/architecture-diagrams/docs)

---

# Technologiestack

- Ansible (Deployment)
- Angular (Twitterwall)
- Bootstrap (CSS framework)
- [Django](https://www.djangoproject.com/)
- [Django CMS](https://www.django-cms.org/)
- Docker
- Gulp (Builder für CSS und JavaScript)
- HashiCorp Vault (Credential management)
- Postfix
- PostgreSQL 🐘
- Python 🐍
- nginx
- sass (CSS precompiler)
- uWSGI

---

# Entwicklung

[Code repository](https://github.com/devdaydresden/devday_website)

## Demo / Hands-On

---

# Mögliche neue Architektur

---

# Q&A

## Wie weiter

- Dev Day ist ein Mitmach-Projekt

- Kuratoren gesucht
- Weitere Entwickler für Webseite gesucht (Frontend Angular & Backend Python + Django)
- Ideen für SpeakerInnen, Sessions, Rahmenprogramm und Sponsoren? Her damit! 😎

- [Issue tracker](https://github.com/devdaydresden/devday_website/issues)

## Kontakt

- [Ihr wollt beim Dev Day mitmachen?](mailto:info@devday.de)
- [Ihr habt Detailfragen zur Webseite?](mailto:jan.dittberner@t-systems.com)
48 changes: 48 additions & 0 deletions docs/system_context.puml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
@startuml
!include <C4/C4_Context.puml>

title Context diagram Dev Day Website

Enterprise_Boundary(MMSBT, "T-Systems MMS BT&E") {
System(ReverseProxy, "Reverse Proxy", "MMS reverse proxy")
System_Boundary(DevDay, "Dev Day applications") {
System(DevDayWebsite, "Dev Day website", "Dev Day Website application")
System(TwitterWall, "Dev Day Twitterwall", "Dev Day Twitter wall")
}
System(Vault, "Vault", "Hashicorp Vault Secret Manager")
System(PostgreSQL, "PostgreSQL", "PostgreSQL database")
System(TMS, "Mail system", "technical mail system")

Person(DevDayAdmin, "Dev Day admin")
}

System(TwitterAPI, "Twitter API", "Twitter's public API endpoints")

Person(DevDayTeam, "Dev Day team member")
Person(DevDaySpeaker, "Dev Day speaker (potential and selected speakers)")
Person(DevDaySponsor, "Dev Day sponsor")
Person(DevDayAttendee, "Dev Day attendee")
Person(DevDayCommittee, "Dev Day program committee")

System(ScreenAtDevDay, "Twitter Wall screen", "Large Twitter wall screen at the Dev Day venue")

Rel_D(ReverseProxy, DevDayWebsite, "forward user traffic")
Rel_D(ReverseProxy, TwitterWall, "forward user traffic")

Rel(ScreenAtDevDay, ReverseProxy, "Get Twitter wall content")

Rel(DevDayWebsite, Vault, "fetch secrets")
Rel(DevDayWebsite, PostgreSQL, "read and write application data")
Rel(DevDayWebsite, TwitterAPI, "fetch Dev Day related tweets")
Rel(DevDayWebsite, TMS, "send bulk and individual mails")

Rel_R(TwitterWall, DevDayWebsite, "get tweet information")

Rel(DevDayAdmin, DevDayWebsite, "administration and configuration")
Rel(DevDayTeam, ReverseProxy, "content editing, mail editing")
Rel(DevDaySponsor, ReverseProxy, "request sponsorship")
Rel(DevDaySpeaker, ReverseProxy, "add and modify talks")
Rel(DevDayAttendee, ReverseProxy, "register for events, workshops, manage profile")
Rel(DevDayCommittee, ReverseProxy, "evaluate and choose sessions")

@enduml
196 changes: 196 additions & 0 deletions docs/system_context.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
73 changes: 73 additions & 0 deletions docs/system_context_new.puml
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
@startuml
!include <C4/C4_Context.puml>

title Context diagram Dev Day Website Neu

Enterprise_Boundary(DEVDAY, "Dev Day infrastructure") {
System_Boundary(Applications, "Applications") {
System(DevDayPWA, "Dev Day website", "Progressive web application")
System(DevDayAPI, "Dev Day API", "Dev Day API (i.e. attendee management, mail, twitter proxy)")
System(TwitterWall, "Dev Day Twitterwall", "Dev Day Twitter wall")
System(Pretalx, "Pretalx", "Talk management")
System(CMS, "WordPress", "WordPress CMS")
}

System_Boundary(Backend, "Backend Services") {
System(Vault, "Vault", "Hashicorp Vault Secret Manager")
System(PostgreSQL, "PostgreSQL", "PostgreSQL database")
System(TMS, "Mail system", "technical mail system")
System(MariaDB, "MariaDB")
System(Redis, "Redis")
}
}

System_Boundary(ExternalSystems, "External Systems") {
System(TwitterAPI, "Twitter API", "Twitter's public API endpoints")
System(ScreenAtDevDay, "Twitter Wall screen", "Large Twitter wall screen at the Dev Day venue")
}

Person(DevDayAdmin, "Dev Day admin")
Person(DevDayTeam, "Dev Day team member")
Person(DevDayContentTeam, "Dev Day content team member")
Person(DevDaySpeaker, "Dev Day speaker (potential and selected speakers)")
Person(DevDaySponsor, "Dev Day sponsor")
Person(DevDayAttendee, "Dev Day attendee")
Person(DevDayCommittee, "Dev Day program committee")

Rel(DevDayPWA, DevDayAPI, "API")
Rel(DevDayPWA, Pretalx, "API")
Rel(DevDayPWA, CMS, "API")
Rel(DevDayPWA, TMS, "send bulk and individual mails")

Rel(ScreenAtDevDay, TwitterWall, "Get Twitter wall content")

Rel(DevDayAPI, Pretalx, "reservations, favourites via API")
Rel(DevDayAPI, Vault, "fetch secrets")
Rel(DevDayAPI, PostgreSQL, "read and write application data")
Rel(DevDayAPI, TwitterAPI, "fetch Dev Day related tweets")

Rel(CMS, MariaDB, "read and write data")

Rel(Pretalx, PostgreSQL, "read and write data")
Rel(Pretalx, Redis, "cache and task data")

Rel(TwitterWall, DevDayAPI, "get tweet information")

Rel(DevDayAdmin, DevDayAPI, "administration and configuration")
Rel(DevDayAdmin, Pretalx, "administration and configuration")

Rel(DevDayTeam, DevDayPWA, "attendee management, mail editing")
Rel(DevDayTeam, Pretalx, "speaker and session management")

Rel(DevDayContentTeam, CMS, "content editing, mail editing")

Rel(DevDaySponsor, DevDayPWA, "request sponsorship")

Rel(DevDaySpeaker, Pretalx, "add and modify talks")
Rel(DevDaySpeaker, DevDayPWA, "act as attendee")

Rel(DevDayAttendee, DevDayPWA, "register for events, workshops, manage profile")

Rel(DevDayCommittee, Pretalx, "evaluate and choose sessions")

@enduml
Loading

0 comments on commit 2ceccea

Please sign in to comment.