From bfd0380a58d54ce4cbb56583e70e609d2f72015c Mon Sep 17 00:00:00 2001
From: Allison Tielking <atielkin@alumni.stanford.edu>
Date: Thu, 2 Mar 2023 21:49:10 -0500
Subject: [PATCH 1/3] hi


From df773362b463bab18792ebf0ffa83a3e94e4e41f Mon Sep 17 00:00:00 2001
From: Allison Tielking <atielkin@alumni.stanford.edu>
Date: Thu, 2 Mar 2023 21:57:40 -0500
Subject: [PATCH 2/3] try this

---
 .github/workflows/pipeline.yml         | 48 ++++++++++++++++++++++++++
 client/components/App 2.js             | 12 +++++++
 client/components/Footer 2.js          | 10 ++++++
 client/components/FrontPage/index 2.js | 10 ++++++
 client/components/NavBar 2.js          | 10 ++++++
 client/util/common 2.js                | 11 ++++++
 config/common 2.js                     |  9 +++++
 server/util/common 2.js                |  8 +++++
 server/util/routes 2.js                | 10 ++++++
 9 files changed, 128 insertions(+)
 create mode 100644 .github/workflows/pipeline.yml
 create mode 100644 client/components/App 2.js
 create mode 100644 client/components/Footer 2.js
 create mode 100644 client/components/FrontPage/index 2.js
 create mode 100644 client/components/NavBar 2.js
 create mode 100644 client/util/common 2.js
 create mode 100644 config/common 2.js
 create mode 100644 server/util/common 2.js
 create mode 100644 server/util/routes 2.js

diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
new file mode 100644
index 0000000..d29f200
--- /dev/null
+++ b/.github/workflows/pipeline.yml
@@ -0,0 +1,48 @@
+name: Deployment pipeline
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches: [master]
+    types: [opened, synchronize]
+      
+jobs:
+  deployment_prep:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '16'
+      - name: npm install 
+        run: npm install  
+      - name: lint
+        run: npm run lint
+      - name: build
+        run: npm run build
+  deploy:
+    name: Deploy app
+    needs: [deployment_prep]
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name == 'push' && !contains(join(github.event.commits.*.message, ''), '#skip
+    steps:
+      - uses: actions/checkout@v3
+      - uses: superfly/flyctl-actions/setup-flyctl@master
+      - run: flyctl deploy --remote-only
+        env:
+          FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
+  tag_release:
+    needs: [deploy]
+    permissions: write-all
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name == 'push' && !contains(join(github.event.commits.*.message, ''), '#skip
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: '0'
+      - name: Bump version and push tag
+        uses: anothrNick/github-tag-action@eca2b69f9e2c24be7decccd0f15fdb1ea5906598
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
diff --git a/client/components/App 2.js b/client/components/App 2.js
new file mode 100644
index 0000000..3e51fa7
--- /dev/null
+++ b/client/components/App 2.js	
@@ -0,0 +1,12 @@
+import React from 'react'
+import NavBar from 'Components/NavBar'
+import Footer from 'Components/Footer'
+import Router from 'Components/Router'
+
+export default () => (
+  <>
+    <NavBar />
+    <Router />
+    <Footer />
+  </>
+)
diff --git a/client/components/Footer 2.js b/client/components/Footer 2.js
new file mode 100644
index 0000000..17ac13e
--- /dev/null
+++ b/client/components/Footer 2.js	
@@ -0,0 +1,10 @@
+import React from 'react'
+import { images } from 'Utilities/common'
+
+const Footer = () => (
+  <div className="footer">
+    <img src={images.toskaLogo} alt="toska" />
+  </div>
+)
+
+export default Footer
diff --git a/client/components/FrontPage/index 2.js b/client/components/FrontPage/index 2.js
new file mode 100644
index 0000000..f6ecc2d
--- /dev/null
+++ b/client/components/FrontPage/index 2.js	
@@ -0,0 +1,10 @@
+import React from 'react'
+
+const FrontPage = () => (
+  <>
+    Welcome
+    <a href="/messages">Messages</a>
+  </>
+)
+
+export default FrontPage
diff --git a/client/components/NavBar 2.js b/client/components/NavBar 2.js
new file mode 100644
index 0000000..5c72861
--- /dev/null
+++ b/client/components/NavBar 2.js	
@@ -0,0 +1,10 @@
+import React from 'react'
+import { images } from 'Utilities/common'
+
+const NavBar = () => (
+  <div className="navbar">
+    <img src={images.toskaLogo} alt="toska" />
+  </div>
+)
+
+export default NavBar
diff --git a/client/util/common 2.js b/client/util/common 2.js
new file mode 100644
index 0000000..52ba1a8
--- /dev/null
+++ b/client/util/common 2.js	
@@ -0,0 +1,11 @@
+/**
+ * Insert common items for frontend here
+ */
+import toskaLogo from 'Assets/toskalogo_color.svg'
+
+export const images = {
+  toskaLogo,
+}
+
+// Everything from application wide common items is available through here
+export * from '@root/config/common'
diff --git a/config/common 2.js b/config/common 2.js
new file mode 100644
index 0000000..71ee13f
--- /dev/null
+++ b/config/common 2.js	
@@ -0,0 +1,9 @@
+/**
+ * Insert application wide common items here, they're all exported by frontend and backend common.js respectively
+ */
+
+const inProduction = process.env.NODE_ENV === 'production'
+
+module.exports = {
+  inProduction,
+}
diff --git a/server/util/common 2.js b/server/util/common 2.js
new file mode 100644
index 0000000..4543e4b
--- /dev/null
+++ b/server/util/common 2.js	
@@ -0,0 +1,8 @@
+const common = require('@root/config/common')
+
+const PORT = process.env.PORT || 8000
+
+module.exports = {
+  ...common,
+  PORT,
+}
diff --git a/server/util/routes 2.js b/server/util/routes 2.js
new file mode 100644
index 0000000..b39a6ab
--- /dev/null
+++ b/server/util/routes 2.js	
@@ -0,0 +1,10 @@
+const Router = require('express')
+const messages = require('@controllers/messagesController')
+
+const router = Router()
+
+router.get('/messages', messages.getAll)
+router.post('/messages', messages.create)
+router.delete('/messages/:id', messages.destroy)
+
+module.exports = router

From 191ed1c8b13e09cb11d5de44c98bff8aa8b499ba Mon Sep 17 00:00:00 2001
From: Allison Tielking <atielkin@alumni.stanford.edu>
Date: Thu, 2 Mar 2023 22:00:36 -0500
Subject: [PATCH 3/3] update

---
 .github/workflows/pipeline.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
index d29f200..759692e 100644
--- a/.github/workflows/pipeline.yml
+++ b/.github/workflows/pipeline.yml
@@ -26,7 +26,7 @@ jobs:
     name: Deploy app
     needs: [deployment_prep]
     runs-on: ubuntu-latest
-    if: ${{ github.event_name == 'push' && !contains(join(github.event.commits.*.message, ''), '#skip
+    if: ${{ github.event_name == 'push' && !contains(join(github.event.commits.*.message, ''), '#skip') }}
     steps:
       - uses: actions/checkout@v3
       - uses: superfly/flyctl-actions/setup-flyctl@master
@@ -37,7 +37,7 @@ jobs:
     needs: [deploy]
     permissions: write-all
     runs-on: ubuntu-latest
-    if: ${{ github.event_name == 'push' && !contains(join(github.event.commits.*.message, ''), '#skip
+    if: ${{ github.event_name == 'push' && !contains(join(github.event.commits.*.message, ''), '#skip') }}
     steps:
       - uses: actions/checkout@v3
         with:
@@ -45,4 +45,5 @@ jobs:
       - name: Bump version and push tag
         uses: anothrNick/github-tag-action@eca2b69f9e2c24be7decccd0f15fdb1ea5906598
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          DEFAULT_BUMP: 'patch'
\ No newline at end of file