Merge pull request #5 from educorvi/develop

Release
educorvi · Feb 14, 2023 · 53f2742 · 53f2742
2 parents 5870afb + 8161ebd
commit 53f2742
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 9 deletions.
diff --git a/client/.releaserc.js b/client/.releaserc.js
@@ -3,6 +3,12 @@ module.exports = {
     plugins: [
         "@semantic-release/commit-analyzer",
         "@semantic-release/release-notes-generator",
+        [
+            "@semantic-release/changelog",
+            {
+                "changelogFile": "public/CHANGELOG.md"
+            }
+        ],
         ["@semantic-release/npm", {
             publish: false
         }],

diff --git a/client/package.json b/client/package.json
@@ -15,6 +15,7 @@
     "axios": "^1.2.2",
     "bootstrap": "^4.6.2",
     "bootstrap-vue": "^2.23.1",
+    "bootswatch": "^4.6.2",
     "file-saver": "^2.0.5",
     "humanize-duration": "^3.28.0",
     "keycloak-js": "^20.0.3",
@@ -24,6 +25,7 @@
   },
   "devDependencies": {
     "@rushstack/eslint-patch": "^1.1.4",
+    "@semantic-release/changelog": "^6.0.2",
     "@semantic-release/github": "^8.0.7",
     "@types/file-saver": "^2.0.5",
     "@types/humanize-duration": "^3.27.1",

diff --git a/client/src/main.ts b/client/src/main.ts
@@ -4,7 +4,8 @@ import {createPinia} from 'pinia';
 import App from './App.vue';
 import router from './router';
 
-import 'bootstrap/dist/css/bootstrap.css';
+// import 'bootstrap/dist/css/bootstrap.css';
+import 'bootswatch/dist/cosmo/bootstrap.min.css'
 import 'bootstrap-vue/dist/bootstrap-vue.css';
 import './assets/main.css';
 

diff --git a/client/src/views/Home.vue b/client/src/views/Home.vue
@@ -1,10 +1,12 @@
 <template>
-  <div style="display: flex; width: 100%; justify-content: center" class="mb-4">
-    <b-button @click="showModal" variant="primary" style="max-width: 400px" class="w-100">Neuer Eintrag
-    </b-button>
-  </div>
 
-  <overview ref="overview" :tasks="tasks"/>
+  <overview ref="overview" :tasks="tasks">
+
+    <div style="display: flex; width: 100%; justify-content: center" class="mb-4">
+      <b-button @click="showModal" variant="primary" style="max-width: 400px" class="w-100">Neuer Eintrag
+      </b-button>
+    </div>
+  </overview>
 
   <entry-editor ref="entryModal" :done="refresh" :tasks="tasks"/>
 </template>

diff --git a/server/.releaserc.js b/server/.releaserc.js
@@ -3,6 +3,12 @@ module.exports = {
     plugins: [
         "@semantic-release/commit-analyzer",
         "@semantic-release/release-notes-generator",
+        [
+            "@semantic-release/changelog",
+            {
+                "changelogFile": "CHANGELOG.md"
+            }
+        ],
         ["@semantic-release/npm", {
             publish: false
         }],

diff --git a/server/package.json b/server/package.json
@@ -27,6 +27,7 @@
   },
   "homepage": "https://github.com/educorvi/timeclicker#readme",
   "devDependencies": {
+    "@semantic-release/changelog": "^6.0.2",
     "@semantic-release/github": "^8.0.7",
     "@types/cors": "^2.8.13",
     "@types/express": "^4.17.15",

diff --git a/server/src/index.ts b/server/src/index.ts
@@ -58,12 +58,17 @@ async function synchronizeTasks() {
 }
 
 async function start() {
-    await db.init();
-    logger.info("Connected to database")
+    try {
+        await db.init();
+        logger.info("Connected to database");
+    } catch (e) {
+        logger.fatal("Could not connect to database: ", e);
+        process.exit(-1);
+    }
     await synchronizeTasks();
     setInterval(synchronizeTasks, 1000*60*60)
     app.listen(port, () =>
-        console.log(`Example app listening at http://localhost:${port}`)
+        console.log(`App listening at http://localhost:${port}`)
     );
 }
 

diff --git a/yarn.lock b/yarn.lock
@@ -714,6 +714,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@semantic-release/changelog@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "@semantic-release/changelog@npm:6.0.2"
+  dependencies:
+    "@semantic-release/error": ^3.0.0
+    aggregate-error: ^3.0.0
+    fs-extra: ^11.0.0
+    lodash: ^4.17.4
+  peerDependencies:
+    semantic-release: ">=18.0.0"
+  checksum: e116a1ac2528c960743ae952f0b2510713a18a9df1d7ea61dc0092380eb26c5e79c5b0b699f7c9cc71f5f27b49ccd736c46319363a737528454568b000016752
+  languageName: node
+  linkType: hard
+
 "@semantic-release/commit-analyzer@npm:^9.0.2":
   version: 9.0.2
   resolution: "@semantic-release/commit-analyzer@npm:9.0.2"
@@ -1789,6 +1803,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"bootswatch@npm:^4.6.2":
+  version: 4.6.2
+  resolution: "bootswatch@npm:4.6.2"
+  checksum: 0f1ffcae7786ea2828be9ae974a5bc415b938ec0f7f238f6d13514b0ff23d04579fb9af864585a3e04f6fdfe1b5e9fdcd02908c66c13187b004ef9b2fcdd461c
+  languageName: node
+  linkType: hard
+
 "bottleneck@npm:^2.18.1":
   version: 2.19.5
   resolution: "bottleneck@npm:2.19.5"
@@ -7682,6 +7703,7 @@ __metadata:
   resolution: "timeclicker_client@workspace:client"
   dependencies:
     "@rushstack/eslint-patch": ^1.1.4
+    "@semantic-release/changelog": ^6.0.2
     "@semantic-release/github": ^8.0.7
     "@types/file-saver": ^2.0.5
     "@types/humanize-duration": ^3.27.1
@@ -7695,6 +7717,7 @@ __metadata:
     axios: ^1.2.2
     bootstrap: ^4.6.2
     bootstrap-vue: ^2.23.1
+    bootswatch: ^4.6.2
     eslint: ^8.22.0
     eslint-plugin-vue: ^9.3.0
     file-saver: ^2.0.5
@@ -7717,6 +7740,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "timeclicker_server@workspace:server"
   dependencies:
+    "@semantic-release/changelog": ^6.0.2
     "@semantic-release/github": ^8.0.7
     "@types/cors": ^2.8.13
     "@types/express": ^4.17.15