Skip to content

Commit

Permalink
Merge pull request #3 from Mateus-Mannes/merge-frontend
Browse files Browse the repository at this point in the history
Merge frontend
  • Loading branch information
Mateus-Mannes authored Mar 28, 2024
2 parents 21ed45c + 919f749 commit 82f118c
Show file tree
Hide file tree
Showing 116 changed files with 22,225 additions and 6 deletions.
46 changes: 46 additions & 0 deletions .github/workflows/azure-static-web-apps-red-rock-04972fe10.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: Azure Static Web Apps CI/CD

on:
push:
branches:
- master
pull_request:
types: [opened, synchronize, reopened, closed]
branches:
- master

jobs:
build_and_deploy_job:
if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
runs-on: ubuntu-latest
name: Build and Deploy Job
steps:
- uses: actions/checkout@v2
with:
submodules: true
- name: Build And Deploy
id: builddeploy
uses: Azure/static-web-apps-deploy@v1
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_RED_ROCK_04972FE10 }}
repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
action: "upload"
###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
# For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
app_location: "/TodoWebApp" # App source code path
api_location: "" # Api source code path - optional
output_location: "dist/todo-app" # Built app content directory - optional
app_build_command: "npm run build_production"
###### End of Repository/Build Configurations ######

close_pull_request_job:
if: github.event_name == 'pull_request' && github.event.action == 'closed'
runs-on: ubuntu-latest
name: Close Pull Request Job
steps:
- name: Close Pull Request
id: closepullrequest
uses: Azure/static-web-apps-deploy@v1
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_RED_ROCK_04972FE10 }}
action: "close"
6 changes: 3 additions & 3 deletions .github/workflows/master_todoapp-mateus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ jobs:
include-prerelease: true

- name: Build with dotnet
run: dotnet build --configuration Release
run: dotnet build ./WriteFluencyApi --configuration Release

- name: Test
run: dotnet test --no-restore --verbosity normal
run: dotnet test ./WriteFluencyApi --no-restore --verbosity normal

- name: dotnet publish
run: dotnet publish src/ -c Release -o ${{env.DOTNET_ROOT}}/myapp
run: dotnet publish ./WriteFluencyApi/src/ -c Release -o ${{env.DOTNET_ROOT}}/myapp

- name: Upload artifact for deployment job
uses: actions/upload-artifact@v2
Expand Down
52 changes: 52 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
# TodoApp

This is a simple TodoApp front end built on Angular

## Running

This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 14.2.6.

Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`.

the application is using the API at https://github.com/Mateus-Mannes/TodoWebApp for the back-end. You can run it locally also.

## Project Structure

``` mermaid
flowchart TB
subgraph Login Page
LoginComponent
end
subgraph Create User Page
CreateUserComponent
end
subgraph Application Page
ApplicationComponent
subgraph GroupsModule
GroupsComponent[GroupsComponent \n - Groups CRUD]
end
ApplicationComponent -- Fills groups --> GroupsModule
subgraph GridModule
GridComponent[GridComponent \n - Todos CRUD]
-- 1 - * -->
TodoComponent
TodoComponent -- pop up -->EditTodoComponent
end
GroupsModule -- Selected group \nfills the grid --> GridModule
subgraph InputModule
InputComponent[InputComponent]
end
InputModule -- emits todo creation --> GridModule
end
```
59 changes: 56 additions & 3 deletions Readme.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# TodoWebApp
This is an API built to work as a Todo App backend, built on DOTNET 6
# TodoApi

This is an API built to work as a Todo App backend, built on DOTNET 8

## Running
using DOTNET 6 CLI, run:
using DOTNET 8 CLI, run:
``` cmd
dotnet run
````
Expand Down Expand Up @@ -31,3 +32,55 @@ the application code is in the `/src` directory, where you will find the main pr
The tests are simple, all in one file `TodoAppTests`. It inherits from `TodoAppTestBase`, that implements an in-memory sqlite for the test data and have a ServiceCollection that provides access to dbcontext, services, controllers, etc ...
# TodoWebApp
This is a simple TodoApp front end built on Angular
## Running
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 14.2.6.
Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`.
the application is using the API at https://github.com/Mateus-Mannes/TodoWebApp for the back-end. You can run it locally also.
## Project Structure
``` mermaid
flowchart TB
subgraph Login Page
LoginComponent
end
subgraph Create User Page
CreateUserComponent
end
subgraph Application Page
ApplicationComponent
subgraph GroupsModule
GroupsComponent[GroupsComponent \n - Groups CRUD]
end
ApplicationComponent -- Fills groups --> GroupsModule
subgraph GridModule
GridComponent[GridComponent \n - Todos CRUD]
-- 1 - * -->
TodoComponent
TodoComponent -- pop up -->EditTodoComponent
end
GroupsModule -- Selected group \nfills the grid --> GridModule
subgraph InputModule
InputComponent[InputComponent]
end
InputModule -- emits todo creation --> GridModule
end
```
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file renamed src/app.db → TodoApi/src/app.db
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
16 changes: 16 additions & 0 deletions TodoWebApp/.browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
# For additional information regarding the format and rule options, please see:
# https://github.com/browserslist/browserslist#queries

# For the full list of supported browsers by the Angular framework, please see:
# https://angular.io/guide/browser-support

# You can see what browsers were selected by your queries by running:
# npx browserslist

last 1 Chrome version
last 1 Firefox version
last 2 Edge major versions
last 2 Safari major versions
last 2 iOS major versions
Firefox ESR
16 changes: 16 additions & 0 deletions TodoWebApp/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Editor configuration, see https://editorconfig.org
root = true

[*]
charset = utf-8
indent_style = space
indent_size = 2
insert_final_newline = true
trim_trailing_whitespace = true

[*.ts]
quote_type = single

[*.md]
max_line_length = off
trim_trailing_whitespace = false
42 changes: 42 additions & 0 deletions TodoWebApp/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.

# Compiled output
/dist
/tmp
/out-tsc
/bazel-out

# Node
/node_modules
npm-debug.log
yarn-error.log

# IDEs and editors
.idea/
.project
.classpath
.c9/
*.launch
.settings/
*.sublime-workspace

# Visual Studio Code
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
.history/*

# Miscellaneous
/.angular/cache
.sass-cache/
/connect.lock
/coverage
/libpeerconnection.log
testem.log
/typings

# System files
.DS_Store
Thumbs.db
4 changes: 4 additions & 0 deletions TodoWebApp/.vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=827846
"recommendations": ["angular.ng-template"]
}
27 changes: 27 additions & 0 deletions TodoWebApp/.vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "Launch Chrome",
"request": "launch",
"type": "chrome",
"url": "http://localhost:4200",
"webRoot": "${workspaceFolder}"
},
{
"name": "ng serve",
"type": "pwa-chrome",
"request": "launch",
"preLaunchTask": "npm: start",
"url": "http://localhost:4200/"
},
{
"name": "ng test",
"type": "chrome",
"request": "launch",
"preLaunchTask": "npm: test",
"url": "http://localhost:9876/debug.html"
}
]
}
42 changes: 42 additions & 0 deletions TodoWebApp/.vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
// For more information, visit: https://go.microsoft.com/fwlink/?LinkId=733558
"version": "2.0.0",
"tasks": [
{
"type": "npm",
"script": "start",
"isBackground": true,
"problemMatcher": {
"owner": "typescript",
"pattern": "$tsc",
"background": {
"activeOnStart": true,
"beginsPattern": {
"regexp": "(.*?)"
},
"endsPattern": {
"regexp": "bundle generation complete"
}
}
}
},
{
"type": "npm",
"script": "test",
"isBackground": true,
"problemMatcher": {
"owner": "typescript",
"pattern": "$tsc",
"background": {
"activeOnStart": true,
"beginsPattern": {
"regexp": "(.*?)"
},
"endsPattern": {
"regexp": "bundle generation complete"
}
}
}
}
]
}
Loading

0 comments on commit 82f118c

Please sign in to comment.