diff --git a/.gitignore b/.gitignore index cb9c929..22ec675 100644 --- a/.gitignore +++ b/.gitignore @@ -35,6 +35,3 @@ yarn-error.log* # vercel .vercel - -# compose -docker-compose-dev.yml diff --git a/.vscode/tasks.json b/.vscode/tasks.json index fb24988..f404271 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -17,7 +17,7 @@ }, { "type": "shell", - "command": "docker-compose -f docker-compose-dev.yml up --build", + "command": "docker-compose -f docker-compose-dev.yml --env-file .env.local up --build", "problemMatcher": [], "label": "Docker", "detail": "Builds and runs a docker container" diff --git a/README.md b/README.md index a179564..5559b5c 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,7 @@ Fill the BOT_TOKEN, leave CHAT_ID empty and start the container. version: "3" services: notifybot: + container_name: notifybot image: planecore/notifybot ports: - "3000:3000" diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml new file mode 100644 index 0000000..96bfce5 --- /dev/null +++ b/docker-compose-dev.yml @@ -0,0 +1,13 @@ +version: "3" +services: + notifybot: + container_name: notifybot + build: . + ports: + - "3000:3000" + environment: + - BOT_TOKEN + - CHAT_ID + volumes: + - ./db:/usr/src/app/db + restart: unless-stopped diff --git a/docker-compose.yml b/docker-compose.yml index a5419af..c3c73ca 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: notifybot: container_name: notifybot - build: . + image: planecore/notifybot ports: - "3000:3000" environment: diff --git a/package.json b/package.json index 91f3b55..9d3470e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "notifybot", - "version": "0.1.0", + "version": "0.1.1", "private": true, "scripts": { "dev": "next dev", diff --git a/src/pages/index.tsx b/src/pages/index.tsx index 4e37d94..57c07fa 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -28,6 +28,7 @@ const HomePage: NextPage = ({ messages }) => { const router = useRouter() const [, setToast] = useToasts() const [message, setMessage] = useState("") + const [showDatePicker, setShowDatePicker] = useState(false) const [scheduleDate, setScheduleDate] = useState(new Date()) const [shouldSchedule, setShouldSchedule] = useState<"true" | "false">( "false" @@ -73,29 +74,36 @@ const HomePage: NextPage = ({ messages }) => {
-
- -
setScheduleDate(date.toDate())} + open={showDatePicker} + onOpen={() => setShowDatePicker(true)} + onClose={() => setShowDatePicker(false)} ampm={false} autoOk disablePast />
+
+ +
diff --git a/src/scheduleJobs.js b/src/scheduleJobs.js index 8ff7e7c..efd7094 100644 --- a/src/scheduleJobs.js +++ b/src/scheduleJobs.js @@ -48,7 +48,6 @@ if (chatId === undefined || chatId === "") { function scheduleJob() { schedule.scheduleJob("* * * * *", async () => { - console.log("HELLO AT ", new Date()) sendMessagesInQueue() }) }