Skip to content
Open

hi #3

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
11 changes: 4 additions & 7 deletions .github/workflows/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@ jobs:
name: Deploy app
needs: [deployment_prep]
runs-on: ubuntu-latest
if: |
${{ github.event_name == 'push' }} &&
!contains(join(toJson(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
Expand All @@ -39,14 +37,13 @@ jobs:
needs: [deploy]
permissions: write-all
runs-on: ubuntu-latest
if: |
${{ github.event_name == 'push' }} &&
!contains(join(toJson(github.event.commits.*.message), ' '), '#skip')
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 }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
DEFAULT_BUMP: 'patch'
12 changes: 12 additions & 0 deletions client/components/App 2.js
Original file line number Diff line number Diff line change
@@ -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 />
</>
)
10 changes: 10 additions & 0 deletions client/components/Footer 2.js
Original file line number Diff line number Diff line change
@@ -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
10 changes: 10 additions & 0 deletions client/components/FrontPage/index 2.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import React from 'react'

const FrontPage = () => (
<>
Welcome
<a href="/messages">Messages</a>
</>
)

export default FrontPage
10 changes: 10 additions & 0 deletions client/components/NavBar 2.js
Original file line number Diff line number Diff line change
@@ -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
11 changes: 11 additions & 0 deletions client/util/common 2.js
Original file line number Diff line number Diff line change
@@ -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'
9 changes: 9 additions & 0 deletions config/common 2.js
Original file line number Diff line number Diff line change
@@ -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,
}
8 changes: 8 additions & 0 deletions server/util/common 2.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
const common = require('@root/config/common')

const PORT = process.env.PORT || 8000

module.exports = {
...common,
PORT,
}
10 changes: 10 additions & 0 deletions server/util/routes 2.js
Original file line number Diff line number Diff line change
@@ -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