Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Katerina #880

Open
wants to merge 49 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
8d10825
Create main.yml
sofronijevikj Mar 4, 2024
c79707c
Update main.yml
sofronijevikj Mar 4, 2024
21ce53e
hello
sofronijevikj Mar 4, 2024
ee838c3
Merge branch 'master' of https://github.com/sofronijevikj/full-stack-…
sofronijevikj Mar 4, 2024
b025218
Ende
sofronijevikj Mar 4, 2024
7a42712
Create pipeline.yml
sofronijevikj Mar 4, 2024
0fa7bff
Update pipeline.yml
sofronijevikj Mar 4, 2024
40d718e
Update pipeline.yml
sofronijevikj Mar 4, 2024
1b80e22
update
sofronijevikj Mar 4, 2024
6d65614
Update corection
sofronijevikj Mar 4, 2024
0fb8ee3
Update main.yml
sofronijevikj Mar 4, 2024
339d976
Update package.json
sofronijevikj Mar 4, 2024
bfa0979
test2
sofronijevikj Mar 4, 2024
8bc7cec
Update main.yml
sofronijevikj Mar 4, 2024
f3720a6
update package.josn
sofronijevikj Mar 4, 2024
0e51aeb
Merge branch 'master' of https://github.com/sofronijevikj/full-stack-…
sofronijevikj Mar 4, 2024
ca95a4f
package.json update
sofronijevikj Mar 4, 2024
e69d765
update pachake.json
sofronijevikj Mar 4, 2024
85df35c
corect
sofronijevikj Mar 4, 2024
0091a58
Update main.yml
sofronijevikj Mar 4, 2024
8d7bb3d
pockemon.
sofronijevikj Mar 4, 2024
79b2589
code
sofronijevikj Mar 4, 2024
1f01aed
Update main.yml
sofronijevikj Mar 5, 2024
341b63a
mien.yml
sofronijevikj Mar 5, 2024
3d9a882
Merge branch 'master' of https://github.com/sofronijevikj/full-stack-…
sofronijevikj Mar 5, 2024
3b15d9f
Update main.yml
sofronijevikj Mar 5, 2024
d7bc0f3
new branch
sofronijevikj Mar 5, 2024
97bf17d
new branch
sofronijevikj Mar 5, 2024
531ecd9
pull_request:mein.yml
sofronijevikj Mar 5, 2024
327b1c9
Workflow-Konfiguration
sofronijevikj Mar 5, 2024
e31a322
Workflow-Konfiguration 1
sofronijevikj Mar 5, 2024
863c5e0
Konfiguration main.yml
sofronijevikj Mar 5, 2024
970185a
Verbessern des Workflows main.yml
sofronijevikj Mar 5, 2024
b35ff25
verberesern main.yml
sofronijevikj Mar 5, 2024
70241a1
check status
sofronijevikj Mar 5, 2024
a2337c5
Update and rename main.yml to Workflow-Konfiguration main.Workflow-Ko…
sofronijevikj Mar 5, 2024
7603620
Pipeline.main.yml
sofronijevikj Mar 5, 2024
60d019e
Create Pipeline.create.yml
sofronijevikj Mar 5, 2024
d48b084
Update Pipeline.main.yml
sofronijevikj Mar 5, 2024
de67576
Update Pipeline.main.yml
sofronijevikj Mar 5, 2024
d0a2fee
Update Pipeline.main.yml
sofronijevikj Mar 5, 2024
a49e38d
Update Pipeline.main.yml
sofronijevikj Mar 5, 2024
3aefe9a
update
sofronijevikj Mar 5, 2024
0d43048
Merge branch 'master' into katerina
sofronijevikj Mar 5, 2024
99dd951
package.json
sofronijevikj Mar 5, 2024
1dfdc92
Merge branch 'katerina' of https://github.com/sofronijevikj/full-stac…
sofronijevikj Mar 5, 2024
2f50684
update index.ysx
sofronijevikj Mar 5, 2024
e58e265
Update
sofronijevikj Mar 5, 2024
ed94988
#skip
sofronijevikj Mar 5, 2024
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
96 changes: 51 additions & 45 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,49 +1,55 @@
module.exports = {
"env": {
"browser": true,
"es6": true,
"jest/globals": true
},
"extends": [
"eslint:recommended",
"plugin:react/recommended"
],
"parserOptions": {
"ecmaFeatures": {
"jsx": true
'env': {
'browser': true,
'es6': true,
'node': true,
'jest/globals': true
},
"ecmaVersion": 2018,
"sourceType": "module"
},
"plugins": [
"react", "jest"
],
"rules": {
"indent": [
"error",
2
],
"linebreak-style": [
"error",
"unix"
"extends": [
"eslint:recommended",
"plugin:react/recommended"
],
"quotes": [
"error",
"single"
],
"semi": [
"error",
"never"
],
"eqeqeq": "error",
"no-trailing-spaces": "error",
"object-curly-spacing": [
"error", "always"
],
"arrow-spacing": [
"error", { "before": true, "after": true }
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"ecmaVersion": 2018,
"sourceType": "module"
},
"plugins": [
"react", "jest"
],
"no-console": "error",
"react/prop-types": 0
}
}
"rules": {
"indent": [
"error",
2
],
"linebreak-style": [
"error",
"unix"
],
"quotes": [
"error",
"single"
],
"semi": [
"error",
"never"
],
"eqeqeq": "error",
"no-trailing-spaces": "error",
"object-curly-spacing": [
"error", "always"
],
"arrow-spacing": [
"error", { "before": true, "after": true }
],
"no-console": "error",
"react/prop-types": 0
},
"settings": {
"react": {
"version": "detect"
}
}
}
24 changes: 24 additions & 0 deletions .github/workflows/Pipeline.create.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Testing stuff
on:
push:
branches:
- main
jobs:
a_test_job:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2

- name: github context
env:
GITHUB_CONTEXT: ${{ toJson(github) }}
run: echo "$GITHUB_CONTEXT"

- name: commits
env:
COMMITS: ${{ toJson(github.event.commits) }}
run: echo "$COMMITS"

- name: commit messages
env:
COMMIT_MESSAGES: ${{ toJson(github.event.commits.
46 changes: 46 additions & 0 deletions .github/workflows/Pipeline.main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: Pokedex

on:
push:
branches:
- master

pull_request:
branches: [master]
types: [opened, synchronize]

jobs:
simple_deployment_pipeline:
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: '16'

- name: Abhängigkeiten installieren
run: npm install

- name: Code Linting (with Fix)
run: npm run eslint -- --fix

- name: Build
run: npm run build

- name: Run Tests
run: npm test

tag_release:
if: ${{ (!contains(toJSON(github.event.head_commit.message), '#skip')) }}
needs: [simple_deployment_pipeline]
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v2

- name: Bump version and push tag
uses: anothrNick/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
10 changes: 7 additions & 3 deletions app.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
/* global process */

const express = require("express");
const app = express();

// Heroku dynamically sets a port

// Heroku dynamisch setzt einen Port

const PORT = process.env.PORT || 5000;

app.use(express.static("dist"));

app.listen(PORT, () => {
console.log("server started on port 5000");
});
// console.log("server started on port 5000");
});
Loading