Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:14
FROM node:20
RUN mkdir /usr/src/app
WORKDIR /usr/src/app
ENV PATH /usr/src/app/node_modules/.bin:$PATH
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,14 @@ Run `yarn watch` to run reload the server on file changes. Note: this deletes th
- Set up a `.env` file based on `.env.example` with real values.

```bash
docker compose up -d --build
docker-compose build
docker-compose up
```

While the containers are running, execute the following:

```bash
docker compose run web bash -c "yarn run migrate"
docker-compose run tanulo bash -c "yarn run migrate"
```

## Debugging
Expand Down
18 changes: 11 additions & 7 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,20 @@ services:
networks:
- tanulo-network
restart: always
db:
image: postgres:12
postgres:
image: postgres
restart: always
env_file:
- .env
environment:
POSTGRES_USER: "${DB_USERNAME}"
POSTGRES_PASSWORD: "${DB_PASSWORD}"
POSTGRES_DB: "${DB_DATABASE}"
networks:
- tanulo-network
tanulo-network:
aliases:
- postgresql.db
volumes:
- tanulo_db_folder:/var/lib/postgresql/tanulo-data
- postgres:/var/lib/postgresql/tanulo-data
volumes:
tanulo_db_folder:
postgres:
networks:
tanulo-network:
10 changes: 5 additions & 5 deletions public/js/group/create.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// eslint-disable-next-line @typescript-eslint/no-unused-vars
import FullCalendar from "https://cdn.jsdelivr.net/npm/fullcalendar@5.7.0";
import { Calendar } from "https://cdn.jsdelivr.net/npm/@fullcalendar/core@5.7.0";
import dayGridPlugin from "https://cdn.jsdelivr.net/npm/@fullcalendar/daygrid@5.7.0";
import timeGridPlugin from "https://cdn.jsdelivr.net/npm/@fullcalendar/timegrid@5.7.0";
import listPlugin from "https://cdn.jsdelivr.net/npm/@fullcalendar/list@5.7.0";
import 'https://cdn.jsdelivr.net/npm/fullcalendar@5.6.0'
import { Calendar } from 'https://cdn.jsdelivr.net/npm/@fullcalendar/core@5.6.0/+esm'
import dayGridPlugin from 'https://cdn.jsdelivr.net/npm/@fullcalendar/daygrid@5.6.0/+esm'
import timeGridPlugin from 'https://cdn.jsdelivr.net/npm/@fullcalendar/timegrid@5.6.0/+esm'
import listPlugin from 'https://cdn.jsdelivr.net/npm/@fullcalendar/list@5.6.0/+esm'

let meetingPlace = 'floor'
const MEETING_PLACES = ['floor', 'link', 'other']
Expand Down
2 changes: 1 addition & 1 deletion public/js/md-editor.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import EasyMDE from "https://cdn.jsdelivr.net/npm/easymde@2.15.0";
import EasyMDE from 'https://cdn.jsdelivr.net/npm/easymde@2.15.0/+esm'

const submitBtn = document.getElementById('submitBtn')
const textArea = document.getElementById('desc')
Expand Down
12 changes: 6 additions & 6 deletions public/js/room/calendar.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// eslint-disable-next-line @typescript-eslint/no-unused-vars
import FullCalendar from "https://cdn.jsdelivr.net/npm/fullcalendar@5.7.0";
import { Calendar } from "https://cdn.jsdelivr.net/npm/@fullcalendar/core@5.7.0";
import dayGridPlugin from "https://cdn.jsdelivr.net/npm/@fullcalendar/daygrid@5.7.0";
import timeGridPlugin from "https://cdn.jsdelivr.net/npm/@fullcalendar/timegrid@5.7.0";
import listPlugin from "https://cdn.jsdelivr.net/npm/@fullcalendar/list@5.7.0";
import interactionPlugin from "https://cdn.jsdelivr.net/npm/@fullcalendar/interaction@5.7.0";
import 'https://cdn.jsdelivr.net/npm/fullcalendar@5.6.0'
import { Calendar } from 'https://cdn.jsdelivr.net/npm/@fullcalendar/core@5.6.0/+esm'
import dayGridPlugin from 'https://cdn.jsdelivr.net/npm/@fullcalendar/daygrid@5.6.0/+esm'
import timeGridPlugin from 'https://cdn.jsdelivr.net/npm/@fullcalendar/timegrid@5.6.0/+esm'
import listPlugin from 'https://cdn.jsdelivr.net/npm/@fullcalendar/list@5.6.0/+esm'
import interactionPlugin from 'https://cdn.jsdelivr.net/npm/@fullcalendar/interaction@5.6.0/+esm'

const commonCalendarOptions = {
plugins: [dayGridPlugin, timeGridPlugin, listPlugin, interactionPlugin],
Expand Down
2 changes: 1 addition & 1 deletion public/js/tags.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Tagify from "https://cdn.jsdelivr.net/npm/@yaireo/tagify@3.22.0";
import Tagify from 'https://cdn.jsdelivr.net/npm/@yaireo/tagify@3.22.0/+esm'

function transformTag(tagData) {
tagData.style = 'line-height: normal;'
Expand Down
2 changes: 1 addition & 1 deletion views/group/new.pug
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ extends ../layouts/main

block styles
link(rel="stylesheet" href="https://unpkg.com/easymde@2.15.0/dist/easymde.min.css")
link(rel="stylesheet", href="https://cdn.jsdelivr.net/npm/fullcalendar@5.7.0/main.min.css")
link(rel="stylesheet", href="https://cdn.jsdelivr.net/npm/fullcalendar@5.6.0/main.min.css")
link(rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@yaireo/tagify@3.22.0/dist/tagify.css")
link(rel="stylesheet" href="https://cdn.jsdelivr.net/npm/flatpickr/dist/flatpickr.min.css")
link(rel="stylesheet" href="https://npmcdn.com/flatpickr/dist/themes/material_blue.css")
Expand Down
2 changes: 1 addition & 1 deletion views/room/calendar.pug
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
extend ../layouts/main

block styles
link(rel="stylesheet", href="https://cdn.jsdelivr.net/npm/fullcalendar@5.7.0/main.min.css")
link(rel="stylesheet", href="https://cdn.jsdelivr.net/npm/fullcalendar@5.6.0/main.min.css")

block content
div(class="ml-4")
Expand Down
Loading