Merge pull request #8 from snemmani/issue/5

Issue/5
snemmani · Aug 8, 2020 · 8451791 · 8451791
2 parents 652c90f + c593aeb
commit 8451791
Show file tree

Hide file tree

Showing 18 changed files with 471 additions and 111 deletions.
diff --git a/.github/workflows/trello.yml b/.github/workflows/trello.yml
@@ -0,0 +1,13 @@
+name: Attach to Trello
+on:
+  pull_request:
+    types: [opened, reopened, edited]
+jobs:
+  attach-trello:
+    runs-on: ubuntu-latest
+    name: Find trello link and attach to card
+    steps:
+      - uses: delivered/attach-to-trello-card-action@master
+        with:
+          trello-key: ${{ secrets.TRELLO_KEY }}
+          trello-token: ${{ secrets.TRELLO_TOKEN }}
diff --git a/confessions-client/angular.json b/confessions-client/angular.json
@@ -28,7 +28,6 @@
               "src/assets"
             ],
             "styles": [
-              "./node_modules/@angular/material/prebuilt-themes/purple-green.css",
               "src/styles.scss"
             ],
             "scripts": []
@@ -128,4 +127,4 @@
     }
   },
   "defaultProject": "confessions-client"
-}
+}
diff --git a/confessions-client/package.json b/confessions-client/package.json
@@ -17,10 +17,13 @@
     "@angular/compiler": "~10.0.6",
     "@angular/core": "~10.0.6",
     "@angular/forms": "~10.0.6",
+    "@angular/localize": "~10.0.6",
     "@angular/material": "^10.1.2",
     "@angular/platform-browser": "~10.0.6",
     "@angular/platform-browser-dynamic": "~10.0.6",
     "@angular/router": "~10.0.6",
+    "@ng-bootstrap/ng-bootstrap": "^7.0.0",
+    "bootstrap": "^4.5.0",
     "rxjs": "~6.5.5",
     "tslib": "^2.0.0",
     "zone.js": "~0.10.3"

diff --git a/confessions-client/src/app/app.module.ts b/confessions-client/src/app/app.module.ts
@@ -7,14 +7,16 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import {MatSliderModule} from "@angular/material/slider";
 import {MatIconModule} from "@angular/material/icon";
 import {MatToolbarModule} from "@angular/material/toolbar";
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 
 @NgModule({
   declarations: [
     AppComponent
   ],
   imports: [
     BrowserModule,
-    AppRoutingModule
+    AppRoutingModule,
+    NgbModule
   ],
   providers: [],
   bootstrap: [AppComponent]

diff --git a/confessions-client/src/polyfills.ts b/confessions-client/src/polyfills.ts
@@ -1,3 +1,7 @@
+/***************************************************************************************************
+ * Load `$localize` onto the global scope - used if i18n tags appear in Angular templates.
+ */
+import '@angular/localize/init';
 /**
  * This file includes polyfills needed by Angular and is loaded before the app.
  * You can add your own extra polyfills to this file.

diff --git a/confessions-client/src/styles.scss b/confessions-client/src/styles.scss
@@ -1,4 +1,4 @@
 /* You can add global styles to this file, and also import other style files */
 
-html, body { height: 100%; }
-body { margin: 0; font-family: Roboto, "Helvetica Neue", sans-serif; }
+/* Importing Bootstrap SCSS file. */
+@import '~bootstrap/scss/bootstrap';
diff --git a/confessions-rest/confessions.postman_collection.json b/confessions-rest/confessions.postman_collection.json
@@ -12,45 +12,59 @@
 					"name": "Comment",
 					"item": [
 						{
-							"name": "/api/confession/{id}/comment/",
+							"name": "/api/confession/{id}/comment",
 							"request": {
+								"auth": {
+									"type": "basic",
+									"basic": [
+										{
+											"key": "password",
+											"value": "M49d4@Sri",
+											"type": "string"
+										},
+										{
+											"key": "username",
+											"value": "snemmani",
+											"type": "string"
+										}
+									]
+								},
 								"method": "POST",
 								"header": [
 									{
 										"key": "Content-Type",
 										"name": "Content-Type",
-										"value": "application/json",
-										"type": "text"
+										"type": "text",
+										"value": "application/json"
 									}
 								],
 								"body": {
 									"mode": "raw",
-									"raw": "{\n\t\"text\": \"This is a successfull comment? Is it successfull?\"\n}",
+									"raw": "{\n\t\"text\": \"This is a successfull comment? Is it first\"\n}",
 									"options": {
 										"raw": {
 											"language": "json"
 										}
 									}
 								},
 								"url": {
-									"raw": "localhost:8000/api/confession/3/comment/",
+									"raw": "localhost:8000/api/confession/1/comment",
 									"host": [
 										"localhost"
 									],
 									"port": "8000",
 									"path": [
 										"api",
 										"confession",
-										"3",
-										"comment",
-										""
+										"1",
+										"comment"
 									]
 								}
 							},
 							"response": []
 						},
 						{
-							"name": "/api/confession/{id}/comment",
+							"name": "/api/comment/{id}",
 							"request": {
 								"auth": {
 									"type": "basic",
@@ -72,13 +86,13 @@
 									{
 										"key": "Content-Type",
 										"name": "Content-Type",
-										"value": "application/json",
-										"type": "text"
+										"type": "text",
+										"value": "application/json"
 									}
 								],
 								"body": {
 									"mode": "raw",
-									"raw": "{\n    \"id\": 1,\n    \"user\": \"snemmani\",\n    \"text\": \"This is a successfull comment? Is it successfull?\",\n    \"upvote_count\": 1,\n    \"downvote_count\": 0,\n    \"created\": \"2020-08-07T11:45:06.688348+05:30\"\n}",
+									"raw": "{\n    \"text\": \"This is a successfull comment? Is it updated?\"\n}",
 									"options": {
 										"raw": {
 											"language": "json"
@@ -99,6 +113,114 @@
 								}
 							},
 							"response": []
+						},
+						{
+							"name": "/api/comment/{id}/vote",
+							"request": {
+								"auth": {
+									"type": "basic",
+									"basic": [
+										{
+											"key": "password",
+											"value": "M49d4@Sri",
+											"type": "string"
+										},
+										{
+											"key": "username",
+											"value": "snemmani",
+											"type": "string"
+										}
+									]
+								},
+								"method": "POST",
+								"header": [
+									{
+										"key": "Content-Type",
+										"name": "Content-Type",
+										"value": "application/json",
+										"type": "text"
+									}
+								],
+								"body": {
+									"mode": "raw",
+									"raw": "{\n\t\"vote_type\": 1\n}",
+									"options": {
+										"raw": {
+											"language": "json"
+										}
+									}
+								},
+								"url": {
+									"raw": "localhost:8000/api/comment/2/vote",
+									"host": [
+										"localhost"
+									],
+									"port": "8000",
+									"path": [
+										"api",
+										"comment",
+										"2",
+										"vote"
+									]
+								}
+							},
+							"response": []
+						},
+						{
+							"name": "/api/confession/{id}/comment",
+							"request": {
+								"method": "GET",
+								"header": [],
+								"url": {
+									"raw": "localhost:8000/api/confession/1/comment",
+									"host": [
+										"localhost"
+									],
+									"port": "8000",
+									"path": [
+										"api",
+										"confession",
+										"1",
+										"comment"
+									]
+								}
+							},
+							"response": []
+						},
+						{
+							"name": "/api/comment/{id}",
+							"request": {
+								"auth": {
+									"type": "basic",
+									"basic": [
+										{
+											"key": "password",
+											"value": "M49d4@Sri",
+											"type": "string"
+										},
+										{
+											"key": "username",
+											"value": "snemmani",
+											"type": "string"
+										}
+									]
+								},
+								"method": "DELETE",
+								"header": [],
+								"url": {
+									"raw": "localhost:8000/api/comment/2",
+									"host": [
+										"localhost"
+									],
+									"port": "8000",
+									"path": [
+										"api",
+										"comment",
+										"2"
+									]
+								}
+							},
+							"response": []
 						}
 					],
 					"protocolProfileBehavior": {},
@@ -165,16 +287,15 @@
 						"method": "GET",
 						"header": [],
 						"url": {
-							"raw": "localhost:8000/api/confession/3/",
+							"raw": "localhost:8000/api/confession/1",
 							"host": [
 								"localhost"
 							],
 							"port": "8000",
 							"path": [
 								"api",
 								"confession",
-								"3",
-								""
+								"1"
 							]
 						}
 					},
@@ -219,6 +340,46 @@
 						}
 					},
 					"response": []
+				},
+				{
+					"name": "/api/confession/{id}/vote",
+					"request": {
+						"auth": {
+							"type": "noauth"
+						},
+						"method": "POST",
+						"header": [
+							{
+								"key": "Content-Type",
+								"name": "Content-Type",
+								"value": "application/json",
+								"type": "text"
+							}
+						],
+						"body": {
+							"mode": "raw",
+							"raw": "{\n\t\"vote_type\": -1\n}",
+							"options": {
+								"raw": {
+									"language": "json"
+								}
+							}
+						},
+						"url": {
+							"raw": "localhost:8000/api/confession/1/vote",
+							"host": [
+								"localhost"
+							],
+							"port": "8000",
+							"path": [
+								"api",
+								"confession",
+								"1",
+								"vote"
+							]
+						}
+					},
+					"response": []
 				}
 			],
 			"protocolProfileBehavior": {}

diff --git a/confessions-rest/db.sqlite3 b/confessions-rest/db.sqlite3
diff --git a/confessions-rest/readme.md b/confessions-rest/readme.md
@@ -0,0 +1,15 @@
+# Confessions REST API
+
+This api implements a RESTful service for the confessions web app
+
+The app has 2 components
+* Confession
+* * This does not need authentication
+* Comment
+* * Needs authentication
+
+# License
+This app and its components can be reused without changing the source code
+
+## Author: snemmani
+