diff --git a/Dockerfile b/Dockerfile index 005c7adf..5cb8203a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 diff --git a/README.md b/README.md index 26bcd5e0..c5adf1d0 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/docker-compose.yml b/docker-compose.yml index 109625d6..20bb634a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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: diff --git a/public/js/group/create.js b/public/js/group/create.js index 00f379da..2c4ff1a3 100644 --- a/public/js/group/create.js +++ b/public/js/group/create.js @@ -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'] diff --git a/public/js/md-editor.js b/public/js/md-editor.js index 72c1346d..95ba574d 100644 --- a/public/js/md-editor.js +++ b/public/js/md-editor.js @@ -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') diff --git a/public/js/room/calendar.js b/public/js/room/calendar.js index 002c79be..556f1766 100644 --- a/public/js/room/calendar.js +++ b/public/js/room/calendar.js @@ -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], diff --git a/public/js/tags.js b/public/js/tags.js index 7a1f9950..a8288464 100644 --- a/public/js/tags.js +++ b/public/js/tags.js @@ -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;' diff --git a/views/group/new.pug b/views/group/new.pug index d67382e3..d4a4695e 100644 --- a/views/group/new.pug +++ b/views/group/new.pug @@ -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") diff --git a/views/room/calendar.pug b/views/room/calendar.pug index 6fe50972..c4a4903c 100644 --- a/views/room/calendar.pug +++ b/views/room/calendar.pug @@ -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")